[followup] (bug #4051) set as binary

[koha.git] / tools / holidays.pl

diff --git a/tools/holidays.pl b/tools/holidays.pl
index 21e791c..abca5e7 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -17,6 +17,8 @@
 
 #####Sets holiday periods for each branch. Datedues will be extended if branch is closed -TG
 use strict;
+use warnings;
+
 use CGI;
 
 use C4::Auth;
@@ -27,10 +29,6 @@ use C4::Calendar;
 
 my $input = new CGI;
 
-my $branch=C4::Context->preference('defaultbranch') || $input->param('branch');
-
-
-
 my $dbh = C4::Context->dbh();
 # Get the template to use
 my ($template, $loggedinuser, $cookie)
@@ -42,12 +40,28 @@ my ($template, $loggedinuser, $cookie)
                              debug => 1,
                            });
 
+# keydate - date passed to calendar.js.  calendar.js does not process dashes within a date.
+my $keydate;
+# calendardate - date passed in url for human readability (syspref)
+my $calendardate;
+my $today = C4::Dates->new();
+my $calendarinput = C4::Dates->new($input->param('calendardate')) || $today;
+# if the url has an invalid date default to 'now.'
+unless($calendardate = $calendarinput->output('syspref')) {
+  $calendardate = $today->output('syspref');
+}
+unless($keydate = $calendarinput->output('iso')) {
+  $keydate = $today->output('iso');
+}
+$keydate =~ s/-/\//g;
+
+my $branch= $input->param('branch') || C4::Context->userenv->{'branch'};
 # Set all the branches.
 my $onlymine=(C4::Context->preference('IndependantBranches') &&
               C4::Context->userenv &&
               C4::Context->userenv->{flags} !=1  &&
               C4::Context->userenv->{branch}?1:0);
-if ( C4::Context->preference("IndependantBranches") ) { 
+if ( $onlymine ) { 
     $branch = C4::Context->userenv->{'branch'};
 }
 my $branches = GetBranches($onlymine);
@@ -60,7 +74,8 @@ for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{b
             );
     push @branchloop, \%row;
 }
-
+# branches calculated - put branch codes in a single string so they can be passed in a form
+my $branchcodes = join("|", keys %$branches);
 
 # Get all the holidays
 
@@ -78,9 +93,19 @@ foreach my $weekday (keys %$week_days_holidays) {
 
 my $day_month_holidays = $calendar->get_day_month_holidays();
 my @day_month_holidays;
-foreach my $monthDay (keys %$day_month_holidays) {
+foreach my $monthDay (sort keys %$day_month_holidays) {
+    # Determine date format on month and day.
+    my $day_monthdate;
+    if (C4::Context->preference("dateformat") eq "metric") {
+      $day_monthdate = "$day_month_holidays->{$monthDay}{day}/$day_month_holidays->{$monthDay}{month}";
+    } elsif (C4::Context->preference("dateformat") eq "us") {
+      $day_monthdate = "$day_month_holidays->{$monthDay}{month}/$day_month_holidays->{$monthDay}{day}";
+    } else {
+      $day_monthdate = "$day_month_holidays->{$monthDay}{month}-$day_month_holidays->{$monthDay}{day}";
+    }
     my %day_month;
     %day_month = (KEY => $monthDay,
+                  DATE => $day_monthdate,
                   TITLE => $day_month_holidays->{$monthDay}{title},
                   DESCRIPTION => $day_month_holidays->{$monthDay}{description});
     push @day_month_holidays, \%day_month;
@@ -88,9 +113,11 @@ foreach my $monthDay (keys %$day_month_holidays) {
 
 my $exception_holidays = $calendar->get_exception_holidays();
 my @exception_holidays;
-foreach my $yearMonthDay (keys %$exception_holidays) {
+foreach my $yearMonthDay (sort keys %$exception_holidays) {
+    my $exceptiondate = C4::Dates->new($exception_holidays->{$yearMonthDay}{date}, "iso");
     my %exception_holiday;
     %exception_holiday = (KEY => $yearMonthDay,
+                          DATE => $exceptiondate->output("syspref"),
                           TITLE => $exception_holidays->{$yearMonthDay}{title},
                           DESCRIPTION => $exception_holidays->{$yearMonthDay}{description});
     push @exception_holidays, \%exception_holiday;
@@ -98,9 +125,11 @@ foreach my $yearMonthDay (keys %$exception_holidays) {
 
 my $single_holidays = $calendar->get_single_holidays();
 my @holidays;
-foreach my $yearMonthDay (keys %$single_holidays) {
+foreach my $yearMonthDay (sort keys %$single_holidays) {
+    my $holidaydate = C4::Dates->new($single_holidays->{$yearMonthDay}{date}, "iso");
     my %holiday;
     %holiday = (KEY => $yearMonthDay,
+                DATE => $holidaydate->output("syspref"),
                 TITLE => $single_holidays->{$yearMonthDay}{title},
                 DESCRIPTION => $single_holidays->{$yearMonthDay}{description});
     push @holidays, \%holiday;
@@ -111,6 +140,9 @@ $template->param(WEEK_DAYS_LOOP => \@week_days,
                                HOLIDAYS_LOOP => \@holidays,
                                EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays,
                                DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays,
+                               calendardate => $calendardate,
+                               keydate => $keydate,
+                               branchcodes => $branchcodes,
                                branch => $branch
        );