From 2b6cabf8228e44ca9abbbbc6f5760abc66c332a7 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 21 Feb 2014 17:16:43 +0100 Subject: [PATCH] Bug 11637: Irregular subscriptions don't know when serials are planned Test plan: Create a subscription with an irregular numbering pattern. Verify the prediction pattern. With this patch, it should show "unknown" instead of the date of the first issue publication date. This patch does not fix the issue on generating the next serial. http://bugs.koha-community.org/show_bug.cgi?id=11814 --- serials/showpredictionpattern.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/serials/showpredictionpattern.pl b/serials/showpredictionpattern.pl index 690705d..c654f55 100755 --- a/serials/showpredictionpattern.pl +++ b/serials/showpredictionpattern.pl @@ -55,6 +55,7 @@ my $subtype = $input->param('subtype'); my $sublength = $input->param('sublength'); my $custompattern = $input->param('custompattern'); +my $frequency = GetSubscriptionFrequency($frequencyid); my %pattern = ( numberingmethod => $input->param('numberingmethod') // '', @@ -118,7 +119,7 @@ my @predictions_loop; my ($calculated) = GetSeq(\%subscription, \%pattern); push @predictions_loop, { number => $calculated, - publicationdate => $date, + publicationdate => ($frequency->{unit} ? $date : undef), issuenumber => $issuenumber, dow => Day_of_Week(split /-/, $date), }; @@ -142,7 +143,7 @@ while( $i < 1000 ) { $date = GetNextDate(\%subscription, $date); } if(defined $date){ - $line{'publicationdate'} = $date; + $line{'publicationdate'} = $date if $frequency->{unit}; $line{'dow'} = Day_of_Week(split /-/, $date); } @@ -177,8 +178,6 @@ $template->param( predictions_loop => \@predictions_loop, ); -my $frequency = GetSubscriptionFrequency($frequencyid); - if ( $frequency->{unit} and not $custompattern ) { $template->param( ask_for_irregularities => 1 ); if ( $frequency->{unit} eq 'day' and $frequency->{unitsperissue} == 1 ) { -- 1.7.10.4