Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

fix(medication): set correct quantity and value for new medications #2554

Merged
merged 68 commits into from
Nov 25, 2021
Merged

fix(medication): set correct quantity and value for new medications #2554

merged 68 commits into from
Nov 25, 2021

Conversation

chadian
Copy link
Contributor

@chadian chadian commented Jan 26, 2021 •
edited
Loading

Fixes #2492.

Fixes setting the quantity and value properties on the medication model via the form NewMedicationRequest.

Changes proposed in this pull request:

  • Fix the way quantity and value is set on a new medication model from the form

@vercel
Copy link

vercel bot commented Jan 26, 2021 •
edited
Loading

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/hospitalrun/hospitalrun-frontend/7c4YFBXAQTwUWfHThAiwU6yZYBwK
✅ Preview: https://hospitalrun-frontend-git-fork-chadian-chadia-9915b9-hospitalrun.vercel.app

@chadian chadian mentioned this pull request Jan 26, 2021
Closed
@chadian chadian changed the title Fix quantity and value for new medictations fix(medication): set correct quantity and value for new medications Jan 26, 2021
blestab
blestab suggested changes Jan 26, 2021
View reviewed changes
Copy link
Contributor

@blestab blestab left a comment

Choose a reason for hiding this comment

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

Code changes LGTM as they appear to resolve the issue. May you fix the lint errors in src/medications/requests/NewMedicationRequest.tsx andwe should be all set.

@chadian
Copy link
Contributor Author

chadian commented Jan 26, 2021

@blestab All set! I had to fix the extends for the eslint rules for eslint-config-prettier to work in disabling conflicting rules (in this case jsx-curly-newline)

@chadian chadian requested a review from blestab January 26, 2021 16:43
fix: fix conflicting jsx-curly-newline and prettier/react
6371239 
These rules conflict and eslint-config-prettier is set to disable
conflicting prettier rules if extends includes the plugins.

https://github.com/prettier/eslint-config-prettier#installation
> If you extend a config which uses a plugin, it is recommended to
> add "prettier/that-plugin" (if available).
blestab
blestab previously approved these changes Jan 26, 2021
View reviewed changes
Copy link
Contributor

@blestab blestab left a comment

Choose a reason for hiding this comment

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

LGTM

@blestab blestab added medication issue/pull request that interacts with medication module 🐛bug issue/pull request that documents/fixes a bug labels Jan 27, 2021
@blestab blestab added this to In progress in Version 2.0 via automation Jan 27, 2021
@blestab blestab added this to the v2.0 milestone Jan 27, 2021
jackcmeyer
jackcmeyer suggested changes Jan 30, 2021
View reviewed changes
Copy link
Member

@jackcmeyer jackcmeyer left a comment

Choose a reason for hiding this comment

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

I would have expected a test to be modified/added to show that this is working

@CLAassistant
Copy link

CLAassistant commented Jan 30, 2021 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@HospitalRun HospitalRun deleted a comment from CLAassistant Jan 30, 2021
@matteovivona matteovivona merged commit f72c93f into HospitalRun:master Nov 25, 2021
Version 2.0 automation moved this from In progress to Done Nov 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@blestab blestab blestab left review comments

@matteovivona matteovivona Awaiting requested review from matteovivona

@jackcmeyer jackcmeyer Awaiting requested review from jackcmeyer

@jameszheng405 jameszheng405 Awaiting requested review from jameszheng405 jameszheng405 was automatically assigned from HospitalRun/core-contributors

@cynthiachen7 cynthiachen7 Awaiting requested review from cynthiachen7 cynthiachen7 was automatically assigned from HospitalRun/core-contributors

Assignees
No one assigned
Labels
🐛bug issue/pull request that documents/fixes a bug in progress indicates that issue/pull request is currently being worked on medication issue/pull request that interacts with medication module
Projects
Version 2.0
  
Done
Milestone
v2.0
Development

Successfully merging this pull request may close these issues.

Medication: New medication request quantity amount and unit not creating correctly
5 participants
@chadian @CLAassistant @matteovivona @blestab @jackcmeyer