From 7dfce583eb36a11612d5fc8f5fd1a8ba5c110217 Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@EquinoxInitiative.org>
Date: Tue, 19 Nov 2019 23:56:41 -0500
Subject: [PATCH] tweak columns for picklist and purchase order grids

to better match the spec (unmandated columns hidden by default)

virtual columns such as picklist's entry_count have to be specified with eg-grid

hiding fleshed user columns was causing some uncaught errors and the grid to
misrender when manually unhidden. Adding a label helped, but would render the
cell as [object Object].  Using a cell template to handle that object was
providing different errors (.id() was accessible, but not .usrname()).  So,
unfleshing those for now.

Signed-off-by: Jason Etheridge <jason@EquinoxInitiative.org>
---
 .../src/eg2/src/app/staff/acq/search/acq-search.service.ts     | 10 +++++-----
 .../src/app/staff/acq/search/picklist-results.component.html   |  6 ++++++
 .../app/staff/acq/search/purchase-order-results.component.html |  7 ++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts
index 9e21871ae8..38040a2795 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts
@@ -45,15 +45,15 @@ const searchOptions = {
     purchase_order: {
         no_flesh_cancel_reason: true,
         flesh_provider: true,
-        flesh_owner: true,
-        flesh_creator: true,
-        flesh_editor: true
+        flesh_owner: false,
+        flesh_creator: false,
+        flesh_editor: false
     },
     picklist: {
         flesh_lineitem_count: true,
         flesh_owner: true,
-        flesh_creator: true,
-        flesh_editor: true
+        flesh_creator: false,
+        flesh_editor: false
     },
     invoice: {
         no_flesh_misc: true
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.html
index 5464399382..b6c528d53d 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.html
@@ -45,4 +45,10 @@
   </eg-grid-toolbar-action>
 
   <eg-grid-column path="name" [cellTemplate]="nameTmpl"></eg-grid-column>
+  <eg-grid-column path="entry_count"></eg-grid-column>
+
+  <eg-grid-column path="id" [hidden]="true"></eg-grid-column>
+  <eg-grid-column path="creator" [hidden]="true"></eg-grid-column>
+  <eg-grid-column path="editor" [hidden]="true"></eg-grid-column>
+
 </eg-grid>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html
index b6262cd77e..7b3300b82e 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html
@@ -14,9 +14,14 @@
 
 <eg-grid #acqSearchPurchaseOrdersGrid
   persistKey="acq.search.purchaseorders"
-  [stickyHeader]="true"
+  [stickyHeader]="true" 
   idlClass="acqpo" [dataSource]="gridSource">
 
   <eg-grid-column path="name" [cellTemplate]="nameTmpl"></eg-grid-column>
   <eg-grid-column path="provider" [cellTemplate]="providerTmpl"></eg-grid-column>
+
+  <eg-grid-column path="creator" [hidden]="true"></eg-grid-column>
+  <eg-grid-column path="editor" [hidden]="true"></eg-grid-column>
+  <eg-grid-column path="owner" [hidden]="true"></eg-grid-column>
+
 </eg-grid>
-- 
2.11.0