[bot] Merge 26.7 to develop#3
Merged
Merged
Conversation
* Create nbri_ehr module as a renamed copy of nirc_ehr Seeds the new nbriEHRModules repository from the nircEHRModules module tree, with every occurrence of nirc replaced by nbri (casing-matched: NIRC→NBRI, Nirc→Nbri, nirc→nbri) in file contents, file names, and directory names. Also carries over the nircEHRModules versions of the GitHub workflow files (adding permissions blocks) and .gitignore (ignoring referenceStudy ETL logs). * Address PR review feedback on initial nbri_ehr module Remove the ETL surface: etls/ definitions, dbo source queries, the CasesTemp staging table, the casesSource/casesTemp staging pieces, and the now-unreferenced NBRIUserCreateTransform column transform. Remove the Orchard/HL7 integration: NBRIOrchardFileGenerator, the orchardData and orchardIdsForTaskid queries, the NBRIOrchardFileLocation module property, the trigger helper method and its JS trigger call sites, and the Selenium test coverage. Drop the 250 building/area-specific .qview.xml saved views, combine the two DB scripts into nbri_ehr-0.000-25.001.sql, and remove ull-logo-main-subsite.png along with its page references. Rename NBRI_EHRSchema.get_instance() to getInstance(), remove the unused category param from canCloseCase(), remove the duplicate CagematesDemographicsProvider registration, and guard isProcedureOrderEntered() against missing rows and null qcstate. Replace leftover NIRC branding (page headings, folder type description) with NBRI, normalize copyright headers to 2026, delete datasetBirth.tsv~, gitignore folder_load logs, and bump actions/checkout to v4. * Stabilize NBRI_EHRTest UI test; fix pairing_formation_types lookup Fix NBRI_EHRTest failures: resolve the vet-tech role by class name (NBRIEHRVetTechRole) since its "EHR Veterinarian Technician" display name collides with NIRC's role and can otherwise assign the wrong module's role (hiding the necropsy-review button); re-assert form fields that get dropped when EHR form sections rebuild (case Subjective, behavior-case Remark, Clinical Case Problem Area) so lingering required/comment warnings don't block submit; set the medication-order Ordered By directly in the grid instead of via the bulk-edit combo, which trips an Ext4 onTypeAhead null client error that can leave the field unset; and scope the active-clinical-cases assertion to the test animal so other tests' open cases don't inflate the count. Also correct the pairing_formation_types row in editable_lookups.tsv to the standard column layout (Behavior category, proper label and description).
cnathe
approved these changes
Jul 15, 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: 7c72a6e
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.7