Skip to content

[bot] Fast-forward for 26.3.18 - #1025

Merged
github-actions[bot] merged 10 commits into
release26.3from
26.3_ff_bot_26.3.18
Aug 26, 2026
Merged

[bot] Fast-forward for 26.3.18#1025
github-actions[bot] merged 10 commits into
release26.3from
26.3_ff_bot_26.3.18

Conversation

@github-actions

Copy link
Copy Markdown

Generated automatically.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.3_ff_bot_26.3.18

LeviCameron1 and others added 10 commits July 22, 2026 13:17
## Rationale
Mistakenly used getController in the container portion of a generated
URL causing template redirects to go to the wrong URL.

## Related Pull Requests
- <!-- list of links to related pull requests (replace this comment) -->

## Changes
- Corrected incorrect container method
PR DETAILS:

- anesthesiaRecoveriesFullHistory.sql: Defines sql for table that holds
data for full history.
- anesthesiaRecovery.query.xml: Defines row details for
anesthesiaRecovery official table.
- anesthesiaRecovery/.qview.xml: Defines anesthesiaRecovery official
table default view.
- anesthesiaRecovery/Full History.qview.xml: Defines anesthesiaRecovery
full history table default view.
- anesthesiaRecovery/.qview.xml: Defines anesthesiaRecovery official
table summary view.
- anesthesiaRecovery/.qview.xml: Defines anesthesiaRecovery official
table full history view.
- anesthesiaRecovery/Full History.qview.xml: Adds anesthesia recovery as
an option for full history.
- session_log.query.xml: Adds a customizer for the session log query.
- WNPRC_EHRController.java: Created trigger to validate & upload data to
anesthesiaRecovery dataset.
- WNPRC_EHRModule: Registers email notification.
- AnesthesiaRecoveryReviewNotification.java: Creates email notification
to let users know if there are unfinished recoveries or rows marked as
'review required'.
- NotificationToolkit.java: Updated functionality to allow multiple
params for field clauses.
- WNPRC_EHRCustomizer.java: Added customizers for anesthesiaRecovery and
sessionLog tables.
- .gitignore: Added .DS_Store so iOS only uploads necessary files and no
caches.
- README: Empty, but created for future use.
- build.gradle: Needed to create new external iOS module.
- module.properties: Needed to create new external iOS module.
- wnprc_ios_app-0.000-25.000.sql: Upgrade script that inserts iOS app
tables into app on first load.
- wnprc_ios_app.xml: Defines default .xml view for all iOS app tables.
- begin.html: Created a default landing page for new iOS module.
- wnprc_ios_appContainerListener.java: Needed to create new external iOS
module.
- wnprc_ios_appController.java: Creates all validation functions for new
iOS module tables. They are muted for now and can be unmuted when
needed.
- wnprc_ios_appManager.java: Needed to create new external iOS module.
- wnprc_ios_appModule.java: Needed to create new external iOS module.
- wnprc_ios_appSchema.java: Needed to create new external iOS module.





## 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) -->

<!-- list of standard tasks (remove this comment to enable)
## Tasks 📍
- [ ] Claude Code Review
- [ ] Manual Testing
- [ ] Test Automation
- [ ] Verify Fix
-->
Updated 4 files to fix the errors being thrown by TeamCity build. My
anesthesiaRecovery dataset will be created manually after deployment, so
these files needed to be updated (per Marty) to ensure the automated
tests know what the dataset will look like.

- datasets_manifest.xml: Added my dataset to the list (fixes TeamCity
error: WNPRC_EHRTest)
- datasets_metadata.xml: Listed all the columns in my dataset (fixes
TeamCity error: WNPRC_EHRTest)
- wnprcEhrTestStudyPolicy.xml: Added my table permissions (fixes
TeamCity error: testMprDataEntry)
- wnprc_ios_appModule.java: Updated my schema after changing my upgrade
script to 0.000-26.000 (fixes TeamCity error: SchemaXMLTestCase)



## 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) -->

<!-- list of standard tasks (remove this comment to enable)
## Tasks 📍
- [ ] Claude Code Review
- [ ] Manual Testing
- [ ] Test Automation
- [ ] Verify Fix
-->
…1008)

## Rationale

The "Import Results from File" list in the virology results grid could
fail to render. Each candidate file's upload date comes from a webdav
file-history lookup, and two paths through that lookup were broken: a
file with no file system audit record threw on `history[0].data.date`,
and the lookup's own failure callback called an undefined `reject`,
throwing a ReferenceError instead of rejecting. Either one rejected the
enclosing `Promise.all`, which had no rejection handler, so the window
stayed behind a "Loading..." mask with no error shown.

## Changes

- `getFileHistory` resolves instead of rejecting on a failed lookup, so
one unreadable file no longer drops the whole import list.
- Guarded the empty-history case; those files report their upload date
as `Unknown` rather than a substituted timestamp.
- Added a rejection handler to the `Promise.all` so failures hide the
loading mask and surface an alert.
- `getFileHistory` resolves `{name, uploaded}` rather than a positional
`[filename, history]` pair.
## Rationale
Users are currently unable to create a new rack on a rack that is
currently real as well due to conflicting object ids. This patch ensures
that new object ids are generated if a rack is created on an existing
rack.

## Related Pull Requests
- <!-- list of links to related pull requests (replace this comment) -->

## Changes
- Update the change rack function to generate new object ids when
creating new racks
## Rationale
Added ghost cage functionality for rack assignment to the rooms in the
cageUI project.

## Related Pull Requests

## Changes
- New sql script to add ghost cage table
- Code to handle ghost cage assignment and renumbering.
- Species check for how to handle renumbering on rooms
- Will need to add rack type for ghost cage once this gets put on
production.
#1010)

Updated date so it parses correctly and sends the notification. Left
comment above code change describing why the fix was required.

## 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) -->

<!-- list of standard tasks (remove this comment to enable)
## Tasks 📍
- [ ] Claude Code Review
- [ ] Manual Testing
- [ ] Test Automation
- [ ] Verify Fix
-->
## Rationale
Users requested the line rotation be switched to match how they will
usually structure layouts.

## Related Pull Requests

## Changes
- Update legend svg to rotate the lines for floors and dividers
## Rationale
This table and form will be used later by the new housing to determine
condition codes.

## Related Pull Requests

## Changes
- Added data entry for adoptions
- Permissions for adoptions
## Rationale

`WNPRC_EHR/tools/wnprc.modules`, the legacy ant build list, named a
mergesync module directory that no longer exists now that the module has
been retired.

## Changes

- Removes the stale mergesync entry from the build list.
@github-actions
github-actions Bot merged commit 43aa2cc into release26.3 Aug 26, 2026
11 of 15 checks passed
@github-actions
github-actions Bot deleted the 26.3_ff_bot_26.3.18 branch August 26, 2026 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants