Skip to content

Changes to include BSL3 perdiems #974

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

Open
dnicolalde wants to merge 1 commit into
base: release26.3-SNAPSHOT
Choose a base branch
from
Open

Changes to include BSL3 perdiems #974

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
3 changes: 2 additions & 1 deletion wnprc_billing/resources/queries/wnprc_billing/perDiemFeeRates.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,5 @@
(CAST(pdt.adate AS DATE) <= cr1.enddate OR cr1.enddate IS NULL))
LEFT JOIN ehr_billing.chargeableItems ci1 ON ci1.rowid = cr1.chargeId) pdr
WHERE (pdr.item = 'Per diems' AND pdr.project.projectType IS NULL) --Excluding research projects from reduce perDiem
OR (pdr.item = 'Special Animal Per Diem' AND pdr.project.projectType = 'Marmoset U24') --Only assigning reduce perDiem to U24 projects
OR (pdr.item = 'Special Animal Per Diem' AND pdr.project.projectType = 'Marmoset U24') --Only assigning reduce perDiem to U24 projects
OR (pdr.item = 'BSL3 Per diems' AND pdr.project.projectType = 'BSL3')
2 changes: 2 additions & 0 deletions wnprc_billing/src/org/labkey/wnprc_billing/table/WNPRC_BillingCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ private void customizeChargeableItems(AbstractTableInfo ti)
" THEN 'Yes'" +
" WHEN " + ExprColumn.STR_TABLE_ALIAS + ".name = 'Special Animal Per Diem'" +
" THEN 'Yes'" +
" WHEN " + ExprColumn.STR_TABLE_ALIAS + ".name = 'BSL3 Per diems'" +
" THEN 'Yes'" +
" ELSE ''" +
" END)" +
")";
Expand Down