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

Removed Oxygen Details from Update Facility form #7796

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

Removed Oxygen Details from Update Facility form #7796

wants to merge 13 commits into from
+710 −196

Conversation

609harsh
Copy link
Contributor

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

@609harsh 609harsh requested a review from a team as a code owner May 11, 2024 12:13
@vercel Vercel
Copy link

vercel bot commented May 11, 2024

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

A member of the Team first needs to authorize it.

@netlify Netlify
Copy link

netlify bot commented May 11, 2024 •
edited

✅ Deploy Preview for care-egov-staging ready!

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

@nihal467
Copy link
Member

@609harsh modify the existing cypress test related to facility creation as it is currently failing

@github-actions GitHub Actions
Copy link

👋 Hi, @609harsh,
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 May 15, 2024
@609harsh
Copy link
Contributor Author

Hi @rithviknishad these are the following updates in ui

image
image
image
image

on Update Facility page
image

@github-actions github-actions bot removed the merge conflict pull requests with merge conflict label May 20, 2024
@609harsh
Copy link
Contributor Author

@609harsh modify the existing cypress test related to facility creation as it is currently failing

Please review the modified cypress test

rithviknishad
rithviknishad approved these changes May 20, 2024
View reviewed changes
src/Components/Facility/FacilityHome.tsx Outdated
@@ -52,7 +52,7 @@ export const FacilityHome = (props: any) => {
const [editCoverImage, setEditCoverImage] = useState(false);
const [imageKey, setImageKey] = useState(Date.now());
const authUser = useAuthUser();

console.log("hell", props);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
console.log("hell", props);

src/Components/Facility/FacilityOxygenInformation.tsx Outdated
}: any) => {
const [oxygenDetailsModalOpen, setOxygenDetailsModalOpen] = useState(false);

let capacityList: any = null;
Copy link
Member

Choose a reason for hiding this comment

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

any type is not allowed. define proper types

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will "let capacityList: ReactElement | null = null" be good? Since it will contain React element(reference line 25 or Line 38)
Moreover this file is almost in similar pattern with and FacilityBedCapacity.tsx. Should there also this variable be modified?

src/Components/Facility/FacilityOxygenInformation.tsx Outdated
Comment on lines 95 to 97
handleUpdate={() => {
facilityFetch();
}}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
handleUpdate={() => {
facilityFetch();
}}
handleUpdate={() => facilityFetch()}

src/Components/Facility/FacilityOxygenInformation.tsx Outdated
Comment on lines 139 to 142
handleUpdate={() => {
facilityFetch();
return;
}}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
handleUpdate={() => {
facilityFetch();
return;
}}
handleUpdate={() => facilityFetch()}

src/Components/Facility/OxygenDetails.tsx
Comment on lines +80 to +94
oxygen_type === 1
? facilityData?.oxygen_capacity
: oxygen_type === 2
? facilityData?.type_b_cylinders
: oxygen_type === 3
? facilityData?.type_c_cylinders
: facilityData?.type_d_cylinders,
expectedBurnRate:
oxygen_type === 1
? facilityData?.expected_oxygen_requirement
: oxygen_type === 2
? facilityData?.expected_type_b_cylinders
: oxygen_type === 3
? facilityData?.expected_type_c_cylinders
: facilityData?.expected_type_d_cylinders,
Copy link
Member

Choose a reason for hiding this comment

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

use a map instead? where keys are the oxygen_type and values are the capacity?

@nihal467
Copy link
Member

@609harsh

image

  • when we open the add oxygen pop-up, the input field are having 0 as by-default value, it should be blank input , similar to the staff and bed capacity pop-up we have

image

  • Already added oxygen type, should be hidden in the dropdown of oxygen type

image

  • when we are editing pop-up of oxygen detail, disable the oxygen type as we wont be changing it, similar to the staff capacity pop-up

image

  • when we click on the save and add more button, it shouldn't close the pop-up similar to the staff capacity pop-up

Note: Always try to check the similar existing behavior functions (staff capacity pop-up or bed capacity pop-up), in the platform and do a basic functionality check to increase the quality of PR

nihal467
nihal467 requested changes May 28, 2024
View reviewed changes
cypress/e2e/facility_spec/facility_manage.cy.ts
@@ -24,6 +24,10 @@ describe("Facility Manage Functions", () => {
const currentOccupied = "80";
const totalUpdatedCapacity = "120";
const currentUpdatedOccupied = "100";
const totalOxygenCapacity = "100";
Copy link
Member

Choose a reason for hiding this comment

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

delete the existing unused constants or reuse them when you are modifying the existing test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nihal467 nihal467 nihal467 requested changes

@rithviknishad rithviknishad rithviknishad approved these changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
test failed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Clean up Facility registration form
3 participants
@609harsh @nihal467 @rithviknishad