View | Details | Raw Unified | Return to bug 5670
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt (-17 / +10 lines)
Lines 14-27 Link Here
14
<title>Koha &rsaquo; Housebound &rsaquo; Details for [% INCLUDE 'patron-title.inc' %]</title>
14
<title>Koha &rsaquo; Housebound &rsaquo; Details for [% INCLUDE 'patron-title.inc' %]</title>
15
[% INCLUDE 'doc-head-close.inc' %]
15
[% INCLUDE 'doc-head-close.inc' %]
16
[% INCLUDE 'calendar.inc' %]
16
[% INCLUDE 'calendar.inc' %]
17
<script type="text/javascript">
18
//<![CDATA[
19
$(document).ready(function() {
20
  $("#date").datepicker({ minDate: 0, dateFormat: "yy-mm-dd" });
21
});
22
//]]>
23
</script>
24
25
</head>
17
</head>
26
<body>
18
<body>
27
[% INCLUDE 'header.inc' %]
19
[% INCLUDE 'header.inc' %]
Lines 46-52 $(document).ready(function() { Link Here
46
38
47
          <!-- Title -->
39
          <!-- Title -->
48
          <h3>Housebound details for [% patron.title %] [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</h3>
40
          <h3>Housebound details for [% patron.title %] [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</h3>
49
          <div class="yui-u first">
41
          <div class="first">
50
42
51
            [% FOR m IN messages %]
43
            [% FOR m IN messages %]
52
                <div class="dialog [% m.type %]">
44
                <div class="dialog [% m.type %]">
Lines 216-222 $(document).ready(function() { Link Here
216
            <!-- Create or edit housebound_visit -->
208
            <!-- Create or edit housebound_visit -->
217
            [% ELSIF ( method == 'visit_update_or_create' ) %]
209
            [% ELSIF ( method == 'visit_update_or_create' ) %]
218
              <h4>Manage housebound deliveries</h4>
210
              <h4>Manage housebound deliveries</h4>
219
              <form name="form" id="instance_form" method="post"
211
              <form name="form" id="instance_form" method="post" class="toggler"
220
                    action="/cgi-bin/koha/members/housebound.pl">
212
                    action="/cgi-bin/koha/members/housebound.pl">
221
                [% IF ( visit ) %]
213
                [% IF ( visit ) %]
222
                  <input type="hidden" name="method" value="editvisitconfirm" />
214
                  <input type="hidden" name="method" value="editvisitconfirm" />
Lines 229-243 $(document).ready(function() { Link Here
229
                  <legend>Delivery details</legend>
221
                  <legend>Delivery details</legend>
230
                  <ol>
222
                  <ol>
231
                    <li>
223
                    <li>
232
                      <label for="date">Date: </label>
224
                      <label for="date" class="required">Date: </label>
233
                      [% IF ( visit ) %]
225
                      [% IF ( visit ) %]
234
                        <input type="text" id="date" name="date" size="20"
226
                        <input type="text" id="date" class="datepicker"
235
                               value="[% visit.appointment_date %]"
227
                               value="[% visit.appointment_date | $KohaDates %]"
236
                               required="required"/>
228
                               name="date" size="20" required="required"/>
237
                      [% ELSE %]
229
                      [% ELSE %]
238
                        <input type="text" id="date" name="date" size="20"
230
                        <input type="text" id="date" class="datepicker"
239
                               value="" required="required"/>
231
                               value="" name="date" size="20" required="required"/>
240
                      [% END %]
232
                      [% END %]
233
                      <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
241
                    </li>
234
                    </li>
242
                    <li>
235
                    <li>
243
                      <label for="segment">Time:</label>
236
                      <label for="segment">Time:</label>
Lines 418-424 $(document).ready(function() { Link Here
418
                    [% FOREACH entry IN housebound_visits %]
411
                    [% FOREACH entry IN housebound_visits %]
419
                    <tr>
412
                    <tr>
420
                      <td>[% entry.id %]</td>
413
                      <td>[% entry.id %]</td>
421
                      <td>[% entry.appointment_date %] ([% entry.day_segment %])</td>
414
                      <td>[% entry.appointment_date | $KohaDates %] ([% entry.day_segment %])</td>
422
                      <td>
415
                      <td>
423
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.chooser.borrowernumber %]">
416
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.chooser.borrowernumber %]">
424
                          [% INCLUDE 'patron-title.inc' borrowernumber = entry.chooser.borrowernumber category_type = entry.chooser.category_type firstname = entry.chooser.firstname surname = entry.chooser.surname othernames = entry.chooser.othernames cardnumber = entry.chooser.cardnumber invert_name = 0 %]
417
                          [% INCLUDE 'patron-title.inc' borrowernumber = entry.chooser.borrowernumber category_type = entry.chooser.category_type firstname = entry.chooser.firstname surname = entry.chooser.surname othernames = entry.chooser.othernames cardnumber = entry.chooser.cardnumber invert_name = 0 %]
(-)a/members/housebound.pl (-11 / +12 lines)
Lines 28-33 use Modern::Perl; Link Here
28
use CGI;
28
use CGI;
29
use C4::Auth;
29
use C4::Auth;
30
use C4::Output;
30
use C4::Output;
31
use DateTime;
32
use Koha::DateUtils;
31
use Koha::Libraries;
33
use Koha::Libraries;
32
use Koha::Patrons;
34
use Koha::Patrons;
33
use Koha::Patron::Categories;
35
use Koha::Patron::Categories;
Lines 125-135 if ( $method eq 'updateconfirm' and $houseboundprofile ) { Link Here
125
    # We have received input for editing a visit.  We must store and return to
127
    # We have received input for editing a visit.  We must store and return to
126
    # simple display.
128
    # simple display.
127
    $visit->set({
129
    $visit->set({
128
        borrowernumber      => $input->param('borrowernumber') // q{},
130
        borrowernumber      => $input->param('borrowernumber')      // q{},
129
        appointment_date    => $input->param('date')           // q{},
131
        appointment_date    => dt_from_string($input->param('date') // q{}),
130
        day_segment         => $input->param('segment')        // q{},
132
        day_segment         => $input->param('segment')             // q{},
131
        chooser_brwnumber   => $input->param('chooser')        // q{},
133
        chooser_brwnumber   => $input->param('chooser')             // q{},
132
        deliverer_brwnumber => $input->param('deliverer')      // q{},
134
        deliverer_brwnumber => $input->param('deliverer')           // q{},
133
    });
135
    });
134
    my $success = eval { return $visit->store };
136
    my $success = eval { return $visit->store };
135
    push @messages, { type => 'error', code => 'error_on_visit_store' }
137
    push @messages, { type => 'error', code => 'error_on_visit_store' }
Lines 139-149 if ( $method eq 'updateconfirm' and $houseboundprofile ) { Link Here
139
    # We have received input for creating a visit.  We must store and return
141
    # We have received input for creating a visit.  We must store and return
140
    # to simple display.
142
    # to simple display.
141
    my $visit = Koha::Patron::HouseboundVisit->new({
143
    my $visit = Koha::Patron::HouseboundVisit->new({
142
        borrowernumber      => $input->param('borrowernumber') // q{},
144
        borrowernumber      => $input->param('borrowernumber')      // q{},
143
        appointment_date    => $input->param('date')           // q{},
145
        appointment_date    => dt_from_string($input->param('date') // q{}),
144
        day_segment         => $input->param('segment')        // q{},
146
        day_segment         => $input->param('segment')             // q{},
145
        chooser_brwnumber   => $input->param('chooser')        // q{},
147
        chooser_brwnumber   => $input->param('chooser')             // q{},
146
        deliverer_brwnumber => $input->param('deliverer')      // q{},
148
        deliverer_brwnumber => $input->param('deliverer')           // q{},
147
    });
149
    });
148
    my $success = eval { return $visit->store };
150
    my $success = eval { return $visit->store };
149
    push @messages, { type => 'error', code => 'error_on_visit_create' }
151
    push @messages, { type => 'error', code => 'error_on_visit_create' }
150
- 

Return to bug 5670