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

Prescription: Titrated drug dose #1692

Merged
merged 31 commits into from
Mar 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8ac9459
adds titrated prescription
GokulramGHV Oct 30, 2023
6ba692d
fix linting
GokulramGHV Oct 30, 2023
ad069bc
optimize prn copy query in migration
GokulramGHV Oct 30, 2023
608ffaa
fix reverse migration
GokulramGHV Oct 30, 2023
eb1fd59
added tests and implemented suggested changes
GokulramGHV Nov 5, 2023
22a8baa
Merge branch 'master' into fix-issue-6432
GokulramGHV Nov 5, 2023
16e8115
fix lint errors
GokulramGHV Nov 6, 2023
6071f17
Add titration dosage information to patient
GokulramGHV Nov 8, 2023
1c9977a
Refactor prescription serializer validation
GokulramGHV Nov 12, 2023
47b1661
Merge branch 'master' into fix-issue-6432
GokulramGHV Nov 13, 2023
158fd0a
Merge two facility migrations
GokulramGHV Nov 13, 2023
f688f48
Fix validation for titrated prescriptions in
GokulramGHV Nov 16, 2023
76e9270
recreated migrations
GokulramGHV Nov 16, 2023
a39e484
Merge branch 'master' into fix-issue-6432
GokulramGHV Nov 16, 2023
f4c7a84
Refactor prescription serializers and models
GokulramGHV Dec 7, 2023
9e52b82
Merge branch 'master' into fix-issue-6432
GokulramGHV Dec 9, 2023
1ea6cfb
fix migrations
GokulramGHV Dec 9, 2023
cdc65b6
Merge branch 'master' into fix-issue-6432
GokulramGHV Dec 14, 2023
b045add
update tests and redo migration
GokulramGHV Dec 14, 2023
cd2749c
Merge branch 'master' into fix-issue-6432
GokulramGHV Dec 20, 2023
37d2bc2
fix: imports that are incorrectly sorted and/or formatted
GokulramGHV Dec 20, 2023
03d53e2
Merge branch 'master' into fix-issue-6432
GokulramGHV Dec 24, 2023
ee29de2
rebase migrations
GokulramGHV Dec 24, 2023
9a48f8e
Merge branch 'master' into fix-issue-6432
Ashesh3 Dec 26, 2023
e980da4
Rename dosage field to base_dosage and add dosage_type field in dummy…
GokulramGHV Dec 26, 2023
faf7ce7
Merge branch 'master' into fix-issue-6432
sainak Jan 22, 2024
687efd7
Merge remote-tracking branch 'origin/master' into fix-issue-6432
sainak Feb 10, 2024
f5d36ae
update migrations
sainak Feb 10, 2024
42aeb66
Merge branch 'master' into fix-issue-6432
rithviknishad Feb 20, 2024
533ec90
Rebase migrations and adds missing custom migration for setting dosag…
rithviknishad Feb 26, 2024
d7f6824
Merge branch 'master' into fix-issue-6432
sainak Mar 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix validation for titrated prescriptions in
MedicineAdministrationSerializer
  • Loading branch information
GokulramGHV committed Nov 16, 2023
commit f688f481b910299bc80e801f875c93cc80c5e60d
2 changes: 1 addition & 1 deletion care/facility/api/serializers/prescription.py
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ def validate(self, attrs):
raise serializers.ValidationError(
{"dosage": "Dosage is required for titrated prescriptions."}
)
else:
elif self.context["prescription"].dosage_type != "TITRATED":
attrs.pop("dosage", None)

return super().validate(attrs)
Loading