$unit ||= 'days'; # default days ?
my $dt;
-
if ( $unit eq 'hours' ) {
# Fixed for legacy support. Should be set as a branch parameter
my $return_by_hour = 10;
# days
$dt = $self->addDays($startdate, $add_duration);
}
-
return $dt;
}
$self->is_holiday($base_date) ) {
if ( $hours_duration->is_negative() ) {
- $base_date = $self->prev_open_day($base_date);
+ $base_date = $self->prev_open_days($base_date, 1);
} else {
- $base_date = $self->next_open_day($base_date);
+ $base_date = $self->next_open_days($base_date, 1);
}
$base_date->set_hour($return_by_hour);
if ( $days_duration->is_negative() ) {
while ($days) {
- $base_date = $self->prev_open_day($base_date);
+ $base_date = $self->prev_open_days($base_date, 1);
--$days;
}
} else {
while ($days) {
- $base_date = $self->next_open_day($base_date);
+ $base_date = $self->next_open_days($base_date, 1);
--$days;
}
}
- } else { # Days or Datedue
+ } else { # Days, Datedue or Dayweek
# use straight days, then use calendar to push
- # the date to the next open day if Datedue
+ # the date to the next open day as appropriate
+ # if Datedue or Dayweek
$base_date->add_duration($days_duration);
- if ( $self->{days_mode} eq 'Datedue' ) {
- # Datedue, then use the calendar to push
+ if ( $self->{days_mode} eq 'Datedue' ||
+ $self->{days_mode} eq 'Dayweek') {
+ # Datedue or Dayweek, then use the calendar to push
# the date to the next open day if holiday
if ( $self->is_holiday($base_date) ) {
-
+ my $dow = $base_date->day_of_week;
+ my $days = $days_duration->in_units('days');
+ # Is it a period based on weeks
+ my $push_amt = $days % 7 == 0 ?
+ $self->get_push_amt($base_date) : 1;
if ( $days_duration->is_negative() ) {
- $base_date = $self->prev_open_day($base_date);
+ $base_date = $self->prev_open_days($base_date, $push_amt);
} else {
- $base_date = $self->next_open_day($base_date);
+ $base_date = $self->next_open_days($base_date, $push_amt);
}
}
}
return $base_date;
}
+sub get_push_amt {
+ my ( $self, $base_date) = @_;
+
+ my $dow = $base_date->day_of_week;
+ return (
+ # We're using Dayweek useDaysMode option
+ $self->{days_mode} eq 'Dayweek' &&
+ # It's not a permanently closed day
+ !$self->{weekly_closed_days}->[$dow] == 1
+ ) ? 7 : 1;
+}
+
sub is_holiday {
my ( $self, $dt ) = @_;
return 0;
}
-sub next_open_day {
- my ( $self, $dt ) = @_;
+sub next_open_days {
+ my ( $self, $dt, $to_add ) = @_;
my $base_date = $dt->clone();
- $base_date->add(days => 1);
-
+ $base_date->add(days => $to_add);
while ($self->is_holiday($base_date)) {
- $base_date->add(days => 1);
+ my $add_next = $self->get_push_amt($base_date);
+ $base_date->add(days => $add_next);
}
-
return $base_date;
}
-sub prev_open_day {
- my ( $self, $dt ) = @_;
+sub prev_open_days {
+ my ( $self, $dt, $to_sub ) = @_;
my $base_date = $dt->clone();
- $base_date->add(days => -1);
+ # It feels logical to be passed a positive number, though we're
+ # subtracting, so do the right thing
+ $to_sub = $to_sub > 0 ? 0 - $to_sub : $to_sub;
+
+ $base_date->add(days => $to_sub);
while ($self->is_holiday($base_date)) {
- $base_date->add(days => -1);
+ my $sub_next = $self->get_push_amt($base_date);
+ # Ensure we're subtracting when we need to be
+ $sub_next = $sub_next > 0 ? 0 - $sub_next : $sub_next;
+ $base_date->add(days => $sub_next);
}
return $base_date;
my $base_dt = $start_dt->clone();
while ($num_days--) {
- $base_dt = $self->next_open_day($base_dt);
+ $base_dt = $self->next_open_days($base_dt, 1);
}
return $base_dt;
}
# start and end should not be closed days
- my $days = $start_dt->delta_days($end_dt)->delta_days;
+ my $delta_days = $start_dt->delta_days($end_dt)->delta_days;
while( $start_dt->compare($end_dt) < 1 ) {
- $days-- if $self->is_holiday($start_dt);
+ $delta_days-- if $self->is_holiday($start_dt);
$start_dt->add( days => 1 );
}
- return DateTime::Duration->new( days => $days );
+ return DateTime::Duration->new( days => $delta_days );
}
sub hours_between {
my ($self, $start_date, $end_date) = @_;
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' );
+
# NB this is a kludge in that it assumes all days are 24 hours
# However for hourly loans the logic should be expanded to
# take into account open/close times then it would be a duration
# of library open hours
my $skipped_days = 0;
- for (my $dt = $start_dt->clone();
- $dt <= $end_dt;
- $dt->add(days => 1)
- ) {
- if ($self->is_holiday($dt)) {
- ++$skipped_days;
- }
+ while( $start_dt->compare($end_dt) < 1 ) {
+ $skipped_days++ if $self->is_holiday($start_dt);
+ $start_dt->add( days => 1 );
}
+
if ($skipped_days) {
$duration->subtract_duration(DateTime::Duration->new( hours => 24 * $skipped_days));
}
return $duration;
-
}
sub set_daysmode {
C<$return_by_hour> is an integer value representing the opening hour for the branch
+=head2 get_push_amt
+
+ my $amt = $calendar->get_push_amt($date)
+
+C<$date> is a DateTime object representing a closed return date
+
+Using the days_mode syspref value and the nature of the closed return
+date, return how many days we should jump forward to find another return date
=head2 addDays
Passed two dates returns a DateTime::Duration object measuring the length between them
ignoring closed days. Always returns a positive number irrespective of the
-relative order of the parameters
+relative order of the parameters.
+
+Note: This routine assumes neither the passed start_dt nor end_dt can be a closed day
+
+=head2 hours_between
+
+$duration = $calendar->hours_between($start_dt, $end_dt);
+
+Passed two dates returns a DateTime::Duration object measuring the length between them
+ignoring closed days. Always returns a positive number irrespective of the
+relative order of the parameters.
+
+Note: This routine assumes neither the passed start_dt nor end_dt can be a closed day
-=head2 next_open_day
+=head2 next_open_days
-$datetime = $calendar->next_open_day($duedate_dt)
+$datetime = $calendar->next_open_days($duedate_dt, $to_add)
-Passed a Datetime returns another Datetime representing the next open day. It is
-intended for use to calculate the due date when useDaysMode syspref is set to either
-'Datedue' or 'Calendar'.
+Passed a Datetime and number of days, returns another Datetime representing
+the next open day after adding the passed number of days. It is intended for
+use to calculate the due date when useDaysMode syspref is set to either
+'Datedue', 'Calendar' or 'Dayweek'.
-=head2 prev_open_day
+=head2 prev_open_days
-$datetime = $calendar->prev_open_day($duedate_dt)
+$datetime = $calendar->prev_open_days($duedate_dt, $to_sub)
-Passed a Datetime returns another Datetime representing the previous open day. It is
-intended for use to calculate the due date when useDaysMode syspref is set to either
-'Datedue' or 'Calendar'.
+Passed a Datetime and a number of days, returns another Datetime
+representing the previous open day after subtracting the number of passed
+days. It is intended for use to calculate the due date when useDaysMode
+syspref is set to either 'Datedue', 'Calendar' or 'Dayweek'.
=head2 set_daysmode
projects / srvgit / blobdiff