From e8016247533f427ea4ea6fec0729c308db5ffad0 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Thu, 3 Jun 2021 15:54:43 -0400
Subject: [PATCH] funds: improve CSV export in fund details dialog

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../admin/acq/funds/fund-details-dialog.component.html  |  6 +++---
 .../admin/acq/funds/fund-details-dialog.component.ts    | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
index 87ee598bad..ec9618bbd8 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
@@ -103,11 +103,11 @@
 
               <ng-template #sourcefundTmpl let-row="row">
                 <ng-container *ngIf="row.src_fund().id() === fundId">
-                  {{row.src_fund().code()}}  ({{row.src_fund().year()}}) ({{getOrgShortname(row.src_fund().org())}})
+                  {{row.src_fund().code()}} ({{row.src_fund().year()}}) ({{getOrgShortname(row.src_fund().org())}})
                 </ng-container>
                 <ng-container *ngIf="row.src_fund().id() !== fundId">
                   <a href="/eg2/staff/admin/acq/funds/fund/{{row.src_fund().id()}}" target="_blank">
-                    {{row.src_fund().code()}}  ({{row.src_fund().year()}}) ({{getOrgShortname(row.src_fund().org())}})
+                    {{row.src_fund().code()}} ({{row.src_fund().year()}}) ({{getOrgShortname(row.src_fund().org())}})
                   </a>
                 </ng-container>
               </ng-template>
@@ -119,7 +119,7 @@
                 </ng-container>
                 <ng-container *ngIf="row.dest_fund().id() !== fundId">
                   <a href="/eg2/staff/admin/acq/funds/fund/{{row.dest_fund().id()}}" target="_blank">
-                    {{row.dest_fund().code()}}  ({{row.dest_fund().year()}}) ({{getOrgShortname(row.dest_fund().org())}})
+                    {{row.dest_fund().code()}} ({{row.dest_fund().year()}}) ({{getOrgShortname(row.dest_fund().org())}})
                   </a>
                 </ng-container>
               </ng-template>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts
index f254e608b9..f4e052408c 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts
@@ -75,9 +75,20 @@ export class FundDetailsDialogComponent
         this.fieldOrder = 'name,code,year,org,active,currency_type,balance_stop_percentage,balance_warning_percentage,propagate,rollover';
 
         this.cellTextGenerator = {
-            src_fund: row => row().code(),
-            dest_fund: row => row().code(),
-            funding_source: row => row().code(),
+            src_fund: row =>
+                row.src_fund().code() + ' (' +
+                row.src_fund().year() + ') (' +
+                this.getOrgShortname(row.src_fund().org()) + ')',
+            dest_fund: row =>
+                row.dest_fund().code() + ' (' +
+                row.dest_fund().year() + ') (' +
+                this.getOrgShortname(row.dest_fund().org()) + ')',
+            funding_source: row =>
+                row.funding_source().code() + ' (' + 
+                    this.getOrgShortname(row.funding_source().owner()) + ')',
+            funding_source_credit: row =>
+                row.funding_source_credit().funding_source().code() + ' (' + 
+                    this.getOrgShortname(row.funding_source_credit().funding_source().owner()) + ')',
             li: row => row.li_id,
             po: row => row.po_name,
             invoice: row => row.vendor_invoice_id
-- 
2.11.0