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

ConsultationDetails.tsx split into seperate components. #6232

Closed
wants to merge 13 commits into from

Conversation

thtauhid
Copy link
Contributor

@thtauhid thtauhid commented Sep 7, 2023

WHAT

🤖 Generated by Copilot at b736565

This pull request adds several new components to the ConsultationDetails folder that render different tabs for displaying various data and plots related to a consultation. The components use existing components from other folders and pass the appropriate props to them. The components also use the PageTitle component to show the name of each tab.

Proposed Changes

@coronasafe/care-fe-code-reviewers @coronasafe/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

HOW

🤖 Generated by Copilot at b736565

@thtauhid thtauhid requested a review from a team September 7, 2023 03:21
@thtauhid thtauhid requested a review from a team as a code owner September 7, 2023 03:21
@vercel
Copy link

vercel bot commented Sep 7, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
care-storybook ✅ Ready (Inspect) Visit Preview 💬 Add feedback Sep 8, 2023 0:30am

@netlify
Copy link

netlify bot commented Sep 7, 2023

Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit 5456fad
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/64fb13a7314bd30008b9cd29
😎 Deploy Preview https://deploy-preview-6232--care-egov-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

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

Copy link
Member

@rithviknishad rithviknishad left a comment

Choose a reason for hiding this comment

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

Nice Work! LGTM.

* Fix fullscreen button for IOS

* Fix fullscreen
@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Sep 7, 2023
@github-actions
Copy link

github-actions bot commented Sep 7, 2023

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

@thtauhid
Copy link
Contributor Author

thtauhid commented Sep 7, 2023

Had conflict of 3 lines. I've updated the lines.

@rithviknishad rithviknishad removed the merge conflict pull requests with merge conflict label Sep 7, 2023
ShivamJhaa and others added 3 commits September 7, 2023 17:43
…t_crud.ts to POM approach (ohcnetwork#5870)

* Added test for importing and configuring an asset

* Revert few changes

* nits

* Migrated to POM approach

* Migrated patient_crud to POM approach

* reverted some chnages

* FIx

* Merge conflicts

* Fixed test

* add responsiveness to virtual nursing assistant card (ohcnetwork#6130)

* allow use stock as well (ohcnetwork#6115)

* fixed responsive issue of 'Update Log' button in patient consultation page (ohcnetwork#6113)

* fix multiple bed bug (ohcnetwork#6111)

* Fixed typo in Date format in Asset management (ohcnetwork#6105)

* Added padding to count block on patients page

* fixed date format in asset manage page

* show only items with no min value (ohcnetwork#6103)

* check for id in response (ohcnetwork#6100)

* Added Responsiveness to File upload (ohcnetwork#6096)

* add responsiveness

* refactor

* remove overlap (ohcnetwork#6094)

* fixed failing test

* Fix

* Fixed comments

* fix comments

* Fixed all comments

---------

Co-authored-by: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com>
Co-authored-by: Gokulram A <gokulram2010418@ssn.edu.in>
Co-authored-by: Kshitij Verma <101321276+kshitijv256@users.noreply.github.com>
Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
…hcnetwork#6106)

* lints

* Added test for resource and migrated it to POM

* trying a fix

* nits

* backend change

* Reverted useless changes

* fix test

* Fixed failing test

* Added api verification

* Diagnosis: Adds field Principal Diagnosis (ohcnetwork#6218)

* adds field principle diagnosis

* show in consultation details

* fix typo

* fix cypress

* try adding wait

* fix tests

* open pdf file preview in new tab (ohcnetwork#6226)

* Changed weekly to average weekly for working hours (ohcnetwork#6228)

* Added padding to count block on patients page

* fixed date format in asset manage page

* Merged configure facility and configure health facility in one page

* removed commented code

* changed weekly to average weekly for working hours

* Resolved comments

---------

Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <mail@rithviknishad.dev>
Co-authored-by: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Co-authored-by: Kshitij Verma <101321276+kshitijv256@users.noreply.github.com>
)

* Consultation: Verified By Doctor as Dropdown

* filter by home_facility instead

* fixes ohcnetwork#6213

* fix cypress

* fix cypress

* fix more cypressss

* fix moreeeee

* fix inventory

* fix inventory
@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Sep 7, 2023
@github-actions
Copy link

github-actions bot commented Sep 7, 2023

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

@thtauhid
Copy link
Contributor Author

thtauhid commented Sep 8, 2023

I should have removed {consultationData.verified_by} in commit afa08f3. But, removed it in 5456fad

Conflicts have been resolved.

Thanks.

Copy link
Member

@rithviknishad rithviknishad left a comment

Choose a reason for hiding this comment

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

There are a lot of unnecessary changes now in this PR.

You'll have to rebase your original changes correctly.

@rithviknishad
Copy link
Member

Let's try to get this merged first on Monday once the necessary changes are made.
This will always keep catching conflicts every day.

@rithviknishad
Copy link
Member

@khavinshankar @nihal467

@rithviknishad rithviknishad added changes required and removed merge conflict pull requests with merge conflict labels Sep 8, 2023
@thtauhid
Copy link
Contributor Author

Hello,
I've created a new PR #6258 as this PR is a bit messy and I was having some issues rebasing it.
I hope it doesn't create much of a problem.

Thank you for understanding.

Should I close this PR?

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Sep 11, 2023
@github-actions
Copy link

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

@khavinshankar
Copy link
Member

khavinshankar commented Sep 11, 2023

@thtauhid is this a duplicate PR of #6258,

I'm closing this PR, If this is relevant, feel free to reopen it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Code Refactor: ConsultationDetails.tsx
5 participants