use DateTime::Set;
use DateTime::Duration;
use C4::Context;
+use Koha::Caches;
use Carp;
sub new {
return;
}
-
-# FIXME: use of package-level variables for caching the holiday
-# lists breaks persistance engines. As of 2013-12-10, the RM
-# is allowing this with the expectation that prior to release of
-# 3.16, bug 8089 will be fixed and we can switch the caching over
-# to Koha::Cache.
-our ( $exception_holidays, $single_holidays );
sub exception_holidays {
my ( $self ) = @_;
+
+ my $cache = Koha::Caches->get_instance();
+ my $cached = $cache->get_from_cache('exception_holidays');
+ return $cached if $cached;
+
my $dbh = C4::Context->dbh;
my $branch = $self->{branchcode};
- if ( $exception_holidays ) {
- $self->{exception_holidays} = $exception_holidays;
- return $exception_holidays;
- }
my $exception_holidays_sth = $dbh->prepare(
'SELECT day, month, year FROM special_holidays WHERE branchcode = ? AND isexception = 1'
);
day => $day,
month => $month,
year => $year,
- time_zone => C4::Context->tz()
+ time_zone => "floating",
)->truncate( to => 'day' );
}
$self->{exception_holidays} =
DateTime::Set->from_datetimes( dates => $dates );
- $exception_holidays = $self->{exception_holidays};
- return $exception_holidays;
+ $cache->set_in_cache( 'exception_holidays', $self->{exception_holidays} );
+ return $self->{exception_holidays};
}
sub single_holidays {
- my ( $self ) = @_;
- my $dbh = C4::Context->dbh;
+ my ( $self, $date ) = @_;
my $branchcode = $self->{branchcode};
- if ( $single_holidays->{$branchcode} ) {
- $self->{single_holidays}{$branchcode} = $single_holidays->{$branchcode};
- return $single_holidays->{$branchcode};
- }
- my $single_holidays_sth = $dbh->prepare(
+ my $cache = Koha::Caches->get_instance();
+ my $single_holidays = $cache->get_from_cache('single_holidays');
+
+ # $single_holidays looks like:
+ # {
+ # CPL => [
+ # [0] 20131122,
+ # ...
+ # ],
+ # ...
+ # }
+
+ unless ($single_holidays) {
+ my $dbh = C4::Context->dbh;
+ $single_holidays = {};
+
+ # push holidays for each branch
+ my $branches_sth =
+ $dbh->prepare('SELECT distinct(branchcode) FROM special_holidays');
+ $branches_sth->execute();
+ while ( my $br = $branches_sth->fetchrow ) {
+ my $single_holidays_sth = $dbh->prepare(
'SELECT day, month, year FROM special_holidays WHERE branchcode = ? AND isexception = 0'
- );
- $single_holidays_sth->execute( $branchcode );
- my $dates = [];
- while ( my ( $day, $month, $year ) = $single_holidays_sth->fetchrow ) {
- push @{$dates},
- DateTime->new(
- day => $day,
- month => $month,
- year => $year,
- time_zone => C4::Context->tz()
- )->truncate( to => 'day' );
+ );
+ $single_holidays_sth->execute($br);
+
+ my @ymd_arr;
+ while ( my ( $day, $month, $year ) =
+ $single_holidays_sth->fetchrow )
+ {
+ my $dt = DateTime->new(
+ day => $day,
+ month => $month,
+ year => $year,
+ time_zone => 'floating',
+ )->truncate( to => 'day' );
+ push @ymd_arr, $dt->ymd('');
+ }
+ $single_holidays->{$br} = \@ymd_arr;
+ } # br
+ $cache->set_in_cache( 'single_holidays', $single_holidays,
+ { expiry => 76800 } ) #24 hrs ;
+ }
+ my $holidays = ( $single_holidays->{$branchcode} );
+ for my $hols (@$holidays ) {
+ return 1 if ( $date == $hols ) #match ymds;
}
- $self->{single_holidays}{$branchcode} = DateTime::Set->from_datetimes( dates => $dates );
- $single_holidays->{$branchcode} = $self->{single_holidays}{$branchcode};
- return $single_holidays->{$branchcode};
+ return 0;
}
+
sub addDate {
my ( $self, $startdate, $add_duration, $unit ) = @_;
# Datedue, then use the calendar to push
# the date to the next open day if holiday
if ( $self->is_holiday($base_date) ) {
+
if ( $days_duration->is_negative() ) {
$base_date = $self->prev_open_day($base_date);
} else {
sub is_holiday {
my ( $self, $dt ) = @_;
+
my $localdt = $dt->clone();
my $day = $localdt->day;
my $month = $localdt->month;
+ #Change timezone to "floating" before doing any calculations or comparisons
+ $localdt->set_time_zone("floating");
$localdt->truncate( to => 'day' );
+
if ( $self->exception_holidays->contains($localdt) ) {
# exceptions are not holidays
return 0;
return 1;
}
- if ( $self->single_holidays->contains($localdt) ) {
+ my $ymd = $localdt->ymd('') ;
+ if ($self->single_holidays( $ymd ) == 1 ) {
return 1;
}
return $base_date;
}
+sub days_forward {
+ my $self = shift;
+ my $start_dt = shift;
+ my $num_days = shift;
+
+ return $start_dt unless $num_days > 0;
+
+ my $base_dt = $start_dt->clone();
+
+ while ($num_days--) {
+ $base_dt = $self->next_open_day($base_dt);
+ }
+
+ return $base_dt;
+}
+
sub days_between {
my $self = shift;
my $start_dt = shift;
my $end_dt = shift;
- if ( $start_dt->compare($end_dt) > 0 ) {
- # swap dates
- my $int_dt = $end_dt;
- $end_dt = $start_dt;
- $start_dt = $int_dt;
+ # Change time zone for date math and swap if needed
+ $start_dt = $start_dt->clone->set_time_zone('floating');
+ $end_dt = $end_dt->clone->set_time_zone('floating');
+ if( $start_dt->compare($end_dt) > 0 ) {
+ ( $start_dt, $end_dt ) = ( $end_dt, $start_dt );
}
-
# start and end should not be closed days
my $days = $start_dt->delta_days($end_dt)->delta_days;
- for (my $dt = $start_dt->clone();
- $dt <= $end_dt;
- $dt->add(days => 1)
- ) {
- if ($self->is_holiday($dt)) {
- $days--;
- }
+ while( $start_dt->compare($end_dt) < 1 ) {
+ $days-- if $self->is_holiday($start_dt);
+ $start_dt->add( days => 1 );
}
return DateTime::Duration->new( days => $days );
-
}
sub hours_between {
my ($self, $start_date, $end_date) = @_;
- my $start_dt = $start_date->clone();
- my $end_dt = $end_date->clone();
+ my $start_dt = $start_date->clone()->set_time_zone('floating');
+ my $end_dt = $end_date->clone()->set_time_zone('floating');
my $duration = $end_dt->delta_ms($start_dt);
$start_dt->truncate( to => 'day' );
$end_dt->truncate( to => 'day' );
return;
}
-sub add_holiday {
- my $self = shift;
- my $new_dt = shift;
- my @dt = $self->single_holidays->as_list;
- push @dt, $new_dt;
- my $branchcode = $self->{branchcode};
- $self->{single_holidays}{$branchcode} =
- DateTime::Set->from_datetimes( dates => \@dt );
- $single_holidays->{$branchcode} = $self->{single_holidays}{$branchcode};
-
- return;
-}
-
1;
__END__
Koha::Calendar - Object containing a branches calendar
-=head1 VERSION
-
-This documentation refers to Koha::Calendar version 0.0.1
-
=head1 SYNOPSIS
use Koha::Calendar
parameter will be removed when issuingrules properly cope with that
+=head2 single_holidays
+
+my $rc = $self->single_holidays( $ymd );
+
+Passed a $date in Ymd (yyyymmdd) format - returns 1 if date is a single_holiday, or 0 if not.
+
+
=head2 is_holiday
$yesno = $calendar->is_holiday($dt);
projects / koha-ffzg.git / blobdiff