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.

Sign up for GitHub

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

Jump to bottom

Fix 705 rewriting patient report screen #714

Merged
merged 14 commits into from
Mar 18, 2024
Merged

Fix 705 rewriting patient report screen #714

merged 14 commits into from
Mar 18, 2024

Conversation

adityadeshlahre
Copy link
Contributor

@adityadeshlahre adityadeshlahre commented Feb 7, 2024 •
edited
Loading

fixes #705

Rewritten the Patient Status Report screen.
Added Translation and Created New Component .

Video

wipPR

Images FR lang

image
image

@adityadeshlahre
Copy link
Contributor Author

hey @mozzy11
create DRAFT PR with front-end changes .

If any changes required let me know 🙂
few Image and Videos attached

Thank You

@mozzy11
Copy link
Collaborator

mozzy11 commented Feb 7, 2024 •
edited
Loading

Thanks @adityadeshlahre . generally Looks ggod.
you can use the carbon </Grid> </Column> instead of the custom styling with </div>. for creating the Layout of the components

@adityadeshlahre adityadeshlahre force-pushed the fix-705-rewriting-patient-report-screen branch 2 times, most recently from cc8637e to ea004aa Compare February 7, 2024 22:19
@adityadeshlahre
Copy link
Contributor Author

Hey @mozzy11 👋

this is one way in which we could implement the routing to render different
components/redirecting-to-URLs according to params/querys.

if any changes required let me know 🙂

Thank You

Video

713pr

@adityadeshlahre
Copy link
Contributor Author

Update : SiteName list fixed 👍

siteNamesFIX

@adityadeshlahre
Copy link
Contributor Author

Update fetching patient fix + table drawn

image

@adityadeshlahre adityadeshlahre marked this pull request as ready for review February 24, 2024 13:39
mozzy11
mozzy11 reviewed Mar 6, 2024
View reviewed changes
frontend/src/App.js Outdated Show resolved Hide resolved
@mozzy11
Copy link
Collaborator

mozzy11 commented Mar 6, 2024

Hello @adityadeshlahre , generally Looks good.
You just need to improve the Routes and also remove any other changes not useful for the REport youre working on

@mozzy11
Copy link
Collaborator

mozzy11 commented Mar 8, 2024

@adityadeshlahre can you adress the above comments and also fix the merge conflicts ??

mozzy11
mozzy11 requested changes Mar 8, 2024
View reviewed changes
Copy link
Collaborator

@mozzy11 mozzy11 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seeabove comments

@github-actions github-actions bot added the merge conflict Merge Conflicts label Mar 8, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 8, 2024

👋 Hi, @adityadeshlahre,
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.

@adityadeshlahre adityadeshlahre force-pushed the fix-705-rewriting-patient-report-screen branch from 965cb6f to 29d07a4 Compare March 8, 2024 09:39
@adityadeshlahre
Copy link
Contributor Author

Hey @mozzy11 i have updated this PR fixed all conflicts!
If any changes required let me know 🙂

@github-actions github-actions bot removed the merge conflict Merge Conflicts label Mar 18, 2024
@mozzy11 mozzy11 self-requested a review March 18, 2024 09:23
mozzy11
mozzy11 requested changes Mar 18, 2024
View reviewed changes
Copy link
Collaborator

@mozzy11 mozzy11 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you aded a path ActivityReport with no Route handling it . can you remove that ??

@github-actions github-actions bot added the merge conflict Merge Conflicts label Mar 18, 2024
@github-actions GitHub Actions
Copy link

👋 Hi, @adityadeshlahre,
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.

@adityadeshlahre
Copy link
Contributor Author

you adede a path ActivityReport with no Route handling it . can you remove that ??

Hey @mozzy11 you were the only one who asked for it 🙂
Is previous review but let me remove it now !

image
image

@adityadeshlahre adityadeshlahre force-pushed the fix-705-rewriting-patient-report-screen branch from 851c29a to fedfa1f Compare March 18, 2024 11:14
@adityadeshlahre
Copy link
Contributor Author

Hey @mozzy11 i have made the requested changes 🙂
this PR is ready to get merged 🚀
Thank You

mozzy11
mozzy11 approved these changes Mar 18, 2024
View reviewed changes
Copy link
Collaborator

@mozzy11 mozzy11 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @adityadeshlahre

@mozzy11 mozzy11 merged commit 902157d into I-TECH-UW:develop_3x Mar 18, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codewithunknown codewithunknown codewithunknown left review comments

@manishjha-04 manishjha-04 manishjha-04 left review comments

@mozzy11 mozzy11 mozzy11 approved these changes

Assignees
No one assigned
Labels
merge conflict Merge Conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rewrite Patient Status Report report screen in the new React Framework
4 participants
@adityadeshlahre @mozzy11 @codewithunknown @manishjha-04