@@ -, +, @@
-Apply patch
-Add holiday for a library and copy it to all or some
-Edit previosly made holiday (edit, delete etc.) and
---
.../prog/en/modules/tools/holidays.tt | 6 +
tools/exceptionHolidays.pl | 147 ++++++++++--------
2 files changed, 88 insertions(+), 65 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -111,6 +111,12 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl
Edit this holiday
[?]
This will save changes to the holiday's title and description. If the information for a repeatable holiday is modified, it affects all of the dates on which the holiday is repeated.
+
+
+ Copy changes to all libraries .
+ [?]
+ If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.
+
--- a/tools/exceptionHolidays.pl
+++ a/tools/exceptionHolidays.pl
@@ -15,6 +15,7 @@ my $input = new CGI;
my $dbh = C4::Context->dbh();
my $branchcode = $input->param('showBranchName');
+my $originalbranchcode = $branchcode;
my $weekday = $input->param('showWeekday');
my $day = $input->param('showDay');
my $month = $input->param('showMonth');
@@ -24,8 +25,8 @@ my $description = $input->param('showDescription');
my $holidaytype = $input->param('showHolidayType');
my $datecancelrange_dt = eval { dt_from_string( scalar $input->param('datecancelrange') ) };
my $calendardate = sprintf("%04d-%02d-%02d", $year, $month, $day);
-
-my $calendar = C4::Calendar->new(branchcode => $branchcode);
+my $showoperation = $input->param('showOperation');
+my $allbranches = $input->param('allBranches');
$title || ($title = '');
if ($description) {
@@ -47,77 +48,93 @@ if ($datecancelrange_dt){
push @holiday_list, $dt->clone();
}
}
-if ($input->param('showOperation') eq 'exception') {
- $calendar->insert_exception_holiday(day => $day,
- month => $month,
- year => $year,
- title => $title,
- description => $description);
-} elsif ($input->param('showOperation') eq 'exceptionrange' ) {
- if (@holiday_list){
- foreach my $date (@holiday_list){
- $calendar->insert_exception_holiday(
- day => $date->{local_c}->{day},
- month => $date->{local_c}->{month},
- year => $date->{local_c}->{year},
- title => $title,
- description => $description
- );
+
+if($allbranches) {
+ my $libraries = Koha::Libraries->search;
+ while ( my $library = $libraries->next ) {
+ edit_holiday($showoperation, $library->branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype);
+ }
+} else {
+ edit_holiday($showoperation, $branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype);
+}
+
+print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=$originalbranchcode&calendardate=$calendardate");
+
+sub edit_holiday {
+ ($showoperation, $branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype) = @_;
+ my $calendar = C4::Calendar->new(branchcode => $branchcode);
+
+ if ($showoperation eq 'exception') {
+ $calendar->insert_exception_holiday(day => $day,
+ month => $month,
+ year => $year,
+ title => $title,
+ description => $description);
+ } elsif ($showoperation eq 'exceptionrange' ) {
+ if (@holiday_list){
+ foreach my $date (@holiday_list){
+ $calendar->insert_exception_holiday(
+ day => $date->{local_c}->{day},
+ month => $date->{local_c}->{month},
+ year => $date->{local_c}->{year},
+ title => $title,
+ description => $description
+ );
+ }
}
- }
-} elsif ($input->param('showOperation') eq 'edit') {
- if($holidaytype eq 'weekday') {
- $calendar->ModWeekdayholiday(weekday => $weekday,
- title => $title,
- description => $description);
- } elsif ($holidaytype eq 'daymonth') {
- $calendar->ModDaymonthholiday(day => $day,
+ } elsif ($showoperation eq 'edit') {
+ if($holidaytype eq 'weekday') {
+ $calendar->ModWeekdayholiday(weekday => $weekday,
+ title => $title,
+ description => $description);
+ } elsif ($holidaytype eq 'daymonth') {
+ $calendar->ModDaymonthholiday(day => $day,
+ month => $month,
+ title => $title,
+ description => $description);
+ } elsif ($holidaytype eq 'ymd') {
+ $calendar->ModSingleholiday(day => $day,
month => $month,
+ year => $year,
title => $title,
description => $description);
- } elsif ($holidaytype eq 'ymd') {
- $calendar->ModSingleholiday(day => $day,
- month => $month,
- year => $year,
- title => $title,
- description => $description);
- } elsif ($holidaytype eq 'exception') {
- $calendar->ModExceptionholiday(day => $day,
- month => $month,
- year => $year,
- title => $title,
- description => $description);
- }
-} elsif ($input->param('showOperation') eq 'delete') {
- $calendar->delete_holiday(weekday => $weekday,
- day => $day,
- month => $month,
- year => $year);
-}elsif ($input->param('showOperation') eq 'deleterange') {
- if (@holiday_list){
- foreach my $date (@holiday_list){
- $calendar->delete_holiday_range(weekday => $weekday,
+ } elsif ($holidaytype eq 'exception') {
+ $calendar->ModExceptionholiday(day => $day,
+ month => $month,
+ year => $year,
+ title => $title,
+ description => $description);
+ }
+ } elsif ($showoperation eq 'delete') {
+ $calendar->delete_holiday(weekday => $weekday,
+ day => $day,
+ month => $month,
+ year => $year);
+ }elsif ($showoperation eq 'deleterange') {
+ if (@holiday_list){
+ foreach my $date (@holiday_list){
+ $calendar->delete_holiday_range(weekday => $weekday,
+ day => $date->{local_c}->{day},
+ month => $date->{local_c}->{month},
+ year => $date->{local_c}->{year});
+ }
+ }
+ }elsif ($showoperation eq 'deleterangerepeat') {
+ if (@holiday_list){
+ foreach my $date (@holiday_list){
+ $calendar->delete_holiday_range_repeatable(weekday => $weekday,
+ day => $date->{local_c}->{day},
+ month => $date->{local_c}->{month});
+ }
+ }
+ }elsif ($showoperation eq 'deleterangerepeatexcept') {
+ if (@holiday_list){
+ foreach my $date (@holiday_list){
+ $calendar->delete_exception_holiday_range(weekday => $weekday,
day => $date->{local_c}->{day},
month => $date->{local_c}->{month},
year => $date->{local_c}->{year});
}
- }
-}elsif ($input->param('showOperation') eq 'deleterangerepeat') {
- if (@holiday_list){
- foreach my $date (@holiday_list){
- $calendar->delete_holiday_range_repeatable(weekday => $weekday,
- day => $date->{local_c}->{day},
- month => $date->{local_c}->{month});
- }
- }
-}elsif ($input->param('showOperation') eq 'deleterangerepeatexcept') {
- if (@holiday_list){
- foreach my $date (@holiday_list){
- $calendar->delete_exception_holiday_range(weekday => $weekday,
- day => $date->{local_c}->{day},
- month => $date->{local_c}->{month},
- year => $date->{local_c}->{year});
}
}
}
-print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=$branchcode&calendardate=$calendardate");
--