[bot] Merge 26.7 to 26.9 - #36
Merged
Merged
Conversation
) ## Rationale Two independent fixes, to observation entry and to cagemate matching. The Observations form let a user pick any observation type but stored every entry as Clinical, so behavior observations recorded there were filed as clinical and dropped out of the behavior views; the form cannot know the right value up front because it depends on which type the user picks for each row, so the type is now derived on save from that type's category. The behavior forms had the same mismatch from the other direction: their Daily Observations shortcut bypassed the type-filtered picker and wrote clinical-category observations labeled as behavior. Separately, the cagemates query treated a housing row with no cage as though it were a location, so every animal whose location had not resolved was reported as a cagemate of every other. Rows already saved with a mismatched observation type need a one-time data fix; this change only affects new entries. ## Changes - The Observations form no longer defaults an observation's type. The trigger script derives it from the selected observation type's category, while every other form continues to set the type explicitly, including scheduled entries that inherit it from their order. - The Daily Observations shortcut is now opt-in per form section rather than always present, so it appears only on the clinical forms. - Cagemate matching now keys off active housing rows with a known cage.
…ropdown (#33) ## Rationale This branch corrects three defects in the death and birth/arrival entry forms: the death notification never fired for a death entered alongside its necropsy, birth and arrival events were stored at midnight regardless of the time entered, and reopening the Submit For Review window rendered a second Assign To dropdown. The notification and the procedure-order update were gated on the record landing on 'Request: Pending', which only happens by way of 'Submit Death'. A death entered together with its necropsy goes straight to 'Review Required' or 'Completed' and so notified nobody. This widens the trigger to any first save that leaves draft, which means an API or bulk load inserting deaths already at 'Completed' will now send one notification per animal. ## Related Pull Requests - Notify and complete procedure orders on the first save that leaves draft, rather than only when the record lands on 'Request: Pending'. - Ignore deletes in the death trigger, which previously read a deleted row as a draft leaving draft. - Keep the time of day on birth and arrival events and on the assignment, protocol assignment, housing, and group membership records derived from them. - Show that time of day on the birth, arrival, death, necropsy and derived-record dates, which the study framework otherwise renders as date-only, so the entry forms offer a time editor. - Give the Assign To combo a window-scoped identity and discard the Submit For Review window on cancel.
## Rationale Adds a Pregnant field to the animal snapshot so staff can see at a glance whether a female is carrying an open conception, without opening the conception records to check. A conception is open until a birth or a pregnancy outcome claims it, which no existing column expressed, so the field is backed by a new derived flag on the conception record. That flag is also useful on its own and is surfaced on the conceptions-by-dam report. ## Changes - Conception records carry a derived active flag marking the ones no birth or pregnancy outcome has claimed, and it appears on the conceptions-by-dam report alongside the outcome. - The snapshot and Animal Details panels show a Pregnant field listing each open conception as a link to its record, or "No" when there are none. - The dam's cached demographics are refreshed whenever a conception is entered, re-pointed or removed, and whenever a birth closes or reopens one. Previously only a pregnancy outcome refreshed her, so the field could show a stale value indefinitely. - The outcome report no longer counts birth or pregnancy records whose status is explicitly non-public. - Removed the Prev Id field from the snapshot panel. - Test coverage for the field and the flag across the birth, conception and pregnancy flows.
## Rationale Bring the birth, arrival, death, and pregnancy entry forms in line with the data that is actually captured for new animals and pregnancy outcomes. Four gaps drove the work: animals were being created with neither a location nor a generation, the death type list still offered values that are no longer valid for new entry alongside a disposition field that is not used, and pregnancy outcomes recorded no delivery mode and could be saved without a link back to a conception. ## Changes - Require the initial location on the birth and arrival forms. - Record a generation on demographics for animals entered through those forms: arrivals start at zero and births derive theirs from the dam. - Disable the death types that are no longer valid for new entry, leaving them in the lookup so historical rows still resolve. - Drop the disposition field from the deaths form and dataset, and deregister the death reason lookup that it left unused. - Add a delivery mode to pregnancy outcomes and require a conception Id. - Extend the module's Selenium coverage for the new required fields and the generation behavior. - Note for deployment: the new generation column ships with the reference study, so an existing study needs it imported before the forms will accept it.
DariaBod
approved these changes
Sep 8, 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: 5e37878
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.9_fb_bot_merge_26.7