[bot] Merge 26.3 to develop (Conflicts)#985
Merged
Merged
Conversation
#### Rationale Clinpath acquired a new hematology analyzer which has a different text format with more tests. This updates the parser used by clinpath to fit the new text format and tests. #### Related Pull Requests #### Changes - Update hematology upload to include new tests - Add new tests to hematology display grid
#971) WARNING: Please double check this link is formatted correctly. It includes '/project/' at the beginning, which all other links do not. wnprcLabs.html: Added 2 new links (carrion lab and evans lab) to WNPRC Labs dropdown. #### Rationale <!-- Rationale describing why this pull request is needed, what behavior it's adding/changing/removing, etc. (replace this comment) --> #### Related Pull Requests * <!-- list of links to related pull requests (replace this comment) --> #### Changes * <!-- list of descriptions of changes that are worth noting (replace this comment) -->
#### Rationale Change to include new perdiems for BSL3 labs #### Related Pull Requests * <!-- list of links to related pull requests (replace this comment) --> #### Changes - adding special project type
## Rationale Adds end-to-end test coverage for the LovCombo fix in LabKey/internal-issues#1266. The "Time of Day" multi-select on the Treatments task's Import Scheduled Treatments dialog is a string-valued `lovcombo`; before the fix its selections were silently dropped and Submit failed validation with "Must provide room and time of day". ## Related Pull Requests - LabKey/platform#7796 - LabKey/premiumModules#638 ## Changes - `WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java`: add `testTreatmentTimeOfDayMultiSelect`, which opens the dialog, selects multiple Time of Day values, asserts the selection is retained, and submits — expecting the "No uncompleted treatments were found." alert rather than the pre-fix "Must provide room and time of day" validation alert.
Conflicts: WNPRC_EHR/resources/queries/study/hematologyPivot.sql
labkey-tchad
force-pushed
the
fb_bot_merge_26.3
branch
from
6dff2f8 to
442f09e
Compare
labkey-tchad
approved these changes
Jun 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic merge failed! Please merge
26.3intofb_bot_merge_26.3and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=fb_bot_merge_26.3