# TMPL_LOOP'ized; doing this properly will fix bug 130; need to
# notify translators
# FIXME: need to implement the branch categories stuff
-# FIXME: heading() need to be moved to templates, need to notify translators
# 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
+#
+# NOTE: heading() should now be called like this:
+# 1. Use heading() as before
+# 2. $template->param('heading-LISPISHIZED-HEADING-p' => 1);
+# 3. $template->param('use-heading-flags-p' => 1);
+# This ensures that both converted and unconverted templates work
# Finlay working on this file from 26-03-2002
# Reorganising this branches admin page.....
use C4::Output;
use C4::Interface::CGI::Output;
use HTML::Template;
+use C4::Koha;
# Fixed variables
my $linecolor1='#ffffcc';
# 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 => "parameters/branches.tmpl",
+ = get_template_and_user({template_name => "admin/branches.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {parameters => 1},
+ flagsrequired => {parameters => 1, management => 1},
debug => 1,
});
if ($op) {
else => 1); # we show only the TMPL_VAR names $op
}
$template->param(action => $script_name);
-
if ($op eq 'add') {
# If the user has pressed the "add new branch" button.
heading("Branches: Add Branch");
+ $template->param('heading-branches-add-branch-p' => 1);
editbranchform();
} elsif ($op eq 'edit') {
# if the user has pressed the "edit branch settings" button.
heading("Branches: Edit Branch");
+ $template->param('heading-branches-edit-branch-p' => 1);
$template->param(add => 1);
editbranchform($branchcode);
} elsif ($op eq 'add_validate') {
# 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");
+ $template->param(else => 1);
+ default ("MESSAGE1");
} else {
setbranchinfo($params);
$template->param(else => 1);
- default ("Branch record changed for branch: $params->{'branchname'}");
+ default ("MESSAGE2");
}
} elsif ($op eq 'delete') {
# if the user has pressed the "delete branch" button.
$template->param(else => 1);
default($message);
} else {
+ $template->param(branchname => $branchname);
$template->param(delete_confirm => 1);
$template->param(branchcode => $branchcode);
}
# actually delete branch and return to the main screen....
deletebranch($branchcode);
$template->param(else => 1);
- default("The branch with code $branchcode has been deleted.");
+ default("MESSAGE3");
} elsif ($op eq 'editcategory') {
- # If the user has pressed the "add new category" button.
- heading("Branches: Edit Category");
+ # If the user has pressed the "add new category" or "modify" buttons.
+ $template->param('heading-branches-edit-category-p' => 1);
editcatform($categorycode);
} elsif ($op eq 'addcategory_validate') {
# confirm settings change...
my $params = $input->Vars;
unless ($params->{'categorycode'} && $params->{'categoryname'}) {
- default ("Cannot change branch record: You must specify a Branchname and a Branchcode");
+ $template->param(else => 1);
+ default ("MESSAGE4");
} else {
setcategoryinfo($params);
$template->param(else => 1);
- default ("Category record changed for category $params->{'categoryname'}");
+ default ("MESSAGE5");
}
} elsif ($op eq 'delete_category') {
# if the user has pressed the "delete branch" button.
# actually delete branch and return to the main screen....
deletecategory($categorycode);
$template->param(else => 1);
- default("The category with code $categorycode has been deleted.");
+ default("MESSAGE6");
} else {
# if no operation has been set...
sub default {
my ($message) = @_;
heading("Branches");
- $template->param(message => $message);
+ $template->param('heading-branches-p' => 1);
+ $template->param("$message" => 1);
$template->param(action => $script_name);
branchinfotable();
}
sub editbranchform {
# prepares the edit form...
+
+# initiate the scrolling-list to select the printers
+ my %env;
+ my $printers=getprinters(\%env);
+ my @printerloop;
+ my $printercount=0;
+ my $oldprinter;
+ my $CGIprinter;
my ($branchcode) = @_;
my $data;
+
if ($branchcode) {
$data = getbranchinfo($branchcode);
$data = $data->[0];
+ # get the old printer of the branch
+ $oldprinter = $data->{'branchprinter'};
+# printer loop
+ foreach my $thisprinter (keys %$printers) {
+ my $selected = 1 if $oldprinter eq $printers->{$thisprinter}->{'printqueue'};
+ my %row =(value => $thisprinter,
+ selected => $selected,
+ branchprinter => $printers->{$thisprinter}->{'printqueue'},
+ );
+ push @printerloop, \%row;
+ }
+
+ $template->param(printerloop => \@printerloop );
$template->param(branchcode => $data->{'branchcode'});
- $template->param(branchname => $data->{'branchname'});
+ $template->param(branch_name => $data->{'branchname'});
$template->param(branchaddress1 => $data->{'branchaddress1'});
$template->param(branchaddress2 => $data->{'branchaddress2'});
$template->param(branchaddress3 => $data->{'branchaddress3'});
$template->param(branchphone => $data->{'branchphone'});
$template->param(branchfax => $data->{'branchfax'});
$template->param(branchemail => $data->{'branchemail'});
- }
+ $template->param(branchip => $data->{'branchip'});
+ }
+ else { #case of an add branch select printer
+ foreach my $thisprinter (keys %$printers) {
+ my %row =(value => $thisprinter,
+ branchprinter => $printers->{$thisprinter}->{'printqueue'},
+ );
+ push @printerloop, \%row;
+ }
+ $template->param(printerloop => \@printerloop );
+ }
# make the checkboxs.....
#
my $checked = "";
my $tmp = quotemeta($cat->{'categorycode'});
if (grep {/^$tmp$/} @{$data->{'categories'}}) {
- $checked = "CHECKED";
+ $checked = "checked=\"checked\"";
}
push @categoryloop, {
categoryname => $cat->{'categoryname'},
} else {
$branchinfo = getbranchinfo();
}
- my $color;
+ my $toggle;
+ my $i;
my @loop_data =();
foreach my $branch (@$branchinfo) {
- ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
+ ($i % 2) ? ($toggle = 1) : ($toggle = 0);
#
# We export the following fields to the template. These are not
# pre-composed as a single "address" field because the template
# Handle address fields separately
my $address_empty_p = 1;
for my $field ('branchaddress1', 'branchaddress2', 'branchaddress3',
- 'branchphone', 'branchfax', 'branchemail') {
+ 'branchphone', 'branchfax', 'branchemail', 'branchip', 'branchprinter') {
$row{$field} = $branch->{$field};
if ( $branch->{$field} ) {
$address_empty_p = 0;
# Handle all other fields
$row{'branch_name'} = $branch->{'branchname'};
$row{'branch_code'} = $branch->{'branchcode'};
- $row{'color'} = $color;
+ $row{'toggle'} = $toggle;
$row{'value'} = $branch->{'branchcode'};
$row{'action'} = '/cgi-bin/koha/admin/branches.pl';
push @loop_data, { %row };
+ $i++;
}
my @branchcategories =();
my $catinfo = getcategoryinfo();
+ my $toggle;
+ my $i = 0;
foreach my $cat (@$catinfo) {
+ ($i % 2) ? ($toggle = 1) : ($toggle = 0);
push @branchcategories, {
+ toggle => $toggle,
categoryname => $cat->{'categoryname'},
categorycode => $cat->{'categorycode'},
codedescription => $cat->{'codedescription'},
};
- }
+ $i++;
+ }
$template->param(branches => \@loop_data,
branchcategories => \@branchcategories);
my ($branchcode) = @_;
my $dbh = C4::Context->dbh;
- my ($query, @query_args);
+ my $sth;
if ($branchcode) {
- $query = "Select * from branches where branchcode = ?";
- @query_args = ($branchcode);
+ $sth = $dbh->prepare("Select * from branches where branchcode = ? order by branchcode");
+ $sth->execute($branchcode);
} else {
- $query = "Select * from branches";
+ $sth = $dbh->prepare("Select * from branches order by branchcode");
+ $sth->execute();
}
- my $sth = $dbh->prepare($query);
- $sth->execute(@query_args);
my @results;
while (my $data = $sth->fetchrow_hashref) {
- $query = "select categorycode from branchrelations where branchcode = ?";
- my $nsth = $dbh->prepare($query);
+ my $nsth = $dbh->prepare("select categorycode from branchrelations where branchcode = ?");
$nsth->execute($data->{'branchcode'});;
my @cats = ();
while (my ($cat) = $nsth->fetchrow_array) {
# returns a reference to an array of hashes containing branches,
my ($catcode) = @_;
my $dbh = C4::Context->dbh;
- my ($query, @query_args);
+ my $sth;
# print DEBUG "getcategoryinfo: entry: catcode=".cvs($catcode)."\n";
if ($catcode) {
- $query = "select * from branchcategories where categorycode = ?";
- @query_args = ($catcode);
+ $sth = $dbh->prepare("select * from branchcategories where categorycode = ?");
+ $sth->execute($catcode);
} else {
- $query = "Select * from branchcategories";
+ $sth = $dbh->prepare("Select * from branchcategories");
+ $sth->execute();
}
- # print DEBUG "getcategoryinfo: query=".cvs($query)."\n";
- my $sth = $dbh->prepare($query);
- $sth->execute(@query_args);
my @results;
while (my $data = $sth->fetchrow_hashref) {
push(@results, $data);
# sets the data from the editbranch form, and writes to the database...
my ($data) = @_;
my $dbh = C4::Context->dbh;
- my $query = "replace branches (branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail) values (?,?,?,?,?,?,?,?)";
- my $sth=$dbh->prepare($query);
+ my $sth=$dbh->prepare("replace branches (branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail,branchip,branchprinter) values (?,?,?,?,?,?,?,?,?,?)");
$sth->execute(uc($data->{'branchcode'}), $data->{'branchname'},
$data->{'branchaddress1'}, $data->{'branchaddress2'},
$data->{'branchaddress3'}, $data->{'branchphone'},
- $data->{'branchfax'}, $data->{'branchemail'});
+ $data->{'branchfax'}, $data->{'branchemail'}, $data->{'branchip'},$data->{'branchprinter'});
$sth->finish;
# sort out the categories....
push(@addcats, $ccat);
}
}
- # FIXME - There's already a $dbh in this scope.
- my $dbh = C4::Context->dbh;
foreach my $cat (@addcats) {
- my $query = "insert into branchrelations (branchcode, categorycode) values(?, ?)";
- my $sth = $dbh->prepare($query);
+ my $sth = $dbh->prepare("insert into branchrelations (branchcode, categorycode) values(?, ?)");
$sth->execute($branchcode, $cat);
$sth->finish;
}
foreach my $cat (@removecats) {
- my $query = "delete from branchrelations where branchcode=? and categorycode=?";
- my $sth = $dbh->prepare($query);
+ my $sth = $dbh->prepare("delete from branchrelations where branchcode=? and categorycode=?");
$sth->execute($branchcode, $cat);
$sth->finish;
}
sub deletebranch {
# delete branch...
my ($branchcode) = @_;
- my $query = "delete from branches where branchcode = ?";
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare($query);
+ my $sth=$dbh->prepare("delete from branches where branchcode = ?");
$sth->execute($branchcode);
$sth->finish;
}
# sets the data from the editbranch form, and writes to the database...
my ($data) = @_;
my $dbh = C4::Context->dbh;
- my $query = "replace branchcategories (categorycode,categoryname,codedescription) values (?,?,?)";
- my $sth=$dbh->prepare($query);
+ my $sth=$dbh->prepare("replace branchcategories (categorycode,categoryname,codedescription) values (?,?,?)");
$sth->execute(uc($data->{'categorycode'}), $data->{'categoryname'},$data->{'codedescription'});
$sth->finish;
sub deletecategory {
# delete branch...
my ($categorycode) = @_;
- my $query = "delete from branchcategories where categorycode = ?";
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare($query);
+ my $sth=$dbh->prepare("delete from branchcategories where categorycode = ?");
$sth->execute($categorycode);
$sth->finish;
}
my $message;
if ($total) {
# FIXME: need to be replaced by an exported boolean parameter
- $message = "Branch cannot be deleted because there are $total items using that branch.";
+ $message = "MESSAGE7";
}
return $message;
}
projects / koha-ffzg.git / blobdiff