Attachment 43339 Details for Bug 14990 – Bug 14990: Format the date template-side for moremember

[patch] Bug 14990: Format the date template-side for moremember

Bug-14990-Format-the-date-template-side-for-moreme.patch (text/plain), 5.57 KB, created by Marc Véron on 2015-10-12 11:56:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2015-10-12 11:56:07 UTC

Size: 5.57 KB

patch

obsolete

>From da51081465637bc894641e456df7ec288d680ba7 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 9 Oct 2015 09:14:33 +0100
>Subject: [PATCH] Bug 14990: Format the date template-side for moremember
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Test plan:
>print slip and show the member detail page, the 3 dates date of birth,
>date enrolled and date of expiry should be displayed correctly.
>
>Followed test pan, works as expected.
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>---
> .../prog/en/modules/members/moremember-brief.tt | 9 +++++----
> .../intranet-tmpl/prog/en/modules/members/moremember.tt | 10 +++++-----
> members/moremember.pl | 4 +---
> 3 files changed, 11 insertions(+), 12 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
>index 6196df0..34367d8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
>@@ -1,3 +1,4 @@
>+[% USE KohaDates %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Check duplicate patron</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -47,7 +48,7 @@
> [% IF ( emailpro ) %]<li>Secondary email: <a href="mailto:[% emailpro %]">[% emailpro %]</a></li>[% END %]
> [% END %]
> <li>Initials: [% initials %]</li>
>- <li>Date of birth:[% dateofbirth %]</li>
>+ <li>Date of birth:[% dateofbirth | $KohaDates %]</li>
> <li>Gender:[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]</li>[% END %]
> [% IF ( isguarantee ) %]
> [% IF ( guaranteeloop ) %]
>@@ -70,12 +71,12 @@
> <li>Card number: [% cardnumber %]</li>
> 	<li>Borrowernumber: [% borrowernumber %]</li>
> <li>Category: [% description %] ([% categorycode %])</li>
>- <li>Registration date: [% dateenrolled %]</li>
>+ <li>Registration date: [% dateenrolled | $KohaDates %]</li>
> <li>Expiration date: 
> [% IF ( was_renewed ) %]
>- [% dateexpiry %]
>+ [% dateexpiry | $KohaDates %]
> [% ELSE %]
>- [% dateexpiry %]
>+ [% dateexpiry | $KohaDates %]
> [% END %]
> </li>
> <li>Library: [% branchname %]</li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index 5a8c5a9..21e5d91 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -166,7 +166,7 @@ function validate1(date) {
> [% IF ( unknowuser ) %]
> <div class="dialog message">This patron does not exist.</div>
> [% ELSE %]
>- [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
>+ [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry | $KohaDates %]</div>[% END %]
> 
> [% IF ( flagged ) %]
> <div id="circmessages" class="circmessage attention">
>@@ -225,7 +225,7 @@ function validate1(date) {
> [% IF ( emailpro ) %]<li>Secondary email: <a href="mailto:[% emailpro %]">[% emailpro %]</a></li>[% END %]
> [% END %]
> [% IF ( initials ) %]<li>Initials: [% initials %]</li>[% END %]
>- [% IF ( dateofbirth ) %]<li>Date of birth:[% dateofbirth %]</li>[% END %]
>+ [% IF ( dateofbirth ) %]<li>Date of birth:[% dateofbirth | $KohaDates %]</li>[% END %]
> [% IF ( sex ) %]<li>Gender:
> [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
> </li>[% END %][% END %]
>@@ -337,13 +337,13 @@ function validate1(date) {
> <li>Card number: [% cardnumber %]</li>
> 	<li>Borrowernumber: [% borrowernumber %]</li>
> <li>Category: [% description %] ([% categorycode %])</li>
>- <li>Registration date: [% dateenrolled %]</li>
>+ <li>Registration date: [% dateenrolled | $KohaDates %]</li>
> 
> <li>Expiration date: 
> [% IF ( was_renewed ) %]
>- [% dateexpiry %]
>+ [% dateexpiry | $KohaDates %]
> [% ELSE %]
>- [% dateexpiry %]
>+ [% dateexpiry | $KohaDates %]
> [% END %]
> </li>
> 
>diff --git a/members/moremember.pl b/members/moremember.pl
>index f0b583f..688215b 100755
>--- a/members/moremember.pl
>+++ b/members/moremember.pl
>@@ -135,9 +135,7 @@ foreach (qw(dateenrolled dateexpiry dateofbirth)) {
> $data->{$_} = '';
> next;
> }
>- $userdate = output_pref({ dt => dt_from_string( $userdate ), dateonly => 1 });
>- $data->{$_} = $userdate || '';
>- $template->param( $_ => $userdate );
>+ $template->param( $_ => dt_from_string( $userdate ) );
> }
> $data->{'IS_ADULT'} = ( $data->{'categorycode'} ne 'I' );
> 
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 14990: 43289 | 43338 | 43339 | 43570