@djb25/digit-ui-module-ekyc 1.0.54 → 1.0.56

package/dist/index.modern.js

@@ -223,7 +223,7 @@ const StatusCards = _ref => {
               alert(t("NO_DATA_FOUND") || "No data found for download.");
               return;
             }
-            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile", "doorPhotoFilestoreId", "panFilestoreId", "documentProofFilestoreId", "buildingImageFileStoreId", "propertyDocumentFileStoreId", "meterPhotoFileStoreId", "modifiedBy", "zoneCode", "propertyType", "subPropertyCategory"];
+            const excludedKeys = ["status", "source", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile", "doorPhotoFilestoreId", "panFilestoreId", "documentProofFilestoreId", "buildingImageFileStoreId", "propertyDocumentFileStoreId", "meterPhotoFileStoreId", "modifiedBy", "zoneCode", "propertyType", "subPropertyCategory"];
             const headerMapping = {
               kno: t("KNO"),
               firstName: t("FIRST_NAME"),
@@ -352,9 +352,16 @@ const StatusCards = _ref => {
               if (name) {
                 cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = toTitleCase(name);
               }
-              Object.keys(item).forEach(key => {
+              const keys = Object.keys(item);
+              const orderedKeys = [...keys.filter(key => key !== "submittedAt"), ...(keys.includes("submittedAt") ? ["submittedAt"] : [])];
+              orderedKeys.forEach(key => {
                 if (excludedKeys.includes(key)) return;
                 let val = item[key];
+                if (key === "submittedAt" && val) {
+                  const date = new Date(Number(val));
+                  const pad = n => String(n).padStart(2, "0");
+                  val = pad(date.getDate()) + "/" + pad(date.getMonth() + 1) + "/" + date.getFullYear() + " " + pad(date.getHours()) + ":" + pad(date.getMinutes()) + ":" + pad(date.getSeconds());
+                }
                 if (typeof val === "object" && val !== null) {
                   return;
                 }
@@ -2085,57 +2092,174 @@ const VendorDetailsCard = () => {
   const _useState3 = useState(false),
     ekycDownloadLoading = _useState3[0],
     setEkycDownloadLoading = _useState3[1];
-  const handleDownloadEkycData = function () {
+  const handleDownloadEkycData = function (fromDate, toDate) {
     try {
       setEkycDownloadLoading(true);
       return Promise.resolve(_finallyRethrows(function () {
         return _catch(function () {
-          return Promise.resolve(Digit.EkycService.application_list({
+          return Promise.resolve(Digit.EkycService.application_list(_extends({
             tenantId: tenantId,
             offset: 0,
             limit: 10000,
             reportDownload: true
-          })).then(function (response) {
+          }, fromDate && {
+            fromDate
+          }, toDate && {
+            toDate
+          }))).then(function (response) {
             const consumerList = (response === null || response === void 0 ? void 0 : response.consumerList) || [];
             if (!consumerList || consumerList.length === 0) {
               alert(t("NO_EKYC_DATA_FOUND") || "No eKYC data found to download.");
               return;
             }
-            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "isSelfAssigned", "userType", "tenantName", "tenantMobile"];
+            const excludedKeys = ["status", "source", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile", "doorPhotoFilestoreId", "panFilestoreId", "documentProofFilestoreId", "buildingImageFileStoreId", "propertyDocumentFileStoreId", "meterPhotoFileStoreId", "modifiedBy", "zoneCode", "propertyType", "subPropertyCategory"];
             const headerMapping = {
-              kno: t("KNO") || "KNO",
-              firstName: t("FIRST_NAME") || "First Name",
-              middleName: t("MIDDLE_NAME") || "Middle Name",
-              lastName: t("LAST_NAME") || "Last Name",
-              gender: t("GENDER") || "Gender",
-              mobileNumber: t("MOBILE_NUMBER") || "Mobile Number",
-              emailId: t("EMAIL_ID") || "Email ID",
-              fatherOrHusbandName: t("FATHER_HUSBUND_NAME") || "Father/Husband Name",
-              relationship: t("RELATIONSHIP") || "Relationship",
-              dob: t("DOB") || "Date of Birth",
-              ekycStatus: t("EKYC_STATUS") || "eKYC Status",
-              zoneName: t("ZONE") || "Zone",
-              assembly: t("ASSEMBLY") || "Assembly",
-              ward: t("WARD") || "Ward",
-              pincode: t("PINCODE") || "Pincode",
-              mrkey: t("MR_KEY") || "MR Key",
-              createdTime: t("CREATED_TIME") || "Created Time",
-              lastModifiedTime: t("LAST_MODIFIED_TIME") || "Last Modified Time"
+              kno: t("KNO"),
+              firstName: t("FIRST_NAME"),
+              middleName: t("MIDDLE_NAME"),
+              lastName: t("LAST_NAME"),
+              status: t("STATUS"),
+              ekycStatus: t("EKYC_STATUS"),
+              zoneName: t("ZONE"),
+              zoneCode: t("ZONE_CODE"),
+              assembly: t("EKYC_ASSEMBLY"),
+              ward: t("WARD"),
+              pincode: t("EKYC_PINCODE"),
+              addressRaw: t("ADDRESS_RAW"),
+              locality: t("EKYC_LOCALITY"),
+              subLocality: t("SUB_LOCALITY"),
+              flatHouseNumber: t("FLAT_HOUSE_NUMBER"),
+              streetName: t("STREET_NAME"),
+              landmark: t("EKYC_LANDMARK"),
+              city: t("CITY"),
+              state: t("STATE"),
+              addressType: t("ADDRESS_TYPE"),
+              addressProofType: t("ADDRESS_PROOF_TYPE"),
+              mobileNo: t("MOBILE_NUMBER"),
+              alternateMobileNo: t("ALTERNATE_MOBILE_NUMBER"),
+              whatsappNo: t("WHATSAPP_NO"),
+              email: t("EMAIL"),
+              landlineNo: t("LANDLINE_NO"),
+              mrkey: t("MR_KEY"),
+              mrcode: t("MR_CODE"),
+              areacode: t("AREA_CODE"),
+              source: t("SOURCE"),
+              submittedAt: t("SUBMITTED_AT"),
+              assignedAt: t("ASSIGNED_AT"),
+              connectionType: t("CONNECTION_TYPE"),
+              Type: t("CONSUMER_TYPE"),
+              occupantType: t("OCCUPANT_TYPE"),
+              knoCategory: t("KNO_CATEGORY"),
+              approvedAt: t("APPROVED_AT"),
+              gender: t("GENDER"),
+              parentSpouse: t("PARENT_SPOUSE"),
+              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
+              relationship: t("RELATIONSHIP"),
+              informantName: t("INFORMANT_NAME"),
+              informantRelation: t("INFORMANT_RELATION"),
+              informantIs: t("INFORMANT_IS"),
+              contactPerson: t("CONTACT_PERSON"),
+              relation: t("RELATION"),
+              entityName: t("ENTITY_NAME"),
+              designation: t("DESIGNATION"),
+              department: t("DEPARTMENT"),
+              employeeId: t("EMPLOYEE_ID"),
+              ownerMobile: t("OWNER_MOBILE"),
+              ownerVerificationDone: t("OWNER_VERIFICATION_DONE"),
+              consentGiven: t("CONSENT_GIVEN"),
+              proofOfIdentityType: t("PROOF_OF_IDENTITY_TYPE"),
+              documentNumber: t("DOCUMENT_NUMBER"),
+              noOfPerson: t("NUMBER_OF_PERSON"),
+              latitude: t("LATITUDE"),
+              longitude: t("LONGITUDE"),
+              gpsValid: t("GPS_VALID"),
+              meterNumber: t("METER_NUMBER"),
+              meterMake: t("METER_MAKE"),
+              meterStatus: t("METER_STATUS"),
+              meterCondition: t("METER_CONDITION"),
+              meterLocation: t("METER_LOCATION"),
+              meterLocationAddress: t("METER_LOCATION_ADDRESS"),
+              workingStatus: t("WORKING_STATUS"),
+              sewerConnection: t("SEWER_CONNECTION"),
+              septicTank: t("SEPTIC_TANK"),
+              lastBillRaised: t("LAST_BILL_RAISED"),
+              lastBillReceivedDate: t("LAST_BILL_RECEIVED_DATE"),
+              accessToMeter: t("ACCESS_TO_METER"),
+              systemMeterId: t("SYSTEM_METER_ID"),
+              lastBillNotRaisedReason: t("LAST_BILL_NOT_RAISED_REASON"),
+              waterConnectionYears: t("WATER_CONNECTION_YEARS"),
+              sewerConnectionYears: t("SEWER_CONNECTION_YEARS"),
+              pidNumber: t("PID_NUMBER"),
+              propertyType: t("PROPERTY_TYPE"),
+              subPropertyCategory: t("SUB_PROPERTY_CATEGORY"),
+              noOfFloor: t("NO_OF_FLOOR"),
+              noOfRooms: t("NO_OF_ROOMS"),
+              noOfBeds: t("NO_OF_BEDS"),
+              numberOfDwellingUnits: t("NUMBER_OF_DWELLING_UNITS"),
+              floorNo: t("FLOOR_NO"),
+              userType: t("USER_TYPE"),
+              tenantName: t("TENANT_NAME"),
+              tenantMobile: t("TENANT_MOBILE"),
+              verificationStatus: t("VERIFICATION_STATUS"),
+              houseBuiltDuration: t("HOUSE_BUILT_DURATION"),
+              surveyorId: t("SURVEYOR_ID"),
+              supervisorId: t("SUPERVISOR_ID"),
+              vendorId: t("VENDOR_ID"),
+              assignmentType: t("ASSIGNMENT_TYPE"),
+              assignmentValue: t("ASSIGNMENT_VALUE"),
+              assignedTime: t("ASSIGNED_TIME"),
+              isSelfAssigned: t("IS_SELF_ASSIGNED"),
+              doorPhotoFilestoreId: t("DOOR_PHOTO_FILESTORE_ID"),
+              panFilestoreId: t("PAN_FILESTORE_ID"),
+              documentProofFilestoreId: t("DOCUMENT_PROOF_FILESTORE_ID"),
+              buildingImageFileStoreId: t("BUILDING_IMAGE_FILESTORE_ID"),
+              propertyDocumentFileStoreId: t("PROPERTY_DOCUMENT_FILESTORE_ID"),
+              meterPhotoFileStoreId: t("METER_PHOTO_FILESTORE_ID"),
+              modifiedBy: t("MODIFIED_BY"),
+              emailId: t("EMAIL_ID"),
+              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
+              dob: t("DOB"),
+              consumerType: t("CONSUMER_TYPE"),
+              createdTime: t("CREATED_TIME"),
+              lastModifiedTime: t("LAST_MODIFIED_TIME"),
+              meterLatitude: t("EKYC_METER_LATITUDE1"),
+              meterLongitude: t("EKYC_METER_LONGITUDE1")
+            };
+            const toTitleCase = str => {
+              if (!str) return "";
+              let cleanStr = String(str);
+              if (cleanStr.includes(".") && !cleanStr.includes("@") && isNaN(Number(cleanStr))) {
+                cleanStr = cleanStr.split(".").pop();
+              }
+              return cleanStr.toLowerCase().replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase());
             };
+            const skipTitleCase = ["kno", "mobileNumber", "emailId", "email", "pincode", "mrkey", "dob", "createdTime", "lastModifiedTime", "meterLatitude", "meterLongitude"];
+            const translatedFields = ["meterMake", "meterLocation"];
             const excelData = consumerList.map(item => {
               const cleanObj = {};
               const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
               if (fullName) {
-                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = fullName;
+                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = toTitleCase(fullName);
               }
               Object.keys(item).forEach(key => {
                 if (excludedKeys.includes(key)) return;
-                const val = item[key];
+                let val = item[key];
                 if (typeof val === "object" && val !== null) {
                   return;
                 }
+                if (String(val).toLowerCase() === "true") {
+                  val = t("CS_YES");
+                } else if (String(val).toLowerCase() === "false") {
+                  val = t("CS_NO");
+                }
                 const friendlyHeader = headerMapping[key] || t(key.toUpperCase()) || key;
-                cleanObj[friendlyHeader] = val;
+                if (typeof val === "string" && translatedFields.includes(key)) {
+                  cleanObj[friendlyHeader] = t(val);
+                } else if (typeof val === "string" && !skipTitleCase.includes(key)) {
+                  cleanObj[friendlyHeader] = toTitleCase(val);
+                } else {
+                  cleanObj[friendlyHeader] = val;
+                }
               });
               return cleanObj;
             });
@@ -2155,6 +2279,34 @@ const VendorDetailsCard = () => {
       return Promise.reject(e);
     }
   };
+  const getDateRange = filter => {
+    const now = new Date();
+    const start = new Date(now);
+    if (filter === "today") {
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    if (filter === "week") {
+      start.setDate(now.getDate() - now.getDay());
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    if (filter === "month") {
+      start.setDate(1);
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    return null;
+  };
   const paginatedSupervisors = useMemo(() => {
     const start = currentPage * pageSize;
     const end = start + pageSize;
@@ -2269,19 +2421,35 @@ const VendorDetailsCard = () => {
       console.error("Failed to generate report:", err);
     } finally {
       setReportLoading(false);
+    }
+  };
+  const handlePresetDownload = function (filter) {
+    try {
+      const range = getDateRange(filter);
+      if (!range) return Promise.resolve();
       setShowReportMenu(false);
       setShowCustomPicker(false);
+      return Promise.resolve(handleDownloadEkycData(range.from.getTime(), range.to.getTime())).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
     }
   };
-  const handlePresetDownload = filter => {
-    handleDownload();
-  };
-  const handleCustomDownload = () => {
-    if (!customDate.from || !customDate.to) {
-      alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
-      return;
+  const handleCustomDownload = function () {
+    try {
+      if (!customDate.from || !customDate.to) {
+        alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
+        return Promise.resolve();
+      }
+      const from = new Date(customDate.from);
+      from.setHours(0, 0, 0, 0);
+      const to = new Date(customDate.to);
+      to.setHours(23, 59, 59, 999);
+      setShowReportMenu(false);
+      setShowCustomPicker(false);
+      return Promise.resolve(handleDownloadEkycData(from.getTime(), to.getTime())).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
     }
-    handleDownload();
   };
   const StatCard = _ref3 => {
     let title = _ref3.title,
@@ -2329,65 +2497,12 @@ const VendorDetailsCard = () => {
   }, vendorName), /*#__PURE__*/React.createElement("div", {
     className: "designation"
   }, t("VENDOR_AGENCY") || "Agency / Vendor"))), /*#__PURE__*/React.createElement("div", {
-    className: "report-download",
-    ref: reportMenuRef
+    className: "report-download"
   }, /*#__PURE__*/React.createElement("button", {
     className: "download-btn",
     disabled: reportLoading,
-    onClick: () => {
-      setShowReportMenu(p => !p);
-      setShowCustomPicker(false);
-    }
-  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"), showReportMenu && /*#__PURE__*/React.createElement("div", {
-    className: "report-menu"
-  }, [{
-    label: t("TODAY") || "Today",
-    key: "today"
-  }, {
-    label: t("THIS_WEEK") || "This Week",
-    key: "week"
-  }, {
-    label: t("THIS_MONTH") || "This Month",
-    key: "month"
-  }].map(_ref4 => {
-    let label = _ref4.label,
-      key = _ref4.key;
-    return /*#__PURE__*/React.createElement("div", {
-      key: key,
-      className: "menu-item",
-      onClick: () => handlePresetDownload()
-    }, label);
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "custom-date-trigger",
-    onClick: () => setShowCustomPicker(p => !p)
-  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React.createElement("div", {
-    className: "custom-picker"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "date-field"
-  }, /*#__PURE__*/React.createElement("label", {
-    className: "date-label"
-  }, t("FROM_DATE") || "From"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.from,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      from: e.target.value
-    }))
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "date-field"
-  }, /*#__PURE__*/React.createElement("label", {
-    className: "date-label"
-  }, t("TO_DATE") || "To"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.to,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      to: e.target.value
-    }))
-  })), /*#__PURE__*/React.createElement("button", {
-    className: "download-action-btn",
-    onClick: handleCustomDownload
-  }, t("DOWNLOAD") || "Download"))))), /*#__PURE__*/React.createElement("div", {
+    onClick: handleDownload
+  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"))), /*#__PURE__*/React.createElement("div", {
     className: "stats-wrapper"
   }, cards.map((card, idx) => /*#__PURE__*/React.createElement(StatCard, {
     key: idx,
@@ -2438,10 +2553,16 @@ const VendorDetailsCard = () => {
     className: "details-right"
   }, /*#__PURE__*/React.createElement("div", {
     className: "download-card"
-  }, /*#__PURE__*/React.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React.createElement("button", {
+  }, /*#__PURE__*/React.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React.createElement("div", {
+    className: "report-download",
+    ref: reportMenuRef
+  }, /*#__PURE__*/React.createElement("button", {
     className: "download-excel-btn",
     disabled: ekycDownloadLoading,
-    onClick: handleDownloadEkycData
+    onClick: () => {
+      setShowReportMenu(p => !p);
+      setShowCustomPicker(false);
+    }
   }, /*#__PURE__*/React.createElement("svg", {
     width: "16",
     height: "16",
@@ -2460,19 +2581,75 @@ const VendorDetailsCard = () => {
     y1: "15",
     x2: "12",
     y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"))))), /*#__PURE__*/React.createElement(Card, {
-    className: "dashboard-card"
-  }, /*#__PURE__*/React.createElement(Table, {
-    t: t,
-    tableTitle: t("CONNECTED_SUPERVISORS") || "Connected Supervisors",
-    tableClass: "ekycTable",
-    data: paginatedSupervisors,
-    columns: supervisorColumns,
-    isLoading: isPageLoading,
-    totalRecords: vendorSupervisors.length,
-    currentPage: currentPage,
-    pageSizeLimit: pageSize,
-    isPaginationRequired: true,
+  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React.createElement("div", {
+    className: "report-menu"
+  }, [{
+    label: t("TODAY") || "Today",
+    key: "today"
+  }, {
+    label: t("THIS_WEEK") || "This Week",
+    key: "week"
+  }, {
+    label: t("THIS_MONTH") || "This Month",
+    key: "month"
+  }].map(_ref4 => {
+    let label = _ref4.label,
+      key = _ref4.key;
+    return /*#__PURE__*/React.createElement("div", {
+      key: key,
+      className: "menu-item",
+      onClick: () => handlePresetDownload(key)
+    }, label);
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "custom-date-trigger",
+    onClick: () => setShowCustomPicker(p => !p)
+  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React.createElement("div", {
+    className: "custom-picker"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "date-inputs"
+  }, /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "From"), /*#__PURE__*/React.createElement("input", {
+    type: "date",
+    value: customDate.from,
+    onChange: e => setCustomDate(_extends({}, customDate, {
+      from: e.target.value
+    }))
+  })), /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "To"), /*#__PURE__*/React.createElement("input", {
+    type: "date",
+    value: customDate.to,
+    onChange: e => setCustomDate(_extends({}, customDate, {
+      to: e.target.value
+    }))
+  }))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "10px",
+      marginTop: "10px"
+    }
+  }, /*#__PURE__*/React.createElement("button", {
+    className: "picker-cancel-btn",
+    onClick: () => {
+      setShowCustomPicker(false);
+      setCustomDate({
+        from: "",
+        to: ""
+      });
+    }
+  }, t("CANCEL") || "Cancel"), /*#__PURE__*/React.createElement("button", {
+    className: "picker-apply-btn",
+    onClick: handleCustomDownload
+  }, t("APPLY") || "Apply"))))))))), /*#__PURE__*/React.createElement(Card, {
+    className: "dashboard-card"
+  }, /*#__PURE__*/React.createElement(Table, {
+    t: t,
+    tableTitle: t("CONNECTED_SUPERVISORS") || "Connected Supervisors",
+    tableClass: "ekycTable",
+    data: paginatedSupervisors,
+    columns: supervisorColumns,
+    isLoading: isPageLoading,
+    totalRecords: vendorSupervisors.length,
+    currentPage: currentPage,
+    pageSizeLimit: pageSize,
+    isPaginationRequired: true,
     onNextPage: () => {
       if (currentPage < Math.ceil(vendorSupervisors.length / pageSize) - 1) {
         setCurrentPage(prev => prev + 1);
@@ -3612,7 +3789,7 @@ const ReviewSection = _ref2 => {
   })))));
 };
 const Review = () => {
-  var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _newDataRaw$connectio, _newDataRaw$connectio2, _newDataRaw$connectio3, _newDataRaw$address, _newDataRaw$address2, _newDataRaw$address3, _newDataRaw$address4, _newDataRaw$address5, _newDataRaw$address6, _newDataRaw$address7, _newDataRaw$address8, _newDataRaw$address9, _newDataRaw$address0, _newDataRaw$address1, _newDataRaw$address10, _newDataRaw$address11, _newDataRaw$address12, _newDataRaw$address13, _newDataRaw$address14, _newDataRaw$property, _newDataRaw$property2, _editedProperty$conne, _newDataRaw$property3, _editedProperty$conne2, _newDataRaw$property4, _editedProperty$userT, _newDataRaw$property5, _editedProperty$noOfF, _newDataRaw$property6, _newDataRaw$property7, _newDataRaw$meter, _editedMeter$meterSta, _newDataRaw$meter2, _newDataRaw$meter3, _newDataRaw$meter4, _newDataRaw$meter5, _editedMeter$workingS, _newDataRaw$meter6, _editedMeter$lastBill, _newDataRaw$meter7, _newDataRaw$meter8;
+  var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _newDataRaw$connectio, _newDataRaw$connectio2, _newDataRaw$connectio3, _newDataRaw$address, _newDataRaw$address2, _newDataRaw$address3, _newDataRaw$address4, _newDataRaw$address5, _newDataRaw$address6, _newDataRaw$address7, _newDataRaw$address8, _newDataRaw$address9, _newDataRaw$address0, _newDataRaw$address1, _newDataRaw$address10, _newDataRaw$address11, _newDataRaw$address12, _newDataRaw$address13, _newDataRaw$address14, _newDataRaw$property, _newDataRaw$property2, _editedProperty$conne, _newDataRaw$property3, _editedProperty$conne2, _newDataRaw$property4, _editedProperty$userT, _newDataRaw$property5, _editedProperty$noOfF, _newDataRaw$property6, _newDataRaw$property7, _newDataRaw$meter, _editedMeter$meterSta, _newDataRaw$meter2, _newDataRaw$meter3, _newDataRaw$meter4, _newDataRaw$meter5, _editedMeter$workingS, _newDataRaw$meter6, _editedMeter$lastBill, _newDataRaw$meter7, _newDataRaw$meter8, _Digit$UserService$ge, _supervisorData;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const history = useHistory();
@@ -3673,7 +3850,9 @@ const Review = () => {
     isSearchLoading = _Digit$Hooks$ekyc$use.isLoading;
   const userRoles = ((_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : (_Digit$SessionStorage2 = _Digit$SessionStorage.info) === null || _Digit$SessionStorage2 === void 0 ? void 0 : (_Digit$SessionStorage3 = _Digit$SessionStorage2.roles) === null || _Digit$SessionStorage3 === void 0 ? void 0 : _Digit$SessionStorage3.map(ele => ele.code)) || [];
   const isZRO = userRoles.includes("EKYC_ZRO") || userRoles.includes("ZRO");
-  const isSupervisorOrSurveyorOrVendor = userRoles.includes("EKYC_SUPERVISOR") || userRoles.includes("EKYC_SURVEYOR") || userRoles.includes("EKYC_VENDOR");
+  const isSupervisorOrSurveyorOrVendor = userRoles.includes("EKYC_SURVEYOR") || userRoles.includes("EKYC_VENDOR");
+  const EKYC_ROLE_PRIORITY = ["EKYC_ZRO", "ZRO", "EKYC_SUPERVISOR", "EKYC_SURVEYOR", "EKYC_VENDOR"];
+  const currentUserRole = EKYC_ROLE_PRIORITY.find(r => userRoles.includes(r)) || userRoles[0] || "EMPLOYEE";
   const isStatusView = location.pathname.includes("/status/");
   const hideEditButton = isSupervisorOrSurveyorOrVendor && !isZRO || isStatusView;
   const _extractReviewData = extractReviewData(searchData, flowState),
@@ -4107,34 +4286,48 @@ const Review = () => {
     label: "EKYC_METER_LONGITUDE1"
   }];
   const handleDeclaration = () => setAgree(!agree);
+  const loggedInUserInfo = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info;
+  const matchedSupervisor = (_supervisorData = supervisorData) === null || _supervisorData === void 0 ? void 0 : _supervisorData.find(s => (s === null || s === void 0 ? void 0 : s.uuid) === (loggedInUserInfo === null || loggedInUserInfo === void 0 ? void 0 : loggedInUserInfo.uuid) || (s === null || s === void 0 ? void 0 : s.userName) === (loggedInUserInfo === null || loggedInUserInfo === void 0 ? void 0 : loggedInUserInfo.userName));
+  const supervisorId = (matchedSupervisor === null || matchedSupervisor === void 0 ? void 0 : matchedSupervisor.uuid) || (loggedInUserInfo === null || loggedInUserInfo === void 0 ? void 0 : loggedInUserInfo.uuid);
   const handleReject = function () {
     try {
-      var _Digit$UserService$ge, _Digit$UserService$ge2, _Digit$UserService$ge3;
+      var _Digit$UserService$ge2;
       const payload = {
         RequestInfo: {
           apiId: "Rainmaker",
           ver: "1.0",
           msgId: "message-id",
           tenantId: tenantId,
-          authToken: (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.access_token
+          authToken: (_Digit$UserService$ge2 = Digit.UserService.getUser()) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.access_token
         },
         kno: activeKno,
         action: "REJECTED",
         remarks: "Application rejected by reviewer",
-        reviewedBy: (_Digit$UserService$ge2 = Digit.UserService.getUser()) === null || _Digit$UserService$ge2 === void 0 ? void 0 : (_Digit$UserService$ge3 = _Digit$UserService$ge2.info) === null || _Digit$UserService$ge3 === void 0 ? void 0 : _Digit$UserService$ge3.userName,
-        role: "ZRO"
+        reviewedBy: supervisorId,
+        role: currentUserRole
       };
       const _temp = _catch(function () {
         return Promise.resolve(workflowMutation.mutateAsync(payload)).then(function (result) {
           if (result) {
-            history.push("/digit-ui/employee/ekyc/response", {
-              success: true,
-              result
+            setToastData({
+              error: true,
+              label: t("EKYC_APPLICATION_REJECT_SUCCESSFUL") || "Application Rejected Successfully"
             });
+            setShowToast(true);
+            setTimeout(() => {
+              history.push("/digit-ui/employee/ekyc/inbox");
+            }, 2000);
           }
         });
       }, function (err) {
+        var _err$response, _err$response$data, _err$response2, _err$response2$data, _err$response2$data$E, _err$response2$data$E2, _err$Errors, _err$Errors$;
         console.error("Reject Error:", err);
+        const errMsg = (err === null || err === void 0 ? void 0 : err.message) || (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.message) || (err === null || err === void 0 ? void 0 : (_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : (_err$response2$data$E = _err$response2$data.Errors) === null || _err$response2$data$E === void 0 ? void 0 : (_err$response2$data$E2 = _err$response2$data$E[0]) === null || _err$response2$data$E2 === void 0 ? void 0 : _err$response2$data$E2.message) || (err === null || err === void 0 ? void 0 : (_err$Errors = err.Errors) === null || _err$Errors === void 0 ? void 0 : (_err$Errors$ = _err$Errors[0]) === null || _err$Errors$ === void 0 ? void 0 : _err$Errors$.message) || t("EKYC_REJECT_ERROR") || "Reject failed. Please try again.";
+        setToastData({
+          error: true,
+          label: errMsg
+        });
+        setShowToast(true);
       });
       return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
     } catch (e) {
@@ -4143,20 +4336,20 @@ const Review = () => {
   };
   const handleApprove = function () {
     try {
-      var _Digit$UserService$ge4, _Digit$UserService$ge5, _Digit$UserService$ge6;
+      var _Digit$UserService$ge3;
       const payload = {
         RequestInfo: {
           apiId: "Rainmaker",
           ver: "1.0",
           msgId: "message-id",
           tenantId: tenantId,
-          authToken: (_Digit$UserService$ge4 = Digit.UserService.getUser()) === null || _Digit$UserService$ge4 === void 0 ? void 0 : _Digit$UserService$ge4.access_token
+          authToken: (_Digit$UserService$ge3 = Digit.UserService.getUser()) === null || _Digit$UserService$ge3 === void 0 ? void 0 : _Digit$UserService$ge3.access_token
         },
         kno: activeKno,
         action: "APPROVED",
         remarks: "All documents verified",
-        reviewedBy: (_Digit$UserService$ge5 = Digit.UserService.getUser()) === null || _Digit$UserService$ge5 === void 0 ? void 0 : (_Digit$UserService$ge6 = _Digit$UserService$ge5.info) === null || _Digit$UserService$ge6 === void 0 ? void 0 : _Digit$UserService$ge6.userName,
-        role: "ZRO"
+        reviewedBy: supervisorId,
+        role: currentUserRole
       };
       const _temp2 = _catch(function () {
         return Promise.resolve(workflowMutation.mutateAsync(payload)).then(function (result) {
@@ -4172,11 +4365,12 @@ const Review = () => {
           }
         });
       }, function (err) {
-        var _err$response, _err$response$data;
+        var _err$response3, _err$response3$data, _err$response3$data$E, _err$response3$data$E2, _err$Errors2, _err$Errors2$;
         console.error("Approve Error:", err);
+        const errMsg = (err === null || err === void 0 ? void 0 : (_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : (_err$response3$data$E = _err$response3$data.Errors) === null || _err$response3$data$E === void 0 ? void 0 : (_err$response3$data$E2 = _err$response3$data$E[0]) === null || _err$response3$data$E2 === void 0 ? void 0 : _err$response3$data$E2.message) || (err === null || err === void 0 ? void 0 : (_err$Errors2 = err.Errors) === null || _err$Errors2 === void 0 ? void 0 : (_err$Errors2$ = _err$Errors2[0]) === null || _err$Errors2$ === void 0 ? void 0 : _err$Errors2$.message) || (err === null || err === void 0 ? void 0 : err.message) || t("EKYC_APPROVE_ERROR") || "Approve failed. Please try again.";
         setToastData({
           error: true,
-          label: (err === null || err === void 0 ? void 0 : err.message) || (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.message) || "Approve Error"
+          label: errMsg
         });
         setShowToast(true);
       });
@@ -4206,9 +4400,9 @@ const Review = () => {
   };
   const handleMenuSelect = option => {
     setShowOptions(false);
-    if (option.action === t("Approve")) {
+    if (option.action === t("APPROVE")) {
       handleApprove();
-    } else if (option.action === t("Reject")) {
+    } else if (option.action === t("REJECT")) {
       handleReject();
     }
   };
@@ -5684,21 +5878,37 @@ const SupervisorDetailsCard = () => {
       console.error("Failed to generate supervisor report:", err);
     } finally {
       setReportLoading(false);
+    }
+  };
+  const handlePresetDownload = function (filter) {
+    try {
+      const range = getDateRange(filter);
+      if (!range) return Promise.resolve();
       setShowReportMenu(false);
       setShowCustomPicker(false);
+      return Promise.resolve(handleDownloadEkycData(range.from.getTime(), range.to.getTime())).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
     }
   };
-  const handlePresetDownload = filter => {
-    handleDownload();
-  };
-  const handleCustomDownload = () => {
-    if (!customDate.from || !customDate.to) {
-      alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
-      return;
+  const handleCustomDownload = function () {
+    try {
+      if (!customDate.from || !customDate.to) {
+        alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
+        return Promise.resolve();
+      }
+      const from = new Date(customDate.from);
+      from.setHours(0, 0, 0, 0);
+      const to = new Date(customDate.to);
+      to.setHours(23, 59, 59, 999);
+      setShowReportMenu(false);
+      setShowCustomPicker(false);
+      return Promise.resolve(handleDownloadEkycData(from.getTime(), to.getTime())).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
     }
-    handleDownload();
   };
-  const handleDownloadEkycData = function () {
+  const handleDownloadEkycData = function (fromDate, toDate) {
     try {
       if (!surveyors || surveyors.length === 0) {
         alert(t("NO_SURVEYORS_ASSIGNED") || "No surveyors assigned to this supervisor.");
@@ -5707,45 +5917,144 @@ const SupervisorDetailsCard = () => {
       setEkycDownloadLoading(true);
       return Promise.resolve(_finallyRethrows(function () {
         return _catch(function () {
-          return Promise.resolve(Digit.EkycService.application_list({
+          return Promise.resolve(Digit.EkycService.application_list(_extends({
             tenantId: tenantId || "dl.djb",
             offset: 0,
             limit: 10000,
             reportDownload: true
-          })).then(function (response) {
+          }, fromDate && {
+            fromDate
+          }, toDate && {
+            toDate
+          }))).then(function (response) {
             const consumerList = (response === null || response === void 0 ? void 0 : response.consumerList) || [];
             if (consumerList.length === 0) {
               alert(t("NO_DATA_FOUND") || "No data found for download.");
               return;
             }
-            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile"];
+            const excludedKeys = ["status", "source", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile", "doorPhotoFilestoreId", "panFilestoreId", "documentProofFilestoreId", "buildingImageFileStoreId", "propertyDocumentFileStoreId", "meterPhotoFileStoreId", "modifiedBy", "zoneCode", "propertyType", "subPropertyCategory"];
             const headerMapping = {
-              kno: t("KNO") || "KNO",
-              firstName: t("FIRST_NAME") || "First Name",
-              middleName: t("MIDDLE_NAME") || "Middle Name",
-              lastName: t("LAST_NAME") || "Last Name",
-              gender: t("GENDER") || "Gender",
-              mobileNumber: t("MOBILE_NUMBER") || "Mobile Number",
-              emailId: t("EMAIL_ID") || "Email ID",
-              fatherOrHusbandName: t("FATHER_HUSBUND_NAME") || "Father/Husband Name",
-              relationship: t("RELATIONSHIP") || "Relationship",
-              dob: t("DOB") || "Date of Birth",
-              ekycStatus: t("EKYC_STATUS") || "eKYC Status",
-              zoneName: t("ZONE") || "Zone",
-              assembly: t("ASSEMBLY") || "Assembly",
-              ward: t("WARD") || "Ward",
-              pincode: t("PINCODE") || "Pincode",
-              mrkey: t("MR_KEY") || "MR Key",
-              consumerType: t("CONSUMER_TYPE") || "Consumer Type",
-              createdTime: t("CREATED_TIME") || "Created Time",
-              lastModifiedTime: t("LAST_MODIFIED_TIME") || "Last Modified Time"
+              kno: t("KNO"),
+              firstName: t("FIRST_NAME"),
+              middleName: t("MIDDLE_NAME"),
+              lastName: t("LAST_NAME"),
+              status: t("STATUS"),
+              ekycStatus: t("EKYC_STATUS"),
+              zoneName: t("ZONE"),
+              zoneCode: t("ZONE_CODE"),
+              assembly: t("EKYC_ASSEMBLY"),
+              ward: t("WARD"),
+              pincode: t("EKYC_PINCODE"),
+              addressRaw: t("ADDRESS_RAW"),
+              locality: t("EKYC_LOCALITY"),
+              subLocality: t("SUB_LOCALITY"),
+              flatHouseNumber: t("FLAT_HOUSE_NUMBER"),
+              streetName: t("STREET_NAME"),
+              landmark: t("EKYC_LANDMARK"),
+              city: t("CITY"),
+              state: t("STATE"),
+              addressType: t("ADDRESS_TYPE"),
+              addressProofType: t("ADDRESS_PROOF_TYPE"),
+              mobileNo: t("MOBILE_NUMBER"),
+              alternateMobileNo: t("ALTERNATE_MOBILE_NUMBER"),
+              whatsappNo: t("WHATSAPP_NO"),
+              email: t("EMAIL"),
+              landlineNo: t("LANDLINE_NO"),
+              mrkey: t("MR_KEY"),
+              mrcode: t("MR_CODE"),
+              areacode: t("AREA_CODE"),
+              source: t("SOURCE"),
+              submittedAt: t("SUBMITTED_AT"),
+              assignedAt: t("ASSIGNED_AT"),
+              connectionType: t("CONNECTION_TYPE"),
+              Type: t("CONSUMER_TYPE"),
+              occupantType: t("OCCUPANT_TYPE"),
+              knoCategory: t("KNO_CATEGORY"),
+              approvedAt: t("APPROVED_AT"),
+              gender: t("GENDER"),
+              parentSpouse: t("PARENT_SPOUSE"),
+              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
+              relationship: t("RELATIONSHIP"),
+              informantName: t("INFORMANT_NAME"),
+              informantRelation: t("INFORMANT_RELATION"),
+              informantIs: t("INFORMANT_IS"),
+              contactPerson: t("CONTACT_PERSON"),
+              relation: t("RELATION"),
+              entityName: t("ENTITY_NAME"),
+              designation: t("DESIGNATION"),
+              department: t("DEPARTMENT"),
+              employeeId: t("EMPLOYEE_ID"),
+              ownerMobile: t("OWNER_MOBILE"),
+              ownerVerificationDone: t("OWNER_VERIFICATION_DONE"),
+              consentGiven: t("CONSENT_GIVEN"),
+              proofOfIdentityType: t("PROOF_OF_IDENTITY_TYPE"),
+              documentNumber: t("DOCUMENT_NUMBER"),
+              noOfPerson: t("NUMBER_OF_PERSON"),
+              latitude: t("LATITUDE"),
+              longitude: t("LONGITUDE"),
+              gpsValid: t("GPS_VALID"),
+              meterNumber: t("METER_NUMBER"),
+              meterMake: t("METER_MAKE"),
+              meterStatus: t("METER_STATUS"),
+              meterCondition: t("METER_CONDITION"),
+              meterLocation: t("METER_LOCATION"),
+              meterLocationAddress: t("METER_LOCATION_ADDRESS"),
+              workingStatus: t("WORKING_STATUS"),
+              sewerConnection: t("SEWER_CONNECTION"),
+              septicTank: t("SEPTIC_TANK"),
+              lastBillRaised: t("LAST_BILL_RAISED"),
+              lastBillReceivedDate: t("LAST_BILL_RECEIVED_DATE"),
+              accessToMeter: t("ACCESS_TO_METER"),
+              systemMeterId: t("SYSTEM_METER_ID"),
+              lastBillNotRaisedReason: t("LAST_BILL_NOT_RAISED_REASON"),
+              waterConnectionYears: t("WATER_CONNECTION_YEARS"),
+              sewerConnectionYears: t("SEWER_CONNECTION_YEARS"),
+              pidNumber: t("PID_NUMBER"),
+              propertyType: t("PROPERTY_TYPE"),
+              subPropertyCategory: t("SUB_PROPERTY_CATEGORY"),
+              noOfFloor: t("NO_OF_FLOOR"),
+              noOfRooms: t("NO_OF_ROOMS"),
+              noOfBeds: t("NO_OF_BEDS"),
+              numberOfDwellingUnits: t("NUMBER_OF_DWELLING_UNITS"),
+              floorNo: t("FLOOR_NO"),
+              userType: t("USER_TYPE"),
+              tenantName: t("TENANT_NAME"),
+              tenantMobile: t("TENANT_MOBILE"),
+              verificationStatus: t("VERIFICATION_STATUS"),
+              houseBuiltDuration: t("HOUSE_BUILT_DURATION"),
+              surveyorId: t("SURVEYOR_ID"),
+              supervisorId: t("SUPERVISOR_ID"),
+              vendorId: t("VENDOR_ID"),
+              assignmentType: t("ASSIGNMENT_TYPE"),
+              assignmentValue: t("ASSIGNMENT_VALUE"),
+              assignedTime: t("ASSIGNED_TIME"),
+              isSelfAssigned: t("IS_SELF_ASSIGNED"),
+              doorPhotoFilestoreId: t("DOOR_PHOTO_FILESTORE_ID"),
+              panFilestoreId: t("PAN_FILESTORE_ID"),
+              documentProofFilestoreId: t("DOCUMENT_PROOF_FILESTORE_ID"),
+              buildingImageFileStoreId: t("BUILDING_IMAGE_FILESTORE_ID"),
+              propertyDocumentFileStoreId: t("PROPERTY_DOCUMENT_FILESTORE_ID"),
+              meterPhotoFileStoreId: t("METER_PHOTO_FILESTORE_ID"),
+              modifiedBy: t("MODIFIED_BY"),
+              emailId: t("EMAIL_ID"),
+              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
+              dob: t("DOB"),
+              consumerType: t("CONSUMER_TYPE"),
+              createdTime: t("CREATED_TIME"),
+              lastModifiedTime: t("LAST_MODIFIED_TIME"),
+              meterLatitude: t("EKYC_METER_LATITUDE1"),
+              meterLongitude: t("EKYC_METER_LONGITUDE1")
             };
             const toTitleCase = str => {
               if (!str) return "";
-              const cleanStr = String(str).includes(".") ? String(str).split(".").pop() : String(str);
+              let cleanStr = String(str);
+              if (cleanStr.includes(".") && !cleanStr.includes("@") && isNaN(Number(cleanStr))) {
+                cleanStr = cleanStr.split(".").pop();
+              }
               return cleanStr.toLowerCase().replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase());
             };
-            const titleCaseFields = ["ekycStatus", "zoneName", "gender", "relationship", "assembly", "ward", "consumerType"];
+            const skipTitleCase = ["kno", "mobileNumber", "emailId", "email", "pincode", "mrkey", "dob", "createdTime", "lastModifiedTime", "meterLatitude", "meterLongitude"];
+            const translatedFields = ["meterMake", "meterLocation"];
             const excelData = consumerList.map(item => {
               const cleanObj = {};
               const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
@@ -5754,12 +6063,19 @@ const SupervisorDetailsCard = () => {
               }
               Object.keys(item).forEach(key => {
                 if (excludedKeys.includes(key)) return;
-                const val = item[key];
+                let val = item[key];
                 if (typeof val === "object" && val !== null) {
                   return;
                 }
+                if (String(val).toLowerCase() === "true") {
+                  val = t("CS_YES");
+                } else if (String(val).toLowerCase() === "false") {
+                  val = t("CS_NO");
+                }
                 const friendlyHeader = headerMapping[key] || t(key.toUpperCase()) || key;
-                if (typeof val === "string" && titleCaseFields.includes(key)) {
+                if (typeof val === "string" && translatedFields.includes(key)) {
+                  cleanObj[friendlyHeader] = t(val);
+                } else if (typeof val === "string" && !skipTitleCase.includes(key)) {
                   cleanObj[friendlyHeader] = toTitleCase(val);
                 } else {
                   cleanObj[friendlyHeader] = val;
@@ -5782,6 +6098,34 @@ const SupervisorDetailsCard = () => {
       return Promise.reject(e);
     }
   };
+  const getDateRange = filter => {
+    const now = new Date();
+    const start = new Date(now);
+    if (filter === "today") {
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    if (filter === "week") {
+      start.setDate(now.getDate() - now.getDay());
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    if (filter === "month") {
+      start.setDate(1);
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    return null;
+  };
   const StatCard = _ref3 => {
     let title = _ref3.title,
       value = _ref3.value,
@@ -5828,65 +6172,12 @@ const SupervisorDetailsCard = () => {
   }, fullName), /*#__PURE__*/React.createElement("div", {
     className: "designation"
   }, t("FIELD_SUPERVISOR") || "Field Supervisor"))), /*#__PURE__*/React.createElement("div", {
-    className: "report-download",
-    ref: reportMenuRef
+    className: "report-download"
   }, /*#__PURE__*/React.createElement("button", {
     className: "download-btn",
     disabled: reportLoading,
-    onClick: () => {
-      setShowReportMenu(p => !p);
-      setShowCustomPicker(false);
-    }
-  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"), showReportMenu && /*#__PURE__*/React.createElement("div", {
-    className: "report-menu"
-  }, [{
-    label: t("TODAY") || "Today",
-    key: "today"
-  }, {
-    label: t("THIS_WEEK") || "This Week",
-    key: "week"
-  }, {
-    label: t("THIS_MONTH") || "This Month",
-    key: "month"
-  }].map(_ref4 => {
-    let label = _ref4.label,
-      key = _ref4.key;
-    return /*#__PURE__*/React.createElement("div", {
-      key: key,
-      className: "menu-item",
-      onClick: () => handlePresetDownload()
-    }, label);
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "custom-date-trigger",
-    onClick: () => setShowCustomPicker(p => !p)
-  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React.createElement("div", {
-    className: "custom-picker"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "date-field"
-  }, /*#__PURE__*/React.createElement("label", {
-    className: "date-label"
-  }, t("FROM_DATE") || "From"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.from,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      from: e.target.value
-    }))
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "date-field"
-  }, /*#__PURE__*/React.createElement("label", {
-    className: "date-label"
-  }, t("TO_DATE") || "To"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.to,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      to: e.target.value
-    }))
-  })), /*#__PURE__*/React.createElement("button", {
-    className: "download-action-btn",
-    onClick: handleCustomDownload
-  }, t("DOWNLOAD") || "Download"))))), /*#__PURE__*/React.createElement("div", {
+    onClick: handleDownload
+  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"))), /*#__PURE__*/React.createElement("div", {
     className: "stats-wrapper"
   }, cards.map((card, idx) => /*#__PURE__*/React.createElement(StatCard, {
     key: idx,
@@ -5950,10 +6241,16 @@ const SupervisorDetailsCard = () => {
     className: "details-right"
   }, /*#__PURE__*/React.createElement("div", {
     className: "download-card"
-  }, /*#__PURE__*/React.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React.createElement("button", {
+  }, /*#__PURE__*/React.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React.createElement("div", {
+    className: "report-download",
+    ref: reportMenuRef
+  }, /*#__PURE__*/React.createElement("button", {
     className: "download-excel-btn",
     disabled: ekycDownloadLoading,
-    onClick: handleDownloadEkycData
+    onClick: () => {
+      setShowReportMenu(p => !p);
+      setShowCustomPicker(false);
+    }
   }, /*#__PURE__*/React.createElement("svg", {
     width: "16",
     height: "16",
@@ -5972,7 +6269,63 @@ const SupervisorDetailsCard = () => {
     y1: "15",
     x2: "12",
     y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"))))), /*#__PURE__*/React.createElement(Card, {
+  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React.createElement("div", {
+    className: "report-menu"
+  }, [{
+    label: t("TODAY") || "Today",
+    key: "today"
+  }, {
+    label: t("THIS_WEEK") || "This Week",
+    key: "week"
+  }, {
+    label: t("THIS_MONTH") || "This Month",
+    key: "month"
+  }].map(_ref4 => {
+    let label = _ref4.label,
+      key = _ref4.key;
+    return /*#__PURE__*/React.createElement("div", {
+      key: key,
+      className: "menu-item",
+      onClick: () => handlePresetDownload(key)
+    }, label);
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "custom-date-trigger",
+    onClick: () => setShowCustomPicker(p => !p)
+  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React.createElement("div", {
+    className: "custom-picker"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "date-inputs"
+  }, /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "From"), /*#__PURE__*/React.createElement("input", {
+    type: "date",
+    value: customDate.from,
+    onChange: e => setCustomDate(_extends({}, customDate, {
+      from: e.target.value
+    }))
+  })), /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "To"), /*#__PURE__*/React.createElement("input", {
+    type: "date",
+    value: customDate.to,
+    onChange: e => setCustomDate(_extends({}, customDate, {
+      to: e.target.value
+    }))
+  }))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "10px",
+      marginTop: "10px"
+    }
+  }, /*#__PURE__*/React.createElement("button", {
+    className: "picker-cancel-btn",
+    onClick: () => {
+      setShowCustomPicker(false);
+      setCustomDate({
+        from: "",
+        to: ""
+      });
+    }
+  }, t("CANCEL") || "Cancel"), /*#__PURE__*/React.createElement("button", {
+    className: "picker-apply-btn",
+    onClick: handleCustomDownload
+  }, t("APPLY") || "Apply"))))))))), /*#__PURE__*/React.createElement(Card, {
     className: "dashboard-card"
   }, /*#__PURE__*/React.createElement(Table, {
     t: t,
@@ -6514,7 +6867,7 @@ const AssignEkycModal = _ref => {
 };
 
 const SurveyorDetailsDashboard = () => {
-  var _Digit$SessionStorage, _Digit$SessionStorage2, _surveyorSearchById$s, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner3, _surveyor$owner4, _fullName$charAt, _dashboardData$dashbo, _dashboardData$dashbo2, _dashboardData$dashbo3, _dashboardData$dashbo4, _surveyor$owner8, _surveyor$owner9, _surveyor$owner0, _dashboardData$dashbo5, _dashboardData$dashbo6;
+  var _Digit$SessionStorage, _Digit$SessionStorage2, _surveyorSearchById$s, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner3, _surveyor$owner4, _fullName$charAt, _dashboardData$dashbo, _dashboardData$dashbo2, _dashboardData$dashbo3, _dashboardData$dashbo4, _surveyor$owner7, _surveyor$owner8, _surveyor$owner9, _dashboardData$dashbo5, _dashboardData$dashbo6;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const _useState = useState(null),
     showModal = _useState[0],
@@ -6726,10 +7079,8 @@ const SurveyorDetailsDashboard = () => {
     }
     return null;
   };
-  const handlePresetDownload = function (filter) {
+  const handleDownload = function () {
     try {
-      const range = getDateRange(filter);
-      if (!range) return Promise.resolve();
       setReportLoading(true);
       const _temp = _finallyRethrows(function () {
         return _catch(function () {
@@ -6738,9 +7089,7 @@ const SurveyorDetailsDashboard = () => {
             tenantId: "dl.djb",
             offset: 0,
             limit: 1000,
-            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner5 = surveyor.owner) === null || _surveyor$owner5 === void 0 ? void 0 : _surveyor$owner5.uuid,
-            fromDate: range.from.getTime(),
-            toDate: range.to.getTime()
+            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner5 = surveyor.owner) === null || _surveyor$owner5 === void 0 ? void 0 : _surveyor$owner5.uuid
           })).then(function (response) {
             var _response$dashboardIn;
             const rows = (response === null || response === void 0 ? void 0 : (_response$dashboardIn = response.dashboardInfo) === null || _response$dashboardIn === void 0 ? void 0 : _response$dashboardIn.consumerList) || [];
@@ -6760,8 +7109,6 @@ const SurveyorDetailsDashboard = () => {
         });
       }, function (_wasThrown, _result) {
         setReportLoading(false);
-        setShowReportMenu(false);
-        setShowCustomPicker(false);
         if (_wasThrown) throw _result;
         return _result;
       });
@@ -6770,52 +7117,30 @@ const SurveyorDetailsDashboard = () => {
       return Promise.reject(e);
     }
   };
-  const handleCustomDownload = function () {
+  const handlePresetDownload = function (filter) {
     try {
-      if (!customDate.from || !customDate.to) {
-        alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
-        return Promise.resolve();
-      }
-      const from = new Date(customDate.from);
-      from.setHours(0, 0, 0, 0);
-      const to = new Date(customDate.to);
-      to.setHours(23, 59, 59, 999);
-      setReportLoading(true);
-      const _temp2 = _finallyRethrows(function () {
-        return _catch(function () {
-          var _surveyor$owner6;
-          return Promise.resolve(Digit.EkycService.dashboard({}, {
-            tenantId: "dl.djb",
-            offset: 0,
-            limit: 1000,
-            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner6 = surveyor.owner) === null || _surveyor$owner6 === void 0 ? void 0 : _surveyor$owner6.uuid,
-            fromDate: from.getTime(),
-            toDate: to.getTime()
-          })).then(function (response) {
-            var _response$dashboardIn2;
-            const rows = (response === null || response === void 0 ? void 0 : (_response$dashboardIn2 = response.dashboardInfo) === null || _response$dashboardIn2 === void 0 ? void 0 : _response$dashboardIn2.consumerList) || [];
-            downloadSurveyorPDF({
-              rows: rows,
-              surveyorName: fullName,
-              vendorName,
-              supervisorName,
-              employeeId,
-              mobileNumber,
-              dashboardInfo: (response === null || response === void 0 ? void 0 : response.dashboardInfo) || {},
-              t
-            });
-          });
-        }, function (err) {
-          console.error("Failed to fetch custom dashboard data for report download:", err);
-        });
-      }, function (_wasThrown2, _result2) {
-        setReportLoading(false);
-        setShowReportMenu(false);
-        setShowCustomPicker(false);
-        if (_wasThrown2) throw _result2;
-        return _result2;
-      });
-      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+      const range = getDateRange(filter);
+      if (!range) return Promise.resolve();
+      setShowReportMenu(false);
+      setShowCustomPicker(false);
+      return Promise.resolve(handleDownloadEkycData(range.from.getTime(), range.to.getTime())).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  const handleCustomDownload = function () {
+    try {
+      if (!customDate.from || !customDate.to) {
+        alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
+        return Promise.resolve();
+      }
+      const from = new Date(customDate.from);
+      from.setHours(0, 0, 0, 0);
+      const to = new Date(customDate.to);
+      to.setHours(23, 59, 59, 999);
+      setShowReportMenu(false);
+      setShowCustomPicker(false);
+      return Promise.resolve(handleDownloadEkycData(from.getTime(), to.getTime())).then(function () {});
     } catch (e) {
       return Promise.reject(e);
     }
@@ -6849,61 +7174,164 @@ const SurveyorDetailsDashboard = () => {
     setShowOptions(false);
     setShowModal(option.action);
   };
-  const handleDownloadEkycData = function () {
+  const handleDownloadEkycData = function (fromDate, toDate) {
     try {
       setEkycDownloadLoading(true);
       return Promise.resolve(_finallyRethrows(function () {
         return _catch(function () {
-          var _surveyor$owner7;
-          return Promise.resolve(Digit.EkycService.application_list({
+          var _surveyor$owner6;
+          return Promise.resolve(Digit.EkycService.application_list(_extends({
             tenantId: tenantId || "dl.djb",
             offset: 0,
             limit: 10000,
-            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner7 = surveyor.owner) === null || _surveyor$owner7 === void 0 ? void 0 : _surveyor$owner7.uuid,
+            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner6 = surveyor.owner) === null || _surveyor$owner6 === void 0 ? void 0 : _surveyor$owner6.uuid,
             reportDownload: true
-          })).then(function (response) {
+          }, fromDate && {
+            fromDate
+          }, toDate && {
+            toDate
+          }))).then(function (response) {
             const consumerList = (response === null || response === void 0 ? void 0 : response.consumerList) || [];
             if (consumerList.length === 0) {
               alert(t("NO_DATA_FOUND") || "No data found for download.");
               return;
             }
-            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile"];
+            const excludedKeys = ["status", "source", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile", "doorPhotoFilestoreId", "panFilestoreId", "documentProofFilestoreId", "buildingImageFileStoreId", "propertyDocumentFileStoreId", "meterPhotoFileStoreId", "modifiedBy", "zoneCode", "propertyType", "subPropertyCategory"];
             const headerMapping = {
-              kno: t("KNO") || "KNO",
-              firstName: t("FIRST_NAME") || "First Name",
-              middleName: t("MIDDLE_NAME") || "Middle Name",
-              lastName: t("LAST_NAME") || "Last Name",
-              gender: t("GENDER") || "Gender",
-              mobileNumber: t("MOBILE_NUMBER") || "Mobile Number",
-              emailId: t("EMAIL_ID") || "Email ID",
-              fatherOrHusbandName: t("FATHER_HUSBUND_NAME") || "Father/Husband Name",
-              relationship: t("RELATIONSHIP") || "Relationship",
-              dob: t("DOB") || "Date of Birth",
-              ekycStatus: t("EKYC_STATUS") || "eKYC Status",
-              zoneName: t("ZONE") || "Zone",
-              assembly: t("ASSEMBLY") || "Assembly",
-              ward: t("WARD") || "Ward",
-              pincode: t("PINCODE") || "Pincode",
-              mrkey: t("MR_KEY") || "MR Key",
-              consumerType: t("CONSUMER_TYPE") || "Consumer Type",
-              createdTime: t("CREATED_TIME") || "Created Time",
-              lastModifiedTime: t("LAST_MODIFIED_TIME") || "Last Modified Time"
+              kno: t("KNO"),
+              firstName: t("FIRST_NAME"),
+              middleName: t("MIDDLE_NAME"),
+              lastName: t("LAST_NAME"),
+              status: t("STATUS"),
+              ekycStatus: t("EKYC_STATUS"),
+              zoneName: t("ZONE"),
+              zoneCode: t("ZONE_CODE"),
+              assembly: t("EKYC_ASSEMBLY"),
+              ward: t("WARD"),
+              pincode: t("EKYC_PINCODE"),
+              addressRaw: t("ADDRESS_RAW"),
+              locality: t("EKYC_LOCALITY"),
+              subLocality: t("SUB_LOCALITY"),
+              flatHouseNumber: t("FLAT_HOUSE_NUMBER"),
+              streetName: t("STREET_NAME"),
+              landmark: t("EKYC_LANDMARK"),
+              city: t("CITY"),
+              state: t("STATE"),
+              addressType: t("ADDRESS_TYPE"),
+              addressProofType: t("ADDRESS_PROOF_TYPE"),
+              mobileNo: t("MOBILE_NUMBER"),
+              alternateMobileNo: t("ALTERNATE_MOBILE_NUMBER"),
+              whatsappNo: t("WHATSAPP_NO"),
+              email: t("EMAIL"),
+              landlineNo: t("LANDLINE_NO"),
+              mrkey: t("MR_KEY"),
+              mrcode: t("MR_CODE"),
+              areacode: t("AREA_CODE"),
+              source: t("SOURCE"),
+              submittedAt: t("SUBMITTED_AT"),
+              assignedAt: t("ASSIGNED_AT"),
+              connectionType: t("CONNECTION_TYPE"),
+              Type: t("CONSUMER_TYPE"),
+              occupantType: t("OCCUPANT_TYPE"),
+              knoCategory: t("KNO_CATEGORY"),
+              approvedAt: t("APPROVED_AT"),
+              gender: t("GENDER"),
+              parentSpouse: t("PARENT_SPOUSE"),
+              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
+              relationship: t("RELATIONSHIP"),
+              informantName: t("INFORMANT_NAME"),
+              informantRelation: t("INFORMANT_RELATION"),
+              informantIs: t("INFORMANT_IS"),
+              contactPerson: t("CONTACT_PERSON"),
+              relation: t("RELATION"),
+              entityName: t("ENTITY_NAME"),
+              designation: t("DESIGNATION"),
+              department: t("DEPARTMENT"),
+              employeeId: t("EMPLOYEE_ID"),
+              ownerMobile: t("OWNER_MOBILE"),
+              ownerVerificationDone: t("OWNER_VERIFICATION_DONE"),
+              consentGiven: t("CONSENT_GIVEN"),
+              proofOfIdentityType: t("PROOF_OF_IDENTITY_TYPE"),
+              documentNumber: t("DOCUMENT_NUMBER"),
+              noOfPerson: t("NUMBER_OF_PERSON"),
+              latitude: t("LATITUDE"),
+              longitude: t("LONGITUDE"),
+              gpsValid: t("GPS_VALID"),
+              meterNumber: t("METER_NUMBER"),
+              meterMake: t("METER_MAKE"),
+              meterStatus: t("METER_STATUS"),
+              meterCondition: t("METER_CONDITION"),
+              meterLocation: t("METER_LOCATION"),
+              meterLocationAddress: t("METER_LOCATION_ADDRESS"),
+              workingStatus: t("WORKING_STATUS"),
+              sewerConnection: t("SEWER_CONNECTION"),
+              septicTank: t("SEPTIC_TANK"),
+              lastBillRaised: t("LAST_BILL_RAISED"),
+              lastBillReceivedDate: t("LAST_BILL_RECEIVED_DATE"),
+              accessToMeter: t("ACCESS_TO_METER"),
+              systemMeterId: t("SYSTEM_METER_ID"),
+              lastBillNotRaisedReason: t("LAST_BILL_NOT_RAISED_REASON"),
+              waterConnectionYears: t("WATER_CONNECTION_YEARS"),
+              sewerConnectionYears: t("SEWER_CONNECTION_YEARS"),
+              pidNumber: t("PID_NUMBER"),
+              propertyType: t("PROPERTY_TYPE"),
+              subPropertyCategory: t("SUB_PROPERTY_CATEGORY"),
+              noOfFloor: t("NO_OF_FLOOR"),
+              noOfRooms: t("NO_OF_ROOMS"),
+              noOfBeds: t("NO_OF_BEDS"),
+              numberOfDwellingUnits: t("NUMBER_OF_DWELLING_UNITS"),
+              floorNo: t("FLOOR_NO"),
+              userType: t("USER_TYPE"),
+              tenantName: t("TENANT_NAME"),
+              tenantMobile: t("TENANT_MOBILE"),
+              verificationStatus: t("VERIFICATION_STATUS"),
+              houseBuiltDuration: t("HOUSE_BUILT_DURATION"),
+              surveyorId: t("SURVEYOR_ID"),
+              supervisorId: t("SUPERVISOR_ID"),
+              vendorId: t("VENDOR_ID"),
+              assignmentType: t("ASSIGNMENT_TYPE"),
+              assignmentValue: t("ASSIGNMENT_VALUE"),
+              assignedTime: t("ASSIGNED_TIME"),
+              isSelfAssigned: t("IS_SELF_ASSIGNED"),
+              doorPhotoFilestoreId: t("DOOR_PHOTO_FILESTORE_ID"),
+              panFilestoreId: t("PAN_FILESTORE_ID"),
+              documentProofFilestoreId: t("DOCUMENT_PROOF_FILESTORE_ID"),
+              buildingImageFileStoreId: t("BUILDING_IMAGE_FILESTORE_ID"),
+              propertyDocumentFileStoreId: t("PROPERTY_DOCUMENT_FILESTORE_ID"),
+              meterPhotoFileStoreId: t("METER_PHOTO_FILESTORE_ID"),
+              modifiedBy: t("MODIFIED_BY"),
+              emailId: t("EMAIL_ID"),
+              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
+              dob: t("DOB"),
+              consumerType: t("CONSUMER_TYPE"),
+              createdTime: t("CREATED_TIME"),
+              lastModifiedTime: t("LAST_MODIFIED_TIME"),
+              meterLatitude: t("EKYC_METER_LATITUDE1"),
+              meterLongitude: t("EKYC_METER_LONGITUDE1")
             };
+            const skipTitleCase = ["kno", "mobileNumber", "emailId", "email", "pincode", "mrkey", "dob", "createdTime", "lastModifiedTime", "meterLatitude", "meterLongitude"];
+            const translatedFields = ["meterMake", "meterLocation"];
             const excelData = consumerList.map(item => {
               const cleanObj = {};
               const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
               if (fullName) {
                 cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = toTitleCase(fullName);
               }
-              const titleCaseFields = ["ekycStatus", "zoneName", "gender", "relationship", "assembly", "ward", "consumerType"];
               Object.keys(item).forEach(key => {
                 if (excludedKeys.includes(key)) return;
-                const val = item[key];
+                let val = item[key];
                 if (typeof val === "object" && val !== null) {
                   return;
                 }
+                if (String(val).toLowerCase() === "true") {
+                  val = t("CS_YES");
+                } else if (String(val).toLowerCase() === "false") {
+                  val = t("CS_NO");
+                }
                 const friendlyHeader = headerMapping[key] || t(key.toUpperCase()) || key;
-                if (typeof val === "string" && titleCaseFields.includes(key)) {
+                if (typeof val === "string" && translatedFields.includes(key)) {
+                  cleanObj[friendlyHeader] = t(val);
+                } else if (typeof val === "string" && !skipTitleCase.includes(key)) {
                   cleanObj[friendlyHeader] = toTitleCase(val);
                 } else {
                   cleanObj[friendlyHeader] = val;
@@ -6917,10 +7345,10 @@ const SurveyorDetailsDashboard = () => {
         }, function (error) {
           console.error("Error downloading eKYC Excel:", error);
         });
-      }, function (_wasThrown3, _result3) {
+      }, function (_wasThrown2, _result2) {
         setEkycDownloadLoading(false);
-        if (_wasThrown3) throw _result3;
-        return _result3;
+        if (_wasThrown2) throw _result2;
+        return _result2;
       }));
     } catch (e) {
       return Promise.reject(e);
@@ -6949,65 +7377,12 @@ const SurveyorDetailsDashboard = () => {
   }, fullName), /*#__PURE__*/React.createElement("div", {
     className: "designation"
   }, (surveyor === null || surveyor === void 0 ? void 0 : surveyor.description) || t("FIELD_SURVEYOR")))), /*#__PURE__*/React.createElement("div", {
-    className: "report-download",
-    ref: reportMenuRef
+    className: "report-download"
   }, /*#__PURE__*/React.createElement("button", {
     className: "download-btn",
     disabled: reportLoading,
-    onClick: () => {
-      setShowReportMenu(p => !p);
-      setShowCustomPicker(false);
-    }
-  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"), showReportMenu && /*#__PURE__*/React.createElement("div", {
-    className: "report-menu"
-  }, [{
-    label: t("TODAY") || "Today",
-    key: "today"
-  }, {
-    label: t("THIS_WEEK") || "This Week",
-    key: "week"
-  }, {
-    label: t("THIS_MONTH") || "This Month",
-    key: "month"
-  }].map(_ref5 => {
-    let label = _ref5.label,
-      key = _ref5.key;
-    return /*#__PURE__*/React.createElement("div", {
-      key: key,
-      className: "menu-item",
-      onClick: () => handlePresetDownload(key)
-    }, label);
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "custom-date-trigger",
-    onClick: () => setShowCustomPicker(p => !p)
-  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React.createElement("div", {
-    className: "custom-picker"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "date-field"
-  }, /*#__PURE__*/React.createElement("label", {
-    className: "date-label"
-  }, t("FROM_DATE") || "From"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.from,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      from: e.target.value
-    }))
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "date-field"
-  }, /*#__PURE__*/React.createElement("label", {
-    className: "date-label"
-  }, t("TO_DATE") || "To"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.to,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      to: e.target.value
-    }))
-  })), /*#__PURE__*/React.createElement("button", {
-    className: "download-action-btn",
-    onClick: handleCustomDownload
-  }, t("DOWNLOAD") || "Download"))))), /*#__PURE__*/React.createElement("div", {
+    onClick: handleDownload
+  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"))), /*#__PURE__*/React.createElement("div", {
     className: "stats-wrapper"
   }, /*#__PURE__*/React.createElement(StatCard, {
     title: t("TOTAL_ASSIGNED"),
@@ -7049,19 +7424,19 @@ const SurveyorDetailsDashboard = () => {
     className: "label"
   }, t("MOBILE")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner8 = surveyor.owner) === null || _surveyor$owner8 === void 0 ? void 0 : _surveyor$owner8.mobileNumber) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.mobileNo) || "N/A")), /*#__PURE__*/React.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner7 = surveyor.owner) === null || _surveyor$owner7 === void 0 ? void 0 : _surveyor$owner7.mobileNumber) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.mobileNo) || "N/A")), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
   }, t("EMAIL")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner9 = surveyor.owner) === null || _surveyor$owner9 === void 0 ? void 0 : _surveyor$owner9.emailId) || "N/A")), /*#__PURE__*/React.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner8 = surveyor.owner) === null || _surveyor$owner8 === void 0 ? void 0 : _surveyor$owner8.emailId) || "N/A")), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
   }, t("GENDER")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner0 = surveyor.owner) === null || _surveyor$owner0 === void 0 ? void 0 : _surveyor$owner0.gender) || "N/A")), /*#__PURE__*/React.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner9 = surveyor.owner) === null || _surveyor$owner9 === void 0 ? void 0 : _surveyor$owner9.gender) || "N/A")), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
@@ -7083,10 +7458,16 @@ const SurveyorDetailsDashboard = () => {
     className: "details-right"
   }, /*#__PURE__*/React.createElement("div", {
     className: "download-card"
-  }, /*#__PURE__*/React.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React.createElement("button", {
+  }, /*#__PURE__*/React.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React.createElement("div", {
+    className: "report-download",
+    ref: reportMenuRef
+  }, /*#__PURE__*/React.createElement("button", {
     className: "download-excel-btn",
     disabled: ekycDownloadLoading,
-    onClick: handleDownloadEkycData
+    onClick: () => {
+      setShowReportMenu(p => !p);
+      setShowCustomPicker(false);
+    }
   }, /*#__PURE__*/React.createElement("svg", {
     width: "16",
     height: "16",
@@ -7105,7 +7486,63 @@ const SurveyorDetailsDashboard = () => {
     y1: "15",
     x2: "12",
     y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"))))), /*#__PURE__*/React.createElement(Card, {
+  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React.createElement("div", {
+    className: "report-menu"
+  }, [{
+    label: t("TODAY") || "Today",
+    key: "today"
+  }, {
+    label: t("THIS_WEEK") || "This Week",
+    key: "week"
+  }, {
+    label: t("THIS_MONTH") || "This Month",
+    key: "month"
+  }].map(_ref5 => {
+    let label = _ref5.label,
+      key = _ref5.key;
+    return /*#__PURE__*/React.createElement("div", {
+      key: key,
+      className: "menu-item",
+      onClick: () => handlePresetDownload(key)
+    }, label);
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "custom-date-trigger",
+    onClick: () => setShowCustomPicker(p => !p)
+  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React.createElement("div", {
+    className: "custom-picker"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "date-inputs"
+  }, /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "From"), /*#__PURE__*/React.createElement("input", {
+    type: "date",
+    value: customDate.from,
+    onChange: e => setCustomDate(_extends({}, customDate, {
+      from: e.target.value
+    }))
+  })), /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "To"), /*#__PURE__*/React.createElement("input", {
+    type: "date",
+    value: customDate.to,
+    onChange: e => setCustomDate(_extends({}, customDate, {
+      to: e.target.value
+    }))
+  }))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "10px",
+      marginTop: "10px"
+    }
+  }, /*#__PURE__*/React.createElement("button", {
+    className: "picker-cancel-btn",
+    onClick: () => {
+      setShowCustomPicker(false);
+      setCustomDate({
+        from: "",
+        to: ""
+      });
+    }
+  }, t("CANCEL") || "Cancel"), /*#__PURE__*/React.createElement("button", {
+    className: "picker-apply-btn",
+    onClick: handleCustomDownload
+  }, t("APPLY") || "Apply"))))))))), /*#__PURE__*/React.createElement(Card, {
     className: "dashboard-card"
   }, /*#__PURE__*/React.createElement(Table, {
     t: t,
@@ -9576,7 +10013,7 @@ const CitizenApp = () => {
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: path + "/review",
     component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
-      layoutClass: "normal"
+      layoutClass: "action"
     }, /*#__PURE__*/React.createElement(Review, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: path + "/assign",