View | Details | Raw Unified | Return to bug 12801
Collapse All | Expand All

(-)a/Koha/Calendar.pm (-11 / +11 lines)
Lines 91-105 sub exception_holidays { Link Here
91
sub single_holidays {
91
sub single_holidays {
92
    my ( $self ) = @_;
92
    my ( $self ) = @_;
93
    my $dbh = C4::Context->dbh;
93
    my $dbh = C4::Context->dbh;
94
    my $branch = $self->{branchcode};
94
    my $branchcode = $self->{branchcode};
95
    if ( $single_holidays ) {
95
    if ( $single_holidays->{$branchcode} ) {
96
        $self->{single_holidays} = $single_holidays;
96
        $self->{single_holidays}{$branchcode} = $single_holidays->{$branchcode};
97
        return $single_holidays;
97
        return $single_holidays->{$branchcode};
98
    }
98
    }
99
    my $single_holidays_sth = $dbh->prepare(
99
    my $single_holidays_sth = $dbh->prepare(
100
'SELECT day, month, year FROM special_holidays WHERE branchcode = ? AND isexception = 0'
100
'SELECT day, month, year FROM special_holidays WHERE branchcode = ? AND isexception = 0'
101
    );
101
    );
102
    $single_holidays_sth->execute( $branch );
102
    $single_holidays_sth->execute( $branchcode );
103
    my $dates = [];
103
    my $dates = [];
104
    while ( my ( $day, $month, $year ) = $single_holidays_sth->fetchrow ) {
104
    while ( my ( $day, $month, $year ) = $single_holidays_sth->fetchrow ) {
105
        push @{$dates},
105
        push @{$dates},
Lines 110-118 sub single_holidays { Link Here
110
            time_zone => C4::Context->tz()
110
            time_zone => C4::Context->tz()
111
          )->truncate( to => 'day' );
111
          )->truncate( to => 'day' );
112
    }
112
    }
113
    $self->{single_holidays} = DateTime::Set->from_datetimes( dates => $dates );
113
    $self->{single_holidays}{$branchcode} = DateTime::Set->from_datetimes( dates => $dates );
114
    $single_holidays = $self->{single_holidays};
114
    $single_holidays->{$branchcode} = $self->{single_holidays}{$branchcode};
115
    return $single_holidays;
115
    return $single_holidays->{$branchcode};
116
}
116
}
117
sub addDate {
117
sub addDate {
118
    my ( $self, $startdate, $add_duration, $unit ) = @_;
118
    my ( $self, $startdate, $add_duration, $unit ) = @_;
Lines 344-352 sub add_holiday { Link Here
344
    my $new_dt = shift;
344
    my $new_dt = shift;
345
    my @dt = $self->single_holidays->as_list;
345
    my @dt = $self->single_holidays->as_list;
346
    push @dt, $new_dt;
346
    push @dt, $new_dt;
347
    $self->{single_holidays} =
347
    my $branchcode = $self->{branchcode};
348
    $self->{single_holidays}{$branchcode} =
348
      DateTime::Set->from_datetimes( dates => \@dt );
349
      DateTime::Set->from_datetimes( dates => \@dt );
349
    $single_holidays = $self->{single_holidays};
350
    $single_holidays->{$branchcode} = $self->{single_holidays}{$branchcode};
350
351
351
    return;
352
    return;
352
}
353
}
353
- 

Return to bug 12801