From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Fri, 15 May 2020 21:43:10 +0000 (-0400)
Subject: implement user contains (barcode or username) operator
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e6a7ff060a2307df795ecdb6fc11752a9bfd4854;p=working%2FEvergreen.git

implement user contains (barcode or username) operator

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
index 5c0c830c64..89a8438db1 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
@@ -43,7 +43,7 @@
         (change)="clearSearchTermValueAfterOpChange(t)">
         <option i18n value="">is</option>
         <option i18n value="__not">is NOT</option>
-        <option i18n value="__fuzzy" [hidden]="searchTermDatatypes[t.field] != 'text' && searchFieldLinkedClasses[t.field] !== 'acqpro'">contains</option>
+        <option i18n value="__fuzzy" [hidden]="searchTermDatatypes[t.field] != 'text' && searchFieldLinkedClasses[t.field] !== 'acqpro' && searchFieldLinkedClasses[t.field] !== 'au'">contains</option>
         <option i18n value="__not,__fuzzy" [hidden]="searchTermDatatypes[t.field] != 'text'">does NOT contain</option>
         <option i18n value="__starts" [hidden]="searchTermDatatypes[t.field] != 'text'">STARTS with</option>
         <option i18n value="__ends" [hidden]="searchTermDatatypes[t.field] != 'text'">ENDS with</option>
@@ -89,7 +89,15 @@
             </eg-combobox>
             <input [ngModelOptions]="{standalone: true}" [(ngModel)]="t.value1" type="text" *ngIf="t.op == '__fuzzy'" class="form-control" />
           </ng-container>
-          <ng-container *ngIf="searchFieldLinkedClasses[t.field] !== 'acqpro'">
+          <ng-container *ngIf="searchFieldLinkedClasses[t.field] === 'au'">
+            <eg-combobox *ngIf="!t.op.includes('__fuzzy')"
+              [idlClass]="searchFieldLinkedClasses[t.field]"
+              [selectedId]="t.value1"
+              (onChange)="t.value1 = $event ? $event.id : ''">
+            </eg-combobox>
+            <input [ngModelOptions]="{standalone: true}" [(ngModel)]="t.value1" type="text" *ngIf="t.op.includes('__fuzzy')" class="form-control" />
+          </ng-container>
+          <ng-container *ngIf="searchFieldLinkedClasses[t.field] !== 'acqpro' && searchFieldLinkedClasses[t.field] !== 'au'">
             <eg-combobox
               [asyncSupportsEmptyTermClick]="t.field.endsWith('cancel_reason') || t.field.endsWith(':claim_policy') || t.field.endsWith('_method')"
               [idlClass]="searchFieldLinkedClasses[t.field]"
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
index a42010103a..d9355aa7cf 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
@@ -166,6 +166,12 @@ export class AcqSearchFormComponent implements OnInit, AfterViewInit, OnChanges
         if (old && this.searchTermDatatypes[old] != this.searchTermDatatypes[term.field]) {
             term.op = '';
         }
+        if (old && this.searchTermDatatypes[old] == this.searchTermDatatypes[term.field] &&
+            this.searchTermDatatypes[term.field] == 'link' &&
+            (this.searchFieldLinkedClasses[old] != this.searchFieldLinkedClasses[term.field])
+           ) {
+            term.op = '';
+        }
         if (term.field.startsWith('acqlia:') && term.op === '') {
             // default operator for line item attributes should be "contains"
             term.op = '__fuzzy';