Bugzilla – Attachment 56584 Details for
Bug 5670
Housebound Readers Module
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 5670: [QA Followup] Don't force ISO dates.
Bug-5670-QA-Followup-Dont-force-ISO-dates.patch (text/plain), 6.90 KB, created by
Jonathan Druart
on 2016-10-17 16:40:39 UTC
(
hide
)
Description:
Bug 5670: [QA Followup] Don't force ISO dates.
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-10-17 16:40:39 UTC
Size:
6.90 KB
patch
obsolete
>From 43eaa6e61628bd47f1f2ec733658762ab66e516c Mon Sep 17 00:00:00 2001 >From: Alex Sassmannshausen <alex.sassmannshausen@ptfs-europe.com> >Date: Mon, 19 Sep 2016 13:12:21 +0200 >Subject: [PATCH] Bug 5670: [QA Followup] Don't force ISO dates. > >* koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt: Use > ".datepicker" class for date input, use `$KohaDates` to filter our iso > dates. >* members/housebound.pl: Use DateTime and Koha::DateUtils to parse > incoming date to ISO format. > >Signed-off-by: Claire Gravely <claire_gravely@hotmail.com> >--- > .../prog/en/modules/members/housebound.tt | 27 ++++++++-------------- > members/housebound.pl | 22 ++++++++++-------- > 2 files changed, 22 insertions(+), 27 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >index 604523a..4656160 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >@@ -14,14 +14,6 @@ > <title>Koha › Housebound › Details for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<script type="text/javascript"> >-//<![CDATA[ >-$(document).ready(function() { >- $("#date").datepicker({ minDate: 0, dateFormat: "yy-mm-dd" }); >-}); >-//]]> >-</script> >- > </head> > <body> > [% INCLUDE 'header.inc' %] >@@ -46,7 +38,7 @@ $(document).ready(function() { > > <!-- Title --> > <h3>Housebound details for [% patron.title %] [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</h3> >- <div class="yui-u first"> >+ <div class="first"> > > [% FOR m IN messages %] > <div class="dialog [% m.type %]"> >@@ -216,7 +208,7 @@ $(document).ready(function() { > <!-- Create or edit housebound_visit --> > [% ELSIF ( method == 'visit_update_or_create' ) %] > <h4>Manage housebound deliveries</h4> >- <form name="form" id="instance_form" method="post" >+ <form name="form" id="instance_form" method="post" class="toggler" > action="/cgi-bin/koha/members/housebound.pl"> > [% IF ( visit ) %] > <input type="hidden" name="method" value="editvisitconfirm" /> >@@ -229,15 +221,16 @@ $(document).ready(function() { > <legend>Delivery details</legend> > <ol> > <li> >- <label for="date">Date: </label> >+ <label for="date" class="required">Date: </label> > [% IF ( visit ) %] >- <input type="text" id="date" name="date" size="20" >- value="[% visit.appointment_date %]" >- required="required"/> >+ <input type="text" id="date" class="datepicker" >+ value="[% visit.appointment_date | $KohaDates %]" >+ name="date" size="20" required="required"/> > [% ELSE %] >- <input type="text" id="date" name="date" size="20" >- value="" required="required"/> >+ <input type="text" id="date" class="datepicker" >+ value="" name="date" size="20" required="required"/> > [% END %] >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > <li> > <label for="segment">Time:</label> >@@ -418,7 +411,7 @@ $(document).ready(function() { > [% FOREACH entry IN housebound_visits %] > <tr> > <td>[% entry.id %]</td> >- <td>[% entry.appointment_date %] ([% entry.day_segment %])</td> >+ <td>[% entry.appointment_date | $KohaDates %] ([% entry.day_segment %])</td> > <td> > <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.chooser.borrowernumber %]"> > [% INCLUDE 'patron-title.inc' borrowernumber = entry.chooser.borrowernumber category_type = entry.chooser.categorycode firstname = entry.chooser.firstname surname = entry.chooser.surname othernames = entry.chooser.othernames cardnumber = entry.chooser.cardnumber invert_name = 0 %] >diff --git a/members/housebound.pl b/members/housebound.pl >index 516effc..a2d5062 100755 >--- a/members/housebound.pl >+++ b/members/housebound.pl >@@ -28,6 +28,8 @@ use Modern::Perl; > use CGI; > use C4::Auth; > use C4::Output; >+use DateTime; >+use Koha::DateUtils; > use Koha::Libraries; > use Koha::Patrons; > use Koha::Patron::Categories; >@@ -125,11 +127,11 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) { > # We have received input for editing a visit. We must store and return to > # simple display. > $visit->set({ >- borrowernumber => $input->param('borrowernumber') // q{}, >- appointment_date => $input->param('date') // q{}, >- day_segment => $input->param('segment') // q{}, >- chooser_brwnumber => $input->param('chooser') // q{}, >- deliverer_brwnumber => $input->param('deliverer') // q{}, >+ borrowernumber => $input->param('borrowernumber') // q{}, >+ appointment_date => dt_from_string($input->param('date') // q{}), >+ day_segment => $input->param('segment') // q{}, >+ chooser_brwnumber => $input->param('chooser') // q{}, >+ deliverer_brwnumber => $input->param('deliverer') // q{}, > }); > my $success = eval { return $visit->store }; > push @messages, { type => 'error', code => 'error_on_visit_store' } >@@ -139,11 +141,11 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) { > # We have received input for creating a visit. We must store and return > # to simple display. > my $visit = Koha::Patron::HouseboundVisit->new({ >- borrowernumber => $input->param('borrowernumber') // q{}, >- appointment_date => $input->param('date') // q{}, >- day_segment => $input->param('segment') // q{}, >- chooser_brwnumber => $input->param('chooser') // q{}, >- deliverer_brwnumber => $input->param('deliverer') // q{}, >+ borrowernumber => $input->param('borrowernumber') // q{}, >+ appointment_date => dt_from_string($input->param('date') // q{}), >+ day_segment => $input->param('segment') // q{}, >+ chooser_brwnumber => $input->param('chooser') // q{}, >+ deliverer_brwnumber => $input->param('deliverer') // q{}, > }); > my $success = eval { return $visit->store }; > push @messages, { type => 'error', code => 'error_on_visit_create' } >-- >2.8.1
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 5670
:
3038
|
22162
|
22163
|
22164
|
22165
|
26816
|
27288
|
50930
|
51377
|
51875
|
54384
|
54385
|
55326
|
55334
|
55335
|
55336
|
55734
|
55735
|
55736
|
55737
|
55738
|
55739
|
55865
|
55866
|
55867
|
55890
|
55891
|
56298
|
56299
|
56300
|
56301
|
56302
|
56308
|
56337
|
56341
|
56346
|
56347
|
56348
|
56349
|
56350
|
56351
|
56352
|
56353
|
56354
|
56355
|
56356
|
56357
|
56358
|
56359
|
56360
|
56361
|
56362
|
56363
|
56364
|
56365
|
56366
|
56367
|
56368
|
56369
|
56580
|
56581
|
56582
|
56583
| 56584 |
56585
|
56586
|
56587
|
56588
|
56589
|
56590
|
56591
|
56592
|
56593
|
56594
|
56595
|
56596
|
56597
|
56598
|
56599
|
56600
|
56601
|
56602
|
56603
|
56604
|
56605
|
56606