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.

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

Merge develop to staging v24.18.0 #7698

Merged
merged 70 commits into from
Apr 24, 2024
Merged

Merge develop to staging v24.18.0 #7698

merged 70 commits into from
Apr 24, 2024

Conversation

nihal467
Copy link
Member

Proposed Changes

  • Fixes #issue_number
  • Change 1
  • Change 2
  • More?

@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

GokulramGHV and others added 30 commits November 16, 2023 18:25
…r-scanner" package version 2.0.0-beta.3. Update AssetsList.tsx to import Scanner from "@yudiel/react-qr-scanner" instead of QrReader.
…canner component from "@yudiel/react-qr-scanner" package.
kshitijv256 and others added 25 commits April 22, 2024 20:11
…-ro-user

Allow 'State Admin Read Only' to view Camera + Refactor permissions related code to reduce duplication
…h-to-api-routes

Add trailing slashes to api routes to avoid 301 responses from care
…ber-drop-down

fix: Auto-close country codes dropdown when clicking outside the component
Fix: unusual behaviour when removing selected Options
Replace react-qr-reader with @yudiel/react-qr-scanner package
…lter

User Filters: Adds support for filtering by home facility
Rearranged facility home layout
…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 <[email protected]>
Co-authored-by: Mohammed Nihal <[email protected]>
Co-authored-by: Ashesh3 <[email protected]>
* Occupation dropdown frontend

* Update src/Components/Form/FormFields/Autocomplete.tsx

Co-authored-by: Rithvik Nishad <[email protected]>

* Update src/Components/Patient/PatientRegister.tsx

Co-authored-by: Rithvik Nishad <[email protected]>

* constants changed

* changed

* final fix ocupations

* fix cypress

* changed dropdown

---------

Co-authored-by: Rithvik Nishad <[email protected]>
Co-authored-by: Mohammed Nihal <[email protected]>
* add new notification

* Update src/Components/Facility/AddInventoryForm.tsx

Co-authored-by: Ashesh <[email protected]>

---------

Co-authored-by: Ashesh <[email protected]>
* fixing symptoms multiselect list

* symptoms list typing search

* Attempt cypress fix

* added cypress for type and multi select

* Cypress fixes

* Cypress-fixes

* Cypress fixing

* adding new test

* Cypress-fixes-again

* adding new test-1

* Single select behaviour fixed

* lint

---------

Co-authored-by: Mohammed Nihal <[email protected]>
* BedActivityTimeline component added

* In Use indicator added to BedActivityTimeLine

* fixed deepscan failure due to missing key prop

* UI revision | reduced IN USE size | created BedTitleSuffix component

* moved BedActivityTimeline one level up

* Timeline note accepts react node | Bed timeline ui changed

* improved logic for showing asset changes

* moved all input fields to one row

* changed in use badge color

* Introduced i button popover to BedActivityTimeline

* Added Asset diffing function

* minor css change

* added icons for adding and removing asset

* no assets linked text added

* moved input fields back to different lines

* changed in use bed timeline node icon to l-bed

* added missing key props to map objects

* added icon style customizability for Timeline Node

* fixed null value error

* icon color changed for first node

* added divider between form and timeline | moved button to right

* Refactor BedAllocationNode and BedTimelineAsset components

* fixed linting

* fixed linting

* minor fixes based on review

---------

Co-authored-by: rithviknishad <[email protected]>
* Add Sorting filter on Discharged Patients page

* refactor

* add filter badges for sorting filter

* reduce number of filter options

* fix filter badge

* refactor

* fix ui issues
@nihal467 nihal467 requested a review from a team as a code owner April 24, 2024 14:18
Copy link

vercel bot commented Apr 24, 2024

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

Name Status Preview Updated (UTC)
care-storybook ✅ Ready (Inspect) Visit Preview Apr 24, 2024 2:18pm

Copy link

netlify bot commented Apr 24, 2024

Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit 75743a8
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/662914aba36f1a0008c924aa
😎 Deploy Preview https://deploy-preview-7698--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.

@gigincg gigincg merged commit c74e61a into staging Apr 24, 2024
29 of 33 checks passed
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.