From d6fba7b4c4c63c2eb3f16f099dd52904fb158279 Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@equinoxinitiative.org>
Date: Thu, 8 Jun 2017 01:02:17 -0400
Subject: [PATCH] lp1686459 webstaff: item editor form validation

Specifically for stat cats, we mark the select statements as required if the
corresponding stat cat is required, but we can also start using HTML5 validation
tests elsewhere in the form now as well.

I also fixed the <NONE> entries so that they display instead of blank entries,
and forced the Price, Cost, and Deposit Amount fields to be of input type number,
though you could still enter invalid numbers here from the database's POV, so
better validation tests are still needed there.

Signed-off-by: Jason Etheridge <jason@equinoxinitiative.org>
Signed-off-by: Andrea Neiman <abneiman@equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../staff/cat/volcopy/t_attr_edit.tt2         | 33 ++++++++++++-------
 .../templates/staff/cat/volcopy/t_edit.tt2    |  2 +-
 .../js/ui/default/staff/cat/volcopy/app.js    |  6 +++-
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index 0d61a68aa9..12f1f77c11 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -1,4 +1,12 @@
-<div class="container-fluid">
+<style type="text/css">
+  .css-form input.ng-invalid {
+    background-color: #FA787E;
+  }
+  .css-form select.ng-invalid {
+    background-color: #FA787E;
+  }
+</style>
+<div class="container-fluid"><form novalidate class="css-form" name="forms.myForm">
     <div class="row bg-info">
         <div class="col-md-1">
             <h5>[% l('Template') %]</h5>
@@ -51,7 +59,7 @@
         </div>
         <div class="nullable col-md-2" ng-class="{'bg-success': working.callnumber.classification !== undefined}">
             <select class="form-control" ng-model="working.callnumber.classification" ng-options="cl.id() as cl.name() for cl in classification_list">
-                <option value="">[% l('<NONE>') %]</option>
+                <option value="">[% l('&lt;NONE&gt;') %]</option>
             </select>
         </div>
         <div class="col-md-1 bg-info">
@@ -59,7 +67,7 @@
         </div>
         <div class="nullable col-xs-2" ng-class="{'bg-success': working.callnumber.prefix !== undefined}">
             <select class="form-control" ng-model="working.callnumber.prefix" ng-options="p.id() as p.label() for p in prefix_list">
-                <option value="">[% l('<NONE>') %]</option>
+                <option value="">[% l('&lt;NONE&gt;') %]</option>
             </select>
         </div>
         <div class="col-md-1 bg-info">
@@ -67,7 +75,7 @@
         </div>
         <div class="nullable col-md-2" ng-class="{'bg-success': working.callnumber.suffix !== undefined}">
             <select class="form-control" ng-model="working.callnumber.suffix" ng-options="s.id() as s.label() for s in suffix_list">
-                <option value="">[% l('<NONE>') %]</option>
+                <option value="">[% l('&lt;NONE&gt;') %]</option>
             </select>
         </div>
     </div>
@@ -213,11 +221,11 @@
                         ng-disabled="!defaults.attributes.circ_modifier" ng-model="working.circ_modifier"
                         ng-options="m.code() as m.name() for m in circ_modifier_list | orderBy: 'name()'"
                     >
-                        <option value="">[% l('<NONE>') %]</option>
+                        <option value="">[% l('&lt;NONE&gt;') %]</option>
                     </select>
                 </div>
                 <div class="col-md-6" ng-class="{'bg-success': working.price !== undefined}">
-                    <input class="form-control" ng-disabled="!defaults.attributes.price" ng-model="working.price" type="text"/>
+                    <input class="form-control" ng-disabled="!defaults.attributes.price" ng-model="working.price" type="number"/>
                 </div>
             </div>
 
@@ -241,7 +249,7 @@
                     </select>
                 </div>
                 <div class="col-md-6" ng-class="{'bg-success': working.cost !== undefined}">
-                    <input class="form-control" ng-disabled="!defaults.attributes.cost" ng-model="working.cost" type="text"/>
+                    <input class="form-control" ng-disabled="!defaults.attributes.cost" ng-model="working.cost" type="number"/>
                 </div>
             </div>
 
@@ -261,7 +269,7 @@
                     <select class="form-control"
                         ng-disabled="!defaults.attributes.circ_as_type" ng-model="working.circ_as_type"
                         ng-options="t.code() as t.value() for t in circ_type_list">
-                      <option value="">[% l('<NONE>') %]</option>
+                      <option value="">[% l('&lt;NONE&gt;') %]</option>
                     </select>
                 </div>
                 <div class="col-md-6" ng-class="{'bg-success': working.deposit !== undefined}">
@@ -311,7 +319,7 @@
                     </div>
                 </div>
                 <div class="col-md-6" ng-class="{'bg-success': working.deposit_amount !== undefined}">
-                    <input class="form-control" ng-disabled="!defaults.attributes.deposit_amount" ng-model="working.deposit_amount" type="text"/>
+                    <input class="form-control" ng-disabled="!defaults.attributes.deposit_amount" ng-model="working.deposit_amount" type="number"/>
                 </div>
             </div>
 
@@ -421,8 +429,9 @@
                             <select class="form-control" ng-disabled="!defaults.statcats"
                                 ng-change="statcatUpdate(sc.id())"
                                 ng-model="working.statcats[sc.id()]"
-                                ng-options="e.id() as e.value() for e in sc.entries()">
-                                <option value="">[% l('<NONE>') %]</option>
+                                ng-options="e.id() as e.value() for e in sc.entries()"
+                                ng-required="sc.required() == 't'">
+                                <option value="">[% l('&lt;NONE&gt;') %]</option>
                             </select>
                         </div>
                     </div>
@@ -432,4 +441,4 @@
 
     </div>
 </div>
-</div>
+</form></div>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
index 526673423e..886d41cd40 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
@@ -112,7 +112,7 @@
                           after-select="afterItemSelect"
                           persist-key="cat.volcopy.copies">
         
-                          <eg-grid-menu-item handler="workingToComplete"
+                          <eg-grid-menu-item disabled="disableSave" handler="workingToComplete"
                            label="[% l('Store Selected') %]"></eg-grid-menu-item>
                           <eg-grid-menu-item disabled="disableSave" handler="workingSaveAndExit"
                            label="[% l('Save & Exit') %]"></eg-grid-menu-item>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index def7cdcb2a..644be2f378 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -779,6 +779,8 @@ function(egCore , $q) {
        ['$scope','$q','$window','$routeParams','$location','$timeout','egCore','egNet','egGridDataProvider','itemSvc','$uibModal',
 function($scope , $q , $window , $routeParams , $location , $timeout , egCore , egNet , egGridDataProvider , itemSvc , $uibModal) {
 
+    $scope.forms = {}; // Accessed by t_attr_edit.tt2
+
     $scope.defaults = { // If defaults are not set at all, allow everything
         barcode_checkdigit : false,
         auto_gen_barcode : false,
@@ -1285,7 +1287,9 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                         can_save = false;
                 }
             );
-
+            if ($scope.forms.myForm && $scope.forms.myForm.$invalid) {
+                can_save = false;
+            }
             $scope.can_save = can_save;
         }
 
-- 
2.43.2