egovernments · hridya-egov · Aug 8, 2024 · Aug 8, 2024 · Aug 8, 2024 · Aug 8, 2024
@@ -17,11 +17,20 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <script src="%REACT_APP_GLOBAL%"></script>
 
+  <!-- Adding custom style directly in the HTML -->
+
+  <style>
+    .custom-margin-bottom .citizen-card-input--front {
+      margin-bottom: 0 !important;
+    }
+  </style>
+
+
 </head>
 
 <body>
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="root"></div>
 </body>
 
-</html>
+</html>
@@ -14,11 +14,13 @@ export const Complaint = {
     uploadedImages,
     mobileNumber,
     name,
+    user,
   }) => {
     const tenantId = Digit.ULBService.getCurrentTenantId();
     const defaultData = {
       service: {
         tenantId: cityCode,
+        active :true,
         serviceCode: complaintType,
         description: description,
         additionalDetail: {},
@@ -36,15 +38,18 @@ export const Complaint = {
           },
           geoLocation: {},
         },
+        user: user, 
       },
       workflow: {
-        action: "APPLY",
-        verificationDocuments: uploadedImages,
+        // action: "APPLY",
+        // verificationDocuments: uploadedImages,
+        action: "CREATE", assignes: [], hrmsAssignes: [], comments: ""
       },
     };
 
+
     if (Digit.SessionStorage.get("user_type") === "employee") {
-      defaultData.service.citizen = {
+      defaultData.service.user = {
         name: name,
         type: "CITIZEN",
         mobileNumber: mobileNumber,
@@ -59,6 +64,7 @@ export const Complaint = {
         tenantId: tenantId,
       };
     }
+
     const response = await Digit.PGRService.create(defaultData, cityCode);
     return response;
   },
@@ -79,8 +85,7 @@ export const Complaint = {
       : null;
 
     if (!uploadedDocument) complaintDetails.workflow.verificationDocuments = [];
-
-    //TODO: get tenant id
+
     const response = await Digit.PGRService.update(complaintDetails, tenantId);
     return response;
   },

@@ -1,5 +1,4 @@
 import {
-  BackButton,
   CitizenHomeCard,
   CitizenInfoLabel,
   Loader,
@@ -94,8 +93,8 @@ const CitizenHome = ({
       <div className="citizen-all-services-wrapper">
         {location.pathname.includes(
           "sanitation-ui/citizen/all-services"
-        ) ? null : (
-          <BackButton />
+        // ) ? null : (
+          // <BackButton />
         )}
         <div className="citizenAllServiceGrid">
           {moduleArray

@@ -13,7 +13,7 @@ const LanguageSelection = () => {
   const texts = useMemo(
     () => ({
       header: t("CS_COMMON_CHOOSE_LANGUAGE"),
-      submitBarLabel: t("CORE_COMMON_CONTINUE"),
+       submitBarLabel: t("CORE_COMMON_CONTINUE"),
     }),
     [t]
   );
@@ -41,6 +41,13 @@ const LanguageSelection = () => {
         <CardHeader>{t("CS_COMMON_CHOOSE_LANGUAGE")}</CardHeader>
         <RadioButtons {...RadioButtonProps} />
       </PageBasedInput>
+      <style>
+        {`
+          .digit-submit-bar-container {
+            display: none;
+          }
+        `}
+      </style>
     </div>
   );
 };

@@ -1,9 +1,9 @@
-import { BackButton, CardHeader, CardLabelError, PageBasedInput, SearchOnRadioButtons } from "@egovernments/digit-ui-components";
+import {  CardHeader, CardLabelError, PageBasedInput, SearchOnRadioButtons } from "@egovernments/digit-ui-components";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory, useLocation } from "react-router-dom";
 
-const LocationSelection = () => {
+ const LocationSelection = () => {
   const { t } = useTranslation();
   const history = useHistory();
   const location = useLocation();
@@ -51,12 +51,19 @@ const LocationSelection = () => {
     <loader />
   ) : (
     <div className="selection-card-wrapper">
-      <BackButton />
+      {/* <BackButton /> */}
       <PageBasedInput texts={texts} onSubmit={onSubmit} className="location-selection-container">
         <CardHeader>{t("CS_COMMON_CHOOSE_LOCATION")}</CardHeader>
         <SearchOnRadioButtons {...RadioButtonProps} placeholder={t("COMMON_TABLE_SEARCH")} />
         {showError ? <CardLabelError>{t("CS_COMMON_LOCATION_SELECTION_ERROR")}</CardLabelError> : null}
       </PageBasedInput>
+      <style>
+        {`
+          .digit-submit-bar-container {
+            display: none;
+          }
+        `}
+      </style>
     </div>
   );
 };

@@ -0,0 +1,16 @@
+export const PGRConstants = {
+  INDIA: {
+      countryCode: '+91',
+      regex: /^[6-9]\d{9}$/,
+  },
+  MOZ: {
+      countryCode: '+258',
+      regex: /^[0-9]\d{8}$/,
+  },
+  ET: {
+      countryCode: '+251',
+      regex: /^[0-9]\d{9}$/, 
+  },
+
+
+};
@@ -1,17 +1,42 @@
 import { FormStep } from "@egovernments/digit-ui-components";
-import React from "react";
+import React, { useState } from "react";
+import { PGRConstants } from "./PGRConstants";
 
 const SelectMobileNumber = ({ t, onSelect, showRegisterLink, mobileNumber, onMobileChange, config, canSubmit }) => {
+  const [selectedCountryCode, setSelectedCountryCode] = useState(PGRConstants.INDIA.countryCode);
+
+  const countryOptions = Object.values(PGRConstants).map(({ countryCode }, index) => (
+    <option key={index} value={countryCode}>
+      {countryCode}
+    </option>
+  ));
+
+  const getPhonePattern = (selectedCountryCode) => {
+    return Object.values(PGRConstants).find(e => e.countryCode === selectedCountryCode)?.regex;
+  };
+
+  const validation = {
+    required: true,
+    pattern: getPhonePattern(selectedCountryCode),
+  };
+
   return (
+    <div className="custom-margin-bottom">
     <FormStep
       isDisabled={!(mobileNumber.length === 10 && canSubmit)}
       onSelect={onSelect}
       config={config}
       t={t}
-      componentInFront="+91"
+      componentInFront={
+        <select value={selectedCountryCode} onChange={(e) => setSelectedCountryCode(e.target.value)}>
+          {countryOptions}
+        </select>
+      }
       onChange={onMobileChange}
       value={mobileNumber}
+      validation={validation} 
     ></FormStep>
+    </div>
   );
 };
 

@@ -1,4 +1,4 @@
-import { CardText, CardLabelError, FormStep, OTPInput } from "@egovernments/digit-ui-components";
+  import { CardLabelError, CardText, FormStep, OTPInput } from "@egovernments/digit-ui-react-components";
 import React, { Fragment, useState } from "react";
 import useInterval from "../../../hooks/useInterval";
 
@@ -48,4 +48,4 @@ const SelectOtp = ({ config, otp, onOtpChange, onResend, onSelect, t, error, use
   );
 };
 
-export default SelectOtp;
+export default SelectOtp;
@@ -1,11 +1,11 @@
 import { AppContainer, BackButton ,Toast} from "@egovernments/digit-ui-components";
 import React, { useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Route, Switch, useHistory, useLocation, useRouteMatch } from "react-router-dom";
-import { loginSteps } from "./config";
+ import { useTranslation } from "react-i18next";
+ import { Route, Switch, useHistory, useLocation, useRouteMatch } from "react-router-dom";
+ import { loginSteps } from "./config";
 import SelectMobileNumber from "./SelectMobileNumber";
-import SelectName from "./SelectName";
-import SelectOtp from "./SelectOtp";
+ import SelectName from "./SelectName";
+ import SelectOtp from "./SelectOtp";
 
 const TYPE_REGISTER = { type: "register" };
 const TYPE_LOGIN = { type: "login" };
@@ -31,20 +31,20 @@ const getFromLocation = (state, searchParams) => {
 };
 
 const Login = ({ stateCode, isUserRegistered = true }) => {
-  const { t } = useTranslation();
-  const location = useLocation();
-  const { path, url } = useRouteMatch();
+   const { t } = useTranslation();
+   const location = useLocation();
+   const { path, url } = useRouteMatch();
   const history = useHistory();
   const [user, setUser] = useState(null);
   const [error, setError] = useState(null);
-  const [isOtpValid, setIsOtpValid] = useState(true);
-  const [tokens, setTokens] = useState(null);
-  const [params, setParmas] = useState(isUserRegistered ? {} : location?.state?.data);
-  const [errorTO, setErrorTO] = useState(null);
-  const searchParams = Digit.Hooks.useQueryParams();
+   const [isOtpValid, setIsOtpValid] = useState(true);
+   const [tokens, setTokens] = useState(null);
+   const [params, setParmas] = useState(isUserRegistered ? {} : location?.state?.data);
+ const [errorTO, setErrorTO] = useState(null);
+   const searchParams = Digit.Hooks.useQueryParams();
   const [canSubmitName, setCanSubmitName] = useState(false);
-  const [canSubmitOtp, setCanSubmitOtp] = useState(true);
-  const [canSubmitNo, setCanSubmitNo] = useState(true);
+   const [canSubmitOtp, setCanSubmitOtp] = useState(true);
+   const [canSubmitNo, setCanSubmitNo] = useState(true);
 
   useEffect(() => {
     let errorTimeout;
@@ -230,10 +230,11 @@ const Login = ({ stateCode, isUserRegistered = true }) => {
   };
 
   return (
-    <div className="citizen-form-wrapper">
-      <Switch>
-        <AppContainer>
-          <BackButton />
+     <div className="citizen-form-wrapper">
+       <Switch>
+         <AppContainer>
+          {/* <BackButton /> */}
+    <div>
           <Route path={`${path}`} exact>
             <SelectMobileNumber
               onSelect={selectMobileNumber}
@@ -245,25 +246,30 @@ const Login = ({ stateCode, isUserRegistered = true }) => {
               t={t}
             />
           </Route>
-          <Route path={`${path}/otp`}>
-            <SelectOtp
+          </div>,
+    <div>
+        <Route path={`${path}/otp`}>
+           <SelectOtp
               config={{ ...stepItems[1], texts: { ...stepItems[1].texts, cardText: `${stepItems[1].texts.cardText} ${params.mobileNumber || ""}` } }}
               onOtpChange={handleOtpChange}
               onResend={resendOtp}
               onSelect={selectOtp}
-              otp={params.otp}
-              error={isOtpValid}
-              canSubmit={canSubmitOtp}
-              t={t}
-            />
-          </Route>
+               otp={params.otp}
+               error={isOtpValid}
+               canSubmit={canSubmitOtp}
+               t={t}
+             />
+           </Route> 
+    </div>,
+    <div>
           <Route path={`${path}/name`}>
-            <SelectName config={stepItems[2]} onSelect={selectName} t={t} isDisabled={canSubmitName} />
+            <SelectName  onSelect={selectName} t={t} isDisabled={canSubmitName} />
           </Route>
-          {error && <Toast type={"error"} label={error} onClose={() => setError(null)} />}
+          </div>,
+           {error && <Toast type={"error"} label={error} onClose={() => setError(null)} />}
         </AppContainer>
-      </Switch>
-    </div>
+       </Switch>
+     </div>
   );
 };
 

@@ -0,0 +1,16 @@
+export const PGRConstants = {
+  INDIA: {
+      countryCode: '+91',
+      regex: /^[6-9]\d{9}$/,
+  },
+  MOZ: {
+      countryCode: '+258',
+      regex: /^[0-9]\d{8}$/,
+  },
+  ET: {
+      countryCode: '+251',
+      regex: /^[0-9]\d{9}$/, 
+  },
+
+
+};