Changes for circle ci config

.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:

src/Common/constants.tsx

@@ -37,9 +37,9 @@ export const DOWNLOAD_TYPES: Array<String> = [
 ];
 
 export const TEST_TYPE_CHOICES: Array<OptionsType> = [
+  { 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<OptionsType> = [
 ];
 
 export const BED_TYPES: Array<OptionsType> = [
-  { 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<OptionsType> = [
@@ -170,11 +184,11 @@ export const MEDICAL_HISTORY_CHOICES: Array<OptionsType> = [
   { 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<OptionsType> = [
@@ -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",

src/Components/ExternalResult/ExternalResultLocalbodySelector.tsx

@@ -34,7 +34,7 @@ export const ExternalResultLocalbodySelector = (props: any) => {
         </label>
 
         <div className="md:col-span-2">
-          <InputLabel id="local_body-label">Localbody*</InputLabel>
+          <InputLabel id="local_body-label">Village / Town*</InputLabel>
           <SelectField
             name="local_body"
             variant="outlined"
@@ -48,7 +48,7 @@ export const ExternalResultLocalbodySelector = (props: any) => {
           />
         </div>
         <div className="md:col-span-2">
-          <InputLabel id="ward-label">Ward*</InputLabel>
+          <InputLabel id="ward-label">Street*</InputLabel>
           {wards && (
             <SelectField
               name="ward"

src/Components/ExternalResult/ListFilter.tsx

@@ -224,14 +224,14 @@ export default function ListFilter(props: any) {
       <div className="font-light text-md mt-2">Filter By:</div>
       <div className="flex flex-wrap gap-2">
         <div className="w-64 flex-none">
-          <span className="text-sm font-semibold">Lsg</span>
+          <span className="text-sm font-semibold">Village / Town</span>
           <AutoCompleteAsyncField
             multiple={true}
             name="local_bodies"
             options={lsgList}
-            label="Local Body"
+            label="Village / Town"
             variant="outlined"
-            placeholder="Select Local Body"
+            placeholder="Select Village / Town"
             loading={loading}
             freeSolo={false}
             value={selectedLsgs}
@@ -246,12 +246,12 @@ export default function ListFilter(props: any) {
       </div>
       <div className="flex flex-wrap gap-2">
         <div className="w-64 flex-none">
-          <span className="text-sm font-semibold">Ward</span>
+          <span className="text-sm font-semibold">Street</span>
           <AutoCompleteAsyncField
             multiple={true}
             name="wards"
             options={filterWards()}
-            label="Ward"
+            label="Street"
             variant="outlined"
             placeholder="Select wards"
             loading={loading}

src/Components/ExternalResult/ResultUpdate.tsx

@@ -66,8 +66,8 @@ const FormReducer = (state = initialState, action: any) => {
   }
 };
 
-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) {
               />
             </div>
             <div data-testid="localbody">
-              <InputLabel id="local_body-label">Localbody*</InputLabel>
+              <InputLabel id="local_body-label">Village / Town*</InputLabel>
               {isLocalbodyLoading ? (
                 <CircularProgress size={20} />
               ) : (
@@ -283,7 +283,7 @@ export default function UpdateResult(props: any) {
             </div>
             <div data-testid="ward-respective-lsgi">
               <InputLabel id="ward-label">
-                Ward/Division of respective LSGI*
+                Street of respective Village / Town*
               </InputLabel>
               {isWardLoading ? (
                 <CircularProgress size={20} />

src/Components/Facility/ConsultationForm.tsx

@@ -484,7 +484,7 @@ export const ConsultationForm = (props: any) => {
                 {state.form.hasSymptom && (
                   <div id="symptoms_onset_date-div">
                     <DateInputField
-                      label="Date of onset of the symptoms*"
+                      label="Date of onset of first symptoms*"
                       value={state.form.symptoms_onset_date}
                       onChange={(date) =>
                         handleDateChange(date, "symptoms_onset_date")

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) => {
               </div>
 
               <div className="md:col-span-2">
-                <InputLabel id="local_body-label">Localbody*</InputLabel>
+                <InputLabel id="local_body-label">Village / Town*</InputLabel>
                 {isLocalbodyLoading ? (
                   <CircularProgress size={20} />
                 ) : (
@@ -555,7 +555,7 @@ export const FacilityCreate = (props: FacilityProps) => {
                 )}
               </div>
               <div className="md:col-span-2">
-                <InputLabel id="ward-label">Ward*</InputLabel>
+                <InputLabel id="ward-label">Street*</InputLabel>
                 {isWardLoading ? (
                   <CircularProgress size={20} />
                 ) : (

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) {
         </div>
 
         <div className="w-64 flex-none">
-          <span className="text-sm font-semibold">Local Body</span>
+          <span className="text-sm font-semibold">Village / Town</span>
           <div>
             {isLocalbodyLoading ? (
               <CircularProgress size={20} />

src/Components/Patient/PatientFilterV2.tsx

@@ -442,7 +442,7 @@ export default function PatientFilterV2(props: any) {
       <div className="font-light text-md mt-2">Filter By:</div>
       <div className="flex flex-wrap gap-2">
         <div className="w-64 flex-none">
-          <span className="text-sm font-semibold">LSG body</span>
+          <span className="text-sm font-semibold">Village / Town</span>
           <div className="">
             <AutoCompleteAsyncField
               name="lsgBody"
@@ -453,10 +453,10 @@ export default function PatientFilterV2(props: any) {
               onSearch={handleLsgSearch}
               onChange={(e: object, value: any) => 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) => <div>{option.name}</div>}

src/Components/Patient/PatientHome.tsx

@@ -1172,15 +1172,15 @@ export const PatientHome = (props: any) => {
               </div>
               <div className="sm:col-span-1">
                 <div className="text-sm leading-5 font-medium text-gray-500">
-                  Village
+                  Address /Landmark
                 </div>
                 <div className="mt-1 text-sm leading-5 text-gray-900">
                   {patientData.village || "-"}
                 </div>
               </div>
               <div className="sm:col-span-1">
                 <div className="text-sm leading-5 font-medium text-gray-500">
-                  Ward
+                  Street
                 </div>
                 <div className="mt-1 text-sm leading-5 text-gray-900">
                   {(patientData.ward_object &&
@@ -1192,7 +1192,7 @@ export const PatientHome = (props: any) => {
               </div>
               <div className="sm:col-span-1">
                 <div className="text-sm leading-5 font-medium text-gray-500">
-                  Local Body
+                  Village / Town
                 </div>
                 <div className="mt-1 text-sm leading-5 text-gray-900">
                   {patientData.local_body_object?.name || "-"}
@@ -1248,7 +1248,7 @@ export const PatientHome = (props: any) => {
               </div>
               <div className="sm:col-span-1">
                 <div className="text-sm leading-5 font-medium text-gray-500">
-                  Estimated Contact Date
+                  Contact Date
                 </div>
                 <div className="mt-1 text-sm leading-5 text-gray-900">
                   {patientData.estimated_contact_date