LP#1942220: (follow-up) include receiver in select LI details displays

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

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.html
index 7b7717b..69381de 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.html
@@ -20,6 +20,7 @@
     <div class="flex-1 p-1" i18n>
       <ng-container *ngIf="!hideBarcode && !batchAdd">Barcode</ng-container>
     </div>
+    <div class="flex-1 p-1" *ngIf="!hasEditableCopies()" i18n>Receiver</div>
     <div class="flex-1 p-1"></div>
     <div class="flex-1 p-1"></div>
   </div>
@@ -53,6 +54,7 @@
       (unReceiveRequested)="unReceiveCopy($event)"
       (deleteRequested)="deleteCopy($event)" 
       (cancelRequested)="cancelCopy($event)"
+      [showReceiver]="!hasEditableCopies()"
       [rowIndex]="idx + 1" [lineitem]="lineitem" [copy]="copy">
     </eg-lineitem-copy-attrs>
   </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.html
index 380bcd8..2523e76 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.html
@@ -81,6 +81,9 @@
       </ng-container>
     </ng-container>
   </div>
+  <div class="flex-1 p-1" *ngIf="showReceiver">
+    {{copy.receiver()?.usrname()}}
+  </div>
   <ng-container *ngIf="!embedded">
     <div class="flex-2 p-1 pr-2 pl-2">
       <ng-container *ngIf="!batchMode">

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.ts
index e30e45c..b85c40e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.ts
@@ -49,6 +49,8 @@ export class LineitemCopyAttrsComponent implements OnInit {
     // Always read-only.
     @Input() embedded = false;
 
+    @Input() showReceiver = false;
+
     // Emits an 'acqlid' object;
     @Output() batchApplyRequested: EventEmitter<IdlObject> = new EventEmitter<IdlObject>();
     @Output() deleteRequested: EventEmitter<IdlObject> = new EventEmitter<IdlObject>();

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
index 8af5df8..c49bd23 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
@@ -511,9 +511,10 @@
         <div class="flex-1 p-1" i18n>Circ Modifier</div>
         <div class="flex-1 p-1" i18n>Callnumber</div>
         <div class="flex-1 p-1" i18n>Barcode</div>
+        <div class="flex-1 p-1" i18n>Receiver</div>
       </div>
       <div class="batch-copy-row" *ngFor="let copy of li.lineitem_details()">
-        <eg-lineitem-copy-attrs [embedded]="true" [copy]="copy">
+        <eg-lineitem-copy-attrs [embedded]="true" [showReceiver]="true" [copy]="copy">
         </eg-lineitem-copy-attrs>
       </div>
     </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.service.ts
index faaf3be..7c73ad5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.service.ts
@@ -101,6 +101,7 @@ export class LineitemService {
             flesh_order_summary: true,
             flesh_cancel_reason: true,
             flesh_li_details: true,
+            flesh_li_details_receiver: true,
             flesh_notes: true,
             flesh_fund: true,
             flesh_circ_modifier: true,