From 8d8dd0dfdd838e01a1b0a00acb452178612d9547 Mon Sep 17 00:00:00 2001
From: Cesar Velez <cesar.velez@equinoxinitiative.org>
Date: Thu, 12 Oct 2017 17:31:37 -0400
Subject: [PATCH] LP#1719967 - Add alert message field to volcopy editor

As 1676608 was deferred to 3.1, this adds a copy alert_message
field, to the volcopy editor. The defaults tab "Alerts" checkbox has
been replaced by "Alert Message" and this new field will be active until replaced by
the changes of 3.1.

Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../templates/staff/cat/volcopy/t_attr_edit.tt2    | 34 ++++++++++++++++++----
 .../src/templates/staff/cat/volcopy/t_defaults.tt2 |  5 ++--
 .../web/js/ui/default/staff/cat/volcopy/app.js     |  5 +++-
 3 files changed, 35 insertions(+), 9 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 d67c833113..4916745225 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
@@ -98,7 +98,7 @@
             <b>[% l('Status') %]</b>
         </div>
         <div class="col-md-4">
-            <b>[% l('Statistical Categories') %]</b>
+            <b>[% l('Copy Alert') %]</b>
         </div>
     </div>
 
@@ -138,6 +138,7 @@
                 <div class="col-md-6">
                     <b>[% l('Reference?') %]</b>
                 </div>
+                
             </div>
 
             <div class="row">
@@ -405,13 +406,33 @@
         </div>
 
         <div class="col-md-4">
+            
+            <div class="row" >
+                <div class="col-xs-12">
+                    <div class="row">
+                        <div class="nullable col-xs-12">
+                            <input class="form-control" type="text" ng-model="working.alert_message"
+                                ng-disabled="!defaults.attributes.alert_message" placeholder="Alert message" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row pad-vert"></div>
             <div class="row">
                 <div class="col-xs-12">
-                    <select class="form-control" ng-disabled="!defaults.statcats"
-                        ng-model="working.statcat_filter"
-                        ng-options="o.id() as o.shortname() for o in statcat_filter_list">
-                      <option value="">[% l('Filter by Library') %]</option>
-                    </select>
+                    <div class="row bg-info">
+                        <div class="col-xs-12">
+                            <b>Statistical Categories</b>
+                        </div>
+                    </div>
+                    <div class="row">
+			    <select class="form-control" ng-disabled="!defaults.statcats"
+				ng-model="working.statcat_filter"
+				ng-options="o.id() as o.shortname() for o in statcat_filter_list">
+			      <option value="">[% l('Filter by Library') %]</option>
+			    </select>
+                    </div>
                 </div>
             </div>
 
@@ -437,6 +458,7 @@
                     </div>
                 </div>
             </div>
+
         </div>
 
     </div>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
index 44b328beb0..d959594b7e 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
@@ -102,8 +102,9 @@
                 </div>
                 <div class="col-xs-6">
                     <label>
-                        <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alerts"/>
-                        [% l('Alerts') %]
+                        <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alert_message"/>
+                        <!-- <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alerts"/> -->
+                        [% l('Alert Message') %]
                     </label>
                 </div>
             </div>
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 e7d9f003c7..5626129a33 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
@@ -833,7 +833,8 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
             location : true,
             holdable : true,
             age_protect : true,
-            floating : true
+            floating : true,
+            alert_message : true
         }
     };
 
@@ -1576,6 +1577,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
         createSimpleUpdateWatcher('mint_condition');
         createSimpleUpdateWatcher('opac_visible');
         createSimpleUpdateWatcher('ref');
+        createSimpleUpdateWatcher('alert_message');
 
         $scope.saveCompletedCopies = function (and_exit) {
             var cnHash = {};
@@ -2011,6 +2013,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                 createSimpleUpdateWatcher('mint_condition');
                 createSimpleUpdateWatcher('opac_visible');
                 createSimpleUpdateWatcher('ref');
+                createSimpleUpdateWatcher('alert_message');
 
                 $scope.suffix_list = [];
                 itemSvc.get_suffixes(egCore.auth.user().ws_ou()).then(function(list){
-- 
2.11.0