Merge from onprc19.1 & onprc19.1Prod r.63271 to 65949 by labkey-bpatel · Pull Request #32 · LabKey/onprcEHRModules

labkey-bpatel · 2020-10-12T18:28:41Z

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

…that didn't find the new base automatically)

labkey-jeckels

A few merge-related problems and a handful of other fixes I noticed we should make during the review.

- Cleanup in sql scripts - Add HTML encoding - Remove illegal usage of <sort> in .query.xml files

labkey-jeckels

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.

labkey-bpatel · 2020-10-15T17:10:58Z

Only script that needed to be handled was the one that deletes observation_types.
With recent changes, 20.7 server (& onprc19.1Prod) can upgrade to this fb without issues.
Let me know if i am missing anything else.

…n release20.7-SNAPSHOT

…graphics).

…lc.sql.

-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).

…) wip)

…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.

….drug_defaults.

…alues/populating Frequency & Route values upon Treatment selection on Treatment Orders data entry form.

…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

…mns, fix up XML

labkey-bpatel added 20 commits October 6, 2020 13:39

Merge from onprc19.1 r.63271
180d542

Merge from onprc19.1 r.63271 (includes newly created folders & files …
f21297f
…that didn't find the new base automatically)

Merge from onprc19.1 r.63282
6a0c64b

Merge from onprc19.1 r.63282
10e7680

Merge from onprc19.1 r.63328 to 64381
80aecf7

Merge from onprc19.1 r.64647
58dbc53

Merge from onprc19.1 r.64748
8190071

Merge from onprc19.1 r.64769 to 64894
8c7b428

Merge from onprc19.1 r.64939 to 64951
3d12fe6

Merge from onprc19.1 r.64953 to 65052
383326c

Merge from onprc19.1 r.65053 to 65061
5ad9dab

Merge from onprc19.1 r.65063, 65064, 65071, 65388 to 65398
1e477ca

Merge from onprc19.1 r.65410
87d562e

Merge from onprc19.1 r.65412 to 65638
4128c68

Merge from onprc19.1 r.65639 to 65677
e9cdb74

Merge from onprc19.1 r.65678 to 65757
ed6604b

Merge from onprc19.1 r.64748 -- include missed .gif file
e6bf441

Fix build issues
2969518

Merge from onprc19.1Prod r 65762 to 65949
9d23eef

Merge from onprc19.1Prod r 65762 to 65949 - include missed changes
ba36612

labkey-bpatel requested a review from labkey-jeckels October 12, 2020 18:51

Add LDK module dependency
36b35b6

labkey-jeckels requested changes Oct 13, 2020
View reviewed changes

labkey-bpatel added 3 commits October 13, 2020 10:36

Add database tables to the xml metadata
b961201

Add database tables to the xml metadata
5f8344e

Code review changes
440fa3e
- Cleanup in sql scripts - Add HTML encoding - Remove illegal usage of <sort> in .query.xml files

labkey-jeckels requested changes Oct 14, 2020
View reviewed changes

labkey-bpatel added 2 commits October 14, 2020 21:28

Include 'GO' before 'Create Procedure' statements to avoid 'CREATE/AL…
e553fb0
…TER PROCEDURE' must be the first statement in a query batch' errors.

Handle observation_types deletion for dbs on different versions.
6b1b755

labkey-bpatel requested a review from labkey-jeckels October 15, 2020 17:11

labkey-bpatel added 15 commits October 15, 2020 19:56

Include contents of upgrade scripts from onprc19.1Prod that are not i…
312e761
…n release20.7-SNAPSHOT

Substitute module property path. Fix query name (demograophis to demo…
e64077f
…graphics).

Add the contents of RateCalc.sql to the upgrade script. Remove RateCa…
2bffbdd
…lc.sql.

-Replace hardcoded path with moduleProperty in sql queries.
4a56720
-Add query stored in the db to the module. -Remove broken query onprc_billing.leasefee_leasetypeTest. -Add module property BillingContainer_Public.

-Replace hardcoded path with moduleProperty in sql queries.
c39f74b
-Remove broken query study.currentBloodAvailable. -Add module property DCM_NHP_Resources_Container. -Update automated tests.

Use getColumnName() instead of getSelectName() (otherwise it errors w…
b63cdb6
…hen viewing most of study datasets and also causes test failures).

Fix error caused by an 'undefined' value.
96d15e2

Fix typo, other minor cleanup & updates.
379bbe1

Automated test fix for testArrivalApi(). (Fix for testBloodVolumeApi(…
dfc335c
…) wip)

Add values to Surgical Repairs template. Move skipStudyImportQueryVal…
14b0408
…idation() to the parent class.

Revert 'Add values to Surgical Repair template'.
a28e892
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.

Test fixes. Associate 'code' column with editorConfig for ehr_lookups…
2cd36c6
….drug_defaults.

Remove unnecessary code that was restricting getting drug formulary v…
5ca68fc
…alues/populating Frequency & Route values upon Treatment selection on Treatment Orders data entry form.

Remove version property
aef6acf

Get QC State by label instead of hardcoded rowid value.
109c138

labkey-jeckels approved these changes Oct 28, 2020
View reviewed changes

labkey-bpateland others added 7 commits October 27, 2020 23:37

Replace hardcoded value with module property. Add columns to demograp…
e39ad9d
…hics and pairings datasets.

Remove USE [Labkey]
5f67a0a

Remove skipStudyImportQueryValidation(), and other related refactor. …
58ad3df
…Query updates (note: these queries still fail the validation, they are just partially updated/fixed).

Merge remote-tracking branch 'origin/20.7_fb_merge_from_onprc19.1' in…
5c37c8d
…to 20.7_fb_merge_from_onprc19.1

Clean up long-defunct SQL queries
58a6f0b

Clean up queries - delete defunct queries, add missing lists and colu…
e1ab5a5
…mns, fix up XML

labkey-bpatel merged commit 9bf8da6 into release20.7-SNAPSHOTOct 30, 2020

labkey-bpatel deleted the 20.7_fb_merge_from_onprc19.1 branch October 30, 2020 17:48

Navigation Menu

Uh oh!

Merge from onprc19.1 & onprc19.1Prod r.63271 to 65949 - #32

Merge from onprc19.1 & onprc19.1Prod r.63271 to 65949#32
labkey-bpatel merged 51 commits into
release20.7-SNAPSHOTfrom
20.7_fb_merge_from_onprc19.1

labkey-bpatel commented Oct 12, 2020•
edited
Loading

Uh oh!

labkey-jeckels left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

labkey-jeckels left a comment

Uh oh!

labkey-bpatel commented Oct 15, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

labkey-bpatel commented Oct 12, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Rationale

Related Pull Requests

Uh oh!

labkey-jeckels left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

labkey-jeckels left a comment

Choose a reason for hiding this comment

Uh oh!

labkey-bpatel commented Oct 15, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

labkey-bpatel commented Oct 12, 2020•
edited
Loading