LP1904036 patron edit

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
index 4e29981..7d19146 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
@@ -4,19 +4,24 @@
 <a class="ml-2" href="javascript:;'" (click)="showFields='suggested'" i18n>Suggested Fields</a>
 <a class="ml-2" href="javascript:;'" (click)="showFields='all'" i18n>All Fields</a>
 
-
-<ng-template #fieldLabel
-  let-cls="cls" let-field="field" let-override="override">
+<ng-template #fieldLabel  
+  let-cls="cls" let-field="field" let-overrideLabel="overrideLabel">
   <div class="col-lg-3 field-label">
     <label for="{{cls}}-{{field}}-input">
-      {{getFieldLabel(cls, field, override)}}
+      {{getFieldLabel(cls, field, overrideLabel)}}
     </label>
     <!-- TODO doc links -->
   </div>
 </ng-template>
 
-<ng-template #fieldInput let-cls="cls" let-field="field" 
+<ng-template #fieldInput let-cls="cls" let-field="field" let-overrideLabel="overrideLabel"
   let-type="type" let-disabled="disabled" let-path="path">
+
+  <ng-container 
+    *ngTemplateOutlet="fieldLabel; context: 
+      {cls: cls, field: field, overrideLabel: overrideLabel}">
+  </ng-container>
+
   <div class="col-lg-3">
     <input 
       type="{{type || 'text'}}"
@@ -33,29 +38,19 @@
   </div>
 </ng-template>
 
-
 <div class="mt-3 striped-rows-even patron-edit-container" *ngIf="patron">
-  <div class="row pt-1 pb-1 mt-2">
-    <ng-container 
-      *ngTemplateOutlet="fieldLabel; context: {cls: 'ac', field: 'barcode'}">
-    </ng-container>
+  <div class="row pt-1 pb-1 mt-1">
     <ng-container 
       *ngTemplateOutlet="fieldInput; context: 
-        {cls: 'ac', field: 'barcode', disabled: !patron.isnew(), path: 'card'}">
+        {cls: 'ac', field: 'barcode', path: 'card', disabled: !patron.isnew()}">
     </ng-container>
   </div>
-  <div class="row pt-1 pb-1 mt-2">
-    <ng-container 
-      *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'usrname'}">
-    </ng-container>
+  <div class="row pt-1 pb-1 mt-1">
     <ng-container 
       *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'usrname'}">
     </ng-container>
   </div>
-  <div class="row pt-1 pb-1 mt-2">
-    <ng-container 
-      *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'passwd'}">
-    </ng-container>
+  <div class="row pt-1 pb-1 mt-1">
     <ng-container 
       *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'passwd'}">
     </ng-container>
@@ -69,42 +64,27 @@
     <li ngbNavItem="primary">
       <a ngbNavLink i18n>Primary Name</a>
       <ng-template ngbNavContent>
-        <div class="row pt-1 pb-1 mt-2">
-          <ng-container 
-            *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'prefix'}">
-          </ng-container>
+        <div class="row pt-1 pb-1 mt-1">
           <ng-container 
             *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'prefix'}">
           </ng-container>
         </div>
-        <div class="row pt-1 pb-1 mt-2">
-          <ng-container 
-            *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'first_given_name'}">
-          </ng-container>
+        <div class="row pt-1 pb-1 mt-1">
           <ng-container 
             *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'first_given_name'}">
           </ng-container>
         </div>
-        <div class="row pt-1 pb-1 mt-2">
-          <ng-container 
-            *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'second_given_name'}">
-          </ng-container>
+        <div class="row pt-1 pb-1 mt-1">
           <ng-container 
             *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'second_given_name'}">
           </ng-container>
         </div>
-        <div class="row pt-1 pb-1 mt-2">
-          <ng-container 
-            *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'family_name'}">
-          </ng-container>
+        <div class="row pt-1 pb-1 mt-1">
           <ng-container 
             *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'family_name'}">
           </ng-container>
         </div>
-        <div class="row pt-1 pb-1 mt-2">
-          <ng-container 
-            *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'suffix'}">
-          </ng-container>
+        <div class="row pt-1 pb-1 mt-1">
           <ng-container 
             *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'suffix'}">
           </ng-container>
@@ -114,42 +94,27 @@
     <li ngbNavItem="preferred">
       <a ngbNavLink i18n>Preferred Name</a>
       <ng-template ngbNavContent>
-        <div class="row pt-1 pb-1 mt-2">
-          <ng-container 
-            *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'pref_prefix'}">
-          </ng-container>
+        <div class="row pt-1 pb-1 mt-1">
           <ng-container 
             *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'pref_prefix'}">
           </ng-container>
         </div>
-        <div class="row pt-1 pb-1 mt-2">
-          <ng-container 
-            *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'pref_first_given_name'}">
-          </ng-container>
+        <div class="row pt-1 pb-1 mt-1">
           <ng-container 
             *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'pref_first_given_name'}">
           </ng-container>
         </div>
-        <div class="row pt-1 pb-1 mt-2">
-          <ng-container 
-            *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'pref_second_given_name'}">
-          </ng-container>
+        <div class="row pt-1 pb-1 mt-1">
           <ng-container 
             *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'pref_second_given_name'}">
           </ng-container>
         </div>
-        <div class="row pt-1 pb-1 mt-2">
-          <ng-container 
-            *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'pref_family_name'}">
-          </ng-container>
+        <div class="row pt-1 pb-1 mt-1">
           <ng-container 
             *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'pref_family_name'}">
           </ng-container>
         </div>
-        <div class="row pt-1 pb-1 mt-2">
-          <ng-container 
-            *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'pref_suffix'}">
-          </ng-container>
+        <div class="row pt-1 pb-1 mt-1">
           <ng-container 
             *ngTemplateOutlet="fieldInput; context: {cls: 'au', field: 'pref_suffix'}">
           </ng-container>
@@ -158,8 +123,30 @@
     </li>
   </ul>
   <div [ngbNavOutlet]="nameNav"></div>
-  <hr class="m-2"/>
-
-
+  <div class="row pt-1 pb-1 mt-1">
+    <ng-container 
+      *ngTemplateOutlet="fieldLabel; context: {cls: 'au', field: 'name_keywords'}">
+    </ng-container>
+    <div class="col-lg-3">
+      <textarea
+        class="form-control" 
+        name="au-name_keywords-input"
+        id="au-name_keywords-input"
+        [ngModel]="objectFromPath(null)['name_keywords']()"
+        (ngModelChange)="fieldValueChange(null, 'name_keywords', $event)"
+        (change)="fieldMaybeModified(null, 'name_keywords')"
+        [required]="fieldRequired(cls, 'name_keywords')"
+        [pattern]="fieldPattern(cls, 'name_keywords')">
+      </textarea>
+    </div>
+  </div>
+  <div class="row pt-1 pb-1 mt-1">
+    <!-- example of overriding a field label -->
+    <eg-string #holdAliasString i18n-text text="Holds Alias"></eg-string>
+    <ng-container 
+      *ngTemplateOutlet="fieldInput; context: 
+        {cls: 'au', field: 'alias', overrideLabel: holdAliasString.text}">
+    </ng-container>
+  </div>
 </div>