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.

Sign up for GitHub

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

Adds validation for max dosage in PRN prescription #8324 #8378

Merged
merged 6 commits into from
Sep 2, 2024
Merged

Adds validation for max dosage in PRN prescription #8324 #8378

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85b416a
Adds validation for max dosage in PRN prescription #8324
Nithin9585 Aug 20, 2024
c336e7e
Merge branch 'develop' into issues/8324/add-max-dosage-validation
nihal467 Aug 21, 2024
fac73c4
localization for error messages
Nithin9585 Aug 24, 2024
33551c9
Merge branch 'develop' into issues/8324/add-max-dosage-validation
rithviknishad Sep 2, 2024
a50f7b1
update i18n's
rithviknishad Sep 2, 2024
88b75ef
Merge branch 'develop' into issues/8324/add-max-dosage-validation
bodhish Sep 2, 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
38 changes: 29 additions & 9 deletions src/Components/Medicine/validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,51 @@ import { Prescription } from "./models";
export const PrescriptionFormValidator = () => {
return (form: Prescription): FormErrors<Prescription> => {
const errors: Partial<Record<keyof Prescription, FieldError>> = {};

errors.medicine_object = RequiredFieldValidator()(form.medicine_object);

if (form.dosage_type === "TITRATED") {
errors.base_dosage = RequiredFieldValidator()(form.base_dosage);
errors.target_dosage = RequiredFieldValidator()(form.target_dosage);

if (
form.base_dosage &&
form.target_dosage &&
form.base_dosage.split(" ")[1] !== form.target_dosage.split(" ")[1]
) {
errors.base_dosage = "Unit must be same as target dosage's unit";
errors.target_dosage = "Unit must be same as base dosage's unit";
errors.base_dosage = "Unit must be the same as target dosage's unit";
errors.target_dosage = "Unit must be the same as base dosage's unit";
Nithin9585 marked this conversation as resolved.
Show resolved Hide resolved
}
} else errors.base_dosage = RequiredFieldValidator()(form.base_dosage);
if (form.dosage_type === "PRN")
} else {
errors.base_dosage = RequiredFieldValidator()(form.base_dosage);
}

if (form.dosage_type === "PRN") {
errors.indicator = RequiredFieldValidator()(form.indicator);
if (form.dosage_type !== "PRN")

const baseDosageValue = getDosageValue(form.base_dosage);
const maxDosageValue = getDosageValue(form.max_dosage);

if (
baseDosageValue &&
maxDosageValue &&
baseDosageValue > maxDosageValue
) {
errors.max_dosage =
"Max dosage in 24 hours must be greater than or equal to base dosage";
}
} else {
errors.frequency = RequiredFieldValidator()(form.frequency);
}

return errors;
};
};

const getDosageValue = (dosage: string | undefined) => {
return dosage ? Number(dosage.split(" ")[0]) : undefined;
};

export const EditPrescriptionFormValidator = (old: Prescription) => {
return (form: Prescription): FormErrors<Prescription> => {
const errors = PrescriptionFormValidator()(form);
Expand Down Expand Up @@ -66,10 +90,6 @@ export const AdministrationDosageValidator = (
target_dosage: Prescription["target_dosage"],
) => {
return (value: Prescription["base_dosage"]) => {
const getDosageValue = (dosage: string | undefined) => {
return dosage ? Number(dosage.split(" ")[0]) : undefined;
};

const valueDosage = getDosageValue(value);
const baseDosage = getDosageValue(base_dosage);
const targetDosage = getDosageValue(target_dosage);
Expand Down
Loading