From 639ebe37a186bb012d279593aa500d904bb21b42 Mon Sep 17 00:00:00 2001 From: Maxime Pelletier Date: Tue, 4 Oct 2011 13:23:23 -0400 Subject: [PATCH] =?utf-8?q?V3.6=20de=20checkbox=20pour=20affich=C3=A9=20items=20expir=C3=A9=20avant=20ajd?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit --- .../prog/en/modules/serials/checkexpiration.tt | 10 +++++++--- serials/checkexpiration.pl | 4 +++- 2 files changed, 10 insertions(+), 4 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..41f5c00 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 @@
Filter results : -
    +
    1. @@ -65,8 +65,12 @@ ); Required
      [% INCLUDE 'date-format.inc' %]
      -
    - +
  1. + + +
  2. +
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl index 02a4fbc..ba283a0 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 ); @@ -80,7 +81,7 @@ if ($date) { $subscription->{expirationdate} = $expirationdate; next if $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 == 'on' || (Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today))) ) { $subscription->{expirationdate}=format_date($subscription->{expirationdate}); push @subscriptions_loop,$subscription; } @@ -89,6 +90,7 @@ if ($date) { $template->param ( title => $title, issn => $issn, + showexpiredtoday => $showexpiredtoday, numsubscription => scalar @subscriptions_loop, date => format_date($date), subscriptions_loop => \@subscriptions_loop, -- 1.5.6.5