O3- 2998 monthly calender in appointment form fixed #1072

Madhu-mac · 2024-03-31T13:06:50Z

Requirements

This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes a conventional commit label. See existing PR titles for inspiration.
My work conforms to the OpenMRS 3.0 Styleguide and design documentation.
My work includes tests or is validated by existing tests.

Summary

This PR Fixes the issue with new enhanced monthly calender view

In this new enhanced monthly calendar view the user can able to go to the future months with the arrow buttons.
And it only lets the user to select current and future dates which is the actual requirement needed here. The user should not
select past dates.
The selected date gets highlighted in the calendar for better experience

Screenshots

open_mrs.mp4

Related Issue

#1049

Madhu-mac · 2024-03-31T13:09:45Z

@mogoodrich Can you please review this PR

mogoodrich · 2024-04-01T14:42:59Z

I believe @gabriel090 may already be looking at this, I will defer to @gabriel090 for the initial review.

Madhu-mac · 2024-04-01T17:06:04Z

I believe @gabriel090 may already be looking at this, I will defer to @gabriel090 for the initial review.

Sure! Hope to see a good feedback from the review

ojwanganto · 2024-04-02T07:45:21Z

@mogoodrich I see this PR adds an extra navigation feature that @gabriel090 may not be working on. I like his addition.
@Madhu-mac - please resolve the conflicts.

Madhu-mac · 2024-04-02T09:07:47Z

@ojwanganto I've resolved the conflicts. Can you review this..

mogoodrich · 2024-04-02T12:19:56Z

@ojwanganto @Madhu-mac I'm a bit "underwater" right now with some things, but should be able to check out later in the week.

Madhu-mac · 2024-04-02T12:33:38Z

@ojwanganto @Madhu-mac I'm a bit "underwater" right now with some things, but should be able to check out later in the week.

Cool

mogoodrich

It looks like the dates that can't be clicked on are black and the ones that are clickable are grey. Can we reverse so that the future dates are black and the dates in the past are grey?

Also, I think we this PR includes some other changes from other PRs, would be it be possible to have a clean PR with just the changes that are part of this PR?

Madhu-mac · 2024-04-04T09:28:46Z

It looks like the dates that can't be clicked on are black and the ones that are clickable are grey. Can we reverse so that the future dates are black and the dates in the past are grey?

Also, I think we this PR includes some other changes from other PRs, would be it be possible to have a clean PR with just the changes that are part of this PR?

Yeah! I like the idea as well. will be working on it

gabriel090 · 2024-04-05T09:51:37Z

It looks like the dates that can't be clicked on are black and the ones that are clickable are grey. Can we reverse so that the future dates are black and the dates in the past are grey?

Also, I think we this PR includes some other changes from other PRs, would be it be possible to have a clean PR with just the changes that are part of this PR?

Some changes and modifications have been worked on. We can select the date from the grid and save the appointment on the selected date. Open for feedback Thank you.

mogoodrich

LGTM, thanks @Madhu-mac .... but looks like there are some conflicts to resolve before merging?

Madhu-mac · 2024-04-15T09:34:22Z

Hi @mogoodrich, Can you please checkout this branch. I've resolved the confilcts and tested it locally it works fine..!!

mogoodrich · 2024-04-19T13:41:02Z

@Madhu-mac are these latest changes ready for review? can you explain what the updates do?

Madhu-mac · 2024-04-19T20:11:06Z

@Madhu-mac are these latest changes ready for review? can you explain what the updates do?

Yes @mogoodrich its ready for the review & the deliverables are..

The code defines a React functional component called MonthlyCalendarView that renders a monthly calendar view.
It manages the state of the currently displayed month and the selected date using the useState hook.
The component includes event handlers for navigating between months and selecting dates, renders the calendar UI with workload counts

mogoodrich · 2024-04-23T12:55:09Z

Thanks @Madhu-mac ! Can you look into the failing tests and once we fix those we likely can merge this in?

Madhu-mac · 2024-04-23T16:35:36Z

Thanks @Madhu-mac ! Can you look into the failing tests and once we fix those we likely can merge this in?

@mogoodrich I've updated the branch relavent to the main branch, If any tests are failing Please let me know I'm sure will fix it and get this PR Ready for Merging..

mogoodrich · 2024-04-23T17:55:07Z

@Madhu-mac you should be able to see the failing tests below...

Madhu-mac · 2024-04-23T19:08:15Z

@mogoodrich I've added some changes & the test cases are running fine. Can you look into it..

mogoodrich

Thanks! I am running the tests now, but, I also just added some questions I have.

mogoodrich · 2024-04-23T19:39:52Z

packages/esm-appointments-app/src/form/appointments-form.component.tsx

@@ -350,6 +352,13 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
      <InlineLoading className={styles.loader} description={`${t('loading', 'Loading')} ...`} role="progressbar" />
    );

+  const updateLocations = uniqBy(


Where is this used?

The updateLocations function is defined in the AppointmentsForm component but is not directly used within the component itself. We can use it to optimize performance by fetching and updating the list only when necessary, rather than fetching it every time the component renders.( Its for the future purposes if its relative static)

Not sure I follow 100%, but if this function is not yet used, I'd prefer to remove it until it is actually needed/used.

mogoodrich · 2024-04-23T19:41:02Z

yarn.lock

-  version: 1.0.30001551
-  resolution: "caniuse-lite@npm:1.0.30001551"
-  checksum: 10/3ab880797f2a47ce5e2db38700283219faacbddb4382a730883657b2155240aedda1931aac456bc957f61a41c99e15b42f452e5f68e62272def026fd3bf474a7
+  version: 1.0.30001612


is this update necessary?

Depends, If we wanna cope up with future versions or we can just revert it. Its working same, if we update the version also not much of a problem

packages/esm-appointments-app/src/form/appointments-form.component.tsx

Madhu-mac · 2024-04-26T09:41:41Z

@mogoodrich Is there anything that i need to look into?..

Madhu-mac · 2024-04-26T20:09:49Z

@mogoodrich I've commented out updateLocations fn as you said.. Do i need to make any changes to this PR bfr Merging to the main

mogoodrich · 2024-05-01T17:01:01Z

Thanks @Madhu-mac and sorry for the delay... assuming the tests pass (I just triggered them to re-run) this is good to merge, thanks!

Madhu-mac · 2024-05-01T20:20:15Z

Thanks @Madhu-mac and sorry for the delay... assuming the tests pass (I just triggered them to re-run) this is good to merge, thanks!

Thanks for the assist @mogoodrich

mogoodrich · 2024-05-02T12:50:47Z

No worries, @Madhu-mac , let me know if you need anything else from me to get this merged.

This reverts commit b6249cc

mogoodrich · 2024-05-23T20:29:02Z

Unfortunately I am reverting this PR, because as @mccarthyaaron mentioned (see link above) this commit removed the end date picker for reoccurring appointments and therefore broke that functionality:

Reverted here:
47663ad

This reverts commit b6249cc

monthly calender in appointment form fixed

9b7fbe9

ojwanganto closed this Apr 2, 2024

ojwanganto reopened this Apr 2, 2024

"resolved merge conflicts"

bb86893

mogoodrich reviewed Apr 3, 2024

View reviewed changes

mogoodrich approved these changes Apr 5, 2024

View reviewed changes

Merge branch 'main' into Fix/Calender-UI-data

0e43054

Merge branch 'main' into Fix/Calender-UI-data

1e05901

Merge branch 'main' into Fix/Calender-UI-data

6b657a7

Merge branch 'main' into Fix/Calender-UI-data

fba0e51

Merge branch 'main' into Fix/Calender-UI-data

2711981

Fixed test cases

a5a8178

Delete .env

cd8fcb3

mogoodrich reviewed Apr 23, 2024

View reviewed changes

Merge branch 'main' into Fix/Calender-UI-data

ed23e73

mogoodrich and others added 2 commits April 26, 2024 09:12

Merge branch 'main' into Fix/Calender-UI-data

48c203b

Update appointments-form.component.tsx

a555709

Merge branch 'main' into Fix/Calender-UI-data

a89d44a

Madhu-mac and others added 2 commits May 2, 2024 23:33

Merge branch 'main' into Fix/Calender-UI-data

1c8ed6b

Merge branch 'main' into Fix/Calender-UI-data

04df425

mogoodrich merged commit b6249cc into openmrs:main May 8, 2024
6 checks passed

mccarthyaaron mentioned this pull request May 22, 2024

(fix) O3-3167: The recurring-appointment end date field does not get focused when it is required and the form does not submit #1132

Merged

3 tasks

mogoodrich added a commit that referenced this pull request May 23, 2024

Revert "O3- 2998 monthly calender in appointment form fixed (#1072)"

47663ad

This reverts commit b6249cc

mogoodrich added a commit that referenced this pull request May 23, 2024

Revert "O3- 2998 monthly calender in appointment form fixed (#1072)"

7b4efa8

This reverts commit b6249cc

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

O3- 2998 monthly calender in appointment form fixed #1072

O3- 2998 monthly calender in appointment form fixed #1072

Madhu-mac commented Mar 31, 2024

Madhu-mac commented Mar 31, 2024

mogoodrich commented Apr 1, 2024

Madhu-mac commented Apr 1, 2024

ojwanganto commented Apr 2, 2024 •

edited

Madhu-mac commented Apr 2, 2024

mogoodrich commented Apr 2, 2024

Madhu-mac commented Apr 2, 2024

mogoodrich left a comment

Madhu-mac commented Apr 4, 2024

gabriel090 commented Apr 5, 2024

mogoodrich left a comment

Madhu-mac commented Apr 15, 2024 •

edited

mogoodrich commented Apr 19, 2024

Madhu-mac commented Apr 19, 2024 •

edited

mogoodrich commented Apr 23, 2024

Madhu-mac commented Apr 23, 2024

mogoodrich commented Apr 23, 2024

Madhu-mac commented Apr 23, 2024

mogoodrich left a comment

mogoodrich Apr 23, 2024

Madhu-mac Apr 25, 2024

mogoodrich Apr 26, 2024

mogoodrich Apr 23, 2024

Madhu-mac Apr 25, 2024 •

edited

Madhu-mac commented Apr 26, 2024

Madhu-mac commented Apr 26, 2024 •

edited

mogoodrich commented May 1, 2024

Madhu-mac commented May 1, 2024

mogoodrich commented May 2, 2024

mogoodrich commented May 23, 2024 •

edited

O3- 2998 monthly calender in appointment form fixed #1072

O3- 2998 monthly calender in appointment form fixed #1072

Conversation

Madhu-mac commented Mar 31, 2024

Requirements

Summary

Screenshots

Related Issue

Madhu-mac commented Mar 31, 2024

mogoodrich commented Apr 1, 2024

Madhu-mac commented Apr 1, 2024

ojwanganto commented Apr 2, 2024 • edited

Madhu-mac commented Apr 2, 2024

mogoodrich commented Apr 2, 2024

Madhu-mac commented Apr 2, 2024

mogoodrich left a comment

Choose a reason for hiding this comment

Madhu-mac commented Apr 4, 2024

gabriel090 commented Apr 5, 2024

mogoodrich left a comment

Choose a reason for hiding this comment

Madhu-mac commented Apr 15, 2024 • edited

mogoodrich commented Apr 19, 2024

Madhu-mac commented Apr 19, 2024 • edited

mogoodrich commented Apr 23, 2024

Madhu-mac commented Apr 23, 2024

mogoodrich commented Apr 23, 2024

Madhu-mac commented Apr 23, 2024

mogoodrich left a comment

Choose a reason for hiding this comment

mogoodrich Apr 23, 2024

Choose a reason for hiding this comment

Madhu-mac Apr 25, 2024

Choose a reason for hiding this comment

mogoodrich Apr 26, 2024

Choose a reason for hiding this comment

mogoodrich Apr 23, 2024

Choose a reason for hiding this comment

Madhu-mac Apr 25, 2024 • edited

Choose a reason for hiding this comment

Madhu-mac commented Apr 26, 2024

Madhu-mac commented Apr 26, 2024 • edited

mogoodrich commented May 1, 2024

Madhu-mac commented May 1, 2024

mogoodrich commented May 2, 2024

mogoodrich commented May 23, 2024 • edited

ojwanganto commented Apr 2, 2024 •

edited

Madhu-mac commented Apr 15, 2024 •

edited

Madhu-mac commented Apr 19, 2024 •

edited

Madhu-mac Apr 25, 2024 •

edited

Madhu-mac commented Apr 26, 2024 •

edited

mogoodrich commented May 23, 2024 •

edited