Skip to content

Commit 62acf47

Browse files
dnicolaldednicolalde
authored
25.7 fb workdaychanges (#901)
* Changing labels to the columns to match WorkDay new names * Adding new column to the aliases table * Adding new template for creating new accounts * Adding columns to JET export and adding column to aliases * expand workday export to include new columns for EIB * simplifying work day display for CSV export * removing program from aliases table since it is not needed * Changing Fund-account to Grant removing UW Fund * Adding class for new csv export and removing institution
1 parent 0a03523 commit 62acf47

12 files changed

Lines changed: 386 additions & 7 deletions

File tree

‎wnprc_billing/resources/domain-templates/ehr_billing.template.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@
114114
<dat:rangeURI>string</dat:rangeURI>
115115
<dat:scale>500</dat:scale>
116116
</dat:column>
117+
<dat:column columnName="spend_category">
118+
<dat:rangeURI>string</dat:rangeURI>
119+
<dat:scale>500</dat:scale>
120+
</dat:column>
117121
</dat:columns>
118122
</table>
119123
</template>

‎wnprc_billing/resources/queries/ehr_billing/aliases.query.xml‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@
33
<tables xmlns="http://labkey.org/data/xml">
44
<table tableName="aliases" tableDbType="TABLE" useColumnOrder="true">
55
<javaCustomizer class="org.labkey.ehr_billing.table.EHR_BillingCustomizer" />
6+
<importTemplates>
7+
<template label="WorkDay Template" url="/query/exportExcelTemplate.view?schemaName=ehr_billing&amp;query.queryName=aliasesTemplate&amp;captionType=Label&amp;filenamePrefix=aliasesTemplate" />
8+
</importTemplates>
69
<tableTitle>Grant Accounts</tableTitle>
710
<auditLogging>DETAILED</auditLogging>
811
<columns>
912
<column columnName="alias">
10-
<columnTitle>Account Number</columnTitle>
13+
<importAliases>
14+
<importAlias>GrantWorkday</importAlias>
15+
</importAliases>
16+
<columnTitle>Grant</columnTitle>
1117
<nullable>false</nullable>
1218
</column>
1319
<column columnName="isAcceptingCharges">
@@ -18,7 +24,7 @@
1824
<formatString>Y;N;</formatString>
1925
</column>
2026
<column columnName="projectNumber">
21-
<columnTitle>Project Number</columnTitle>
27+
<columnTitle>Grant</columnTitle>
2228
</column>
2329
<column columnName="grantNumber">
2430
<columnTitle>Grant Number</columnTitle>
@@ -83,9 +89,24 @@
8389
<formatString>$###,##0.00</formatString>
8490
</column>
8591
<column columnName="charge_grant_accounts_id"/>
86-
<column columnName="uw_fund"/>
87-
<column columnName="uw_account"/>
88-
<column columnName="uw_udds"/>
92+
<column columnName="uw_fund">
93+
<importAliases>
94+
<importAlias>Fund</importAlias>
95+
</importAliases>
96+
<columnTitle>Fund</columnTitle>
97+
</column>
98+
<column columnName="uw_account">
99+
<importAliases>
100+
<importAlias>ledgerAccount</importAlias>
101+
</importAliases>
102+
<columnTitle>Ledger Account</columnTitle>
103+
</column>
104+
<column columnName="uw_udds">
105+
<importAliases>
106+
<importAlias>costCenter</importAlias>
107+
</importAliases>
108+
<columnTitle>Cost Center</columnTitle>
109+
</column>
89110
<column columnName="uw_class_code"/>
90111
<column columnName="grant_period_end"/>
91112
<column columnName="order_cutoff"/>

‎wnprc_billing/resources/queries/ehr_billing/aliases/.qview.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<column name="charge_grant_accounts_id"/>
2828
<column name="uw_fund"/>
2929
<column name="uw_account"/>
30+
<column name="program"/>
31+
<column name="spend_category"/>
3032
<column name="uw_udds"/>
3133
<column name="uw_class_code"/>
3234
<column name="grant_period_end"/>

‎wnprc_billing/resources/queries/ehr_billing/aliasesTemplate.sql‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
SELECT
2+
al.alias AS grantWorkDay,
3+
al.category AS category,
4+
al.isAcceptingCharges AS isAcceptingCharges,
5+
al.gencredits AS genCredits,
6+
al.projectNumber AS Grant,
7+
al.grantNumber AS grantNumber,
8+
al.tier_rate AS tierRate,
9+
al.type AS type,
10+
al.budgetStartDate AS budgetStartDate,
11+
al.budgetEndDate AS budgetEndDate,
12+
al.investigatorName AS investigatorName,
13+
al.investigatorId AS investigatorId,
14+
al.fiscalAuthority AS fiscalAuthority,
15+
al.affiliate AS affiliate,
16+
al.contact_name AS contact_name,
17+
al.contact_phone AS contact_phone,
18+
al.contact_email AS contact_email,
19+
--al.institution AS institution,
20+
al.address AS address,
21+
al.city AS city,
22+
al.state AS state,
23+
al.zip AS zip,
24+
al.billing_contact_info AS billing_contact_info,
25+
al.comments AS comments,
26+
al.po_number AS po_number,
27+
al.po_amount AS po_amount,
28+
al.charge_grant_accounts_id AS charge_grant_accounts_id,
29+
al.uw_fund AS fund,
30+
al.uw_account AS ledgerAccount,
31+
al.uw_udds AS costCenter,
32+
al.uw_class_code AS uw_class_code,
33+
al.grant_period_end AS grant_period_end,
34+
al.order_cutoff AS order_cutoff,
35+
al.successor_account AS successor_account,
36+
al.predecessor_account AS predecessor_account,
37+
al.mds_number AS mds_number,
38+
al.faRate AS faRate,
39+
al.faSchedule AS faSchedule
40+
FROM ehr_billing.aliases al

‎wnprc_billing/resources/queries/ehr_billing/invoiceRuns/.qview.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@
1616
<property name="columnTitle" value="CSV Download"/>
1717
</properties>
1818
</column>
19+
<column name="viewWorkdayInvoice">
20+
<properties>
21+
<property name="columnTitle" value="Workday Preview"/>
22+
</properties>
23+
</column>
24+
<column name="downloadWorkdayCsv">
25+
<properties>
26+
<property name="columnTitle" value="WorkDay Download"/>
27+
</properties>
28+
</column>
1929
</columns>
2030
<sorts>
2131
<sort column="billingPeriodEnd" descending="true" />

‎wnprc_billing/resources/queries/wnprc_billing/workdayInvoiceItems.query.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="jetInvoiceItems" tableDbType="NOT_IN_DB">
5+
<tableTitle>CSV to Workday Preview</tableTitle>
6+
<columns>
7+
<column columnName="Department">
8+
<columnTitle>Cost Center</columnTitle>
9+
10+
</column>
11+
<column columnName="Program">
12+
<columnTitle>Function</columnTitle>
13+
</column>
14+
<column columnName="Project">
15+
<columnTitle>Grant</columnTitle>
16+
</column>
17+
<column columnName="Account">
18+
<columnTitle>Ledge Account</columnTitle>
19+
</column>
20+
<column columnName="Amount">
21+
<columnTitle>Extended Amount</columnTitle>
22+
<formatString>0.00</formatString>
23+
</column>
24+
<column columnName="Description">
25+
<columnTitle>Catalog Item</columnTitle>
26+
</column>
27+
</columns>
28+
</table>
29+
</tables>
30+
</metadata>
31+
</query>

‎wnprc_billing/resources/queries/wnprc_billing/workdayInvoiceItems.sql‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
SELECT
2+
ii.invoiceId.rowId as runId,
3+
a.uw_account as Project,
4+
sum(ii.totalcost) as Amount,
5+
replace(a.uw_udds, '-', '') as Department,
6+
a.uw_fund as Fund,
7+
ii.invoiceId.runDate AS document_date,
8+
ii.invoiceId.comment AS memo,
9+
a.charge_grant_accounts_Id as Account,
10+
'Primate Center ' || to_char(ii.invoiceId.billingPeriodStart,'MON') as Description,
11+
to_char(ii.invoiceId.billingPeriodEnd, 'MMyy') as billingPeriodMMyy
12+
FROM
13+
ehr_billing.invoicedItems ii
14+
left join ehr_billing.aliases a
15+
on ii.debitedAccount = a.alias
16+
WHERE
17+
lcase(a.type) like '%internal%' AND a.gencredits IS FALSE
18+
GROUP BY
19+
ii.invoiceId.rowId,
20+
a.uw_udds,
21+
a.uw_fund,
22+
a.uw_account,
23+
a.charge_grant_accounts_Id,
24+
ii.invoiceId.runDate,
25+
ii.invoiceId.comment,
26+
ii.invoiceId.billingPeriodStart,
27+
ii.invoiceId.billingPeriodEnd

‎wnprc_billing/resources/queries/wnprc_billing/workdayInvoiceItems/.qview.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
2+
<columns>
3+
<column name="runId"/>
4+
<column name="Project"/> <!--Grant -->
5+
<column name="Amount"/>
6+
<column name="Department"/> <!-- Cost Center -->
7+
<column name="document_date"/>
8+
<column name="memo"/>
9+
10+
<column name="costCenter"/>
11+
<column name="Fund"/>
12+
<column name="function"/>
13+
14+
<!-- Internal Service Delivery Line Data -->
15+
<column name ="row_id"/>
16+
<column name="internal_service_delivery"/>
17+
<column name="Intercompany_Affiliate"/>
18+
<column name="Description"/> <!-- Catalog_Item -->
19+
20+
</columns>
21+
</customView>

0 commit comments

Comments
 (0)