From 854c6f8005b73acc3dd8b0a18aed771df1a44104 Mon Sep 17 00:00:00 2001 From: Paul POULAIN Date: Fri, 4 Apr 2008 11:16:00 +0200 Subject: [PATCH] Reintroducing history dates for serial-issue (see previous commit for staff // feature) Signed-off-by: Joshua Ferraro --- C4/Serials.pm | 2 ++ .../prog/en/modules/opac-serial-issues.tmpl | 25 +++++++++---------- opac/opac-serial-issues.pl | 1 - 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index 913292549a..35ef133264 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/\/g; $subs->{missinglist} =~ s/\n/\/g; $subs->{recievedlist} =~ s/\n/\/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 95d6d0cb1f..bbc8a155b1 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 @@

Subscription information for

-

It began on and is issued every - +

The current subscription began on and is issued every day @@ -52,29 +51,26 @@ 2 years - - on - - Monday + on Monday - Tuesday + on Tuesday - Wednesday + on Wednesday - Thursday + on Thursday - Friday + on Friday - Saturday + on Saturday - Sunday + on Sunday for @@ -82,7 +78,10 @@ weeks months - since +

The first subscription was started on

+ +

The subscription expired on

+

diff --git a/opac/opac-serial-issues.pl b/opac/opac-serial-issues.pl index 8fabccabc9..4935e29497 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; } } -- 2.39.5