Bugzilla – Attachment 149723 Details for
Bug 22375
Due dates should be formatted consistently
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22375: (follow-up) Format even more due dates consistently
Bug-22375-follow-up-Format-even-more-due-dates-con.patch (text/plain), 11.74 KB, created by
Katrin Fischer
on 2023-04-16 01:24:10 UTC
(
hide
)
Description:
Bug 22375: (follow-up) Format even more due dates consistently
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-04-16 01:24:10 UTC
Size:
11.74 KB
patch
obsolete
>From d453772a31dcef66c48d057f07fd6abc0ee4dadb Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Sun, 16 Apr 2023 01:06:53 +0000 >Subject: [PATCH] Bug 22375: (follow-up) Format even more due dates > consistently > >To test: >Create some checkouts in future and past, make sure to include >some with a time != 23:59.CirculateILL > >Verify that the due date is displayed correctly on: >* Catalog detail page > Items tab > Checkout status >* Circulation start page > Renew > Renew one of your checkouts > dialog message >* ILL request page: requires ILL setup and CirculateILL system preference >* Patron acccount in staff > Print > Print summary >* Catalog detail page > Holds > search for patron > due date on checked out items >* Recalls: > * Activate UseRecalls system preference, set up circulation rules to allow recalls > * Checkout an item to another user > * In the OPAC, place a recall on that record with yor use > * Check "Recall a specific item" > * Verify due date in item list > * Place recall on checked out item > * Patron account in OPAC > Recalls history (due date might have been changed through recall) >* OPAC patron account > Summary > Overdue tab >* Self checkout: > * Activate WebBasedSelfCheck > * Go to <opacbaseurl>/cgi-bin/koha/sco/sco-main.pl > * Log in > Tab checkouts > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 2 +- > .../intranet-tmpl/prog/en/modules/members/moremember-print.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 ++-- > 9 files changed, 11 insertions(+), 11 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index b220f58002..6fea214ab1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -1,4 +1,4 @@ >-[% USE raw %] >+[% USE raw %]fda > [% USE Price %] > [% USE Asset %] > [% USE Koha %] >@@ -174,7 +174,7 @@ > <span>Last renewed [% checkout.lastreneweddate | $KohaDates %]</span>, > [% END %] > [% IF ( checkout.date_due ) %] >- <span>Due back on [% checkout.date_due | $KohaDates %]</span> >+ <span>Due back on [% checkout.date_due | $KohaDates as_due_date => 1 %]</span> > [% ELSE %] > <span>Not checked out</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >index a6f121eb73..9b0664a6d1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >@@ -184,7 +184,7 @@ > ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | uri %]&biblionumber=[% item.biblio.biblionumber | uri %]&bi=[% item.biblioitemnumber.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a> ) > renewed for > [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> ) >- now due on [% date_due | $KohaDates %] >+ now due on [% date_due | $KohaDates as_due_date => 1 %] > </p> > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index 23c6c33f12..62dcfac4f3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -283,7 +283,7 @@ > </li> > <li> > <label>Due date:</label> >- [% whole.value.check_out.date_due | $KohaDates with_hours => 1 %] >+ [% whole.value.check_out.date_due | $KohaDates as_due_date => 1 %] > </li> > </ol> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index 3a606e06bb..92a920d206 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >@@ -57,7 +57,7 @@ > <td>[% issue.author | html %]</td> > <td>[% issue.itemcallnumber | html %]</td> > <td>[% ItemTypes.GetDescription( issue.itype ) | html %]</td> >- <td>[% issue.date_due | $KohaDates as_due_date => 1 %]</td> >+ <td>[% issue.date_due | $KohaDates as_due_date => 1 %]</td> > <td>[% issue.barcode | html %]</td> > <td>[% issue.stocknumber | html %]</td> > [% IF ( issue.charge <= 0 ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 6ce054fffc..e6d5a5621e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -852,7 +852,7 @@ > [% END %] > [% IF ( itemloo.onloan ) %] > <td data-order="[% itemloo.date_due | html %]"> >- <span class="checkedout">Due [% itemloo.date_due | $KohaDates as_due_date => 1 %]</span> >+ <span class="checkedout">Due [% itemloo.date_due | $KohaDates as_due_date => 1 %]</span> > [% ELSE %] > <td> > [% IF ( itemloo.transfertwhen ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt >index 92625eb643..f2804af257 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt >@@ -128,7 +128,7 @@ > <td>[% item.enumchron | html %]</td> > <td> > [% IF ( item.checkout ) %] >- <span class="checkedout">Due [% item.checkout.date_due | $KohaDates %]</span> >+ <span class="checkedout">Due [% item.checkout.date_due | $KohaDates as_due_date => 1 %]</span> > [% ELSIF ( item.get_transfer ) %] > <span class="intransit">In transit from [% Branches.GetName( item.get_transfer.frombranch ) | html %] to [% Branches.GetName( item.get_transfer.tobranch ) | html %] since [% item.get_transfer.datesent | $KohaDates %]</span> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt >index 8b7a358fa8..833befc69d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt >@@ -101,7 +101,7 @@ > <td class="due_date"> > <span class="tdlabel">Due date</span> > [% IF ( RECALL.requested ) %] >- <span>Due to be returned by [% RECALL.checkout.date_due | $KohaDates %]</span> >+ <span>Due to be returned by [% RECALL.checkout.date_due | $KohaDates as_due_date => 1 %]</span> > [% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %] > <span>Pick up by [% RECALL.expiration_date | $KohaDates %]</span> > [% ELSE %] >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 1bb4bbed79..075d59eeea 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -751,7 +751,7 @@ > </td> > <td data-order="[% OVERDUE.date_due | html %]"> > <span class="tdlabel">Date due:</span> >- [% OVERDUE.date_due | $KohaDates as_due_date => 1 %] >+ [% OVERDUE.date_due | $KohaDates as_due_date => 1 %] > </td> > [% IF ( OpacRenewalAllowed ) %] > <td> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >index a157e86cc6..3b306fd7ab 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >@@ -334,11 +334,11 @@ > <td>[% ISSUE.itemcallnumber | html %]</td> > [% IF ( ISSUE.overdue ) %] > <td class="overdue" data-order="[% ISSUE.date_due | html %]"> >- [% ISSUE.date_due | $KohaDates as_due_date => 1 %] >+ [% ISSUE.date_due | $KohaDates as_due_date => 1 %] > </td> > [% ELSE %] > <td data-order="[% ISSUE.date_due | html %]"> >- [% ISSUE.date_due | $KohaDates as_due_date => 1 %] >+ [% ISSUE.date_due | $KohaDates as_due_date => 1 %] > </td> > [% END %] > <td> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 22375
:
85331
|
149722
|
149723
|
150655
|
150656