use strict;
use warnings;
-use vars qw($VERSION @EXPORT);
+use vars qw(@EXPORT);
-use Carp;
-use Date::Calc qw( Date_to_Days Today);
+use Carp qw( croak );
+use Date::Calc qw( Today );
use C4::Context;
-use Koha::Cache;
+use Koha::Caches;
use constant ISO_DATE_FORMAT => "%04d-%02d-%02d";
croak "Invalid weekday $weekday" unless $weekday =~ m/^[0-6]$/;
my $dbh = C4::Context->dbh();
- my $insertHoliday = $dbh->prepare("insert into repeatable_holidays (id,branchcode,weekday,day,month,title,description) values ( '',?,?,NULL,NULL,?,? )");
+ my $insertHoliday = $dbh->prepare("insert into repeatable_holidays (branchcode,weekday,day,month,title,description) values ( ?,?,NULL,NULL,?,? )");
$insertHoliday->execute( $self->{branchcode}, $weekday, $options{title}, $options{description});
$self->{'week_days_holidays'}->{$weekday}{title} = $options{title};
$self->{'week_days_holidays'}->{$weekday}{description} = $options{description};
my %options = @_;
my $dbh = C4::Context->dbh();
- my $insertHoliday = $dbh->prepare("insert into repeatable_holidays (id,branchcode,weekday,day,month,title,description) values ('', ?, NULL, ?, ?, ?,? )");
+ my $insertHoliday = $dbh->prepare("insert into repeatable_holidays (branchcode,weekday,day,month,title,description) values (?, NULL, ?, ?, ?,? )");
$insertHoliday->execute( $self->{branchcode}, $options{day},$options{month},$options{title}, $options{description});
$self->{'day_month_holidays'}->{"$options{month}/$options{day}"}{title} = $options{title};
$self->{'day_month_holidays'}->{"$options{month}/$options{day}"}{description} = $options{description};
my $dbh = C4::Context->dbh();
my $isexception = 0;
- my $insertHoliday = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', ?,?,?,?,?,?,?)");
+ my $insertHoliday = $dbh->prepare("insert into special_holidays (branchcode,day,month,year,isexception,title,description) values (?,?,?,?,?,?,?)");
$insertHoliday->execute( $self->{branchcode}, $options{day},$options{month},$options{year}, $isexception, $options{title}, $options{description});
$self->{'single_holidays'}->{"$options{year}/$options{month}/$options{day}"}{title} = $options{title};
$self->{'single_holidays'}->{"$options{year}/$options{month}/$options{day}"}{description} = $options{description};
# changed the 'single_holidays' table, lets force/reset its cache
- my $cache = Koha::Cache->get_instance();
- $cache->clear_from_cache( 'single_holidays') ;
+ my $cache = Koha::Caches->get_instance();
+ my $key = $self->{branchcode} . "_holidays";
+ $cache->clear_from_cache($key);
return $self;
my $dbh = C4::Context->dbh();
my $isexception = 1;
- my $insertException = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', ?,?,?,?,?,?,?)");
+ my $insertException = $dbh->prepare("insert into special_holidays (branchcode,day,month,year,isexception,title,description) values (?,?,?,?,?,?,?)");
$insertException->execute( $self->{branchcode}, $options{day},$options{month},$options{year}, $isexception, $options{title}, $options{description});
$self->{'exception_holidays'}->{"$options{year}/$options{month}/$options{day}"}{title} = $options{title};
$self->{'exception_holidays'}->{"$options{year}/$options{month}/$options{day}"}{description} = $options{description};
# changed the 'single_holidays' table, lets force/reset its cache
- my $cache = Koha::Cache->get_instance();
- $cache->clear_from_cache( 'single_holidays') ;
+ my $cache = Koha::Caches->get_instance();
+ my $key = $self->{branchcode} . "_holidays";
+ $cache->clear_from_cache($key);
return $self;
}
$self->{'single_holidays'}->{"$options{year}/$options{month}/$options{day}"}{description} = $options{description};
# changed the 'single_holidays' table, lets force/reset its cache
- my $cache = Koha::Cache->get_instance();
- $cache->clear_from_cache( 'single_holidays') ;
+ my $cache = Koha::Caches->get_instance();
+ my $key = $self->{branchcode} . "_holidays";
+ $cache->clear_from_cache($key);
return $self;
}
$self->{'exception_holidays'}->{"$options{year}/$options{month}/$options{day}"}{description} = $options{description};
# changed the 'single_holidays' table, lets force/reset its cache
- my $cache = Koha::Cache->get_instance();
- $cache->clear_from_cache( 'single_holidays') ;
+ my $cache = Koha::Caches->get_instance();
+ my $key = $self->{branchcode} . "_holidays";
+ $cache->clear_from_cache($key);
return $self;
}
}
# changed the 'single_holidays' table, lets force/reset its cache
- my $cache = Koha::Cache->get_instance();
- $cache->clear_from_cache( 'single_holidays') ;
+ my $cache = Koha::Caches->get_instance();
+ my $key = $self->{branchcode} . "_holidays";
+ $cache->clear_from_cache($key);
return $self;
}
$sth->execute($self->{branchcode}, $options{day}, $options{month}, $options{year});
# changed the 'single_holidays' table, lets force/reset its cache
- my $cache = Koha::Cache->get_instance();
- $cache->clear_from_cache( 'single_holidays') ;
+ my $cache = Koha::Caches->get_instance();
+ my $key = $self->{branchcode} . "_holidays";
+ $cache->clear_from_cache($key);
}
$sth->execute($self->{branchcode}, $options{day}, $options{month}, $options{year});
# changed the 'single_holidays' table, lets force/reset its cache
- my $cache = Koha::Cache->get_instance();
- $cache->clear_from_cache( 'single_holidays') ;
+ my $cache = Koha::Caches->get_instance();
+ my $key = $self->{branchcode} . "_holidays";
+ $cache->clear_from_cache($key);
}
=head2 isHoliday
sub isHoliday {
my ($self, $day, $month, $year) = @_;
# FIXME - date strings are stored in non-padded metric format. should change to iso.
- # FIXME - should change arguments to accept C4::Dates object
$month=$month+0;
$year=$year+0;
$day=$day+0;
my $today = sprintf ISO_DATE_FORMAT, $y,$m,$d;
my $wdh = $self->get_week_days_holidays;
- $target_calendar->insert_week_day_holiday( weekday => $_, %{ $wdh->{$_} } )
- foreach keys %$wdh;
- $target_calendar->insert_day_month_holiday(%$_)
- foreach values %{ $self->get_day_month_holidays };
- $target_calendar->insert_exception_holiday(%$_)
- foreach grep { $_->{date} gt $today } values %{ $self->get_exception_holidays };
- $target_calendar->insert_single_holiday(%$_)
- foreach grep { $_->{date} gt $today } values %{ $self->get_single_holidays };
-
- return 1;
-}
-
-=head2 addDate
-
- my ($day, $month, $year) = $calendar->addDate($date, $offset)
-
-C<$date> is a C4::Dates object representing the starting date of the interval.
-
-C<$offset> Is the number of days that this function has to count from $date.
-
-=cut
-
-sub addDate {
- my ($self, $startdate, $offset) = @_;
- my ($year,$month,$day) = split("-",$startdate->output('iso'));
- my $daystep = 1;
- if ($offset < 0) { # In case $offset is negative
- # $offset = $offset*(-1);
- $daystep = -1;
- }
- my $daysMode = C4::Context->preference('useDaysMode');
- if ($daysMode eq 'Datedue') {
- ($year, $month, $day) = &Date::Calc::Add_Delta_Days($year, $month, $day, $offset );
- while ($self->isHoliday($day, $month, $year)) {
- ($year, $month, $day) = &Date::Calc::Add_Delta_Days($year, $month, $day, $daystep);
- }
- } elsif($daysMode eq 'Calendar') {
- while ($offset != 0) {
- ($year, $month, $day) = &Date::Calc::Add_Delta_Days($year, $month, $day, $daystep);
- if (!($self->isHoliday($day, $month, $year))) {
- $offset = $offset - $daystep;
- }
+ my $target_wdh = $target_calendar->get_week_days_holidays;
+ foreach my $key (keys %$wdh) {
+ unless (grep { $_ eq $key } keys %$target_wdh) {
+ $target_calendar->insert_week_day_holiday( weekday => $key, %{ $wdh->{$key} } )
}
- } else { ## ($daysMode eq 'Days')
- ($year, $month, $day) = &Date::Calc::Add_Delta_Days($year, $month, $day, $offset );
}
- return(C4::Dates->new( sprintf(ISO_DATE_FORMAT,$year,$month,$day),'iso'));
-}
-=head2 daysBetween
-
- my $daysBetween = $calendar->daysBetween($startdate, $enddate)
-
-C<$startdate> and C<$enddate> are C4::Dates objects that define the interval.
-
-Returns the number of non-holiday days in the interval.
-useDaysMode syspref has no effect here.
-=cut
+ my $dmh = $self->get_day_month_holidays;
+ my $target_dmh = $target_calendar->get_day_month_holidays;
+ foreach my $values (values %$dmh) {
+ unless (grep { $_->{day} eq $values->{day} && $_->{month} eq $values->{month} } values %$target_dmh) {
+ $target_calendar->insert_day_month_holiday(%{ $values });
+ }
+ }
-sub daysBetween {
- my $self = shift or return;
- my $startdate = shift or return;
- my $enddate = shift or return;
- my ($yearFrom,$monthFrom,$dayFrom) = split("-",$startdate->output('iso'));
- my ($yearTo, $monthTo, $dayTo ) = split("-", $enddate->output('iso'));
- if (Date_to_Days($yearFrom,$monthFrom,$dayFrom) > Date_to_Days($yearTo,$monthTo,$dayTo)) {
- return 0;
- # we don't go backwards ( FIXME - handle this error better )
+ my $exception_holidays = $self->get_exception_holidays;
+ my $target_exceptions = $target_calendar->get_exception_holidays;
+ foreach my $values ( grep {$_->{date} gt $today} values %{ $exception_holidays }) {
+ unless ( grep { $_->{date} eq $values->{date} } values %$target_exceptions) {
+ $target_calendar->insert_exception_holiday(%{ $values });
+ }
}
- my $count = 0;
- while (1) {
- ($yearFrom != $yearTo or $monthFrom != $monthTo or $dayFrom != $dayTo) or last; # if they all match, it's the last day
- unless ($self->isHoliday($dayFrom, $monthFrom, $yearFrom)) {
- $count++;
+
+ my $single_holidays = $self->get_single_holidays;
+ my $target_singles = $target_calendar->get_single_holidays;
+ foreach my $values ( grep {$_->{date} gt $today} values %{ $single_holidays }) {
+ unless ( grep { $_->{date} eq $values->{date} } values %$target_singles){
+ $target_calendar->insert_single_holiday(%{ $values });
}
- ($yearFrom, $monthFrom, $dayFrom) = &Date::Calc::Add_Delta_Days($yearFrom, $monthFrom, $dayFrom, 1);
}
- return($count);
+
+ return 1;
}
1;
Koha Physics Library UNLP <matias_veleda@hotmail.com>
=cut
+