From 5dc2735e39ac6f60d581c8739b59150e18a1b6c2 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Fri, 22 Jun 2012 17:25:54 +0200 Subject: [PATCH] Bug 8296: Add descriptive (text) published date field for serials Add a new field serial.publisheddatetext for displaying published date in another format that dateformat syspref permit. Signed-off-by: Cedric Vita --- C4/Serials.pm | 39 +++++++++++++++------- installer/data/mysql/kohastructure.sql | 1 + installer/data/mysql/updatedatabase.pl | 14 ++++++++ .../prog/en/modules/serials/serials-collection.tt | 14 ++++++++ .../prog/en/modules/serials/serials-edit.tt | 7 ++++ .../prog/en/modules/serials/subscription-detail.tt | 4 +++ misc/cronjobs/serialsUpdate.pl | 2 +- serials/serials-collection.pl | 10 ++++-- serials/serials-edit.pl | 4 +++ 9 files changed, 79 insertions(+), 16 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index d127066..34f9f0b 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -373,6 +373,7 @@ sub GetFullSubscription { serial.serialseq, serial.planneddate, serial.publisheddate, + serial.publisheddatetext, serial.status, serial.notes as notes, year(IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate)) as year, @@ -529,6 +530,7 @@ sub GetFullSubscriptionsFromBiblionumber { serial.serialseq, serial.planneddate, serial.publisheddate, + serial.publisheddatetext, serial.status, serial.notes as notes, year(IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate)) as year, @@ -772,7 +774,8 @@ sub GetSerials { my $counter = 0; $count = 5 unless ($count); my @serials; - my $query = "SELECT serialid,serialseq, status, publisheddate, planneddate,notes, routingnotes + my $query = "SELECT serialid,serialseq, status, publisheddate, + publisheddatetext, planneddate,notes, routingnotes FROM serial WHERE subscriptionid = ? AND status NOT IN (2, 4, 41, 42, 43, 44, 5) ORDER BY IF(publisheddate<>'0000-00-00',publisheddate,planneddate) DESC"; @@ -792,7 +795,8 @@ sub GetSerials { } # OK, now add the last 5 issues arrives/missing - $query = "SELECT serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes + $query = "SELECT serialid,serialseq, status, planneddate, publisheddate, + publisheddatetext, notes, routingnotes FROM serial WHERE subscriptionid = ? AND (status in (2, 4, 41, 42, 43, 44, 5)) @@ -837,7 +841,8 @@ sub GetSerials2 { my $dbh = C4::Context->dbh; my $query = qq| - SELECT serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes + SELECT serialid,serialseq, status, planneddate, publisheddate, + publisheddatetext, notes, routingnotes FROM serial WHERE subscriptionid=$subscription AND status IN ($status) ORDER BY publisheddate,serialid DESC @@ -1163,7 +1168,8 @@ sub ModSubscriptionHistory { =head2 ModSerialStatus -ModSerialStatus($serialid,$serialseq, $planneddate,$publisheddate,$status,$notes) + ModSerialStatus($serialid, $serialseq, $planneddate, $publisheddate, + $publisheddatetext, $status, $notes); This function modify the serial status. Serial status is a number.(eg 2 is "arrived") Note : if we change from "waited" to something else,then we will have to create a new "waited" entry @@ -1171,7 +1177,8 @@ Note : if we change from "waited" to something else,then we will have to create =cut sub ModSerialStatus { - my ( $serialid, $serialseq, $planneddate, $publisheddate, $status, $notes ) = @_; + my ($serialid, $serialseq, $planneddate, $publisheddate, $publisheddatetext, + $status, $notes) = @_; return unless ($serialid); @@ -1193,9 +1200,15 @@ sub ModSerialStatus { DelIssue( { 'serialid' => $serialid, 'subscriptionid' => $subscriptionid, 'serialseq' => $serialseq } ); } else { - my $query = 'UPDATE serial SET serialseq=?,publisheddate=?,planneddate=?,status=?,notes=? WHERE serialid = ?'; + my $query = ' + UPDATE serial + SET serialseq = ?, publisheddate = ?, publisheddatetext = ?, + planneddate = ?, status = ?, notes = ? + WHERE serialid = ? + '; $sth = $dbh->prepare($query); - $sth->execute( $serialseq, $publisheddate, $planneddate, $status, $notes, $serialid ); + $sth->execute( $serialseq, $publisheddate, $publisheddatetext, + $planneddate, $status, $notes, $serialid ); $query = "SELECT * FROM subscription WHERE subscriptionid = ?"; $sth = $dbh->prepare($query); $sth->execute($subscriptionid); @@ -1600,19 +1613,21 @@ returns the serial id =cut sub NewIssue { - my ( $serialseq, $subscriptionid, $biblionumber, $status, $planneddate, $publisheddate, $notes ) = @_; + my ( $serialseq, $subscriptionid, $biblionumber, $status, $planneddate, + $publisheddate, $publisheddatetext, $notes ) = @_; ### FIXME biblionumber CAN be provided by subscriptionid. So Do we STILL NEED IT ? return unless ($subscriptionid); my $dbh = C4::Context->dbh; my $query = qq| - INSERT INTO serial - (serialseq,subscriptionid,biblionumber,status,publisheddate,planneddate,notes) - VALUES (?,?,?,?,?,?,?) + INSERT INTO serial (serialseq, subscriptionid, biblionumber, status, + publisheddate, publisheddatetext, planneddate, notes) + VALUES (?,?,?,?,?,?,?,?) |; my $sth = $dbh->prepare($query); - $sth->execute( $serialseq, $subscriptionid, $biblionumber, $status, $publisheddate, $planneddate, $notes ); + $sth->execute( $serialseq, $subscriptionid, $biblionumber, $status, + $publisheddate, $publisheddatetext, $planneddate, $notes ); my $serialid = $dbh->{'mysql_insertid'}; $query = qq| SELECT missinglist,recievedlist diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index b135e21..28f53d3 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1939,6 +1939,7 @@ CREATE TABLE `serial` ( `planneddate` date default NULL, `notes` text, `publisheddate` date default NULL, + publisheddatetext varchar(100) default NULL, `claimdate` date default NULL, claims_count int(11) default 0, `routingnotes` text, diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 7e54990..73af280 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8952,6 +8952,20 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } + +$DBversion = "XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do(" + ALTER TABLE serial + ADD COLUMN publisheddatetext VARCHAR(100) DEFAULT NULL + AFTER publisheddate + "); + + print "Upgrade to $DBversion done (Add serial.publisheddatetext)\n"; + SetVersion($DBversion); +} + + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index 0114e1e..17d9094 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -201,6 +201,8 @@ $(document).ready(function() { [% END %] Date published + Date published (text) + Date received Number @@ -247,6 +249,18 @@ $(document).ready(function() { + [% publisheddatetext = serial.publisheddatetext || serial.publisheddate %] + + [% IF serial.publisheddatetext %] + [% publisheddatetext %] + [% ELSIF serial.publisheddate %] + [% serial.publisheddate | $KohaDates %] + [% ELSE %] + Unknown + [% END %] + + + [% IF serial.planneddate %] [% serial.planneddate | $KohaDates %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index 3877715..5e05954 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -145,6 +145,7 @@ $(document).ready(function() { Numbered Published on + Published on (text) Expected on Status Notes @@ -166,6 +167,9 @@ $(document).ready(function() { + + + @@ -320,6 +324,9 @@ $(document).ready(function() { + + + 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 b684e5e..8764c30 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 @@ -251,6 +251,7 @@ $(document).ready(function() { Issue number Planned date Published date + Published date (text) Status [% FOREACH serialslis IN serialslist %] @@ -273,6 +274,9 @@ $(document).ready(function() { [% END %] + [% serialslis.publisheddatetext || serialslis.publisheddate %] + + [% IF ( serialslis.status1 ) %]Expected[% END %] [% IF ( serialslis.status2 ) %]Arrived[% END %] [% IF ( serialslis.status3 ) %]Late[% END %] diff --git a/misc/cronjobs/serialsUpdate.pl b/misc/cronjobs/serialsUpdate.pl index 6ac5558..95de35f 100755 --- a/misc/cronjobs/serialsUpdate.pl +++ b/misc/cronjobs/serialsUpdate.pl @@ -128,7 +128,7 @@ while ( my $issue = $sth->fetchrow_hashref ) { { $confirm and ModSerialStatus( $issue->{serialid}, $issue->{serialseq}, - $issue->{planneddate}, $issue->{publisheddate}, + $issue->{planneddate}, $issue->{publisheddate}, $issue->{publisheddatetext}, 3, $note ); $verbose and print "Serial issue with id=" . $issue->{serialid} . " updated\n"; diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index 2922c42..be2ec1d 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -55,8 +55,12 @@ my $subscriptions; if($op eq 'gennext' && @subscriptionid){ my $subscriptionid = $subscriptionid[0]; - my $sth = $dbh->prepare("SELECT publisheddate, serialid, serialseq, planneddate - FROM serial WHERE status = 1 AND subscriptionid = ?"); + my $sth = $dbh->prepare(" + SELECT publisheddate, publisheddatetext, serialid, serialseq, + planneddate + FROM serial + WHERE status = 1 AND subscriptionid = ? + "); my $status = defined( $nbissues ) ? 2 : 3; $nbissues ||= 1; for ( my $i = 0; $i < $nbissues; $i++ ){ @@ -65,7 +69,7 @@ if($op eq 'gennext' && @subscriptionid){ if ( my $issue = $sth->fetchrow_hashref ) { ModSerialStatus( $issue->{serialid}, $issue->{serialseq}, $issue->{planneddate}, $issue->{publisheddate}, - $status, "" ); + $issue->{publisheddatetext}, $status, "" ); } else { require C4::Serials::Numberpattern; my $subscription = GetSubscription($subscriptionid); diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl index 2eeed10..d0a6b23 100755 --- a/serials/serials-edit.pl +++ b/serials/serials-edit.pl @@ -81,6 +81,8 @@ my @serialids = $query->param('serialid'); my @serialseqs = $query->param('serialseq'); my @planneddates = $query->param('planneddate'); my @publisheddates = $query->param('publisheddate'); +my @publisheddates = $query->param('publisheddate'); +my @publisheddatetexts = $query->param('publisheddatetext'); my @status = $query->param('status'); my @notes = $query->param('notes'); my @subscriptionids = $query->param('subscriptionid'); @@ -228,6 +230,7 @@ if ( $op and $op eq 'serialchangestatus' ) { $status[$i], $plan_date, $pub_date, + $publisheddatetexts[$i], $notes[$i] ); } @@ -238,6 +241,7 @@ if ( $op and $op eq 'serialchangestatus' ) { $serialseqs[$i], $plan_date, $pub_date, + $publisheddatetexts[$i], $status[$i], $notes[$i] ); -- 1.9.1