From: Bill Erickson Date: Mon, 28 Jul 2014 18:59:15 +0000 (-0400) Subject: scan missing pieces X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9683fcbc65b7939f3d5364155792ebd34461b1ab;p=working%2FEvergreen.git scan missing pieces Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/templates/staff/cat/item/missing_pieces.tt2 b/Open-ILS/src/templates/staff/cat/item/missing_pieces.tt2 new file mode 100644 index 0000000000..2581ba7274 --- /dev/null +++ b/Open-ILS/src/templates/staff/cat/item/missing_pieces.tt2 @@ -0,0 +1,69 @@ +[% + WRAPPER "staff/base.tt2"; + ctx.page_title = l("Scan Item as Missing Pieces"); + ctx.page_app = "egItemMissingPieces"; + ctx.page_ctrl = "MissingPiecesCtrl"; +%] + +[% BLOCK APP_JS %] + + + + +[% END %] + +
+
+ [% l('Scan Item as Missing Pieces') %] +
+
+ +
+
+ + + + + + +
+
+ +
+
+ [% l('Barcode Not Found: [_1]', '{{bcNotFound}}') %] +
+ +
+ +
+
+
+ +
+
+
+
+ +
+
+
+ +[% END %] + + diff --git a/Open-ILS/src/templates/staff/circ/patron/t_new_message_dialog.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_new_message_dialog.tt2 deleted file mode 100644 index d3555a0e2d..0000000000 --- a/Open-ILS/src/templates/staff/circ/patron/t_new_message_dialog.tt2 +++ /dev/null @@ -1,45 +0,0 @@ -
-
- -

[% l('Apply Standing Penalty / Message') %]

-
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- - -
-
diff --git a/Open-ILS/src/templates/staff/circ/share/t_new_message_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_new_message_dialog.tt2 new file mode 100644 index 0000000000..1cd94f0963 --- /dev/null +++ b/Open-ILS/src/templates/staff/circ/share/t_new_message_dialog.tt2 @@ -0,0 +1,45 @@ +
+
+ +

[% l('Apply Standing Penalty / Message') %]

+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+ + +
+
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2 index 1782deef8d..6d0e6d87b2 100644 --- a/Open-ILS/src/templates/staff/navbar.tt2 +++ b/Open-ILS/src/templates/staff/navbar.tt2 @@ -135,8 +135,14 @@ [% l('Replace Barcode') %] +
  • + + + [% l('Scan Item as Missing Pieces') %] + +
    • - +
  • diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/missing_pieces.js b/Open-ILS/web/js/ui/default/staff/cat/item/missing_pieces.js new file mode 100644 index 0000000000..06fad21abd --- /dev/null +++ b/Open-ILS/web/js/ui/default/staff/cat/item/missing_pieces.js @@ -0,0 +1,123 @@ +angular.module('egItemMissingPieces', + ['ngRoute', 'ui.bootstrap', 'egCoreMod','egUiMod']) + +.controller('MissingPiecesCtrl', + ['$scope','$q','$window','$location','egCore','egConfirmDialog','egAlertDialog','egCirc', +function($scope , $q , $window , $location , egCore , egConfirmDialog , egAlertDialog , egCirc) { + + $scope.selectMe = true; // focus text input + $scope.args = {}; + + function get_copy(barcode) { + + return egCore.net.request( + 'open-ils.actor', + 'open-ils.actor.get_barcodes', + egCore.auth.token(), egCore.auth.user().ws_ou(), + 'asset', barcode) + + .then(function(resp) { // get_barcodes + + if (evt = egCore.evt.parse(resp)) { + console.error(evt.toString()); + return $q.reject(); + } + + if (!resp || !resp[0]) { + $scope.bcNotFound = barcode; + $scope.selectMe = true; + return $q.reject(); + } + + return egCore.pcrud.search('acp', {id : resp[0].id}, { + flesh : 3, + flesh_fields : { + acp : ['call_number'], + acn : ['record'], + bre : ['simple_record'] + }, + select : { + // avoid fleshing MARC on the bre + // note: don't add simple_record.. not sure why + bre : ['id'] + } + }) + }) + } + + function mark_missing_pieces(copy) { + + egConfirmDialog.open( + egCore.strings.CONFIRM_MARK_MISSING_TITLE, + egCore.strings.CONFIRM_MARK_MISSING_BODY, { + barcode : copy.barcode(), + title : copy.call_number().record().simple_record().title() + + }).result.then(function() { + + // kick off mark missing + return egCore.net.request( + 'open-ils.circ', + 'open-ils.circ.mark_item_missing_pieces', + egCore.auth.token(), copy.id() + ) + + }).then(function(resp) { + var evt = egCore.evt.parse(resp); // should always produce event + + if (evt.textcode == 'ACTION_CIRCULATION_NOT_FOUND') { + return egAlertDialog.open( + egCore.strings.CIRC_NOT_FOUND, {barcode : copy.barcode()}); + } + + var payload = evt.payload; + + // TODO: open copy editor inline? new tab? + + // print the missing pieces slip + var promise = $q.when(); + if (payload.slip) { + // wait for completion, since it may spawn a confirm dialog + promise = egCore.print.print({ + context : 'default', + content_type : 'text/html', + content : payload.slip.template_output().data() + }); + } + + if (payload.letter) { + $scope.letter = payload.letter.template_output().data(); + } + + // apply patron penalty + if (payload.circ) { + promise.then(function() { + egCirc.create_penalty(payload.circ.usr()) + }); + } + + }); + } + + $scope.print_letter = function() { + egCore.print.print({ + context : 'mail', + content_type : 'text/plain', + content : $scope.letter + }); + } + + // find the item by barcode, then proceed w/ missing pieces + $scope.submitBarcode = function(args) { + + $scope.bcNotFound = null; + if (!args.barcode) return; + + $scope.selectMe = false; + $scope.letter = null; + + get_copy(args.barcode).then(mark_missing_pieces); + } + +}]) + 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 044a99b0fb..71fbf05b1b 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 @@ -948,8 +948,8 @@ function($scope, $q, $routeParams, $timeout, $window, $location, egCore, * Manages messages */ .controller('PatronMessagesCtrl', - ['$scope','$q','$routeParams','egCore','$modal','patronSvc', -function($scope , $q , $routeParams, egCore , $modal , patronSvc) { + ['$scope','$q','$routeParams','egCore','$modal','patronSvc','egCirc', +function($scope , $q , $routeParams, egCore , $modal , patronSvc , egCirc) { $scope.initTab('messages', $routeParams.id); var usr_id = $routeParams.id; @@ -1051,38 +1051,12 @@ function($scope , $q , $routeParams, egCore , $modal , patronSvc) { } $scope.createPenalty = function() { - $modal.open({ - templateUrl: './circ/patron/t_new_message_dialog', - controller: - ['$scope','$modalInstance','staffPenalties', - function($scope , $modalInstance , staffPenalties) { - $scope.focusNote = true; - $scope.penalties = staffPenalties; - $scope.args = {penalty : 21}; // default to Note - $scope.setPenalty = function(id) { - args.penalty = id; - } - $scope.ok = function(count) { $modalInstance.close($scope.args) } - $scope.cancel = function () { $modalInstance.dismiss() } - }], - resolve : { staffPenalties : fetchPenaltyTypes } - }).result.then( - function(args) { - var pen = new egCore.idl.ausp(); - pen.usr(usr_id); - pen.org_unit(egCore.auth.user().ws_ou()); - pen.note(args.note); - pen.standing_penalty(args.penalty); - pen.staff(egCore.auth.user().id()); - pen.set_date('now'); - egCore.pcrud.create(pen).then(function() { - activeGrid.refresh(); - // force a refresh of the user, since they may now - // have blocking penalties, etc. - patronSvc.setPrimary(patronSvc.current.id(), null, true); - }); - } - ); + egCirc.create_penalty(usr_id).then(function() { + activeGrid.refresh(); + // force a refresh of the user, since they may now + // have blocking penalties, etc. + patronSvc.setPrimary(patronSvc.current.id(), null, true); + }); } $scope.editPenalty = function(selected) { @@ -1092,36 +1066,12 @@ function($scope , $q , $routeParams, egCore , $modal , patronSvc) { var penalty = patronSvc.current.standing_penalties().filter( function(p) {return p.id() == selected[0].id})[0]; - $modal.open({ - templateUrl: './circ/patron/t_new_message_dialog', - controller: - ['$scope','$modalInstance','staffPenalties', - function($scope , $modalInstance , staffPenalties) { - $scope.focusNote = true; - $scope.penalties = staffPenalties; - $scope.args = { - penalty : penalty.standing_penalty().id(), - note : penalty.note() - } - $scope.setPenalty = function(id) { - args.penalty = id; - } - $scope.ok = function(count) { $modalInstance.close($scope.args) } - $scope.cancel = function () { $modalInstance.dismiss() } - }], - resolve : { staffPenalties : fetchPenaltyTypes } - }).result.then( - function(args) { - penalty.note(args.note); - penalty.standing_penalty(args.penalty); - egCore.pcrud.update(penalty).then(function() { - activeGrid.refresh(); - // force a refresh of the user, since they may now - // have blocking penalties, etc. - patronSvc.setPrimary(patronSvc.current.id(), null, true); - }); - } - ); + egCirc.edit_penalty(penalty).then(function() { + activeGrid.refresh(); + // force a refresh of the user, since they may now + // have blocking penalties, etc. + patronSvc.setPrimary(patronSvc.current.id(), null, true); + }); } }]) diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js index f2d688449d..68401f14b8 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js +++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js @@ -467,6 +467,17 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { }); } + service.get_staff_penalty_types = function() { + if (egCore.env.csp) + return $q.when(egCore.env.csp.list); + return egCore.pcrud.search( + // id <= 100 are reserved for system use + 'csp', {id : {'>': 100}}, {}, {atomic : true}) + .then(function(penalties) { + return egCore.env.absorbList(penalties, 'csp').list; + }); + } + // ideally all of these data should be returned with the response, // but until then, grab what we need. service.flesh_response_data = function(action, evt, params, options) { @@ -1402,6 +1413,68 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { return check_digit; } + service.create_penalty = function(user_id) { + return $modal.open({ + templateUrl: './circ/share/t_new_message_dialog', + controller: + ['$scope','$modalInstance','staffPenalties', + function($scope , $modalInstance , staffPenalties) { + $scope.focusNote = true; + $scope.penalties = staffPenalties; + $scope.args = {penalty : 21}; // default to Note + $scope.setPenalty = function(id) { + args.penalty = id; + } + $scope.ok = function(count) { $modalInstance.close($scope.args) } + $scope.cancel = function($event) { + $modalInstance.dismiss(); + $event.preventDefault(); + } + }], + resolve : { staffPenalties : service.get_staff_penalty_types } + }).result.then( + function(args) { + var pen = new egCore.idl.ausp(); + pen.usr(user_id); + pen.org_unit(egCore.auth.user().ws_ou()); + pen.note(args.note); + pen.standing_penalty(args.penalty); + pen.staff(egCore.auth.user().id()); + pen.set_date('now'); + return egCore.pcrud.create(pen); + } + ); + } + + // assumes, for now anyway, penalty type is fleshed onto usr_penalty. + service.edit_penalty = function(usr_penalty) { + return $modal.open({ + templateUrl: './circ/share/t_new_message_dialog', + controller: + ['$scope','$modalInstance','staffPenalties', + function($scope , $modalInstance , staffPenalties) { + $scope.focusNote = true; + $scope.penalties = staffPenalties; + $scope.args = { + penalty : usr_penalty.standing_penalty().id(), + note : usr_penalty.note() + } + $scope.setPenalty = function(id) { args.penalty = id; } + $scope.ok = function(count) { $modalInstance.close($scope.args) } + $scope.cancel = function($event) { + $modalInstance.dismiss(); + $event.preventDefault(); + } + }], + resolve : { staffPenalties : service.get_staff_penalty_types } + }).result.then( + function(args) { + usr_penalty.note(args.note); + usr_penalty.standing_penalty(args.penalty); + return egCore.pcrud.update(usr_penalty); + } + ); + } return service; diff --git a/Open-ILS/web/js/ui/default/staff/services/event.js b/Open-ILS/web/js/ui/default/staff/services/event.js index ccec585c38..dbf0d828df 100644 --- a/Open-ILS/web/js/ui/default/staff/services/event.js +++ b/Open-ILS/web/js/ui/default/staff/services/event.js @@ -35,6 +35,7 @@ angular.module('egCoreMod') this.ilsperm = args.ilsperm; this.ilspermloc = args.ilspermloc; this.note = args.note; + this.success = this.textcode == 'SUCCESS'; this.toString = function() { var s = 'Event: ' + (this.code || '') + ':' + this.textcode + ' -> ' + new String(this.desc);