Refactor Scheduling and Appointments; support for delete schedule, cancel booking, improved date filter in appointments page, etc.

public/locale/en.json

@@ -191,11 +191,14 @@
   "ROUNDS_TYPE__NORMAL": "Brief Update",
   "ROUNDS_TYPE__TELEMEDICINE": "Tele-medicine Log",
   "ROUNDS_TYPE__VENTILATOR": "Detailed Update",
+  "SCHEDULE_AVAILABILITY_TYPE_DESCRIPTION__appointment": "Patients can be booked for slots in this session",
+  "SCHEDULE_AVAILABILITY_TYPE_DESCRIPTION__closed": "Inidcates the practitioner is not available for in this session's time",
+  "SCHEDULE_AVAILABILITY_TYPE_DESCRIPTION__open": "Indicates the practitioner is available in this session",
+  "SCHEDULE_AVAILABILITY_TYPE__appointment": "Appointment",
+  "SCHEDULE_AVAILABILITY_TYPE__closed": "Closed",
+  "SCHEDULE_AVAILABILITY_TYPE__open": "Open",
   "SCHEDULE_EXCEPTION_TYPE__MODIFY_SCHEDULE": "Modify Schedule",
   "SCHEDULE_EXCEPTION_TYPE__UNAVAILABLE": "Unavailable",
-  "SCHEDULE_SLOT_TYPE__appointment": "Appointment",
-  "SCHEDULE_SLOT_TYPE__closed": "Closed",
-  "SCHEDULE_SLOT_TYPE__open": "Open",
   "SLEEP__EXCESSIVE": "Excessive",
   "SLEEP__NO_SLEEP": "No sleep",
   "SLEEP__SATISFACTORY": "Satisfactory",
@@ -313,6 +316,7 @@
   "active_files": "Active Files",
   "active_prescriptions": "Active Prescriptions",
   "add": "Add",
+  "add_another_session": "Add another session",
   "add_as": "Add as",
   "add_attachments": "Add Attachments",
   "add_beds": "Add Bed(s)",
@@ -434,6 +438,7 @@
   "authorize_shift_delete": "Authorize shift delete",
   "auto_generated_for_care": "Auto Generated for Care",
   "autofilled_fields": "Autofilled Fields",
+  "availabilities": "Availabilities",
   "available_features": "Available Features",
   "available_in": "Available in",
   "available_time_slots": "Available Time Slots",
@@ -650,11 +655,14 @@
   "create_position_preset_description": "Creates a new position preset in Care from the current position of the camera for the given name",
   "create_preset_prerequisite": "To create presets for this bed, you'll need to link the camera to the bed first.",
   "create_resource_request": "Create Request",
+  "create_schedule_template": "Create Schedule Template",
+  "create_template": "Create Template",
   "create_user": "Create User",
   "created": "Created",
   "created_by": "Created By",
   "created_date": "Created Date",
   "created_on": "Created On",
+  "creating": "Creating...",
   "criticality": "Criticality",
   "csv_file_in_the_specified_format": "Select a CSV file in the specified format",
   "current_address": "Current Address",
@@ -679,6 +687,7 @@
   "date_of_result": "Covid confirmation date",
   "date_of_return": "Date of Return",
   "date_of_test": "Date of sample collection for Covid testing",
+  "date_range": "Date Range",
   "day": "Day",
   "death_report": "Death Report",
   "delete": "Delete",
@@ -768,6 +777,7 @@
   "edit_policy_description": "Add or edit patient's insurance details",
   "edit_prescriptions": "Edit Prescriptions",
   "edit_profile": "Edit Profile",
+  "edit_schedule_template": "Edit Schedule Template",
   "edit_role": "Edit Role",
   "edit_user_profile": "Edit Profile",
   "edit_user_role": "Edit User Role",
@@ -888,6 +898,7 @@
   "encounter_suggestion_edit_disallowed": "Not allowed to switch to this option in edit consultation",
   "encounters": "Encounters",
   "end_datetime": "End Date/Time",
+  "end_time": "End Time",
   "enter_aadhaar_number": "Enter a 12-digit Aadhaar ID",
   "enter_aadhaar_otp": "Enter OTP sent to the registered mobile with Aadhaar",
   "enter_abha_address": "Enter ABHA Address",
@@ -917,6 +928,7 @@
   "etiology_identified": "Etiology identified",
   "evening_slots": "Evening Slots",
   "events": "Events",
+  "exception_created": "Exception created successfully",
   "exception_deleted": "Exception deleted",
   "exceptions": "Exceptions",
   "expand_sidebar": "Expand Sidebar",
@@ -1119,6 +1131,7 @@
   "last_administered": "Last administered",
   "last_discharge_reason": "Last Discharge Reason",
   "last_edited": "Last Edited",
+  "last_fortnight_short": "Last 2wk",
   "last_login": "Last Login",
   "last_modified": "Last Modified",
   "last_modified_by": "Last Modified By",
@@ -1128,6 +1141,7 @@
   "last_serviced_on": "Last Serviced On",
   "last_updated_by": "Last updated by",
   "last_vaccinated_on": "Last Vaccinated on",
+  "last_week_short": "Last wk",
   "latitude_invalid": "Latitude must be between -90 and 90",
   "left": "Left",
   "length": "Length ({{unit}})",
@@ -1176,6 +1190,7 @@
   "map_acronym": "M.A.P.",
   "mark_all_as_read": "Mark all as Read",
   "mark_as_complete": "Mark as Complete",
+  "mark_as_entered_in_error": "Mark as entered in error",
   "mark_as_fulfilled": "Mark as Fullfilled",
   "mark_as_noshow": "Mark as no-show",
   "mark_as_read": "Mark as Read",
@@ -1227,6 +1242,7 @@
   "moving_camera": "Moving Camera",
   "my_doctors": "My Doctors",
   "my_profile": "My Profile",
+  "my_schedules": "My Schedules",
   "name": "Name",
   "name_of_hospital": "Name of Hospital",
   "name_of_shifting_approving_facility": "Name of shifting approving facility",
@@ -1238,11 +1254,15 @@
   "new_password_confirmation": "Confirm New Password",
   "new_password_same_as_old": "New password is same as old password, please enter a different new password.",
   "new_password_validation": "New password is not valid.",
+  "new_session": "New Session",
+  "next_fortnight_short": "Next 2wk",
   "next_sessions": "Next Sessions",
+  "next_week_short": "Next wk",
   "no": "No",
   "no_address_provided": "No address provided",
   "no_appointments": "No appointments found",
   "no_attachments_found": "This communication has no attachments.",
+  "no_availabilities_yet": "No availabilities yet",
   "no_bed_asset_linked_allocated": "No bed/asset linked allocated",
   "no_bed_types_found": "No Bed Types found",
   "no_beds_available": "No beds available",
@@ -1287,6 +1307,7 @@
   "no_resource_requests_found": "No requests found",
   "no_results": "No results",
   "no_results_found": "No Results Found",
+  "no_schedule_templates_found": "No schedule templates found for this month.",
   "no_scheduled_exceptions_found": "No scheduled exceptions found",
   "no_slots_available": "No slots available",
   "no_slots_available_for_this_date": "No slots available for this date",
@@ -1310,6 +1331,7 @@
   "notification_permission_denied": "Notification permission denied",
   "notification_permission_granted": "Notification permission granted",
   "notify": "Notify",
+  "number_min_error": "Must be greater than {{min}}",
   "number_of_aged_dependents": "Number of Aged Dependents (Above 60)",
   "number_of_beds": "Number of beds",
   "number_of_beds_out_of_range_error": "Number of beds cannot be greater than 100",
@@ -1417,6 +1439,7 @@
   "patient_update_error": "Could not update patient",
   "patient_update_success": "Patient Updated Sucessfully",
   "patients": "Patients",
+  "patients_per_slot": "Patients per Slot",
   "pending": "Pending",
   "permanent_address": "Permanent Address",
   "permission_denied": "You do not have permission to perform this action",
@@ -1548,6 +1571,8 @@
   "reject": "Reject",
   "rejected": "Rejected",
   "reload": "Reload",
+  "remarks": "Remarks",
+  "remarks_placeholder": "Enter remarks",
   "remove": "Remove",
   "remove_user": "Remove User",
   "remove_user_organization": "Remove User from Organization",
@@ -1576,6 +1601,7 @@
   "requested_by": "Requested By",
   "required": "Required",
   "required_quantity": "Required Quantity",
+  "reschedule": "Reschedule",
   "resend_otp": "Resend OTP",
   "reset": "Reset",
   "reset_password": "Reset Password",
@@ -1618,13 +1644,35 @@
   "save": "Save",
   "save_and_continue": "Save and Continue",
   "save_investigation": "Save Investigation",
+  "saving": "Saving...",
   "scan_asset_qr": "Scan Asset QR!",
   "schedule": "Schedule",
   "schedule_appointment": "Schedule Appointment",
+  "schedule_availability_created_successfully": "Availability created successfully",
+  "schedule_availability_deleted_successfully": "Schedule availability deleted successfully",
   "schedule_calendar": "Schedule Calendar",
+  "schedule_end_time": "End Time",
+  "schedule_for": "Scheduled for",
   "schedule_information": "Schedule Information",
+  "schedule_remarks": "Remarks",
+  "schedule_remarks_placeholder": "Any additional notes about this session",
+  "schedule_session_time": "Session Time",
+  "schedule_session_type": "Session Type",
+  "schedule_sessions": "Sessions",
+  "schedule_sessions_min_error": "Add at least one session",
+  "schedule_slot_size": "Slot Size",
+  "schedule_slot_size_label": "Slot size (mins.)",
+  "schedule_slots_allocation_callout": "Allocating <strong>{{slots}} slots</strong> in this session provides approximately <strong>{{token_duration}} mins.</strong> for each patient.",
+  "schedule_start_time": "Start Time",
+  "schedule_template": "Schedule Template",
+  "schedule_template_name": "Template Name",
+  "schedule_template_name_placeholder": "Regular OP Day",
+  "schedule_valid_from_till_range": "Valid from <strong>{{from_date}}</strong> till <strong>{{to_date}}</strong>",
+  "schedule_weekdays": "Weekdays",
+  "schedule_weekdays_description": "Select the weekdays applicable for the template",
+  "schedule_weekdays_min_error": "Select at least one weekday",
   "scheduled": "Scheduled",
-  "schedules": "Schedules",
+  "scheduled_for": "Schedule for:",
   "scribe__reviewing_field": "Reviewing field {{currentField}} / {{totalFields}}",
   "scribe_error": "Could not autofill fields",
   "search": "Search",
@@ -1683,8 +1731,12 @@
   "send_sample_to_collection_centre_title": "Send sample to collection centre",
   "serial_number": "Serial Number",
   "serviced_on": "Serviced on",
+  "session_capacity": "Session Capacity",
   "session_expired": "Session Expired",
   "session_expired_msg": "It appears that your session has expired. This could be due to inactivity. Please login again to continue.",
+  "session_title": "Session Title",
+  "session_title_placeholder": "IP Rounds",
+  "session_type": "Session Type",
   "set_average_weekly_working_hours_for": "Set Average weekly working hours for",
   "set_home_facility": "Set as home facility",
   "set_your_local_language": "Set your local language",
@@ -1709,11 +1761,13 @@
   "show_default_presets": "Show Default Presets",
   "show_patient_presets": "Show Patient Presets",
   "show_unread_notifications": "Show Unread",
+  "showing_all_appointments": "Showing all appointments",
   "sign_in": "Sign in",
   "sign_out": "Sign out",
   "skill_add_error": "Error while adding skill",
   "skill_added_successfully": "Skill added successfully",
   "skills": "Skills",
+  "slot_configuration": "Slot Configuration",
   "slots_left": "slots left",
   "social_profile": "Social Profile",
   "social_profile_detail": "Include occupation, ration card category, socioeconomic status, and domestic healthcare support for a complete profile.",
@@ -1731,6 +1785,7 @@
   "start_datetime": "Start Date/Time",
   "start_dosage": "Start Dosage",
   "start_review": "Start Review",
+  "start_time": "Start Time",
   "state": "State",
   "status": "Status",
   "stop": "Stop",
@@ -1758,6 +1813,7 @@
   "systolic": "Systolic",
   "tachycardia": "Tachycardia",
   "target_dosage": "Target Dosage",
+  "template_deleted": "Template has been deleted",
   "test_type": "Type of test done",
   "tested_on": "Tested on",
   "thank_you_for_choosing": "Thank you for choosing our care service",
@@ -1774,9 +1830,11 @@
   "today": "Today",
   "token": "Token",
   "token_no": "Token No.",
+  "tomorrow": "Tomorrow",
   "total_amount": "Total Amount",
   "total_beds": "Total Beds",
   "total_patients": "Total Patients",
+  "total_slots": "Total Slots",
   "total_staff": "Total Staff",
   "total_users": "Total Users",
   "transcribe_again": "Transcribe Again",
@@ -1892,7 +1950,9 @@
   "vacant": "Vacant",
   "vaccinated": "Vaccinated",
   "vaccine_name": "Vaccine name",
+  "valid_from": "Valid From",
   "valid_otp_found": "Valid OTP found, Navigating to Appointments",
+  "valid_to": "Valid Till",
   "valid_year_of_birth": "Please enter a valid year of birth (YYYY)",
   "vehicle_preference": "Vehicle preference",
   "vendor_name": "Vendor Name",
@@ -1949,6 +2009,7 @@
   "ward": "Ward",
   "warranty_amc_expiry": "Warranty / AMC Expiry",
   "we_ve_sent_you_a_code_to": "We've sent you a code to",
+  "weekly_schedule": "Weekly Schedule",
   "weekly_working_hours_error": "Average weekly working hours must be a number between 0 and 168",
   "what_facility_assign_the_patient_to": "What facility would you like to assign the patient to",
   "whatsapp_number": "Whatsapp Number",
@@ -1963,6 +2024,7 @@
   "years_of_experience": "Years of Experience",
   "years_of_experience_of_the_doctor": "Years of Experience of the Doctor",
   "yes": "Yes",
+  "yesterday": "Yesterday",
   "yet_to_be_decided": "Yet to be decided",
   "you_need_at_least_a_location_to_create_an_assest": "You need at least a location to create an assest.",
   "zoom_in": "Zoom In",

src/CAREUI/display/Callout.tsx

@@ -16,7 +16,7 @@ export default function Callout({
   return (
     <div
       className={cn(
-        "flex h-min gap-2 rounded-md px-2 py-1.5 text-sm/tight",
+        "flex items-center h-min gap-2 rounded-md px-2 py-2 text-sm/tight",
         {
           primary: "bg-primary-100/50 text-primary-800",
           secondary: "bg-gray-50 text-gray-700",
@@ -29,7 +29,7 @@ export default function Callout({
     >
       <div
         className={cn(
-          "h-min rounded-full border bg-white px-2 py-0.5",
+          "h-min rounded-full border bg-white px-2",
           {
             primary: "border-primary-200",
             secondary: "border-secondary-300",
@@ -41,7 +41,9 @@ export default function Callout({
       >
         <span className="font-medium">{props.badge}</span>
       </div>
-      <span className="font-medium">{props.children}</span>
+      <div className="flex-1">
+        <span className="font-medium">{props.children}</span>
+      </div>
     </div>
   );
 }