From 03175f90ce54c68d228bbdc1a180bf35a4971539 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 5 Jul 2013 10:34:04 -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 | 10 ++-- serials/subscription-detail.pl | 2 +- 7 files changed, 50 insertions(+), 50 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index f30bb48..7db6ab1 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -1261,7 +1261,7 @@ sub ModSubscription { $lastvalue2, $innerloop2, $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, $status, $biblionumber, $callnumber, $notes, $letter, $hemisphere, $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid, - $seriallifespan + $serial_lifespan ) = @_; # warn $irregularity; @@ -1275,7 +1275,7 @@ sub ModSubscription { numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?, staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ? - ,enddate=?, seriallifespan=? + ,enddate=?, serial_lifespan=? WHERE subscriptionid = ?"; #warn "query :".$query; @@ -1292,7 +1292,7 @@ sub ModSubscription { $numberingmethod, $status, $biblionumber, $callnumber, $notes, $letter, $hemisphere, ( $manualhistory ? $manualhistory : 0 ), $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, - $graceperiod, $location, $enddate, $seriallifespan, $subscriptionid + $graceperiod, $location, $enddate, $serial_lifespan, $subscriptionid ); my $rows = $sth->rows; @@ -1324,7 +1324,7 @@ sub NewSubscription { $lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, $lastvalue2, $innerloop2, $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, $status, $notes, $letter, $firstacquidate, $irregularity, $numberpattern, $callnumber, $hemisphere, $manualhistory, - $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $seriallifespan + $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $serial_lifespan ) = @_; my $dbh = C4::Context->dbh; @@ -1338,7 +1338,7 @@ sub NewSubscription { add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3, numberingmethod, status, notes, letter,firstacquidate,irregularity, numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems, - staffdisplaycount,opacdisplaycount,graceperiod,location,enddate,seriallifespan) + staffdisplaycount,opacdisplaycount,graceperiod,location,enddate,serial_lifespan) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |; my $sth = $dbh->prepare($query); @@ -1348,7 +1348,7 @@ sub NewSubscription { $lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, $lastvalue2, $innerloop2, $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, "$status", $notes, $letter, $firstacquidate, $irregularity, $numberpattern, $callnumber, $hemisphere, $manualhistory, - $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $seriallifespan + $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $serial_lifespan ); my $subscriptionid = $dbh->{'mysql_insertid'}; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index a9eb278..5731029 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2031,7 +2031,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`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 36e6343..6fd7276 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7019,8 +7019,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 9168b76..8e9c9cb 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 @@ -1030,59 +1030,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 5907dc4..0584407 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 @@ -262,27 +262,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 %]
  • @@ -355,27 +355,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 79f2513..c8e6766 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), ); } @@ -256,7 +256,7 @@ sub redirect_add_subscription { my $missinglist = $query->param('missinglist'); my $opacnote = $query->param('opacnote'); my $librariannote = $query->param('librariannote'); - my $seriallifespan = $query->param('seriallifespan'); + my $serial_lifespan = $query->param('serial_lifespan'); my $subscriptionid = NewSubscription($auser,$branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber, $startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength, $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1, @@ -264,7 +264,7 @@ sub redirect_add_subscription { $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3, $numberingmethod, $status, $notes,$letter,$firstacquidate,join(",",@irregularity), $numberpattern, $callnumber, $hemisphere,($manualhistory?$manualhistory:0),$internalnotes, - $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$seriallifespan + $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$serial_lifespan ); ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote); @@ -333,7 +333,7 @@ sub redirect_mod_subscription { my $graceperiod = $query->param('graceperiod') || 0; my $location = $query->param('location'); my $nextexpected = GetNextExpected($subscriptionid); - my $seriallifespan = $query->param('seriallifespan'); + my $serial_lifespan = $query->param('serial_lifespan'); # If it's a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary. if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) { ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso')); @@ -351,7 +351,7 @@ sub redirect_mod_subscription { $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, $status, $biblionumber, $callnumber, $notes, $letter, $hemisphere, $manualhistory,$internalnotes, - $serialsadditems, $staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$subscriptionid,$seriallifespan + $serialsadditems, $staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$subscriptionid,$serial_lifespan ); ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote); diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl index 9e0d922..479705d 100755 --- a/serials/subscription-detail.pl +++ b/serials/subscription-detail.pl @@ -178,7 +178,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.2.5