[Koha-patches] [PATCH] Reintroducing history dates for serial-issue (see previous commit for staff // feature)
paul.poulain at biblibre.com
paul.poulain at biblibre.com
Fri Apr 4 11:16:00 CEST 2008
From: Paul POULAIN <paul.poulain at biblibre.com>
diff --git a/C4/Serials.pm b/C4/Serials.pm
index 9e830fb..a48afca 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -519,6 +519,7 @@ sub GetSubscriptionsFromBiblionumber {
SELECT subscription.*,
branches.branchname,
subscriptionhistory.*,
+ subscriptionhistory.enddate as histenddate,
aqbudget.bookfundid,
aqbooksellers.name AS aqbooksellername,
biblio.title AS bibliotitle
@@ -541,6 +542,7 @@ sub GetSubscriptionsFromBiblionumber {
while ( my $subs = $sth->fetchrow_hashref ) {
$subs->{startdate} = format_date( $subs->{startdate} );
$subs->{histstartdate} = format_date( $subs->{histstartdate} );
+ $subs->{histenddate} = format_date( $subs->{histenddate} );
$subs->{opacnote} =~ s/\n/\<br\/\>/g;
$subs->{missinglist} =~ s/\n/\<br\/\>/g;
$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
index 95d6d0c..bbc8a15 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
@@ -17,8 +17,7 @@
<form method="post" name="f">
<!-- TMPL_LOOP name="subscription_LOOP" -->
<h2>Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
- <p>It began on <!-- TMPL_VAR name="startdate" --> and is issued every
-
+ <p>The current subscription began on <!-- TMPL_VAR name="startdate" --> and is issued every
<!--TMPL_IF name="periodicity1" -->
day
<!-- /TMPL_IF -->
@@ -52,29 +51,26 @@
<!--TMPL_IF name="periodicity11" -->
2 years
<!-- /TMPL_IF -->
-
- on
-
<!--TMPL_IF name="arrival1" -->
- Monday
+ on Monday
<!-- /TMPL_IF -->
<!--TMPL_IF name="arrival2" -->
- Tuesday
+ on Tuesday
<!-- /TMPL_IF -->
<!--TMPL_IF name="arrival3" -->
- Wednesday
+ on Wednesday
<!-- /TMPL_IF -->
<!--TMPL_IF name="arrival4" -->
- Thursday
+ on Thursday
<!-- /TMPL_IF -->
<!--TMPL_IF name="arrival5" -->
- Friday
+ on Friday
<!-- /TMPL_IF -->
<!--TMPL_IF name="arrival6" -->
- Saturday
+ on Saturday
<!-- /TMPL_IF -->
<!--TMPL_IF name="arrival7" -->
- Sunday
+ on Sunday
<!-- /TMPL_IF -->
for
@@ -82,7 +78,10 @@
<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF -->
<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
- since <!-- TMPl_VAR name="startdate" -->
+ <p>The first subscription was started on <!-- TMPl_VAR name="histstartdate" --></p>
+ <!-- TMPL_IF name="histenddate" -->
+ <p>The subscription expired on <!-- TMPl_VAR name="histenddate" --></p>
+ <!-- /TMPL_IF -->
</p>
<h2><!-- TMPL_VAR name="branchcode" --> <!-- TMPL_VAR name="notes" --></h2>
<!-- TMPL_IF name="recievedlist" -->
diff --git a/opac/opac-serial-issues.pl b/opac/opac-serial-issues.pl
index 8fabcca..4935e29 100755
--- a/opac/opac-serial-issues.pl
+++ b/opac/opac-serial-issues.pl
@@ -94,7 +94,6 @@ else {
foreach (@$subscriptions) {
my $subscription = getalert($loggedinuser,'issue',$_->{subscriptionid});
if (@$subscription[0]) {
- warn ">>>>>>>>> has alert : loggedinuser / ".$_->{subscriptionid};
$_->{hasalert} = 1;
}
}
--
1.5.3.2
More information about the Koha-patches
mailing list