store checkin; psearch prefs

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/circ/checkin/index.tt2 b/Open-ILS/src/templates/staff/circ/checkin/index.tt2
index 89ce0e8..fea404b 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/checkin/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/index.tt2
@@ -151,7 +151,7 @@
       <ul class="dropdown-menu pull-right">
         <li>
           <a href dropdown-toggle 
-            ng-click="modifiers.no_precat_alert=!modifiers.no_precat_alert">
+            ng-click="toggle_mod('no_precat_alert')">
             <span ng-if="modifiers.no_precat_alert" 
               class="label label-success">&#x2713;</span>
             <span ng-if="!modifiers.no_precat_alert"
@@ -161,7 +161,7 @@
         </li>
         <li>
           <a href dropdown-toggle 
-            ng-click="modifiers.noop=!modifiers.noop">
+            ng-click="toggle_mod('noop')">
             <span ng-if="modifiers.noop" 
               class="label label-success">&#x2713;</span>
             <span ng-if="!modifiers.noop"
@@ -171,7 +171,7 @@
         </li>
         <li>
           <a href dropdown-toggle 
-            ng-click="modifiers.void_overdues=!modifiers.void_overdues">
+            ng-click="toggle_mod('void_overdues')">
             <span ng-if="modifiers.void_overdues" 
               class="label label-success">&#x2713;</span>
             <span ng-if="!modifiers.void_overdues"
@@ -181,7 +181,7 @@
         </li>
         <li>
           <a href dropdown-toggle 
-            ng-click="modifiers.auto_print_holds_transits=!modifiers.auto_print_holds_transits">
+            ng-click="toggle_mod('auto_print_holds_transits')">
             <span ng-if="modifiers.auto_print_holds_transits" 
               class="label label-success">&#x2713;</span>
             <span ng-if="!modifiers.auto_print_holds_transits"
@@ -191,7 +191,7 @@
         </li>
         <li>
           <a href dropdown-toggle 
-            ng-click="modifiers.clear_expired=!modifiers.clear_expired">
+            ng-click="toggle_mod('clear_expired')">
             <span ng-if="modifiers.clear_expired" 
               class="label label-success">&#x2713;</span>
             <span ng-if="!modifiers.clear_expired"
@@ -201,7 +201,7 @@
         </li>
         <li>
           <a href dropdown-toggle 
-            ng-click="modifiers.retarget_holds=!modifiers.retarget_holds">
+            ng-click="toggle_mod('retarget_holds')">
             <span ng-if="modifiers.retarget_holds" 
               class="label label-success">&#x2713;</span>
             <span ng-if="!modifiers.retarget_holds"
@@ -211,7 +211,7 @@
         </li>
         <li>
           <a href dropdown-toggle 
-            ng-click="modifiers.retarget_holds_all=!modifiers.retarget_holds_all">
+            ng-click="toggle_mod('retarget_holds_all')">
             <span ng-if="modifiers.retarget_holds_all" 
               class="label label-success">&#x2713;</span>
             <span ng-if="!modifiers.retarget_holds_all"
@@ -221,7 +221,7 @@
         </li>
         <li>
           <a href dropdown-toggle 
-            ng-click="modifiers.hold_as_transit=!modifiers.hold_as_transit">
+            ng-click="toggle_mod('hold_as_transit')">
             <span ng-if="modifiers.hold_as_transit" 
               class="label label-success">&#x2713;</span>
             <span ng-if="!modifiers.hold_as_transit"

diff --git a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
index 7a64110..f47ac93 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
@@ -21,13 +21,6 @@ angular.module('egCheckinApp', ['ngRoute', 'ui.bootstrap',
 function($scope , $q , $window , $location , egCore , checkinSvc , egGridDataProvider , egCirc)  {
 
     var suppress_popups = false;
-    var today = new Date();
-    $scope.focusMe = true;
-    $scope.checkins = checkinSvc.checkins;
-    $scope.checkinArgs = {backdate : today}
-    $scope.using_hatch = egCore.hatch.usingHatch();
-    $scope.modifiers = {};
-    $scope.fine_total = 0;
 
     // run egCore.startup here since it's not handled via resolver
     egCore.startup.go().then(
@@ -42,6 +35,39 @@ function($scope , $q , $window , $location , egCore , checkinSvc , egGridDataPro
         }
     );
 
+    var today = new Date();
+    $scope.focusMe = true;
+    $scope.checkins = checkinSvc.checkins;
+    $scope.checkinArgs = {backdate : today}
+    $scope.using_hatch = egCore.hatch.usingHatch();
+    $scope.modifiers = {};
+    $scope.fine_total = 0;
+
+    // set modifiers from stored preferences
+    angular.forEach(['noop','void_overdues', 'clear_expired',
+        'hold_as_transit','manual_float','no_precat_alert',
+        'auto_print_holds_transits','retarget_holds','retarget_holds_all'],
+        function(mod) {
+            egCore.hatch.getItem('eg.circ.checkin.' + mod)
+            .then(function(val) { 
+                if (val) $scope.modifiers[mod] = true;
+            });
+        }
+    );
+
+    // set / unset a checkin modifier
+    // when set, store the preference
+    $scope.toggle_mod = function(mod) {
+        if ($scope.modifiers[mod]) {
+            $scope.modifiers[mod] = false;
+            egCore.hatch.removeItem('eg.circ.checkin.' + mod);
+        } else {
+            $scope.modifiers[mod] = true;
+            egCore.hatch.setItem('eg.circ.checkin.' + mod, true);
+        }
+    }
+
+
     // ensure the backdate is not in the future
     // note: input type=date max=foo not yet supported anywhere
     $scope.$watch('checkinArgs.backdate', function(newval) {

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
index faf9203..343bb5c 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
@@ -759,8 +759,13 @@ function($scope,  $q,  $routeParams,  $timeout,  $window,  $location,  egCore,
     }
 
     $scope.applyShowExtras = function($event, bool) {
-        $scope.showExtras = bool;
-        egCore.hatch.setItem('eg.prefs.circ.patron.search.showExtras', bool);
+        if (bool) {
+            $scope.showExtras = true;
+            egCore.hatch.setItem('eg.circ.patron.search.show_extras', true);
+        } else {
+            $scope.showExtras = false;
+            egCore.hatch.removeItem('eg.circ.patron.search.show_extras');
+        }
         $event.preventDefault();
     }