From ae7b3a87c967f949b880e88453fe71b427b69d0b Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 23 Jun 2014 13:11:01 -0400 Subject: [PATCH] hold / translit dialogs / printing repairs Signed-off-by: Bill Erickson --- .../src/templates/staff/circ/patron/t_checkout.tt2 | 4 +- .../staff/circ/share/t_hold_shelf_dialog.tt2 | 35 ++++++----- .../templates/staff/circ/share/t_noncat_dialog.tt2 | 48 ++++++++-------- .../staff/circ/share/t_transit_dialog.tt2 | 49 +++++----------- .../share/print_templates/t_hold_shelf_slip.tt2 | 37 ++++++++++++ .../js/ui/default/staff/circ/patron/checkout.js | 1 - .../web/js/ui/default/staff/circ/services/circ.js | 67 +++++++++++++--------- 7 files changed, 135 insertions(+), 106 deletions(-) create mode 100644 Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 index 1edcf3de82..0cd4ce4833 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 @@ -12,13 +12,13 @@ diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2 index bcea59d1e5..22e74e173a 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2 @@ -5,59 +5,58 @@

[% l('Hold Slip') %]

- -
+
- [% l('This item should be routed to the Private Holds Shelf') %] + [% l('This item should be routed to the [_1]Private Holds Shelf[_2]', + '','') %]
- [% l('This item should be routed to the Public Holds Shelf') %] + [% l('This item should be routed to the [_1]Public Holds Shelf[_2]', + '','') %]

[% l('Item Barcode:') %] - {{evt.payload.copy.barcode()}} + {{copy.barcode}}
[% l('Title:') %] - {{evt.payload.record.title()}} + {{title}}
[% l('Author:') %] - {{evt.payload.record.author()}} + {{author}}

-
- [% l('Hold for patron {{holdUser.alias()}}') %] +
+ [% l('Hold for patron {{patron.alias}}') %]
-
+
[% |l %] - Hold for patron {{holdUser.family_name()}}, - {{holdUser.first_given_name()}} {{holdUser.second_given_name()}} + Hold for patron {{patron.family_name}}, + {{patron.first_given_name}} {{patron.second_given_name}} [% END %]
[% l('Patron Barcode:') %] - {{holdUser.card().barcode()}} + {{patron.card.barcode}}

[% l('Request Date:') %] - {{evt.payload.hold.request_time() | date:'shortDate'}} + {{hold.request_time | date:'shortDate'}}
[% l('Slip Date:') %] - {{now | date:'shortDate'}} + {{today | date:'shortDate'}}
-
diff --git a/Open-ILS/src/templates/staff/circ/share/t_noncat_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_noncat_dialog.tt2 index 7cbadfdbc2..345848eed7 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_noncat_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_noncat_dialog.tt2 @@ -1,27 +1,25 @@ -
-
-
-
- -

- [% l('Enter the number of {{type.name()}} circulating') %] -

-
-
-
- - -
-
-
- - -
-
-
+ +
+ +

+ [% l('Enter the number of {{type.name()}} circulating') %] +

+
+
+
+ + +
+
+
+ + +
diff --git a/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 index 817b96267d..1491fb299a 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 @@ -8,69 +8,50 @@
[% l('Destination') %] - {{dest.shortname()}} + {{dest_location.shortname}}

- {{dest.name()}}
- {{destAddr.street1()}} {{destAddr.street2()}}
- {{destAddr.city()}}, {{destAddr.state()}} {{destAddr.post_code()}}
- P: {{dest.phone()}} + {{dest_location.name}}
+ {{dest_address.street1}} {{dest_address.street2}}
+ {{dest_address.city}}, {{dest_address.state}} {{dest_address.post_code}}
+ P: {{dest_location.phone}}
[% l('Item Barcode:') %] - {{evt.payload.copy.barcode()}} + {{copy.barcode}}
[% l('Title:') %] - {{evt.payload.record.title()}} + {{title}}
[% l('Author:') %] - {{evt.payload.record.author()}} + {{author}}
-
+

[% |l %] - Hold for patron {{holdUser.family_name()}}, - {{holdUser.first_given_name()}} {{holdUser.second_given_name()}} + Hold for patron {{patron.family_name}}, + {{patron.first_given_name}} {{patron.second_given_name}} [% END %]
[% l('Patron Barcode:') %] - {{holdUser.card().barcode()}} + {{patron.card.barcode}}

[% l('Request Date:') %] - {{evt.payload.hold.request_time() | date:'shortDate'}} -
-
- [% l('Slip Date:') %] - {{now | date:'shortDate'}} + {{hold.request_time | date:'shortDate'}}
-
-
-
[% |l %] - Hold for patron {{holdUser.family_name()}}, - {{holdUser.first_given_name()}} {{holdUser.second_given_name()}} - [% END %] -
-
- [% l('Patron Barcode:') %] - {{holdUser.card().barcode()}} -
-
-
- [% l('Request Date:') %] - {{evt.payload.hold.request_time() | date:'shortDate'}} -
+
[% l('Slip Date:') %] - {{now | date:'shortDate'}} + {{today | date:'shortDate'}}
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 new file mode 100644 index 0000000000..f1980d7540 --- /dev/null +++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 @@ -0,0 +1,37 @@ +
+
+
+ [% l('This item needs to be routed to the [_1]Private Holds Shelf[_2].', + '','') %] +
+
+ [% l('This item needs to be routed to the [_1]Public Holds Shelf[_2].', + '','') %] +
+
+
+ + [% l('Barcode: [_1]', '{{copy.barcode}}') %]
+ [% l('Title: [_1]', '{{title}}') %]
+ +
+
+ +
[% l('Hold for patron [_1], [_2] [_3]', + '{{patron.family_given_name}}', + '{{patron.first_given_name}}', + '{{patron.second_given_name}}') %]
+
[% l('Barcode: [_1]', '{{patron.card.barcode}}') %]
+
[% l('Notify by phone: [_1]', '{{hold.phone_notify}}') %]
+
[% l('Notify by text: [_1]', '{{hold.sms_notify}}') %]
+
[% l('Notify by email: [_1]', '{{patron.email}}') %]
+ +
+ +
[% l('Request Date: [_1]', + '{{hold.request_time | date:"short"}}') %]
+
[% l('Slip Date: [_1]', '{{today | date:"short"}}') %]
+
[% l('Printed by [_1] at [_2]', + '{{staff.first_given_name}}', '{{current_location.shortname}}') %]
+ +
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 593198a725..a032464e4e 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 @@ -167,7 +167,6 @@ function($scope , $q , $modal , $routeParams , egCore , egUser , patronSvc , } } - // TODO: show print dialog $scope.print_receipt = function() { var print_data = {circulations : []} 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 1b9259dbc7..1c88249b6c 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 @@ -313,6 +313,7 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { // This assumes the caller has already handled the noncat-type // selection and just needs to collect the count info. service.noncat_dialog = function(params, options) { + var noncatMax = 99; // hard-coded max // the caller should presumably have fetched the noncat_types via // our API already, but fetch them again (from cache) to be safe. @@ -329,12 +330,17 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { $scope.focusMe = true; $scope.type = type; $scope.count = 1; + $scope.noncatMax = noncatMax; $scope.ok = function(count) { $modalInstance.close(count) } - $scope.cancel = function () { $modalInstance.dismiss() } + $scope.cancel = function ($event) { + $modalInstance.dismiss() + $event.preventDefault(); + } }], }).result.then( function(count) { - if (count && count > 0 /* && count < x (TODO) */) { + if (count && count > 0 && count <= noncatMax) { + // NOTE: in Chrome, form validation ensure a valid number params.noncat_count = count; return $q.when(params); } else { @@ -548,34 +554,40 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { '$scope','$modalInstance','destAddr','holdUser','transit', function($scope , $modalInstance , destAddr , holdUser , transit) { - // TODO: synchronize scope variables with print context vars. - - $scope.destAddr = destAddr; - $scope.holdUser = holdUser; - $scope.dest = egCore.org.get(evt.org); - $scope.evt = evt; - $scope.now = new Date(); + $scope.today = new Date(); + + var print_context = { + copy : egCore.idl.toHash(evt.payload.copy), + title : evt.payload.record.title(), + author : evt.payload.record.author() + } + + if (transit) { + // route_dialog includes the "route to holds shelf" + // dialog, which has no transit + print_context.transit = egCore.idl.toHash(transit); + print_context.dest_address = egCore.idl.toHash(destAddr); + print_context.dest_location = + egCore.idl.toHash(egCore.org.get(transit.dest())); + } + + if (holdUser) { + print_context.hold = egCore.idl.toHash(evt.payload.hold); + print_context.patron = egCore.idl.toHash(holdUser); + } + + angular.forEach(print_context, function(val, key) { + $scope[key] = val; + }); + $scope.ok = function() {$modalInstance.close()} $scope.print = function() { $modalInstance.close(); - var print_context = { - transit : egCore.idl.toHash(transit), - title : evt.payload.record.title(), - author : evt.payload.record.author(), - copy : egCore.idl.toHash(evt.payload.copy), - dest_location : - egCore.idl.toHash(egCore.org.get(transit.dest())), - dest_address : egCore.idl.toHash(destAddr), - } - - var template = 'transit_slip'; - if (holdUser) { - template = 'hold_transit_slip'; - print_context.hold = egCore.idl.toHash(evt.payload.hold); - print_context.patron = egCore.idl.toHash(holdUser); - } + template = transit ? + (holdUser ? 'hold_transit_slip' : 'transit_slip') : + 'hold_shelf_slip'; egCore.print.print({ context : 'default', @@ -584,9 +596,11 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { }); } }], + resolve : { destAddr : function() { - if (!evt.org) return $q.when(); + if (!evt.org || tmpl.match(/hold_shelf/)) + return $q.when(); return service.get_org_addr(evt.org, 'holds_address'); }, holdUser : function() { @@ -599,6 +613,7 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { ); }, transit : function() { + if (tmpl.match(/hold_shelf/)) return $q.when(); return service.find_copy_transit(evt, params, options); } } -- 2.11.0