Bug 32336: (QA follow-up) Use $metadata->schema

[srvgit] / serials / showpredictionpattern.pl

diff --git a/serials/showpredictionpattern.pl b/serials/showpredictionpattern.pl
index c654f55..e553ee1 100755 (executable)
--- a/serials/showpredictionpattern.pl
+++ b/serials/showpredictionpattern.pl
@@ -30,19 +30,19 @@ publication date, based on frequency and first publication date.
 
 use Modern::Perl;
 
-use CGI;
-use Date::Calc qw(Today Day_of_Year Week_of_Year Day_of_Week Days_in_Year Delta_Days Add_Delta_Days Add_Delta_YM);
-use C4::Auth;
-use C4::Output;
-use C4::Serials;
+use CGI qw ( -utf8 );
+use Date::Calc qw( Add_Delta_Days Add_Delta_YM Day_of_Week Delta_Days );
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Serials qw( GetSubscription GetFictiveIssueNumber GetSeq GetSubscriptionIrregularities GetNextDate GetNextSeq );
 use C4::Serials::Frequency;
+use Koha::DateUtils qw( dt_from_string );
 
-my $input = new CGI;
+my $input = CGI->new;
 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     template_name   => 'serials/showpredictionpattern.tt',
     query           => $input,
     type            => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { 'serials' => '*' },
 } );
 
@@ -50,67 +50,69 @@ my $subscriptionid = $input->param('subscriptionid');
 my $frequencyid = $input->param('frequency');
 my $firstacquidate = $input->param('firstacquidate');
 my $nextacquidate = $input->param('nextacquidate');
-my $enddate = $input->param('enddate');
+my $enddate = $input->param('to');
 my $subtype = $input->param('subtype');
 my $sublength = $input->param('sublength');
 my $custompattern = $input->param('custompattern');
 
-my $frequency = GetSubscriptionFrequency($frequencyid);
+
+my $frequency;
+if ( $frequencyid eq 'mana' ) {
+    $frequency = {
+        'id'            => undef,
+        'displayorder'  => undef,
+        'description'   => scalar $input->param('sfdescription') // '',
+        'unitsperissue' => scalar $input->param('unitsperissue') // '',
+        'issuesperunit' => scalar $input->param('issuesperunit') // '',
+        'unit'          => scalar $input->param('unit') // ''
+    };
+}
+else {
+    $frequency = GetSubscriptionFrequency($frequencyid);
+}
 
 my %pattern = (
-    numberingmethod => $input->param('numberingmethod') // '',
-    numbering1      => $input->param('numbering1') // '',
-    numbering2      => $input->param('numbering2') // '',
-    numbering3      => $input->param('numbering3') // '',
-    add1            => $input->param('add1') // '',
-    add2            => $input->param('add2') // '',
-    add3            => $input->param('add3') // '',
-    whenmorethan1   => $input->param('whenmorethan1') // '',
-    whenmorethan2   => $input->param('whenmorethan2') // '',
-    whenmorethan3   => $input->param('whenmorethan3') // '',
-    setto1          => $input->param('setto1') // '',
-    setto2          => $input->param('setto2') // '',
-    setto3          => $input->param('setto3') // '',
-    every1          => $input->param('every1') // '',
-    every2          => $input->param('every2') // '',
-    every3          => $input->param('every3') // '',
+    numberingmethod => scalar $input->param('numberingmethod') // '',
+    numbering1      => scalar $input->param('numbering1') // '',
+    numbering2      => scalar $input->param('numbering2') // '',
+    numbering3      => scalar $input->param('numbering3') // '',
+    add1            => scalar $input->param('add1') // '',
+    add2            => scalar $input->param('add2') // '',
+    add3            => scalar $input->param('add3') // '',
+    whenmorethan1   => scalar $input->param('whenmorethan1') // '',
+    whenmorethan2   => scalar $input->param('whenmorethan2') // '',
+    whenmorethan3   => scalar $input->param('whenmorethan3') // '',
+    setto1          => scalar $input->param('setto1') // '',
+    setto2          => scalar $input->param('setto2') // '',
+    setto3          => scalar $input->param('setto3') // '',
+    every1          => scalar $input->param('every1') // '',
+    every2          => scalar $input->param('every2') // '',
+    every3          => scalar $input->param('every3') // '',
 );
 
-if(!defined $firstacquidate || $firstacquidate eq ''){
-    my ($year, $month, $day) = Today();
-    $firstacquidate = sprintf "%04d-%02d-%02d", $year, $month, $day;
-} else {
-    $firstacquidate = C4::Dates->new($firstacquidate)->output('iso');
-}
+$firstacquidate = $firstacquidate ? dt_from_string($firstacquidate)->ymd : dt_from_string->ymd;
 
-if($enddate){
-    $enddate = C4::Dates->new($enddate)->output('iso');
-}
+$enddate = dt_from_string($enddate)->ymd;
 
-if($nextacquidate) {
-    $nextacquidate = C4::Dates->new($nextacquidate)->output('iso');
-} else {
-    $nextacquidate = $firstacquidate;
-}
+$nextacquidate = $nextacquidate ? dt_from_string($nextacquidate)->ymd : $firstacquidate;
 my $date = $nextacquidate;
 
 my %subscription = (
-    locale      => $input->param('locale') // '',
-    lastvalue1      => $input->param('lastvalue1') // '',
-    lastvalue2      => $input->param('lastvalue2') // '',
-    lastvalue3      => $input->param('lastvalue3') // '',
-    innerloop1      => $input->param('innerloop1') // '',
-    innerloop2      => $input->param('innerloop2') // '',
-    innerloop3      => $input->param('innerloop3') // '',
+    locale      => scalar $input->param('locale') // '',
+    lastvalue1      => scalar $input->param('lastvalue1') // '',
+    lastvalue2      => scalar $input->param('lastvalue2') // '',
+    lastvalue3      => scalar $input->param('lastvalue3') // '',
+    innerloop1      => scalar $input->param('innerloop1') // '',
+    innerloop2      => scalar $input->param('innerloop2') // '',
+    innerloop3      => scalar $input->param('innerloop3') // '',
     irregularity    => '',
-    periodicity     => $frequencyid,
     countissuesperunit  => 1,
     firstacquidate  => $firstacquidate,
 );
 
 my $issuenumber;
 if(defined $subscriptionid) {
-    ($issuenumber) = C4::Serials::GetFictiveIssueNumber(\%subscription, $date);
+    ($issuenumber) = C4::Serials::GetFictiveIssueNumber(\%subscription, $date, $frequency);
 } else {
     $issuenumber = 1;
 }
@@ -119,7 +121,7 @@ my @predictions_loop;
 my ($calculated) = GetSeq(\%subscription, \%pattern);
 push @predictions_loop, {
     number => $calculated,
-    publicationdate => ($frequency->{unit} ? $date : undef),
+    publicationdate => $date,
     issuenumber => $issuenumber,
     dow => Day_of_Week(split /-/, $date),
 };
@@ -140,10 +142,10 @@ while( $i < 1000 ) {
     my %line;
 
     if(defined $date){
-        $date = GetNextDate(\%subscription, $date);
+        $date = GetNextDate(\%subscription, $date, $frequency);
     }
     if(defined $date){
-        $line{'publicationdate'} = $date if $frequency->{unit};
+        $line{'publicationdate'} = $date;
         $line{'dow'} = Day_of_Week(split /-/, $date);
     }
 
@@ -161,7 +163,7 @@ while( $i < 1000 ) {
         last;
     }
 
-    ($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern);
+    ($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern, $frequency);
     $issuenumber++;
     $line{'number'} = $calculated;
     $line{'issuenumber'} = $issuenumber;