@mseva/digit-ui-module-noc 1.0.75 → 1.0.76

package/dist/index.modern.js

@@ -13688,6 +13688,7 @@ const getTimelineAcknowledgementData = (workflowDetails, tenantInfo, pdfFiles =
     const formats = (downloadLink === null || downloadLink === void 0 ? void 0 : (_downloadLink$split = downloadLink.split(",")) === null || _downloadLink$split === void 0 ? void 0 : _downloadLink$split.filter(Boolean)) || [];
     return (formats === null || formats === void 0 ? void 0 : formats.find(link => !(link !== null && link !== void 0 && link.includes("large")) && !(link !== null && link !== void 0 && link.includes("medium")) && !(link !== null && link !== void 0 && link.includes("small")))) || (formats === null || formats === void 0 ? void 0 : formats[0]) || "";
   };
+  const pattern = /\[#\?.*?\*\*\]/;
   const timelineRows = timeline.map((item, index) => {
     var _item$auditDetails, _item$auditDetails2, _item$assigner, _item$assigner2, _item$assigner3, _item$wfComment;
     const createdDate = (item === null || item === void 0 ? void 0 : (_item$auditDetails = item.auditDetails) === null || _item$auditDetails === void 0 ? void 0 : _item$auditDetails.created) || "N/A";
@@ -13697,7 +13698,8 @@ const getTimelineAcknowledgementData = (workflowDetails, tenantInfo, pdfFiles =
     const mobileNumber = (item === null || item === void 0 ? void 0 : (_item$assigner3 = item.assigner) === null || _item$assigner3 === void 0 ? void 0 : _item$assigner3.mobileNumber) || "N/A";
     const action = (item === null || item === void 0 ? void 0 : item.performedAction) || "N/A";
     const status = (item === null || item === void 0 ? void 0 : item.status) || (item === null || item === void 0 ? void 0 : item.state) || "N/A";
-    const comment = (item === null || item === void 0 ? void 0 : (_item$wfComment = item.wfComment) === null || _item$wfComment === void 0 ? void 0 : _item$wfComment[0]) || "-";
+    const rawComment = (item === null || item === void 0 ? void 0 : (_item$wfComment = item.wfComment) === null || _item$wfComment === void 0 ? void 0 : _item$wfComment[0]) || "-";
+    const comment = typeof rawComment === "string" ? rawComment.split(pattern)[0] : rawComment;
     const documents = (item === null || item === void 0 ? void 0 : item.wfDocuments) || [];
     const sla = (item === null || item === void 0 ? void 0 : item.sla) || "N/A";
     const assignedTo = Array.isArray(item === null || item === void 0 ? void 0 : item.assignes) ? item.assignes.map(a => a === null || a === void 0 ? void 0 : a.name).filter(Boolean).join(", ") : "";
@@ -16377,7 +16379,7 @@ const NOCFeeTable = ({
     style: {
       cursor: "pointer"
     }
-  }, /*#__PURE__*/React.createElement(CardSubHeader, null, t("FEE_HISTORY"), " ", showHistory ? "▲" : "▼")), showHistory && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(CardSubHeader, null, t("FEE_HISTORY"), " ", showHistory ? "▲" : "▼")), showHistory && /*#__PURE__*/React.createElement("div", {
     style: {
       overflowX: "auto",
       WebkitOverflowScrolling: "touch",
@@ -16390,59 +16392,76 @@ const NOCFeeTable = ({
     style: {
       width: "100%",
       tableLayout: "auto",
-      minWidth: "500px",
+      minWidth: "600px",
       borderCollapse: "collapse"
     }
   }, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", {
-    rowSpan: 2,
-    style: {
-      padding: "12px 8px",
-      fontSize: "12px",
-      minWidth: "120px"
-    }
-  }, t("LABELS")), Array.from({
-    length: Math.max(...Object.values(feeHistory).map(rows => rows.length))
-  }).map((_, idx) => /*#__PURE__*/React.createElement("th", {
-    key: idx,
-    colSpan: Object.keys(feeHistory).length,
     style: {
       padding: "12px 8px",
       fontSize: "12px",
-      textAlign: "center"
+      minWidth: "150px"
     }
-  }, t("ENTRY"), " ", idx + 1))), /*#__PURE__*/React.createElement("tr", null, Array.from({
-    length: Math.max(...Object.values(feeHistory).map(rows => rows.length))
-  }).flatMap((_, idx) => Object.keys(feeHistory).map(taxHeadCode => /*#__PURE__*/React.createElement("th", {
-    key: `${idx}-${taxHeadCode}`,
+  }, " "), Object.keys(feeHistory).map(taxHeadCode => /*#__PURE__*/React.createElement("th", {
+    key: taxHeadCode,
     style: {
       padding: "12px 8px",
       fontSize: "12px",
       whiteSpace: "nowrap",
       minWidth: "120px"
     }
-  }, t(taxHeadCode)))))), /*#__PURE__*/React.createElement("tbody", null, ["FEE", "REMARK", "LAST_UPDATED_BY"].map(labelKey => /*#__PURE__*/React.createElement("tr", {
-    key: labelKey
-  }, /*#__PURE__*/React.createElement("td", {
-    style: {
-      fontWeight: "bold",
-      padding: "12px 8px"
-    }
-  }, t(labelKey)), Array.from({
+  }, t(taxHeadCode))))), /*#__PURE__*/React.createElement("tbody", null, Array.from({
     length: Math.max(...Object.values(feeHistory).map(rows => rows.length))
-  }).flatMap((_, idx) => Object.entries(feeHistory).map(([taxHeadCode, historyRows]) => {
-    const h = historyRows[idx];
-    let value;
-    if (labelKey === "FEE") value = (h === null || h === void 0 ? void 0 : h.estimateAmount) || t("CS_NA");
-    if (labelKey === "REMARK") value = (h === null || h === void 0 ? void 0 : h.remarks) || t("CS_NA");
-    if (labelKey === "LAST_UPDATED_BY") value = (h === null || h === void 0 ? void 0 : h.who) || t("UNKNOWN");
-    return /*#__PURE__*/React.createElement("td", {
-      key: `${labelKey}-${idx}-${taxHeadCode}`,
+  }).map((_, rowIdx) => {
+    const descIdx = rowIdx;
+    return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("tr", {
+      key: `fee-${rowIdx}`
+    }, /*#__PURE__*/React.createElement("td", {
       style: {
+        fontWeight: "bold",
         padding: "12px 8px",
-        fontSize: "12px"
+        borderBottom: "none"
       }
-    }, value);
-  }))))))))));
+    }, t("FEE")), Object.entries(feeHistory).map(([taxHeadCode, historyRows]) => {
+      const h = historyRows[descIdx];
+      return /*#__PURE__*/React.createElement("td", {
+        key: `${taxHeadCode}-fee-${rowIdx}`,
+        style: {
+          padding: "12px 8px"
+        }
+      }, (h === null || h === void 0 ? void 0 : h.estimateAmount) || t("CS_NA"));
+    })), /*#__PURE__*/React.createElement("tr", {
+      key: `remark-${rowIdx}`
+    }, /*#__PURE__*/React.createElement("td", {
+      style: {
+        fontWeight: "bold",
+        padding: "12px 8px",
+        borderBottom: "none"
+      }
+    }, t("REMARK")), Object.entries(feeHistory).map(([taxHeadCode, historyRows]) => {
+      const h = historyRows[descIdx];
+      return /*#__PURE__*/React.createElement("td", {
+        key: `${taxHeadCode}-remark-${rowIdx}`,
+        style: {
+          padding: "12px 8px"
+        }
+      }, (h === null || h === void 0 ? void 0 : h.remarks) || t("CS_NA"));
+    })), /*#__PURE__*/React.createElement("tr", {
+      key: `who-${rowIdx}`
+    }, /*#__PURE__*/React.createElement("td", {
+      style: {
+        fontWeight: "bold",
+        padding: "12px 8px"
+      }
+    }, t("LAST_UPDATED_BY")), Object.entries(feeHistory).map(([taxHeadCode, historyRows]) => {
+      const h = historyRows[descIdx];
+      return /*#__PURE__*/React.createElement("td", {
+        key: `${taxHeadCode}-who-${rowIdx}`,
+        style: {
+          padding: "12px 8px"
+        }
+      }, (h === null || h === void 0 ? void 0 : h.who) || t("UNKNOWN"));
+    })));
+  }))))));
 };
 
 const NOCFeeEstimationDetails = ({
@@ -17838,6 +17857,12 @@ const getNOCSanctionLetter = async (application, t, EmpData, approverComment) =>
     }];
     regularized_label = "NA";
   }
+  let areaSummary;
+  if ((site === null || site === void 0 ? void 0 : site.buildingStatus) === "Built Up") {
+    areaSummary = ` ${floorArea.map(f => `${f.floorNo}: ${f.value} sq.mtrs\n`).join(" ")}Basement Area: ${basementArea} sq.mtrs\nTotal Buildup Area (sq.mtrs): ${totalFloorArea} sq.mtrs `;
+  } else {
+    areaSummary = "NA";
+  }
   const sanctionKeys = ["NOC_SANCTION_THREE", "NOC_SANCTION_FOUR", "NOC_SANCTION_FIVE", "NOC_SANCTION_SIX", "NOC_SANCTION_SEVEN", "NOC_SANCTION_EIGHT"];
   const isProvisional = (site === null || site === void 0 ? void 0 : site.specificationNocType) === "Provisional";
   const activeKeys = isProvisional ? sanctionKeys : sanctionKeys.slice(1);
@@ -17866,7 +17891,8 @@ const getNOCSanctionLetter = async (application, t, EmpData, approverComment) =>
       ...EmpData,
       approverComment,
       regularized_label,
-      ownersString
+      ownersString,
+      areaSummary
     }]
   };
 };
@@ -18373,9 +18399,9 @@ const InspectionReportForm = _props => {
     className: "bpa-table-container"
   }, /*#__PURE__*/React.createElement("table", {
     className: "customTable table-border-style"
-  }, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", null, t("BPA_CHECK_LIST_DETAILS")), /*#__PURE__*/React.createElement("th", null, t("BPA_REMARKS")))), /*#__PURE__*/React.createElement("tbody", null, extendedQuestions && extendedQuestions.map((ob, ind) => /*#__PURE__*/React.createElement("tr", {
+  }, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", null, t("SR_NO")), /*#__PURE__*/React.createElement("th", null, t("BPA_CHECK_LIST_DETAILS")), /*#__PURE__*/React.createElement("th", null, t("BPA_REMARKS")))), /*#__PURE__*/React.createElement("tbody", null, extendedQuestions && extendedQuestions.map((ob, ind) => /*#__PURE__*/React.createElement("tr", {
     key: ind
-  }, /*#__PURE__*/React.createElement("td", null, t(ob === null || ob === void 0 ? void 0 : ob.question) || t("CS_NA")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Controller, {
+  }, /*#__PURE__*/React.createElement("td", null, ind + 1), " ", /*#__PURE__*/React.createElement("td", null, t(ob === null || ob === void 0 ? void 0 : ob.question) || t("CS_NA")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: `Remarks_${ind}`,
     defaultValue: unit[`Remarks_${ind}`] || "",
@@ -18442,6 +18468,11 @@ const InspectionReportDisplay = ({
     t: t,
     data: tableData,
     columns: [{
+      Header: t("SR_NO"),
+      Cell: ({
+        row
+      }) => row.index + 1
+    }, {
       Header: t("BPA_CHECK_LIST_DETAILS"),
       accessor: "question"
     }, {
@@ -18640,7 +18671,7 @@ const NOCEmployeeApplicationOverview = () => {
       if (approvercomments !== null && approvercomments !== void 0 && approvercomments.includes("[#?..**]")) {
         conditionText = approvercomments.split("[#?..**]")[1] || "";
       }
-      const finalComment = conditionText ? `The above approval is subjected to the following conditions: ${conditionText}` : "";
+      const finalComment = conditionText ? `The above approval is subjected to the following conditions:\n${conditionText}` : "";
       setApproverComment(finalComment);
     }
   }, [workflowDetails]);
@@ -19006,10 +19037,17 @@ const NOCEmployeeApplicationOverview = () => {
         var _latestCalc$taxHeadEs2, _latestCalc$taxHeadEs3;
         if (!row.edited) return true;
         const originalRemark = (latestCalc === null || latestCalc === void 0 ? void 0 : (_latestCalc$taxHeadEs2 = latestCalc.taxHeadEstimates) === null || _latestCalc$taxHeadEs2 === void 0 ? void 0 : (_latestCalc$taxHeadEs3 = _latestCalc$taxHeadEs2.find(th => th.taxHeadCode === row.taxHeadCode)) === null || _latestCalc$taxHeadEs3 === void 0 ? void 0 : _latestCalc$taxHeadEs3.remarks) ?? "";
-        console.log("originalRemark", originalRemark);
-        const isremarksSame = row.remark && row.remark.trim() !== "" && row.remark.trim() !== originalRemark.trim();
-        console.log("isremarksSame", isremarksSame);
-        return row.remark && row.remark.trim() !== "" && row.remark.trim() !== originalRemark.trim();
+        const adjustedAmount = row.adjustedAmount ?? 0;
+        if ((row === null || row === void 0 ? void 0 : row.taxHeadCode) === "NOC_COMPOUNDING_FEES") {
+          if (adjustedAmount > 0) {
+            var _row$remark;
+            return (row === null || row === void 0 ? void 0 : row.remark) && (row === null || row === void 0 ? void 0 : row.remark.trim()) !== "" && (row === null || row === void 0 ? void 0 : (_row$remark = row.remark) === null || _row$remark === void 0 ? void 0 : _row$remark.trim()) !== (originalRemark === null || originalRemark === void 0 ? void 0 : originalRemark.trim());
+          }
+          return true;
+        } else {
+          var _row$remark2, _row$remark3;
+          return (row === null || row === void 0 ? void 0 : row.remark) && (row === null || row === void 0 ? void 0 : (_row$remark2 = row.remark) === null || _row$remark2 === void 0 ? void 0 : _row$remark2.trim()) !== "" && (row === null || row === void 0 ? void 0 : (_row$remark3 = row.remark) === null || _row$remark3 === void 0 ? void 0 : _row$remark3.trim()) !== (originalRemark === null || originalRemark === void 0 ? void 0 : originalRemark.trim());
+        }
       });
       if (!hasNonZeroFee) {
         setShowToast({
@@ -24315,21 +24353,27 @@ const NOCApplicantDetails = _props => {
           }
           props.onChange(e);
           if (e) {
-            dispatch(UPDATE_NOCNewApplication_FORM("cpt", null));
-            dispatch(UPDATE_NOCNewApplication_FORM("applicationDetails", null));
-            dispatch(UPDATE_NOC_OwnerIds("ownerIdList", []));
-            dispatch(UPDATE_NOC_OwnerPhotos("ownerPhotoList", []));
-            dispatch(UPDATE_NOCNewApplication_FORM("siteDetails", {
-              ...(currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.siteDetails),
-              vasikaNumber: "",
-              vasikaDate: null,
-              netTotalArea: null,
-              proposedSiteAddress: ""
-            }));
-            reset({
-              owners: [defaultOwner()],
-              isPropertyAvailable: e
-            });
+            const firstOwnerPropertyId = getValues("owners[0].propertyId");
+            const isYes = e.value === true;
+            const mustReset = tenantId === LUDHIANA_TENANT || tenantId === BATHINDA_TENANT;
+            const shouldReset = isYes || mustReset || !!firstOwnerPropertyId && firstOwnerPropertyId.trim() !== "";
+            if (shouldReset) {
+              dispatch(UPDATE_NOCNewApplication_FORM("cpt", null));
+              dispatch(UPDATE_NOCNewApplication_FORM("applicationDetails", null));
+              dispatch(UPDATE_NOC_OwnerIds("ownerIdList", []));
+              dispatch(UPDATE_NOC_OwnerPhotos("ownerPhotoList", []));
+              dispatch(UPDATE_NOCNewApplication_FORM("siteDetails", {
+                ...(currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.siteDetails),
+                vasikaNumber: "",
+                vasikaDate: null,
+                netTotalArea: null,
+                proposedSiteAddress: ""
+              }));
+              reset({
+                owners: [defaultOwner()],
+                isPropertyAvailable: e
+              });
+            }
           }
           setIsPropertyAvailable(e);
         },
@@ -28959,7 +29003,7 @@ const CitizenApplicationOverview = () => {
       if (approvercomments !== null && approvercomments !== void 0 && approvercomments.includes("[#?..**]")) {
         conditionText = approvercomments.split("[#?..**]")[1] || "";
       }
-      const finalComment = conditionText ? `The above approval is subjected to the following conditions: ${conditionText}` : "";
+      const finalComment = conditionText ? `The above approval is subjected to the following conditions:\n${conditionText}` : "";
       setApproverComment(finalComment);
     }
   }, [workflowDetails]);