Finalized XML version for intranet

[koha-ffzg.git] / tools / holidays.pl

diff --git a/tools/holidays.pl b/tools/holidays.pl
index f4b5c79..c2c03a3 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -1,28 +1,18 @@
 #!/usr/bin/perl
-#####Sets holiday periods for each branch. Datedues will be extended if branch is closed -TG
+
 use strict;
 use CGI;
 
 use C4::Auth;
-use C4::Output;
+
 use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
-use C4::Calendar;
+
+use C4::Calendar::Calendar;
 
 my $input = new CGI;
-#my $branch = $input->param('branch');
-my $branch=C4::Context->preference('defaultbranch') || $input->param('branch');
+my $branch = $input->param('branch');
+$branch=C4::Context->preference('defaultBranch') unless $branch;
 my $dbh = C4::Context->dbh();
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "tools/holidays.tmpl",
-                                        type => "intranet",
-                                        query => $input,
-                                        authnotrequired => 0,
-                                        flagsrequired => {parameters => 1},
-                                                debug => 1,
-                                      });
 
 # Set all the branches.
 my $branches = $dbh->prepare("select branchcode, branchname from branches");
@@ -36,24 +26,21 @@ my @listValues = keys(%list);
 if (!defined($branch)) {
        $branch =$listValues[4];
 }
-my $branchesList = CGI::scrolling_list(-name => 'branch',
+my $branchesList = CGI::scrolling_list(-name => 'branch', -id=>'branch',
                                               -values => \@listValues,
                                                   -labels => \%list,
                                                   -size => 1,
-                                                                          -default => [$branch],
+                                        -default => [$branch],
                                                   -multiple => 0,
-                                                                          -id => "branch",
-                                                                          -onChange => "changeBranch()");
+                                        -onChange => "changeBranch()");
 
 $branches->finish;
 
 # Get all the holidays
-warn "BRANCH : $branch";
-my $calendar = C4::Calendar->new(branchcode => $branch);
+my $calendar = C4::Calendar::Calendar->new(branchcode => $branch);
 my $week_days_holidays = $calendar->get_week_days_holidays();
 my @week_days;
 foreach my $weekday (keys %$week_days_holidays) {
-warn "WEEK DAY : $weekday";
        my %week_day;
        %week_day = (KEY => $weekday,
                         TITLE => $week_days_holidays->{$weekday}{title},
@@ -91,6 +78,16 @@ foreach my $yearMonthDay (keys %$single_holidays) {
        push @holidays, \%holiday;
 }
 
+# Get the template to use
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "tools/holidays.tmpl",
+                                        type => "intranet",
+                                        query => $input,
+                                        authnotrequired => 0,
+                                        flagsrequired => {parameters => 1},
+                                                debug => 1,
+                                      });
+
 # Replace the template values with the real ones
 $template->param(BRANCHES => $branchesList);
 $template->param(WEEK_DAYS_LOOP => \@week_days);
@@ -100,4 +97,4 @@ $template->param(DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays);
 $template->param(branch => $branch);
 
 # Shows the template with the real values replaced
-output_html_with_http_headers $input, $cookie, $template->output;
+output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file