From ee6400a7eb34a1f76a44c6c99558322855b71f0a Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Tue, 19 Dec 2017 15:40:06 +0000 Subject: [PATCH] Bug 17656 - Update irregularities on subscription renewals Test plan: - Apply this patch, - Launch installer/data/mysql/updatedatabase.pl - Launch misc/devel/update_dbix_class_files.pl - Create a daily subscription. i.e: - From: 2017-10-09, To: 2017-10-15, - Frequency: 1/day, - 7 issues, - test prediction pattern - check Wednesday and Thursday as irregularity, - save - Renew subscription from 2017-10-16 - Check that you have the prediction pattern table on renwal page - Submit renewal - Check that irregularity and permanent_irregularity column have been updated. - Do the same for a monthly and weekly subscription --- C4/Serials.pm | 35 +++++++++++ Koha/Subscription.pm | 22 +++++++ .../prog/en/modules/serials/subscription-add.tt | 1 + .../prog/en/modules/serials/subscription-renew.tt | 39 ++++++++++++ .../intranet-tmpl/prog/js/showpredictionpattern.js | 3 +- .../intranet-tmpl/prog/js/subscription-add.js | 69 --------------------- koha-tmpl/intranet-tmpl/prog/js/subscription.js | 71 ++++++++++++++++++++++ serials/subscription-add.pl | 36 ++--------- serials/subscription-renew.pl | 46 +++++++++++++- t/db_dependent/Koha/Subscription.t | 41 ++++++++++++- 10 files changed, 258 insertions(+), 105 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/js/subscription.js diff --git a/C4/Serials.pm b/C4/Serials.pm index 8abeaf0..e6aec3c 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -87,6 +87,7 @@ BEGIN { HasItems &GetSubscriptionsFromBorrower &subscriptionCurrentlyOnOrder + &GuessEnddate ); } @@ -2715,6 +2716,40 @@ sub findSerialsByStatus { return @$serials; } +=head2 GessEnddate + +my $enddate = GessEnddate($startdate_iso $frequencyid, $numberlength, $weeklength, $monthlength); + +=cut + +sub GuessEnddate { + my ($startdate_iso, $frequencyid, $numberlength, $weeklength, $monthlength) = @_; + my ($year, $month, $day); + my $enddate; + if($numberlength != 0) { + my $frequency = GetSubscriptionFrequency($frequencyid); + if($frequency->{'unit'} eq 'day') { + ($year, $month, $day) = Add_Delta_Days(split(/-/, $startdate_iso), $numberlength * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}); + } elsif($frequency->{'unit'} eq 'week') { + ($year, $month, $day) = Add_Delta_Days(split(/-/, $startdate_iso), $numberlength * 7 * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}); + } elsif($frequency->{'unit'} eq 'month') { + ($year, $month, $day) = Add_Delta_YM(split(/-/, $startdate_iso), 0, $numberlength * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}); + } elsif($frequency->{'unit'} eq 'year') { + ($year, $month, $day) = Add_Delta_YM(split(/-/, $startdate_iso), $numberlength * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}, 0); + } + } elsif($weeklength != 0) { + ($year, $month, $day) = Add_Delta_Days(split(/-/, $startdate_iso), $weeklength * 7); + } elsif($monthlength != 0) { + ($year, $month, $day) = Add_Delta_YM(split(/-/, $startdate_iso), 0, $monthlength); + } + if(defined $year) { + $enddate = sprintf("%04d-%02d-%02d", $year, $month, $day); + } else { + undef $enddate; + } + return $enddate; +} + 1; __END__ diff --git a/Koha/Subscription.pm b/Koha/Subscription.pm index bb7437e..40b2ae0 100644 --- a/Koha/Subscription.pm +++ b/Koha/Subscription.pm @@ -130,6 +130,28 @@ sub permanent_irregularities { return split(';', $self->permanent_irregularity); } +=head3 subtype + +Return the length type (issues, weeks, months) + +=cut + +sub subtype { + my ($self) = @_; + + if ($self->numberlength) { + return 'issues'; + } + + if ($self->weeklength) { + return 'weeks'; + } + + if ($self->monthlength) { + return 'months'; + } +} + =head3 type =cut diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index 8f95b49..505560e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -509,6 +509,7 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ var MSG_PUB_DATE_UNDEFINED = _("First publication date is not defined"); var MSG_NEXT_ISSUE_UNDEFINED = _("Next issue publication date is not defined"); + [% Asset.js("js/subscription.js") %] [% Asset.js("js/subscription-add.js") %] [% Asset.js("js/showpredictionpattern.js") %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt index 4a5fd2c..7816cc7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt @@ -1,3 +1,4 @@ +[% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% IF subscription %] @@ -26,6 +27,36 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Subscription renewal for [% subscription.bibliotitle %]
  1. @@ -40,14 +71,20 @@
    • +
  • +
    [% END %] [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] + [% Asset.js("js/subscription.js") %] + [% Asset.js("js/showpredictionpattern.js") %] [% END %] [% INCLUDE 'intranet-bottom.inc' popup_window=1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js b/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js index ffc7013..1efab8a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js +++ b/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js @@ -2,10 +2,12 @@ function Check_boxes(dow) { if($(":checkbox[data-dow='"+dow+"']:first").is(':checked')) { $("#predictionst :checkbox[data-dow='"+dow+"']").each(function(){ $(this).prop('checked', true); + return false; }); } else { $("#predictionst :checkbox[data-dow='"+dow+"']").each(function(){ $(this).prop('checked', false); + return false; }); } } @@ -21,7 +23,6 @@ function Check_permanent_irregularities() { // So check them according to permanent irregularity if (nothing_checked) { $(".skip").each(function() { - console.log('iciiiiiiiiiiiiii'); if ($(this).is(':checked')) { Check_boxes( $(this).data("dow")); } diff --git a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js b/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js index c995751..bf45472 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js +++ b/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js @@ -225,75 +225,6 @@ function restoreAdvancedPattern() { advancedpatternlocked = 1; } -function testPredictionPattern() { - var frequencyid = $("#frequency").val(); - var acquidate; - var error = 0; - var error_msg = ""; - if(frequencyid == undefined || frequencyid == ""){ - error_msg += _("- Frequency is not defined") + "\n"; - error ++; - } - acquidate = $("#acqui_date").val(); - if(acquidate == undefined || acquidate == ""){ - error_msg += _("- First publication date is not defined") + "\n"; - error ++; - } - if( more_than_one_serial !== "" ){ - var nextacquidate = $("#nextacquidate").val(); - if(nextacquidate == undefined || nextacquidate == ""){ - error_msg += _("- Next issue publication date is not defined") + "\n"; - error ++; - } - } - - if(error){ - alert(_("Cannot test prediction pattern for the following reason(s): %s").format(error_msg)); - return false; - } - - var custompattern = 0; - if(advancedpatternlocked == 0) { - custompattern = 1; - } - - var ajaxData = { - 'custompattern': custompattern, - 'firstacquidate': acquidate - }; - - if( subscriptionid !== "" ){ - ajaxData.subscriptionid = subscriptionid; - } - if( more_than_one_serial !== "" ){ - ajaxData.nextacquidate = nextacquidate; - } - - - var ajaxParams = [ - 'to', 'subtype', 'sublength', 'frequency', 'numberingmethod', - 'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3', - 'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3', - 'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3', - 'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale' - ]; - for(i in ajaxParams) { - var param = ajaxParams[i]; - var value = $("#"+param).val(); - if(value.length > 0) - ajaxData[param] = value; - } - - $.ajax({ - url:"/cgi-bin/koha/serials/showpredictionpattern.pl", - data: ajaxData, - success: function(data) { - $("#displayexample").html(data); - patternneedtobetested = 0; - } - }); -} - function saveAdvancedPattern() { if ($("#patternname").val().length == 0) { alert(_("Please enter a name for this pattern")); diff --git a/koha-tmpl/intranet-tmpl/prog/js/subscription.js b/koha-tmpl/intranet-tmpl/prog/js/subscription.js new file mode 100644 index 0000000..f8dea82 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/js/subscription.js @@ -0,0 +1,71 @@ + +var advancedpatternlocked; + +function testPredictionPattern() { + var frequencyid = $("#frequency").val(); + var acquidate; + var error = 0; + var error_msg = ""; + if(frequencyid == undefined || frequencyid == ""){ + error_msg += _("- Frequency is not defined") + "\n"; + error ++; + } + acquidate = $("#acqui_date").val(); + if(acquidate == undefined || acquidate == ""){ + error_msg += _("- First publication date is not defined") + "\n"; + error ++; + } + if( more_than_one_serial !== "" ){ + var nextacquidate = $("#nextacquidate").val(); + if(nextacquidate == undefined || nextacquidate == ""){ + error_msg += _("- Next issue publication date is not defined") + "\n"; + error ++; + } + } + + if(error){ + alert(_("Cannot test prediction pattern for the following reason(s): %s").format(error_msg)); + return false; + } + + var custompattern = 0; + if(advancedpatternlocked == 0) { + custompattern = 1; + } + + var ajaxData = { + 'custompattern': custompattern, + 'firstacquidate': acquidate + }; + + if( subscriptionid !== "" ){ + ajaxData.subscriptionid = subscriptionid; + } + if( more_than_one_serial !== "" ){ + ajaxData.nextacquidate = nextacquidate; + } + + + var ajaxParams = [ + 'to', 'subtype', 'sublength', 'frequency', 'numberingmethod', + 'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3', + 'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3', + 'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3', + 'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale' + ]; + for(i in ajaxParams) { + var param = ajaxParams[i]; + var value = $("#"+param).val(); + if(value.length > 0) + ajaxData[param] = value; + } + + $.ajax({ + url:"/cgi-bin/koha/serials/showpredictionpattern.pl", + data: ajaxData, + success: function(data) { + $("#displayexample").html(data); + patternneedtobetested = 0; + } + }); +} diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index 8f7dc91..84d874d 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -257,34 +257,6 @@ sub _get_sub_length { ); } -sub _guess_enddate { - my ($startdate_iso, $frequencyid, $numberlength, $weeklength, $monthlength) = @_; - my ($year, $month, $day); - my $enddate; - if($numberlength != 0) { - my $frequency = GetSubscriptionFrequency($frequencyid); - if($frequency->{'unit'} eq 'day') { - ($year, $month, $day) = Add_Delta_Days(split(/-/, $startdate_iso), $numberlength * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}); - } elsif($frequency->{'unit'} eq 'week') { - ($year, $month, $day) = Add_Delta_Days(split(/-/, $startdate_iso), $numberlength * 7 * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}); - } elsif($frequency->{'unit'} eq 'month') { - ($year, $month, $day) = Add_Delta_YM(split(/-/, $startdate_iso), 0, $numberlength * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}); - } elsif($frequency->{'unit'} eq 'year') { - ($year, $month, $day) = Add_Delta_YM(split(/-/, $startdate_iso), $numberlength * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}, 0); - } - } elsif($weeklength != 0) { - ($year, $month, $day) = Add_Delta_Days(split(/-/, $startdate_iso), $weeklength * 7); - } elsif($monthlength != 0) { - ($year, $month, $day) = Add_Delta_YM(split(/-/, $startdate_iso), 0, $monthlength); - } - if(defined $year) { - $enddate = sprintf("%04d-%02d-%02d", $year, $month, $day); - } else { - undef $enddate; - } - return $enddate; -} - sub redirect_add_subscription { my $auser = $query->param('user'); my $branchcode = $query->param('branchcode'); @@ -330,9 +302,9 @@ sub redirect_add_subscription { if(!defined $enddate || $enddate eq '') { if($subtype eq "issues") { - $enddate = _guess_enddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength) + $enddate = GuessEnddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength) } else { - $enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength) + $enddate = GuessEnddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength) } } @@ -407,9 +379,9 @@ sub redirect_mod_subscription { # Guess end date if(!defined $enddate || $enddate eq '') { if($subtype eq "issues") { - $enddate = _guess_enddate($nextacquidate, $periodicity, $numberlength, $weeklength, $monthlength); + $enddate = GuessEnddate($nextacquidate, $periodicity, $numberlength, $weeklength, $monthlength); } else { - $enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength); + $enddate = GuessEnddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength); } } diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl index 836e612..9bd24f6 100755 --- a/serials/subscription-renew.pl +++ b/serials/subscription-renew.pl @@ -53,6 +53,9 @@ use C4::Context; use C4::Auth; use C4::Output; use C4::Serials; +use C4::Serials::Frequency; +use C4::Serials::Numberpattern; +use Date::Calc qw(Today Day_of_Year Week_of_Year Add_Delta_Days Add_Delta_YM); use Koha::DateUtils; my $query = new CGI; @@ -75,6 +78,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( if ( $op eq "renew" ) { # Do not use this script with op=renew and @subscriptionids > 1! my $subscriptionid = $subscriptionids[0]; + my @permanent_irregularities = $query->param('permanent_irregularity'); + my @irregularities = $query->param('irregularity'); my $startdate = output_pref( { str => scalar $query->param('startdate'), dateonly => 1, dateformat => 'iso' } ); ReNewSubscription( $subscriptionid, $loggedinuser, @@ -82,6 +87,11 @@ if ( $op eq "renew" ) { scalar $query->param('weeklength'), scalar $query->param('monthlength'), scalar $query->param('note') ); + + my $subscription = Koha::Subscriptions->find($subscriptionid); + $subscription->permanent_irregularity(join(';', @permanent_irregularities)); + $subscription->irregularity(join(';', @irregularities)); + $subscription->store; } elsif ( $op eq 'multi_renew' ) { for my $subscriptionid ( @subscriptionids ) { my $subscription = GetSubscription( $subscriptionid ); @@ -103,14 +113,46 @@ if ( $op eq "renew" ) { my $newstartdate = output_pref( { str => $subscription->{enddate}, dateonly => 1 } ) or output_pref( { dt => dt_from_string, dateonly => 1 } ); + my ($serials_number) = GetSerials($subscriptionid); + if ($serials_number > 1) { + $template->param(more_than_one_serial => 1); + } + + my $subscription_o = Koha::Subscriptions->find($subscription->{subscriptionid}); + my $subtype = $subscription_o->subtype; + my $nextexpected = GetNextExpected($subscriptionid); + my $enddate = GuessEnddate($subscription->{enddate} || dt_from_string, + $subscription->{periodicity}, + $subscription->{numberlength}, + $subscription->{weeklength}, + $subscription->{monthlength}); + + my $sub_length; + foreach my $length_unit (qw(numberlength weeklength monthlength)) { + if ($subscription->{$length_unit}) { + $sub_length=$subscription->{$length_unit}; + last; + } + } + + my $numberpattern = GetSubscriptionNumberpattern($subscription->{numberpattern}); + $template->param( - startdate => $newstartdate, - subscription => $subscription, + startdate => $newstartdate, + subscription => $subscription, + numberpattern => $numberpattern, + startdate => $newstartdate, + nextacquidate => $nextexpected->{planneddate}, + enddate => $enddate, + subtype => $subtype, + sublength => $sub_length, ); } $template->param( op => $op, + #$op => 1, + popup => ($mode eq 'popup'), ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/t/db_dependent/Koha/Subscription.t b/t/db_dependent/Koha/Subscription.t index a8c1a4c..d9700bc 100644 --- a/t/db_dependent/Koha/Subscription.t +++ b/t/db_dependent/Koha/Subscription.t @@ -19,7 +19,9 @@ use Modern::Perl; -use Test::More tests => 3; +use Test::More tests => 4; +use Test::More tests => 2; +use t::lib::TestBuilder; use Koha::Subscriptions; use Koha::Biblio; @@ -88,6 +90,43 @@ subtest 'Koha::Subscription->vendor' => sub { is( $object->vendor->id, $subscription->{aqbooksellerid}, 'Koha::Subscription->vendor should return the correct vendor' ); }; +subtest 'Koha::Subscription::subtype' => sub { + plan tests => 3; + + my $subs = $builder->build({ + source => 'Subscription', + value => { + numberlength => 7, + weeklength => 0, + monthlength => 0, + } + }); + my $subscription = Koha::Subscriptions->find($subs->{subscriptionid}); + is($subscription->subtype, 'issues', 'Subscription with numberlength has issues type'); + + my $subs2 = $builder->build({ + source => 'Subscription', + value => { + numberlength => 0, + weeklength => 52, + monthlength => 0, + } + }); + my $subscription2 = Koha::Subscriptions->find($subs2->{subscriptionid}); + is($subscription2->subtype, 'weeks', 'Subscription with weeklength has weeks type'); + + my $subs3 = $builder->build({ + source => 'Subscription', + value => { + numberlength => 0, + weeklength => 0, + monthlength => 12, + } + }); + my $subscription3 = Koha::Subscriptions->find($subs3->{subscriptionid}); + is($subscription3->subtype, 'months', 'Subscription with monthlength has months type'); +}; + $schema->storage->txn_rollback; 1; -- 2.7.4