Merge from onprc19.1 & onprc19.1Prod r.63271 to 65949 #32
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…that didn't find the new base automatically)
This was referenced Oct 12, 2020
labkey-jeckels
requested changes
Oct 13, 2020
Contributor
labkey-jeckels
left a comment
labkey-jeckels
left a comment
There was a problem hiding this comment.
A few merge-related problems and a handful of other fixes I noticed we should make during the review.
onprc_ehr/resources/queries/onprc_ehr/vet_assignment_summary.sql
Outdated
Show resolved
Hide resolved
onprc_ehr/resources/queries/study/StudyDetails_cohort_values.query.xml
Outdated
Show resolved
Hide resolved
onprc_ehr/resources/queries/study/StudyDetails_group_values.query.xml
Outdated
Show resolved
Hide resolved
onprc_ehr/resources/queries/study/StudyDetails_phase_values.query.xml
Outdated
Show resolved
Hide resolved
...c_ehr/src/org/labkey/onprc_ehr/notification/TreatmentAlertsPostOpsNotificationSecondary.java
Outdated
Show resolved
Hide resolved
onprc_ehr/src/org/labkey/onprc_ehr/notification/TreatmentAlertsPostOpsNotificationThird.java
Outdated
Show resolved
Hide resolved
onprc_ehr/src/org/labkey/onprc_ehr/notification/UnoccupiedRoomsNotification.java
Outdated
Show resolved
Hide resolved
onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java
Outdated
Show resolved
Hide resolved
onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java
Outdated
Show resolved
Hide resolved
- Cleanup in sql scripts - Add HTML encoding - Remove illegal usage of <sort> in .query.xml files
labkey-jeckels
requested changes
Oct 14, 2020
Contributor
labkey-jeckels
left a comment
labkey-jeckels
left a comment
There was a problem hiding this comment.
All looks good except there's more to do on the upgrade scripts
…TER PROCEDURE' must be the first statement in a query batch' errors.
Contributor
Author
|
Only script that needed to be handled was the one that deletes observation_types. |
…n release20.7-SNAPSHOT
-Add query stored in the db to the module. -Remove broken query onprc_billing.leasefee_leasetypeTest. -Add module property BillingContainer_Public.
-Remove broken query study.currentBloodAvailable. -Add module property DCM_NHP_Resources_Container. -Update automated tests.
…hen viewing most of study datasets and also causes test failures).
…idation() to the parent class.
Use existing & functional utility code to get ehr_lookups.labwork_services store. Replace 'onprc-snomedtreatmentcombo' with 'ehr-snomedtreatmentcombo' (since the onprc one is not defined). Some cleanup.
…alues/populating Frequency & Route values upon Treatment selection on Treatment Orders data entry form.
labkey-jeckels
approved these changes
Oct 28, 2020
…hics and pairings datasets.
…to 20.7_fb_merge_from_onprc19.1 # Conflicts: # onprc_billing/resources/queries/onprc_billing/RateCalc.sql # onprc_billing/resources/schemas/dbscripts/sqlserver/onprc_billing-17.501-17.502.sql # onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-12.395-12.396.sql # onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-12.405-12.406.sql # onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-12.406-12.407.sql # onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-12.407-12.408.sql # onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-12.408-12.409.sql # onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-17.702-17.703.sql # onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-20.106-20.107.sql
…Query updates (note: these queries still fail the validation, they are just partially updated/fixed).
…to 20.7_fb_merge_from_onprc19.1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rationale
Merge changes from onprc19.1 r.63271 to 65757
Merge changes from onprc19.1Prod r. 65762 to 65949
Related Pull Requests
LabKey/platform#1626
LabKey/ehrModules#74
LabKey/DiscvrLabKeyModules#64
LabKey/LabDevKitModules#55
https://github.com/LabKey/sampleManagement/pull/381
https://github.com/LabKey/biologics/pull/712
https://github.com/LabKey/labbook/pull/53
LabKey/wnprc-modules#38