Attachment 85331 Details for Bug 22375 – Bug 22375: Format due date consistantly

[patch] Bug 22375: Format due date consistantly

Bug-22375-Format-due-date-consistantly.patch (text/plain), 8.13 KB, created by Josef Moravec on 2019-02-20 12:48:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2019-02-20 12:48:22 UTC

Size: 8.13 KB

patch

obsolete

>From e0de4676138875021b7b30a2c6b1ef9d9ac48802 Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Wed, 20 Feb 2019 12:41:04 +0000
>Subject: [PATCH] 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) batch checkouts
>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
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt | 4 ++--
> .../prog/en/modules/circ/circulation_batch_checkouts.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt | 2 +-
> .../intranet-tmpl/prog/en/modules/members/moremember-receipt.tt | 6 +++---
> koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +-
> 7 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>index 77cd776..d534e28 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>@@ -76,7 +76,7 @@
> 
> [% END %]</td>
> <td>[% IF checkout.date_due %]
>- [% checkout.date_due |$KohaDates with_hours => 1 %]
>+ [% checkout.date_due |$KohaDates as_due_date => 1 %]
> [% ELSE %]
> 
> [% END %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>index 1531574..9a0826a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>@@ -42,7 +42,7 @@
> [% FOREACH overduesloo IN overduesloop %]
> <tr>
> <td>
>- [% overduesloo.date_due | html %]
>+ [% overduesloo.date_due | $KohaDates as_due_date => 1 %]
> </td>
> <td>
> [% INCLUDE 'biblio-default-view.inc' biblionumber = overduesloo.biblionumber %][% overduesloo.title | html %] [% IF ( overduesloo.subtitle ) %][% overduesloo.subtitle | html %][% END %]</a> [% IF ( overduesloo.author ) %] by [% overduesloo.author | html %][% END %]
>@@ -79,7 +79,7 @@
> <tr>
> <td>
> 
>- [% todayoverduesloo.date_due | html %]
>+ [% todayoverduesloo.date_due | $KohaDates as_due_date => 1 %]
> 
> </td>
> <td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>index 95811b4..ac6fbdc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>@@ -256,7 +256,7 @@
> [% END %]
> 
> [% IF checkout_info.issue.date_due %]
>- <li>Due on [% checkout_info.issue.date_due | $KohaDates %]</li>
>+ <li>Due on [% checkout_info.issue.date_due | $KohaDates as_due_date => 1 %]</li>
> [% END %]
> </td>
> </tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>index 6b1d94f..ea8be11 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>@@ -41,7 +41,7 @@
> <tr>
> <td>
> [% IF item.is_overdue %][% END %]
>- [% item.date_due | $KohaDates %]
>+ [% item.date_due | $KohaDates as_due_date => 1 %]
> [% IF item.is_overdue %][% END %]
> </td>
> <td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
>index c645c55..49c600b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
>@@ -28,7 +28,7 @@ Checked out to [% firstname | html %] [% surname | html %] 
> [% IF ( issueloo.today ) %]
> <a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | uri %]&amp;biblionumber=[% issueloo.biblionumber | uri %]&amp;bi=[% issueloo.biblioitemnumber | uri %]">[% issueloo.title | html %]</a> 
> Barcode: [% issueloo.barcode | html %] 
>-Date due: [% issueloo.date_due | html %] 
>+Date due: [% issueloo.date_due | $KohaDates as_due_date => 1 %] 
> [% END %]
> [% END %]
> [% END %]
>@@ -39,7 +39,7 @@ Date due: [% issueloo.date_due | html %] 
> [% IF ( issueloo.red ) %][% ELSE %]
> <a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | uri %]&amp;biblionumber=[% issueloo.biblionumber | uri %]&amp;bi=[% issueloo.biblioitemnumber | uri %]">[% issueloo.title | html %]</a> 
> Barcode: [% issueloo.barcode | html %] 
>-Date due: [% issueloo.date_due | html %] 
>+Date due: [% issueloo.date_due | $KohaDates as_due_date => 1 %] 
> [% END %]
> [% END %]
> 
>@@ -53,7 +53,7 @@ Date due: [% issueloo.date_due | html %] 
> [% IF ( issueloo.red ) %]
> <a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | uri %]&amp;biblionumber=[% issueloo.biblionumber | uri %]&amp;bi=[% issueloo.biblioitemnumber | uri %]">[% issueloo.title | html %]</a> 
> Barcode: [% issueloo.barcode | html %] 
>-Date due: [% issueloo.date_due | html %]
>+Date due: [% issueloo.date_due | $KohaDates as_due_date => 1 %]
> [% END %]
> [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>index ccd72b7..20a2f3b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>@@ -93,7 +93,7 @@
> <td>[% Branches.GetName( issue.branchcode ) | html %]</td>
> <td>
> [% IF issue.date_due %]
>- [% issue.date_due |$KohaDates with_hours => 1 %]
>+ [% issue.date_due | $KohaDates as_due_date => 1 %]
> [% ELSE %]
> 
> [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index 7af3a0f..7031ac4 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -446,7 +446,7 @@
> </td>
> 
> <td>
>- [% i.date_due | $KohaDates %]
>+ [% i.date_due | $KohaDates as_due_date => 1 %]
> </td>
> 
> <td>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 22375: 85331 | 149722 | 149723 | 150655 | 150656