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

Arjun | 1204657040722345 | [Bug] Clicking add new appointment doesn't show highlighted tab #278

Merged
merged 1 commit into from
May 26, 2023

Conversation

Arjun-Go
Copy link
Contributor

Asana card
JIRA card

Summary

This PR has changes for the following bugs

  • Clicking add new appointment button doesn't highlight active tab (Appointment or Awaiting appointment tab)
  • Date picker and other buttons like Today, Week and Day are not available in the appointment list calendar view when add new appointment button is selected.

@Arjun-Go Arjun-Go requested review from binduak and Phanindra-tw May 24, 2023 06:58
@Arjun-Go Arjun-Go merged commit bbaa70e into Bahmni-IPD-master May 26, 2023
@Arjun-Go Arjun-Go deleted the appointments-datePicker-fix branch May 26, 2023 10:30
Phanindra-tw added a commit that referenced this pull request Feb 23, 2024
…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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants