Attachment 70688 Details for Bug 16486 – Bug 16486: [FOLLOW-UP] Putting time in date column

[patch] Bug 16486: [FOLLOW-UP] Putting time in date column

Bug-16486-FOLLOW-UP-Putting-time-in-date-column.patch (text/plain), 2.89 KB, created by Biblibre Sandboxes on 2018-01-18 13:27:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Biblibre Sandboxes

Created: 2018-01-18 13:27:19 UTC

Size: 2.89 KB

patch

obsolete

>From 8a66493f161ff62eb67c35972eaf444613f6323e Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Mon, 4 Sep 2017 23:42:03 +0000
>Subject: [PATCH] Bug 16486: [FOLLOW-UP] Putting time in date column
>
>In reply to Comment 6, I have moved the time into a column separate from
>the description. Unfortunately the timestamp has the date and the time,
>so I figured it was easier to just have them in the same column and
>replace the original date column.
>
>Signed-off-by: Marjorie Barry-Vila <marjorie.barry-vila@collecto.ca>
>---
> .../intranet-tmpl/prog/en/modules/members/boraccount.tt  | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>index 95e00a6..5260b90 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>@@ -82,27 +82,27 @@ $(document).ready(function() {
>   [% FOREACH account IN accounts %]
> 
>    <tr>
>-   <td><span title="[% account.date %]">[% account.date |$KohaDates %]</span></td>
>+   <td><span title="[% account.timestamp %]">[% account.timestamp | $KohaDates with_hours => 1 %]</span></td>
>       <td>
>         [% SWITCH account.accounttype %]
>-          [% CASE 'Pay' %]Payment on [% account.timestamp | $KohaDates with_hours => 1 %], thanks
>-          [% CASE 'Pay00' %]Payment on [% account.timestamp | $KohaDates with_hours => 1 %], thanks (cash via SIP2)
>-          [% CASE 'Pay01' %]Payment on [% account.timestamp | $KohaDates with_hours => 1 %], thanks (VISA via SIP2)
>-          [% CASE 'Pay02' %]Payment on [% account.timestamp | $KohaDates with_hours => 1 %], thanks (credit card via SIP2)
>+          [% CASE 'Pay' %]Payment, thanks
>+          [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
>+          [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
>+          [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
>           [% CASE 'N' %]New card
>           [% CASE 'F' %]Fine
>           [% CASE 'A' %]Account management fee
>           [% CASE 'M' %]Sundry
>           [% CASE 'L' %]Lost item
>-          [% CASE 'W' %]Written off on [% account.timestamp | $KohaDates with_hours => 1 %]
>+          [% CASE 'W' %]Written off
>           [% CASE 'FU' %]Accruing fine
>           [% CASE 'HE' %]Hold waiting too long
>           [% CASE 'Rent' %]Rental fee
>           [% CASE 'FOR' %]Forgiven
>           [% CASE 'LR' %]Lost item fee refund
>           [% CASE 'PF' %]Processing fee
>-          [% CASE 'PAY' %]Payment on [% account.timestamp | $KohaDates with_hours => 1 %]
>-          [% CASE 'WO' %]Written off on [% account.timestamp | $KohaDates with_hours => 1 %]
>+          [% CASE 'PAY' %]Payment
>+          [% CASE 'WO' %]Written off
>           [% CASE 'C' %]Credit
>           [% CASE 'CR' %]Credit
>           [% CASE %][% account.accounttype %]
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 16486: 62343 | 62703 | 62995 | 66826 | 66827 | 67537 | 67538 | 68302 | 68303 | 68304 | 68316 | 70578 | 70579 | 70580 | 70582 | 70583 | 70650 | 70687 | 70688 | 70689 | 70690 | 70691 | 71870 | 74045 | 74046 | 74047 | 103534 | 103938 | 117232 | 117233 | 117348 | 120479 | 120485