From: Bill Erickson Date: Tue, 29 Apr 2014 21:46:05 +0000 (-0400) Subject: more workstation config UI bits X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fd9826d8c1674332d5e36927b36caa07ca679895;p=working%2FEvergreen.git more workstation config UI bits Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 index 1fd75916a2..e5e46023da 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 @@ -1,7 +1,38 @@
-
+ + +
+ +
+
+
+ +
+
+
+ +
+
+ + +
+
-

-
- -
-
-
-
- [% l('Printing, Templates, etc.') %] -
-
- -
-
- -
-
-
-
- [% l('Other') %] -
-
-
-
-
-
-
+
+ +
-
-
-
-
- [% l('Other') %] -
-
- -
+
+ -
+
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 e786506cc7..9ecad916a0 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 @@ -36,12 +36,20 @@ angular.module('egWorkstationAdmin', }]) .controller('SplashCtrl', - ['$scope','egPrintStore','egUser', -function($scope , egPrintStore , egUser) { + ['$scope','egPrintStore','egUser','egEnv','egAuth', +function($scope , egPrintStore , egUser , egEnv , egAuth) { $scope.userHasAdminPerm = false; egUser.hasPermHere('ADMIN_WORKSTATION') .then(function(bool) { $scope.userHasAdminPerm = bool }); + + var workstation; + if (egEnv.aws) { // TODO: move this to egAuth + workstation = egEnv.aws.map[egAuth.user().wsid()]; + + // strip the org unit component of the name + $scope.workstationName = workstation.name().split(/-/)[1]; + } $scope.hatchURL = egPrintStore.hatchURL(); $scope.hatchRequired = @@ -56,6 +64,21 @@ function($scope , egPrintStore , egUser) { egPrintStore.setLocalItem( 'eg.conf.hatch.url', $scope.hatchURL); } + + $scope.updateUsesWorkstation = function() { + egPrintStore.setLocalItem( + 'eg.conf.workstation.required', $scope.usesWorkstation); + } + + $scope.updateUsesWorkstation = function() { + // TODO + /* + egPrintStore.setLocalItem( + 'eg.conf.workstation.name', $scope.workstationName); + */ + } + + }]) .controller('PrintingCtrl',