Modified the UI of events log and switch tab #8825

JOSHIK27 · 2024-10-18T11:46:44Z

Proposed Changes

Fixes Modify the UI of events log switch tab #8286
Erased the logic for both sort buttons which were initially present in child components i.e (eventlist and dailroundslist) and brought the logic to parent component which was rendering child components.
In the parent component, 2 query state variables for both sort buttons were created and passed them as props to child components. And DailyRoundsSortDropdown (which is popover) component is created in the parent component.
DailyRoundsSortDropdown styling was fixed as we just need to display filter icon (not text)
For eventlist sort button, a new popover was created to make it look exactly same as DailyRoundsSortDropdown popover.

Screen.Recording.2024-10-21.at.06.32.44.mov

@ohcnetwork/care-fe-code-reviewers

Merge Checklist

Add specs that demonstrate bug / test a new feature.
Update product documentation.
Ensure that UI text is kept in I18n files.
Prep screenshot or demo video for changelog entry, and attach it to issue.
Request for Peer Reviews
Completion of QA

netlify · 2024-10-18T11:47:02Z

✅ Deploy Preview for care-ohc ready!

Name	Link
🔨 Latest commit	`8292d27`
🔍 Latest deploy log	https://app.netlify.com/sites/care-ohc/deploys/671ddf369028310008898dfc
😎 Deploy Preview	https://deploy-preview-8825--care-ohc.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

rithviknishad

Please follow the PR template and checklist.

JOSHIK27 · 2024-10-18T13:02:23Z

Please follow the PR template and checklist.

I have added proposed changed in the pr template. can you check if everything is ok or if anything needs to changed @rithviknishad ?

rithviknishad

lgtm, just a minor change

src/pluginMap.ts

bodhish · 2024-10-21T04:08:12Z

@JOSHIK27 the Merge Checklist is still not completed. Please complete it.

Ensure that UI text is kept in I18n files.
Prep screenshot or demo video for changelog entry, and attach it to issue.

JOSHIK27 · 2024-10-21T06:01:38Z

@JOSHIK27 the Merge Checklist is still not completed. Please complete it.
* [ ]   Ensure that UI text is kept in I18n files.

* [ ]   Prep screenshot or demo video for changelog entry, and attach it to issue.

Attached demo video above. And the pr above does not introduce any text to the ui (just layout fixes). Please let me if anything is needed. Thanks.

rithviknishad

a self review of the code changes would help identify missing translations

rithviknishad · 2024-10-21T06:17:22Z

src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx

+                {
+                  text: (
+                    <div className="flex items-center justify-center gap-1 text-sm">
+                      Events


missing i18n

rithviknishad · 2024-10-21T06:17:26Z

src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx

+                    <div className="flex items-center justify-center gap-1 text-sm">
+                      Events
+                      <span className="rounded-lg bg-warning-400 p-px px-1 text-xs text-white">
+                        beta


missing i18n

rithviknishad · 2024-10-21T06:17:48Z

src/Components/Facility/Consultations/DailyRoundsFilter.tsx

+              />
+              <TextFormField
+                {...field("taken_at_after")}
+                label="Measured after"


missing i18n

src/Locale/en.json

bodhish

LGTM

nihal467 · 2024-10-23T07:11:35Z

add a spacing between the card and the switch tabs

When a user applies any sort-by option, the filter icon button should change to the primary color, the same as the behavior in the daily round filter where the button turns primary when a filter is active.

JOSHIK27 · 2024-10-23T07:38:39Z

* [ ]  add a spacing between the card and the switch tabs

* [ ]  When a user applies any sort-by option, the filter icon button should change to the primary color, the same as the behavior in the daily round filter where the button turns primary when a filter is active.

Please let me know if anything needs to be changed.

Screen.Recording.2024-10-23.at.08.29.11.mov

github-actions · 2024-10-23T10:13:17Z

👋 Hi, @JOSHIK27,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

nihal467 · 2024-10-27T18:43:19Z

LGTM

github-actions · 2024-10-27T22:13:37Z

@JOSHIK27 Your efforts have helped advance digital healthcare and TeleICU systems. 🚀 Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! 🙌

JOSHIK27 added 4 commits September 30, 2024 17:07

both sort buttons brought to the parent component

bc268bf

achieved intented functionality

6dd1e60

included pluginMap file

52ba802

merge conflicts fixed

888ed24

JOSHIK27 requested a review from a team as a code owner October 18, 2024 11:46

JOSHIK27 changed the title ~~Fixes#8286~~ Modified the UI of events log and switch tab Oct 18, 2024

JOSHIK27 mentioned this pull request Oct 18, 2024

Modify the UI of events log switch tab #8286

Closed

3 tasks

rithviknishad requested changes Oct 18, 2024

View reviewed changes

rithviknishad added needs testing and removed needs testing labels Oct 18, 2024

rithviknishad requested changes Oct 18, 2024

View reviewed changes

src/pluginMap.ts Outdated Show resolved Hide resolved

Merge branch 'develop' into fixes#8286

41a3e43

nihal467 added the needs testing label Oct 18, 2024

JOSHIK27 added 3 commits October 18, 2024 17:14

Merge branch 'develop' into fixes#8286

7bc91fb

Merge branch 'develop' into fixes#8286

1b46d44

Delete src/pluginMap.ts

ab660b9

rithviknishad approved these changes Oct 19, 2024

View reviewed changes

Merge branch 'develop' into fixes#8286

0505676

Merge branch 'develop' into fixes#8286

cad099d

rithviknishad reviewed Oct 21, 2024

View reviewed changes

JOSHIK27 and others added 2 commits October 21, 2024 08:09

i18n fixes

cb0d8ba

Merge branch 'develop' into fixes#8286

c444120

JOSHIK27 requested a review from rithviknishad October 21, 2024 15:49

bodhish requested changes Oct 22, 2024

View reviewed changes

src/Locale/en.json Outdated Show resolved Hide resolved

JOSHIK27 and others added 2 commits October 22, 2024 16:57

Merge branch 'develop' into fixes#8286

1c2d8a0

changed to small cases

c3ca2d0

rithviknishad approved these changes Oct 22, 2024

View reviewed changes

rithviknishad requested a review from bodhish October 22, 2024 16:14

Merge branch 'develop' into fixes#8286

38a65d5

bodhish approved these changes Oct 23, 2024

View reviewed changes

nihal467 added changes required and removed needs testing labels Oct 23, 2024

JOSHIK27 and others added 2 commits October 23, 2024 08:19

Merge branch 'develop' into fixes#8286

faf8a88

margin issues and filter button variant adjustments fixed

67ded13

github-actions bot added the merge conflict pull requests with merge conflict label Oct 23, 2024

cleared merge conflicts

77d7552

github-actions bot removed the merge conflict pull requests with merge conflict label Oct 23, 2024

bodhish added needs testing and removed changes required labels Oct 23, 2024

JOSHIK27 added 3 commits October 24, 2024 03:20

Merge branch 'develop' into fixes#8286

3908f54

Merge branch 'develop' into fixes#8286

1e9ba09

Merge branch 'develop' into fixes#8286

8292d27

nihal467 added needs review tested and removed needs testing labels Oct 27, 2024

bodhish merged commit 5ef6740 into ohcnetwork:develop Oct 27, 2024
22 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modified the UI of events log and switch tab #8825

Modified the UI of events log and switch tab #8825

JOSHIK27 commented Oct 18, 2024 •

edited

Loading

netlify bot commented Oct 18, 2024 •

edited

Loading

rithviknishad left a comment

JOSHIK27 commented Oct 18, 2024

rithviknishad left a comment

bodhish commented Oct 21, 2024

JOSHIK27 commented Oct 21, 2024

rithviknishad left a comment

rithviknishad Oct 21, 2024

rithviknishad Oct 21, 2024

rithviknishad Oct 21, 2024

bodhish left a comment

nihal467 commented Oct 23, 2024 •

edited

Loading

JOSHIK27 commented Oct 23, 2024

github-actions bot commented Oct 23, 2024

nihal467 commented Oct 27, 2024

github-actions bot commented Oct 27, 2024

Modified the UI of events log and switch tab #8825

Modified the UI of events log and switch tab #8825

Conversation

JOSHIK27 commented Oct 18, 2024 • edited Loading

Proposed Changes

Merge Checklist

netlify bot commented Oct 18, 2024 • edited Loading

✅ Deploy Preview for care-ohc ready!

rithviknishad left a comment

Choose a reason for hiding this comment

JOSHIK27 commented Oct 18, 2024

rithviknishad left a comment

Choose a reason for hiding this comment

bodhish commented Oct 21, 2024

JOSHIK27 commented Oct 21, 2024

rithviknishad left a comment

Choose a reason for hiding this comment

rithviknishad Oct 21, 2024

Choose a reason for hiding this comment

rithviknishad Oct 21, 2024

Choose a reason for hiding this comment

rithviknishad Oct 21, 2024

Choose a reason for hiding this comment

bodhish left a comment

Choose a reason for hiding this comment

nihal467 commented Oct 23, 2024 • edited Loading

JOSHIK27 commented Oct 23, 2024

github-actions bot commented Oct 23, 2024

nihal467 commented Oct 27, 2024

github-actions bot commented Oct 27, 2024

JOSHIK27 commented Oct 18, 2024 •

edited

Loading

netlify bot commented Oct 18, 2024 •

edited

Loading

nihal467 commented Oct 23, 2024 •

edited

Loading