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

Refactored condition of Different Districts in External Result #7339

Merged
merged 10 commits into from Mar 19, 2024
Merged

Refactored condition of Different Districts in External Result #7339

merged 10 commits into from Mar 19, 2024
+25 −9

Conversation

jainvedant392
Copy link
Contributor

Proposed Changes

  • Fixes Failed to upload patient file in External Result #7101
  • If the user has a "user_type: StateAdmin", then "Different Districts" will not appear while uploading files of patients of different districts.
  • StateAdmin can upload all files from his state, irrespective of district of patient.

@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

@jainvedant392 jainvedant392 requested a review from a team as a code owner March 5, 2024 09:55
@vercel Vercel
Copy link

vercel bot commented Mar 5, 2024 •
edited

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 12, 2024 2:18pm

@netlify Netlify
Copy link

netlify bot commented Mar 5, 2024 •
edited

✅ Deploy Preview for care-egov-staging ready!

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

@vercel Vercel
Copy link

vercel bot commented Mar 13, 2024

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

A member of the Team first needs to authorize it.

@jainvedant392
Copy link
Contributor Author

Hey @rithviknishad, friendly reminder.

rithviknishad
rithviknishad reviewed Mar 18, 2024
View reviewed changes
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.

What about StateLabAdmin?

@jainvedant392
Copy link
Contributor Author

What about StateLabAdmin?

Are you saying that like user_type: StateAdmin, there is also some user_type: StateLabAdmin?
And if that exists, then I have to add the functionality for the same as well. Right?

@rithviknishad
Copy link
Member

Yup

@jainvedant392
Copy link
Contributor Author

Ok, any other user types for which I have to do the same. And is there any way, by which i can see all the user types available?

@nihal467
Copy link
Member

LGTM

@khavinshankar khavinshankar merged commit a77ff8b into coronasafe:develop Mar 19, 2024
33 of 35 checks passed
@github-actions GitHub Actions
Copy link

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

@jainvedant392 jainvedant392 deleted the issue7101 branch March 19, 2024 12:04
UdaySagar-Git added a commit to UdaySagar-Git/care_fe that referenced this pull request Mar 26, 2024
@UdaySagar-Git
merges pr coronasafe#7339
12a8f1e
khavinshankar pushed a commit that referenced this pull request Apr 24, 2024
@UdaySagar-Git @gigincg
@nihal467 @Ashesh3
Introduced Reusable JSON Parser and Validator with Schema, File Previ…
782a77d 
…ew, and Selected Import Support for XLSX/CSV Files (#7367)

* added new package

* removed 2 packages

* changed route for external result import modal

* updated schemas

* custom schema parser

* modified schema parser

* added file drag and drop component

* modified assest import modal to use reusable component

* excel viewer component

* modified import name

* external result upload modal

* lazy import

* Modified templete for external results import file

* cypress fix

* updated cypress templete

* fixes incorrect date format with csv files

* cypress fix

* Added documentation

* code reviews

* Error on hover

* merges pr #7339

* fix the flaky test

* change the cypress to use Reusable component

* fix type errors

* lint fix

---------

Co-authored-by: Gigin George <mail.gigin@gmail.com>
Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Co-authored-by: Ashesh3 <3626859+Ashesh3@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ashesh3 Ashesh3 Ashesh3 approved these changes

@rithviknishad rithviknishad rithviknishad approved these changes

@khavinshankar khavinshankar khavinshankar approved these changes

Assignees
No one assigned
Labels
needs review tested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Failed to upload patient file in External Result
5 participants
@jainvedant392 @rithviknishad @nihal467 @Ashesh3 @khavinshankar