Skip to content

[bot] Merge 25.8 to develop #1012

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
github-actions merged 5 commits into from
Aug 13, 2025
Merged

[bot] Merge 25.8 to develop #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0d7e79
Wait for active report panel to prevent NPEs (#999)
labkey-tchad Aug 4, 2025
bc48be4
Add container option to ehr billing ext cols (#998)
labkey-martyp Aug 6, 2025
04455f1
Merge 25.3 to 25.7
labkey-teamcity Aug 11, 2025
d56b0c2
Merge 25.7 to 25.8
labkey-teamcity Aug 12, 2025
13b2273
Merge 25.8 to develop
labkey-teamcity Aug 13, 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) {
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>
2 changes: 1 addition & 1 deletion ehr/test/src/org/labkey/test/pages/ehr/ParticipantViewPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public ParticipantViewPage clickReportTab(String reportLabel)

public WebElement getActiveReportPanel()
{
return activeReportPanel.findElementOrNull(getDriver());
return activeReportPanel.waitForElement(getDriver(), 2_000);
}

public DataRegionTable getActiveReportDataRegion()
Expand Down
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