diff --git a/.circleci/config.yml b/.circleci/config.yml index cd7143319d2..c757d7c2acc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2.1 orbs: - aws-ecr: circleci/aws-ecr@6.15.3 - aws-eks: circleci/aws-eks@0.2.6 + aws-ecr: circleci/aws-ecr@7.3.0 + aws-eks: circleci/aws-eks@1.2.0 workflows: deploy-to-staging: diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx index 1cc9f6a1c85..2661417bd3d 100644 --- a/src/Common/constants.tsx +++ b/src/Common/constants.tsx @@ -37,9 +37,9 @@ export const DOWNLOAD_TYPES: Array = [ ]; export const TEST_TYPE_CHOICES: Array = [ + { id: 30, text: "RTPCR" }, { id: 10, text: "UNK" }, { id: 20, text: "ANTIGEN" }, - { id: 30, text: "RTPCR" }, { id: 40, text: "CBNAAT" }, { id: 50, text: "TRUENAT" }, ]; @@ -138,24 +138,38 @@ export const PATIENT_FILTER_ORDER: Array = [ ]; export const BED_TYPES: Array = [ - { id: 1, text: "Non-Covid Ordinary Beds" }, - { id: 150, text: "Non-Covid Oxygen beds" }, - { id: 10, text: "Non-Covid ICU (ICU without ventilator)" }, - { id: 20, text: "Non-Covid Ventilator (ICU with ventilator)" }, - { id: 30, text: "Covid Ordinary Beds" }, - { id: 120, text: "Covid Oxygen beds" }, - { id: 110, text: "Covid ICU (ICU without ventilator)" }, - { id: 100, text: "Covid Ventilators (ICU with ventilator)" }, - { id: 40, text: KASP_STRING + " Ordinary Beds" }, - { id: 60, text: KASP_STRING + " Oxygen beds" }, - { id: 50, text: KASP_STRING + " ICU (ICU without ventilator)" }, - { id: 70, text: KASP_STRING + " ICU (ICU with ventilator)" }, - { id: 2, text: "Hostel" }, - { id: 3, text: "Single Room with Attached Bathroom" }, - { id: 111, text: "Pediatric Covid Ordinary Beds" }, - { id: 112, text: "Pediatric Covid Oxygen beds" }, - { id: 113, text: "Pediatric Covid ICU (ICU without ventilator)" }, - { id: 114, text: "Pediatric Covid Ventilators (ICU with ventilator)" }, + { id: 30, text: "Adult covid Non O2 Beds" }, + { id: 120, text: "Adult covid O2 bed" }, + { id: 110, text: "Adult covid ICU Without ventilator" }, + { id: 100, text: "Adult covid ICU With ventilator" }, + { id: 111, text: "Pediatric covid Non O2 Beds" }, + { id: 112, text: "Pediatric covid O2 beds" }, + { id: 113, text: "Pediatric covid ICU without ventilator" }, + { id: 114, text: "Pediatric covid ICU ventilator" }, + { id: 40, text: "Adult " + KASP_STRING + " Non O2 Beds" }, + { id: 60, text: "Adult " + KASP_STRING + " O2 beds" }, + { id: 50, text: "Adult " + KASP_STRING + " ICU Without ventilator" }, + { id: 70, text: "Adult " + KASP_STRING + " ICU With ventilator" }, + { id: 45, text: "Pediatric " + KASP_STRING + " Non O2 Beds" }, + { id: 65, text: "Pediatric " + KASP_STRING + " O2 beds" }, + { id: 55, text: "Pediatric " + KASP_STRING + " ICU Without ventilator" }, + { id: 75, text: "Pediatric " + KASP_STRING + " ICU With ventilator" }, + { id: 3, text: "Casulatily / Emergency Ward NON O2 BED" }, + { id: 13, text: "Casulatily / Emergency Ward O2 BED" }, + { id: 23, text: "Casulatily / Emergency Ward ICU Without ventilator" }, + { id: 33, text: "Casulatily / Emergency Ward ICU With ventilator" }, + { id: 2, text: "Makeshift Arrangement Ward NON O2 BED" }, + { id: 12, text: "Makeshift Arrangement Ward O2 BED" }, + { id: 22, text: "Makeshift Arrangement Ward ICU Without ventilator" }, + { id: 32, text: "Makeshift Arrangement Ward ICU With ventilator" }, + { id: 1, text: "Adult Non covid NON O2 BED" }, + { id: 150, text: "Adult Non covid O2 BED" }, + { id: 10, text: "Adult Non covid ICU Without ventilator" }, + { id: 20, text: "Adult Non covid ICU With ventilator" }, + { id: 5, text: "Pediatric Non covid NON O2 BED" }, + { id: 155, text: "Pediatric Non covid O2 BED" }, + { id: 15, text: "Pediatric Non covid ICU Without ventilator" }, + { id: 25, text: "Pediatric Non covid ICU With ventilator" }, ]; export const DOCTOR_SPECIALIZATION: Array = [ @@ -170,11 +184,11 @@ export const MEDICAL_HISTORY_CHOICES: Array = [ { id: 1, text: "NO" }, { id: 2, text: "Diabetes" }, { id: 3, text: "Heart Disease" }, - { id: 4, text: "HyperTension" }, + { id: 4, text: "Hypertension" }, { id: 5, text: "Kidney Diseases" }, { id: 6, text: "Lung Diseases/Asthma" }, { id: 7, text: "Cancer" }, - { id: 8, text: "OTHER" }, + { id: 8, text: "other" }, ]; export const REVIEW_AT_CHOICES: Array = [ @@ -336,7 +350,7 @@ export const DISEASE_STATUS = [ "EXPIRED", ]; -export const TEST_TYPE = ["UNK", "ANTIGEN", "RTPCR", "CBNAAT", "TRUENAT"]; +export const TEST_TYPE = ["RTPCR", "UNK", "ANTIGEN", "CBNAAT", "TRUENAT"]; export const VACCINES = [ "CoviShield", diff --git a/src/Components/ExternalResult/ExternalResultLocalbodySelector.tsx b/src/Components/ExternalResult/ExternalResultLocalbodySelector.tsx index dc03e9cbf40..28307e61e1f 100644 --- a/src/Components/ExternalResult/ExternalResultLocalbodySelector.tsx +++ b/src/Components/ExternalResult/ExternalResultLocalbodySelector.tsx @@ -34,7 +34,7 @@ export const ExternalResultLocalbodySelector = (props: any) => {
- Localbody* + Village / Town* { />
- Ward* + Street* {wards && ( Filter By:
- Lsg + Village / Town
- Ward + Street { } }; -const initialLocalbodies = [{ id: 0, name: "Choose Localbody", number: 0 }]; -const initialWard = [{ id: 0, name: "Choose Ward", number: 0 }]; +const initialLocalbodies = [{ id: 0, name: "Village / Town", number: 0 }]; +const initialWard = [{ id: 0, name: "Choose Street", number: 0 }]; export default function UpdateResult(props: any) { const { id } = props; @@ -262,7 +262,7 @@ export default function UpdateResult(props: any) { />
- Localbody* + Village / Town* {isLocalbodyLoading ? ( ) : ( @@ -283,7 +283,7 @@ export default function UpdateResult(props: any) {
- Ward/Division of respective LSGI* + Street of respective Village / Town* {isWardLoading ? ( diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx index 3f89a6f8d20..bd22cb458cf 100644 --- a/src/Components/Facility/ConsultationForm.tsx +++ b/src/Components/Facility/ConsultationForm.tsx @@ -484,7 +484,7 @@ export const ConsultationForm = (props: any) => { {state.form.hasSymptom && (
handleDateChange(date, "symptoms_onset_date") diff --git a/src/Components/Facility/FacilityCreate.tsx b/src/Components/Facility/FacilityCreate.tsx index e363f86c375..5e40e46dce9 100644 --- a/src/Components/Facility/FacilityCreate.tsx +++ b/src/Components/Facility/FacilityCreate.tsx @@ -56,12 +56,12 @@ const facilityTypes = [...FACILITY_TYPES.map((i) => i.text)]; const initialStates = [{ id: 0, name: "Choose State *" }]; const initialDistricts = [{ id: 0, name: "Choose District" }]; const selectStates = [{ id: 0, name: "Please select your state" }]; -const initialLocalbodies = [{ id: 0, name: "Choose Localbody" }]; +const initialLocalbodies = [{ id: 0, name: "Choose Village / Town" }]; const selectDistrict = [{ id: 0, name: "Please select your district" }]; const selectLocalBody = [ - { id: 0, name: "Please select your Local Body", number: 0 }, + { id: 0, name: "Please select your Village / Town", number: 0 }, ]; -const initialWards = [{ id: 0, name: "Choose Ward", number: 0 }]; +const initialWards = [{ id: 0, name: "Choose Street", number: 0 }]; const initForm: any = { facility_type: "2", @@ -534,7 +534,7 @@ export const FacilityCreate = (props: FacilityProps) => {
- Localbody* + Village / Town* {isLocalbodyLoading ? ( ) : ( @@ -555,7 +555,7 @@ export const FacilityCreate = (props: FacilityProps) => { )}
- Ward* + Street* {isWardLoading ? ( ) : ( diff --git a/src/Components/Facility/FacilityFilter/index.tsx b/src/Components/Facility/FacilityFilter/index.tsx index 8a91ce91595..ef12c3ff1a2 100644 --- a/src/Components/Facility/FacilityFilter/index.tsx +++ b/src/Components/Facility/FacilityFilter/index.tsx @@ -22,7 +22,7 @@ function useMergeState(initialState: any) { const initialStates = [{ id: 0, name: "Choose State *" }]; const initialDistricts = [{ id: 0, name: "Choose District" }]; const selectStates = [{ id: 0, name: "Please select your state" }]; -const initialLocalbodies = [{ id: 0, name: "Choose Localbody" }]; +const initialLocalbodies = [{ id: 0, name: "Choose Village / Town" }]; const selectDistrict = [{ id: 0, name: "Please select your district" }]; function FacillityFilter(props: any) { @@ -207,7 +207,7 @@ function FacillityFilter(props: any) {
- Local Body + Village / Town
{isLocalbodyLoading ? ( diff --git a/src/Components/Patient/PatientFilterV2.tsx b/src/Components/Patient/PatientFilterV2.tsx index ee24618c4bf..a5c61738804 100644 --- a/src/Components/Patient/PatientFilterV2.tsx +++ b/src/Components/Patient/PatientFilterV2.tsx @@ -442,7 +442,7 @@ export default function PatientFilterV2(props: any) {
Filter By:
- LSG body + Village / Town
handleLsgChange(value)} loading={isLsgLoading} - placeholder="Search by LSG body name" + placeholder="Search by Village / Town name" noOptionsText={ hasLsgSearchText - ? "No LSG body found, please try again" + ? "No Village / Town found, please try again" : "Start typing to begin search" } renderOption={(option: any) =>
{option.name}
} diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx index 7c445df5c6a..3daa9565040 100644 --- a/src/Components/Patient/PatientHome.tsx +++ b/src/Components/Patient/PatientHome.tsx @@ -1172,7 +1172,7 @@ export const PatientHome = (props: any) => {
- Village + Address /Landmark
{patientData.village || "-"} @@ -1180,7 +1180,7 @@ export const PatientHome = (props: any) => {
- Ward + Street
{(patientData.ward_object && @@ -1192,7 +1192,7 @@ export const PatientHome = (props: any) => {
- Local Body + Village / Town
{patientData.local_body_object?.name || "-"} @@ -1248,7 +1248,7 @@ export const PatientHome = (props: any) => {
- Estimated Contact Date + Contact Date
{patientData.estimated_contact_date diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx index b0d7a3010e5..80a08831db1 100644 --- a/src/Components/Patient/PatientRegister.tsx +++ b/src/Components/Patient/PatientRegister.tsx @@ -62,7 +62,7 @@ const PageTitle = loadable(() => import("../Common/PageTitle")); const debounce = require("lodash.debounce"); const placesList = countryList.concat( - statesList.filter((i: string) => i !== "Kerala") + statesList.filter((i: string) => i !== "Tamil Nadu") ); interface PatientRegisterProps extends PatientModel { @@ -171,8 +171,10 @@ const initialState = { const initialStates = [{ id: 0, name: "Choose State *" }]; const initialDistricts = [{ id: 0, name: "Choose District" }]; const selectStates = [{ id: 0, name: "Please select your state" }]; -const initialLocalbodies = [{ id: 0, name: "Choose Localbody", number: 0 }]; -const initialWard = [{ id: 0, name: "Choose Ward", number: 0 }]; +const initialLocalbodies = [ + { id: 0, name: "Choose Village / Town", number: 0 }, +]; +const initialWard = [{ id: 0, name: "Choose Street", number: 0 }]; const selectDistrict = [{ id: 0, name: "Please select your district" }]; const patientFormReducer = (state = initialState, action: any) => { @@ -478,7 +480,14 @@ export const PatientRegister = (props: PatientRegisterProps) => { setIsStateLoading(true); const statesRes = await dispatchAction(getStates()); if (!status.aborted && statesRes.data.results) { - setStates([...initialStates, ...statesRes.data.results]); + const initialStateVal = statesRes.data.results.filter( + (i: any) => i.name == "Tamil Nadu" + ); + const stateVal = statesRes.data.results.filter( + (i: any) => i.name !== "Tamil Nadu" + ); + setStates([...initialStateVal, ...stateVal]); + fetchDistricts(String(initialStateVal[0].id)); } setIsStateLoading(false); }, @@ -529,14 +538,14 @@ export const PatientRegister = (props: PatientRegisterProps) => { return; case "local_body": if (state.form.nationality === "India" && !state.form[field]) { - errors[field] = "Please select local body"; + errors[field] = "Please select Village / Town"; if (!error_div) error_div = field; invalidForm = true; } return; case "ward": if (state.form.nationality === "India" && !state.form[field]) { - errors[field] = "Please select ward"; + errors[field] = "Please select Street"; if (!error_div) error_div = field; invalidForm = true; } @@ -610,7 +619,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { JSON.parse(state.form.contact_with_suspected_carrier) ) { if (!state.form[field]) { - errors[field] = "Please enter the estimated date of contact"; + errors[field] = "Please enter the date of contact"; if (!error_div) error_div = field; invalidForm = true; } @@ -1436,7 +1445,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
- Localbody* + Village / Town* {isLocalbodyLoading ? ( @@ -1515,7 +1524,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
- Ward/Division of respective LSGI* + Street of respective Village / Town* {isWardLoading ? ( @@ -1537,7 +1546,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { )}
- Village + Address / Landmark {
)} -
+ {/*
Is a Guest workers? @@ -1639,7 +1648,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { /> -
+
*/}
@@ -1698,7 +1707,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
handleDateChange(date, "estimated_contact_date") @@ -1774,7 +1783,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
- Estimated date of Arrival* + Date of Arrival* { )}
- Number Of Primary Contacts for COVID + Number of Primary Contacts for COVID {
- Number Of Secondary Contacts for COVID + Number of Secondary Contacts for COVID {
- Number Of Aged Dependents (Above 60) + Number of Aged Dependents (Above 60) {
- Number Of Chronic Diseased Dependents + Number of Chronic Diseased Dependents The request will be fulfilled by{" "} {data.assigned_facility_object.facility_type?.name}, District{" "} - {data.assigned_facility_object.district_type?.name}, LSG + {data.assigned_facility_object.district_type?.name}, Village / + Town {data.assigned_facility_object.local_body_object?.name}, {data.assigned_facility_object.state_object?.name}
diff --git a/src/Components/Shifting/ShiftDetails.tsx b/src/Components/Shifting/ShiftDetails.tsx index 7f51c1e4e19..9065c4d34f0 100644 --- a/src/Components/Shifting/ShiftDetails.tsx +++ b/src/Components/Shifting/ShiftDetails.tsx @@ -261,7 +261,7 @@ export default function ShiftDetails(props: { id: string }) { {patientData?.estimated_contact_date && (
- Estimated contact date:{" "} + Contact date:{" "} {moment(patientData?.estimated_contact_date).format("LL")}
@@ -314,7 +314,7 @@ export default function ShiftDetails(props: { id: string }) { {!!patientData?.number_of_aged_dependents && (
- Number Of Aged Dependents (Above 60):{" "} + Number of Aged Dependents (Above 60):{" "} {patientData?.number_of_aged_dependents}
@@ -322,7 +322,7 @@ export default function ShiftDetails(props: { id: string }) { {!!patientData?.number_of_chronic_diseased_dependents && (
- Number Of Chronic Diseased Dependents:{" "} + Number of Chronic Diseased Dependents:{" "} {patientData?.number_of_chronic_diseased_dependents}
diff --git a/src/Components/Users/UserAdd.tsx b/src/Components/Users/UserAdd.tsx index 2b5599b2907..445a47deee0 100644 --- a/src/Components/Users/UserAdd.tsx +++ b/src/Components/Users/UserAdd.tsx @@ -54,7 +54,7 @@ interface UserProps { const initialStates = [{ id: 0, name: "Choose State *" }]; const initialDistricts = [{ id: 0, name: "Choose District" }]; const selectStates = [{ id: 0, name: "Please select your state" }]; -const initialLocalbodies = [{ id: 0, name: "Choose Localbody" }]; +const initialLocalbodies = [{ id: 0, name: "Choose Village / Town" }]; const selectDistrict = [{ id: 0, name: "Please select your district" }]; const initForm: any = { @@ -703,7 +703,7 @@ export const UserAdd = (props: UserProps) => { {showLocalbody && (
- Localbody + Village / Town {isLocalbodyLoading ? ( ) : ( diff --git a/src/Components/Users/UserProfile.tsx b/src/Components/Users/UserProfile.tsx index ff7de47d4e7..fc5df9e60e3 100644 --- a/src/Components/Users/UserProfile.tsx +++ b/src/Components/Users/UserProfile.tsx @@ -302,7 +302,7 @@ export default function UserProfile() { Personal Information

- Local Body, District and State are Non Editable Settings. + Village / Town, District and State are Non Editable Settings.

- Local Body + Village / Town
{details.local_body_object?.name || "-"} diff --git a/src/Locale/en/Common.json b/src/Locale/en/Common.json index b44a575193c..cd660ba7fe7 100644 --- a/src/Locale/en/Common.json +++ b/src/Locale/en/Common.json @@ -9,7 +9,7 @@ "download_type": "Download Type", "State": "State", "District": "District", - "Local Body": "Local Body", + "Local Body": "Village / Town", "Location": "Location", - "Ward": "Ward" + "Ward": "Street" }