Bug 20067: Fix other checks for linked authorised value categories

[koha.git] / tools / holidays.pl

diff --git a/tools/holidays.pl b/tools/holidays.pl
index bec897d..207439b 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -16,15 +16,13 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 #####Sets holiday periods for each branch. Datedues will be extended if branch is closed -TG
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 
 use C4::Auth;
 use C4::Output;
 
-use C4::Branch; # GetBranches
 use C4::Calendar;
 use Koha::DateUtils;
 
@@ -41,41 +39,16 @@ 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 $calendarinput_dt = eval { dt_from_string( $input->param('calendardate') ); } || dt_from_string;
 # if the url has an invalid date default to 'now.'
-$calendardate = output_pref( { dt => $calendarinput_dt, dateonly => 1 } );
-$keydate = output_pref( { dt => $calendarinput_dt, dateonly => 1, dateformat => 'iso' } );
+my $calendarinput_dt = eval { dt_from_string( scalar $input->param('calendardate') ); } || dt_from_string;
+my $calendardate = output_pref( { dt => $calendarinput_dt, dateonly => 1 } );
+
+# keydate - date passed to calendar.js.  calendar.js does not process dashes within a date.
+my $keydate = output_pref( { dt => $calendarinput_dt, dateonly => 1, dateformat => 'iso' } );
 $keydate =~ s/-/\//g;
 
 my $branch= $input->param('branch') || C4::Context->userenv->{'branch'};
-# Set all the branches.
-my $onlymine =
-  (      C4::Context->preference('IndependentBranches')
-      && C4::Context->userenv
-      && !C4::Context->IsSuperLibrarian()
-      && C4::Context->userenv->{branch} ? 1 : 0 );
-if ( $onlymine ) { 
-    $branch = C4::Context->userenv->{'branch'};
-}
-my $branchname = GetBranchName($branch);
-my $branches   = GetBranches($onlymine);
-my @branchloop;
-for my $thisbranch (
-    sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
-    keys %{$branches} ) {
-    push @branchloop,
-      { value      => $thisbranch,
-        selected   => $thisbranch eq $branch,
-        branchname => $branches->{$thisbranch}->{'branchname'},
-      };
-}
-
-# 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
 
@@ -100,7 +73,10 @@ foreach my $monthDay (keys %$day_month_holidays) {
     if (C4::Context->preference("dateformat") eq "metric") {
       $day_monthdate_sort = "$day_month_holidays->{$monthDay}{month}-$day_month_holidays->{$monthDay}{day}";
       $day_monthdate = "$day_month_holidays->{$monthDay}{day}/$day_month_holidays->{$monthDay}{month}";
-    } elsif (C4::Context->preference("dateformat") eq "us") {
+    } elsif (C4::Context->preference("dateformat") eq "dmydot") {
+      $day_monthdate_sort = "$day_month_holidays->{$monthDay}{month}.$day_month_holidays->{$monthDay}{day}";
+      $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}";
       $day_monthdate_sort = $day_monthdate;
     } else {
@@ -123,7 +99,7 @@ foreach my $yearMonthDay (keys %$exception_holidays) {
     my %exception_holiday;
     %exception_holiday = (KEY => $yearMonthDay,
                           DATE_SORT => $exception_holidays->{$yearMonthDay}{date},
-                          DATE => output_pref( { dt => $exceptiondate, dateonly => 1, dateformat => 'iso' } ),
+                          DATE => output_pref( { dt => $exceptiondate, dateonly => 1 } ),
                           TITLE => $exception_holidays->{$yearMonthDay}{title},
                           DESCRIPTION => $exception_holidays->{$yearMonthDay}{description});
     push @exception_holidays, \%exception_holiday;
@@ -132,11 +108,11 @@ foreach my $yearMonthDay (keys %$exception_holidays) {
 my $single_holidays = $calendar->get_single_holidays();
 my @holidays;
 foreach my $yearMonthDay (keys %$single_holidays) {
-    my $holidaydate = eval { dt_from_string( $single_holidays->{$yearMonthDay}{date} ) };
+    my $holidaydate_dt = eval { dt_from_string( $single_holidays->{$yearMonthDay}{date} ) };
     my %holiday;
     %holiday = (KEY => $yearMonthDay,
                 DATE_SORT => $single_holidays->{$yearMonthDay}{date},
-                DATE => output_pref( { dt => $holidaydate, dateonly => 1, dateformat => 'iso' } ),
+                DATE => output_pref( { dt => $holidaydate_dt, dateonly => 1 } ),
                 TITLE => $single_holidays->{$yearMonthDay}{title},
                 DESCRIPTION => $single_holidays->{$yearMonthDay}{description});
     push @holidays, \%holiday;
@@ -144,15 +120,11 @@ foreach my $yearMonthDay (keys %$single_holidays) {
 
 $template->param(
     WEEK_DAYS_LOOP           => \@week_days,
-    branchloop               => \@branchloop,
     HOLIDAYS_LOOP            => \@holidays,
     EXCEPTION_HOLIDAYS_LOOP  => \@exception_holidays,
     DAY_MONTH_HOLIDAYS_LOOP  => \@day_month_holidays,
     calendardate             => $calendardate,
     keydate                  => $keydate,
-    branchcodes              => $branchcodes,
-    branch                   => $branch,
-    branchname               => $branchname,
     branch                   => $branch,
 );