Create nbri_ehr module#1
Merged
labkey-martyp merged 3 commits intoJul 15, 2026
Merged
Conversation
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).
labkey-bpatel
left a comment
There was a problem hiding this comment.
Overall looks like a good starting point.
I am sure we'll trim and iterate as development progresses, but a few things stood out on this initial pass:
- Are we planning to ETL data into this module? If not, the ETL queries and definitions and go.
- Area/Building-specific .qview.xml files - there are quite a few of these with hardcoded location names (e.g. activeBehaviorCases/Building 10.qview.xml). Since these are site-specific and easy to recreate from the UI, I think we can drop them.
- Two nbri_ehr DB scripts - any reason not to combine these into a single script?
- nbri_ehr/resources/web/nbri_ehr/images/ull-logo-main-subsite.png - should be removed.
- Death/Necropsy workflow - the combined form is complex and quite center-specific. Would it be worth splitting into two separate forms (a simpler Death form and a separate Necropsy form) as a baseline?
- Copyright headers - Since this is the initial commit, normalize 'Copyright (c) 2024-2026 LabKey Corporation' (and other date-range variants) to 'Copyright (c) 2026 LabKey Corporation' across the new files.
Revised comments from claude code review:
- Remove the duplicate CagematesDemographicsProvider registration.
- Escape HL7 delimiters in the Orchard file writer.
- Null-check birth before formatting in the Orchard file writer.
- Guard isProcedureOrderEntered against empty result and null qcstate.
- Delete datasetBirth.tsv~.
- Non-blocker: Three workflows (branch_release.yml, merge_release.yml, validate_pr.yml) each add a top-level permissions: block that matches what the reusable actions require. actions/checkout@v3 is used in two of them - GitHub has been recommending v4 for a while; not blocking, but consider bumping to keep parity with the newer LabKey repos.
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.
Contributor
Author
|
Thanks for the thorough review — all of this is addressed in 3f602e0 except the Death/Necropsy split:
The inline comments (get_instance() rename, unused category param, duplicate CagematesDemographicsProvider) and the remaining code-review items (isProcedureOrderEntered guard, datasetBirth.tsv~, checkout@v4) are also fixed. |
labkey-bpatel
approved these changes
Jul 14, 2026
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).
labkey-martyp
added a commit
to LabKey/server
that referenced
this pull request
Jul 15, 2026
## Rationale The new nbriEHRModules repository needs to be included in the EHR TeamCity test distribution so its nbri_ehr module is built and tested. ## Related Pull Requests - [LabKey/nbriEHRModules#1](LabKey/nbriEHRModules#1) ## Changes - Added server/modules/nbriEHRModules to the ehrModulesDirs list in gradle/settings/ehr.gradle.
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
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.
Rationale
Seeds the new nbriEHRModules repository with a working EHR module so NBRI development can proceed from a functioning baseline.
Related Pull Requests
None.
Changes