From: Bill Erickson Date: Thu, 21 May 2015 04:00:26 +0000 (-0400) Subject: example org settings; standalone repairs, etc. X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=461451b4ed669c5b903ec911d7716066f4b9acf6;p=working%2FEvergreen.git example org settings; standalone repairs, etc. Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/templates/staff/circ/patron/register.tt2 b/Open-ILS/src/templates/staff/circ/patron/register.tt2 index b943d6da90..a0b2af49fa 100644 --- a/Open-ILS/src/templates/staff/circ/patron/register.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/register.tt2 @@ -5,6 +5,7 @@ %] [% BLOCK APP_JS %] + diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 index 81b05bb794..4f840deccb 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 @@ -20,39 +20,57 @@ [% MACRO formfield(cls, field, path, input_type) BLOCK; - # input field generator for common text/number/checkbox fields + # input field generator for common text/number/checkbox fields - IF NOT input_type; input_type = 'text'; END %] + IF NOT input_type; input_type = 'text'; END %] -
+
+ +
+ + -
+ + +
+ +
- + [% + model = path ? 'patron.' _ path _ '.' _ field : 'patron.' _ field; + IF input_type == 'checkbox' %] - - +
+
-
+ [% ELSE %] + - [% - model = path ? 'patron.' _ path _ '.' _ field : 'patron.' _ field; - IF input_type == 'checkbox' %] + + [% END %] +
-
- -
+
+ [% set_str = "org_settings['ui.patron.edit." _ + cls _ "." _ field _ ".example']"; %] - [% ELSE %] - + + [% l('Example: [_1]', "{{" _ set_str _ "}}") %] + - - [% END %] -
+ [% IF field.match('phone') %] + + + [% l('Example: [_1]', + "{{org_settings['ui.patron.edit.phone.example']}}") %] + + [% END %] + +
[% END %] @@ -67,16 +85,16 @@ [% formfield('au', 'alias') %]
-
- - -
-
- -
+
+ + +
+
+ +
[% formfield('au', 'juvenile', '', 'checkbox') %] @@ -84,33 +102,33 @@
-
- - -
-
-
- - -
+
+ + +
+
+
+ +
+
[% formfield('au', 'ident_value') %] [% formfield('au', 'ident_value2') %] -[% formfield('au', 'email') %] +[% formfield('au', 'email', '', 'email') %] [% formfield('au', 'day_phone') %] [% formfield('au', 'evening_phone') %] [% formfield('au', 'other_phone') %] @@ -118,84 +136,84 @@
-
- - +
+ +
- -
+ + +
-
- - -
-
-
- - -
+
+ + +
+
+
+ +
+
-
- - -
-
- -
+
+ + +
+
+ +
-
- - -
-
-
- - -
+
+ + +
+
+
+ +
+
[% formfield('au', 'active', '', 'checkbox') %] @@ -206,7 +224,7 @@ [% formfield('au', 'alert_message') %]
@@ -358,17 +376,17 @@
-
- - -
+
+ + +
diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 index 300668c15f..8b4f3bbac7 100644 --- a/Open-ILS/src/templates/staff/css/style.css.tt2 +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -115,6 +115,7 @@ table.list tr.selected td { /* deprecated? */ .pad-left {padding-left: 10px;} .pad-right {padding-right: 10px;} .pad-all-min {padding : 5px; } +.pad-all-min2 {padding : 2px; } .pad-all {padding : 10px; } #print-div { display: none; } diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js index 108a41b65c..b940514707 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js @@ -9,7 +9,7 @@ angular.module('egCoreMod') profiles : [], // permission groups sms_carriers : [], user_settings : {}, // applied user settings - user_setting_types : {}, + user_setting_types : {}, // config.usr_setting_type modified_user_settings : {} // settings modifed this session }; @@ -131,7 +131,7 @@ angular.module('egCoreMod') }); }; - // some org settings require the retrieval of additional data... + // some org settings require the retrieval of additional data service.process_org_settings = function(settings) { if (!settings['sms.enable']) { @@ -193,7 +193,7 @@ angular.module('egCoreMod') return egCore.pcrud.search('cust', { '-or' : [ - {name : [ + {name : [ // common user settings 'circ.holds_behind_desk', 'circ.collections.exempt', 'opac.hold_notify', @@ -201,7 +201,7 @@ angular.module('egCoreMod') 'opac.default_pickup_location', 'opac.default_sms_carrier', 'opac.default_sms_notify']}, - {name : { + {name : { // opt-in notification user settings 'in': { select : {atevdef : ['opt_in_setting']}, from : 'atevdef', @@ -218,6 +218,8 @@ angular.module('egCoreMod') }); if(service.patron_id) { + // retrieve applied values for the current user + // for the setting types we care about. var setting_names = setting_types.map(function(obj) { return obj.name() }); @@ -250,12 +252,11 @@ angular.module('egCoreMod') return service.init_new_patron(); service.patron = current; - service.patron_id = current.id(); return service.init_existing_patron(current) } /* - * Existing patron objects reqire massaging before insertion + * Existing patron objects reqire some data munging before insertion * into the scope. * * 1. Turn everything into a hash @@ -287,12 +288,21 @@ angular.module('egCoreMod') } service.init_new_patron = function() { + + var addr = { + valid : true, + within_city_limits : true + // default state, etc. + }; + return { isnew : true, active : true, card : {}, home_ou : egCore.org.get(egCore.auth.user().ws_ou()), // TODO default profile group? + mailing_address : addr, + addresses : [addr] }; } @@ -303,6 +313,11 @@ angular.module('egCoreMod') function PatronRegCtrl($scope, $routeParams, $q, egCore, patronSvc, patronRegSvc) { + $scope.clone_id = $routeParams.clone_id; + $scope.stage_username = $routeParams.stage_username; + $scope.patron_id = + patronRegSvc.patron_id = $routeParams.edit_id || $routeParams.id; + $q.all([ $scope.initTab ? // initTab comes from patron app @@ -314,7 +329,8 @@ function PatronRegCtrl($scope, $routeParams, // called after initTab and patronRegSvc.init have completed var prs = patronRegSvc; // brevity - $scope.patron = prs.init_patron(patronSvc.current); + // in standalone mode, we have no patronSvc + $scope.patron = prs.init_patron(patronSvc ? patronSvc.current : null); $scope.field_doc = prs.field_doc; $scope.profiles = prs.profiles; $scope.ident_types = prs.ident_types; @@ -342,9 +358,6 @@ function PatronRegCtrl($scope, $routeParams, aua : egCore.idl.classes.aua.field_map }; - $scope.patron_id = $routeParams.edit_id || $routeParams.id; - $scope.clone_id = $routeParams.clone_id; - $scope.stage_username = $routeParams.stage_username; } diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/register.js b/Open-ILS/web/js/ui/default/staff/circ/patron/register.js index b8cbe272eb..49306f015e 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/register.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/register.js @@ -4,7 +4,7 @@ * Search, checkout, items out, holds, bills, edit, etc. */ -angular.module('egPatronRegApp', ['ui.bootstrap','ngRoute','egCoreMod']) +angular.module('egPatronRegApp', ['ui.bootstrap','ngRoute','egCoreMod', 'egUiMod']) .config(function($routeProvider, $locationProvider, $compileProvider) {