Skip to content

Merge from wnprc18.3 svn r.64261 to r.65647 - #56

Merged
labkey-jeckels merged 39 commits into
release20.6-SNAPSHOTfrom
20.6_fb_merge_from_wnprc18.3
Sep 1, 2020
Merged

Merge from wnprc18.3 svn r.64261 to r.65647#56
labkey-jeckels merged 39 commits into
release20.6-SNAPSHOTfrom
20.6_fb_merge_from_wnprc18.3

Conversation

@labkey-bpatel

@labkey-bpatellabkey-bpatel commented Jul 6, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Rationale

Merge from wnprc18.3 svn r.64261 to r.65647 (skipped r. 64864 & 65166 since these were backports)

Related Pull Requests

LabKey/commonAssays#200
LabKey/LabDevKitModules#38
LabKey/onprcEHRModules#20
LabKey/platform#1370
LabKey/tnprc_billing#72

This was referenced Jul 7, 2020
Closed
Merged
Closed
Merged
@labkey-bpatel
Fix merge inconsistencies.
5f49850
-Delete folders/files that should have been deleted.
-Cleanup/add comments to ehr upgrade scripts.
labkey-jeckels
labkey-jeckels requested changes Jul 8, 2020
View reviewed changes
Comment threadehr/resources/web/ehr/model/sources/Necropsy.js
Comment threadehr/resources/web/ehr/model/sources/Biopsy.js
Comment threadehr/resources/web/ehr/model/sources/Surgery.js
Comment threadehr/src/org/labkey/ehr/query/EHRCustomPermissionsTable.java
Comment threadehr/src/org/labkey/ehr/query/EHRUserSchema.java Outdated
Comment threadViral_Load_Assay/resources/web/Viral_Load_Assay/SampleData/LC_data.txt
Comment threadehr/resources/web/ehr/grid/Panel.js
Comment threadehr/resources/web/ehr/form/field/ProjectEntryField.js
Comment threadehr/src/org/labkey/ehr/EHRController.java Outdated
Comment threadehr_billing/src/org/labkey/ehr_billing/notification/BillingNotification.java
@labkey-bpatel
Restore deleted files during merge.
6afa5fa
@labkey-bpatel
Code review changes:
6cdd5cb
- Cleanup, optimize imports, fix bad merge
- Restore 'invesLastNameCol' in ProjectEntryField.js.
- Remove unused class LightCycleImportMethod.java
@labkey-bpatel
Add space.
45c972f
@labkey-bpatel
Remove 'SOPRequirements' metadata from ehr_compliancedb module, and a…
0d499b0
…dd to wnprc-modules.
@labkey-bpatel
Remove 'SOPAdmin' view from ehr_compliancedb module, and add to wnprc…
4327175
…-modules.
labkey-jeckels
labkey-jeckels requested changes Jul 20, 2020
View reviewed changes

@labkey-jeckelslabkey-jeckels left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good, pending Chad's revisions to EHRController to avoid hard-coding the React form URLs

labkey-jeckels
labkey-jeckels approved these changes Aug 15, 2020
View reviewed changes

@labkey-jeckelslabkey-jeckels left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, pending TeamCity happiness

@labkey-jeckels
Point at new package for permission class
6b1c76b
@labkey-jeckels
Remove unused method to fix build
a6c188e
@labkey-jeckels
Fix up schema upgrades, including:
1ca1cb8
Don't modify EHR schema from WNPRC_EHR scripts
Update getVersion() to getSchemaVersion()
Fix up schema XML files to match expected schema
Fix bootstrapping for WNPRC_EHR upgrades
@labkey-jeckels
Various test fixes, including:
380ca88
Customize source_material query directly instead of trying to mutate a locked FK lookup table
Update to use new assay designer UI
Migrate <javaCustomizer> syntax
@labkey-jeckels
More test fixes
8d83c54
@labkey-jeckels
Fix SQLServer upgrade scripts
4384919
@labkey-jeckels
Cascade user delete though ehr_billing.dataaccess
9b32f7a
Move code from LabModuleHelper to only place that uses it, ViralLoadAssayTest
Fix rate import codepath in WNPRC_EHRTest
@labkey-jeckels
Fix bad merge related to adding QueryWebParts to JS reports
747c9e1
@labkey-jeckels
Remove uses of methods injected into object prototypes by Ext3
2d25cc6
@labkey-jeckels
Remove uses of methods injected into object prototypes by Ext3
63851c7
@labkey-jeckels
Update navMenu from Ext3 to Ext4 and don't pull it into WNPRC with th…
36af1c4
…e rest of the Ext3 code
@labkey-jeckels
Fully migrate navMenu to ExtJS4
16ff05a
@labkey-jeckels
More test fixes
06abf22
@labkey-jeckels
Backport fix from develop branch
01a8f30
@labkey-jeckels
Migrate second format() call too
f22a2b6
@labkey-jeckels
Purge remaining uses of ExtJS3's injected date.format() function
9db0ace
@labkey-jeckels
Migrate the .format() calls in HTML files too
59d06a7
@labkey-jeckels
Don't rely on ExtJS3 remove method
673d44e
@labkey-jeckels
Update to match HTML tag used for page titles
495623b
@labkey-jeckels
Avoid validation failure
78a4c0c
@labkey-jeckels
Split compliance test into ONPRC and WNPRC variants
c552a2c
@labkey-jeckels
Update with latest patch from Chad
282e949
@labkey-jeckels
Get the third format() call hiding at the end of the line
f55cad3
@labkey-jeckels
More attempted fixes
a134f89
@labkey-jeckels
Fix typo
3ef361d
@labkey-jeckels
Fix ViralLoadAssayTest - restore WNPRC test code, updated to new DOM …
61d06b4
…in 20.x line, and avoiding WNPRC_EHR query metadata if the module is deployed but not enabled in the container
This was referenced Aug 31, 2020
Merged
Merged
@labkey-jeckels
labkey-jeckels merged commit ea195b4 into release20.6-SNAPSHOTSep 1, 2020
@labkey-jeckels
labkey-jeckels deleted the 20.6_fb_merge_from_wnprc18.3 branch September 1, 2020 00:16
@labkey-jeckelslabkey-jeckels mentioned this pull request Sep 1, 2020
Merged
labkey-tchad pushed a commit that referenced this pull request Feb 24, 2025
@labkey-bpatel
Epic 6798 : List Domain Designer Conversion (#56)
a2a44fc
- Updates related to allowing binding of DomainKind specific options/properties to a bean & generifying DomainKind.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@labkey-jeckelslabkey-jeckelslabkey-jeckels approved these changes
+1 more reviewer
@labkey-ankurjlabkey-ankurjlabkey-ankurj left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@labkey-bpatel@labkey-jeckels@labkey-ankurj