Attachment 124432 Details for Bug 26544 – Bug 26544: Add housebound details to delivery page

[patch] Bug 26544: Add housebound details to delivery page

Bug-26544-Add-housebound-details-to-delivery-page.patch (text/plain), 5.98 KB, created by Lucas Gass (lukeg) on 2021-09-02 17:06:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas Gass (lukeg)

Created: 2021-09-02 17:06:15 UTC

Size: 5.98 KB

patch

obsolete

>From df9f5f748a50f4e086c3036bfa3dfc8bffe61d4f Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Thu, 29 Jul 2021 22:39:09 +0000
>Subject: [PATCH] Bug 26544: Add housebound details to delivery page
>
>To test:
>1. Turn on the housebound module
>2. go to the housebound for a given patron /cgi-bin/koha/members/housebound.pl?borrowernumber=X
>3. add some housebound details, fill out all the fields
>4. Go to 'Add a new delivery'
>5. No housebound details, hard to know what the patron likes or days to deliver!
>6. apply patch
>7. Go to 'Add a delivery'
>8. See the housebound details, yay! All the line breaks should be preserved.
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>---
> .../prog/en/modules/members/housebound.tt     | 105 +++++++++---------
> 1 file changed, 55 insertions(+), 50 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 51488f2d59..3d4aa3bcd2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>@@ -14,6 +14,58 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'patron-search.inc' %]
> 
>+[% BLOCK 'homebound-details' %]
>+    <div class="rows">
>+        <ol>
>+          <li>
>+            <span class="label" class="required"> Delivery day:</span>
>+            [% hpd = housebound_profile.day %]
>+            [% IF hpd == 'any' %]
>+              Any
>+            [% ELSIF hpd == 'monday' %]
>+              Monday
>+            [% ELSIF hpd == 'tuesday' %]
>+              Tuesday
>+            [% ELSIF hpd == 'wednesday' %]
>+              Wednesday
>+            [% ELSIF hpd == 'thursday' %]
>+              Thursday
>+            [% ELSIF hpd == 'friday' %]
>+              Friday
>+            [% ELSIF hpd == 'saturday' %]
>+              Saturday
>+            [% ELSIF hpd == 'sunday' %]
>+              Sunday
>+            [% END %]
>+          </li>
>+          <li>
>+            <span class="label" class="required">Frequency:</span>
>+            [% AuthorisedValues.GetByCode( 'HSBND_FREQ', housebound_profile.frequency, 0 ) || housebound_profile.frequency | html %]
>+          </li>
>+          <li>
>+            <span class="label">Material:</span><br />
>+            [% housebound_profile.fav_itemtypes | html | html_line_break %]
>+          </li>
>+          <li>
>+            <span class="label">Subjects:</span><br />
>+            [% housebound_profile.fav_subjects | html | html_line_break %]
>+          </li>
>+          <li>
>+            <span class="label">Authors:</span><br />
>+            [% housebound_profile.fav_authors | html | html_line_break %]
>+          </li>
>+          <li>
>+            <span class="label">Referral:</span><br />
>+            [% housebound_profile.referral | html | html_line_break %]
>+          </li>
>+          <li>
>+            <span class="label">Notes:</span><br />
>+            [% housebound_profile.notes | html | html_line_break %]
>+          </li>
>+        </ol>
>+    </div>
>+[% END %]
>+
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>         <li>
>@@ -324,61 +376,14 @@
>                   </a>
>                 </fieldset>
>               </form>
>-
>+              <h3>Housebound details</h3>
>+              [% PROCESS 'homebound-details' %]
>             
>             [% ELSIF ( housebound_profile ) %]
>-              <div class="rows">
>-                <ol>
>-                  <li>
>-                    <span class="label" class="required"> Delivery day:</span>
>-                    [% hpd = housebound_profile.day %]
>-                    [% IF hpd == 'any' %]
>-                      Any
>-                    [% ELSIF hpd == 'monday' %]
>-                      Monday
>-                    [% ELSIF hpd == 'tuesday' %]
>-                      Tuesday
>-                    [% ELSIF hpd == 'wednesday' %]
>-                      Wednesday
>-                    [% ELSIF hpd == 'thursday' %]
>-                      Thursday
>-                    [% ELSIF hpd == 'friday' %]
>-                      Friday
>-                    [% ELSIF hpd == 'saturday' %]
>-                      Saturday
>-                    [% ELSIF hpd == 'sunday' %]
>-                      Sunday
>-                    [% END %]
>-                  </li>
>-                  <li>
>-                    <span class="label" class="required">Frequency:</span>
>-                    [% AuthorisedValues.GetByCode( 'HSBND_FREQ', housebound_profile.frequency, 0 ) || housebound_profile.frequency | html %]
>-                  </li>
>-                  <li>
>-                    <span class="label">Material:</span><br />
>-                    [% housebound_profile.fav_itemtypes | html | html_line_break %]
>-                  </li>
>-                  <li>
>-                    <span class="label">Subjects:</span><br />
>-                    [% housebound_profile.fav_subjects | html | html_line_break %]
>-                  </li>
>-                  <li>
>-                    <span class="label">Authors:</span><br />
>-                    [% housebound_profile.fav_authors | html | html_line_break %]
>-                  </li>
>-                  <li>
>-                    <span class="label">Referral:</span><br />
>-                    [% housebound_profile.referral | html | html_line_break %]
>-                  </li>
>-                  <li>
>-                    <span class="label">Notes:</span><br />
>-                    [% housebound_profile.notes | html | html_line_break %]
>-                  </li>
>-                </ol>
>+                [% PROCESS 'homebound-details' %]
>                 <div class="action">
>                   <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]&method=update_or_create"><i class="fa fa-pencil"></i> Edit</a>
>                 </div>
>-              </div>
>               <div>
>                 <h3>Deliveries</h3>
>                 [% housebound_visits = housebound_profile.housebound_visits %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 26544: 123290 | 123334 | 124432 | 125322