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

Track occupation of patient #7152

Merged
merged 6 commits into from
Mar 19, 2024

Conversation

konavivekramakrishna
Copy link
Contributor

@konavivekramakrishna konavivekramakrishna commented Feb 2, 2024

Proposed Changes

image

@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

@konavivekramakrishna konavivekramakrishna requested a review from a team as a code owner February 2, 2024 05:33
Copy link

netlify bot commented Feb 2, 2024

Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit d2bbb58
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/65f95a808b2298000947572b
😎 Deploy Preview https://deploy-preview-7152--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

vercel bot commented Feb 2, 2024

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 Mar 7, 2024 1:53pm

Copy link

netlify bot commented Feb 2, 2024

Deploy Preview for care-net failed.

Name Link
🔨 Latest commit 30e2599
🔍 Latest deploy log https://app.netlify.com/sites/care-net/deploys/65bc7eac1f9a7d0008ed14fa

@github-actions github-actions bot added the Deploy-Failed Deplyment is not showing preview label Feb 2, 2024
@konavivekramakrishna konavivekramakrishna changed the title draft Fix#6945 draft occupation of patient Feb 2, 2024
@konavivekramakrishna
Copy link
Contributor Author

@rithviknishad

can you please review it

@rithviknishad rithviknishad removed the Deploy-Failed Deplyment is not showing preview label Feb 2, 2024
Comment on lines 321 to 326
field.onChange({
name: "occupation",
value: res.data.meta_info?.occupation
? res.data.meta_info.occupation
: state.form.occupation,
});
Copy link
Member

Choose a reason for hiding this comment

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

The null check can be simplified

Suggested change
field.onChange({
name: "occupation",
value: res.data.meta_info?.occupation
? res.data.meta_info.occupation
: state.form.occupation,
});
field.onChange({
name: "occupation",
value: res.data.meta_info?.occupation ?? state.form.occupation,
});

Comment on lines 793 to 797
meta_info: formData.occupation
? {
occupation: formData.occupation,
}
: null,
Copy link
Member

Choose a reason for hiding this comment

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

what if there are other attributes stored in the meta_info object in the initial value? Those would get discarded right?

Copy link
Member

Choose a reason for hiding this comment

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

{ ...initial, updated_attr: updated_val }

src/Components/Patient/PatientRegister.tsx Outdated Show resolved Hide resolved
src/Utils/utils.ts Outdated Show resolved Hide resolved
src/Components/Patient/PatientRegister.tsx Outdated Show resolved Hide resolved
src/Utils/utils.ts Outdated Show resolved Hide resolved
@konavivekramakrishna konavivekramakrishna changed the title draft occupation of patient Track occupation of patient Feb 8, 2024
@konavivekramakrishna
Copy link
Contributor Author

@aparnacoronasafe

can you please look into it #7152 (comment)

@rithviknishad
Copy link
Member

@konavivekramakrishna if we are taking an input from the user from a form, we should be displaying it too right?

let's keep it in the patient home as you've suggested in the previous comment.

@rithviknishad
Copy link
Member

show other or not selected itself 😅 am I missing some context?

@aparnacoronasafe
Copy link
Member

Show "OTHER" or if not selected, "Occupation: " (blank)

Lets not hide it

@konavivekramakrishna
Copy link
Contributor Author

@rithviknishad @Ashesh3

could you please review and change the label

@nihal467
Copy link
Member

nihal467 commented Mar 12, 2024

@konavivekramakrishna modify the cypress test "Create a new patient with all fields in the registration form and no consultation" in the patient_registration.cy.ts file, to include :

  • add the occupation to the patient registration test
  • verify the field is reflected in the patient details page

@nihal467 nihal467 added changes required Cypress Test Pending The Cypress test are to be verified and removed needs testing needs review labels Mar 12, 2024
Copy link

vercel bot commented Mar 14, 2024

@konavivekramakrishna is attempting to deploy a commit to the Open Healthcare Network Team on Vercel.

A member of the Team first needs to authorize it.

@konavivekramakrishna
Copy link
Contributor Author

@rithviknishad @nihal467

could you please review

@rithviknishad rithviknishad added needs testing and removed changes required Cypress Test Pending The Cypress test are to be verified labels Mar 17, 2024
@nihal467
Copy link
Member

LGTM

@nihal467 nihal467 added tested reviewed reviewed by a core member and removed needs testing labels Mar 19, 2024
@khavinshankar khavinshankar merged commit a7e139d into ohcnetwork:develop Mar 19, 2024
33 of 35 checks passed
Copy link

@konavivekramakrishna 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! 🙌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
reviewed reviewed by a core member tested
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Occupation of patient to be tracked
6 participants