Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Save the pi/group as the account and allocation charge number #11

Merged
merged 1 commit into from
Jan 17, 2017
Merged

Save the pi/group as the account and allocation charge number #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/OpenXdmod/Ingestor/Hpcdb/Accounts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion classes/OpenXdmod/Ingestor/Hpcdb/Allocations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down