[bot] Merge 26.3 to 26.6#710
Merged
github-actions[bot] merged 3 commits intoJun 21, 2026
Merged
Conversation
…/Score editor (#706) ## Rationale Adds Selenium coverage for the new category-dependent Observation/Score editor in the clinical observations bulk edit dialog, introduced in the related ehrModules PR. ## Related Pull Requests - LabKey/ehrModules#1145 ## Changes - New `testObservationBulkEdit` in `NIRC_EHRTest` that bulk-edits observation rows and verifies the Observation/Score editor is rebuilt per the selected Category (lookup combo for Appetite, free text for Mass), stays enabled across category changes, clears stale values, and applies the submitted values to every selected row.
#### Rationale When a clinical observation is entered from the observation schedule and multiple orders match on category and scheduled date/time, an entry is created in clinical_observations for each matching order. Previously the duplicate entries reused the originating order's existing schedule task id, so the entered observations were tied back to the schedule order tasks instead of a task representing the recording session. This change groups the entries by their originating order's taskid and assigns one task per group. #### Related Pull Requests * N/A #### Changes * NIRC_EHRTriggerHelper.handleScheduledObservations now groups scheduled observation entries by their originating order's taskid: the first order group reuses the form's own task and each additional distinct order group gets a freshly created task cloned from the form task, so no order's existing schedule task id is reused and the form task is never left empty. * Added resolveGroupTaskId and createTaskFromForm helpers plus a per-batch grouping map that is cleared from the clinical_observations onInit trigger. * clinical_observations.js sets the triggering row's taskid to the resolved group task. * Added the caseId/problemCategory column to the clinical_observations default view.
labkey-tchad
approved these changes
Jun 21, 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
3 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.
Generated automatically.
Merging changes from: d98c54d
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=26.6_fb_bot_merge_26.3