Added SpO2 field in community log update for nurses #8907

noufalrahim · 2024-10-23T16:02:14Z

Proposed Changes

Fixes Add Spo2 on vitals section of Community Nurse log update #8865
Added SpO2 field in community log update form of nurses
Added texts to i18n file

@ohcnetwork/care-fe-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

Summary by CodeRabbit

New Features
- Introduced a new ventilator_spo2 field in the Daily Rounds form for capturing and validating patient SpO2 levels.
- Enhanced form submission logic to include the new SpO2 data.
Localization
- Added new translations for healthcare-related terms, including "high" and "low," improving user interface terminology.

netlify · 2024-10-23T16:02:33Z

✅ Deploy Preview for care-ohc ready!

Name	Link
🔨 Latest commit	`04b2baa`
🔍 Latest deploy log	https://app.netlify.com/sites/care-ohc/deploys/673c385da4a91f0008aa1783
😎 Deploy Preview	https://deploy-preview-8907--care-ohc.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.

Jacobjeevan · 2024-10-24T01:46:36Z

src/components/Patient/DailyRounds.tsx

@@ -788,6 +788,30 @@ export const DailyRounds = (props: any) => {
                  },
                ]}
              />
+              <RangeAutocompleteFormField


There's already an SpO2 field, line 848 onwards that's used for doctors/telemedicine rounds type, let's move that out to the earlier block, after line 762.

I did the same

Yea, but now we have SpO2 field specified twice, when we can achieve the same result with one.

So we dont need SpO2 field for community nurses log update ?

We do.

Please check the file itself, the code block that starts at 726 includes fields that should appear for all 4 round types (that should have SpO2 field under new requirements).

So you can move the code starting at line 848 inside that block, and just remove the code you added.

rithviknishad · 2024-10-24T10:42:33Z

@noufalrahim make changes in the same branch

…etwork#8852)

…8809)

…hcnetwork#8908)

Co-authored-by: rithviknishad <mail@rithviknishad.dev>

Jacobjeevan · 2024-10-24T15:21:06Z

src/components/Patient/DailyRounds.tsx

@@ -900,7 +875,30 @@ export const DailyRounds = (props: any) => {
              />
            </>
          )}
-
+          <RangeAutocompleteFormField


There's still two instances for the field SpO2, there should only be one.

And this shouldn't be placed here, as Sp02 will be visible for all round types, instead of just normal, telemedicine, doctor's log and community nurse's update.

Always make sure to test your changes - on the frontend, you should see Sp02 occur twice under community nurse's log.

On a side note, how are you merging changes from develop into your branch? 🤔 It shouldn't be showing up as individual commits, but rather a merge commit.

https://docs.ohc.network/docs/contributing/#how-to-resolve-merge-conflicts

And this shouldn't be placed here, as Sp02 will be visible for all round types, instead of just normal, telemedicine, doctor's log and community nurse's update.

@noufalrahim This is still an issue.

As mentioned earlier

Please check the file itself, the code block that starts at 726 includes fields that should appear for all 4 round types (that should have SpO2 field under new requirements).

The new code should be there.

@noufalrahim ☝️

noufalrahim · 2024-10-28T11:39:57Z

@rithviknishad
Can I do this once again from a new branch..?

rithviknishad · 2024-10-29T09:17:55Z

are you facing any difficulties updating in the same branch?

github-actions · 2024-10-30T08:54:07Z

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

… issues/ohcnetwork#8865/SpO2-Field-in-Log-Update-in-Community-Nurse

rithviknishad · 2024-11-13T12:39:33Z

@noufalrahim resolve conflicts

Jacobjeevan

LGTM

nihal467 · 2024-11-18T12:00:07Z

LGTM @khavinshankar can you resolve the merge conflict and merge it ASAP

…Update-in-Community-Nurse

github-actions · 2024-11-19T10:27:13Z

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

Added SpO2 field in community log update for nurses

5d2d284

noufalrahim requested a review from a team as a code owner October 23, 2024 16:02

Jacobjeevan requested changes Oct 24, 2024

View reviewed changes

Jacobjeevan added the changes required label Oct 24, 2024

noufalrahim closed this Oct 24, 2024

rithviknishad mentioned this pull request Oct 24, 2024

Added SpO2 in community nurse log update form #8916

Closed

6 tasks

rithviknishad reopened this Oct 24, 2024

Jacobjeevan and others added 8 commits October 24, 2024 17:47

Ventilator mode/Oxygen modality data as exclusive of each other (ohcn…

10927c8

…etwork#8852)

Remove redundant API calls in Vitals tab (ohcnetwork#8864)

e7dda66

Hide locations with no monitors in CNS page (ohcnetwork#8812)

4668728

Add field validation to resolve the Update Profile Issue (ohcnetwork#…

c51b88b

…8809)

Adds support for useMutation hook (ohcnetwork#8891)

5ce520f

Disable abha number linking when health facility id is not present (o…

2f29439

…hcnetwork#8908)

enable livekit plugin; fixed dockerfile (ohcnetwork#8910)

0783211

Co-authored-by: rithviknishad <mail@rithviknishad.dev>

Removed code redundancy

340c586

Jacobjeevan requested changes Oct 24, 2024

View reviewed changes

rithviknishad added the invalid This doesn't seem right label Oct 24, 2024

bodhish added the blocked label Oct 27, 2024

github-actions bot added the merge conflict pull requests with merge conflict label Oct 30, 2024

Jacobjeevan added the question Further information is requested label Oct 30, 2024

noufalrahim added 2 commits November 1, 2024 18:55

Merge branch 'develop' of https://github.com/noufalrahim/care_fe into…

774d165

… issues/ohcnetwork#8865/SpO2-Field-in-Log-Update-in-Community-Nurse

Removed code redundancy

88d99c6

github-actions bot removed the merge conflict pull requests with merge conflict label Nov 2, 2024

Jacobjeevan removed the question Further information is requested label Nov 4, 2024

github-actions bot added the merge conflict pull requests with merge conflict label Nov 6, 2024

rithviknishad added needs testing needs review and removed merge conflict pull requests with merge conflict labels Nov 13, 2024

rithviknishad requested a review from Jacobjeevan November 13, 2024 12:38

rithviknishad added the merge conflict pull requests with merge conflict label Nov 13, 2024

coderabbitai bot mentioned this pull request Nov 13, 2024

Adjust SpO2 thresholds and labels in DailyRounds component to match medical standards #9102

Closed

Jacobjeevan approved these changes Nov 13, 2024

View reviewed changes

nihal467 added tested and removed needs testing labels Nov 18, 2024

Merge branch 'develop' into issues/ohcnetwork#8865/SpO2-Field-in-Log-…

04b2baa

…Update-in-Community-Nurse

Jacobjeevan removed needs review merge conflict pull requests with merge conflict labels Nov 19, 2024

khavinshankar approved these changes Nov 19, 2024

View reviewed changes

khavinshankar merged commit b0305a4 into ohcnetwork:develop Nov 19, 2024
22 of 23 checks passed

AdityaJ2305 mentioned this pull request Nov 21, 2024

Adjusted SpO2 thresholds and labels in DailyRounds component to match medical standards #9118

Merged

6 tasks

This was referenced Nov 21, 2024

Remove special character validations for names (patients and users) #9177

Merged

Fix: Spo2 twice rendering and wrong thresholds #9182

Merged

Rishith25 pushed a commit to Rishith25/care_fe that referenced this pull request Nov 25, 2024

Added SpO2 field in community log update for nurses (ohcnetwork#8907)

b1b5db5

This was referenced Nov 25, 2024

Disallow picking out of range month or year in date input dropdown #9064

Closed

Update Sample File Upload and upgrade buttons to Shadcn button #9157

Merged

UdaySagar-Git pushed a commit to UdaySagar-Git/care_fe that referenced this pull request Dec 3, 2024

Added SpO2 field in community log update for nurses (ohcnetwork#8907)

bb6aacc

coderabbitai bot mentioned this pull request Dec 20, 2024

changed OP Number to Registration Number #9521

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added SpO2 field in community log update for nurses #8907

Added SpO2 field in community log update for nurses #8907

noufalrahim commented Oct 23, 2024 •

edited by coderabbitai bot

Loading

netlify bot commented Oct 23, 2024 •

edited

Loading

Jacobjeevan Oct 24, 2024 •

edited

Loading

noufalrahim Oct 24, 2024

Jacobjeevan Oct 24, 2024

noufalrahim Oct 24, 2024

Jacobjeevan Oct 24, 2024 •

edited

Loading

rithviknishad commented Oct 24, 2024

Jacobjeevan Oct 24, 2024

rithviknishad Oct 24, 2024

Jacobjeevan Nov 4, 2024 •

edited

Loading

Jacobjeevan Nov 11, 2024

noufalrahim commented Oct 28, 2024

rithviknishad commented Oct 29, 2024

github-actions bot commented Oct 30, 2024

rithviknishad commented Nov 13, 2024

Jacobjeevan left a comment

nihal467 commented Nov 18, 2024

github-actions bot commented Nov 19, 2024

Added SpO2 field in community log update for nurses #8907

Added SpO2 field in community log update for nurses #8907

Conversation

noufalrahim commented Oct 23, 2024 • edited by coderabbitai bot Loading

Proposed Changes

Merge Checklist

Summary by CodeRabbit

netlify bot commented Oct 23, 2024 • edited Loading

✅ Deploy Preview for care-ohc ready!

Jacobjeevan Oct 24, 2024 • edited Loading

Choose a reason for hiding this comment

noufalrahim Oct 24, 2024

Choose a reason for hiding this comment

Jacobjeevan Oct 24, 2024

Choose a reason for hiding this comment

noufalrahim Oct 24, 2024

Choose a reason for hiding this comment

Jacobjeevan Oct 24, 2024 • edited Loading

Choose a reason for hiding this comment

rithviknishad commented Oct 24, 2024

Jacobjeevan Oct 24, 2024

Choose a reason for hiding this comment

rithviknishad Oct 24, 2024

Choose a reason for hiding this comment

Jacobjeevan Nov 4, 2024 • edited Loading

Choose a reason for hiding this comment

Jacobjeevan Nov 11, 2024

Choose a reason for hiding this comment

noufalrahim commented Oct 28, 2024

rithviknishad commented Oct 29, 2024

github-actions bot commented Oct 30, 2024

rithviknishad commented Nov 13, 2024

Jacobjeevan left a comment

Choose a reason for hiding this comment

nihal467 commented Nov 18, 2024

github-actions bot commented Nov 19, 2024

noufalrahim commented Oct 23, 2024 •

edited by coderabbitai bot

Loading

netlify bot commented Oct 23, 2024 •

edited

Loading

Jacobjeevan Oct 24, 2024 •

edited

Loading

Jacobjeevan Oct 24, 2024 •

edited

Loading

Jacobjeevan Nov 4, 2024 •

edited

Loading