Skip to content

Add container option to ehr billing ext cols #998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-martyp merged 4 commits into from
Aug 6, 2025
Merged

Add container option to ehr billing ext cols #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ec0e35
Add container field
labkey-martyp Aug 1, 2025
ab7122d
Update message
labkey-martyp Aug 5, 2025
ebc51f1
Merge remote-tracking branch 'origin/release25.7-SNAPSHOT' into 25.7_…
labkey-martyp Aug 5, 2025
b3bf833
Move helper function to ehr helper
labkey-martyp Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions ehr/resources/views/ehrTemplates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,18 @@
}

createEHRBillingDomainHandler = function () {
var ctx = EHR.Utils.getEHRContext();
const ctx = EHR.Utils.getEHRContext();
const container = document.getElementById("ehrbilling_container").value;
if (!container) {
Copy link
Contributor

@labkey-jeckels labkey-jeckels Aug 4, 2025

Choose a reason for hiding this comment

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

I think this will require a test update:

https://github.com/LabKey/wnprc-modules/blob/d13afdbe237e956cfe94aea615f6cceba552d1d3/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java#L318

Copy link
Contributor Author

@labkey-martyp labkey-martyp Aug 6, 2025

Choose a reason for hiding this comment

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

Thanks for heads up. New PRs opened for broken tests related to this.

https://github.com/LabKey/tnprcEHRModules/pull/149
LabKey/wnprc-modules#861

LABKEY.Utils.alert("Error", "Must enter the container path of the billing folder.");
}

LABKEY.Domain.create({
module: ctx ? ctx['EHRCustomModule'] : null,
domainKind: "EHR_Billing",
domainGroup: "ehr_billing",
importData: false,
containerPath: ctx ? ctx['EHRStudyContainer'] : null,
containerPath: container,
success: function () {
LABKEY.Utils.alert("Success","EHR_Billing tables updated successfully.");
},
Expand All @@ -55,8 +59,8 @@
}

createEHRComplianceDomainHandler = function () {
var ctx = EHR.Utils.getEHRContext();
var container = document.getElementById("ehrcompliance_container").value;
const ctx = EHR.Utils.getEHRContext();
const container = document.getElementById("ehrcompliance_container").value;
if (!container) {
LABKEY.Utils.alert("Error", "Must enter the container path of the compliance folder.");
}
Expand Down Expand Up @@ -90,16 +94,19 @@
<h5><b>
<a style="cursor: pointer;" id='createEHRDomainHandler'>Load EHR table definitions</a>
<br><br>

<a style="cursor: pointer;" id='createEHRLookupsDomainHandler'>Load EHR_Lookup table definitions</a>
<br><br>
<a style="cursor: pointer;" id='createEHRBillingDomainHandler'>Load EHR_Billing table definitions</a>

<a style="margin-right: 10px; cursor: pointer;" id='createEHRBillingDomainHandler'>Load EHR_Billing table definitions</a>
<label for="ehrbilling_container">Container:</label>
<input type="text" id="ehrbilling_container" name="ehrbilling_container" style="width: 300px;">
<br><br>
<div>
<a style="margin-right: 10px; cursor: pointer;" id='createEHRComplianceDomainHandler'>Load EHR_Compliance table definitions</a>
<label for="ehrcompliance_container">Container:</label>
<input type="text" id="ehrcompliance_container" name="ehrcompliance_container" style="width: 300px;">

</div>
<a style="margin-right: 10px; cursor: pointer;" id='createEHRComplianceDomainHandler'>Load EHR_Compliance table definitions</a>
<label for="ehrcompliance_container">Container:</label>
<input type="text" id="ehrcompliance_container" name="ehrcompliance_container" style="width: 300px;">

</b></h5>
</div>
</html>
8 changes: 8 additions & 0 deletions ehr/test/src/org/labkey/test/util/ehr/EHRTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,14 @@ public void verifyAllReportTabs(ParticipantViewPage participantView)
verifyReportTabs(participantView, Collections.emptyMap());
}

public WebElement fillAnInputByName(String name, String value)
{
WebElement el = Locator.name(name).findElement(_test.getDriver());
el.click();
el.sendKeys(value);
return el;
}

/**
* Verify that the specified reports have no errors
* @param participantView Should be on a participant view or animal history page with some animals selected
Expand Down