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

labkey-bpatel · 2020-10-12T18:29:57Z

Rationale

Merge changes from onprc19.1 r.63271 to 65757
Merge changes from onprc19.1Prod r. 65762 to 65949

Related Pull Requests

LabKey/onprcEHRModules#32
LabKey/platform#1626
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

labkey-jeckels

Overall code is looking pretty good.

EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.39-12.40.sql

ehr/resources/queries/study/treatment_order.query.xml

ehr/resources/schemas/dbscripts/sqlserver/EHR_Lookups-17.20-17.21.sql

ehr/resources/schemas/dbscripts/sqlserver/a_ehr_lookups-17.20-17.21.sql

ehr/resources/schemas/dbscripts/sqlserver/ehr-17.21-17.30.sql

ehr/resources/schemas/ehr_lookups.xml

ehr/resources/views/groupOverlaps.html

ehr/src/org/labkey/ehr/EHRModule.java

ehr/src/org/labkey/ehr/EHRServiceImpl.java

…r updates to metadata.

- Add matching postgres script for EHR_ComplianceDB-12.39-12.40.sql - Add Treatment_Frequencies_Active.sql - Other minor cleanup

labkey-jeckels

One Postgres syntax issue, otherwise all set

EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.39-12.40.sql

ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java

ehr/resources/reports/schemas/study/Pedigree/Pedigree.r

ehr/resources/queries/study/treatment_order.query.xml

ehr/resources/views/groupOverlaps.html

bbimber · 2020-10-20T16:40:16Z

ehr/resources/views/groupOverlaps.html

+            // The Animal group search is working fine now after this change.
            if (groupName)
-                config.removeableFilters = [LABKEY.Filter.create('groupId/name', groupName, LABKEY.Filter.Types.EQUAL)];
+                //config.removeableFilters = [LABKEY.Filter.create('groupId/name', groupName, LABKEY.Filter.Types.EQUAL)];


isnt userFilters the new name for removeableFilters? this change prevents the user from removing the group name filter, doesnt it?

I believe that is the intention given that user enters filter criteria in a form, which then results in a filtered grid in a different panel, having removable filters on this resultant grid would be confusing.

I think it's clear that if there was a bug preventing the filter from being applied, that's a problem.

I can see the argument on there being a filter panel above, but by that same logic then shouldnt start/end date also be immutable? It is possible for the top filter fields and DR to get out of sync.

This is a small enough change that it's probably not a big deal, but in general I would tend toward preserving capabilities for the user. For example, what is they want to do another filter type? More than one group? Contains? etc.

ehr/resources/web/ehr/window/CreateTaskFromIdsWindow.js

ehr/resources/web/ehr/window/CreateTaskFromRecordsWindow.js

… column scale.

-Remove broken query study.currentBloodAvailable. -Add module property DCM_NHP_Resources_Container. -Update automated tests.

…fb_merge_from_onprc19.1

…) wip)

…filter that will get applied during insert and update.

…ey is not managing the calculations & validations, it is now done by a third party tool.

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

…tore is not loading when servicerequested is selected)

… and not been run successfully by the client.

….drug_defaults.

…fb_merge_from_onprc19.1

labkey-jeckels

One question but looks good.

labkey-jeckels · 2020-10-28T01:26:06Z

ehr/test/src/org/labkey/test/tests/onprc_ehr/AbstractGenericONPRC_EHRTest.java

+    @Override
+    protected boolean skipStudyImportQueryValidation()
+    {
+        return true;


Is this still needed?

Is this for test length / performance reasons? Is at least one of the ONPRC EHR tests doing a query validation?

This was added temporarily for query validation to pass so i could fix actual test failures but had missed to removed it after. Now removed, and query failures are fixed as well.

…Query updates (note: these queries still fail the validation, they are just partially updated/fixed).

…mns, fix up XML

Change DATE_TIME_FORMAT in AttributeData and Event to use 0-23 for hours format

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

Merge from onprc19.1 r.63271

74d287e

Merge from onprc19.1 r.63282

da1c620

Merge from onprc19.1 r.63282

25faf26

Merge from onprc19.1 r.63328 to 64381

a01dd02

Merge from onprc19.1 r.64647

2ed1767

Merge from onprc19.1 r.64648

7b23975

Merge from onprc19.1 r.64649 to 64652

50b0d32

Merge from onprc19.1 r.64748

6d7ff62

Merge from onprc19.1 r.64953 to 65052

6b6e16f

Merge from onprc19.1 r.65678 to 65757

efbb2cf

Fix build issues

4a03e01

Merge from onprc19.1Prod r 65762 to 65949

8b7452f

Remove code duplication from the merge.

95fe82d

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

labkey-jeckels requested changes Oct 13, 2020

View reviewed changes

labkey-bpatel added 3 commits October 13, 2020 09:53

'datedisabled' listed twice - remove duplicate

3472a0e

Remove 17.x scripts (content already part of rolled up scripts). Mino…

d63db3c

…r updates to metadata.

Code review changes:

23c1f48

- Add matching postgres script for EHR_ComplianceDB-12.39-12.40.sql - Add Treatment_Frequencies_Active.sql - Other minor cleanup

labkey-bpatel mentioned this pull request Oct 14, 2020

Register 'iStatLabworkType' and 'DefaultClinicalRemarksDataSource' - change part of onprc19.1 svn merge r.63271 LabKey/wnprc-modules#38

Merged

labkey-bpatel requested a review from labkey-jeckels October 14, 2020 00:32

labkey-jeckels requested changes Oct 14, 2020

View reviewed changes

EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.39-12.40.sql Outdated Show resolved Hide resolved

labkey-bpatel commented Oct 14, 2020

View reviewed changes

ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java Outdated Show resolved Hide resolved

Code review change - use varchar for postgres instead of nvarchar

906bd4c

bbimber requested changes Oct 20, 2020

View reviewed changes

labkey-bpatel added 2 commits October 20, 2020 18:34

Code review change - remove expandRemarksColumn() that resets remarks…

1179f09

… column scale.

-Replace hardcoded path with moduleProperty in sql queries.

2047202

-Remove broken query study.currentBloodAvailable. -Add module property DCM_NHP_Resources_Container. -Update automated tests.

labkey-bpatel added 13 commits October 21, 2020 00:57

Automated test updates

99382f3

Code review changes

1411dc8

Merge remote-tracking branch 'origin/release20.7-SNAPSHOT' into 20.7_…

bcb3794

…fb_merge_from_onprc19.1

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

02997d2

…) wip)

Code review change - remove filtered query as fkTable, instead use a …

0a2ac07

…filter that will get applied during insert and update.

Remove testBloodVolumeApi() - this test no longer relevant since LabK…

6d2a24d

…ey is not managing the calculations & validations, it is now done by a third party tool.

Remove extra ')'. Test fixes.

e3ea9e2

Add values to Surgical Repairs template. Move skipStudyImportQueryVal…

1c375ec

…idation() to the parent class.

Revert 'Add values to Surgical Repair template'.

06b7657

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.

Get LabworkServices store before getting 'servicerequested' (so the s…

23308a2

…tore is not loading when servicerequested is selected)

Skip "Billing Validation Notification" - this is broken on the server…

4171d41

… and not been run successfully by the client.

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

5618ca4

….drug_defaults.

Merge remote-tracking branch 'origin/release20.7-SNAPSHOT' into 20.7_…

630a601

…fb_merge_from_onprc19.1

labkey-bpatel requested a review from labkey-jeckels October 26, 2020 21:45

labkey-jeckels approved these changes Oct 28, 2020

View reviewed changes

labkey-bpatel and others added 4 commits October 28, 2020 23:41

Remove skipStudyImportQueryValidation(), and other related refactor. …

626f2cd

…Query updates (note: these queries still fail the validation, they are just partially updated/fixed).

Clean up queries - delete defunct queries, add missing lists and colu…

78f6cdd

…mns, fix up XML

Fix ONPRC_EHRTest2.testArrivalForm

7375737

Fix ONPRC_EHRTest.testNecropsyRequestFlow

1c90aac

labkey-bpatel merged commit 4270a0d into release20.7-SNAPSHOT Oct 30, 2020

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

labkey-jeckels mentioned this pull request Apr 29, 2021

Omit pedigree plot generations where both dam and sire are unknown #176

Merged

labkey-tchad pushed a commit that referenced this pull request Feb 24, 2025

Changed 1-24 hour format to 0-23 (#74)

628383c

Change DATE_TIME_FORMAT in AttributeData and Event to use 0-23 for hours format

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

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

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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bbimber Oct 20, 2020

Choose a reason for hiding this comment

Uh oh!

labkey-bpatel Oct 22, 2020

Choose a reason for hiding this comment

Uh oh!

bbimber Oct 22, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

labkey-jeckels left a comment

Choose a reason for hiding this comment

Uh oh!

labkey-jeckels Oct 28, 2020

Choose a reason for hiding this comment

Uh oh!

bbimber Oct 28, 2020

Choose a reason for hiding this comment

Uh oh!

labkey-bpatel Oct 30, 2020

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

labkey-bpatel commented Oct 12, 2020 •

edited

Loading