# 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
+ 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
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.....
-
+
=cut
use strict;
# Fixed variables
my $script_name = "/cgi-bin/koha/admin/branches.pl";
-my $pagesize = 20;
################################################################################
# Main loop....
my $branchcode = $input->param('branchcode');
my $branchname = $input->param('branchname');
my $categorycode = $input->param('categorycode');
-my $op = $input->param('op');
-
-if(!defined($op)){
- $op = '';
-}
+my $op = $input->param('op') || '';
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { parameters => 1},
+ flagsrequired => { parameters => 'parameters_remaining_permissions'},
debug => 1,
}
);
-if ($op) {
- $template->param(
- script_name => $script_name,
- $op => 1
- ); # we show only the TMPL_VAR names $op
-}
-else {
- $template->param(
- script_name => $script_name,
- else => 1
- ); # we show only the TMPL_VAR names $op
-}
-$template->param( action => $script_name );
+$template->param(
+ script_name => $script_name,
+ action => $script_name,
+);
+$template->param( ($op || 'else') => 1 );
+
if ( $op eq 'add' ) {
# If the user has pressed the "add new branch" button.
- $template->param( 'heading-branches-add-branch-p' => 1 );
+ $template->param( 'heading_branches_add_branch_p' => 1 );
editbranchform($branchcode,$template);
}
elsif ( $op eq 'edit' ) {
# if the user has pressed the "edit branch settings" button.
- $template->param( 'heading-branches-add-branch-p' => 0,
+ $template->param( 'heading_branches_add_branch_p' => 0,
'add' => 1, );
editbranchform($branchcode,$template);
}
default("MESSAGE1",$template);
}
else {
- my $error = ModBranch($params);
- # 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
- $template->param(%$params);
- $template->param(branch_name => $params->{branchname});
- $template->param( 'heading-branches-add-branch-p' => 1, 'add' => 1, "ERROR$error" => 1 );
- } else {
- $template->param( else => 1);
- default("MESSAGE2",$template);
+ 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);
+ }
}
}
}
# check to see if the branchcode is being used in the database somewhere....
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare("select count(*) from items where holdingbranch=? or homebranch=?");
- $sth->execute( $branchcode, $branchcode );
- my ($total) = $sth->fetchrow_array;
- $sth->finish;
-
- my $message;
-
- if ($total) {
- $message = "MESSAGE7";
+ 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);
}
-
- if ($message) {
+ elsif ($totalitems && $totalborrowers){
$template->param( else => 1 );
- default($message,$template);
+ default("MESSAGE7", $template);
}
else {
- $template->param( branchname => $branchname );
$template->param( delete_confirm => 1 );
+ $template->param( branchname => $branchname );
$template->param( branchcode => $branchcode );
}
}
elsif ( $op eq 'editcategory' ) {
# If the user has pressed the "add new category" or "modify" buttons.
- $template->param( 'heading-branches-edit-category-p' => 1 );
+ $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;
+ $params->{'show_in_pulldown'} = ( $params->{'show_in_pulldown'} eq 'on' ) ? 1 : 0;
+
unless ( $params->{'categorycode'} && $params->{'categoryname'} ) {
- $template->param( else => 1 );
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);
- $template->param( else => 1 );
default("MESSAGE5",$template);
}
}
elsif ( $op eq 'delete_category' ) {
# if the user has pressed the "delete branch" button.
- my $message = "MESSAGE8" if CheckBranchCategorycode($categorycode);
- if ($message) {
+ if ( CheckBranchCategorycode($categorycode) ) {
$template->param( else => 1 );
- default($message,$template);
- }
- else {
+ default( 'MESSAGE8', $template );
+ } else {
$template->param( delete_category => 1 );
$template->param( categorycode => $categorycode );
}
}
else {
-
# if no operation has been set...
default("",$template);
}
# html output functions....
sub default {
- my ($message,$innertemplate) = @_;
- $innertemplate->param( 'heading-branches-p' => 1 );
- $innertemplate->param( "$message" => 1 );
- $innertemplate->param( action => $script_name );
+ my $message = shift || '';
+ my $innertemplate = shift or return;
+ $innertemplate->param($message => 1) if $message;
+ $innertemplate->param(
+ 'heading_branches_p' => 1,
+ );
branchinfotable("",$innertemplate);
}
# initiate the scrolling-list to select the printers
my $printers = GetPrinters();
my @printerloop;
- my $printercount = 0;
- my $oldprinter;
- my $CGIprinter;
-
my $data;
+ my $oldprinter = "";
+
+
+ # make the checkboxes.....
+ my $catinfo = GetBranchCategories();
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 and ( $oldprinter eq $printers->{$thisprinter} );
-
- my %row = (
- value => $thisprinter,
- selected => $selected,
- branchprinter => $printers->{$thisprinter}->{'printqueue'},
- );
- push @printerloop, \%row;
+ if ( exists $data->{categories} ) {
+ # Set the selected flag for the categories of this branch
+ $catinfo = [
+ map {
+ my $catcode = $_->{categorycode};
+ if ( grep {/$catcode/} @{$data->{categories}} ){
+ $_->{selected} = 1;
+ }
+ $_;
+ } @{$catinfo}
+ ];
}
- $innertemplate->param(
- printerloop => \@printerloop,
- branchcode => $data->{'branchcode'},
- branch_name => $data->{'branchname'},
- branchaddress1 => $data->{'branchaddress1'},
- branchaddress2 => $data->{'branchaddress2'},
- branchaddress3 => $data->{'branchaddress3'},
- branchphone => $data->{'branchphone'},
- branchfax => $data->{'branchfax'},
- branchemail => $data->{'branchemail'},
- branchip => $data->{'branchip'}
- );
+ # get the old printer of the branch
+ $oldprinter = $data->{'branchprinter'} || '';
+ _branch_to_template($data, $innertemplate);
}
- else { #case of an add branch select printer
- foreach my $thisprinter ( keys %$printers ) {
- my %row = (
- value => $thisprinter,
- branchprinter => $printers->{$thisprinter}->{'printqueue'},
- );
- push @printerloop, \%row;
- }
- $innertemplate->param( printerloop => \@printerloop );
+ $innertemplate->param( categoryloop => $catinfo );
+
+ foreach my $thisprinter ( keys %$printers ) {
+ push @printerloop, {
+ value => $thisprinter,
+ selected => ( $oldprinter eq $printers->{$thisprinter} ),
+ branchprinter => $printers->{$thisprinter}->{'printqueue'},
+ };
}
- # make the checkboxs.....
- #
- # 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'
- # (see bug 130)
- #
- my $catinfo = GetBranchCategory();
- my $catcheckbox;
-
- # print DEBUG "catinfo=".cvs($catinfo)."\n";
- my @categoryloop = ();
- foreach my $cat (@$catinfo) {
- my $checked = "";
- my $tmp = quotemeta( $cat->{'categorycode'} );
- if ( grep { /^$tmp$/ } @{ $data->{'categories'} } ) {
- $checked = "checked=\"checked\"";
- }
- push @categoryloop,
- {
- categoryname => $cat->{'categoryname'},
- categorycode => $cat->{'categorycode'},
- categorytype => $cat->{'categorytype'},
- codedescription => $cat->{'codedescription'},
- checked => $checked,
- };
- }
- $innertemplate->param( categoryloop => \@categoryloop );
+ $innertemplate->param( printerloop => \@printerloop );
- # {{{ Leave this here until bug 130 is completely resolved in the templates
for my $obsolete ( 'categoryname', 'categorycode', 'codedescription' ) {
$innertemplate->param(
$obsolete => 'Your template is out of date (bug 130)' );
}
-
- # }}}
}
sub editcatform {
# prepares the edit form...
my ($categorycode,$innertemplate) = @_;
- warn "cat : $categorycode";
- my $data;
+ # warn "cat : $categorycode";
my @cats;
- $innertemplate->param( categorytype => \@cats);
+ my $data;
if ($categorycode) {
- $data = GetBranchCategory($categorycode);
- $data = $data->[0];
- $innertemplate->param( categorycode => $data->{'categorycode'} ,
- categoryname => $data->{'categoryname'},
- codedescription => $data->{'codedescription'} ,
- );
+ my $data = GetBranchCategory($categorycode);
+ $innertemplate->param(
+ categorycode => $data->{'categorycode'},
+ categoryname => $data->{'categoryname'},
+ codedescription => $data->{'codedescription'},
+ show_in_pulldown => $data->{'show_in_pulldown'},
+ );
}
for my $ctype (GetCategoryTypes()) {
- push @cats , { type => $ctype , selected => ($data->{'categorytype'} eq $ctype) };
+ push @cats , { type => $ctype , selected => ($data->{'categorytype'} and $data->{'categorytype'} eq $ctype) };
}
-}
-
-sub deleteconfirm {
-
- # message to print if the
- my ($branchcode) = @_;
+ $innertemplate->param(categorytype => \@cats);
}
sub branchinfotable {
# makes the html for a table of branch info from reference to an array of hashs.
my ($branchcode,$innertemplate) = @_;
- my $branchinfo;
- if ($branchcode) {
- $branchinfo = GetBranchInfo($branchcode);
- }
- else {
- $branchinfo = GetBranchInfo();
- }
- my $toggle;
- my $i = 0;
+ my $branchinfo = $branchcode ? GetBranchInfo($branchcode) : GetBranchInfo();
my @loop_data = ();
foreach my $branch (@$branchinfo) {
- ( $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
# might (and should) escape what is exported here. (See bug 180)
#
- # - color
# - branch_name (Note: not "branchname")
# - branch_code (Note: not "branchcode")
# - address (containing a static error message)
# - branchaddress1 \
# - branchaddress2 |
# - branchaddress3 | comprising the old "address" field
+ # - branchzip |
+ # - branchcity |
+ # - branchcountry |
# - branchphone |
# - branchfax |
# - branchemail /
+ # - branchurl /
+ # - opac_info (can contain HTML)
# - address-empty-p (1 if no address information, 0 otherwise)
# - categories (containing a static error message)
# - category_list (loop containing "categoryname")
# - no-categories-p (1 if no categories set, 0 otherwise)
# - value
- # - action
#
my %row = ();
my $address_empty_p = 1;
for my $field (
'branchaddress1', 'branchaddress2',
- 'branchaddress3', 'branchphone',
- 'branchfax', 'branchemail',
- 'branchip', 'branchprinter'
+ 'branchaddress3', 'branchzip',
+ 'branchcity', 'branchstate', 'branchcountry',
+ 'branchphone', 'branchfax',
+ 'branchemail', 'branchurl', 'opac_info',
+ 'branchip', 'branchprinter', 'branchnotes'
)
{
$row{$field} = $branch->{$field};
- if ( $branch->{$field} ) {
- $address_empty_p = 0;
- }
+ $address_empty_p = 0 if ( $branch->{$field} );
}
$row{'address-empty-p'} = $address_empty_p;
- # {{{ Leave this here until bug 180 is completely resolved in templates
- $row{'address'} = 'Your template is out of date (see bug 180)';
-
- # }}}
-
# Handle categories
my $no_categories_p = 1;
my @categories;
foreach my $cat ( @{ $branch->{'categories'} } ) {
- my ($catinfo) = @{ GetBranchCategory($cat) };
+ my $catinfo = GetBranchCategory($cat);
push @categories, { 'categoryname' => $catinfo->{'categoryname'} };
$no_categories_p = 0;
}
- # {{{ Leave this here until bug 180 is completely resolved in templates
- $row{'categories'} = 'Your template is out of date (see bug 180)';
-
- # }}}
$row{'category_list'} = \@categories;
$row{'no-categories-p'} = $no_categories_p;
-
- # Handle all other fields
$row{'branch_name'} = $branch->{'branchname'};
$row{'branch_code'} = $branch->{'branchcode'};
- $row{'toggle'} = $toggle;
$row{'value'} = $branch->{'branchcode'};
- $row{'action'} = '/cgi-bin/koha/admin/branches.pl';
- push @loop_data, {%row};
- $i++;
+ push @loop_data, \%row;
}
my @branchcategories = ();
for my $ctype ( GetCategoryTypes() ) {
- my $catinfo = GetBranchCategories(undef,$ctype);
- my @categories;
+ my $catinfo = GetBranchCategories($ctype);
+ my @categories;
foreach my $cat (@$catinfo) {
- push @categories,
- {
- categoryname => $cat->{'categoryname'},
- categorycode => $cat->{'categorycode'},
- codedescription => $cat->{'codedescription'},
- categorytype => $cat->{'categorytype'},
- };
+ push @categories, {
+ categoryname => $cat->{'categoryname'},
+ categorycode => $cat->{'categorycode'},
+ codedescription => $cat->{'codedescription'},
+ categorytype => $cat->{'categorytype'},
+ };
}
- push @branchcategories, { categorytype => $ctype , $ctype => 1 , catloop => \@categories};
+ push @branchcategories, { categorytype => $ctype , $ctype => 1 , catloop => ( @categories ? \@categories : undef) };
}
$innertemplate->param(
branches => \@loop_data,
}
-# FIXME logic seems wrong ## sub is not used.
-sub branchcategoriestable {
- my $innertemplate = shift;
- #Needs to be implemented...
-
- my $categoryinfo = GetBranchCategory();
- my $color;
- foreach my $cat (@$categoryinfo) {
- $innertemplate->param( categoryname => $cat->{'categoryname'} );
- $innertemplate->param( categorycode => $cat->{'categorycode'} );
- $innertemplate->param( codedescription => $cat->{'codedescription'} );
- }
+sub _branch_to_template {
+ my ($data, $template) = @_;
+ $template->param(
+ branchcode => $data->{'branchcode'},
+ branch_name => $data->{'branchname'},
+ branchaddress1 => $data->{'branchaddress1'},
+ branchaddress2 => $data->{'branchaddress2'},
+ branchaddress3 => $data->{'branchaddress3'},
+ branchzip => $data->{'branchzip'},
+ branchcity => $data->{'branchcity'},
+ branchstate => $data->{'branchstate'},
+ branchcountry => $data->{'branchcountry'},
+ branchphone => $data->{'branchphone'},
+ branchfax => $data->{'branchfax'},
+ branchemail => $data->{'branchemail'},
+ branchurl => $data->{'branchurl'},
+ opac_info => $data->{'opac_info'},
+ branchip => $data->{'branchip'},
+ branchnotes => $data->{'branchnotes'},
+ );
}
output_html_with_http_headers $input, $cookie, $template->output;
projects / koha.git / blobdiff