From 56ede58a86274e0f70fc27c0907cd14f03dd77c4 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 8 Oct 2015 09:52:27 +0100 Subject: [PATCH] Bug 14890: Simplify processing to display a date with hours The KohaDates plugin does that, it's not necessary to split the output. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- circ/bookcount.pl | 16 +--------------- .../prog/en/modules/circ/bookcount.tt | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/circ/bookcount.pl b/circ/bookcount.pl index 610fd5e308..09dc6fcbf0 100755 --- a/circ/bookcount.pl +++ b/circ/bookcount.pl @@ -71,11 +71,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( my $branchloop = GetBranchesLoop(C4::Context->userenv->{branch}); foreach (@$branchloop) { - my $date = lastseenat( $itm, $_->{value} ); - my ($datechunk, $timechunk) = slashdate($date); $_->{issues} = issuesat($itm, $_->{value}); - $_->{seen} = $datechunk; - $_->{seentime} = $timechunk; + $_->{seen} = lastseenat( $itm, $_->{value} ) || undef; } $template->param( @@ -170,14 +167,3 @@ sub lastseenat { my $date = ( $date1 lt $date2 ) ? $date2 : $date1 ; return ($date); } - -##################################################### -# return date and time from timestamp -sub slashdate { - my ($date) = @_; - $date or return; - return ( - output_pref({ dt => dt_from_string( $date ), dateonly => 1 }), - substr($date,11,5) - ); -} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt index e83955f48e..f7b47655c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt @@ -48,7 +48,7 @@ $(document).ready(function(){ [% branchloo.branchname %] [% branchloo.issues %] [% IF ( branchloo.seen ) %] - [% branchloo.seen %] [% branchloo.seentime %] + [% branchloo.seen | $KohaDates with_hours => 1 %] [% ELSE %] Never [% END %] -- 2.39.5