gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 22375: Format due date consistantly 

Test plan:
Make some daily an hourly checkouts and confirm the right display
(hourly with hours and minutes, daily only date) of due date on these
places:
1) catalogue -> checkout history
2) circulation -> overdues with fines
3) <already fixed>
4) circulation -> pending on site checkouts
5) patrons circulation history
6) opac -> account summary ->  relatives checkouts

Note: I suspect the moremember-receipt.tt template is not used anymore
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Josef Moravec 2019-02-20 12:41:04 +00:00 committed by Tomas Cohen Arazi
parent 4e599c790f
commit e80d5fc0d0
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
View File

@ -96,7 +96,7 @@
[% checkout.issuedate |$KohaDates with_hours => 1 %]
</td>
<td data-order="[% checkout.date_due | html %]">
[% checkout.date_due |$KohaDates with_hours => 1 %]
[% checkout.date_due | $KohaDates as_due_date => 1 %]
</td>
<td data-order="[% checkout.returndate | html %]">
[% checkout.returndate |$KohaDates with_hours => 1 %]

6
koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
View File

@ -56,7 +56,7 @@
[% FOREACH overduesloo IN overduesloop %]
<tr>
<td>
[% overduesloo.date_due | html %]
[% overduesloo.date_due | $KohaDates as_due_date => 1 %]
</td>
<td>
[% INCLUDE 'biblio-title.inc' biblio=overduesloo link = 1 %] [% IF ( overduesloo.author ) %] by [% overduesloo.author | html %][% END %]
@ -82,7 +82,7 @@
[% IF ( todayoverduesloop ) %]
<div id="branch_odues_today_odues" class="page-section">
<table style="width:100%;">
<caption>Today's notifications</caption>
<caption>Today's notifications</caption>
<tr>
<th>Date due</th>
<th>Title</th>
@ -94,7 +94,7 @@
<tr>
<td>
<p>
[% todayoverduesloo.date_due | html %]
[% todayoverduesloo.date_due | $KohaDates as_due_date => 1 %]
</p>
</td>
<td>

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
View File

@ -52,7 +52,7 @@
<tr>
<td data-order="[% item.date_due | html %]">
[% IF item.is_overdue %]<span class="overdue">[% END %]
[% item.date_due | $KohaDates %]
[% item.date_due | $KohaDates as_due_date => 1 %]
[% IF item.is_overdue %]</span>[% END %]
</td>
<td>

7
koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
View File

@ -110,18 +110,18 @@
[% END %]
</td>
<td data-order="[% issue.issuedate | html %]">
[% issue.issuedate |$KohaDates with_hours => 1 %]
[% issue.issuedate |$KohaDates with_hours => 1 %]
</td>
<td>[% Branches.GetName( issue.branchcode ) | html %]</td>
[% IF Koha.Preference('RecordStaffUserOnCheckout') %]
<td><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% issue.issuer_id | uri %]">[% issue.firstname | html %] [% issue.surname | html %]</a></td>
[% END %]
<td data-order="[% issue.date_due | html %]">
[% issue.date_due |$KohaDates with_hours => 1 %]
[% issue.date_due | $KohaDates as_due_date => 1 %]
</td>
[% IF issue.returndate %]
<td data-order="[% issue.returndate | html %]">
[% issue.returndate |$KohaDates with_hours => 1 %]
[% issue.returndate |$KohaDates with_hours => 1 %]
[% ELSE %]
<td data-order="checked out">
<small>Checked out</small>
@ -151,7 +151,6 @@
[% INCLUDE table_readingrec %]
</div> <!-- /.page-section -->
[% END # /IF Koha.Preference('OnSiteCheckouts') %]
[% END %]
</main>

4
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
View File

@ -418,12 +418,12 @@
[% IF ( ISSUE.overdue ) %]
<td class="date_due overdue" data-order="[% ISSUE.date_due | html %]">
<span class="tdlabel">Date due:</span>
[% ISSUE.date_due | $KohaDates as_due_date => 1 %]
[% ISSUE.date_due | $KohaDates as_due_date => 1 %]
</td>
[% ELSE %]
<td class="date_due" data-order="[% ISSUE.date_due | html %]">
<span class="tdlabel">Date due:</span>
[% ISSUE.date_due | $KohaDates as_due_date => 1 %]
[% ISSUE.date_due | $KohaDates as_due_date => 1 %]
</td>
[% END %]
[% UNLESS ( item_level_itypes ) %]