Skip to content

refactor: replace service unit fields with room and ward and update medication schedule calculation logic #1346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
av-dev2 merged 1 commit into from
May 15, 2026
Merged

refactor: replace service unit fields with room and ward and update medication schedule calculation logic #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hms_tz/hms_tz/doctype/nurse_record/nurse_record.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ function show_schedule_medication_dialog(
);

let doses_per_day = Math.floor(24 / vals.interval_hours);
let total_days = Math.ceil(total_doses / doses_per_day);
let total_days = Math.floor(total_doses / doses_per_day);

let preview_html =
'<div style="padding: 10px; background: #e8f5e9; border-radius: 4px;">' +
Expand Down
30 changes: 15 additions & 15 deletions hms_tz/hms_tz/doctype/nurse_record/nurse_record.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"status",
"posting_time",
"section_break_hsu",
"service_unit",
"service_unit_type",
"room",
"ward",
"naming_series",
"column_break_references",
"nurse",
Expand Down Expand Up @@ -184,18 +184,6 @@
"label": "Shift End Time",
"read_only": 1
},
{
"fieldname": "service_unit",
"fieldtype": "Link",
"label": "Service Unit",
"options": "Healthcare Service Unit"
},
{
"fieldname": "service_unit_type",
"fieldtype": "Link",
"label": "Service Unit Type",
"options": "Healthcare Service Unit Type"
},
{
"fieldname": "column_break_references",
"fieldtype": "Column Break"
Expand Down Expand Up @@ -471,11 +459,23 @@
"options": "Shift Type",
"reqd": 1,
"search_index": 1
},
{
"fieldname": "room",
"fieldtype": "Link",
"label": "Room",
"options": "Healthcare Service Unit"
},
{
"fieldname": "ward",
"fieldtype": "Link",
"label": "Ward",
"options": "Healthcare Service Unit Type"
}
],
"is_submittable": 1,
"links": [],
"modified": "2026-05-15 01:35:40.359315",
"modified": "2026-05-15 03:10:57.599706",
"modified_by": "Administrator",
"module": "Hms Tz",
"name": "Nurse Record",
Expand Down