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

feat: added admitted bed type filter #3963

Merged
merged 5 commits into from
Dec 7, 2022
Merged

feat: added admitted bed type filter #3963

merged 5 commits into from
Dec 7, 2022

Conversation

aeswibon
Copy link
Member

@aeswibon aeswibon commented Nov 5, 2022 •
edited
Loading

Feature Request

Proposed Changes

  • Replaced admitted to with admitted bed_type filter

Associated Issue

@coronasafe/care-fe-code-reviewers @coronasafe/code-reviewers

@aeswibon aeswibon requested a review from a team November 5, 2022 12:19
@aeswibon aeswibon requested a review from a team as a code owner November 5, 2022 12:19
@aeswibon aeswibon requested a review from gigincg November 5, 2022 12:19
@vercel
Copy link

vercel bot commented Nov 5, 2022 •
edited
Loading

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

Name Status Preview Updated
care-storybook ✅ Ready (Inspect) Visit Preview Dec 7, 2022 at 1:13PM (UTC)

@netlify
Copy link

netlify bot commented Nov 5, 2022 •
edited
Loading

✅ Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit 36a25d4
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/639090f1157c1f000963910b
😎 Deploy Preview https://deploy-preview-3963--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 settings.

@aeswibon
Copy link
Member Author

aeswibon commented Nov 5, 2022

@nihal467 This PR can bed tested once the backend PR ohcnetwork/care#1090 merges

rithviknishad
rithviknishad reviewed Nov 5, 2022
View reviewed changes
Copy link
Member

@rithviknishad rithviknishad 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.

@cp-coder since the filter works on Integer choices (id), the text prop can be user friendly ryt?

I've also fixed a typo
image

This was referenced Nov 6, 2022
Merged
Closed
@github-actions
Copy link

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

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Nov 10, 2022
@netlify
Copy link

netlify bot commented Nov 10, 2022

❌ Deploy Preview for care-net failed.

Name Link
🔨 Latest commit d35fb60
🔍 Latest deploy log https://app.netlify.com/sites/care-net/deploys/636ce40e9f64e000091cef4b

@github-actions github-actions bot removed the merge conflict pull requests with merge conflict label Nov 10, 2022
@nihal467
Copy link
Member

@cp-coder
image
image

currently, as per staging, we only have four-bed type, which was specifically mentioned in the issue. remove the extra bed type added and mark it for need testing

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Nov 24, 2022
@aeswibon aeswibon added needs testing and removed test failed merge conflict pull requests with merge conflict labels Nov 26, 2022
@nihal467
Copy link
Member

nihal467 commented Nov 30, 2022 •
edited
Loading

@cp-coder

image

the applied filter badges are not showing on the patient page

@nihal467
Copy link
Member

nihal467 commented Dec 6, 2022

@cp-coder can you work on it ASAP

@nihal467 nihal467 mentioned this pull request Dec 6, 2022
Closed
@aeswibon aeswibon added needs testing P1 breaking issue or vital feature and removed test failed labels Dec 7, 2022
@nihal467
Copy link
Member

nihal467 commented Dec 7, 2022

test approved

khavinshankar
khavinshankar approved these changes Dec 7, 2022
View reviewed changes
src/Components/Patient/ManagePatients.tsx Outdated Show resolved Hide resolved
@sonarqubecloud
Copy link

sonarqubecloud bot commented Dec 7, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@khavinshankar khavinshankar merged commit cecd205 into ohcnetwork:develop Dec 7, 2022
aeswibon added a commit to aeswibon/care_fe that referenced this pull request Dec 8, 2022
@aeswibon @khavinshankar
feat: added admitted bed type filter (ohcnetwork#3963)
8b5b8ba 
* feat(patient): added admitted bed type filter

* fix(patient): modified bed type options for user friendly

* fix(patient): removed unwated bed types

* fix(patient): fixed applied filter badges not visible

* Update src/Components/Patient/ManagePatients.tsx

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@khavinshankar khavinshankar khavinshankar approved these changes

@rithviknishad rithviknishad rithviknishad approved these changes

@gigincg gigincg Awaiting requested review from gigincg

Assignees
No one assigned
Labels
P1 breaking issue or vital feature tested
Projects
None yet
Milestone
No milestone
4 participants
@aeswibon @nihal467 @rithviknishad @khavinshankar