X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Fbranches.pl;h=27d374e987cdb0024a95a7474ef38673fa0f3fbd;hb=b49a0a30a15ea416bbf4e01d23d3db1e4e21ea0f;hp=f5fbcb25d49b98c54c8679112a9b41ce50473a6e;hpb=1e67687742e36bbb90746ecdd78a0c6a63aad890;p=koha_fer
diff --git a/admin/branches.pl b/admin/branches.pl
index f5fbcb25d4..27d374e987 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -1,9 +1,5 @@
#!/usr/bin/perl
-# Finlay working on this file from 26-03-2002
-# Reorganising this branches admin page.....
-
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -17,389 +13,407 @@
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+=head1 branches.pl
+
+ FIXME: individual fields in branch address need to be exported to templates,
+ in order to fix bug 180; need to notify translators
+FIXME: looped html (e.g., list of checkboxes) need to be properly
+ TMPL_LOOP'ized; doing this properly will fix bug 130; need to
+ notify translators
+ FIXME: need to implement the branch categories stuff
+ FIXME: there are too many TMPL_IF's; the proper way to do it is to have
+ separate templates for each individual action; need to notify
+ translators
+ FIXME: there are lots of error messages exported to the template; a lot
+ of these should be converted into exported booleans / counters etc
+ so that the error messages can be localized; need to notify translators
+
+ Finlay working on this file from 26-03-2002
+ Reorganising this branches admin page.....
+
+=cut
use strict;
+use warnings;
use CGI;
+use C4::Auth;
+use C4::Context;
use C4::Output;
-use C4::Database;
+use C4::Koha;
+use C4::Branch;
# Fixed variables
-my $linecolor1='#ffffcc';
-my $linecolor2='white';
-my $backgroundimage="/images/background-mem.gif";
-my $script_name="/cgi-bin/koha/admin/branches.pl";
-my $pagesize=20;
-
+my $script_name = "/cgi-bin/koha/admin/branches.pl";
-#######################################################################################
+################################################################################
# Main loop....
+my $input = new CGI;
+my $branchcode = $input->param('branchcode');
+my $branchname = $input->param('branchname');
+my $categorycode = $input->param('categorycode');
+my $op = $input->param('op') || '';
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "admin/branches.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { parameters => 1},
+ debug => 1,
+ }
+);
+$template->param(
+ script_name => $script_name,
+ action => $script_name,
+);
+$template->param( ($op || 'else') => 1 );
-my $input = new CGI;
-my $branchcode=$input->param('branchcode');
-my $op = $input->param('op');
+if ( $op eq 'add' ) {
-# header
-print $input->header;
+ # If the user has pressed the "add new branch" button.
+ $template->param( 'heading-branches-add-branch-p' => 1 );
+ editbranchform($branchcode,$template);
-# start the page and read in includes
-print startpage();
-print startmenu('admin');
+}
+elsif ( $op eq 'edit' ) {
-if ($op eq 'add') {
-# If the user has pressed the "add new branch" button.
- print heading("Branches: Add Branch");
- print editbranchform();
+ # if the user has pressed the "edit branch settings" button.
+ $template->param( 'heading-branches-add-branch-p' => 0,
+ 'add' => 1, );
+ editbranchform($branchcode,$template);
+}
+elsif ( $op eq 'add_validate' ) {
-} elsif ($op eq 'edit') {
-# if the user has pressed the "edit branch settings" button.
- print heading("Branches: Edit Branch");
- print editbranchform($branchcode);
+ # confirm settings change...
+ my $params = $input->Vars;
+ unless ( $params->{'branchcode'} && $params->{'branchname'} ) {
+ $template->param( else => 1 );
+ default("MESSAGE1",$template);
+ }
+ else {
+ my $mod_branch = 1;
+ if ($params->{add}) {
+ my ($existing) =
+ C4::Context->dbh->selectrow_array("SELECT count(*) FROM branches WHERE branchcode = ?", {}, $branchcode);
+ if ($existing > 0) {
+ $mod_branch = 0;
+ _branch_to_template($params, $template); # preserve most (FIXME) of user's input
+ $template->param( 'heading-branches-add-branch-p' => 1, 'add' => 1, 'ERROR1' => 1 );
+ }
+ }
+ if ($mod_branch) {
+ my $error = ModBranch($params); # FIXME: causes warnings to log on duplicate branchcode
+ # if error saving, stay on edit and rise error
+ if ($error) {
+ # copy input parameters back to form
+ # FIXME - doing this doesn't preserve any branch group selections, but good enough for now
+ editbranchform($branchcode,$template);
+ $template->param( 'heading-branches-add-branch-p' => 1, 'add' => 1, "ERROR$error" => 1 );
+ } else {
+ $template->param( else => 1);
+ default("MESSAGE2",$template);
+ }
+ }
+ }
+}
+elsif ( $op eq 'delete' ) {
+ # if the user has pressed the "delete branch" button.
+
+ # check to see if the branchcode is being used in the database somewhere....
+ my $dbh = C4::Context->dbh;
+ my $sthitems = $dbh->prepare("select count(*) from items where holdingbranch=? or homebranch=?");
+ my $sthborrowers = $dbh->prepare("select count(*) from borrowers where branchcode=?");
+ $sthitems->execute( $branchcode, $branchcode );
+ $sthborrowers->execute( $branchcode );
+ my ($totalitems) = $sthitems->fetchrow_array;
+ my ($totalborrowers) = $sthborrowers->fetchrow_array;
+ if ($totalitems && !$totalborrowers) {
+ $template->param( else => 1 );
+ default("MESSAGE10", $template);
+ }
+ elsif (!$totalitems && $totalborrowers){
+ $template->param( else => 1 );
+ default("MESSAGE11", $template);
+ }
+ elsif ($totalitems && $totalborrowers){
+ $template->param( else => 1 );
+ default("MESSAGE7", $template);
+ }
+ else {
+ $template->param( delete_confirm => 1 );
+ $template->param( branchname => $branchname );
+ $template->param( branchcode => $branchcode );
+ }
+}
+elsif ( $op eq 'delete_confirmed' ) {
+
+ # actually delete branch and return to the main screen....
+ DelBranch($branchcode);
+ $template->param( else => 1 );
+ default("MESSAGE3",$template);
+}
+elsif ( $op eq 'editcategory' ) {
-} elsif ($op eq 'add_validate') {
-# confirm settings change...
+ # If the user has pressed the "add new category" or "modify" buttons.
+ $template->param( 'heading-branches-edit-category-p' => 1 );
+ editcatform($categorycode,$template);
+}
+elsif ( $op eq 'addcategory_validate' ) {
+
+ $template->param( else => 1 );
+ # confirm settings change...
my $params = $input->Vars;
- unless ($params->{'branchcode'} && $params->{'branchname'}) {
- default ("Cannot change branch record: You must specify a Branchname and a Branchcode");
- } else {
- setbranchinfo($params);
- default ("Branch record changed for branch: $params->{'branchname'}");
+ unless ( $params->{'categorycode'} && $params->{'categoryname'} ) {
+ default("MESSAGE4",$template);
+ }
+ elsif ($input->param('add')){
+ # doing an add must check the code is unique
+ if (CheckCategoryUnique($input->param('categorycode'))){
+ ModBranchCategoryInfo($params);
+ default("MESSAGE5",$template);
+ }
+ else {
+ default("MESSAGE9",$template);
+ }
+ }
+ else {
+ ModBranchCategoryInfo($params);
+ default("MESSAGE5",$template);
}
+}
+elsif ( $op eq 'delete_category' ) {
-} elsif ($op eq 'delete') {
-# if the user has pressed the "delete branch" button.
- my $message = checkdatabasefor($branchcode);
+ # if the user has pressed the "delete branch" button.
+ my $message = "MESSAGE8" if CheckBranchCategorycode($categorycode);
if ($message) {
- default($message);
- } else {
- print deleteconfirm($branchcode);
+ $template->param( else => 1 );
+ default($message,$template);
+ }
+ else {
+ $template->param( delete_category => 1 );
+ $template->param( categorycode => $categorycode );
}
-
-} elsif ($op eq 'delete_confirmed') {
-# actually delete branch and return to the main screen....
- deletebranch($branchcode);
- default("The branch with code $branchcode has been deleted.");
-
-} else {
-# if no operation has been set...
- default();
}
+elsif ( $op eq 'categorydelete_confirmed' ) {
+ # actually delete branch and return to the main screen....
+ DelBranchCategory($categorycode);
+ $template->param( else => 1 );
+ default("MESSAGE6",$template);
-print endmenu('admin');
-print endpage();
+}
+else {
+ # if no operation has been set...
+ default("",$template);
+}
-######################################################################################################
+################################################################################
#
# html output functions....
sub default {
- my ($message) = @_;
- print heading("Branches");
- print "$message";
- print "
";
- print branchinfotable();
- print branchcategoriestable();
-}
-
-sub heading {
- my ($head) = @_;
- return "$head ";
+ my $message = shift || '';
+ my $innertemplate = shift or return;
+ $innertemplate->param($message => 1) if $message;
+ $innertemplate->param(
+ 'heading-branches-p' => 1,
+ );
+ branchinfotable("",$innertemplate);
}
sub editbranchform {
-# prepares the edit form...
- my ($branchcode) = @_;
+ my ($branchcode,$innertemplate) = @_;
+ # initiate the scrolling-list to select the printers
+ my $printers = GetPrinters();
+ my @printerloop;
my $data;
+ my $oldprinter = "";
+
if ($branchcode) {
- $data = getbranchinfo($branchcode);
- $data = $data->[0];
- }
-# make the checkboxs.....
- my $catinfo = getcategoryinfo();
- my $catcheckbox;
- foreach my $cat (@$catinfo) {
- my $checked = "";
- my $tmp = $cat->{'categorycode'};
- if (grep {/^$tmp$/} @{$data->{'categories'}}) {
- $checked = "CHECKED";
- }
- $catcheckbox .= <
$cat->{'categoryname'}
-
$cat->{'codedescription'}
-EOF
- }
- my $form = <
-
-
-
Branch code
-
Name
-$catcheckbox
-
Address
-
-
-
Phone
-
Fax
-
E-mail
-
-
-
-EOF
- return $form;
-}
+ $data = GetBranchInfo($branchcode);
+ $data = $data->[0];
-sub deleteconfirm {
-# message to print if the
- my ($branchcode) = @_;
- my $output = <
-
-
-
-EOF
- return $output;
-}
+ # get the old printer of the branch
+ $oldprinter = $data->{'branchprinter'} || '';
+ _branch_to_template($data, $innertemplate);
+ }
+ foreach my $thisprinter ( keys %$printers ) {
+ push @printerloop, {
+ value => $thisprinter,
+ selected => ( $oldprinter eq $printers->{$thisprinter} ),
+ branchprinter => $printers->{$thisprinter}->{'printqueue'},
+ };
+ }
-sub branchinfotable {
-# makes the html for a table of branch info from reference to an array of hashs.
+ $innertemplate->param( printerloop => \@printerloop );
+ # make the checkboxes.....
+ #
+ # We export a "categoryloop" array to the template, each element of which
+ # contains separate 'categoryname', 'categorycode', 'codedescription', and
+ # 'checked' fields. The $checked field is either '' or 'checked="checked"'
- my ($branchcode) = @_;
- my $branchinfo;
- if ($branchcode) {
- $branchinfo = getbranchinfo($branchcode);
- } else {
- $branchinfo = getbranchinfo();
- }
- my $table = <
-
-Branches
-
-
Name
-
Code
-
Address
-
Categories
-
-
-EOF
-
- my $color;
- foreach my $branch (@$branchinfo) {
- ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
- my $address = '';
- $address .= $branch->{'branchaddress1'} if ($branch->{'branchaddress1'});
- $address .= ' '.$branch->{'branchaddress2'} if ($branch->{'branchaddress2'});
- $address .= ' '.$branch->{'branchaddress3'} if ($branch->{'branchaddress3'});
- $address .= ' ph: '.$branch->{'branchphone'} if ($branch->{'branchphone'});
- $address .= ' fax: '.$branch->{'branchfax'} if ($branch->{'branchfax'});
- $address .= ' email: '.$branch->{'branchemail'} if ($branch->{'branchemail'});
- $address = '(nothing entered)' unless ($address);
- my $categories = '';
- foreach my $cat (@{$branch->{'categories'}}) {
- my ($catinfo) = @{getcategoryinfo($cat)};
- $categories .= $catinfo->{'categoryname'}." ";
- }
- $categories = '(no categories set)' unless ($categories);
- $table .= <
-