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

Production Release; Oct Week 4 #6480

Merged
merged 20 commits into from
Oct 22, 2023
Merged

Production Release; Oct Week 4 #6480

merged 20 commits into from
Oct 22, 2023

Conversation

mathew-alex
Copy link
Contributor

No description provided.

Omkar76 and others added 20 commits October 7, 2023 12:38
…page (#5347)

* fix(daily_round): added recommend_discharge as action

* fix: rebased the branch
* Middleware override feature in asset location

* Fix tooltip clipping

* Fix Flaky Cypress test in Facility Module  (#6384)

* fix random facility page failure

* fix random facility page failure

* Revert "Prescriptions: Shrink discontinued prescriptions + Flip MAR timeline + Freeze primary columns in horizontal scroll (#6282)" (#6386)

This reverts commit 5009a86.

* Refactor Asset Model Import Formatting (#6388)

* Refactor Asset Model Import Formatting

* fixes to warranty_amc_end_of_validity

* Fix asset import file for cypress

* Refactor: replaced Dispatch to useQuery/Request of src/Components/Auth/log… (#6333)

* Refactor: replaced useDispatch to useQuery of src/Components/Auth/login.tsx

* fix:useQuery changed to Request

* feat: replaced dispatch with request

* fix: types and added pathparams

* fix: request body error

* Update Login.tsx

* change:Tres to Tbody

* fixes: response type change

* Update package-lock.json

* fix hover height (#6352)

* Split routes of App Router (#6363)

* Prescription: show prescribed on & by and discontinued date in detail card (#6365)

* Fixed bug in location picker in update facility page (#6377)

* add all cases for map rendering

* implement location pointer on searched location

* Added cam auto reset in asset config page (#6375)

* 💊 Adds support for editing prescriptions +  Adds `useSlug` hook (#6369)

* Adds hook: `useSlug`

* bug fix: NumericWithUnits field not showing intial value

* Form: support for showing global errors

* Adds support for editing prescriptions (fixes #6340)

* Fix cypress

* fix cypress

* Improve design

---------

Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <mail@rithviknishad.dev>
Co-authored-by: Aaron Jevil Nazareth <93522968+jevil25@users.noreply.github.com>
Co-authored-by: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com>
Co-authored-by: Gampa Sri Harsh <114745442+sriharsh05@users.noreply.github.com>
Co-authored-by: Tasnimul H. Tauhid <thtauhid.71@gmail.com>
…/Components/ExternalResult/** ) (#6402)

* replaced dispatch with useQuery in ResultList

* replaced useDispatch with useQuery in listfilter

* replaced useDispatch with reqeust in ExternalResultUpload

* fixed filtering

* fix ResultList

* rm clg

* make code readable

* fix build

* removed useEffect and useState from ResultList.tsx

* Apply changes from code review

---------

Co-authored-by: rithviknishad <mail@rithviknishad.dev>
* added cypress test to verify warranty expiry label

* updated spec to check if the warranty expiry label goes off once updated

* verify the last change

---------

Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
* changed to request in HL7monitor.tsx

* replaced dispatch in assetTypes

* changed dispatch in filteer, import files

* changed all dispatch requests with useQuery and request in asset module

* added TBody to various endpoints

* fixed assetfilter page

* fixed asset import modal page

* made requested changes

* made requested changes

* reverted to assetBedModel

* fixed delete asset function

* fixed after delete redirection

* removed extra setstates

* updated failing cypress tests for asset module

* removed useEffects

* removed changes from cypress files

* fixed merge issues

* fixed transactions issue

* remove console logs

----------

Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
* Replaced useDispatch with useQuery and request.

* Removed all relevant no longer used actions from actions.tsx

* Replaced Res to Type

* Added TBody.

* used abha in place of JSON.parse(value).

* Fixed mobile otp issue

* Replaced Rdata with Rerror

* Fixed link care context

---------

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>
…of 15 mins) (#6466)

* fix JWT token refresh fallback interval

* remove jwt_token_refresh_interval from `config.json`
* fix(daily_round): aligned consciousness scale to mews

* fix(daily_round): removed optional description

* fix NeurologicalTables

* fix line break

---------

Co-authored-by: rithviknishad <mail@rithviknishad.dev>
* Username search cypress test

* import error
* fix session expiry detection

* Fix logout bug
* Added test for importing and configuring an asset

* Revert few changes

* nits

* Migrated to POM approach

* Migrated patient_crud to POM approach

* reverted some chnages

* FIx

* Merge conflicts

* Fixed test

* Added test for patient_test

* nits

* add responsiveness to virtual nursing assistant card (#6130)

* allow use stock as well (#6115)

* fixed responsive issue of 'Update Log' button in patient consultation page (#6113)

* fix multiple bed bug (#6111)

* Fixed typo in Date format in Asset management (#6105)

* Added padding to count block on patients page

* fixed date format in asset manage page

* show only items with no min value (#6103)

* check for id in response (#6100)

* Added Responsiveness to File upload (#6096)

* add responsiveness

* refactor

* remove overlap (#6094)

* fixed failing test

* Fix

* Fixed comments

* fix comments

* Fixed all comments

* Migrated test to new test suite

* Added upload file test

* fixed failing test

* Fix failing test

* Revert unwanted changes

* fixed conflict

* random failure fixed

* temporary fixed medicine selection

---------

Co-authored-by: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com>
Co-authored-by: Gokulram A <gokulram2010418@ssn.edu.in>
Co-authored-by: Kshitij Verma <101321276+kshitijv256@users.noreply.github.com>
Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
@mathew-alex mathew-alex requested a review from a team October 22, 2023 19:49
@mathew-alex mathew-alex requested a review from a team as a code owner October 22, 2023 19:49
@netlify
Copy link

netlify bot commented Oct 22, 2023

Deploy Preview for care-egov-staging ready!

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

@vercel
Copy link

vercel bot commented Oct 22, 2023

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

Name Status Preview Updated (UTC)
care-storybook ✅ Ready (Inspect) Visit Preview Oct 22, 2023 7:49pm

@cypress
Copy link

cypress bot commented Oct 22, 2023

Passing run #1460 ↗︎

0 85 0 0 Flakiness 0

Details:

Added test of patient_crud.cy.ts (#6135)
Project: CARE Commit: e452bb5e07
Status: Passed Duration: 03:25 💡
Started: Oct 24, 2023 10:38 PM Ended: Oct 24, 2023 10:41 PM

Review all test suite changes for PR #6480 ↗︎

@mathew-alex mathew-alex merged commit 26ad91b into master Oct 22, 2023
157 of 181 checks passed
@github-actions
Copy link

@mathew-alex We truly appreciate your efforts. Thank you for taking the time to contribute; this is a very valuable contribution to us 🥇. We always welcome your contribution 🙂, so feel free to contribute to anything anytime, and never lose that spirit of innovation 🙌.

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.