Removed Oxygen Details from Update Facility form #7796

609harsh · 2024-05-11T12:13:04Z

Proposed Changes

Fixes Clean up Facility registration form #7758

@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

…function

… issues/7758/clean-up-oxygen-details

vercel · 2024-05-11T12:13:07Z

@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 · 2024-05-11T12:13:24Z

✅ Deploy Preview for care-egov-staging ready!

Name	Link
🔨 Latest commit	`eb939dc`
🔍 Latest deploy log	https://app.netlify.com/sites/care-egov-staging/deploys/665aeafed3120500084327ea
😎 Deploy Preview	https://deploy-preview-7796--care-egov-staging.netlify.app
📱 Preview on mobile	Toggle 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 · 2024-05-14T19:31:00Z

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

github-actions · 2024-05-15T06:36:00Z

👋 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.

609harsh · 2024-05-15T14:18:54Z

Hi @rithviknishad these are the following updates in ui

on Update Facility page

…com/609harsh/os_care_fe into issues/7758/clean-up-oxygen-details

609harsh · 2024-05-20T07:16:36Z

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

Please review the modified cypress test

rithviknishad · 2024-05-11T13:36:29Z

src/Components/Facility/FacilityHome.tsx

@@ -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);


Suggested change

console.log("hell", props);

rithviknishad · 2024-05-11T13:37:09Z

src/Components/Facility/FacilityOxygenInformation.tsx

+}: any) => {
+  const [oxygenDetailsModalOpen, setOxygenDetailsModalOpen] = useState(false);
+
+  let capacityList: any = null;


any type is not allowed. define proper types

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?

rithviknishad · 2024-05-11T13:38:55Z

src/Components/Facility/FacilityOxygenInformation.tsx

+            handleUpdate={() => {
+              facilityFetch();
+            }}


Suggested change

handleUpdate={() => {

facilityFetch();

}}

handleUpdate={() => facilityFetch()}

rithviknishad · 2024-05-11T13:39:22Z

src/Components/Facility/FacilityOxygenInformation.tsx

+            handleUpdate={() => {
+              facilityFetch();
+              return;
+            }}


Suggested change

handleUpdate={() => {

facilityFetch();

return;

}}

handleUpdate={() => facilityFetch()}

rithviknishad · 2024-05-11T13:40:22Z

src/Components/Facility/OxygenDetails.tsx

+          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,


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

nihal467 · 2024-05-28T06:16:56Z

@609harsh

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

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

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

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 · 2024-05-28T06:18:40Z

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";


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

new ones are added for oxygen and earlier ones are for doctor and bed. no constants are unused

github-actions · 2024-05-29T06:14:26Z

👋 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.

609harsh · 2024-06-01T09:58:20Z

hi @nihal467 regarding the last query currently i am sending down props from parent to use oxygen related. In order to prevent popup closing we need a new endpoint to fetch and update information related to oxygen only (similar to what is followed in staff capacity pop-up or bed capacity pop-up).
Please refer to this issue's thread
#7758 (comment)

rithviknishad · 2024-06-05T07:32:39Z

@609harsh you could simply pass the refetch callback from the useQuery and call that instead to refresh latest information.

github-actions · 2024-07-16T12:45:47Z

👋 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.

gigincg · 2024-08-05T09:10:21Z

@609harsh Can you update the PR?

bodhish · 2024-09-20T15:53:18Z

Closing this PR due to lack of recent progress.

609harsh added 7 commits May 10, 2024 22:54

added oxygen_types in constansts.tsx

92116dc

removed oxygen details from update facility form

e58e1b9

removed oxygen details from facility home

881c5e4

added section for oxygen details on facility_home page

93d9fa2

Added Dialog modal for oxygen details

266614f

added oxygen type card for oxygen details along with edit and delete …

7a31768

…function

Merge branch 'develop' of https://github.com/609harsh/os_care_fe into…

a2f2928

… issues/7758/clean-up-oxygen-details

609harsh requested a review from a team as a code owner May 11, 2024 12:13

nihal467 added the needs testing label May 14, 2024

nihal467 added test failed and removed needs testing labels May 14, 2024

github-actions bot added the merge conflict pull requests with merge conflict label May 15, 2024

609harsh and others added 5 commits May 18, 2024 16:11

Removed test for oxygen from facility_update

110165e

Added cypress test for Oxygen details

122bf4e

Merge branch 'develop' into issues/7758/clean-up-oxygen-details

ef822b3

resolved merge conflicts

2bc8cf6

Merge branch 'issues/7758/clean-up-oxygen-details' of https://github.…

bf07f0b

…com/609harsh/os_care_fe into issues/7758/clean-up-oxygen-details

github-actions bot removed the merge conflict pull requests with merge conflict label May 20, 2024

rithviknishad approved these changes May 20, 2024

View reviewed changes

rithviknishad added needs testing needs review and removed test failed labels May 20, 2024

nihal467 removed needs testing needs review labels May 21, 2024

nihal467 added the changes required label May 21, 2024

fix: suggest changes

cd1f06c

rithviknishad approved these changes May 24, 2024

View reviewed changes

rithviknishad added needs testing and removed changes required labels May 24, 2024

nihal467 requested changes May 28, 2024

View reviewed changes

nihal467 added test failed and removed needs testing labels May 28, 2024

github-actions bot added the merge conflict pull requests with merge conflict label May 29, 2024

fix:merge conflict

eb939dc

github-actions bot removed the merge conflict pull requests with merge conflict label Jun 3, 2024

nihal467 added the discussion required label Jun 5, 2024

nihal467 added changes required and removed discussion required labels Jun 10, 2024

github-actions bot added the merge conflict pull requests with merge conflict label Jul 16, 2024

gigincg self-assigned this Aug 5, 2024

bodhish closed this Sep 20, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Removed Oxygen Details from Update Facility form #7796

Removed Oxygen Details from Update Facility form #7796

609harsh commented May 11, 2024

vercel bot commented May 11, 2024

netlify bot commented May 11, 2024 •

edited

Loading

nihal467 commented May 14, 2024

github-actions bot commented May 15, 2024

609harsh commented May 15, 2024

609harsh commented May 20, 2024

rithviknishad May 11, 2024

rithviknishad May 11, 2024

609harsh May 24, 2024

rithviknishad May 11, 2024

rithviknishad May 11, 2024

rithviknishad May 11, 2024

nihal467 commented May 28, 2024

nihal467 May 28, 2024

609harsh Jun 1, 2024 •

edited

Loading

github-actions bot commented May 29, 2024

609harsh commented Jun 1, 2024

rithviknishad commented Jun 5, 2024

github-actions bot commented Jul 16, 2024

gigincg commented Aug 5, 2024

bodhish commented Sep 20, 2024

Removed Oxygen Details from Update Facility form #7796

Removed Oxygen Details from Update Facility form #7796

Conversation

609harsh commented May 11, 2024

Proposed Changes

Merge Checklist

vercel bot commented May 11, 2024

netlify bot commented May 11, 2024 • edited Loading

✅ Deploy Preview for care-egov-staging ready!

nihal467 commented May 14, 2024

github-actions bot commented May 15, 2024

609harsh commented May 15, 2024

609harsh commented May 20, 2024

rithviknishad May 11, 2024

Choose a reason for hiding this comment

rithviknishad May 11, 2024

Choose a reason for hiding this comment

609harsh May 24, 2024

Choose a reason for hiding this comment

rithviknishad May 11, 2024

Choose a reason for hiding this comment

rithviknishad May 11, 2024

Choose a reason for hiding this comment

rithviknishad May 11, 2024

Choose a reason for hiding this comment

nihal467 commented May 28, 2024

nihal467 May 28, 2024

Choose a reason for hiding this comment

609harsh Jun 1, 2024 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented May 29, 2024

609harsh commented Jun 1, 2024

rithviknishad commented Jun 5, 2024

github-actions bot commented Jul 16, 2024

gigincg commented Aug 5, 2024

bodhish commented Sep 20, 2024

netlify bot commented May 11, 2024 •

edited

Loading

609harsh Jun 1, 2024 •

edited

Loading