From ef25453cd7e1f6b46728f8cfee17ba44a1b9955f Mon Sep 17 00:00:00 2001
From: Remington Steed <rjs7@calvin.edu>
Date: Fri, 23 Mar 2018 10:46:32 -0400
Subject: [PATCH] LP#1693036: Simplify template, cleanup preview data

This commit corrects a few minor problems, and also attempts to simplify
and cleanup the template. The changes include:

  - Adding the missing "ident_type2" field to the template and JS
  - Adding missing sample data for "county"
  - Moving "postal code" closer to the standard location (at the end of
    the address)
  - Fixing typos, and making "Claims..." labels more consistent
  - Minor cleanup of the sample data
  - Removing template comments that list available variables, because
    this template is simpler than most, intended to print everything

Signed-off-by: Remington Steed <rjs7@calvin.edu>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
---
 .../share/print_templates/t_patron_data.tt2   | 26 +++++--------------
 .../ui/default/staff/admin/workstation/app.js | 16 +++++++-----
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
index 6c84270e69..48d6152174 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
@@ -1,9 +1,5 @@
 <!--
-Template for printing a patron's data, including addesses and statistical categories. Fields include:
-
-* patron.first_given_name
-* patron.second_given_name
-* patron.family_name
+Template for printing a patron's data, including addresses and statistical categories.
 -->
 <div>
   <div>=-=-=-=</div>
@@ -21,6 +17,7 @@ Template for printing a patron's data, including addesses and statistical catego
   <div>Juvenile: {{patron.juvenile}}</div>
   <div>Primary Identification Type: {{patron.ident_type.name()}}</div>
   <div>Primary Identification: {{patron.ident_value}}</div>
+  <div>Secondary Identification Type: {{patron.ident_type2.name()}}</div>
   <div>Secondary Identification: {{patron.ident_value2}}</div>
   <div>Email Address: {{patron.email}}</div>
   <div>Daytime Phone: {{patron.day_phone}}</div>
@@ -33,36 +30,25 @@ Template for printing a patron's data, including addesses and statistical catego
   <div>Active: {{patron.active}}</div>
   <div>Barred: {{patron.barred}}</div>
   <div>Is Group Lead Account: {{patron.master_account}}</div>
-  <div>Claims-returned Count: {{patron.claims_returned_count}}</div>
-  <div>Claims Never Checked Out Count: {{patron.claims_never_checked_out_count}}</div>
+  <div>Claims-Returned Count: {{patron.claims_returned_count}}</div>
+  <div>Claims-Never-Checked-Out Count: {{patron.claims_never_checked_out_count}}</div>
   <div>Alert Message: {{patron.alert_message}}</div>
 
   <div>
-    <!--
-    * address.street1
-    * address.street2
-    * address.city
-    * address.state
-    * address.post_code
-    -->
     <div ng-repeat="address in patron.addresses">
       <div>-------</div>
       <div>Type: {{address.address_type}}</div>
-      <div>Postal Code: {{address.post_code}}</div>
       <div>Street (1): {{address.street1}}</div>
       <div>Street (2): {{address.street2}}</div>
       <div>City: {{address.city}}</div>
       <div>County: {{address.county}}</div>
       <div>State: {{address.state}}</div>
-      <div>Contry: {{address.country}}</div>
+      <div>Postal Code: {{address.post_code}}</div>
+      <div>Country: {{address.country}}</div>
       <div>Valid Address?: {{address.valid}}</div>
       <div>Within City Limits?: {{address.within_city_limits}}</div>
     </div>
     <div>-------</div>
-    <!-- Stat Cats
-    *  entry.stat_cat_entry
-    *  entry.stat_cat.name
-    -->
     <div ng-repeat="entry in patron.stat_cat_entries">{{entry.stat_cat.name}} : {{entry.stat_cat_entry}}</div>
     <div>=-=-=-=</div>
   </div>
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 ecafa85e0e..012eab08bd 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
@@ -356,8 +356,8 @@ function($scope , $q , egCore , ngToast) {
     // NOTE: A lot of this data can be shared across templates.
     var seed_user = {
         prefix : 'Mr',
-        first_given_name : 'Slow',
-        second_given_name : 'Joe',
+        first_given_name : 'Joseph',
+        second_given_name : 'Martin',
         family_name : 'Jones',
         suffix : 'III',
         card : {
@@ -369,17 +369,16 @@ function($scope , $q , egCore , ngToast) {
             total_paid : '1.00'
         },
         expire_date : '2020-12-31',
-        alias : 'the dude',
+        alias : 'Joey J.',
         has_email : true,
         has_phone : false,
-        dob : '1984-11-07T00:00:00-8:00',
+        dob : '1980-01-01T00:00:00-8:00',
         juvenile : 'f',
         usrname : '30393830393',
         day_phone : '111-222-3333',
         evening_phone : '222-333-1111',
         other_phone : '333-111-2222',
         email : 'user@example.com',
-        ident_value2 : 'Carol',
         home_ou : {name: function() {return 'BR1'}},
         profile : {name: function() {return 'Patrons'}},
         net_access_level : {name: function() {return 'Filtered'}},
@@ -388,9 +387,11 @@ function($scope , $q , egCore , ngToast) {
         master_account : 'f',
         claims_returned_count : '0',
         claims_never_checked_out_count : '0',
-        alert_message : 'Very slow',
-        ident_type: {name: function() {return 'Other'}},
+        alert_message : 'Coat is in the lost-and-found behind the circ desk',
+        ident_type: {name: function() {return 'Drivers License'}},
         ident_value: '11332445',
+        ident_type2: {name: function() {return 'Other'}},
+        ident_value2 : '55442211',
         addresses : [],
         stat_cat_entries : [
             {
@@ -408,6 +409,7 @@ function($scope , $q , egCore , ngToast) {
         street1 : '123 Apple Rd',
         street2 : 'Suite B',
         city : 'Anywhere',
+        county : 'Great County',
         state : 'XX',
         country : 'US',
         post_code : '12345',
-- 
2.43.2