ff ui : code formatting improvements

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/fulfillment/index.tt2 b/Open-ILS/src/templates/staff/fulfillment/index.tt2
index ce0c312..be2672f 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/index.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/index.tt2
@@ -77,11 +77,11 @@
           <div class="dropdown" ng-cloak>
             <a href="javascript:;" 
               class="dropdown-toggle mainNav thispage" data-toggle="dropdown">
-              Location: {{ffService.currentOrg().shortname()}}
+              Location: {{orgSelector.current().shortname()}}
               <b class="caret"></b>
             </a>
             <ul class="dropdown-menu" role="menu">
-              <li role="presentation" ng-repeat="org in ffService.orgList()">
+              <li role="presentation" ng-repeat="org in orgSelector.orgList()">
                 <a role="menuitem" tabindex="-1" ng-click="selectOrg(org.id())">
                   <div style="padding-left:{{org.ou_type().depth() * 10}}px">
                     {{org.shortname()}}

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_records.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_records.tt2
index d611ad0..171d643 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_records.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_records.tt2
@@ -3,7 +3,7 @@
     <div class="col-lg-3"></div><!-- offset? -->
       <div class="col-lg-6">
         <fieldset>
-          <legend>[% l('Upload Bib Records for {{ffService.currentOrg().shortname()}}') %]</legend>
+          <legend>[% l('Upload Bib Records for {{orgSelector.current().shortname()}}') %]</legend>
           <form ng-submit="uploadRecords(this.myinput.files[0])" >
             <div class="form-group row">
               <label class="col-lg-4 control-label">[% l('Record File') %]</label>

diff --git a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
index 11da6e2..d770933 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
+++ b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
@@ -8,7 +8,8 @@
  */
 
 
-angular.module('ffMain', ['ngRoute', 'egCoreMod', 'egUiMod', 'egUserMod'])
+angular.module('ffMain', 
+['ngRoute', 'egCoreMod', 'egUiMod', 'egUserMod'])
 
 .config(function($routeProvider, $locationProvider) {
 
@@ -53,9 +54,9 @@ angular.module('ffMain', ['ngRoute', 'egCoreMod', 'egUiMod', 'egUserMod'])
  * Data shared across FF controllers.
  * TODO: this call all live in FFMainCtrl
  */
-.factory('ffService', 
-['$rootScope', 'egOrg', 'egAuth', 
-function($rootScope, egOrg, egAuth) {
+.factory('orgSelector', 
+       ['$rootScope','egOrg','egAuth', 
+function($rootScope,  egOrg,  egAuth) {
     return {
         orgList : function(newList) {
             if (newList) {
@@ -67,7 +68,7 @@ function($rootScope, egOrg, egAuth) {
         },
 
         // currently selected org unit
-        currentOrg : function(id) {
+        current : function(id) {
             if (id) {
                 this.org = id;
             } else if (!this.org) {
@@ -77,11 +78,11 @@ function($rootScope, egOrg, egAuth) {
         },
 
         /** returns list of IDs for all org units within the
-         * full path of currentOrg.  Useful for pcrud queries.
+         * full path of current.  Useful for pcrud queries.
          */
         relatedOrgs : function(id) {
             return egOrg.fullPath(
-                this.currentOrg()).map(function(o) {return o.id()});
+                this.current()).map(function(o) {return o.id()});
         }
     }
 }])
@@ -91,8 +92,8 @@ function($rootScope, egOrg, egAuth) {
  * selector.
  */
 .controller('FFMainCtrl', 
-['$scope', '$route', 'egStartup', 'ffService', 'egAuth', 'egUser',
-function ($scope, $route, egStartup, ffService, egAuth, egUser) {
+        ['$scope','$route','egStartup','orgSelector','egAuth','egUser',
+function ($scope,  $route,  egStartup,  orgSelector,  egAuth,  egUser) {
 
     // run after startup so we can guarantee access to org units
     egStartup.go().then(function() {
@@ -100,14 +101,14 @@ function ($scope, $route, egStartup, ffService, egAuth, egUser) {
         // logged in user.  From there, we can drive the org selector
         egUser.hasPermAt('FULFILLMENT_ADMIN') 
         .then(function(orgList) {
-            ffService.orgList(orgList);
-            $scope.ffService = ffService;
+            orgSelector.orgList(orgList);
+            $scope.orgSelector = orgSelector;
         });
     });
 
     // change the selected org unit and re-draw the page
     $scope.selectOrg = function(id) {
-        ffService.currentOrg(id);
+        orgSelector.current(id);
         $route.reload();
     }
 
@@ -125,10 +126,10 @@ function ($scope, $route, egStartup, ffService, egAuth, egUser) {
  * Performs actions.
  */
 .controller('ILLCtrl', 
-['$scope', '$q', '$compile', '$timeout', '$rootScope', '$location', 
-    '$route', '$routeParams', 'egNet', 'egAuth', 'ffService', 'egOrg',
-function ($scope, $q, $compile, $timeout, $rootScope, $location, 
-    $route, $routeParams, egNet, egAuth, ffService, egOrg) {
+        ['$scope','$q','$compile','$timeout','$rootScope','$location', 
+         '$route','$routeParams','egNet','egAuth','orgSelector','egOrg',
+function ($scope,  $q,  $compile,  $timeout,  $rootScope, $location, 
+          $route,  $routeParams,  egNet,  egAuth,  orgSelector,  egOrg) {
 
     $scope.tabname = $routeParams.tab;
     $scope.orientation = $routeParams.orientation;
@@ -140,7 +141,6 @@ function ($scope, $q, $compile, $timeout, $rootScope, $location,
     $scope['tab_' + $scope.tabname] = true;
     $scope['orientation_' + $scope.orientation] = true;
 
-
     // so our child controllers can access our route info
     $scope.illRouteParams = $routeParams;
 
@@ -176,7 +176,7 @@ function ($scope, $q, $compile, $timeout, $rootScope, $location,
                 'open-ils.circ',
                 'open-ils.circ.item.transaction.disposition',
                 egAuth.token(), 
-                ffService.currentOrg().id(), 
+                orgSelector.current().id(), 
                 item.barcode
             ).then(function(items) {
                 if (items[0]) {
@@ -311,7 +311,7 @@ function ($scope, $q, $compile, $timeout, $rootScope, $location,
                 'open-ils.circ', 
                 'open-ils.circ.checkin.override',
                 egAuth.token(), {
-                    circ_lib : ffService.currentOrg().id(),
+                    circ_lib : orgSelector.current().id(),
                     copy_id: item.copy.id(),
                     ff_action: item.next_action
                 }
@@ -339,7 +339,7 @@ function ($scope, $q, $compile, $timeout, $rootScope, $location,
                 'open-ils.circ', 
                 'open-ils.circ.checkout.full.override',
                 egAuth.token(), {
-                    circ_lib : ffService.currentOrg().id(),
+                    circ_lib : orgSelector.current().id(),
                     patron_id : item.hold.usr().id(),
                     copy_id: item.copy.id(),
                     ff_action: item.next_action
@@ -434,7 +434,7 @@ function ($scope, $q, $compile, $timeout, $rootScope, $location,
             egNet.request(
                 'open-ils.actor',
                 'open-ils.actor.web_action_print_template.fetch',
-                ffService.currentOrg().id(), focus
+                orgSelector.current().id(), focus
             ).then(function(template) {
 
                 if (!template || !(template = template.template())) { // assign
@@ -532,14 +532,14 @@ function ($scope, $q, $compile, $timeout, $rootScope, $location,
 }])
 
 .controller('TransitsCtrl',
-['$scope', '$q', 'egPCRUD', 'ffService',
-function ($scope, $q, egPCRUD, ffService) {
+        ['$scope','$q','egPCRUD','orgSelector',
+function ($scope,  $q,  egPCRUD,  orgSelector) {
 
     $scope.setCollector(function() {
         var deferred = $q.defer();
         $scope.itemList.items = [];
 
-        var fullPath = ffService.relatedOrgs();
+        var fullPath = orgSelector.relatedOrgs();
 
         var dest = fullPath; // inbound transits
         var circ_lib = fullPath; // our copies
@@ -588,14 +588,14 @@ function ($scope, $q, egPCRUD, ffService) {
 }])
 
 .controller('CircCtrl',
-['$scope', '$q', 'egPCRUD', 'ffService',
-function ($scope, $q, egPCRUD, ffService) {
+        ['$scope','$q','egPCRUD','orgSelector',
+function ($scope,  $q,  egPCRUD,  orgSelector) {
 
     $scope.setCollector(function() {
         var deferred = $q.defer();
         $scope.itemList.items = [];
 
-        var fullPath = ffService.relatedOrgs();
+        var fullPath = orgSelector.relatedOrgs();
 
         var copy_lib = fullPath; // our copies
         var circ_lib = fullPath; // circulating here
@@ -644,8 +644,8 @@ function ($scope, $q, egPCRUD, ffService) {
 
 
 .controller('ItemStatusCtrl',
-['$scope', '$q', '$route', '$location', 'egPCRUD', 'ffService',
-function ($scope, $q, $route, $location, egPCRUD, ffService) {
+        ['$scope','$q','$route','$location','egPCRUD','orgSelector',
+function ($scope,  $q,  $route,  $location,  egPCRUD,  orgSelector) {
     $scope.focusMe = true;
 
     $scope.draw = function(barcode) {
@@ -689,8 +689,8 @@ function ($scope, $q, $route, $location, egPCRUD, ffService) {
  * so the data is managed a little differently.
  */
 .controller('PendingRequestsCtrl',
-['$scope', '$q', '$route', 'egNet', 'egAuth', 'egPCRUD', 'egOrg', 'ffService',
-function ($scope, $q, $route, egNet, egAuth, egPCRUD, egOrg, ffService) {
+        ['$scope','$q','$route','egNet','egAuth','egPCRUD','egOrg','orgSelector',
+function ($scope,  $q,  $route,  egNet,  egAuth,  egPCRUD,  egOrg,  orgSelector) {
     var self = this;
 
     this.displayOne = function(display, hold_blob) {
@@ -755,7 +755,7 @@ function ($scope, $q, $route, egNet, egAuth, egPCRUD, egOrg, ffService) {
 
     $scope.drawTable = function() {
         $scope.itemList.items = [];
-        var fullPath = ffService.relatedOrgs();
+        var fullPath = orgSelector.relatedOrgs();
 
         var query = {   
             capture_time : null, 
@@ -845,8 +845,8 @@ function ($scope, $q, $route, egNet, egAuth, egPCRUD, egOrg, ffService) {
 })
 
 .controller('RecordsCtrl', 
-['$scope', '$q', '$http', 'ffService', 'formDataObject', 'egAuth',
-function($scope, $q, $http, ffService, formDataObject, egAuth) {
+       ['$scope','$q','$http','orgSelector','formDataObject','egAuth',
+function($scope,  $q,  $http,  orgSelector,  formDataObject,  egAuth) {
 
     $scope.uploadRecords = function(file) {
         $scope.in_flight = true;
@@ -858,7 +858,7 @@ function($scope, $q, $http, ffService, formDataObject, egAuth) {
             //  TODO: create a service for file uploads
             //  http://stackoverflow.com/questions/17063000/ng-model-for-input-type-file
             loadFile : $('#record-file')[0].files[0],
-            uploadLocation : ffService.currentOrg().id()
+            uploadLocation : orgSelector.current().id()
         }
 
         if (!args.loadFile) return;