From d3bece05152b78ff27ed5306deb3098df4c41503 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 2 May 2014 16:54:08 -0400 Subject: [PATCH] start compressing services into egCore; minor patron lookup repair Signed-off-by: Bill Erickson --- Open-ILS/src/templates/staff/t_base_js.tt2 | 2 ++ .../web/js/ui/default/staff/circ/patron/app.js | 25 +++++++++--------- .../web/js/ui/default/staff/services/coresvc.js | 30 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 Open-ILS/web/js/ui/default/staff/services/coresvc.js diff --git a/Open-ILS/src/templates/staff/t_base_js.tt2 b/Open-ILS/src/templates/staff/t_base_js.tt2 index 403981b403..55562c30e9 100644 --- a/Open-ILS/src/templates/staff/t_base_js.tt2 +++ b/Open-ILS/src/templates/staff/t_base_js.tt2 @@ -34,6 +34,8 @@ + + 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 cc96749551..ed2d6625cb 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 @@ -229,8 +229,8 @@ function($scope, $q, $filter, egNet, egAuth, egUser, patronSvc, egEnv, e }]) .controller('PatronBarcodeSearchCtrl', - ['$scope','$location','egAuth','egNet','egEvent','egOrg','egConfirmDialog','egUser','egAppStrings','patronSvc', -function($scope , $location , egAuth , egNet , egEvent , egOrg , egConfirmDialog , egUser , egAppStrings , patronSvc) { + ['$scope','$location','egCore','egConfirmDialog','egUser','egAppStrings','patronSvc', +function($scope , $location , egCore , egConfirmDialog , egUser , egAppStrings , patronSvc) { $scope.selectMe = true; // focus text input patronSvc.setDefault(); // clear the default user @@ -241,11 +241,11 @@ function($scope , $location , egAuth , egNet , egEvent , egOrg , egConfirmDialog // create an opt-in=yes response for the loaded user function createOptIn(user_id) { - egNet.request( + egCore.net.request( 'open-ils.actor', 'open-ils.actor.user.org_unit_opt_in.create', - egAuth.token(), user_id).then(function(resp) { - if (evt = egEvent.parse(resp)) return alert(evt); + egCore.auth.token(), user_id).then(function(resp) { + if (evt = egCore.evt.parse(resp)) return alert(evt); loadPatron(user_id); } ); @@ -261,14 +261,15 @@ function($scope , $location , egAuth , egNet , egEvent , egOrg , egConfirmDialog var user_id; // lookup barcode - egNet.request( + egCore.net.request( 'open-ils.actor', 'open-ils.actor.get_barcodes', - egAuth.token(), egAuth.user().ws_ou(), 'actor', args.barcode) + egCore.auth.token(), egCore.auth.user().ws_ou(), + 'actor', args.barcode) .then(function(resp) { // get_barcodes - if (evt = egEvent.parse(resp)) { + if (evt = egCore.evt.parse(resp)) { alert(evt); // FIXME return; } @@ -281,14 +282,14 @@ function($scope , $location , egAuth , egNet , egEvent , egOrg , egConfirmDialog // see if an opt-in request is needed user_id = resp[0].id; - return egNet.request( + return egCore.net.request( 'open-ils.actor', 'open-ils.actor.user.org_unit_opt_in.check', - egAuth.token(), user_id); + egCore.auth.token(), user_id); }).then(function(optInResp) { // opt_in_check - if (evt = egEvent.parse(optInResp)) { + if (evt = egCore.evt.parse(optInResp)) { alert(evt); // FIXME return; } @@ -304,7 +305,7 @@ function($scope , $location , egAuth , egNet , egEvent , egOrg , egConfirmDialog .then(function(user) { // retrieve user egConfirmDialog.open( egAppStrings.OPT_IN_DIALOG, '', - { org : egOrg.get(egAuth.user().ws_ou()), + { org : egCore.org.get(user.home_ou()), user : user, ok : function() { createOptIn(user.id()) }, cancel : function() {} diff --git a/Open-ILS/web/js/ui/default/staff/services/coresvc.js b/Open-ILS/web/js/ui/default/staff/services/coresvc.js new file mode 100644 index 0000000000..6fecb75123 --- /dev/null +++ b/Open-ILS/web/js/ui/default/staff/services/coresvc.js @@ -0,0 +1,30 @@ +/** + * egCore service + * + * Aggregates all core services into a container service. This allows + * use of core services without having to inject each individually. + */ +angular.module('egCoreMod') + +.factory('egCore', + ['egIDL','egNet','egEnv','egOrg','egPCRUD','egEvent','egAuth', + 'egPerm','egPrintStore','egStartup', +function(egIDL , egNet , egEnv , egOrg , egPCRUD , egEvent , egAuth , + egPerm , egPrintStore , egStartup) { + + return { + idl : egIDL, + net : egNet, + env : egEnv, + org : egOrg, + pcrud : egPCRUD, + evt : egEvent, + auth : egAuth, + perm : egPerm, + hatch : egPrintStore, + startup : egStartup + }; + +}]); + + -- 2.11.0