Bug 3806 - Holidays improperly sorted by date

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
index 00ed093..7e0ef90 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
@@ -115,15 +115,6 @@
                $("#holidayexceptions").tablesorter({
                  sortList: [[0,0]], widgets: ['zebra']
                });
-               $("#holidayweeklyrepeatable").tablesorter({
-                 sortList: [[0,0]], widgets: ['zebra']
-               });
-               $("#holidaysyearlyrepeatable").tablesorter({
-                 sortList: [[0,0]], widgets: ['zebra']
-               });
-               $("#holidaysunique").tablesorter({
-                 sortList: [[0,0]], widgets: ['zebra']
-               });
        });
 //]]>
 </script>

diff --git a/tools/holidays.pl b/tools/holidays.pl
index 5d7ab2e..abca5e7 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -93,7 +93,7 @@ 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") {
@@ -113,7 +113,7 @@ 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,
@@ -125,7 +125,7 @@ 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,