From: Bill Erickson Date: Mon, 12 May 2014 21:15:46 +0000 (-0400) Subject: patron alerts panel; todo: menu access X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=457a3e7f4306f4f86cede1cada302c0c3b98356d;p=working%2FEvergreen.git patron alerts panel; todo: menu access Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2 index e8996c60ca..b7fdbc2ca7 100644 --- a/Open-ILS/src/templates/staff/circ/patron/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2 @@ -42,7 +42,7 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
  • - [% l('Checkout') %] + [% l('Check Out') %]
  • [% l('Items Out') %] diff --git a/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2 new file mode 100644 index 0000000000..324c56a496 --- /dev/null +++ b/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2 @@ -0,0 +1,49 @@ +
    + + + + +
    +
    +
    +
    +
    [% l('Alert Message') %]
    +
    +
    + {{patron().alert_message()}} +
    +
    +
    +
    + +
    +
    +
    +
    +
    [% l('Penalties') %]
    +
    +
    +
    +
    + {{penalty.org_unit().shortname()}} +
    +
    + {{penalty.standing_penalty().label()}} +
    {{penalty.note()}}
    +
    +
    + {{penalty.set_date() | date:'shortDate'}} +
    +
    +
    +
    +
    +
    + +
    +
    +[% l('Press a navigation button above (for example, Check Out) to clear this alert.') %] +
    +
    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 4da37ae527..493ebc0d94 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 @@ -16,11 +16,14 @@
    -
    {{penalty.note() || penalty.standing_penalty().label()}}
    -
    +
    {{penalty.set_date() | date:'shortDate'}}
    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 bca5e76800..7140993fcd 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js @@ -62,9 +62,11 @@ angular.module('egPatronApp', ['ngRoute', 'ui.bootstrap', resolve : resolver }); - $routeProvider.when('/circ/patron/:id/credentials', { - templateUrl: './circ/patron/t_credentials', - controller: 'PatronVerifyCredentialsCtrl', + // the following require a patron ID + + $routeProvider.when('/circ/patron/:id/alerts', { + templateUrl: './circ/patron/t_alerts', + controller: 'PatronAlertsCtrl', resolve : resolver }); @@ -104,8 +106,12 @@ angular.module('egPatronApp', ['ngRoute', 'ui.bootstrap', resolve : resolver }); + $routeProvider.when('/circ/patron/:id/credentials', { + templateUrl: './circ/patron/t_credentials', + controller: 'PatronVerifyCredentialsCtrl', + resolve : resolver + }); - // default page / bucket view $routeProvider.otherwise({redirectTo : '/circ/patron/search'}); }) @@ -141,6 +147,7 @@ function($q , $timeout , egCore, egUser) { service.holds = []; service.hold_ids = []; service.checkout_overrides = {}; + service.alertsShown = false; } service.resetPatronLists(); // initialize @@ -661,6 +668,7 @@ function($scope, $routeParams , $location , egCore) { egCore.auth.token(), $scope.barcode, $scope.username + ).then(function(resp) { if (Number(resp)) { @@ -687,4 +695,17 @@ function($scope, $routeParams , $location , egCore) { } }]) +.controller('PatronAlertsCtrl', + ['$scope','$routeParams','$location','egCore','patronSvc', +function($scope, $routeParams , $location , egCore , patronSvc) { + patronSvc.alertsShown = true; + + // called with a patron, pre-populate the form args + $scope.initTab('other', $routeParams.id).then( + function() { + } + ); +}]) + + diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js index fcbc4a8bdf..2ae0301d0f 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js @@ -5,12 +5,20 @@ angular.module('egPatronApp').controller('PatronCheckoutCtrl', ['$scope','$q','$modal','$routeParams','egCore','egUser','patronSvc', - 'egGridDataProvider', + 'egGridDataProvider','$location', -function($scope, $q, $modal, $routeParams, egCore, egUser, patronSvc , - egGridDataProvider) { +function($scope , $q , $modal , $routeParams , egCore , egUser , patronSvc , + egGridDataProvider , $location) { - $scope.initTab('checkout', $routeParams.id); + $scope.initTab('checkout', $routeParams.id).then( + function() { + var p = $scope.patron(); + if (!patronSvc.alertsShown && + (p.standing_penalties().length || p.alert_message())) { + $location.path('/circ/patron/' + p.id() + '/alerts'); + } + } + ); $scope.focusMe = true; $scope.checkouts = patronSvc.checkouts;