From 3414c117cdbe983c9c4dd8cbf3843bd5419bd0d8 Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Mon, 19 Mar 2012 15:18:27 +0100
Subject: [PATCH] Bug 7743: Update opac-readingrecord.pl to use KohaDates TT
 plugin

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

fixed conflict
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt | 4 +++-
 opac/opac-detail.pl                                       | 2 --
 opac/opac-readingrecord.pl                                | 4 ++--
 opac/opac-user.pl                                         | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
index fc5be4c905..59413694d3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
@@ -1,3 +1,5 @@
+[% USE KohaDates %]
+
 [% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog &rsaquo; Your checkout history
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">ul.ui-tabs-nav li a, ul.ui-tabs-nav li span.a  { padding:0.6em 1em; }</style>
@@ -82,7 +84,7 @@ You have never borrowed anything from this library.
                     </span></td>
 <td>[% UNLESS ( noItemTypeImages ) %][% IF ( READING_RECOR.imageurl ) %]<img src="[% READING_RECOR.imageurl %]" alt="" />[% END %][% END %] [% READING_RECOR.description %]</td>
 <td>[% READING_RECOR.itemcallnumber %]</td>
-<td>[% IF ( READING_RECOR.returndate ) %][% READING_RECOR.returndate %][% ELSE %]<em>(Checked out)</em>[% END %]</td>
+<td>[% IF ( READING_RECOR.returndate ) %][% READING_RECOR.returndate | $KohaDates %][% ELSE %]<em>(Checked out)</em>[% END %]</td>
 </tr>
 
 [% END %]
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 7fce1c2766..923f3ff6a9 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -494,8 +494,6 @@ for my $itm (@items) {
         # I can't actually find any case in which this is defined. --amoore 2008-12-09
         $itm->{ $itm->{'publictype'} } = 1;
     }
-    $itm->{datedue}      = format_sqlduedatetime($itm->{datedue});
-    $itm->{datelastseen} = format_date($itm->{datelastseen});
 
     # get collection code description, too
     if ( my $ccode = $itm->{'ccode'} ) {
diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 6872660c30..04c32930ee 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -89,8 +89,8 @@ foreach my $issue (@{$issues} ) {
     $line{title}           = $issue->{'title'};
     $line{author}          = $issue->{'author'};
     $line{itemcallnumber}  = $issue->{'itemcallnumber'};
-    $line{date_due}        = format_sqlduedatetime( $issue->{date_due} );
-    $line{returndate}      = format_sqldatetime( $issue->{returndate} );
+    $line{date_due}        = $issue->{'date_due'};
+    $line{returndate}      = $issue->{'returndate'};
     $line{volumeddesc}     = $issue->{'volumeddesc'};
     $issue->{'itemtype'}   = C4::Context->preference('item-level_itypes') ? $issue->{'itype'} : $issue->{'itemtype'};
     if($issue->{'itemtype'}) {
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 78b155c638..b89e862e87 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -197,7 +197,6 @@ if ($issues){
 			$issue->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{$itemtype}->{'imageurl'} );
 			$issue->{'description'} = $itemtypes->{$itemtype}->{'description'};
 		}
-		$issue->{date_due} = output_pref_due($issue->{date_due});
 		push @issuedat, $issue;
 		$count++;
 		
-- 
2.39.5