20.11 fb sla and pmic #149
Conversation
| LEFT JOIN Site.{substitutePath moduleProperty('ONPRC_Billing','BillingContainer_Public')}.onprc_billing_public.aliases y ON y.alias = a.account | ||
| LEFT JOIN onprc_ehr.investigators i ON i.rowId = a.investigatorId | ||
| LEFT JOIN Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.sla.allowableAnimals_BreedingGroups aa ON a.protocol = aa.protocol | ||
| LEFT JOIN "/onprc/admin/finance/public".onprc_billing_public.aliases y ON y.alias = a.account |
There was a problem hiding this comment.
Did you intentionally switch this to be hard-coded? This will trip up our automated tests on TeamCity. It would be better to keep using the moduleProperty if possible
| LEFT JOIN onprc_billing.fiscalAuthorities f ON f.rowid = i.financialanalyst | ||
| LEFT JOIN Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.sla.allowableAnimals_BreedingGroups aa ON a.protocol = aa.protocol | ||
| LEFT JOIN (select * from onprc_billing.projectAccountHistory z where (z.StartDate IS NOT NULL AND z.EndDate IS NOT NULL AND now() between z.StartDate AND z.EndDate)) x ON a.project = x.project | ||
| LEFT JOIN "/onprc/admin/finance/public".onprc_billing_public.aliases y ON y.alias = x.account |
There was a problem hiding this comment.
Same question here - can this keep using the moduleProperty reference?
| LEFT JOIN onprc_billing.fiscalAuthorities f ON f.rowid = i.financialanalyst | ||
| LEFT JOIN Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.sla.allowableAnimals_BreedingGroups aa ON a.protocol = aa.protocol | ||
| LEFT JOIN (select * from onprc_billing.projectAccountHistory z where (z.StartDate IS NOT NULL AND z.EndDate IS NOT NULL AND now() between z.StartDate AND z.EndDate)) x ON a.project = x.project | ||
| LEFT JOIN "/onprc/admin/finance/public".onprc_billing_public.aliases y ON y.alias = x.account |
|
Yes, Josh. I see the hard coded path for the aliases table("/onprc/admin/finance/public".onprc_billing_public.aliases ). I didn't make this change recently. That change was done few years ago. I can make the change so it uses the moduleProperty reference. Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.sla.allowableAnimals_BreedingGroups is a newly created user defined query directly in the schema browser. I have tested it on my dev machine and it works good. I had issues with the containers creating this query ( sla Vs ehr Vs sla_public). I know the correct way is putting the sql code in intellij. If that is going to interrupt the automated testing, I will change it. |
|
Thank you for noticing the bad xml in housing_transfers.query.xml. I swear I didn't mean to make any changes to this file as this project is already installed in production. It's probably my ghost :-) |
Co-authored-by: Josh Eckels <jeckels@labkey.com>
…1_fb_SLA_and_pmic
|
@kollil I renamed the feature branch in ehrModules as we discussed. TeamCity is running a new installer build now: |
|
Josh, All the fixes are done and tested on prime20test. Please approve to merge. Thanks |
labkey-jeckels
left a comment
labkey-jeckels
left a comment
There was a problem hiding this comment.
I was hoping to merge in changes that were added to the release20.11-SNAPSHOT branch to ensure that the automated tests were fully fixed by your updates but it sounds like the timing is too tight.
I merged the change in the ehrModules repo to allow dates in the distant future. Please go ahead and merge this.
|
Oh. Didn't know that Josh. I could have waited till next week but, I already told users to expect the changes tomorrow in production. |
|
Josh, You said, "I merged the change in the ehrModules repo to allow dates in the distant future. Please go ahead and merge this." |
|
@kollil Sorry, my note was confusing. I merged the ehrModules change a little earlier this afternoon. You don't need to do anything there. I meant you should go ahead and merge this pull request for onprcEhrModules, which you already did. So you're all set and should be able to get a new installer build from the default branch in TeamCity soon. |
|
Oh ok, Thanks Josh! |
Rationale
Retrieved the groups info from eIACUC tables. The SLA authorized projects and IACUC name shows the groups info.
Updated PMIC wiki pages with correct path.