Fix Record Treatment link to pass schedule slot date as scheduledDate - #730
Merged
labkey-martyp merged 3 commits intoJul 29, 2026
Merged
Conversation
The Record Treatment link on study.treatment_order passed the order's start date as scheduledDate, so every recording against an order got the same value and the second one tripped the duplicate-treatment trigger in study/drug.js while the schedule still showed the slot as unrecorded. The link on treatment_order no longer passes scheduledDate; a new link column on study.treatmentSchedule passes the actual slot date, ISO-formatted, replacing the passthrough column previously inherited from treatment_order. The inline display column is extracted to TreatmentDisplayColumnFactory, which also gains a null guard on category. Claude-Session: https://claude.ai/code/session_01TPAAEmPYGaFTG31hRvq358
The title sat in the category column, so the lookup rendered uncategorized and titled "value" with no description.
…fb_treatment_schedule_link
labkey-bpatel
approved these changes
Jul 29, 2026
labkey-bpatel
approved these changes
Jul 29, 2026
labkey-martyp
added a commit
to LabKey/nbriEHRModules
that referenced
this pull request
Jul 29, 2026
…#4) ## Rationale The Record Treatment link on study.treatment_order passed the order's start date as the scheduledDate URL parameter, so every treatment recorded through it carried the same scheduledDate regardless of which schedule slot was being recorded. The second recording against an order then tripped the duplicate-treatment trigger in study/drug.js ("A treatment has already been entered for this order for this date and time.") while the treatmentSchedule grid still showed the slot as unrecorded, since its status join compares the computed slot time against the stored scheduledDate. ## Related Pull Requests - LabKey/johnsHopkinsEHRModules#667 (same fix for jhu_ehr) - LabKey/nircEHRModules#730 (same fix for nirc_ehr) ## Changes - Extract the inline Record Treatment display column into TreatmentDisplayColumnFactory with an includeScheduledDate flag; emit scheduledDate only when set, ISO-formatted via DateUtil.formatIsoDateShortTime() instead of Date.toString(); add a null guard on category. - The treatment_order Record Treatment link no longer passes scheduledDate; new customizeTreatmentSchedule() adds a treatmentRecord link column to study.treatmentSchedule that passes the slot's date. - treatmentSchedule.sql: drop the t1.treatmentRecord passthrough column inherited from treatment_order. - treatmentSchedule.query.xml: apply the module customizer via javaCustomizer so the new column is added.
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
2 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.
Rationale
The Record Treatment link on study.treatment_order passed the order's start date as the scheduledDate URL parameter, so every treatment recorded through it carried the same scheduledDate regardless of which schedule slot was being recorded. The second recording against an order then tripped the duplicate-treatment trigger in study/drug.js ("A treatment has already been entered for this order for this date and time.") while the treatmentSchedule grid still showed the slot as unrecorded, since its status join compares the computed slot time against the stored scheduledDate.
Related Pull Requests
Changes