From: Bill Erickson Date: Thu, 12 Jun 2014 19:46:30 +0000 (-0400) Subject: more circ integration X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=15d252676273cb7345bcbcfdb779438fffbb246b;p=working%2FEvergreen.git more circ integration Signed-off-by: Bill Erickson --- 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 deleted file mode 100644 index 7cbadfdbc2..0000000000 --- a/Open-ILS/src/templates/staff/circ/patron/t_noncat_dialog.tt2 +++ /dev/null @@ -1,27 +0,0 @@ - -
-
-
-
- -

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

-
-
-
- - -
-
-
- - -
-
-
-
diff --git a/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2 index 7ff0a79ad2..78f33f39a7 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2 @@ -1,29 +1,24 @@ -
-
-
-
- -

- [% l('Exceptions occurred during checkout.') %] -

-
-
-
-
{{evt.textcode}}
-
{{evt.desc}}
-
-
-
- [% |l %] -If overridden, subsequent checkouts during this patron's session will -auto-override this event[% END %] -

- - -
-
-
+ +
+ +

+ [% l('Exceptions occurred during checkout.') %] +

+
+
+
+
{{evt.textcode}}
+
{{evt.desc}}
+
+
+
+ [% |l %]If overridden, subsequent checkouts during this patron's + session will auto-override this event[% END %] +

+ + +
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 new file mode 100644 index 0000000000..7cbadfdbc2 --- /dev/null +++ b/Open-ILS/src/templates/staff/circ/share/t_noncat_dialog.tt2 @@ -0,0 +1,27 @@ + +
+
+
+
+ +

+ [% 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 fd09a2cb0e..817b96267d 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 @@ -52,6 +52,27 @@ {{now | 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'}} +
+
0 /* && count < x (TODO) */) { + params.noncat_count = count; + return $q.when(params); + } else { + return $q.reject(); + } + } + ); + }); + } - // opens a dialog allowing the user to fill in pre-cat copy info + // Opens a dialog allowing the user to fill in pre-cat copy info. service.precat_dialog = function(params, options) { return $modal.open({ @@ -232,14 +289,17 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { } service.circ_exists_dialog = function(evt, params, options) { - $modal.open({ + return $modal.open({ templateUrl: './circ/share/t_circ_exists_dialog', controller: ['$scope','$modalInstance','openCirc', function($scope , $modalInstance , openCirc) { $scope.circDate = openCirc.xact_start(); $scope.ok = function() { $modalInstance.close() } - $scope.cancel = function() { $modalInstance.dismiss() } + $scope.cancel = function($event) { + $modalInstance.dismiss(); + $event.preventDefault(); // form, avoid calling ok(); + } }], resolve : { // fetch the conflicting open circulation diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js index e7553a2983..08da5c7ea4 100644 --- a/Open-ILS/web/js/ui/default/staff/services/grid.js +++ b/Open-ILS/web/js/ui/default/staff/services/grid.js @@ -27,21 +27,6 @@ angular.module('egGridMod', idField : '@', // Reference to externally provided egGridDataProvider - // BEWARE: the grid removes everything from its scope that - // is not needed within the template. "=" sets up a two-way - // binding between the grid and the calling scope. After - // grid initiation, the itemsProvider attribute within the - // shared scope space will be set to undefined. - // - // In other words: - // - // template => items-provider="myProvider" - // - // controller => $scope.myProvider === undefined - // - // Storing the provider in the local scope just uses - // resources, anyway. - // itemsProvider : '=', // comma-separated list of supported or disabled grid features @@ -122,7 +107,6 @@ angular.module('egGridMod', delete $scope.idField; grid.dataProvider = $scope.itemsProvider; - delete $scope.itemsProvider; var features = ($scope.features) ? $scope.features.split(',') : [];