From 20c2ea7d3a6e24dd13cf3e6dd47108984852607d Mon Sep 17 00:00:00 2001
From: Alex Sassmannshausen <alex.sassmannshausen@ptfs-europe.com>
Date: Thu, 13 Oct 2016 12:37:50 +0200
Subject: [PATCH] Bug 5670: [Followup] Add 'step 4' edit button.

* koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt:
  Place housebound role form inside the 'step 4' section.
* koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt:
  Add 'step 4' edit button for housebound role.

Signed-off-by: Claire Gravely <claire_gravely@hotmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../prog/en/modules/members/memberentrygen.tt | 101 +++++++++---------
 .../prog/en/modules/members/moremember.tt     |  52 ++++-----
 2 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 8d7e2c76aa..c58185f601 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -917,55 +917,6 @@ $(document).ready(function() {
 		</ol>
 		</fieldset>
         [% END # hide fieldset %][% END %]
-        [% IF ( HouseboundModule ) %]
-        <fieldset class="rows" id="memberentry_housebound_roles">
-          <legend id="housebound_roles">Housebound roles</legend>
-          <ol class="radio">
-            <li>
-              <label class="radio" for="housebound_chooser">
-                Chooser:
-              </label>
-              [% IF ( housebound_role.housebound_chooser == 1 ) %]
-              <label for="yes_housebound_chooser">Yes </label>
-              <input type="radio" id="yes_housebound_chooser"
-                     name="housebound_chooser" value="1"
-                     checked="checked" />
-              <label for="no_housebound_chooser">No </label>
-              <input type="radio" id="no_housebound_chooser"
-                     name="housebound_chooser" value="0" />
-              [% ELSE %]
-              <label for="yes_housebound_chooser">Yes </label>
-              <input type="radio" id="yes_housebound_chooser"
-                     name="housebound_chooser" value="1" />
-              <label for="no_housebound_chooser">No </label>
-              <input type="radio" id="no_housebound_chooser"
-                     name="housebound_chooser" value="0"
-                     checked="checked" />
-              [% END %]
-            </li>
-            <li>
-              <label class="radio" for="housebound_deliverer">Deliverer:</label>
-              [% IF ( housebound_role.housebound_deliverer == 1 ) %]
-              <label for="yes_housebound_deliverer">Yes </label>
-              <input type="radio" id="yes_housebound_deliverer"
-                     name="housebound_deliverer" value="1"
-                     checked="checked" />
-              <label for="no_housebound_deliverer">No </label>
-              <input type="radio" id="no_housebound_deliverer"
-                     name="housebound_deliverer" value="0" />
-              [% ELSE %]
-              <label for="yes_housebound_deliverer">Yes </label>
-              <input type="radio" id="yes_housebound_deliverer"
-                     name="housebound_deliverer" value="1" />
-              <label for="no_housebound_deliverer">No </label>
-              <input type="radio" id="no_housebound_deliverer"
-                     name="housebound_deliverer" value="0"
-                     checked="checked" />
-              [% END %]
-            </li>
-          </ol>
-        </fieldset>
-        [% END # hide fieldset %]
 		<!--this zones are not necessary in modif mode -->
         [% UNLESS ( opadd || opduplicate ) %]
         <fieldset class="rows" id="memberentry_account_flags">
@@ -1061,7 +1012,57 @@ $(document).ready(function() {
 
 [% END %]
 
-[% IF ( step_4 ) %][% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
+[% IF ( step_4 ) %]
+[% IF ( HouseboundModule ) %]
+  <fieldset class="rows" id="memberentry_housebound_roles">
+    <legend id="housebound_roles">Housebound roles</legend>
+    <ol class="radio">
+      <li>
+        <label class="radio" for="housebound_chooser">
+          Chooser:
+        </label>
+        [% IF ( housebound_role.housebound_chooser == 1 ) %]
+        <label for="yes_housebound_chooser">Yes </label>
+        <input type="radio" id="yes_housebound_chooser"
+               name="housebound_chooser" value="1"
+               checked="checked" />
+        <label for="no_housebound_chooser">No </label>
+        <input type="radio" id="no_housebound_chooser"
+               name="housebound_chooser" value="0" />
+        [% ELSE %]
+        <label for="yes_housebound_chooser">Yes </label>
+        <input type="radio" id="yes_housebound_chooser"
+               name="housebound_chooser" value="1" />
+        <label for="no_housebound_chooser">No </label>
+        <input type="radio" id="no_housebound_chooser"
+               name="housebound_chooser" value="0"
+               checked="checked" />
+        [% END %]
+      </li>
+      <li>
+        <label class="radio" for="housebound_deliverer">Deliverer:</label>
+        [% IF ( housebound_role.housebound_deliverer == 1 ) %]
+        <label for="yes_housebound_deliverer">Yes </label>
+        <input type="radio" id="yes_housebound_deliverer"
+               name="housebound_deliverer" value="1"
+               checked="checked" />
+        <label for="no_housebound_deliverer">No </label>
+        <input type="radio" id="no_housebound_deliverer"
+               name="housebound_deliverer" value="0" />
+        [% ELSE %]
+        <label for="yes_housebound_deliverer">Yes </label>
+        <input type="radio" id="yes_housebound_deliverer"
+               name="housebound_deliverer" value="1" />
+        <label for="no_housebound_deliverer">No </label>
+        <input type="radio" id="no_housebound_deliverer"
+               name="housebound_deliverer" value="0"
+               checked="checked" />
+        [% END %]
+      </li>
+    </ol>
+  </fieldset>
+[% END # hide fieldset %]
+[% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
   <fieldset class="rows" id="memberentry_patron_attributes">
     <legend id="patron_attributes_lgd">Additional attributes and identifiers</legend>
     <input type="hidden" name="setting_extended_patron_attributes" value="1" />
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 8e92c564a3..94f9bb9843 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -318,6 +318,33 @@ function validate1(date) {
 
 <!-- End Upload Patron Image Section -->
 
+[% IF ( HouseboundModule ) %]
+<div id="houseboundroles">
+<h3>Housebound roles</h3>
+<div class="rows">
+  <ol>
+    <li>
+      <span class="label">Chooser:</span>
+      [% IF ( housebound_role.housebound_chooser == 1 ) %]
+        Yes
+      [% ELSE %]
+        No
+      [% END %]
+    </li>
+    <li>
+      <span class="label">Deliverer:</span>
+      [% IF ( housebound_role.housebound_deliverer == 1 ) %]
+        Yes
+      [% ELSE %]
+        No
+      [% END %]
+    </li>
+  </ol>
+</div>
+</div>
+<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=4">Edit</a></div>
+[% END %]
+
 [% IF ( ExtendedPatronAttributes ) %]
 [% UNLESS ( no_patron_attribute_types ) %]
 <div id="patron-extended-attributes" style="padding-top: 1em;">
@@ -348,31 +375,6 @@ function validate1(date) {
 [% END %]
 [% END %]
 
-[% IF ( HouseboundModule ) %]
-<div id="houseboundroles">
-<h3>Housebound roles</h3>
-<div class="rows">
-  <ol>
-    <li>
-      <span class="label">Chooser:</span>
-      [% IF ( housebound_role.housebound_chooser == 1 ) %]
-        Yes
-      [% ELSE %]
-        No
-      [% END %]
-    </li>
-    <li>
-      <span class="label">Deliverer:</span>
-      [% IF ( housebound_role.housebound_deliverer == 1 ) %]
-        Yes
-      [% ELSE %]
-        No
-      [% END %]
-    </li>
-  </ol>
-</div>
-</div>
-[% END %]
 
 [% IF ( EnhancedMessagingPreferences ) %]
 <div id="patron-messaging-prefs" style="padding-top: 1em;">
-- 
2.39.5