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} % 2 !=1 &&
- C4::Context->userenv->{branch}?1:0);
+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 $branches = GetBranches($onlymine);
my @branchloop;
-for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
- my $selected = 1 if $thisbranch eq $branch;
- my %row =(value => $thisbranch,
- selected => $selected,
- branchname => $branches->{$thisbranch}->{'branchname'},
- );
- push @branchloop, \%row;
+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);
+my $branchcodes = join '|', keys %{$branches};
# Get all the 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 "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});
my $exceptiondate = C4::Dates->new($exception_holidays->{$yearMonthDay}{date}, "iso");
my %exception_holiday;
%exception_holiday = (KEY => $yearMonthDay,
+ DATE_SORT => $exception_holidays->{$yearMonthDay}{date},
DATE => $exceptiondate->output("syspref"),
TITLE => $exception_holidays->{$yearMonthDay}{title},
DESCRIPTION => $exception_holidays->{$yearMonthDay}{description});
my $holidaydate = C4::Dates->new($single_holidays->{$yearMonthDay}{date}, "iso");
my %holiday;
%holiday = (KEY => $yearMonthDay,
+ DATE_SORT => $single_holidays->{$yearMonthDay}{date},
DATE => $holidaydate->output("syspref"),
TITLE => $single_holidays->{$yearMonthDay}{title},
DESCRIPTION => $single_holidays->{$yearMonthDay}{description});
push @holidays, \%holiday;
}
-$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
- );
+$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,
+);
# Shows the template with the real values replaced
output_html_with_http_headers $input, $cookie, $template->output;