From 2249157396fdc5f788f26f3660e14af4772f6196 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 5 Jun 2014 14:56:43 -0400 Subject: [PATCH] patron notes UI Signed-off-by: Bill Erickson --- Open-ILS/examples/fm_IDL.xml | 19 ++++++- .../staff/admin/workstation/t_print_templates.tt2 | 1 + Open-ILS/src/templates/staff/circ/patron/index.tt2 | 13 +++-- .../staff/circ/patron/t_new_note_dialog.tt2 | 42 +++++++++++++++ .../staff/circ/patron/t_noncat_dialog.tt2 | 1 + .../src/templates/staff/circ/patron/t_notes.tt2 | 44 ++++++++++++++++ .../staff/share/print_templates/t_patron_note.tt2 | 11 ++++ .../js/ui/default/staff/admin/workstation/app.js | 14 +++++ .../web/js/ui/default/staff/circ/patron/app.js | 60 ++++++++++++++++++++++ 9 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 Open-ILS/src/templates/staff/circ/patron/t_new_note_dialog.tt2 create mode 100644 Open-ILS/src/templates/staff/circ/patron/t_notes.tt2 create mode 100644 Open-ILS/src/templates/staff/share/print_templates/t_patron_note.tt2 diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index 451975f944..e4de625e44 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -2019,7 +2019,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + @@ -2033,6 +2033,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + + + + + + + + + + + + + + + + + diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2 index 29d85318d0..c25c2bdeb4 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2 @@ -15,6 +15,7 @@ +
diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2 index ed33ead0db..0e638a8420 100644 --- a/Open-ILS/src/templates/staff/circ/patron/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2 @@ -91,13 +91,18 @@ angular.module('egCoreMod').run(['egStrings', function(s) { diff --git a/Open-ILS/src/templates/staff/circ/patron/t_new_note_dialog.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_new_note_dialog.tt2 new file mode 100644 index 0000000000..cfc5b4081d --- /dev/null +++ b/Open-ILS/src/templates/staff/circ/patron/t_new_note_dialog.tt2 @@ -0,0 +1,42 @@ +
+
+ +

[% l('Create a new note') %]

+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ + +
+
+ diff --git a/Open-ILS/src/templates/staff/circ/patron/t_noncat_dialog.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_noncat_dialog.tt2 index c0c6e5397e..7cbadfdbc2 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_noncat_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_noncat_dialog.tt2 @@ -15,6 +15,7 @@ +
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_notes.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_notes.tt2 new file mode 100644 index 0000000000..b83f317131 --- /dev/null +++ b/Open-ILS/src/templates/staff/circ/patron/t_notes.tt2 @@ -0,0 +1,44 @@ +
+
+ +
+
+ +
+
+
+
{{note.title()}}
+
+
+ [% l('Patron Visible') %] + [% l('Staff Only') %] + {{note.create_date() | date:'short'}} + [% l('Created by [_1]', '{{note.creator().usrname()}}') %] +
+
+
+
+ +
+
+
+
{{note.value()}}
+
+
+
+ + +
+
+
+
+
+
+
+
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_patron_note.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_patron_note.tt2 new file mode 100644 index 0000000000..5b9868397b --- /dev/null +++ b/Open-ILS/src/templates/staff/share/print_templates/t_patron_note.tt2 @@ -0,0 +1,11 @@ +

[% l( + 'Pertaining to [_1], [_2] [_3] : [_4]', + '{{note.usr.family_name}}', + '{{note.usr.first_given_name}}', + '{{note.usr.second_given_name}}', + '{{note.usr.card.barcode}}') %]

+ +

[% l('Created on [_1]', '{{note.create_date | date:"short"}}') %]

+{{note.title}} +
+

{{note.value}}

diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js index cba0e12a22..2c52b429b5 100644 --- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js +++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js @@ -305,6 +305,14 @@ function($scope , $q , egCore) { // TODO: consider moving the template-specific bits directly // into the templates or storing template- specific script files // alongside the templates + var seed_user = { + first_given_name : 'Slow', + second_given_name : 'Joe', + family_name : 'Jones', + card : { + barcode : '30393830393' + } + } $scope.preview_scope = { current_location : egCore.idl.toHash( egCore.org.get(egCore.auth.user().ws_ou())), @@ -345,6 +353,12 @@ function($scope , $q , egCore) { change_given : 0, payment_type : 'cash_payment', payment_note : 'Here is a payment note', + note : { + create_date : '2024-12-25T12:01:03', + title : 'Test Note Title', + usr : seed_user, + value : 'This patron is super nice!' + } } $scope.preview_scope.payments = [ {amount : 1.00, xact : $scope.preview_scope.transactions[0]}, 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 9dc5e36338..ca05dc8d0e 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 @@ -130,6 +130,12 @@ angular.module('egPatronApp', ['ngRoute', 'ui.bootstrap', resolve : resolver }); + $routeProvider.when('/circ/patron/:id/notes', { + templateUrl: './circ/patron/t_notes', + controller: 'PatronNotesCtrl', + resolve : resolver + }); + $routeProvider.otherwise({redirectTo : '/circ/patron/search'}); }) @@ -833,5 +839,59 @@ function($scope, $routeParams , $location , egCore , patronSvc) { }]) +.controller('PatronNotesCtrl', + ['$scope','$routeParams','$location','egCore','patronSvc','$modal', +function($scope, $routeParams , $location , egCore , patronSvc , $modal) { + $scope.initTab('other', $routeParams.id); + var usr_id = $routeParams.id; + + function refreshPage() { + $scope.notes = []; + egCore.pcrud.search('aun', + {usr : usr_id}, + {flesh : 1, flesh_fields : {aun : ['creator']}}, + {authoritative : true}) + .then(null, null, function(note) { + $scope.notes.push(note); + }); + } + + $scope.newNote = function() { + $modal.open({ + templateUrl: './circ/patron/t_new_note_dialog', + controller: + ['$scope', '$modalInstance', + function($scope, $modalInstance) { + $scope.focusNote = true; + $scope.args = {}; + $scope.ok = function(count) { $modalInstance.close($scope.args) } + $scope.cancel = function () { $modalInstance.dismiss() } + }], + }).result.then( + function(args) { + if (!args.value) return; + var note = new egCore.idl.aun(); + note.usr(usr_id); + note.title(args.title); + note.value(args.value); + note.pub(args.pub ? 't' : 'f'); + note.creator(egCore.auth.user().id()); + egCore.pcrud.create(note).then(function() {refreshPage()}); + } + ); + } + + $scope.deleteNote = function(note) { + egCore.pcrud.remove(note).then(function() {refreshPage()}); + } + $scope.printNote = function(note) { + var hash = egCore.idl.toHash(note); + hash.usr = egCore.idl.toHash($scope.patron()); + egCore.hatch.printFromTemplate( + 'default', 'patron_note', {note : hash}); + } + + refreshPage(); +}]) -- 2.11.0