Skip to content
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.

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

Medicine administration UI #10289

Merged
merged 39 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
53550c4
Initial commit for UI
amjithtitus09 Jan 22, 2025
4e94a07
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Jan 23, 2025
e6d433e
Changes
amjithtitus09 Jan 23, 2025
bc24400
UI changes
amjithtitus09 Jan 24, 2025
8dc20ce
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Jan 24, 2025
6720ddc
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Jan 24, 2025
67ca9f6
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Jan 27, 2025
be7228d
Administer UI
amjithtitus09 Jan 27, 2025
0fa73b8
UI changes
amjithtitus09 Jan 27, 2025
13cabd9
Fix error
amjithtitus09 Jan 27, 2025
a7df464
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Jan 27, 2025
db7a0f1
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Jan 28, 2025
b52f35f
Desktop UI
amjithtitus09 Jan 28, 2025
53eac2a
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Jan 28, 2025
7eb1744
Mobile UI
amjithtitus09 Jan 29, 2025
01e3f56
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Jan 29, 2025
5b662e0
Administration UI final, Patient Updates Tab fix, Encounter filter fo…
amjithtitus09 Jan 30, 2025
866b730
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Jan 30, 2025
94a85d2
Import fix
amjithtitus09 Jan 30, 2025
73a28f5
code removed from MAR Dosage
amjithtitus09 Jan 30, 2025
bd6edc4
Minor fixes
amjithtitus09 Jan 30, 2025
37a29f5
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Jan 30, 2025
a1773bf
Merge branch 'develop' into medicine-administration-ui
nihal467 Jan 30, 2025
1352edc
Merge branch 'develop' into medicine-administration-ui
amjithtitus09 Jan 31, 2025
fa39cb8
Revert Questionnaire fixes as they were moved to another PR
amjithtitus09 Feb 3, 2025
5ac5e97
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 3, 2025
5128ce1
Muted foreground replace
amjithtitus09 Feb 3, 2025
1c08074
Bug fixes, validations, cleanup
amjithtitus09 Feb 3, 2025
b33beaf
Bug fix
amjithtitus09 Feb 3, 2025
dbea052
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 3, 2025
8b09293
Allow status update
amjithtitus09 Feb 3, 2025
f7ecceb
Merge branch 'develop' into medicine-administration-ui
nihal467 Feb 3, 2025
0d7d4ad
Change Datetime picker
amjithtitus09 Feb 3, 2025
0f7f513
Merge branch 'medicine-administration-ui' of https://github.com/ohcne…
amjithtitus09 Feb 3, 2025
eced72a
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 3, 2025
530e370
Disable form submission with errors, allow invalid entry
amjithtitus09 Feb 4, 2025
57bacc0
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 4, 2025
0b56e66
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 4, 2025
aaebcf8
Changes requested
amjithtitus09 Feb 4, 2025
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
24 changes: 22 additions & 2 deletions public/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
"SYSTEM__org_type__team": "Team",
"Submit": "Submit",
"TELEMEDICINE": "Telemedicine",
"TRANSPORTATION TO BE ARRANGED": "Transportation",
"TRANSPORTATION_TO_BE_ARRANGED": "Transportation",
"URINATION_FREQUENCY__DECREASED": "Decreased",
"URINATION_FREQUENCY__INCREASED": "Increased",
"URINATION_FREQUENCY__NORMAL": "Normal",
Expand All @@ -265,7 +265,7 @@
"VENTILATOR_MODE__VCV_short": "VCV",
"VENTILATOR_MODE__VC_SIMV": "Volume Controlled SIMV (VC-SIMV)",
"VENTILATOR_MODE__VC_SIMV_short": "VC-SIMV",
"View Facility": "View Facility",
"View_Facility": "View Facility",
"aadhaar_number": "Aadhaar Number",
"aadhaar_number_will_not_be_stored": "Aadhaar number will not be stored by CARE",
"aadhaar_otp_send_error": "Failed to send OTP. Please try again later.",
Expand Down Expand Up @@ -319,6 +319,7 @@
"add_spoke": "Add Spoke Facility",
"add_tags": "Add Tags",
"add_user": "Add User",
"added_on": "Added on",
"additional_information": "Additional Information",
"additional_instructions": "Additional Instructions",
"address": "Address",
Expand Down Expand Up @@ -485,6 +486,7 @@
"cancel_appointment": "Cancel Appointment",
"cancel_appointment_warning": "This action cannot be undone. The appointment will be cancelled and the patient will be notified.",
"cancelled": "Cancelled",
"cannot_go_before_prescription_date": "Cannot view slots before the earliest prescription date",
"cannot_select_date_out_of_range": "Cannot select date out of range",
"cannot_select_month_out_of_range": "Cannot select month out of range",
"cannot_select_year_out_of_range": "Cannot select year out of range",
Expand Down Expand Up @@ -752,12 +754,14 @@
"downloading": "Downloading",
"downloading_abha_card": "Generating ABHA Card, Please hold on",
"downloads": "Downloads",
"draft": "Draft",
"drag_drop_image_to_upload": "Drag & drop image to upload",
"duplicate_patient_record_birth_unknown": "Please contact your district care coordinator, the shifting facility or the patient themselves if you are not sure about the patient's year of birth.",
"duplicate_patient_record_confirmation": "Admit the patient record to your facility by adding the year of birth",
"duplicate_patient_record_rejection": "I confirm that the suspect / patient I want to create is not on the list.",
"duration": "Duration",
"edit": "Edit",
"edit_administration": "Edit Administration",
"edit_avatar": "Edit Avatar",
"edit_avatar_note": "Change the avatar of the user",
"edit_avatar_note_self": "Change your avatar",
Expand Down Expand Up @@ -902,6 +906,9 @@
"end_datetime": "End Date/Time",
"end_dose": "End Dose",
"end_time": "End Time",
"end_time_before_start_error": "End time cannot be before start time",
"end_time_future_error": "End time cannot be in the future",
"ended": "Ended",
"enter_dosage_instructions": "Enter Dosage Instructions",
"enter_file_name": "Enter File Name",
"enter_message": "Start typing...",
Expand Down Expand Up @@ -1074,6 +1081,7 @@
"icmr_specimen_referral_form": "ICMR Specimen Referral Form",
"immunisation-records": "Immunisation",
"in_consultation": "In-Consultation",
"in_progress": "In Progress",
"inactive": "Inactive",
"incoming": "Incoming",
"incomplete_patient_details_warning": "Patient details are incomplete. Please update the details before proceeding.",
Expand Down Expand Up @@ -1140,6 +1148,7 @@
"is_it_upshift": "is it upshift",
"is_phone_a_whatsapp_number": "Is the phone number a WhatsApp number?",
"is_pregnant": "Is pregnant",
"is_this_administration_for_a_past_time": "Is this administration for a past time",
"is_this_an_emergency": "Is this an Emergency?",
"is_this_an_emergency_request": "Is this an emergency request?",
"is_this_an_upshift": "Is this an upshift?",
Expand Down Expand Up @@ -1255,8 +1264,10 @@
"medical_records": "Medical Records",
"medical_worker": "Medical Worker",
"medication": "Medication",
"medication_administration_saved": "Medicine Administration saved",
"medication_taken_between": "Medication Taken Between",
"medicine": "Medicine",
"medicine_administration": "Medicine Administration",
"medicine_administration_history": "Medicine Administration History",
"medicine_prescription": "Medicine Prescription",
"medicines_administered": "Medicine(s) administered",
Expand Down Expand Up @@ -1314,6 +1325,7 @@
"next_sessions": "Next Sessions",
"next_week_short": "Next wk",
"no": "No",
"no_active_medications": "No active medications",
"no_address_provided": "No address provided",
"no_allergies_recorded": "No allergies recorded",
"no_appointments": "No appointments found",
Expand Down Expand Up @@ -1350,6 +1362,7 @@
"no_log_updates": "No log updates found",
"no_medical_history_available": "No Medical History Available",
"no_medications_found_for_this_encounter": "No medications found for this encounter.",
"no_medications_to_administer": "No medications to administer",
"no_notices_for_you": "No notices for you.",
"no_observations": "No Observations",
"no_ongoing_medications": "No Ongoing Medications",
Expand Down Expand Up @@ -1398,6 +1411,7 @@
"none": "None",
"normal": "Normal",
"noshow": "No-show",
"not_done": "Not Done",
"not_eligible": "Not Eligible",
"not_found": "Not Found",
"not_specified": "Not Specified",
Expand Down Expand Up @@ -1601,6 +1615,7 @@
"practitioner_information": "Practitioner Information",
"preferred_facility_type": "Preferred Facility Type",
"preferred_vehicle": "Preferred Vehicle",
"prescribed": "Prescribed",
"prescription": "Prescription",
"prescription_details": "Prescription Details",
"prescription_discontinued": "Prescription discontinued",
Expand Down Expand Up @@ -1836,6 +1851,7 @@
"search_investigation_placeholder": "Search Investigation & Groups",
"search_medication": "Search Medication",
"search_medications": "Search for medications to add",
"search_medicine": "Search Medicine",
"search_patient_page_text": "Search for existing patients using their phone number or create a new patient record",
"search_patients": "Search Patients",
"search_resource": "Search Resource",
Expand Down Expand Up @@ -1935,6 +1951,7 @@
"shifting_details": "Shifting details",
"shifting_history": "Shifting History",
"shifting_status": "Shifting status",
"show": "Show",
"show_abha_profile": "Show ABHA Profile",
"show_all": "Show all",
"show_all_notifications": "Show All",
Expand Down Expand Up @@ -1976,6 +1993,8 @@
"start_new_clinical_encounter": "Start a new clinical encounter",
"start_review": "Start Review",
"start_time": "Start Time",
"start_time_before_authored_error": "Start time cannot be before the medication was prescribed",
"start_time_future_error": "Start time cannot be in the future",
"start_time_must_be_before_end_time": "Start time must be before end time",
"state": "State",
"state_reason_for_archiving": "State reason for archiving <strong>{{name}}</strong> file?",
Expand Down Expand Up @@ -2010,6 +2029,7 @@
"tachycardia": "Tachycardia",
"tag_name": "Tag Name",
"tag_slug": "Tag Slug",
"taken": "Taken",
"taper_titrate_dosage": "Taper & Titrate Dosage",
"target_dosage": "Target Dosage",
"template_deleted": "Template has been deleted",
Expand Down
9 changes: 9 additions & 0 deletions src/Utils/request/api.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
import { PaginatedResponse } from "@/Utils/request/types";
import { AppointmentPatientRegister } from "@/pages/Patient/Utils";
import { Encounter, EncounterEditRequest } from "@/types/emr/encounter";
import { MedicationAdministration } from "@/types/emr/medicationAdministration/medicationAdministration";
import { MedicationStatement } from "@/types/emr/medicationStatement";
import { PartialPatientModel, Patient } from "@/types/emr/newPatient";
import {
Expand Down Expand Up @@ -649,6 +650,14 @@ const routes = {
TRes: Type<PaginatedResponse<MedicationStatement>>(),
},
},

medicationAdministration: {
list: {
path: "/api/v1/patient/{patientId}/medication/administration/",
method: "GET",
TRes: Type<PaginatedResponse<MedicationAdministration>>(),
},
},
} as const;

export default routes;
Loading
Loading