patron / item triggered events

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

diff --git a/Open-ILS/src/templates/staff/cat/item/index.tt2 b/Open-ILS/src/templates/staff/cat/item/index.tt2
index 62664af..2232a7d 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/item/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/index.tt2
@@ -9,6 +9,7 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/grid.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/ui.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/file.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/services/eframe.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/item/app.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/record.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/circ/services/billing.js"></script>
@@ -54,14 +55,15 @@
         <span ng-show="context.page == 'detail'">[% l('List View') %]</span>
       </button>
     </div>
+    <!--
     <div class="btn-group btn-pad" dropdown>
       <button type="button" class="btn btn-default dropdown-toggle">
         [% l('Actions for Catalogers') %]<span class="caret"></span>
       </button>
       <ul class="dropdown-menu" role="menu">
-        <li><a href="#"> Pending... </a></li>
       </ul>
-    </div><!-- btn-group -->
+    </div>
+    -->
   </div><!-- flex row -->
 </form>
 

diff --git a/Open-ILS/src/templates/staff/cat/item/t_triggered_events_pane.tt2 b/Open-ILS/src/templates/staff/cat/item/t_triggered_events_pane.tt2
new file mode 100644 (file)
index 0000000..1e32073
--- /dev/null
+++ b/Open-ILS/src/templates/staff/cat/item/t_triggered_events_pane.tt2
@@ -0,0 +1,2 @@
+<eg-embed-frame url="triggered_events_url" handlers="funcs"></eg-embed-frame>
+

diff --git a/Open-ILS/src/templates/staff/cat/item/t_view.tt2 b/Open-ILS/src/templates/staff/cat/item/t_view.tt2
index bbe2993..82920b4 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/item/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_view.tt2
@@ -20,6 +20,9 @@
   <li ng-class="{active : tab == 'cat'}">
     <a href="./cat/item/{{copy.id()}}/cat">[% l('Cataloging Info') %]</a>
   </li>
+  <li ng-class="{active : tab == 'triggered_events'}">
+    <a href="./cat/item/{{copy.id()}}/triggered_events">[% l('Triggered Events') %]</a>
+  </li>
 </ul>
 <div class="tab-content">
   <div class="tab-pane active">

diff --git a/Open-ILS/src/templates/staff/cat/t_triggered_events_pane.tt2 b/Open-ILS/src/templates/staff/cat/t_triggered_events_pane.tt2
new file mode 100644 (file)
index 0000000..1e32073
--- /dev/null
+++ b/Open-ILS/src/templates/staff/cat/t_triggered_events_pane.tt2
@@ -0,0 +1,2 @@
+<eg-embed-frame url="triggered_events_url" handlers="funcs"></eg-embed-frame>
+

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index 257462f..9f08139 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -126,6 +126,11 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
             </a>
           </li>
           <li>
+            <a href="./circ/patron/{{patron().id()}}/triggered_events">
+              [% l('Triggered Events / Notifications') %]
+            </a>
+          </li>
+          <li>
             <a href="./circ/patron/{{patron().id()}}/stat_cats">
               [% l('Statistical Categories') %]
             </a>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
index 85acb8f..1f09c77 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
@@ -50,6 +50,7 @@
       </div>
     </div>
     <div class="row"
+      ng-show="patron_stats().fines.group_balance_owed > patron_stats().fines.balance_owed"
       ng-class="{'patron-summary-alert' : patron_stats().fines.group_balance_owed}">
       <div class="col-md-5">[% l('Group Fines') %]</div>
       <div class="col-md-7">

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_triggered_events.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_triggered_events.tt2
new file mode 100644 (file)
index 0000000..fe5091f
--- /dev/null
+++ b/Open-ILS/src/templates/staff/circ/patron/t_triggered_events.tt2
@@ -0,0 +1,3 @@
+<!-- insert the patron registration UI -->
+<eg-embed-frame url="triggered_events_url" handlers="funcs"></eg-embed-frame>
+

diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
index 71d45cd..82ed923 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -198,6 +198,12 @@ function($scope , $q , $location , $timeout , egCore , egGridDataProvider , item
             $location.path('/cat/item/' + item.id);
     }
 
+    $scope.context.show_triggered_events = function() {
+        var item = copyGrid.selectedItems()[0];
+        if (item) 
+            $location.path('/cat/item/' + item.id + '/triggered_events');
+    }
+
 }])
 
 /**
@@ -508,6 +514,12 @@ function($scope , $q , $location , $routeParams , egCore , itemSvc , egBilling)
                 loadHolds()
                 loadTransits();
                 break;
+
+            case 'triggered_events':
+                var url = $location.absUrl().replace(/\/staff.*/, '/actor/user/event_log');
+                url += '?copy_id=' + encodeURIComponent(copyId);
+                $scope.triggered_events_url = url;
+                $scope.funcs = {};
         }
     }
 
@@ -520,6 +532,9 @@ function($scope , $q , $location , $routeParams , egCore , itemSvc , egBilling)
         loadCopy(args.barcode).then(loadTabData);
     }
 
+    $scope.context.show_triggered_events = function() {
+        $location.path('/cat/item/' + copyId + '/triggered_events');
+    }
+
     loadCopy().then(loadTabData);
 }])
-

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 275ccfc..2291c0c 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
@@ -174,6 +174,12 @@ angular.module('egPatronApp', ['ngRoute', 'ui.bootstrap',
         resolve : resolver
     });
 
+    $routeProvider.when('/circ/patron/:id/triggered_events', {
+        templateUrl: './circ/patron/t_triggered_events',
+        controller: 'PatronTriggeredEventsCtrl',
+        resolve : resolver
+    });
+
     $routeProvider.when('/circ/patron/:id/group', {
         templateUrl: './circ/patron/t_group',
         controller: 'PatronGroupCtrl',
@@ -1123,10 +1129,7 @@ function($scope,  $routeParams,  $location , egCore , patronSvc) {
     $scope.initTab('edit', $routeParams.id);
 
     var url = $location.absUrl().replace(/\/staff.*/, '/actor/user/register');
-
-    // since we don't store auth cookies, pass the ses via URL
-    url += '?ses=' + egCore.auth.token();
-    url += '&usr=' + encodeURIComponent($routeParams.id);
+    url += '?usr=' + encodeURIComponent($routeParams.id);
 
     $scope.funcs = {
         on_save : function() {
@@ -1481,4 +1484,16 @@ function($scope , $location , egCore) {
 
     $scope.no_last = true;
 }])
- 
+
+.controller('PatronTriggeredEventsCtrl',
+       ['$scope','$routeParams','$location','egCore','patronSvc',
+function($scope,  $routeParams,  $location , egCore , patronSvc) {
+    $scope.initTab('other', $routeParams.id);
+
+    var url = $location.absUrl().replace(/\/staff.*/, '/actor/user/event_log');
+    url += '?patron_id=' + encodeURIComponent($routeParams.id);
+
+    $scope.triggered_events_url = url;
+    $scope.funcs = {};
+}])
+