Merge pull request #11 from smgallo/openxdmod/accountname-as-chargenu…

…mber Save the pi/group as the account and allocation charge number
ubccr · Jan 17, 2017 · 1330a65 · 1330a65
2 parents 415c17d + 1cee0fe
commit 1330a65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/classes/OpenXdmod/Ingestor/Hpcdb/Accounts.php b/classes/OpenXdmod/Ingestor/Hpcdb/Accounts.php
@@ -15,7 +15,7 @@ function __construct($dest_db, $src_db, $start_date = '1997-01-01', $end_date =
             "
                 SELECT
                     account_id   AS id,
-                    ''           AS charge_number,
+                    account_name AS charge_number,
                     -1           AS granttype_id,
                     account_name AS short_name,
                     account_name AS long_name

diff --git a/classes/OpenXdmod/Ingestor/Hpcdb/Allocations.php b/classes/OpenXdmod/Ingestor/Hpcdb/Allocations.php
@@ -19,7 +19,8 @@ function __construct($dest_db, $src_db, $start_date = '1997-01-01', $end_date =
                     al.account_id,
                     req.request_id,
                     pi.person_id AS principalinvestigator_person_id,
-                    req.primary_fos_id AS fos_id
+                    req.primary_fos_id AS fos_id,
+                    acc.account_name AS charge_number
                 FROM hpcdb_allocations al
                 JOIN hpcdb_accounts acc
                     ON al.account_id = acc.account_id