From fa9430ee68bccee0361420bc291aa440c7b85a74 Mon Sep 17 00:00:00 2001 From: mbeaulieu Date: Fri, 8 Aug 2014 13:36:26 -0400 Subject: [PATCH] Bug 8587 - Add a serial lifespan to serial subscriptions - Followup - Change seriallifespan to serial_lifespan for readability --- C4/Serials.pm | 12 +++--- installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 4 +- .../prog/en/modules/serials/subscription-add.tt | 26 ++++++------ .../prog/en/modules/serials/subscription-detail.tt | 44 ++++++++++---------- serials/subscription-add.pl | 11 +++-- serials/subscription-detail.pl | 2 +- 7 files changed, 50 insertions(+), 51 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index c1120e2..8131a25 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -1385,7 +1385,7 @@ sub ModSubscription { $lastvalue2, $innerloop2, $lastvalue3, $innerloop3, $status, $biblionumber, $callnumber, $notes, $letter, $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, - $graceperiod, $location, $enddate, $subscriptionid, $skip_serialseq, $seriallifespan + $graceperiod, $location, $enddate, $subscriptionid, $skip_serialseq, $serial_lifespan ) = @_; my $dbh = C4::Context->dbh; @@ -1399,7 +1399,7 @@ sub ModSubscription { internalnotes=?, serialsadditems=?, staffdisplaycount=?, opacdisplaycount=?, graceperiod=?, location = ?, enddate=?, skip_serialseq=?, - seriallifespan=? + serial_lifespan=? WHERE subscriptionid = ?"; my $sth = $dbh->prepare($query); @@ -1413,7 +1413,7 @@ sub ModSubscription { $letter, ($manualhistory ? $manualhistory : 0), $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq, - $seriallifespan, $subscriptionid + $serial_lifespan, $subscriptionid ); my $rows = $sth->rows; @@ -1445,7 +1445,7 @@ sub NewSubscription { $innerloop3, $status, $notes, $letter, $firstacquidate, $irregularity, $numberpattern, $locale, $callnumber, $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, - $location, $enddate, $skip_serialseq, $seriallifespan + $location, $enddate, $skip_serialseq, $serial_lifespan ) = @_; my $dbh = C4::Context->dbh; @@ -1459,7 +1459,7 @@ sub NewSubscription { irregularity, numberpattern, locale, callnumber, manualhistory, internalnotes, serialsadditems, staffdisplaycount, opacdisplaycount, graceperiod, location, enddate, skip_serialseq, - seriallifespan) + serial_lifespan) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |; my $sth = $dbh->prepare($query); @@ -1471,7 +1471,7 @@ sub NewSubscription { $firstacquidate, $irregularity, $numberpattern, $locale, $callnumber, $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq, - $seriallifespan + $serial_lifespan ); my $subscriptionid = $dbh->{'mysql_insertid'}; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index c15da18..1bcf32d 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2099,7 +2099,7 @@ CREATE TABLE `subscription` ( `enddate` date default NULL, `closed` INT(1) NOT NULL DEFAULT 0, `reneweddate` date default NULL, - `seriallifespan` TINYINT(1) DEFAULT -1, + `serial_lifespan` TINYINT(1) DEFAULT -1, PRIMARY KEY (`subscriptionid`), CONSTRAINT subscription_ibfk_1 FOREIGN KEY (periodicity) REFERENCES subscription_frequencies (id) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT subscription_ibfk_2 FOREIGN KEY (numberpattern) REFERENCES subscription_numberpatterns (id) ON DELETE SET NULL ON UPDATE CASCADE diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5b8b082..57b8d10 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8605,8 +8605,8 @@ if ( CheckVersion($DBversion) ) { $DBversion = 'XXX'; if ( CheckVersion($DBversion) ) { - $dbh->do("ALTER TABLE subscription ADD `seriallifespan` TINYINT(1) DEFAULT -1"); - print "Upgrade to $DBversion done (Add seriallifespan to subscription)\n"; + $dbh->do("ALTER TABLE subscription ADD `serial_lifespan` TINYINT(1) DEFAULT -1"); + print "Upgrade to $DBversion done (Add serial_lifespan to subscription)\n"; SetVersion ($DBversion); } 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 b9d6d6c..b0b871e 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 @@ -508,59 +508,59 @@ $(document).ready(function() { [% END %]
  • - - + [% IF ( serial_lifespan == -1 ) %] [% ELSE %] [% END %] - [% IF ( seriallifespan == 1 ) %] + [% IF ( serial_lifespan == 1 ) %] [% ELSE %] [% END %] - [% IF ( seriallifespan == 2 ) %] + [% IF ( serial_lifespan == 2 ) %] [% ELSE %] [% END %] - [% IF ( seriallifespan == 3 ) %] + [% IF ( serial_lifespan == 3 ) %] [% ELSE %] [% END %] - [% IF ( seriallifespan == 4 ) %] + [% IF ( serial_lifespan == 4 ) %] [% ELSE %] [% END %] - [% IF ( seriallifespan == 5 ) %] + [% IF ( serial_lifespan == 5 ) %] [% ELSE %] [% END %] - [% IF ( seriallifespan == 6 ) %] + [% IF ( serial_lifespan == 6 ) %] [% ELSE %] [% END %] - [% IF ( seriallifespan == 7 ) %] + [% IF ( serial_lifespan == 7 ) %] [% ELSE %] [% END %] - [% IF ( seriallifespan == 8 ) %] + [% IF ( serial_lifespan == 8 ) %] [% ELSE %] [% END %] - [% IF ( seriallifespan == 9 ) %] + [% IF ( serial_lifespan == 9 ) %] [% ELSE %] [% END %] - [% IF ( seriallifespan == 10 ) %] + [% IF ( serial_lifespan == 10 ) %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index 3b7dcf0..a605550 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -181,27 +181,27 @@ $(document).ready(function() { [% IF ( weeklength ) %]
  • Number of weeks: [% weeklength %]
  • [% END %] [% IF ( monthlength ) %]
  • Number of months: [% monthlength %]
  • [% END %]
  • Serial lifespan: - [% IF seriallifespan == -1 %] + [% IF serial_lifespan == -1 %] Permanent - [% ELSIF ( seriallifespan == 1 ) %] + [% ELSIF ( serial_lifespan == 1 ) %] 1 year - [% ELSIF ( seriallifespan == 2 ) %] + [% ELSIF ( serial_lifespan == 2 ) %] 2 years - [% ELSIF ( seriallifespan == 3 ) %] + [% ELSIF ( serial_lifespan == 3 ) %] 3 years - [% ELSIF ( seriallifespan == 4 ) %] + [% ELSIF ( serial_lifespan == 4 ) %] 4 years - [% ELSIF ( seriallifespan == 5 ) %] + [% ELSIF ( serial_lifespan == 5 ) %] 5 years - [% ELSIF ( seriallifespan == 6 ) %] + [% ELSIF ( serial_lifespan == 6 ) %] 6 years - [% ELSIF ( seriallifespan == 7 ) %] + [% ELSIF ( serial_lifespan == 7 ) %] 7 years - [% ELSIF ( seriallifespan == 8 ) %] + [% ELSIF ( serial_lifespan == 8 ) %] 8 years - [% ELSIF ( seriallifespan == 9 ) %] + [% ELSIF ( serial_lifespan == 9 ) %] 9 years - [% ELSIF ( seriallifespan == 10 ) %] + [% ELSIF ( serial_lifespan == 10 ) %] 10 years [% END %]
  • @@ -274,27 +274,27 @@ $(document).ready(function() {

    Serial issues

    - [% IF seriallifespan == -1 %] + [% IF serial_lifespan == -1 %] Permanent - [% ELSIF ( seriallifespan == 1 ) %] + [% ELSIF ( serial_lifespan == 1 ) %] 1 year - [% ELSIF ( seriallifespan == 2 ) %] + [% ELSIF ( serial_lifespan == 2 ) %] 2 years - [% ELSIF ( seriallifespan == 3 ) %] + [% ELSIF ( serial_lifespan == 3 ) %] 3 years - [% ELSIF ( seriallifespan == 4 ) %] + [% ELSIF ( serial_lifespan == 4 ) %] 4 years - [% ELSIF ( seriallifespan == 5 ) %] + [% ELSIF ( serial_lifespan == 5 ) %] 5 years - [% ELSIF ( seriallifespan == 6 ) %] + [% ELSIF ( serial_lifespan == 6 ) %] 6 years - [% ELSIF ( seriallifespan == 7 ) %] + [% ELSIF ( serial_lifespan == 7 ) %] 7 years - [% ELSIF ( seriallifespan == 8 ) %] + [% ELSIF ( serial_lifespan == 8 ) %] 8 years - [% ELSIF ( seriallifespan == 9 ) %] + [% ELSIF ( serial_lifespan == 9 ) %] 9 years - [% ELSIF ( seriallifespan == 10 ) %] + [% ELSIF ( serial_lifespan == 10 ) %] 10 years [% END %]

    diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index 165b8b4..3398771 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -108,7 +108,7 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { history => ($op eq 'modify'), "periodicity".$subs->{'periodicity'} => 1, "numberpattern".$subs->{'numberpattern'} => 1, - "seriallifespan" => $subs->{'seriallifespan'}, + "serial_lifespan" => $subs->{'serial_lifespan'}, firstacquiyear => substr($firstissuedate,0,4), ); @@ -322,10 +322,10 @@ sub redirect_add_subscription { my $opacdisplaycount = $query->param('opacdisplaycount'); my $location = $query->param('location'); my $skip_serialseq = $query->param('skip_serialseq'); + my $serial_lifespan = $query->param('serial_lifespan'); my $startdate = format_date_in_iso( $query->param('startdate') ); my $enddate = format_date_in_iso( $query->param('enddate') ); my $firstacquidate = format_date_in_iso($query->param('firstacquidate')); - my $seriallifespan = $query->param('seriallifespan'); if(!defined $enddate || $enddate eq '') { if($subtype eq "issues") { $enddate = _guess_enddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength); @@ -342,9 +342,8 @@ sub redirect_add_subscription { join(";",@irregularity), $numberpattern, $locale, $callnumber, $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, - $skip_serialseq, $seriallifespan + $skip_serialseq, $serial_lifespan ); - ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote); print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); return; @@ -392,6 +391,7 @@ sub redirect_mod_subscription { my $graceperiod = $query->param('graceperiod') || 0; my $location = $query->param('location'); my $skip_serialseq = $query->param('skip_serialseq'); + my $serial_lifespan = $query->param('serial_lifespan'); # Guess end date if(!defined $enddate || $enddate eq '') { @@ -418,10 +418,9 @@ sub redirect_mod_subscription { $status, $biblionumber, $callnumber, $notes, $letter, $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid, - $skip_serialseq, $seiallifespan + $skip_serialseq, $serial_lifespan ); - ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote); print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); return; } diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl index 7a3f096..202b6a0 100755 --- a/serials/subscription-detail.pl +++ b/serials/subscription-detail.pl @@ -157,7 +157,7 @@ $template->param( show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0, basketno => $order->{basketno}, %$tmpl_infos, - seriallifespan => $subs->{'seriallifespan'}, + serial_lifespan => $subs->{'serial_lifespan'}, ); output_html_with_http_headers $query, $cookie, $template->output; -- 1.7.9.5