From 997e45aa27126442f1e3441a8b4d4e734a1fe365 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 26 Apr 2017 12:42:21 -0400
Subject: [PATCH] LP#1618949 Required patron stats format repairs

Fixes a broken div column class, which caused the patron stat cats to
stretch across the page.

Other div nesting/formatting fixes and additional inline code comments.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../templates/staff/circ/patron/t_edit.tt2    | 71 +++++++++----------
 .../js/ui/default/staff/circ/patron/regctl.js |  5 +-
 2 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 073ccd4237..4f4cc6e43e 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -860,50 +860,43 @@ within the "form" by name for validation.
 <div class="row reg-field-row"
      ng-show="show_field('stat_cats') || hasRequiredStatCat" ng-repeat="cat in stat_cats">
      <!-- Display this stat cat when displaying all stat cats
-       or when this stat cat is required.  Wrap the body of 
+       or when this stat cat is required.  Wrap the body of
        stat cat display in a div for easy show/hide.  -->
   <div ng-if="show_field('stat_cats') || cat.required() == 1">
-  <div class="col-md-3 reg-field-label">
-    <label>{{cat.name()}}</label>
-  </div>
-  <div class="reg-field-input">
-
-    <!-- Editable typeahead is not support in this version of 
-        angularjs-bootstrap.  Requires Angular 1.4 and 
-        angularjs-bootstrap version 1.1+ -->
-
-    <!-- typeahead is wonky.  Consider updating -->
-    <!--
-    <input type="text" ng-model="stat_cat_entry_maps[cat.id()]"
-      typeahead="value as entry.value() for entry in cat.entries() | filter:$viewValue | limitTo:8" 
-      class="form-control">
-    -->
-    
-    <div ng-if="cat.entries().length != 0">
-      <div class="btn-group" uib-dropdown>
-        <button type="button" class="btn btn-default" uib-dropdown-toggle>
-          <span style="padding-right: 5px;">
-            {{stat_cat_entry_maps[cat.id()]}}</span>
-          <span class="caret"></span>
-        </button>
-        <ul uib-dropdown-menu>
-          <li ng-repeat="entry in cat.entries()">
-            <a href 
-              ng-click="field_modified();stat_cat_entry_maps[cat.id()]=entry.value()"> 
-              {{entry.value()}}
-            </a>
-          </li>
-        </ul>
+
+    <div class="col-md-3 reg-field-label">
+      <label>{{cat.name()}}</label>
+    </div>
+    <div class="col-md-3 reg-field-input">
+      <div ng-if="cat.entries().length != 0">
+        <div class="btn-group" uib-dropdown>
+          <button type="button" class="btn btn-default" uib-dropdown-toggle>
+            <span style="padding-right: 5px;">
+              {{stat_cat_entry_maps[cat.id()]}}</span>
+            <span class="caret"></span>
+          </button>
+          <ul uib-dropdown-menu>
+            <li ng-repeat="entry in cat.entries()">
+              <a href
+                ng-click="field_modified();stat_cat_entry_maps[cat.id()]=entry.value()">
+                {{entry.value()}}
+              </a>
+            </li>
+          </ul>
+        </div>
       </div>
     </div>
-  </div>
 
-  <!-- Stat cat retrieval API uses open-ils.storage under the covers
-      which represents DB bools at 1/0 instead of cstore-style t/f -->
-  <div class="col-md-3 reg-field-input" ng-show="show_field('stat_cats') || hasRequiredStatCat" ng-if="cat.allow_freetext() == '1'">
-    <input type="text" ng-model="stat_cat_entry_maps[cat.id()]" class="form-control" ng-required="cat.required() == 1"/>
-  </div>
-  </div><!-- show/hide -->
+    <!-- Stat cat retrieval API uses open-ils.storage under the covers
+        which represents DB bools at 1/0 instead of cstore-style t/f -->
+    <div class="col-md-3 reg-field-input"
+      ng-show="show_field('stat_cats') || hasRequiredStatCat"
+      ng-if="cat.allow_freetext() == '1'">
+      <input type="text" ng-model="stat_cat_entry_maps[cat.id()]"
+        class="form-control" ng-required="cat.required() == 1"/>
+    </div>
+
+  </div><!-- show/hide wrapper -->
 </div>
 
 <!-- surveys -->
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index d6e1c47236..02e9902606 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -1216,9 +1216,10 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
         if ($scope.patron.isnew) 
             set_new_patron_defaults(prs);
 
+        // Stat cats are fetched from open-ils.storage, where 't'==1
         $scope.hasRequiredStatCat = prs.stat_cats.filter(
                 function(cat) {return cat.required() == 1} ).length > 0;
-            
+
         $scope.page_data_loaded = true;
 
         prs.set_field_patterns(field_patterns);
@@ -1274,7 +1275,7 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
         'stat_cats' : 1,
         'surveys' : 1
     }; 
-    
+
     // Returns true if the selected field should be visible
     // given the current required/suggested/all setting.
     // The visibility flag applied to each field as a result of calling
-- 
2.43.2