LP1952931 ASN Receiving UI

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html b/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html
index b66d5c5..68d4005 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html
@@ -111,7 +111,7 @@ across different vendors to match a container code.
   </a>
 </ng-template>
 
-<eg-grid #grid [dataSource]="gridDataSource" 
+<eg-grid *ngIf="container" #grid [dataSource]="gridDataSource" 
   pageSize="50" (onRowActivate)="openLi($event)">
 
   <eg-grid-toolbar-button i18n-label label="Receive All Items"
@@ -128,8 +128,9 @@ across different vendors to match a container code.
   <eg-grid-column i18n-label label="ISBN" path="isbn"></eg-grid-column>
   <eg-grid-column i18n-label label="ISSN" path="issn" [hidden]="true"></eg-grid-column>
   <eg-grid-column i18n-label label="UPC" path="upc" [hidden]="true"></eg-grid-column>
-  <eg-grid-column i18n-label label="Ordered" path="lineitem.order_summary.item_count"></eg-grid-column>
   <eg-grid-column i18n-label label="In Shipment" path="entry.item_count"></eg-grid-column>
+  <eg-grid-column i18n-label label="Ordered" path="lineitem.order_summary.item_count"></eg-grid-column>
+  <eg-grid-column i18n-label label="Pending Receive" path="recievable_count"></eg-grid-column>
   <eg-grid-column i18n-label label="Received" path="lineitem.order_summary.recv_count"></eg-grid-column>
   <eg-grid-column i18n-label label="Invoiced" path="lineitem.order_summary.invoice_count"></eg-grid-column>
   <eg-grid-column i18n-label label="Canceled" path="lineitem.order_summary.cancel_count"></eg-grid-column>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.ts
index a4d29a5..0f5ad15 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.ts
@@ -46,6 +46,7 @@ export class AsnReceiveComponent implements OnInit {
 
     gridifyEntry(entry: IdlObject): any {
         const li = entry.lineitem();
+        const sum = li.order_summary();
         return {
             entry: entry,
             lineitem: li,
@@ -53,7 +54,10 @@ export class AsnReceiveComponent implements OnInit {
             author: this.li.getFirstAttributeValue(li, 'author'),
             isbn: this.li.getFirstAttributeValue(li, 'isbn'),
             issn: this.li.getFirstAttributeValue(li, 'issn'),
-            upc: this.li.getFirstAttributeValue(li, 'upc')
+            upc: this.li.getFirstAttributeValue(li, 'upc'),
+            recievable_count: sum.item_count() - (
+                sum.recv_count() + sum.cancel_count()
+            )
         };
     }