[Koha-patches] [PATCH] Bug 6968: display of expired subscriptions

[Adrien Saurat]

From: Maxime Pelletier <maxime.pelletier at libeo.com>


Signed-off-by: Adrien Saurat <adrien.saurat at biblibre.com>
---
 .../prog/en/modules/serials/checkexpiration.tt     |   10 +++++++---
 serials/checkexpiration.pl                         |    7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
index 246eb49..e75b020 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -45,7 +45,7 @@
 <fieldset class="rows">
     <legend>Filter results :</legend>
     
-         <ol>
+        <ol>
         <li><label for="title">Title:</label>
         <input id="title" type="text" name="title" size="15" value="[% title %]" /></li>
 
@@ -65,8 +65,12 @@
                 );
             </script> <span class="required">Required</span>
 			<div class="hint">[% INCLUDE 'date-format.inc' %]</div></li>
-			</ol>
-        
+        <li>
+            <label for="showexpiredtoday">Show expired before today:</label>
+            <input id="showexpiredtoday" type="checkbox" name="showexpiredtoday"
+            [% IF ( showexpiredtoday ) %] checked="checked" [% END %]/>
+        </li>
+        </ol>
 </fieldset>
 <fieldset class="action"><input type="submit" value="Search" /></fieldset>
 </form>
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index 02a4fbc..13ad042 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -68,6 +68,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
 my $title = $query->param('title');
 my $issn  = $query->param('issn');
 my $date  = format_date_in_iso($query->param('date'));
+my $showexpiredtoday = $query->param('showexpiredtoday');
 
 if ($date) {
     my @subscriptions = GetSubscriptions( $title, $issn );
@@ -78,9 +79,10 @@ if ($date) {
         my $expirationdate = GetExpirationDate($subscriptionid);
 
         $subscription->{expirationdate} = $expirationdate;
-        next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
+        next if !$expirationdate || $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
         if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
-			 Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
+            (($showexpiredtoday && $showexpiredtoday eq 'on') || (Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today))) 
+            ) {
             $subscription->{expirationdate}=format_date($subscription->{expirationdate});
             push @subscriptions_loop,$subscription;
         }
@@ -89,6 +91,7 @@ if ($date) {
     $template->param (
         title           => $title,
         issn            => $issn,
+        showexpiredtoday => $showexpiredtoday,
         numsubscription => scalar @subscriptions_loop,
         date => format_date($date),
         subscriptions_loop => \@subscriptions_loop,
-- 
1.7.4.1