Skip to content

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

Merged
labkey-jeckels merged 12 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#38
labkey-jeckels merged 12 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

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/ehrModules#56
LabKey/onprcEHRModules#20
LabKey/platform#1370
LabKey/tnprc_billing#72

This was referenced Jul 7, 2020
Closed
Merged
Closed
Merged
bbimber
bbimber reviewed Jul 7, 2020
View reviewed changes

@bbimberbbimber left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I realize I'm jumping in here quickly after github sent the notification and there may or may not have been more review on this. most seems fine, but there are several proposed changes in here that really should have gotten triaged.

Comment threadLDK/resources/web/LDK/panel/TabbedReportPanel.js
Comment threadLDK/resources/web/LDK/Utils.js Outdated
Comment threadLDK/test/src/org/labkey/test/util/external/labModules/LabModuleHelper.java Outdated
Comment threadLDK/test/src/org/labkey/test/util/external/labModules/LabModuleHelper.java Outdated
Comment threadlaboratory/resources/web/laboratory/panel/AbstractAssayPanel.js Outdated
labkey-bpateland others added 4 commits July 6, 2020 21:32
@labkey-bpatel
Fix merge.
46cb48c
@labkey-bpatel
Remove duplicate code.
c0c1b99
@labkey-jeckels
Various test fixes, including:
44d4613
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
Use ExtJS4 instead of 3
f887fc4
bbimber
bbimber reviewed Aug 16, 2020
View reviewed changes
Comment threadLDK/test/src/org/labkey/test/util/external/labModules/LabModuleHelper.java Outdated
labkey-jeckelsand others added 4 commits August 16, 2020 11:55
@labkey-jeckels
Cascade user delete though ehr_billing.dataaccess
2a04bd6
Move code from LabModuleHelper to only place that uses it, ViralLoadAssayTest
Fix rate import codepath in WNPRC_EHRTest
@labkey-jeckels
Remove other parts of the merge
ec53ef1
@labkey-jeckels
Flip meaning of argument at controls de-duplication of IDs
5f152b9
Fix up handling of drop-downs in WNPRC misc charges entry
@bbimber
Update AssayTemplatePanel.js
cf425d2
Consistent line spacing for parentheses
@bbimber

bbimber commented Aug 18, 2020

Copy link
Copy Markdown
Collaborator

@labkey-jeckels I made one minor commit to AssayTemplatePanel to make line spacing consistent for parentheses. I also think I closed all the conversations I need as part of my review, but please let me know if i missed something i need to do to keep github happy

@labkey-jeckels

labkey-jeckels commented Aug 18, 2020

Copy link
Copy Markdown

@bbimber nope, that edit looks fine to me and is part of the PR now.

@labkey-jeckels
Fix ViralLoadAssayTest - restore WNPRC test code, updated to new DOM …
ecdb1dc
…in 20.x line, and avoiding WNPRC_EHR query metadata if the module is deployed but not enabled in the container
@labkey-jeckels
Merge remote-tracking branch 'origin/20.6_fb_merge_from_wnprc18.3' in…
5d76ae4
…to 20.6_fb_merge_from_wnprc18.3
@labkey-jeckels
labkey-jeckels merged commit 432bcc7 into release20.6-SNAPSHOTSep 1, 2020
@labkey-jeckels
labkey-jeckels deleted the 20.6_fb_merge_from_wnprc18.3 branch September 1, 2020 00:17
@labkey-jeckelslabkey-jeckels mentioned this pull request Sep 1, 2020
Merged
bbimber added a commit that referenced this pull request Jul 24, 2024
@bbimber
Merge pull request#38from bimberlabinternal/24.7_fb_merge
3e7f9ee
Merge discvr-24.3 to discvr-24.7
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bbimberbbimberbbimber left review comments
@labkey-jeckelslabkey-jeckelslabkey-jeckels approved these changes

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@bbimber@labkey-jeckels