From: Chris Sharp <csharp@georgialibraries.org>
Date: Tue, 14 May 2019 19:14:39 +0000 (-0400)
Subject: LP#1630271: Add a field, change a label.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fcsharp%2Flp1630271_acq_invoice_and_po_summary_views;p=working%2FEvergreen.git

LP#1630271: Add a field, change a label.

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 9523e84690..09462b7674 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -10323,7 +10323,7 @@ SELECT  usr,
 		<fields oils_persist:primary="inv_id">
 			<field reporter:label="Internal Invoice ID" name="inv_id" reporter:datatype="link"/>
 			<field reporter:label="Vendor Invoice ID" name="inv_vendor_ident" reporter:datatype="text"/>
-			<field reporter:label="Receive Date/Time" name="recv_date" reporter:datatype="timestamp"/>
+			<field reporter:label="Invoice Date/Time" name="recv_date" reporter:datatype="timestamp"/>
 			<field reporter:label="Provider ID" name="provider_id" reporter:datatype="link"/>
 			<field reporter:label="Provider Name" name="provider_name" reporter:datatype="text"/>
 			<field reporter:label="Provider Code" name="provider_code" reporter:datatype="text"/>
@@ -10338,14 +10338,15 @@ SELECT  usr,
 			<field reporter:label="Total Cost Billed" name="total_cost_billed" reporter:datatype="money"/>
 			<field reporter:label="Total Actual Cost" name="total_actual_cost" reporter:datatype="money"/>
 			<field reporter:label="Total Amount Paid" name="total_amount_paid" reporter:datatype="money"/>
-            <field reporter:label="Close Date" name="close_date" reporter:datatype="timestamp"/>
-            <field reporter:label="Closed By" name="closed_by" reporter:datatype="link"/>
+			<field reporter:label="Close Date" name="close_date" reporter:datatype="timestamp"/>
+			<field reporter:label="Closing Staff Member (Link)" name="closed_by" reporter:datatype="link"/>
+			<field reporter:label="Closing Staff Member Username" name="closed_by_usrname" reporter:datatype="text"/>
 		</fields>
 		<links>
 			<link field="inv_id" reltype="has_a" key="id" map="" class="acqinv"/>
 			<link field="provider_id" reltype="has_a" key="id" map="" class="acqpro"/>
 			<link field="shipper_id" reltype="might_have" key="id" map="" class="acqpro"/>
-            <link field="closed_by" reltype="might_have" key="id" map="" class="au"/>
+			<link field="closed_by" reltype="might_have" key="id" map="" class="au"/>
 		</links>
 	</class>
 	<class id="raposv" controller="open-ils.reporter-store" oils_obj:fieldmapper="reporter::acq_purchase_order_summary_view" oils_persist:tablename="reporter.acq_purchase_order_summary_view" reporter:label="Acquisitions Purchase Order Summary">
diff --git a/Open-ILS/src/sql/Pg/example.reporter-extension.sql b/Open-ILS/src/sql/Pg/example.reporter-extension.sql
index 3cf5f4fb64..c5d6b6dd72 100644
--- a/Open-ILS/src/sql/Pg/example.reporter-extension.sql
+++ b/Open-ILS/src/sql/Pg/example.reporter-extension.sql
@@ -379,14 +379,16 @@ CREATE OR REPLACE VIEW reporter.acq_invoice_summary_view AS
            raitac.total_actual_cost AS total_actual_cost,
            raitap.total_amount_paid AS total_amount_paid,
            invoice.close_date,
-           invoice.closed_by
+           invoice.closed_by,
+           closer.usrname AS closed_by_usrname
    FROM    acq.invoice invoice
            JOIN reporter.acq_invoice_total_cost_billed raitcb ON (raitcb.invoice = invoice.id)
            JOIN reporter.acq_invoice_total_actual_cost raitac ON (raitac.invoice = invoice.id)
            JOIN reporter.acq_invoice_total_amount_paid raitap ON (raitap.invoice = invoice.id)
            JOIN acq.provider provider ON (invoice.provider = provider.id)
            LEFT OUTER JOIN acq.provider shipper ON (invoice.shipper = shipper.id)
-           LEFT OUTER JOIN actor.org_unit receiver ON (invoice.receiver = receiver.id);
+           LEFT OUTER JOIN actor.org_unit receiver ON (invoice.receiver = receiver.id)
+           LEFT OUTER JOIN actor.usr closer ON (invoice.closed_by = closer.id);
 
 CREATE VIEW reporter.acq_purchase_order_summary_view AS
 SELECT  po.id,