From 0f32248f5b352d5cff49b3f343bc641867f200c4 Mon Sep 17 00:00:00 2001 From: Hritesh Shanty Date: Tue, 18 Jun 2024 13:01:53 +0530 Subject: [PATCH 1/4] vaccination details frontend --- src/Components/Patient/PatientHome.tsx | 25 +++ src/Components/Patient/PatientRegister.tsx | 170 +++++++----------- .../Patient/PatientVaccinationDetails.tsx | 35 ++++ src/Components/Patient/models.tsx | 13 ++ .../AddVaccinationDetails.tsx | 106 +++++++++++ .../VaccinationDetailsBuilder.tsx | 51 ++++++ .../VaccinationDetailsEntry.tsx | 24 +++ .../VaccinationDetailsView.tsx | 55 ++++++ src/Redux/api.tsx | 8 + 9 files changed, 382 insertions(+), 105 deletions(-) create mode 100644 src/Components/Patient/PatientVaccinationDetails.tsx create mode 100644 src/Components/VaccinationDetails/AddVaccinationDetails.tsx create mode 100644 src/Components/VaccinationDetails/VaccinationDetailsBuilder.tsx create mode 100644 src/Components/VaccinationDetails/VaccinationDetailsEntry.tsx create mode 100644 src/Components/VaccinationDetails/VaccinationDetailsView.tsx diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx index e92d043dff4..dd8be5cded9 100644 --- a/src/Components/Patient/PatientHome.tsx +++ b/src/Components/Patient/PatientHome.tsx @@ -39,6 +39,8 @@ import routes from "../../Redux/api"; import { InsuranceDetialsCard } from "./InsuranceDetailsCard"; import request from "../../Utils/request/request"; import PaginatedList from "../../CAREUI/misc/PaginatedList"; +import AccordionV2 from "../Common/components/AccordionV2"; +import PatientVaccinationDetails from "./PatientVaccinationDetails"; const Loading = lazy(() => import("../Common/Loading")); @@ -130,6 +132,7 @@ export const PatientHome = (props: any) => { if (res?.ok && data) { setPatientData(data); } + console.log(data); triggerGoal("Patient Profile Viewed", { facilityId: facilityId, userId: authUser.id, @@ -706,6 +709,28 @@ export const PatientHome = (props: any) => { + +
+ } + title={ +
+ Vaccination Details +
+ } + > + {patientData.vaccination_details?.length ? ( + + ) : ( +
+ No Vaccination Details! +
+ )} + +
+
import("../Common/Loading")); const PageTitle = lazy(() => import("../Common/PageTitle")); @@ -91,7 +91,6 @@ const medicalHistoryChoices = MEDICAL_HISTORY_CHOICES.reduce( const genderTypes = GENDER_TYPES; const bloodGroups = [...BLOOD_GROUPS]; const occupationTypes = OCCUPATION_TYPES; -const vaccines = [...VACCINES]; const initForm: any = { name: "", @@ -130,6 +129,7 @@ const initForm: any = { number_of_doses: "0", vaccine_name: null, last_vaccinated_date: null, + create_vaccination_details: [], abha_number: null, ...medicalHistoryChoices, ration_card_category: null, @@ -217,7 +217,8 @@ export const PatientRegister = (props: PatientRegisterProps) => { useState(false); const [insuranceDetailsError, setInsuranceDetailsError] = useState(); - + const [vaccinesList, setVaccinesList] = useState([]); + const [isVaccineLoading, setIsVaccineLoading] = useState(false); useEffect(() => { if (extId && formField) { setCareExtId(extId); @@ -228,6 +229,19 @@ export const PatientRegister = (props: PatientRegisterProps) => { const headerText = !id ? "Add Details of Patient" : "Update Patient Details"; const buttonText = !id ? "Add Patient" : "Save Details"; + const fetchAllVaccines = useCallback(async () => { + setIsVaccineLoading(true); + const { res, data } = await request(routes.getVaccines); + if (res?.ok && data?.results) { + setVaccinesList(data.results); + } + setIsVaccineLoading(false); + console.log(data?.results); + return data?.results || []; + }, []); + useEffect(() => { + fetchAllVaccines(); + }, []); const fetchDistricts = useCallback(async (id: number) => { if (id > 0) { setIsDistrictLoading(true); @@ -415,6 +429,14 @@ export const PatientRegister = (props: PatientRegisterProps) => { occupation: data.meta_info?.occupation ? parseOccupationFromExt(data.meta_info.occupation) : null, + create_vaccination_details: data.vaccination_details?.map( + (detail) => { + return { + ...detail, + vaccine_name: detail.vaccine_name.name, + }; + }, + ), is_vaccinated: String(data.is_vaccinated), number_of_doses: data.number_of_doses ? String(data.number_of_doses) @@ -599,22 +621,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { errors[field] = "Please select a blood group"; } return; - case "is_vaccinated": - if (form.is_vaccinated === "true") { - if (form.number_of_doses === "0") { - errors["number_of_doses"] = - "Please fill the number of doses taken"; - } - if (form.vaccine_name === null || form.vaccine_name === "Select") { - errors["vaccine_name"] = "Please select vaccine name"; - } - if (!form.last_vaccinated_date) { - errors["last_vaccinated_date"] = - "Please enter last vaccinated date"; - } - } - return; case "medical_history": if (!form[field].length) { errors[field] = "Please fill the medical history"; @@ -709,6 +716,20 @@ export const PatientRegister = (props: PatientRegisterProps) => { ? formData.last_vaccinated_date : null : null, + create_vaccination_details: + formData.is_vaccinated === "true" + ? formData.create_vaccination_details.map((detail: any) => { + const dose_number = Number(detail.number_of_doses); + delete detail.number_of_doses; + return { + ...detail, + dose_number: dose_number, + last_vaccinated_date: dateQueryString( + detail.last_vaccinated_date, + ), + }; + }) + : [], name: _.startCase(_.toLower(formData.name)), pincode: formData.pincode ? formData.pincode : undefined, gender: Number(formData.gender), @@ -756,6 +777,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { is_active: true, ration_card_category: formData.ration_card_category, }; + console.log(data); const { res, data: requestData } = id ? await request(routes.updatePatient, { pathParams: { id }, @@ -1738,7 +1760,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { } title={

- COVID Details + Complete Vaccination Details

} > @@ -1746,7 +1768,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
{ />
-
+
{ -
-
- -
-
- option.label} - optionValue={(option) => option.value} - /> -
-
- o} - optionValue={(o) => o} - /> -
-
- -
+
+ { + field( + "create_vaccination_details", + ).onChange({ + name: "create_vaccination_details", + value: details, + }); + }} + />
}
-
-
- option.label} - optionValue={(option) => option.value} - /> - -
- -
- -
-
- -
-
-
+

Medical History

diff --git a/src/Components/Patient/PatientVaccinationDetails.tsx b/src/Components/Patient/PatientVaccinationDetails.tsx new file mode 100644 index 00000000000..f2b406dba50 --- /dev/null +++ b/src/Components/Patient/PatientVaccinationDetails.tsx @@ -0,0 +1,35 @@ +const PatientVaccinationDetails = (props: any) => { + return ( +
+ + + + + + + + + + + {props.vaccineData?.map((detail: any) => ( + + + + + + + ))} + +
Vaccine Name + Vaccination Date + + Number of Doses + + Vaccination Center +
{detail.vaccine_name.name} + {detail.last_vaccinated_date} + {detail.number_of_doses}{detail.vaccination_center}
+
+ ); +}; +export default PatientVaccinationDetails; diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx index 1a79411ebd5..0a8c26df63b 100644 --- a/src/Components/Patient/models.tsx +++ b/src/Components/Patient/models.tsx @@ -49,7 +49,19 @@ export interface AbhaObject { profile_photo: string; } +export interface VaccinesData { + external_id: string; + name: string; +} + export interface PatientModel { + vaccination_details?: { + vaccine_name: { id: string; name: string }; + vaccination_center: string; + last_vaccinated_date: string; + dose_number: string; + batch_number: string; + }[]; id?: string; action?: number; name?: string; @@ -105,6 +117,7 @@ export interface PatientModel { ration_card_category?: (typeof RATION_CARD_CATEGORY)[number] | null; date_of_test?: string; date_of_result?: string; // keeping this to avoid errors in Death report + create_vaccination_details?: any[]; covin_id?: string; is_vaccinated?: boolean; vaccine_name?: string; diff --git a/src/Components/VaccinationDetails/AddVaccinationDetails.tsx b/src/Components/VaccinationDetails/AddVaccinationDetails.tsx new file mode 100644 index 00000000000..0bb18543e64 --- /dev/null +++ b/src/Components/VaccinationDetails/AddVaccinationDetails.tsx @@ -0,0 +1,106 @@ +import { useState } from "react"; +import TextFormField from "../Form/FormFields/TextFormField"; +import DateFormField from "../Form/FormFields/DateFormField"; +import ButtonV2 from "../Common/components/ButtonV2"; +import AutocompleteFormField from "../Form/FormFields/Autocomplete"; +import Spinner from "../Common/Spinner"; + +const initForm: any = { + vaccination_center: "", + number_of_doses: "", + vaccine_name: "", + batch_number: "", + last_vaccinated_date: "", +}; +export const AddVaccinationDetails = (props: any) => { + const [state, setState] = useState({ ...initForm }); + const handleFormFieldChange = (e: any) => { + setState((prev: any) => { + return { + ...prev, + [e.name]: e.value, + }; + }); + }; + const hasError = props.disallowed.includes(state.vaccine_name); + return ( +
+
+
+ +
+ +
+ +
+
+ {props.vaccinesLoading ? ( + + ) : ( + o.name} + optionValue={(o) => o.name} + error={hasError ? "This vaccine was already added" : undefined} + /> + )} +
+ +
+ +
+ +
+ +
+
+
+ { + return acc || val === ""; + }, false) as boolean) || hasError + } + variant="alert" + onClick={(e) => { + e.preventDefault(); + props.onAdd(state); + setState({ ...initForm }); + }} + > + + Add Vaccination Details + +
+
+ ); +}; diff --git a/src/Components/VaccinationDetails/VaccinationDetailsBuilder.tsx b/src/Components/VaccinationDetails/VaccinationDetailsBuilder.tsx new file mode 100644 index 00000000000..8363af7dc1e --- /dev/null +++ b/src/Components/VaccinationDetails/VaccinationDetailsBuilder.tsx @@ -0,0 +1,51 @@ +import CareIcon from "../../CAREUI/icons/CareIcon"; +import { AddVaccinationDetails } from "./AddVaccinationDetails"; +import { VaccinationDetailsEntry } from "./VaccinationDetailsEntry"; + +export const VaccinationDetailsBuilder = (props: any) => { + return ( +
+ {props.value.length !== 0 && ( +
+ {props.value.map((detail: any, idx: any) => ( +
+ { + props.onChange( + props.value.filter((_: any, index: any) => { + return index !== idx; + }), + ); + }} + /> + +
+ ))} +
+ )} +
+ {props.value.length === 0 && ( +
+ Atleast One Vaccination Details Entry must be added +
+ )} +
+ +
+ obj.vaccine_name)} + onAdd={(details: any) => { + props.onChange([...props.value, details]); + }} + /> +
+
+ ); +}; diff --git a/src/Components/VaccinationDetails/VaccinationDetailsEntry.tsx b/src/Components/VaccinationDetails/VaccinationDetailsEntry.tsx new file mode 100644 index 00000000000..e54765d48a6 --- /dev/null +++ b/src/Components/VaccinationDetails/VaccinationDetailsEntry.tsx @@ -0,0 +1,24 @@ +import AccordionV2 from "../Common/components/AccordionV2"; +import { VaccinationDetailsView } from "./VaccinationDetailsView"; + +export const VaccinationDetailsEntry = (props: any) => { + return ( +
+ +
+ {props.detailsObj.vaccine_name} Details +
+
+ } + > + + +
+ ); +}; diff --git a/src/Components/VaccinationDetails/VaccinationDetailsView.tsx b/src/Components/VaccinationDetails/VaccinationDetailsView.tsx new file mode 100644 index 00000000000..e1f09bb5253 --- /dev/null +++ b/src/Components/VaccinationDetails/VaccinationDetailsView.tsx @@ -0,0 +1,55 @@ +import { formatDate } from "../../Utils/utils"; + +export const VaccinationDetailsView = (props: any) => { + return ( +
+
+
+ Vaccination Center +
+ {props.detailsObj.vaccination_center} +
+
+
+ Number of Doses +
+ {props.detailsObj.number_of_doses} +
+
+
+ Vaccine Name +
+ {props.detailsObj.vaccine_name} +
+
+
+ Batch Number +
+ {props.detailsObj.batch_number} +
+
+
+ Last Date of Vaccination +
+
+ {formatDate(props.detailsObj.last_vaccinated_date)} +
+
+
+ ); +}; diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx index 58147f68943..2d283bcab5b 100644 --- a/src/Redux/api.tsx +++ b/src/Redux/api.tsx @@ -86,6 +86,7 @@ import { PatientModel, SampleReportModel, SampleTestModel, + VaccinesData, } from "../Components/Patient/models"; import { SkillModel, @@ -1227,6 +1228,13 @@ const routes = { TBody: Type>(), }, + // Vaccination endpoints + getVaccines: { + path: "/api/v1/vaccine/names", + method: "GET", + TRes: Type>(), + }, + // Assets endpoints listAssets: { From aa4d838931316ecfca6f77469dc58d57651313b6 Mon Sep 17 00:00:00 2001 From: Hritesh Shanty Date: Thu, 27 Jun 2024 10:43:00 +0530 Subject: [PATCH 2/4] vaccination details frontend updated --- src/Components/Patient/PatientRegister.tsx | 18 +- src/Components/Patient/models.tsx | 10 +- .../AddVaccinationDetails.tsx | 185 +++++++++--------- .../VaccinationDetailsBuilder.tsx | 79 ++++++-- .../VaccinationDetailsEntry.tsx | 2 +- .../VaccinationDetailsView.tsx | 14 +- vite.config.mts | 2 +- 7 files changed, 176 insertions(+), 134 deletions(-) diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx index 191c2734d8e..f7170243a2c 100644 --- a/src/Components/Patient/PatientRegister.tsx +++ b/src/Components/Patient/PatientRegister.tsx @@ -217,8 +217,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { useState(false); const [insuranceDetailsError, setInsuranceDetailsError] = useState(); - const [vaccinesList, setVaccinesList] = useState([]); - const [isVaccineLoading, setIsVaccineLoading] = useState(false); + useEffect(() => { if (extId && formField) { setCareExtId(extId); @@ -229,19 +228,6 @@ export const PatientRegister = (props: PatientRegisterProps) => { const headerText = !id ? "Add Details of Patient" : "Update Patient Details"; const buttonText = !id ? "Add Patient" : "Save Details"; - const fetchAllVaccines = useCallback(async () => { - setIsVaccineLoading(true); - const { res, data } = await request(routes.getVaccines); - if (res?.ok && data?.results) { - setVaccinesList(data.results); - } - setIsVaccineLoading(false); - console.log(data?.results); - return data?.results || []; - }, []); - useEffect(() => { - fetchAllVaccines(); - }, []); const fetchDistricts = useCallback(async (id: number) => { if (id > 0) { setIsDistrictLoading(true); @@ -1794,8 +1780,6 @@ export const PatientRegister = (props: PatientRegisterProps) => { className=" mb-4" > { - const [state, setState] = useState({ ...initForm }); - const handleFormFieldChange = (e: any) => { - setState((prev: any) => { - return { - ...prev, - [e.name]: e.value, - }; +type Props = FormFieldBaseProps; +export const AddVaccinationDetails = (props: Props) => { + const field = useFormFieldPropsResolver(props); + const { data: vaccines, loading: isVaccinesLoading } = useQuery( + routes.getVaccines, + ); + const handleVaccineDetailChange = (event: FieldChangeEvent) => { + const fieldName: string = event.name; + const fieldValue: any = event.value; + field.handleChange({ + ...props.value, + [fieldName]: fieldValue, }); }; - const hasError = props.disallowed.includes(state.vaccine_name); + return ( -
-
-
- -
+ + + + ); +}; -
- -
-
- {props.vaccinesLoading ? ( - - ) : ( - o.name} - optionValue={(o) => o.name} - error={hasError ? "This vaccine was already added" : undefined} - /> - )} -
+const VaccinationDetailsFormCard = ({ + vaccineDetails, + vaccineDetailChange, + fetchedVaccines, + fetchedVaccinesLoading, +}: { + vaccineDetails?: VaccineRegistrationModel; + vaccineDetailChange: (event: FieldChangeEvent) => void; + fetchedVaccines: VaccinesData[]; + fetchedVaccinesLoading?: boolean; +}) => { + return ( +
+
+ +
-
- + +
+
+ {fetchedVaccinesLoading ? ( + + ) : ( + o.name} + optionValue={(o) => o.name} /> -
+ )} +
-
- -
+
+
-
- { - return acc || val === ""; - }, false) as boolean) || hasError - } - variant="alert" - onClick={(e) => { - e.preventDefault(); - props.onAdd(state); - setState({ ...initForm }); - }} - > - + Add Vaccination Details - + +
+
); diff --git a/src/Components/VaccinationDetails/VaccinationDetailsBuilder.tsx b/src/Components/VaccinationDetails/VaccinationDetailsBuilder.tsx index 8363af7dc1e..5355a23825d 100644 --- a/src/Components/VaccinationDetails/VaccinationDetailsBuilder.tsx +++ b/src/Components/VaccinationDetails/VaccinationDetailsBuilder.tsx @@ -1,25 +1,50 @@ +import { useState } from "react"; import CareIcon from "../../CAREUI/icons/CareIcon"; import { AddVaccinationDetails } from "./AddVaccinationDetails"; import { VaccinationDetailsEntry } from "./VaccinationDetailsEntry"; +import { VaccineRegistrationModel } from "../Patient/models"; +import ButtonV2 from "../Common/components/ButtonV2"; +const initialState: VaccineRegistrationModel = { + vaccination_center: "", + number_of_doses: "", + vaccine_name: "", + batch_number: "", + last_vaccinated_date: "", +}; export const VaccinationDetailsBuilder = (props: any) => { + const [vaccineDetailState, setVaccineDetailState] = + useState(initialState); + const [vaccineFormError, setVaccineFormError] = useState(""); + + const validateVaccineDetails = (detail: any) => { + const vaccine_names = props.value.map((val: any) => val.vaccine_name); + if (vaccine_names.includes(detail.vaccine_name)) { + setVaccineFormError("This Vaccine is already selected"); + return false; + } + return true; + }; + return (
{props.value.length !== 0 && (
{props.value.map((detail: any, idx: any) => (
- { - props.onChange( - props.value.filter((_: any, index: any) => { - return index !== idx; - }), - ); - }} - /> +
+ { + props.onChange( + props.value.filter((_: any, index: any) => { + return index !== idx; + }), + ); + }} + /> +
{ )}
-
+
obj.vaccine_name)} - onAdd={(details: any) => { - props.onChange([...props.value, details]); - }} + name="vaccine_Form" + value={vaccineDetailState} + error={vaccineFormError} + onChange={({ value }: any) => setVaccineDetailState(value)} /> +
+ { + return acc || val === ""; + }, false) as boolean) && vaccineFormError == "" + } + onClick={(e) => { + e.preventDefault(); + if (!validateVaccineDetails(vaccineDetailState)) return; + props.onChange([...props.value, { ...vaccineDetailState }]); + setVaccineDetailState({ ...initialState }); + setVaccineFormError(""); + }} + > + + Add Vaccination Details + +
); diff --git a/src/Components/VaccinationDetails/VaccinationDetailsEntry.tsx b/src/Components/VaccinationDetails/VaccinationDetailsEntry.tsx index e54765d48a6..80bd8a3eb0d 100644 --- a/src/Components/VaccinationDetails/VaccinationDetailsEntry.tsx +++ b/src/Components/VaccinationDetails/VaccinationDetailsEntry.tsx @@ -3,7 +3,7 @@ import { VaccinationDetailsView } from "./VaccinationDetailsView"; export const VaccinationDetailsEntry = (props: any) => { return ( -
+
diff --git a/src/Components/VaccinationDetails/VaccinationDetailsView.tsx b/src/Components/VaccinationDetails/VaccinationDetailsView.tsx index e1f09bb5253..66b48d4d02f 100644 --- a/src/Components/VaccinationDetails/VaccinationDetailsView.tsx +++ b/src/Components/VaccinationDetails/VaccinationDetailsView.tsx @@ -2,7 +2,7 @@ import { formatDate } from "../../Utils/utils"; export const VaccinationDetailsView = (props: any) => { return ( -
+
Vaccination Center @@ -42,12 +42,12 @@ export const VaccinationDetailsView = (props: any) => {
Last Date of Vaccination -
-
- {formatDate(props.detailsObj.last_vaccinated_date)} +
+ {formatDate(props.detailsObj.last_vaccinated_date)} +
diff --git a/vite.config.mts b/vite.config.mts index 5a8dcbae044..e9eba0610fd 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -83,7 +83,7 @@ export default { port: 4000, proxy: { "/api": { - target: process.env.CARE_API ?? "https://careapi.ohc.network", + target: process.env.CARE_API ?? "http://localhost:9000/", changeOrigin: true, }, }, From 45ed7621e6232db72cf8f1691c875a67fdd860e5 Mon Sep 17 00:00:00 2001 From: Hritesh Shanty Date: Thu, 27 Jun 2024 12:41:39 +0530 Subject: [PATCH 3/4] added internationalization and removed console logs --- src/Components/Patient/PatientHome.tsx | 3 +-- src/Components/Patient/PatientRegister.tsx | 3 +-- src/Components/Patient/PatientVaccinationDetails.tsx | 4 +++- src/Components/Patient/models.tsx | 2 +- src/Locale/en/Common.json | 4 +++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx index 907e9c7703e..85404086e55 100644 --- a/src/Components/Patient/PatientHome.tsx +++ b/src/Components/Patient/PatientHome.tsx @@ -132,7 +132,6 @@ export const PatientHome = (props: any) => { if (res?.ok && data) { setPatientData(data); } - console.log(data); triggerGoal("Patient Profile Viewed", { facilityId: facilityId, userId: authUser.id, @@ -715,7 +714,7 @@ export const PatientHome = (props: any) => { expandIcon={} title={
- Vaccination Details + {t("vaccination_details")}
} > diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx index f7170243a2c..d2d28f6ea28 100644 --- a/src/Components/Patient/PatientRegister.tsx +++ b/src/Components/Patient/PatientRegister.tsx @@ -763,7 +763,6 @@ export const PatientRegister = (props: PatientRegisterProps) => { is_active: true, ration_card_category: formData.ration_card_category, }; - console.log(data); const { res, data: requestData } = id ? await request(routes.updatePatient, { pathParams: { id }, @@ -1746,7 +1745,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { } title={

- Complete Vaccination Details + {t("complete_vaccination_details")}

} > diff --git a/src/Components/Patient/PatientVaccinationDetails.tsx b/src/Components/Patient/PatientVaccinationDetails.tsx index f2b406dba50..356c1506590 100644 --- a/src/Components/Patient/PatientVaccinationDetails.tsx +++ b/src/Components/Patient/PatientVaccinationDetails.tsx @@ -1,3 +1,5 @@ +import { VaccineRegistrationModel } from "./models"; + const PatientVaccinationDetails = (props: any) => { return (
@@ -17,7 +19,7 @@ const PatientVaccinationDetails = (props: any) => { - {props.vaccineData?.map((detail: any) => ( + {props.vaccineData?.map((detail: VaccineRegistrationModel) => ( {detail.vaccine_name.name} diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx index d8b5ec6c58a..c9de4b905a6 100644 --- a/src/Components/Patient/models.tsx +++ b/src/Components/Patient/models.tsx @@ -55,7 +55,7 @@ export interface VaccinesData { } export interface VaccineRegistrationModel { - vaccine_name?: string; + vaccine_name?: any; vaccination_center?: string; last_vaccinated_date?: any; number_of_doses?: string; diff --git a/src/Locale/en/Common.json b/src/Locale/en/Common.json index 019a51232ba..3b6cb163e4d 100644 --- a/src/Locale/en/Common.json +++ b/src/Locale/en/Common.json @@ -166,5 +166,7 @@ "treating_doctor": "Treating Doctor", "ration_card__NO_CARD": "Non-card holder", "ration_card__BPL": "BPL", - "ration_card__APL": "APL" + "ration_card__APL": "APL", + "complete_vaccination_details": "Complete Vaccination Details", + "vaccination_details": "Vaccination Details" } \ No newline at end of file From ae5f4f36f409a98c5c0fa9a6146ecca0ca820bf2 Mon Sep 17 00:00:00 2001 From: Hritesh Shanty Date: Thu, 27 Jun 2024 12:44:53 +0530 Subject: [PATCH 4/4] changed back --- vite.config.mts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.mts b/vite.config.mts index e9eba0610fd..5a8dcbae044 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -83,7 +83,7 @@ export default { port: 4000, proxy: { "/api": { - target: process.env.CARE_API ?? "http://localhost:9000/", + target: process.env.CARE_API ?? "https://careapi.ohc.network", changeOrigin: true, }, },