Task: 198179 Identify AG form - step 1to5 (tekdi#29)

* FIX (Identify AG form - step 1to5) * Dropout screen, check doc list, geolocation
Dhanashree-Patil95 · May 20, 2023 · 00bfb5f · 00bfb5f
1 parent 21f6e77
commit 00bfb5f
Show file tree

Hide file tree

Showing 28 changed files with 2,513 additions and 186 deletions.
diff --git a/apps/front-end/.env.development b/apps/front-end/.env.development
@@ -0,0 +1,2 @@
+REACT_APP_API_URL=https://eg-dev.uniteframework.io/mw
+REACT_APP_BASE_URL=https://eg-dev.uniteframework.io
diff --git a/apps/front-end/.env.production b/apps/front-end/.env.production
@@ -0,0 +1,2 @@
+REACT_APP_API_URL=https://eg-dev.uniteframework.io/mw
+REACT_APP_BASE_URL=https://eg-dev.uniteframework.io
diff --git a/apps/front-end/public/check.svg b/apps/front-end/public/check.svg
diff --git a/apps/front-end/public/dropout.svg b/apps/front-end/public/dropout.svg
diff --git a/apps/front-end/public/error.png b/apps/front-end/public/error.png
diff --git a/apps/front-end/public/locales/en/translation.json b/apps/front-end/public/locales/en/translation.json
@@ -216,5 +216,41 @@
   "ATTENDANCE_CAMERA_SUBTITLE": "Make sure this image has a clear profile view of your Face. Improper Image might result in disqualification of the Application.",
   "MARK_ABSENT": "Mark Absent",
   "ENTER_USERNAME_PASSWORD_SENT_ON_MOBILE": "Enter the Username and Password sent on your Mobile Number",
-  "AADHAAR_NUMBER_ALREADY_EXISTS": "Aadhaar number already exists"
+  "AADHAAR_NUMBER_ALREADY_EXISTS": "Aadhaar number already exists",
+  "OWNERSHIP": "Ownership",
+  "IDENTIFY_THE_AG_LEARNER": "Identify the AG Learner",
+  "MARITAL_STATUS": "Marital status",
+  "SOCIAL_CATEGORY": "Social Category",
+  "TYPE_OF_STUDENT": "Type of Student",
+  "LAST_YEAR_OF_EDUCATION": "Last Year of Education",
+  "LAST_STANDARD_OF_EDUCATION": "Last Standard of Education",
+  "REASON_FOR_LEAVING_EDUCATION": "Reason for Leaving Education",
+  "AADHAAR_VERIFICATION_SUCCESSFUL": "Aadhaar Verification Successful",
+  "AG_LEARNER_ALREADY_IDENTIFIED": "AG Learner Already Identified!",
+  "AG_LEARNER_ALREADY_IDENTIFIED_DES": "You can continue to Add the AG Learner but they might not be assigned to you ",
+  "FULL_NAME": "Full Name",
+  "VERIFICATION_ID_NUMBER": "Verification ID number",
+  "CONTINUE_ADDING": "Continue Adding",
+  "CANCEL_AND_GO_BACK": "Cancel and Go Back",
+  "AG_ADDED_SUCCESSFULLY": "AG Added Successfully!",
+  "ADD_DETAILS": "Add Details",
+  "DOCUMENTS_CHECKLIST": "Documents Checklist",
+  "ADD_RSOS_NIOS_NO": "Add RSOS/NIOS No.",
+  "NOT_AVAILABLE": "Not Available",
+  "AVAILABLE": "Available",
+  "COMPLETE": "Complete",
+  "UPDATE_REQUIRED": "Update Required",
+  "AADHAAR_CARD": "Aadhaar Card",
+  "JAN_AADHAAR_CARD": "Jan Aadhaar Card",
+  "PHOTO": "Photo",
+  "MARKSHEET": "Marksheet",
+  "BANK_PASSBOOK": "Bank Passbook",
+  "BIRTH_CERTIFICATE": "Birth Certificate",
+  "CASTE_CERTIFICATE": "Cast Certificate",
+  "TRANSFER_CERTIFICATE": "Transfer certificate",
+  "AFFIDAVIT": "Affidavit for non schooling Certification, notary",
+  "CBOSIGN": "Marksheet With CBO Sign",
+  "CBOSIGNTRANSFER": "Transfer certificate with CBO Sign",
+  "MARK_AS_DROPOUT": "Mark as Dropout",
+  "PROFILE_DETAILS": "Profile Details"
 }
diff --git a/apps/front-end/public/locales/hi/translation.json b/apps/front-end/public/locales/hi/translation.json
@@ -205,5 +205,41 @@
   "CALL_SUPPORT": "मदद के लिए कॉल करें",
   "LOGOUT": "लॉग आउट",
   "ENTER_USERNAME_PASSWORD_SENT_ON_MOBILE": "आपके मोबाइल नंबर पर भेजा गया यूजरनेम और पासवर्ड दर्ज करें",
-  "AADHAAR_NUMBER_ALREADY_EXISTS": "आधार नंबर पहले से मौजूद है"
+  "AADHAAR_NUMBER_ALREADY_EXISTS": "आधार नंबर पहले से मौजूद है",
+  "OWNERSHIP": "स्वामित्व",
+  "IDENTIFY_THE_AG_LEARNER": "एजी लर्नर की पहचान करें",
+  "MARITAL_STATUS": "वैवाहिक स्थिति",
+  "SOCIAL_CATEGORY": "सामाजिक श्रेणी",
+  "TYPE_OF_STUDENT": "छात्र का प्रकार",
+  "LAST_YEAR_OF_EDUCATION": "शिक्षा का अंतिम वर्ष",
+  "LAST_STANDARD_OF_EDUCATION": "शिक्षा का अंतिम मानक",
+  "REASON_FOR_LEAVING_EDUCATION": "शिक्षा छोड़ने का कारण",
+  "AADHAAR_VERIFICATION_SUCCESSFUL": "आधार सत्यापन सफल रहा",
+  "AG_LEARNER_ALREADY_IDENTIFIED": "एजी लर्नर की पहले ही पहचान की जा चुकी है!",
+  "AG_LEARNER_ALREADY_IDENTIFIED_DES": "आप एजी लर्नर को जोड़ना जारी रख सकते हैं, लेकिन वे आपको आवंटित नहीं किए जा सकते हैं",
+  "FULL_NAME": "पूरा नाम",
+  "VERIFICATION_ID_NUMBER": "सत्यापन आईडी संख्या",
+  "CONTINUE_ADDING": "जोड़ना जारी रखें",
+  "CANCEL_AND_GO_BACK": "रद्द करें और वापस जाएं",
+  "AG_ADDED_SUCCESSFULLY": "एजी सफलतापूर्वक जोड़ा गया!",
+  "ADD_DETAILS": "विवरण जोड़ें",
+  "DOCUMENTS_CHECKLIST": "दस्तावेजों की जांच सूची",
+  "ADD_RSOS_NIOS_NO.": "आरएसओएस/एनआईओएस संख्या जोड़ें।",
+  "NOT_AVAILABLE": "उपलब्ध नहीं",
+  "AVAILABLE": "उपलब्ध ",
+  "UPDATE_REQUIRED": "अद्यतन आवश्यक है",
+  "COMPLETE": "पूरा",
+  "AADHAAR_CARD": "आधार कार्ड ",
+  "JAN_AADHAAR_CARD": "आधार कार्ड ",
+  "PHOTO": "तस्वीर",
+  "MARKSHEET": "अंकपत्र",
+  "BANK_PASSBOOK": "बैंक पासबुक",
+  "BIRTH_CERTIFICATE": "जन्म प्रमाण पत्र",
+  "CASTE_CERTIFICATE ": "जाति प्रमाण पत्र ",
+  "TRANSFER_CERTIFICATE": "प्रमाणपत्र",
+  "AFFIDAVIT": "शपत पात्र",
+  "CBOSIGN": "सीबीओ हस्ताक्षर के साथ मार्कशीट",
+  "CBOSIGNTRANSFER": "सीबीओ हस्ताक्षर के साथ हस्तांतरण प्रमाण पत्र",
+  "PROFILE_DETAILS": "प्रोफ़ाइल विवरण",
+  "MARK_AS_DROPOUT": "मार्क एज ड्रूपॉट"
 }
diff --git a/apps/front-end/src/pages/admin/AdminHome.js b/apps/front-end/src/pages/admin/AdminHome.js
@@ -53,7 +53,7 @@ export default function AdminHome({ footerLinks, userTokenInfo }) {
   return (
     <Layout getRefAppBar={(e) => setRefAppBar(e)} _sidebar={footerLinks}>
       <HStack>
-        {/* <Box flex={0.2}>
+        <Box flex={0.2}>
           <Box p="10px" bg="primary.500" ref={ref}>
             <H2 color="white">{t("MY_PRERAKS")}</H2>
           </Box>
@@ -139,7 +139,7 @@ export default function AdminHome({ footerLinks, userTokenInfo }) {
               </VStack>
             </VStack>
           </ScrollView>
-        </Box> */}
+        </Box>
         <ScrollView
           maxH={Height - refAppBar?.clientHeight}
           minH={Height - refAppBar?.clientHeight}

diff --git a/apps/front-end/src/pages/front-end/Home.js b/apps/front-end/src/pages/front-end/Home.js
@@ -3,7 +3,10 @@ import Form from "./Form";
 import SplashScreen from "./splash/SplashScreen";
 import PrerakDuties from "./splash/PrerakDuties";
 import Success from "./Success";
-import { facilitatorRegistryService, initializeI18n } from "@shiksha/common-lib";
+import {
+  facilitatorRegistryService,
+  initializeI18n,
+} from "@shiksha/common-lib";
 import { useParams } from "react-router-dom";
 
 function Home({ userTokenInfo }) {
@@ -40,7 +43,7 @@ function Home({ userTokenInfo }) {
       page={page}
       onClick={() => setPage("Form")}
       onClickPrerakDuties={() => setPage("Prerak_Duties")}
-      onPreferedLanguage={()=>setPage("Prerak_Duties")}
+      onPreferedLanguage={() => setPage("Prerak_Duties")}
     />
   ) : page === "Prerak_Duties" ? (
     <PrerakDuties page={page} onClick={() => setPage("Form")} />

diff --git a/apps/front-end/src/pages/front-end/Orientation.js b/apps/front-end/src/pages/front-end/Orientation.js
@@ -60,13 +60,13 @@ export default function Orientation({ footerLinks, onShowScreen }) {
       },
     },
   };
-  const styles={
-    modalxxl:{
-      maxWidth:"950px",
-      width:"100%",
-      height:"100%"
+  const styles = {
+    modalxxl: {
+      maxWidth: "950px",
+      width: "100%",
+      height: "100%",
     },
-  }
+  };
   return (
     <Layout
       _appBar={{
@@ -95,17 +95,19 @@ export default function Orientation({ footerLinks, onShowScreen }) {
         </Box>
         <HStack display="flex" flexDirection="row" space="xl">
           <BoxBlue justifyContent="center" shadow="BlueBoxShadow">
-            <VStack  alignItems={"Center"} >
+            <VStack alignItems={"Center"}>
               <Pressable onPress={onShowScreen}>
-            <Image
-              source={{
-                uri: "/orientation.svg",
-              }}
-              alt="Prerak Orientation"
-              size={"sm"}
-              resizeMode="contain"
-            />
-              <Text fontSize="sm" bold pt="4">Prerak Orientation</Text>
+                <Image
+                  source={{
+                    uri: "/orientation.svg",
+                  }}
+                  alt="Prerak Orientation"
+                  size={"sm"}
+                  resizeMode="contain"
+                />
+                <Text fontSize="sm" bold pt="4">
+                  Prerak Orientation
+                </Text>
               </Pressable>
             </VStack>
           </BoxBlue>
@@ -119,7 +121,9 @@ export default function Orientation({ footerLinks, onShowScreen }) {
                 size={"sm"}
                 resizeMode="contain"
               />
-              <Text fontSize="sm" bold pt="4">Prerak Training</Text>
+              <Text fontSize="sm" bold pt="4">
+                Prerak Training
+              </Text>
             </VStack>
           </BoxBlue>
           <BoxBlue justifyContent="center" shadow="BlueBoxShadow">
@@ -132,7 +136,9 @@ export default function Orientation({ footerLinks, onShowScreen }) {
                 size={"sm"}
                 resizeMode="contain"
               />
-              <Text fontSize="sm" bold pt="4">My MT</Text>
+              <Text fontSize="sm" bold pt="4">
+                My MT
+              </Text>
             </VStack>
           </BoxBlue>
           <BoxBlue justifyContent="center" shadow="BlueBoxShadow">
@@ -145,7 +151,9 @@ export default function Orientation({ footerLinks, onShowScreen }) {
                 size={"sm"}
                 resizeMode="contain"
               />
-              <Text fontSize="sm" bold pt="4">Add a Prerak</Text>
+              <Text fontSize="sm" bold pt="4">
+                Add a Prerak
+              </Text>
             </VStack>
           </BoxBlue>
         </HStack>
@@ -154,37 +162,46 @@ export default function Orientation({ footerLinks, onShowScreen }) {
         </Text>
       </VStack>
 
-
       <HStack space="2xl" justifyContent="space-between" px="3">
         <Box>
           <VStack space="xl">
             <Button
-            variant={"blueOutlineBtn"}
-            shadow="BlueOutlineShadow"
+              variant={"blueOutlineBtn"}
+              shadow="BlueOutlineShadow"
               onPress={() => {
                 setModalVisible(!modalVisible);
               }}
             >
-              <Text color="blueText.400" bold fontSize="lg">Schedule an event +</Text>
+              <Text color="blueText.400" bold fontSize="lg">
+                Schedule an event +
+              </Text>
             </Button>
 
             <Cal />
             <VStack space="4">
               <HStack alignItems="Center" space="md">
                 <CheckCircleIcon size="4" color="blue.500" />
-                <Text fontSize="sm" bold>Interview</Text>
+                <Text fontSize="sm" bold>
+                  Interview
+                </Text>
               </HStack>
               <HStack alignItems="Center" space="md">
                 <CheckCircleIcon size="4" color="green.500" />
-                <Text fontSize="sm" bold>Orientation Days</Text>
+                <Text fontSize="sm" bold>
+                  Orientation Days
+                </Text>
               </HStack>
               <HStack alignItems="Center" space="md">
                 <CheckCircleIcon size="4" color="yellow.500" />
-                <Text fontSize="sm" bold>Training Days</Text>
+                <Text fontSize="sm" bold>
+                  Training Days
+                </Text>
               </HStack>
               <HStack alignItems="Center" space="md">
                 <CheckCircleIcon size="4" color="purple.500" />
-                <Text fontSize="sm" bold>Camp visits</Text>
+                <Text fontSize="sm" bold>
+                  Camp visits
+                </Text>
               </HStack>
             </VStack>
           </VStack>
@@ -194,18 +211,18 @@ export default function Orientation({ footerLinks, onShowScreen }) {
             plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
             initialView={"timeGridWeek"}
             events={[
-              { title: 'event 1', date: moment().format("YYYY-MM-DD HH:mm:ss") },
-
+              {
+                title: "event 1",
+                date: moment().format("YYYY-MM-DD HH:mm:ss"),
+              },
             ]}
-
             headerToolbar={{
               start: "prev,thisweek,next",
               center: "timeGridWeek,dayGridMonth,dayGridYear",
               end: "today",
               height: "50hv",
             }}
           />
-
         </Box>
       </HStack>
 
@@ -217,10 +234,13 @@ export default function Orientation({ footerLinks, onShowScreen }) {
         // height={"450px"}
         overflowY={"scroll"}
       >
-        <Modal.Content  {...styles.modalxxl}>
+        <Modal.Content {...styles.modalxxl}>
           <Modal.CloseButton />
           <Modal.Header p="5" borderBottomWidth="0" bg="white">
-            <H1 textAlign="center" bold> Schedule an Event</H1>
+            <H1 textAlign="center" bold>
+              {" "}
+              Schedule an Event
+            </H1>
           </Modal.Header>
 
           {/* <Modal.Header textAlign={"Center"}>
@@ -351,26 +371,26 @@ export default function Orientation({ footerLinks, onShowScreen }) {
             />
             <Modal.Footer justifyContent={"space-between"}>
               <Button.Group space={2}>
-                  <Button
-                    variant="blueOutlineBtn"
-                    colorScheme="blueGray"
-                    onPress={() => {
-                      setShowModal(false);
-                    }}
-                    shadow="BlueOutlineShadow"
-                  >
-                    <Text>Cancel</Text>
-                  </Button>
-                  <Button
+                <Button
+                  variant="blueOutlineBtn"
+                  colorScheme="blueGray"
+                  onPress={() => {
+                    setShowModal(false);
+                  }}
+                  shadow="BlueOutlineShadow"
+                >
+                  <Text>Cancel</Text>
+                </Button>
+                <Button
                   variant="blueFillButton"
-                    onPress={() => {
-                      setShowModal(false);
-                    }}
-                    shadow="BlueFillShadow"
-                  >
-                   <Text color="white">Send Invites</Text> 
-                  </Button>
-                </Button.Group>
+                  onPress={() => {
+                    setShowModal(false);
+                  }}
+                  shadow="BlueFillShadow"
+                >
+                  <Text color="white">Send Invites</Text>
+                </Button>
+              </Button.Group>
             </Modal.Footer>
           </Modal.Body>
         </Modal.Content>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		REACT_APP_API_URL=https://eg-dev.uniteframework.io/mw
		REACT_APP_BASE_URL=https://eg-dev.uniteframework.io