X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=tools%2Fholidays.pl;h=207439befc42cacc9b70fdc8ab9b2d9ba61f5f3f;hb=refs%2Fheads%2Fkoha_ffzg;hp=9f81511f83b10d2c9cfea2b0bf83d32edb6a5b8e;hpb=c90af5d48b512958dc465d7413eb714dce0dfae6;p=koha.git

diff --git a/tools/holidays.pl b/tools/holidays.pl
index 9f81511f83..207439befc 100755
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -2,72 +2,54 @@
 
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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, see <http://www.gnu.org/licenses>.
 
 #####Sets holiday periods for each branch. Datedues will be extended if branch is closed -TG
-use strict;
-use CGI;
+use Modern::Perl;
+
+use CGI qw ( -utf8 );
 
 use C4::Auth;
 use C4::Output;
 
-
 use C4::Calendar;
+use Koha::DateUtils;
 
 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)
-    = get_template_and_user({template_name => "tools/holidays.tmpl",
+    = get_template_and_user({template_name => "tools/holidays.tt",
                              type => "intranet",
                              query => $input,
                              authnotrequired => 0,
-                             flagsrequired => {tools => 1},
+                             flagsrequired => {tools => 'edit_calendar'},
                              debug => 1,
                            });
 
-# Set all the branches.
-my $branches = $dbh->prepare("select branchcode, branchname from branches");
-$branches->execute;
-# It creates a list of branches
-my %list;
-while (my ($branchcode, $branchname) = $branches->fetchrow) {
-    $list{$branchcode} = $branchname;
-}
-my @listValues = keys(%list);
-if (!defined($branch)) {
-    $branch =$listValues[4];
-}
-my $branchesList = CGI::scrolling_list(-name => 'branch',
-                                       -values => \@listValues,
-                                       -labels => \%list,
-                                       -size => 1,
-                                       -default => [$branch],
-                                       -multiple => 0,
-                                       -id => "branch",
-                                       -onChange => "changeBranch()");
-
-$branches->finish;
-
-if ( C4::Context->preference("IndependantBranches") ) { 
-    $branch = C4::Context->userenv->{'branch'};
-}
+# calendardate - date passed in url for human readability (syspref)
+# if the url has an invalid date default to 'now.'
+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'};
+
 # Get all the holidays
 
 my $calendar = C4::Calendar->new(branchcode => $branch);
@@ -85,8 +67,26 @@ 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) {
+    # Determine date format on month and day.
+    my $day_monthdate;
+    my $day_monthdate_sort;
+    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 "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 {
+      $day_monthdate = "$day_month_holidays->{$monthDay}{month}-$day_month_holidays->{$monthDay}{day}";
+      $day_monthdate_sort = $day_monthdate;
+    }
     my %day_month;
     %day_month = (KEY => $monthDay,
+                  DATE_SORT => $day_monthdate_sort,
+                  DATE => $day_monthdate,
                   TITLE => $day_month_holidays->{$monthDay}{title},
                   DESCRIPTION => $day_month_holidays->{$monthDay}{description});
     push @day_month_holidays, \%day_month;
@@ -95,8 +95,11 @@ foreach my $monthDay (keys %$day_month_holidays) {
 my $exception_holidays = $calendar->get_exception_holidays();
 my @exception_holidays;
 foreach my $yearMonthDay (keys %$exception_holidays) {
+    my $exceptiondate = eval { dt_from_string( $exception_holidays->{$yearMonthDay}{date} ) };
     my %exception_holiday;
     %exception_holiday = (KEY => $yearMonthDay,
+                          DATE_SORT => $exception_holidays->{$yearMonthDay}{date},
+                          DATE => output_pref( { dt => $exceptiondate, dateonly => 1 } ),
                           TITLE => $exception_holidays->{$yearMonthDay}{title},
                           DESCRIPTION => $exception_holidays->{$yearMonthDay}{description});
     push @exception_holidays, \%exception_holiday;
@@ -105,26 +108,25 @@ foreach my $yearMonthDay (keys %$exception_holidays) {
 my $single_holidays = $calendar->get_single_holidays();
 my @holidays;
 foreach my $yearMonthDay (keys %$single_holidays) {
+    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_dt, dateonly => 1 } ),
                 TITLE => $single_holidays->{$yearMonthDay}{title},
                 DESCRIPTION => $single_holidays->{$yearMonthDay}{description});
     push @holidays, \%holiday;
 }
 
-# Replace the template values with the real ones
-# If we have independent branches on we need to only let the user set holidays for their branch
-if ( C4::Context->preference("IndependantBranches") ) { 
-	$template->param(BRANCHES => C4::Context->userenv->{'branchname'});		
-}
-else {
-	$template->param(BRANCHES => $branchesList);
-}
-$template->param(WEEK_DAYS_LOOP => \@week_days);
-$template->param(HOLIDAYS_LOOP => \@holidays);
-$template->param(EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays);
-$template->param(DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays);
-$template->param(branch => $branch);
+$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,
+    branch                   => $branch,
+);
 
 # Shows the template with the real values replaced
 output_html_with_http_headers $input, $cookie, $template->output;