Skip to content

Commit

Permalink
BAH-3009 | Add. Ability to create and Edit regular, recurring Appoint…
Browse files Browse the repository at this point in the history
…ments from the enhanced page (#314)

* Phani | Fix Appointment Recurring End date

* Phani | Fix Appointment Recurring End date

* Phani | A- 1204461586197798 | Update CSS for Add Appointments (#274)

* Update CSS

* Update CSS

* Update style for conent switcher

* Fix style for AM/PM dropdown

* Kavitha | A-1204378118194874 | add waitlist status to dateless appointments (#273)

* Kavitha | A-1204467238383006 | Conflicts warning with new UI (#276)

* refactored conflicts warning popup with carbon UI

* modified letter cases for buttons

* refactored conflicts iteration with map

* Arjun | 1204378118194874 | Ability to view awaiting appointment List (#275)

* add awaiting appointments tab

Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>
Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>

* modify awaiting appointments tab with only list view

Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>
Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>

* change view of awaiting appointments list and show/hide columns

Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>
Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>

* modify patient registration date with appoinment creation date in awaiting appointments

Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>
Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>

* fix tests for existing appointments module

Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>
Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>

* modify add appointments page to add awaiting appointments

Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>
Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>

* fix. existing tests for appointments

Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>
Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>

* add. test for awaiting appointments view

Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>
Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>

* Remove getAppConfig service method and update constants

Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>
Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>

---------

Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>
Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>

* Phani | A- 1204467238383004 |  Add Appointments page enhancement  for Recurring appointments (#277)

* Recurring Appointments

* Recurring Appointments

* Update locale

* Refactor Tags to use carbon components

* Update CSS styling for recurring appointments

* Update CSS to use inline-block

* Update CSS for Time Picker

* Update CSS for Time Picker for regular appointments

* Fix failing tests

* Disable autocomplete

* Modify the dropdown option

* Cleanup unused

* Cleanup unused

* Fix build

* Refactor labels for Recurring appointments

* Phani | 1204633988335095 | [Bug] Alignment and CSS issue introduced by Carbon (#279)

* Recurring Appointments

* Recurring Appointments

* Update locale

* Refactor Tags to use carbon components

* Update CSS styling for recurring appointments

* Update CSS to use inline-block

* Update CSS for Time Picker

* Update CSS for Time Picker for regular appointments

* Fix failing tests

* Disable autocomplete

* Modify the dropdown option

* Cleanup unused

* Cleanup unused

* Fix build

* Refactor labels for Recurring appointments

* Fix theme

* Add font family to label

* Fix font for Repeats on label

* Change Error Messages font to carbon style

* fix. date picker hidden when adding new appointment (#278)

* Remove SMS Appointments

* BAH-3013 | add appointment status functionality (#280)

* Kavitha | BAH-3013 | fix missing brace error (#282)

* Phani | A-1204537782299281| Edit appointments page enhancement with Carbon components (#281)

* Recurring Appointments

* Recurring Appointments

* Update locale

* Refactor Tags to use carbon components

* Update CSS styling for recurring appointments

* Update CSS to use inline-block

* Update CSS for Time Picker

* Update CSS for Time Picker for regular appointments

* Fix failing tests

* Disable autocomplete

* Modify the dropdown option

* Cleanup unused

* Cleanup unused

* Fix build

* Update CSS

* WIP Edit Appointments

* Updated styling for Edit Appointments for Regular Appointment scenario

* Refactor labels for Recurring appointments

* Fix theme

* Add font family to label

* Fix font for Repeats on label

* Refactor Recurring appointments

* Refactor CSS for edit appointments

* Change Error Messages font to carbon style

* BAH-3013 | add appointment status functionality

* Update Time and DatePicker with Disabled fields

* Add space

* Add appointment status for Edit Appointments page

* Add logic to convert appointments from waitlist to scheduled

* Fix build

* Fix Time clear issue

* Refactor unused code

---------

Co-authored-by: Kavitha S <kavitha.s@thoughtworks.com>

* Fix npm install

* Phani | A-1204695790272114 | Fix. Edit awaiting appointment showing default datetime(#286)

* [Ashish | Tanya ] Fix. Error message for selecting providers (#284)

* Arjun | BAH-3010 | Fix sorting in appointment category column and modify text case of appointment status (#285)

* Fix dropdown not updating issue for recurring appointment (#287)

* Phani | A-1204419984112147 | Update Popups and notifications with new UI (#288)

* Add sign for mandatory fields in Edit Appointment

* Add sign for mandatory fields in Edit Appointment

* Add Inline Notification for Success Popup in Add Appointment

* Create Modal for Discard Appointments

* Remove unused code

* Make CustomModal more generic

* Show Discard popup only when Appointment state is updated manually

* Update CancelConfirmationWrapper

* Change Update Confirmation popup to carbon

* Cancel confirmationWrapper

* Edit Appointment Confirmation Popup

* Update Tests

* Show discard popup only when form is touched edit appointment

* Add cancel confirmation for Add appointment

* Update Initial required for Add Appointment

* Phani | Sowmya| A- 1204750498836114| Ability to cancel waitlist appointment (#289)

* Add WaitList option to status filter

* Add ability to cancel Waitlist Appointments

* Fix Bug Status not updating after cancel

* Sowmya | A-1204802317224820 | Makes success notification message duration configurable and sets default duration to 5 seconds

* Phani | Fix height if sidebar in Appointments (#303)

* Fix test

* Address comments from Product call

* Update package

* Update packages

* Fix Tests

* Add Translation

* Fix angular test

---------

Co-authored-by: kavitha-sundararajan <90255023+kavitha-sundararajan@users.noreply.github.com>
Co-authored-by: Arjun G <91885483+Arjun-Go@users.noreply.github.com>
Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com>
Co-authored-by: Tanya Aggarwal <tanya.aggarwal@thoughtworks.com>
Co-authored-by: Kavitha S <kavitha.s@thoughtworks.com>
Co-authored-by: AshishkurianTw <119398030+ashishkuriantw@users.noreply.github.com>
Co-authored-by: sowmya198 <sowmya.ayilam.s@gmail.com>
  • Loading branch information
8 people authored Feb 23, 2024
1 parent d0e5e0d commit 454e239
Show file tree
Hide file tree
Showing 103 changed files with 5,268 additions and 1,960 deletions.
2 changes: 1 addition & 1 deletion config/ng-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"angularCalendarDaysOfWeek": [0,1,2,3,4,5,6],
"defaultWeekStartDayName": "Sunday",
"minDurationForAppointment": 30,
"appointmentStatusList": ["Requested","Scheduled","CheckedIn","Completed","Cancelled","Missed"],
"appointmentStatusList": ["Requested","Scheduled","CheckedIn","Completed","Cancelled","Missed", "WaitList"],
"regexForTime": "(?:(?:1[0-2]|0?[1-9]):[0-5]\\d\\s*[AaPp][Mm])?",
"privilegeManageAppointments": "app:appointments:manageAppointmentsTab",
"privilegeForAdmin": "app:appointments:adminTab",
Expand Down
58 changes: 37 additions & 21 deletions i18n/appointments/locale_en.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"APPOINTMENT_LOCATION": "Location",
"SUMMARY": "Summary",
"APPOINTMENT_LIST": "Appointments List",
"AWAITING_APPOINTMENT_LIST": "Awaiting Appointments",
"CALENDAR_VIEW": "Calendar",
"LIST_VIEW": "List view",
"NO_PROVIDER_COLUMN_KEY": "[No Provider]",
Expand Down Expand Up @@ -38,17 +39,18 @@
"APPOINTMENT_SERVICE_AVAILABILITY_START_TIME_KEY": "Start Time",
"APPOINTMENT_SERVICE_AVAILABILITY_END_TIME_KEY": "End Time",
"APPOINTMENT_SERVICE_AVAILABILITY_MAX_LOAD_KEY": "Max Load",
"SUNDAY": "Su",
"MONDAY": "Mo",
"TUESDAY": "Tu",
"WEDNESDAY": "We",
"THURSDAY": "Th",
"FRIDAY": "Fr",
"SATURDAY": "Sa",
"SUNDAY": "S",
"MONDAY": "M",
"TUESDAY": "T",
"WEDNESDAY": "W",
"THURSDAY": "T",
"FRIDAY": "F",
"SATURDAY": "S",
"APPOINTMENT_SERVICE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service",
"APPOINTMENT_SERVICE_TYPE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service appointment type",
"ADD_AVAILABILITY": "ADD",
"CANCEL_KEY": "Cancel",
"DISCARD_KEY": "Discard",
"OK_KEY": "Ok",
"CONFIRM_DELETE_AVAILABILITY": "There could be appointments booked for this service availability. Are you sure you want to proceed with deleting it?",
"CONFIRM_EDIT_SERVICE_MESSAGE_KEY": "There could be appointments booked against this service. Are you sure you want to save the changes?",
Expand Down Expand Up @@ -106,6 +108,9 @@
"APPOINTMENT_WALK_IN": "Walk In",
"APPOINTMENT_STATUS": "Status",
"APPOINTMENT_COMMENTS": "Comments",
"APPOINTMENT_CATEGORY": "Category",
"APPOINTMENT_CREATION_DATE": "Date Created",
"APPOINTMENT_WAITLIST": "Waitlist",
"CHECK_IN_APPOINTMENT": "Check-in",
"COMPLETE_APPOINTMENT": "Complete",
"MISSED_APPOINTMENT": "Missed",
Expand Down Expand Up @@ -183,8 +188,8 @@
"JOIN_TELE_CONSULTATION":"Join Teleconsultation",
"COPY_LINK": "Copy TeleConsultation Link",
"APPOINTMENT_TIME_LABEL": "Choose a time slot",
"APPOINTMENT_TIME_FROM_LABEL": "From",
"APPOINTMENT_TIME_TO_LABEL": "To",
"APPOINTMENT_TIME_FROM_LABEL": "Start time",
"APPOINTMENT_TIME_TO_LABEL": "End time",
"CURRENT_TIME_SLOT_LABEL": "Current time slot",
"APPOINTMENT_NOTES": "Notes",
"TODAY_LABEL": "Today",
Expand All @@ -193,9 +198,13 @@
"WALK_IN_APPOINTMENT_LABEL": "Walk-in Appointment",
"PLAN_LABEL": "Plan",
"PLACEHOLDER_APPOINTMENT_CREATE_SEARCH_SERVICE_APP_TYPE": "Service App Type",
"PLACEHOLDER_APPOINTMENT_CREATE_SEARCH_PROVIDER": "Choose Provider",
"PLACEHOLDER_APPOINTMENT_CREATE_SEARCH_PROVIDER": "Provider",
"PLACEHOLDER_APPOINTMENT_CREATE_SEARCH_SERVICE": "Service",
"PLACEHOLDER_APPOINTMENT_CREATE_SEARCH_SPECIALITY": "Speciality",
"PLACEHOLDER_APPOINTMENT_CREATE_APPOINTMENT_CATEGORY": "Appointment category",
"PLACEHOLDER_APPOINTMENT_CREATE_APPOINTMENT_STATUS": "Appointment status",
"PLACEHOLDER_APPOINTMENT_STATUS_SCHEDULED": "Scheduled",
"PLACEHOLDER_APPOINTMENT_STATUS_WAITLIST": "Waitlist",
"CHOOSE_TIME_PLACE_HOLDER": "hh:mm am/pm",
"APPOINTMENT_CREATE_CHECK_AND_SAVE": "Check and Save",
"APPOINTMENT_UPDATE_LABEL": "Update",
Expand All @@ -206,35 +215,42 @@
"ENDDATE_TYPE_ERROR_MESSAGE": "Please select recurrence end type",
"TIME_ERROR_MESSAGE": "Please select time",
"RECURRENCE_PERIOD_ERROR_MESSAGE": "Please select valid recurrence period",
"START_TIME_LESSTHAN_END_TME_ERROR_MESSAGE": "From time should be before to time",
"START_TIME_LESSTHAN_END_TME_ERROR_MESSAGE": "End time shouldn't be before start time",
"RECURRENCE_WEEKDAYS_ERROR_MESSAGE": "Please select the day(s)",
"NO_CONTENT_ERROR_MESSAGE": "Selected days do not fall under the end date selected",
"UNEXPECTED_SERVICE_ERROR": "There was an unexpected issue on the server. Please try again",
"APPOINTMENT_CANCEL_CONFIRMATION_TEXT": "Are you sure you want to cancel adding the new appointment?This will erase everything you have filled. Nothing will be saved.",
"APPOINTMENT_CANCEL_CONFIRMATION_TITLE": "Wait!",
"PRIORITY_ERROR_MESSAGE": "Please select appointment category",
"STATUS_ERROR_MESSAGE": "Please select appointment status",
"APPOINTMENT_CANCEL_CONFIRMATION_TEXT": "You will lose appointment details. Do you want to discard these changes?",
"APPOINTMENT_CANCEL_CONFIRMATION_TITLE": "Discard appointment?",
"APPOINTMENT_CANCEL_CONFIRMATION_NO": "No",
"APPOINTMENT_CANCEL_CONFIRMATION_YES": "Yes",
"OVERLAPPING_CONFLICTS_WARNING_HEADER": "You have an overlapping conflict",
"NO_SERVICE_DATE_CONFLICTS_WARNING_HEADER": "You have a no-service date conflict",
"OVERLAPPING_AND_NO_SERVICE_DATE_CONFLICTS_WARNING_HEADER": "You have an overlapping and no-service date conflict",
"NO_SERVICE_DATE_CONFLICTS": "No-Service Date conflicts",
"OVERLAPPING_CONFLICTS": "Overlapping conflicts",
"OVERLAPPING_CONFLICTS_DEFAULT_TEXT": "The appointment you are trying to book overlaps with the following dates",
"RECURRING_OVERLAPPING_CONFLICTS_DEFAULT_TEXT": "The recurring appointments you are trying to book overlaps with the following dates",
"APPOINTMENT_MODIFY_INFORMATION": "Modify information",
"APPOINTMENT_MODIFY_INFORMATION": "Modify Information",
"APPOINTMENT_SAVE_ANYWAY": "Save Anyway",
"APPOINTMENT_CANCEL_CONFIRMATION_TEXT_EDIT": "Are you sure you want to cancel editing the appointment? This will not save any of the changes made.",
"APPOINTMENT_CANCEL_CONFIRMATION_TEXT_EDIT": "You will lose the edited appointment details. Do you want to discard these changes?",
"PLACEHOLDER_APPOINTMENT_NOTES_MAX_LENGTH": "Maximum of 250 characters",
"INVALID_DAY": "Invalid day",
"NEW_END_DATE_LABEL": "Series ends on",
"OCCURRENCES_LABEL": "Occurrences",
"WEEK_LABEL": "Week",
"DAY_LABEL": "Day",
"WEEK_LABEL": "Week(s)",
"DAY_LABEL": "Day(s)",
"REPEATS_EVERY_LABEL": "Repeats every",
"REPEATS_ON_LABEL": "Repeats on",
"STARTS_LABEL": "Starts",
"ENDS_LABEL": "Ends",
"FROM_LABEL": "From",
"ON_LABEL": "On",
"AFTER_LABEL": "After",
"APPOINTMENT_UPDATE_ONE_LABEL": "Update this occurrence",
"APPOINTMENT_UPDATE_ALL_LABEL": "Update all occurrences",
"APPOINTMENT_UPDATE_ONE_LABEL": "This occurrence",
"APPOINTMENT_UPDATE_ALL_LABEL": "All occurrences",
"APPOINTMENT_UPDATE_TITLE": "Update occurrences",
"APPOINTMENT_SAVE_SUCCESS_TITLE": "Save successful",
"APPOINTMENT_SAVE_SUCCESS_HELP_TEXT": "Please check Appointment calendar for the updated schedule",
"APPOINTMENT_SAVE_SUCCESS_CLOSE": "Close",
Expand All @@ -246,9 +262,9 @@
"APPOINTMENT_UPDATE_CONFIRMATION_YES": "Yes, I confirm",
"APPOINTMENT_SAVE_SUCCESS_TEXT": "The new appointment for the patient {patientDetails} has been saved.",
"CHANGE_DATE_TO_LABEL": "Change ${moment(originalAppointmentDate).format('Do MMM')} to",
"PATIENT_DOUBLE_BOOKING_CONFLICT_MESSAGE": "Current {currentAppointmentService} request conflicts with {existingAppointmentService} appointment on and",
"PATIENT_DOUBLE_BOOKING_CONFLICT_MESSAGE": "Current {currentAppointmentService} request conflicts with {existingAppointmentService} appointment on",
"NO_SERVICE_CONFLICTS_DEFAULT_TEXT": "The {label} service you had selected for the appointment(s) is not available during below listed dates",
"PROVIDER_ERROR_MESSAGE": "Please select only a maximum of {maxAppointmentProviders} provider(s)",
"PROVIDER_ERROR_MESSAGE": "Please select maximum of {maxAppointmentProviders} provider(s)",
"APPOINTMENT_BOOKING_MESSAGE": "Appointment for #patientName, #patientId on #dateTime for #service is booked at #clinicName. For any queries call us on #helpDeskNumber.",
"RECURRING_APPOINTMENT_BOOKING_MESSAGE": "A recurring appointment for #patientName, #patientId for #service is booked for every #frequency at #clinicName. Your next appointment is at #dateTime. For any queries call us on #helpDeskNumber.",
"TELECONSULTATION_APPOINTMENT_BOOKING_MESSAGE": "A teleconsultation appointment for #patientName, #patientId on #dateTime for #service is booked at #clinicName. Please click on the link #meetingLink on #dateTime to join the consultation. For any queries call us on #helpDeskNumber.",
Expand Down
14 changes: 7 additions & 7 deletions i18n/appointments/locale_es.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
"APPOINTMENT_SERVICE_AVAILABILITY_START_TIME_KEY": "Start Time",
"APPOINTMENT_SERVICE_AVAILABILITY_END_TIME_KEY": "End Time",
"APPOINTMENT_SERVICE_AVAILABILITY_MAX_LOAD_KEY": "Max Load",
"SUNDAY": "Su",
"MONDAY": "Mo",
"TUESDAY": "Tu",
"WEDNESDAY": "We",
"THURSDAY": "Th",
"FRIDAY": "Fr",
"SATURDAY": "Sa",
"SUNDAY": "S",
"MONDAY": "M",
"TUESDAY": "T",
"WEDNESDAY": "W",
"THURSDAY": "T",
"FRIDAY": "F",
"SATURDAY": "S",
"APPOINTMENT_SERVICE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service",
"APPOINTMENT_SERVICE_TYPE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service appointment type",
"ADD_AVAILABILITY": "ADD",
Expand Down
14 changes: 7 additions & 7 deletions i18n/appointments/locale_pt_BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
"APPOINTMENT_SERVICE_AVAILABILITY_START_TIME_KEY": "Start Time",
"APPOINTMENT_SERVICE_AVAILABILITY_END_TIME_KEY": "End Time",
"APPOINTMENT_SERVICE_AVAILABILITY_MAX_LOAD_KEY": "Max Load",
"SUNDAY": "Su",
"MONDAY": "Mo",
"TUESDAY": "Tu",
"WEDNESDAY": "We",
"THURSDAY": "Th",
"FRIDAY": "Fr",
"SATURDAY": "Sa",
"SUNDAY": "S",
"MONDAY": "M",
"TUESDAY": "T",
"WEDNESDAY": "W",
"THURSDAY": "T",
"FRIDAY": "F",
"SATURDAY": "S",
"APPOINTMENT_SERVICE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service",
"APPOINTMENT_SERVICE_TYPE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service appointment type",
"ADD_AVAILABILITY": "ADD",
Expand Down
Loading

0 comments on commit 454e239

Please sign in to comment.