[bot] Merge 26.9 to develop - #1206
Merged
Merged
Conversation
…loop (#1199) ## Rationale `employeeperunit` and `sopdates` were the only tables in `ehr_compliancedb` without trigger scripts, so their lookup values were never canonicalized on write, and this branch both adds those scripts and replaces the normalization loop that every other script in the schema had copied verbatim. The missing canonicalization is why the ONPRC report procedures had to wrap every unit and category comparison in `lower()`; that `lower()` removal has already merged, so those reports are exposed to case drift until this deploys. Existing rows carrying off-lookup values need a backfill before this deploys. The scripts merge the old row into the new one before validating, so a stored value that no longer matches its lookup will block edits that work today. ## Related Pull Requests - LabKey/LabDevKitModules#310 — adds the shared helper this depends on, and must merge first. - LabKey/onprcEHRModules#1885 — the same conversion in the ONPRC modules. - LabKey/onprcEHRModules#1859 — removed the `lower()` calls these triggers replace. - #1191 — superseded by this branch, which carries the same two new scripts written against the shared helper. ## Changes - Adds trigger scripts for `employeeperunit` and `sopdates`, normalizing the lookup columns their schema metadata already declares. - Leaves `sopdates.sopid` out deliberately: its fk to `sops` is commented out, and a lookup against a column with no fk would reject every row. - Converts the six existing `ehr_compliancedb` scripts to the shared helper, with field lists and error text unchanged so behavior is identical.
## Rationale Fixes the "Show Record History" button on EHR dataset grids, which showed a record's history from every dataset instead of filtering to the one being viewed. The button built its audit log URL with `query.intkey1~eq`, a legacy column alias on `auditLog.DatasetAuditEvent` that was gated behind an off-by-default feature flag in 25.9 and removed outright in 26.1 along with the audit union table. The filter was therefore discarded at render time with an "Ignoring filter/sort on column 'intkey1'" warning; `datasetId` is the current column. Reported in LabKey/internal-issues#1485. ## Related Pull Requests None. ## Changes - Filter the record history grid on the dataset's current audit column rather than the removed legacy alias. - Stop requesting a saved view that no longer exists; the grid was already falling back to the module's default view.
## Rationale Any status recalculation for an animal that has arrived more than once fails with a database error instead of saving. The recalculation reads the animal's acquisition type from the arrival dataset filtered only on the animal, which throws as soon as a second arrival row exists. Death entry is the common way to hit this, and it is worst at centers that leave the status to the recalculation rather than writing it directly, where the save and the status are both lost. This surfaced while adding rearrivals to an institution module, but it affects every center whose arrival dataset carries an acquisition type. ## Related Pull Requests - LabKey/nircEHRModules#758 - LabKey/nbriEHRModules#39 ## Changes - Read the acquisition type from the animal's most recent arrival rather than from all of its arrival records at once.
DariaBod
approved these changes
Sep 16, 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: e12dcda
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.9