From 453edd6fa84bb5f6245a219506deec66a203a1e3 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 4 Apr 2019 15:08:53 +0000 Subject: [PATCH] JBAS-2141 Patron UI layout improvements * Move patron address to the top of the UI * Hide the patron address copy/paste textarea until needed (was taking up a lot of space) * Hide list of penalties and instead display a styled exclamation next to the patron's name when alerts exist. * Move Fines, etc. counts to the bottom of the patron summary. Signed-off-by: Bill Erickson --- Open-ILS/src/templates/staff/circ/patron/index.tt2 | 5 +- .../src/templates/staff/circ/patron/t_summary.tt2 | 147 +++++++++++---------- .../web/js/ui/default/staff/circ/patron/app.js | 2 + 3 files changed, 80 insertions(+), 74 deletions(-) diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2 index 5ebbe0eb9b..53b225b621 100644 --- a/Open-ILS/src/templates/staff/circ/patron/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2 @@ -97,10 +97,11 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
- [% l('[_1], [_2] [_3]', + [% l('[_1], [_2] [_3][_4]', '{{patron().family_name()}}', '{{patron().first_given_name()}}', - '{{patron().second_given_name()}}') %] + '{{patron().second_given_name()}}', + '{{hasAlerts() ? " !" : ""}}') %]
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 index 6b16b66b10..1676b7af47 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 @@ -11,6 +11,8 @@ %]
+ + + +
+
+

+ {{addr.address_type()}} + ([%- l('copy') -%][%- l('/print') -%]) +

+
{{addr.street1()}} {{addr.street2()}}
+
{{addr.city()}}, {{addr.state()}} {{addr.post_code()}}
+ +
+
+
-
+
[% l('Profile') %]
{{patron().profile().name()}}
@@ -83,6 +112,50 @@
[% l('Expire Date') %]
{{patron().expire_date() | date:$root.egDateFormat}}
+ +
+
[% l('Card') %]
+
{{patron().card().barcode()}}
+
+
+
[% l('Username') %]
+
{{patron().usrname()}}
+
+
+
[% l('Day Phone') %]
+
{{patron().day_phone()}}
+
+
+
[% l('Evening Phone') %]
+
{{patron().evening_phone()}}
+
+
+
[% l('Other Phone') %]
+
{{patron().other_phone()}}
+
+
+
[% l('ID1') %] ({{patron().ident_type().name()}})
+
{{patron().ident_value()}}
+
+
+
[% l('ID2') %]
+
{{patron().ident_value2()}}
+
+
+
[% l('Email') %]
+ +
{{patron().email()}}
+
+
+
{{map.stat_cat().name()}}
+
{{map.stat_cat_entry()}}
+
+
+
[% l('Name Keywords') %]
+
{{patron().name_keywords()}}
+
+
[% l('Fines Owed') %]
@@ -132,76 +205,6 @@ {{patron_stats().holds.ready}} / {{patron_stats().holds.total}}
-
-
[% l('Card') %]
-
{{patron().card().barcode()}}
-
-
-
[% l('Username') %]
-
{{patron().usrname()}}
-
-
-
[% l('Day Phone') %]
-
{{patron().day_phone()}}
-
-
-
[% l('Evening Phone') %]
-
{{patron().evening_phone()}}
-
-
-
[% l('Other Phone') %]
-
{{patron().other_phone()}}
-
-
-
[% l('ID1') %] ({{patron().ident_type().name()}})
-
{{patron().ident_value()}}
-
-
-
[% l('ID2') %]
-
{{patron().ident_value2()}}
-
-
-
[% l('Email') %]
- -
{{patron().email()}}
-
-
-
{{map.stat_cat().name()}}
-
{{map.stat_cat_entry()}}
-
-
-
[% l('Name Keywords') %]
-
{{patron().name_keywords()}}
-
-
-
-
-
- - {{addr.address_type()}} - ([%- l('copy') -%][%- l('/print') -%]) - -
{{addr.street1()}} {{addr.street2()}}
-
{{addr.city()}}, {{addr.state()}} {{addr.post_code()}}
-
- -
-
-
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 d007257e4f..267d27a3b7 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 @@ -347,6 +347,7 @@ function($scope, $q , $location , $filter , egCore , egNet , egUser , egAlertDi // Using node.style instead of ng-show/ng-hide in hopes it // will be quicker, so the user never sees the textarea. lNode.style.visibility = 'visible'; + lNode.style.display = 'block'; lNode.focus(); lNode.select(); @@ -355,6 +356,7 @@ function($scope, $q , $location , $filter , egCore , egNet , egUser , egAlertDi } lNode.style.visibility = 'hidden'; + lNode.style.display = 'none'; } $scope.toggle_expand_summary = function() { -- 2.11.0