Merge pull request #950 from sriranjan-s/Dev-2.0

adding packages for auto publishing

frontend/micro-ui/web/micro-ui-internals/example/devpackage.json

@@ -20,7 +20,7 @@
     "@upyog/digit-ui-module-pt":"1.7.0-beta.3",
     "@egovernments/digit-ui-module-receipts":"^1.4.0",
     "@upyog/digit-ui-module-tl":"1.7.0-beta.6",
-    "@upyog/digit-ui-module-ws":"^1.7.0-beta.8",
+    "@upyog/digit-ui-module-ws":"^1.7.0-beta.9",
     "@upyog-niua/upyog-ui-module-ptr":"1.0.5",
     "@egovernments/digit-ui-module-commonpt":"^1.4.0",
     "http-proxy-middleware": "^1.0.5",

frontend/micro-ui/web/micro-ui-internals/example/package.json

@@ -20,7 +20,7 @@
     "@upyog/digit-ui-module-pt": "^1.7.0-beta.3",
     "@egovernments/digit-ui-module-receipts": "^1.7.0-beta.2",
     "@upyog/digit-ui-module-tl": "^1.7.0-beta.6",
-    "@upyog/digit-ui-module-ws": "^1.7.0-beta.8",
+    "@upyog/digit-ui-module-ws": "^1.7.0-beta.9",
     "@egovernments/digit-ui-module-bills": "^1.7.0-beta.2",
     "@egovernments/digit-ui-module-commonpt": "^1.7.0-beta.3",
     "@upyog-niua/upyog-ui-module-ptr":"1.0.5",

frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-ws",
-  "version": "1.7.0-beta.8",
+  "version": "1.7.0-beta.9",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/SearchWaterConnection/BulkBillSearch.js

@@ -11,10 +11,12 @@ import * as XLSX from "xlsx";
 const BulkBillSearch = ({ tenantId, onSubmit, data, count, resultOk, businessService, isLoading }) => {
   const [showToast, setShowToast] = useState(null);
   const [showModal, setModalReject] = useState(null);
+  const [showModalResult, setShowModalResult] = useState(null)
   const [uploadedFile, setUploadedFile] = useState(() => null);
   const [file, setFile] = useState("")
   const [meterReadingData, setMeterReadingData] = useState([])
   const [rejectedReading, setRejectedReading] = useState([])
+  const [bulkReadingStatus, setBulkReadingStatus] = useState([])
   const [isLoadingBulkMeterReading, setIsLoadingBulkMeterReading] =useState(false)
   function selectfile(e) {
     e.preventDefault()
@@ -92,11 +94,14 @@ const BulkBillSearch = ({ tenantId, onSubmit, data, count, resultOk, businessSer
         },
         onSuccess: async (data, variables) => {
           setIsLoadingBulkMeterReading(false)
+          console.log("data",data)
+          setShowModalResult(true)
+          setBulkReadingStatus(data.meterReadings)
           setShowToast({ key: "success", label: "WS_METER_READING_ADDED_SUCCESFULLY" });
           setTimeout(closeToast, 3000);
-          setTimeout(() => {
-            window.location.reload();
-          }, 5000);
+          // setTimeout(() => {
+          //   window.location.reload();
+          // }, 5000);
         },
       });
     }
@@ -116,6 +121,9 @@ const BulkBillSearch = ({ tenantId, onSubmit, data, count, resultOk, businessSer
   const closeModal = () => {
     setModalReject(false)
   }
+  const closeModalStatus = () => {
+    setShowModalResult(false)
+  }
   const setModal = () => {
     setModalReject(false)
     handleBulkSubmit()
@@ -278,6 +286,86 @@ const BulkBillSearch = ({ tenantId, onSubmit, data, count, resultOk, businessSer
 
     ],
   );
+  const columns2 = useMemo(
+    () => [
+
+      {
+        Header: t("BILLING_CYCLE"),
+        disableSortBy: true,
+        Cell: ({ row }) => {
+          return GetCell(row.original?.["billingPeriod"]);
+        },
+      },
+      {
+        Header: t("WS_COMMON_TABLE_COL_CONSUMER_NO_LABEL"),
+        disableSortBy: true,
+        accessor: "connectionNo",
+        Cell: ({ row }) => {
+          return (
+            <div>
+              {row.original["connectionNo"] ? (
+                <span>
+                  {row.original["connectionNo"] || "NA"}
+
+                </span>
+              ) : (
+                <span>{t("NA")}</span>
+              )}
+            </div>
+          );
+        },
+      },
+      {
+        Header: t("LAST_READING"),
+        disableSortBy: true,
+        Cell: ({ row }) => {
+          return GetCell(row.original?.["lastReading"]);
+        },
+
+      },
+      {
+        Header: t("METER_READING_DATE"),
+        disableSortBy: true,
+        Cell: ({ row }) => {
+          return GetCell(convertEpochToDate(row.original?.["lastReadingDate"]));
+        },
+
+      },
+      {
+        Header: t("METER_STATUS"),
+        disableSortBy: true,
+        Cell: ({ row }) => {
+          return GetCell(row.original?.["meterStatus"]);
+        },
+
+      },
+      {
+        Header: t("CURRECT_READING"),
+        disableSortBy: true,
+        Cell: ({ row }) => {
+          return GetCell(row.original?.["currentReading"]);
+        },
+
+      },
+      {
+        Header: t("CURRECT_READING_DATE"),
+        disableSortBy: true,
+        Cell: ({ row }) => {
+          return GetCell(convertEpochToDate(row.original?.["currentReadingDate"]));
+        },
+
+      },
+      {
+        Header: t("CURRECT_STATUS"),
+        disableSortBy: true,
+        Cell: ({ row }) => {
+          return GetCell(row.original?.["status"]);
+        },
+
+      }
+
+    ],
+  );
   return (
     <>
       <Header styles={{ fontSize: "32px" }}>
@@ -389,6 +477,48 @@ const BulkBillSearch = ({ tenantId, onSubmit, data, count, resultOk, businessSer
               />
 
 
+            </Card>
+          </div>
+        </Modal>}
+        {showModalResult && <Modal
+          headerBarMain={<Heading label={t("WS_BULK_READING_STATUS")} />}
+          headerBarEnd={<CloseBtn onClick={closeModalStatus} />}
+          formId="modal-action"
+          popupStyles={{ width: "auto" }}
+        >  <div style={{ width: "100%" }}>
+
+            <Card>
+            <div><CardText>{t("Bulk Meter Reading Status")}</CardText></div>
+            <div className="sideContent" style={{ float: "right", padding: "10px 30px" }}>
+            <span className="table-search-wrapper" style={{ cursor: "pointer" }}>
+              <DownloadBtn className="mrlg cursorPointer" onClick={(e) => handleExcelDownload(e, bulkReadingStatus)} />
+            </span>
+          </div>
+              <Table
+                t={t}
+                data={bulkReadingStatus}
+                totalRecords={bulkReadingStatus?.length}
+                columns={columns2}
+                getCellProps={(cellInfo) => {
+                  return {
+                    style: {
+                      minWidth: cellInfo.column.Header === t("ES_INBOX_APPLICATION_NO") ? "240px" : "",
+                      padding: "20px 18px",
+                      fontSize: "16px",
+                    },
+                  };
+                }}
+                onPageSizeChange={onPageSizeChange}
+                currentPage={getValues("offset") / getValues("limit")}
+                onNextPage={nextPage}
+                onPrevPage={previousPage}
+                pageSizeLimit={getValues("limit")}
+                onSort={onSort}
+                disableSort={true}
+                sortParams={[{ id: getValues("sortBy"), desc: getValues("sortOrder") === "DESC" ? true : false }]}
+              />
+
+
             </Card>
           </div>
         </Modal>}

frontend/micro-ui/web/package.json

@@ -34,7 +34,7 @@
     "@upyog/digit-ui-module-pt": "1.7.0-beta.3",
     "@egovernments/digit-ui-module-receipts": "1.7.0-beta.2",
     "@upyog/digit-ui-module-tl": "1.7.0-beta.6",
-    "@upyog/digit-ui-module-ws": "1.7.0-beta.8",
+    "@upyog/digit-ui-module-ws": "1.7.0-beta.9",
     "@egovernments/digit-ui-react-components": "1.7.0-beta.2",
     "@upyog-niua/upyog-ui-module-ptr": "1.0.5",
     "babel-loader": "8.1.0",