Merge pull request #961 from egovernments/develop

Develop
egovernments · Sep 23, 2024 · 861db5e · 861db5e
2 parents 4fa1372 + c304f3f
commit 861db5e
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 50 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js
@@ -33,6 +33,8 @@ const Details = () => {
   const [successData, setsuccessData, clearSuccessData] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_MUTATION_SUCCESS_DATA", false);
   const isMobile = window.Digit.Utils.browser.isMobile();
   const STATE_ADMIN = Digit.UserService.hasAccess(["STATE_ADMIN"]);
+  const DIVISION_ADMIN = Digit.UserService.hasAccess(["DIV_ADMIN"]);
+
   const { data: mdmsData = {} } = Digit.Hooks.hrms.useHrmsMDMS(tenantId, "egov-hrms", "HRMSRolesandDesignation") || {};
 
   mdmsData?.MdmsRes?.["tenant"]["tenants"]?.map((items) => {
@@ -42,7 +44,6 @@ const Details = () => {
       }
     });
   });
-  // console.log(data, "data");
 
   useEffect(() => {
     setMutationHappened(false);
@@ -65,7 +66,7 @@ const Details = () => {
     window.open(documentLink, "_blank");
   };
 
-  const submitAction = (data) => { };
+  const submitAction = (data) => {};
 
   useEffect(() => {
     switch (selectedAction) {
@@ -117,14 +118,9 @@ const Details = () => {
               <Row label={t("HR_MOB_NO_LABEL")} text={data?.Employees?.[0]?.user?.mobileNumber || "NA"} textStyle={{ whiteSpace: "pre" }} />
               <Row label={t("HR_GENDER_LABEL")} text={t(data?.Employees?.[0]?.user?.gender) || "NA"} />
               <Row label={t("HR_EMAIL_LABEL")} text={data?.Employees?.[0]?.user?.emailId || "NA"} />
-              <Row label={t("HR_COMMON_DEPARTMENT")} text={
-
-                t(data?.Employees?.[0]?.assignments[0]?.department)
-                || "NA"} />
-              <Row label={t("HR_COMMON_USER_DESIGNATION")} text={
-                t(data?.Employees?.[0]?.assignments[0]?.designation)
-
-                || "NA"} />
+              <Row label={t("HR_COMMON_DEPARTMENT")} text={t(data?.Employees?.[0]?.assignments[0]?.department) || "NA"} />
+              <Row label={t("HR_COMMON_USER_DESIGNATION")} text={t(data?.Employees?.[0]?.assignments[0]?.designation) || "NA"} />
+              {DIVISION_ADMIN === 1 && <Row label={t("HR_COMMON_USER_PRIMARY_VILLAGE")} text={t(data?.Employees?.[0]?.tenantId) || "NA"} />}
             </StatusTable>
             {data?.Employees?.[0]?.isActive == false ? (
               <StatusTable>
@@ -139,8 +135,8 @@ const Details = () => {
                   text={
                     t(
                       "EGOV_HRMS_DEACTIVATIONREASON_" +
-                      data?.Employees?.[0]?.deactivationDetails?.sort((a, b) => new Date(a.effectiveFrom) - new Date(b.effectiveFrom))[0]
-                        .reasonForDeactivation
+                        data?.Employees?.[0]?.deactivationDetails?.sort((a, b) => new Date(a.effectiveFrom) - new Date(b.effectiveFrom))[0]
+                          .reasonForDeactivation
                     ) || "NA"
                   }
                 />
@@ -183,41 +179,41 @@ const Details = () => {
 
             {data?.Employees?.[0]?.jurisdictions?.length > 0
               ? data?.Employees?.[0]?.jurisdictions?.map((element, index) => {
-                return (
-                  <StatusTable
-                    key={index}
-                    style={{
-                      maxWidth: "640px",
-                      border: "1px solid rgb(214, 213, 212)",
-                      inset: "0px",
-                      width: "auto",
-                      padding: ".2rem",
-                      marginBottom: "2rem",
-                    }}
-                  >
-                    <div style={{ paddingBottom: "2rem" }}>
-                      {" "}
-                      {t("HR_JURISDICTION")} {index + 1}
-                    </div>
-                    {STATE_ADMIN ? (
-                      <Row
-                        label={t("HR_DIVISIONS_LABEL")}
-                        text={t(Digit.Utils.locale.convertToLocale(element?.division, "EGOV_LOCATION_BOUNDARYTYPE"))}
-                        textStyle={{ whiteSpace: "pre" }}
-                      />
-                    ) : null}
-                    <Row label={t("HR_BOUNDARY_LABEL")} text={t(element?.boundary)} />
-                    {!STATE_ADMIN ? (
-                      <Row
-                        label={t("HR_ROLE_LABEL")}
-                        text={data?.Employees?.[0]?.user.roles
-                          .filter((ele) => ele.tenantId == element?.boundary)
-                          ?.map((ele) => t(`ACCESSCONTROL_ROLES_ROLES_` + ele?.code))}
-                      />
-                    ) : null}
-                  </StatusTable>
-                );
-              })
+                  return (
+                    <StatusTable
+                      key={index}
+                      style={{
+                        maxWidth: "640px",
+                        border: "1px solid rgb(214, 213, 212)",
+                        inset: "0px",
+                        width: "auto",
+                        padding: ".2rem",
+                        marginBottom: "2rem",
+                      }}
+                    >
+                      <div style={{ paddingBottom: "2rem" }}>
+                        {" "}
+                        {t("HR_JURISDICTION")} {index + 1}
+                      </div>
+                      {STATE_ADMIN ? (
+                        <Row
+                          label={t("HR_DIVISIONS_LABEL")}
+                          text={t(Digit.Utils.locale.convertToLocale(element?.division, "EGOV_LOCATION_BOUNDARYTYPE"))}
+                          textStyle={{ whiteSpace: "pre" }}
+                        />
+                      ) : null}
+                      <Row label={t("HR_BOUNDARY_LABEL")} text={t(element?.boundary)} />
+                      {!STATE_ADMIN ? (
+                        <Row
+                          label={t("HR_ROLE_LABEL")}
+                          text={data?.Employees?.[0]?.user.roles
+                            .filter((ele) => ele.tenantId == element?.boundary)
+                            ?.map((ele) => t(`ACCESSCONTROL_ROLES_ROLES_` + ele?.code))}
+                        />
+                      ) : null}
+                    </StatusTable>
+                  );
+                })
               : null}
           </Card>
         </div>
@@ -240,4 +236,4 @@ const Details = () => {
   );
 };
 
-export default Details;
+export default Details;
diff --git a/...ervices/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java b/...ervices/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java
@@ -205,8 +205,8 @@ public BigDecimal getWaterEstimationCharge(WaterConnection waterConnection, Calc
 
 		// WaterCharge Calculation
 		Double totalUOM = getUnitOfMeasurement(waterConnection, calculationAttribute, criteria);
-		if (totalUOM == 0.0)
-			return waterCharge;
+		/*if (totalUOM == 0.0)
+			return waterCharge;*/
 		BillingSlab billSlab = billingSlabs.get(0);
 		// IF calculation type is flat then take flat rate else take slab and calculate the charge
 		//For metered connection calculation on graded fee slab