Attachment 149722 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), 7.82 KB, created by Katrin Fischer on 2023-04-16 01:24:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-04-16 01:24:08 UTC

Size: 7.82 KB

patch

obsolete

>From 6ebdd271e73890e3c4a9119bc579a27edd7ffec8 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) <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>
>---
> .../prog/en/modules/catalogue/issuehistory.tt              | 2 +-
> .../intranet-tmpl/prog/en/modules/circ/branchoverdues.tt   | 6 +++---
> .../prog/en/modules/circ/on-site_checkouts.tt              | 2 +-
> .../intranet-tmpl/prog/en/modules/members/readingrec.tt    | 7 +++----
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt      | 4 ++--
> 5 files changed, 10 insertions(+), 11 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 80c04a69e7..ba2c56a392 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>@@ -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 %]
>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 1f3baf4045..bf203e0c28 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>@@ -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>
>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 06620173cb..11e8db0e3a 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
>@@ -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>
>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 16c6bc3776..ec4c5dfdb9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>@@ -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> 
>         [% END # /IF Koha.Preference('OnSiteCheckouts') %]
>-
> [% END %]
> 
>             </main>
>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 37d36399ea..1bb4bbed79 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -374,12 +374,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 ) %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

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