From a591100b977652af34d23c2ba589ec2a9edb1b13 Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Mon, 23 Feb 2026 12:23:44 +0530
Subject: [PATCH 01/24] PI-20633_Existing Pid not showing old pt id instead
 showing PTi d

---
 .../Property/components/PropertyAddressInfo/index.js          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js
index 806bc114b8..ea75f6de48 100644
--- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js
+++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js
@@ -18,6 +18,7 @@ export const getAddressItems = (properties, OldProperty) => {
   const cityId = tenantInfo && tenantInfo.length === 2 && tenantInfo[1] ? tenantInfo[1].toUpperCase() : 'NA';
   const localityCode = address.locality && address.locality.code ? address.locality.code : 'NA';
   const propertyId = properties.propertyId;
+  const existingPropertyID = properties.oldPropertyId;
   const surveyid = properties.surveyId;
   const yearConsTruction = properties.additionalDetails && properties.additionalDetails.yearConstruction || 'NA';
   if (OldProperty) {
@@ -62,7 +63,7 @@ export const getAddressItems = (properties, OldProperty) => {
       {
         key: getTranslatedLabel("PT_PROPERTY_ADDRESS_EXISTING_PID", localizationLabelsData),
         // value: properties.oldPropertyId || "NA",
-        value: propertyId || "NA",
+        value: existingPropertyID || "NA",
         oldValue: OldProperty && OldProperty.oldPropertyId
       },
       {
@@ -85,6 +86,7 @@ export const getAddressItems = (properties, OldProperty) => {
 }
 
 const PropertyAddressInfo = ({ properties, editIcon, OldProperty }) => {
+  console.log("propertiesproperties",properties)
   let surveyid = properties.surveyId;
   const [isDialogOpen, setDialogOpen] = useState(false);
   const [surveyId, setSurveyId] = useState(properties ? properties.surveyId : "");

From c8141d7eca8ff1b9604c9d69044567dfda3c641c Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Mon, 23 Feb 2026 12:42:12 +0530
Subject: [PATCH 02/24] PI-20633 remove console log

---
 .../Property/components/PropertyAddressInfo/index.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js
index ea75f6de48..c36a1adf28 100644
--- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js
+++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js
@@ -86,7 +86,7 @@ export const getAddressItems = (properties, OldProperty) => {
 }
 
 const PropertyAddressInfo = ({ properties, editIcon, OldProperty }) => {
-  console.log("propertiesproperties",properties)
+ 
   let surveyid = properties.surveyId;
   const [isDialogOpen, setDialogOpen] = useState(false);
   const [surveyId, setSurveyId] = useState(properties ? properties.surveyId : "");

From 9fab1ed3cc7b05da8e9d5275d897377a4f06cbf2 Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Mon, 23 Feb 2026 17:57:29 +0530
Subject: [PATCH 03/24] qr code

---
 web/egov-common-screen/.env                   |  1 +
 web/egov-common-screen/package.json           |  8 +-
 web/egov-common-screen/src/App.jsx            | 30 +++++--
 .../src/components/propertyQRData/api.jsx     | 44 +++++++++
 .../components/propertyQRData/constant.jsx    |  1 +
 .../components/propertyQRData/function.jsx    | 90 ++++++++++++++++++-
 .../src/components/propertyQRData/index.jsx   | 85 +++++++++++-------
 .../src/utils/localstorage.jsx                | 43 +++++++++
 web/egov-common-screen/src/utils/toast.jsx    | 13 +++
 web/egov-common-screen/vite.config.js         | 44 ++++++---
 10 files changed, 303 insertions(+), 56 deletions(-)
 create mode 100644 web/egov-common-screen/.env
 create mode 100644 web/egov-common-screen/src/components/propertyQRData/api.jsx
 create mode 100644 web/egov-common-screen/src/components/propertyQRData/constant.jsx
 create mode 100644 web/egov-common-screen/src/utils/localstorage.jsx
 create mode 100644 web/egov-common-screen/src/utils/toast.jsx

diff --git a/web/egov-common-screen/.env b/web/egov-common-screen/.env
new file mode 100644
index 0000000000..f819676c80
--- /dev/null
+++ b/web/egov-common-screen/.env
@@ -0,0 +1 @@
+VITE_API_HOST=https://mseva-dev.lgpunjab.gov.in
\ No newline at end of file
diff --git a/web/egov-common-screen/package.json b/web/egov-common-screen/package.json
index ede26dd821..834673b5ee 100644
--- a/web/egov-common-screen/package.json
+++ b/web/egov-common-screen/package.json
@@ -2,8 +2,8 @@
   "name": "commonscreen",
   "private": true,
   "version": "0.0.0",
-  "homepage": "https://mseva-uat.lgpunjab.gov.in/common/",
-  "proxy": "https://mseva-uat.lgpunjab.gov.in",
+  "homepage": "https://mseva-dev.lgpunjab.gov.in/common/",
+  "proxy": "https://mseva-dev.lgpunjab.gov.in",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -12,8 +12,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "axios": "^1.13.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-hot-toast": "^2.6.0",
     "react-router-dom": "^7.1.3"
   },
   "devDependencies": {
@@ -31,4 +33,4 @@
     "react-faq-component": "^1.3.4",
     "vite": "^6.0.5"
   }
-}
\ No newline at end of file
+}
diff --git a/web/egov-common-screen/src/App.jsx b/web/egov-common-screen/src/App.jsx
index 5dad5f05a1..a9e167464b 100644
--- a/web/egov-common-screen/src/App.jsx
+++ b/web/egov-common-screen/src/App.jsx
@@ -1,27 +1,47 @@
-import { useState } from 'react'
+import { useState,  } from 'react'
 import Card from './components/Card'
 import Header from './components/Header'
 import Faq from './components/Faqs'
 import Footer from './components/Footer'
 import Privacy from './components/Privacy'
 import Impersonation from './components/Impersonation'
+import PropertyQRData from './components/propertyQRData'
 import './App.css'
-import { BrowserRouter, Routes, Route } from "react-router-dom";
+import { Toaster } from 'react-hot-toast'
+import { BrowserRouter, Routes, Route, useLocation } from "react-router-dom";
 function App() {
+      const Layout = ({ children }) => {
+      const location = useLocation();
 
+      const hideHeaderFooter = location.pathname === "/propertyQRData";
+
+      return (
+        <>
+          {!hideHeaderFooter && <Header />}
+          {children}
+          {!hideHeaderFooter && <Footer />}
+        </>
+      );
+    };
 
   return (
     <>
-      <Header />
+      
       {/* //basename="/common" */}
       <BrowserRouter basename="/common">
+        
+      
+      <Layout>
         <Routes>
           <Route path="/" element={<Card />} />
           <Route path="/privacy" element={<Privacy />} />
           <Route path="/impersonation" element={<Impersonation />} />
+          <Route path="/propertyQRData" element={<PropertyQRData />} />
           <Route path="*" element={<Card />} />
         </Routes>
-
+      </Layout>
+      {/* ✅ ADD TOASTER HERE */}
+      <Toaster position="bottom-center" />
       </BrowserRouter>
       {/* <Card />
       <center ><p style={{
@@ -42,7 +62,7 @@ function App() {
         }}>
       </div>
       <Faq /> */}
-      <Footer />
+      
     </>
   )
 }
diff --git a/web/egov-common-screen/src/components/propertyQRData/api.jsx b/web/egov-common-screen/src/components/propertyQRData/api.jsx
new file mode 100644
index 0000000000..25ce72398c
--- /dev/null
+++ b/web/egov-common-screen/src/components/propertyQRData/api.jsx
@@ -0,0 +1,44 @@
+import axios from "axios";
+const isDev = import.meta.env.DEV;
+const API = axios.create({
+  baseURL: isDev ? "" : import.meta.env.VITE_API_HOST,
+  headers: {
+    "Content-Type": "application/json",
+  },
+});
+
+// Function to generate RequestInfo
+const generateRequestInfo = () => {
+  return {
+    apiId: "Rainmaker",
+    ver: ".01",
+    ts: Date.now(),
+    action: "token",
+    did: "1",
+    key: "",
+    msgId: `${Date.now()}|en_IN`,
+    authToken: localStorage.getItem("authToken") || "",
+  };
+};
+
+// Request Interceptor
+API.interceptors.request.use(
+  (config) => {
+    // Only attach for POST / PUT / PATCH
+    if (
+      config.method === "post" ||
+      config.method === "put" ||
+      config.method === "patch"
+    ) {
+      config.data = {
+        RequestInfo: generateRequestInfo(),
+        ...config.data,
+      };
+    }
+
+    return config;
+  },
+  (error) => Promise.reject(error)
+);
+
+export default API;
\ No newline at end of file
diff --git a/web/egov-common-screen/src/components/propertyQRData/constant.jsx b/web/egov-common-screen/src/components/propertyQRData/constant.jsx
new file mode 100644
index 0000000000..fa8fcc2911
--- /dev/null
+++ b/web/egov-common-screen/src/components/propertyQRData/constant.jsx
@@ -0,0 +1 @@
+export const statetenantId = 'pb'
diff --git a/web/egov-common-screen/src/components/propertyQRData/function.jsx b/web/egov-common-screen/src/components/propertyQRData/function.jsx
index e3ffbe918f..ddca137614 100644
--- a/web/egov-common-screen/src/components/propertyQRData/function.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/function.jsx
@@ -1,11 +1,95 @@
-const checkMobileNumber = (number) => {
+import API from "./api";
+import { statetenantId } from "./constant";
+import { showSuccess, showError } from "../../utils/toast";
+import { use } from "react";
+import axios from "axios";
+export const checkMobileNumber = async (number) => {
     const mobileNumberPattern = /^[6-9]\d{9}$/;
 
     const isMobileValid = mobileNumberPattern.test(number);
     if(isMobileValid){
-        // return number;
+       const data =  await sendOtp(number);
+       console.log("data",data)
     }
 }
+export const sendOtp = async (mobileNumber) => {
+  try {
+    const payload = createOtpPayload(mobileNumber,statetenantId);
 
+    const response = await API.post(
+      "/user-otp/v1/_send?tenantId=pb",
+      payload
+    );
+    console.log("response",response.data)
+     showSuccess("Enter OTP");
+
+  } catch (error) {
+     showError(
+      error?.response?.data?.Errors?.[0]?.message ||
+      "Failed to send OTP"
+    );
+    // return {
+    //   success: false,
+    //   message:
+    //     error?.response?.data?.Errors?.[0]?.message ||
+    //     "Failed to send OTP. Please try again.",
+    // };
+  }
+};
+
+const createOtpPayload = (mobileNumber, tenantId, userType='CITIZEN') => ({
+  otp: {
+    mobileNumber,
+    type: "login",
+    tenantId: tenantId,
+    userType: userType,
+  },
+});
+
+export const loginWithOtp = async (mobileNumber, otp, userType='CITIZEN') => {
+  try {
+    debugger
+    // Create form-urlencoded body
+    const params = new URLSearchParams();
+    params.append("username", mobileNumber);
+    params.append("password", otp);
+    params.append("grant_type", "password");
+    params.append("scope", "read");
+    params.append("tenantId", statetenantId);
+    params.append("userType", userType);
+
+    const response = await axios.post(
+      "/user/oauth/token",
+      params,
+      {
+        headers: {
+          "Content-Type": "application/x-www-form-urlencoded",
+          Authorization:
+            "Basic ZWdvdi11c2VyLWNsaWVudDplZ292LXVzZXItc2VjcmV0",
+        },
+      }
+    );
+
+    if (response?.status === 200) {
+      return {
+        success: true,
+        message: "Login Successful",
+        data: response.data,
+      };
+    }
+
+    return {
+      success: false,
+      message: "Unexpected server response",
+    };
+
+  } catch (error) {
+    return {
+      success: false,
+      message:
+        error?.response?.data?.error_description ||
+        "Invalid OTP or login failed",
+    };
+  }
+};
 
-export default checkMobileNumber;
\ No newline at end of file
diff --git a/web/egov-common-screen/src/components/propertyQRData/index.jsx b/web/egov-common-screen/src/components/propertyQRData/index.jsx
index 0a239b6ef5..a348f1b44c 100644
--- a/web/egov-common-screen/src/components/propertyQRData/index.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/index.jsx
@@ -1,53 +1,72 @@
 
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useRef } from 'react';
 import 'bootstrap/dist/css/bootstrap.min.css';
 import './index.css'
 import OtpInput from './otpInput';
 import { useSearchParams } from 'react-router-dom';
-import checkMobileNumber from './function.jsx'
+import { checkMobileNumber, loginWithOtp } from './function.jsx'
+import { statetenantId } from "./constant.jsx"
 //URL : propertyQRData?surveyid=123&tenantid=pb.amritsar&mobileno=9335130557
-
+import { showLoading } from "../../utils/toast.jsx"
+import { storage } from '../../utils/localstorage.jsx';
 const ProppertyQRData = () => {
-    const [displaypage, setDisplaypage] = useState(true);
+    const [displaypage, setDisplaypage] = useState(false);
     const [loader, setLoader] = useState(false);
     const [searchParams] = useSearchParams();
+    const sentFor = useRef(null);
     // Extract date from  query parameters
-     const surveyID = searchParams.get('surveyid');
-     const tenantId = searchParams.get('tenantid');
-     const mobileNumber = searchParams.get('mobileno');
+    const surveyID = searchParams.get('surveyid');
+    const tenantId = searchParams.get('tenantid');
+    const mobileNumber = searchParams.get('mobileno');
+    useEffect(() => {
+        if (loader) {
+            showLoading("Loading...");
+        }
+    }, [loader]);
+    useEffect(() => {
+        if (!mobileNumber) return;
+        if (sentFor.current === mobileNumber) return;
+        sentFor.current = mobileNumber
+        checkMobileNumber(mobileNumber).finally(() => setLoader(false))
+        setDisplaypage(true)
 
-     useEffect(()=>{
-         checkMobileNumber(mobileNumber)
-         setDisplaypage(true)
-         setLoader(false)
-     }),[mobileNumber]
+    }), [mobileNumber]
 
-    const handleOtpComplete = (otp) => {
+    const handleOtpComplete = async (otp) => {
         console.log("OTP Entered:", otp);
+        const result = await loginWithOtp(mobileNumber, otp);
+        if (result.success) {
+            console.log("Access Token:", result);
+            storage.set("user-info", result.data.UserRequest);
+            storage.set("token", result.data.access_token);
+            storage.set("tenant-id", statetenantId);
+            setDisplaypage(false)
+            setLoader(true)
+        } else {
+            console.error(result.message);
+        }
     };
-    if(loader){
-//show loader
-    }
     return (
         <div className="otp-page">
-            {displaypage && (
-                
-                    <div className="otp-card">
-                        <h2 className="otp-title">OTP Verification</h2>
-
-                         <div className="info-box">
-                            <span><strong>Survey ID:</strong> {surveyID}</span>
-                            <span><strong>Tenant ID:</strong> {tenantId}</span>
-                            <p><strong>Mobile:</strong> {mobileNumber}</p>
-                        </div> 
-
-                        <p className="otp-subtext">
-                            Enter the 6-digit OTP sent to your mobile
-                        </p>
-
-                        <OtpInput onComplete={handleOtpComplete} />
+
+            {displaypage && !loader && (
+
+                <div className="otp-card">
+                    <h2 className="otp-title">OTP Verification</h2>
+
+                    <div className="info-box">
+                        <span><strong>Survey ID:</strong> {surveyID}</span>
+                        <span><strong>Tenant ID:</strong> {tenantId}</span>
+                        <p><strong>Mobile:</strong> {mobileNumber}</p>
                     </div>
-                
+
+                    <p className="otp-subtext">
+                        Enter the 6-digit OTP sent to your mobile
+                    </p>
+
+                    <OtpInput onComplete={handleOtpComplete} />
+                </div>
+
             )}
         </div>
 
diff --git a/web/egov-common-screen/src/utils/localstorage.jsx b/web/egov-common-screen/src/utils/localstorage.jsx
new file mode 100644
index 0000000000..00340b1cc2
--- /dev/null
+++ b/web/egov-common-screen/src/utils/localstorage.jsx
@@ -0,0 +1,43 @@
+export const storage = {
+  set: (key, value) => {
+    try {
+      const stringValue =
+        typeof value === "string" ? value : JSON.stringify(value);
+      localStorage.setItem(key, stringValue);
+    } catch (error) {
+      console.error("LocalStorage Set Error:", error);
+    }
+  },
+
+  get: (key) => {
+    try {
+      const value = localStorage.getItem(key);
+      if (!value) return null;
+
+      try {
+        return JSON.parse(value); // if object
+      } catch {
+        return value; // if normal string
+      }
+    } catch (error) {
+      console.error("LocalStorage Get Error:", error);
+      return null;
+    }
+  },
+
+  remove: (key) => {
+    try {
+      localStorage.removeItem(key);
+    } catch (error) {
+      console.error("LocalStorage Remove Error:", error);
+    }
+  },
+
+  clear: () => {
+    try {
+      localStorage.clear();
+    } catch (error) {
+      console.error("LocalStorage Clear Error:", error);
+    }
+  },
+};
\ No newline at end of file
diff --git a/web/egov-common-screen/src/utils/toast.jsx b/web/egov-common-screen/src/utils/toast.jsx
new file mode 100644
index 0000000000..abbe54d8f2
--- /dev/null
+++ b/web/egov-common-screen/src/utils/toast.jsx
@@ -0,0 +1,13 @@
+import toast from "react-hot-toast";
+
+export const showSuccess = (message) => {
+  toast.success(message);
+};
+
+export const showError = (message) => {
+  toast.error(message);
+};
+
+export const showLoading = (message) => {
+  return toast.loading(message);
+};
\ No newline at end of file
diff --git a/web/egov-common-screen/vite.config.js b/web/egov-common-screen/vite.config.js
index 5714f8d393..7bc1396134 100644
--- a/web/egov-common-screen/vite.config.js
+++ b/web/egov-common-screen/vite.config.js
@@ -1,12 +1,32 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
-
-// https://vite.dev/config/
-export default defineConfig({
-  plugins: [react()],
-  base: '/common',
-  server: {
-    host: 'localhost',
-    port: 3000,
-  },
-})
+import { defineConfig, loadEnv } from "vite";
+import react from "@vitejs/plugin-react";
+
+export default defineConfig(({ mode }) => {
+  // Load environment variables
+  const env = loadEnv(mode, process.cwd());
+
+  return {
+    plugins: [react()],
+    base: "/common",
+
+    server: {
+      host: "localhost",
+      port: 3000,
+
+      proxy: {
+        "/user-otp": {
+          target: env.VITE_API_HOST,
+          changeOrigin: true,
+          secure: false,
+          rewrite: (path) => path.replace(/^\/api/, ""),
+        },
+        "/user": {
+          target: env.VITE_API_HOST,
+          changeOrigin: true,
+          secure: false,
+          rewrite: (path) => path.replace(/^\/api/, ""),
+        },
+      },
+    },
+  };
+});
\ No newline at end of file

From b80188ad21b7eae92c5b58c592d2530ffefcc60f Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Thu, 26 Feb 2026 10:20:18 +0530
Subject: [PATCH 04/24] proprty-qr-code

---
 .../components/propertyQRData/function.jsx    | 38 +++++++++++++++----
 .../src/components/propertyQRData/index.jsx   | 16 ++++++--
 web/egov-common-screen/vite.config.js         |  6 +++
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/web/egov-common-screen/src/components/propertyQRData/function.jsx b/web/egov-common-screen/src/components/propertyQRData/function.jsx
index ddca137614..e3acef0de3 100644
--- a/web/egov-common-screen/src/components/propertyQRData/function.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/function.jsx
@@ -84,12 +84,36 @@ export const loginWithOtp = async (mobileNumber, otp, userType='CITIZEN') => {
     };
 
   } catch (error) {
-    return {
-      success: false,
-      message:
-        error?.response?.data?.error_description ||
-        "Invalid OTP or login failed",
-    };
-  }
+    showError(error?.response?.data?.error_description ||
+          "Invalid OTP or login failed")
+  //   return {
+  //     success: false,
+  //     message:
+  //       error?.response?.data?.error_description ||
+  //       "Invalid OTP or login failed",
+  //   };
+  //     
+   }
 };
 
+
+export const searchPropertyBySurvey = async ({ tenantId, surveyId }) => {
+  try {
+    const query = new URLSearchParams({
+      tenantId,
+      surveyId,
+    }).toString();
+
+    const response = await API.post(
+      `/property-services/property/_search?${query}`
+    );
+
+    return response?.data;
+  } catch (error) {
+    console.error(
+      "Property Search API Error:",
+      error?.response?.data || error.message
+    );
+    throw error;
+  }
+};
diff --git a/web/egov-common-screen/src/components/propertyQRData/index.jsx b/web/egov-common-screen/src/components/propertyQRData/index.jsx
index a348f1b44c..c8a07ec2d7 100644
--- a/web/egov-common-screen/src/components/propertyQRData/index.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/index.jsx
@@ -4,7 +4,7 @@ import 'bootstrap/dist/css/bootstrap.min.css';
 import './index.css'
 import OtpInput from './otpInput';
 import { useSearchParams } from 'react-router-dom';
-import { checkMobileNumber, loginWithOtp } from './function.jsx'
+import { checkMobileNumber, loginWithOtp, searchPropertyBySurvey } from './function.jsx'
 import { statetenantId } from "./constant.jsx"
 //URL : propertyQRData?surveyid=123&tenantid=pb.amritsar&mobileno=9335130557
 import { showLoading } from "../../utils/toast.jsx"
@@ -40,8 +40,15 @@ const ProppertyQRData = () => {
             storage.set("user-info", result.data.UserRequest);
             storage.set("token", result.data.access_token);
             storage.set("tenant-id", statetenantId);
-            setDisplaypage(false)
-            setLoader(true)
+            setDisplaypage(false);
+            setLoader(true);
+            try {
+                const data = await searchPropertyBySurvey({tenantId: tenantId, surveyId: surveyID});
+
+                console.log(data);
+            } catch (err) {
+                console.error("API Failed:", err);
+            }
         } else {
             console.error(result.message);
         }
@@ -68,6 +75,9 @@ const ProppertyQRData = () => {
                 </div>
 
             )}
+
+
+
         </div>
 
 
diff --git a/web/egov-common-screen/vite.config.js b/web/egov-common-screen/vite.config.js
index 7bc1396134..8a3f795da9 100644
--- a/web/egov-common-screen/vite.config.js
+++ b/web/egov-common-screen/vite.config.js
@@ -26,6 +26,12 @@ export default defineConfig(({ mode }) => {
           secure: false,
           rewrite: (path) => path.replace(/^\/api/, ""),
         },
+        "/property-services": {
+          target: env.VITE_API_HOST,
+          changeOrigin: true,
+          secure: false,
+          rewrite: (path) => path.replace(/^\/api/, ""),
+        },
       },
     },
   };

From 804bfeddef1b6e62ddba6f14cef73688d0324a52 Mon Sep 17 00:00:00 2001
From: AashishgKpmg4 <aashishgupta4@kpmg.com>
Date: Thu, 26 Feb 2026 23:15:48 +0530
Subject: [PATCH 05/24] PI-20632- Workflow added by backend team , fix from
 frontend-side

---
 .../screens/specs/wns/search-preview.js        |  2 +-
 .../WorkFlowContainer/index.js                 | 18 +++++++++++++-----
 .../src/ui-molecules-local/Footer/index.js     | 11 +++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/search-preview.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/search-preview.js
index 47e567ac6e..92d5a3b899 100644
--- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/search-preview.js
+++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/search-preview.js
@@ -1213,7 +1213,7 @@ const searchResults = async (action, state, dispatch, applicationNumber, process
     set(
       action.screenConfig,
       "components.div.children.taskDetails.children.cardContent.children.estimate.visible",
-      false
+      true
     );
   }
 };
diff --git a/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-containers-local/WorkFlowContainer/index.js b/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-containers-local/WorkFlowContainer/index.js
index daf76fe34f..c6a0cd86ca 100644
--- a/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-containers-local/WorkFlowContainer/index.js
+++ b/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-containers-local/WorkFlowContainer/index.js
@@ -109,6 +109,7 @@ class WorkFlowContainer extends React.Component {
       case "RESUBMIT":
       case "FORWARD_FOR_APPROVAL":
       case "FORWARD_FOR_FIELD_INSPECTION":
+      case "FORWARD_FOR_FEE":
         return "purpose=forward&status=success";
       case "MARK":
         return "purpose=mark&status=success";
@@ -144,6 +145,9 @@ class WorkFlowContainer extends React.Component {
         return "purpose=approve&status=success";
       case "ACTIVATE_CONNECTION":
         return "purpose=activate&status=success";
+      case "PAY_FEE":
+      case "PAY_DEMAND":
+        return "purpose=pay&status=success";
       case "REVOCATE":
         return "purpose=application&status=revocated";
       case "VOID":
@@ -446,7 +450,7 @@ class WorkFlowContainer extends React.Component {
         const PTStatus = get(preparedFinalObject,"Property.workflow.action", []);
         const WSassigneePresent = get(preparedFinalObject,"WaterConnection[0].assignee", []) ? get(preparedFinalObject,"WaterConnection[0].assignee", []).length > 0 : false;
         const WSassigneeAction = get(preparedFinalObject,"WaterConnection[0].action", "");
-        if(assigneePresent || FirenocassigneePresent || PTassigneePresent || WSassigneePresent || assigneeStatus === "PENDINGAPPROVAL" || fireNOCassigneeStatus === "PENDINGAPPROVAL" || PTStatus === "APPROVE" || WSassigneeAction === "APPROVE_FOR_CONNECTION" || WSassigneeAction === "ACTIVATE_CONNECTION" || assigneeAction=== "REJECT" ||  assigneeAction === "SENDBACKTOCITIZEN"|| FireNOCassigneeAction === "REJECT" || FireNOCassigneeAction === "SENDBACKTOCITIZEN" || PTassigneeAction === "REJECT" || PTassigneeAction === "SENDBACKTOCITIZEN" ){
+        if(assigneePresent || FirenocassigneePresent || PTassigneePresent || WSassigneePresent || assigneeStatus === "PENDINGAPPROVAL" || fireNOCassigneeStatus === "PENDINGAPPROVAL" || PTStatus === "APPROVE" || WSassigneeAction === "APPROVE_FOR_CONNECTION" || WSassigneeAction === "ACTIVATE_CONNECTION" || WSassigneeAction === "FORWARD_FOR_FEE" || assigneeAction=== "REJECT" ||  assigneeAction === "SENDBACKTOCITIZEN"|| FireNOCassigneeAction === "REJECT" || FireNOCassigneeAction === "SENDBACKTOCITIZEN" || PTassigneeAction === "REJECT" || PTassigneeAction === "SENDBACKTOCITIZEN" ){
             this.wfUpdate(label);
           }
       } else {
@@ -474,7 +478,7 @@ class WorkFlowContainer extends React.Component {
     const WSassigneePresent = get(preparedFinalObject,"WaterConnection[0].assignee", []) ? get(preparedFinalObject,"WaterConnection[0].assignee", []).length > 0 : false;
     const WSassigneeAction = get(preparedFinalObject,"WaterConnection[0].action", "");
     
-      if(assigneePresent || FirenocassigneePresent ||window.location.pathname.includes("bill-amend")|| PTassigneePresent || WSassigneePresent || assigneeStatus === "PENDINGAPPROVAL" || fireNOCassigneeStatus === "PENDINGAPPROVAL" || PTStatus === "APPROVE" || WSassigneeAction === "APPROVE" || WSassigneeAction === "APPROVE_FOR_CONNECTION" || WSassigneeAction === "APPROVE_CONNECTION" || WSassigneeAction === "ACTIVATE_CONNECTION" || assigneeAction=== "REJECT" || assigneeAction ===  "CANCEL"|| assigneeAction ===  "RESUBMIT" || assigneeAction === "SENDBACKTOCITIZEN" ||WSassigneeAction ==="SEND_BACK_TO_CITIZEN"|| WSassigneeAction === "RESUBMIT_APPLICATION" || WSassigneeAction === "REJECT" || FireNOCassigneeAction ==="RESUBMIT" || FireNOCassigneeAction === "REJECT" || FireNOCassigneeAction === "SENDBACKTOCITIZEN" || FireNOCassigneeAction === "CANCEL" || PTassigneeAction === "REJECT" ||PTassigneeAction === "SENDBACKTOCITIZEN" || assigneeStatus === "INITIATED"){
+      if(assigneePresent || FirenocassigneePresent ||window.location.pathname.includes("bill-amend")|| PTassigneePresent || WSassigneePresent || assigneeStatus === "PENDINGAPPROVAL" || fireNOCassigneeStatus === "PENDINGAPPROVAL" || PTStatus === "APPROVE" || WSassigneeAction === "APPROVE" || WSassigneeAction === "APPROVE_FOR_CONNECTION" || WSassigneeAction === "APPROVE_CONNECTION" || WSassigneeAction === "ACTIVATE_CONNECTION" || WSassigneeAction === "FORWARD_FOR_FEE" || assigneeAction=== "REJECT" || assigneeAction ===  "CANCEL"|| assigneeAction ===  "RESUBMIT" || assigneeAction === "SENDBACKTOCITIZEN" ||WSassigneeAction ==="SEND_BACK_TO_CITIZEN"|| WSassigneeAction === "RESUBMIT_APPLICATION" || WSassigneeAction === "REJECT" || FireNOCassigneeAction ==="RESUBMIT" || FireNOCassigneeAction === "REJECT" || FireNOCassigneeAction === "SENDBACKTOCITIZEN" || FireNOCassigneeAction === "CANCEL" || PTassigneeAction === "REJECT" ||PTassigneeAction === "SENDBACKTOCITIZEN" || assigneeStatus === "INITIATED"){
         this.wfUpdate(label);
       }
       
@@ -534,6 +538,8 @@ getRedirectUrl = (action, businessId, moduleName) => {
   }
   const payUrl = `/egov-common/pay?consumerCode=${businessId}&tenantId=${tenant}`;
   switch (action) {
+    case "PAY_FEE": return bservice ? `${payUrl}&businessService=${bservice}` : payUrl;
+    case "PAY_DEMAND": return bservice ? `${payUrl}&businessService=${bservice}` : payUrl;
     case "PAY": return bservice ? `${payUrl}&businessService=${bservice}` : payUrl;
     case "EDIT": return isAlreadyEdited
       ? `/${baseUrl}/apply?applicationNumber=${businessId}&tenantId=${tenant}&action=edit&edited=true`
@@ -706,12 +712,14 @@ prepareWorkflowContract = (data, moduleName) => {
         item.action !== "SEND_BACK_TO_CITIZEN" &&
         item.action !== "APPROVE_CONNECTION" &&
         item.action !== "APPROVE_FOR_CONNECTION" &&
-        item.action !== "RESUBMIT_APPLICATION";
+        item.action !== "RESUBMIT_APPLICATION" &&
+        item.action !== "PAY_FEE" &&
+        item.action !== "PAY_DEMAND";
       
       return {
         buttonLabel: item.action,
         moduleName: data[data.length - 1].businessService,
-        isLast: item.action === "PAY" ? true : false,
+        isLast: item.action === "PAY" || item.action === "PAY_FEE" || item.action === "PAY_DEMAND" ? true : false,
         buttonUrl: getRedirectUrl(item.action, businessId, businessService),
         dialogHeader: getHeaderName(item.action),
         showEmployeeList: showEmployeeListResult,
@@ -726,7 +734,7 @@ prepareWorkflowContract = (data, moduleName) => {
       return {
         buttonLabel: item.action,
         moduleName: data[data.length - 1].businessService,
-        isLast: item.action === "PAY" ? true : false,
+        isLast: item.action === "PAY" || item.action === "PAY_FEE" || item.action === "PAY_DEMAND" ? true : false,
         buttonUrl: getRedirectUrl(item.action, businessId, businessService),
         dialogHeader: getHeaderName(item.action),
         showEmployeeList: showEmployeeListResult,
diff --git a/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-molecules-local/Footer/index.js b/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-molecules-local/Footer/index.js
index 2675e35817..271e693357 100644
--- a/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-molecules-local/Footer/index.js
+++ b/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-molecules-local/Footer/index.js
@@ -131,6 +131,11 @@ class Footer extends React.Component {
           item.showEmployeeList = false;
         }
       }
+
+      if (item.buttonLabel === "PAY_FEE" || item.buttonLabel === "PAY_DEMAND") {
+        item.isLast = true;
+        item.showEmployeeList = false;
+      }
       
       if (dataPath === "BPA") {
         handleFieldChange(`${dataPath}.comment`, "");
@@ -239,6 +244,12 @@ class Footer extends React.Component {
           item.showEmployeeList = false;
         }
       }
+
+      if (item.buttonLabel === "PAY_FEE" || item.buttonLabel === "PAY_DEMAND") {
+        item.isLast = true;
+        item.showEmployeeList = false;
+      }
+
       if (dataPath === "BPA") {
         handleFieldChange(`${dataPath}.comment`, "");
         handleFieldChange(`${dataPath}.assignees`, "");

From 7c99e8bdac024d2eb45326aca858ecfe535c9bd8 Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Fri, 27 Feb 2026 17:34:43 +0530
Subject: [PATCH 06/24] property QR Code

---
 web/egov-common-screen/src/App.jsx            | 64 +++++++------
 .../propertyQRData/displayPropertyRecord.jsx  | 91 +++++++++++++++++++
 .../components/propertyQRData/function.jsx    | 19 ++++
 .../src/components/propertyQRData/index.jsx   | 83 +++++++++++------
 .../src/utils/privateRoute.jsx                | 13 +++
 5 files changed, 214 insertions(+), 56 deletions(-)
 create mode 100644 web/egov-common-screen/src/components/propertyQRData/displayPropertyRecord.jsx
 create mode 100644 web/egov-common-screen/src/utils/privateRoute.jsx

diff --git a/web/egov-common-screen/src/App.jsx b/web/egov-common-screen/src/App.jsx
index a9e167464b..4741079c4e 100644
--- a/web/egov-common-screen/src/App.jsx
+++ b/web/egov-common-screen/src/App.jsx
@@ -1,4 +1,4 @@
-import { useState,  } from 'react'
+import { useState, } from 'react'
 import Card from './components/Card'
 import Header from './components/Header'
 import Faq from './components/Faqs'
@@ -6,42 +6,52 @@ import Footer from './components/Footer'
 import Privacy from './components/Privacy'
 import Impersonation from './components/Impersonation'
 import PropertyQRData from './components/propertyQRData'
+import DisplayPropertyRecord from './components/propertyQRData/displayPropertyRecord'
 import './App.css'
+import PrivateRoute from './utils/privateRoute'
 import { Toaster } from 'react-hot-toast'
 import { BrowserRouter, Routes, Route, useLocation } from "react-router-dom";
 function App() {
-      const Layout = ({ children }) => {
-      const location = useLocation();
+  const Layout = ({ children }) => {
+    const location = useLocation();
 
-      const hideHeaderFooter = location.pathname === "/propertyQRData";
+    const hideHeaderFooter = location.pathname === "/propertyQRData" || location.pathname === "/displayPropertyRecord";
 
-      return (
-        <>
-          {!hideHeaderFooter && <Header />}
-          {children}
-          {!hideHeaderFooter && <Footer />}
-        </>
-      );
-    };
+    return (
+      <>
+        {!hideHeaderFooter && <Header />}
+        {children}
+        {!hideHeaderFooter && <Footer />}
+      </>
+    );
+  };
 
   return (
     <>
-      
+
       {/* //basename="/common" */}
       <BrowserRouter basename="/common">
-        
-      
-      <Layout>
-        <Routes>
-          <Route path="/" element={<Card />} />
-          <Route path="/privacy" element={<Privacy />} />
-          <Route path="/impersonation" element={<Impersonation />} />
-          <Route path="/propertyQRData" element={<PropertyQRData />} />
-          <Route path="*" element={<Card />} />
-        </Routes>
-      </Layout>
-      {/* ✅ ADD TOASTER HERE */}
-      <Toaster position="bottom-center" />
+
+
+        <Layout>
+          <Routes>
+            <Route path="/" element={<Card />} />
+            <Route path="/privacy" element={<Privacy />} />
+            <Route path="/impersonation" element={<Impersonation />} />
+            <Route path="/propertyQRData" element={<PropertyQRData />} />
+            <Route
+              path="/displayPropertyRecord"
+              element={
+                <PrivateRoute>
+                  <DisplayPropertyRecord />
+                </PrivateRoute>
+              }
+            />
+            <Route path="*" element={<Card />} />
+          </Routes>
+        </Layout>
+        {/* ✅ ADD TOASTER HERE */}
+        <Toaster position="bottom-center" />
       </BrowserRouter>
       {/* <Card />
       <center ><p style={{
@@ -62,7 +72,7 @@ function App() {
         }}>
       </div>
       <Faq /> */}
-      
+
     </>
   )
 }
diff --git a/web/egov-common-screen/src/components/propertyQRData/displayPropertyRecord.jsx b/web/egov-common-screen/src/components/propertyQRData/displayPropertyRecord.jsx
new file mode 100644
index 0000000000..0d7016b2d1
--- /dev/null
+++ b/web/egov-common-screen/src/components/propertyQRData/displayPropertyRecord.jsx
@@ -0,0 +1,91 @@
+import { useSearchParams } from 'react-router-dom';
+import { useEffect, useState } from 'react';
+import { searchPropertyBySurvey, getAddressArray } from "./function"
+const DisplayPropertyRecord = () => {
+    const [missingParams, setMissingParams] = useState(false);
+    const [searchParams] = useSearchParams();
+    const [propertyData, setPropertyData] = useState([]);
+    // Extract date from  query parameters
+    const surveyID = searchParams.get('surveyid');
+    const tenantId = searchParams.get('tenantid');
+    const mobileNumber = searchParams.get('mobileno');
+    useEffect(() => {
+        if (!surveyID || !tenantId || !mobileNumber) {
+            if (!errorShown.current) { // Show error only once
+                showError("Please scan the QR code again");
+                errorShown.current = true;
+            }
+            setMissingParams(true);
+            return;
+        }
+
+        const fetchProp = async () => {
+            try {
+                const data = await searchPropertyBySurvey({ tenantId, surveyId: surveyID });
+                //console.log("data",data)
+                setPropertyData(data?.Properties || []);
+
+            } catch (err) {
+                console.error("API Failed:", err);
+            }
+        };
+
+        fetchProp();
+    }, [surveyID, tenantId, mobileNumber]);
+   // console.log("propertyData", propertyData)
+   const editPropertyurl = (propertyID, tenantid)=>{
+    let url = `/citizen/property-tax/assessment-form?assessmentId=0&purpose=update&propertyId=${propertyID}&tenantId=${tenantid}`;
+    window.location.replace(url);   
+   }
+    return (
+        <div className="otp-page">
+            {missingParams ? (
+                <div className="otp-card">
+                    <h2 className="otp-title">Invalid QR Code</h2>
+                    <p className="otp-subtext">Please scan a valid QR code to proceed</p>
+                </div>
+            ) : (
+                <div className="property_card-container">
+                    {propertyData.length === 0 ? (
+                        <p>No properties found</p>
+                    ) : (
+                        propertyData.map((prop, idx) => (
+                            <div className="property-card" key = {prop?.id}>
+                                <div className="property-id">
+                                    Property ID: {prop?.propertyId}
+                                </div>
+
+                                <div className="property-row">
+                                    <span className="property-label">Owner:</span>
+                                    <span className="property-value">{prop?.owners[0]?.name || 'NA'}</span>
+                                </div>
+
+                                <div className="property-row">
+                                    <span className="property-label">Guardian:</span>
+                                    <span className="property-value">{prop?.owners[0]?.fatherOrHusbandName || 'NA'}</span>
+                                </div>
+
+                                <div className="property-address">
+                                    {getAddressArray(prop.address)}
+                                </div>
+
+                                <div
+                                    className={`status-badge ${prop?.status === "ACTIVE"
+                                            ? "status-active"
+                                            : "status-inworkflow"
+                                        }`}
+                                >
+                                    {prop?.status}
+                                </div>
+
+                                <button className="property-btn" onClick={()=>editPropertyurl(prop?.propertyId, prop?.tenantId)}>View</button>
+                            </div>
+                        ))
+                    )}
+                </div>
+            )}
+        </div>
+    );
+}
+
+export default DisplayPropertyRecord;
\ No newline at end of file
diff --git a/web/egov-common-screen/src/components/propertyQRData/function.jsx b/web/egov-common-screen/src/components/propertyQRData/function.jsx
index e3acef0de3..c6c16ab73c 100644
--- a/web/egov-common-screen/src/components/propertyQRData/function.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/function.jsx
@@ -117,3 +117,22 @@ export const searchPropertyBySurvey = async ({ tenantId, surveyId }) => {
     throw error;
   }
 };
+
+export const getAddressArray = (propertyaddress) => {
+  if (!propertyaddress) return [];
+
+  const addressParts = [
+    propertyaddress.buildingName,
+    propertyaddress.doorNo !== propertyaddress.buildingName ? propertyaddress.doorNo : null,
+    propertyaddress.street,
+    propertyaddress.locality?.name,
+    propertyaddress.city,
+    propertyaddress.district,
+    propertyaddress.state,
+    propertyaddress.country,
+    propertyaddress.pincode,
+  ];
+
+  // Remove null, undefined, empty string
+  return addressParts.filter(Boolean);
+};
diff --git a/web/egov-common-screen/src/components/propertyQRData/index.jsx b/web/egov-common-screen/src/components/propertyQRData/index.jsx
index c8a07ec2d7..4c00ff1915 100644
--- a/web/egov-common-screen/src/components/propertyQRData/index.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/index.jsx
@@ -2,22 +2,41 @@
 import { useEffect, useState, useRef } from 'react';
 import 'bootstrap/dist/css/bootstrap.min.css';
 import './index.css'
+import { useNavigate } from 'react-router-dom';
 import OtpInput from './otpInput';
 import { useSearchParams } from 'react-router-dom';
 import { checkMobileNumber, loginWithOtp, searchPropertyBySurvey } from './function.jsx'
 import { statetenantId } from "./constant.jsx"
 //URL : propertyQRData?surveyid=123&tenantid=pb.amritsar&mobileno=9335130557
-import { showLoading } from "../../utils/toast.jsx"
+import { showLoading, showError } from "../../utils/toast.jsx"
 import { storage } from '../../utils/localstorage.jsx';
+
 const ProppertyQRData = () => {
+    const Navigate = useNavigate();
     const [displaypage, setDisplaypage] = useState(false);
     const [loader, setLoader] = useState(false);
     const [searchParams] = useSearchParams();
+    const [missingParams, setMissingParams] = useState(false);
     const sentFor = useRef(null);
+    const errorShown = useRef(false);
     // Extract date from  query parameters
     const surveyID = searchParams.get('surveyid');
     const tenantId = searchParams.get('tenantid');
     const mobileNumber = searchParams.get('mobileno');
+    useEffect(() => {
+        storage.clear();
+    }, [])
+    useEffect(() => {
+        if (!surveyID || !tenantId || !mobileNumber) {
+            if (!errorShown.current) { // Show error only once
+                showError("Please scan the QR code again");
+                errorShown.current = true;
+            }
+            setMissingParams(true);
+            return;
+        }
+        setMissingParams(false);
+    }, [surveyID, tenantId, mobileNumber]);
     useEffect(() => {
         if (loader) {
             showLoading("Loading...");
@@ -27,6 +46,7 @@ const ProppertyQRData = () => {
         if (!mobileNumber) return;
         if (sentFor.current === mobileNumber) return;
         sentFor.current = mobileNumber
+
         checkMobileNumber(mobileNumber).finally(() => setLoader(false))
         setDisplaypage(true)
 
@@ -40,47 +60,52 @@ const ProppertyQRData = () => {
             storage.set("user-info", result.data.UserRequest);
             storage.set("token", result.data.access_token);
             storage.set("tenant-id", statetenantId);
-            setDisplaypage(false);
-            setLoader(true);
-            try {
-                const data = await searchPropertyBySurvey({tenantId: tenantId, surveyId: surveyID});
+            const qs = new URLSearchParams({
+                surveyid: surveyID,
+                tenantid: tenantId,
+                mobileno: mobileNumber,
+            }).toString();
+            Navigate(`/displayPropertyRecord?${qs}`, { replace: true });
+            // try {
+            //     const data = await searchPropertyBySurvey({ tenantId: tenantId, surveyId: surveyID });
 
-                console.log(data);
-            } catch (err) {
-                console.error("API Failed:", err);
-            }
+            //     console.log(data);
+            // } catch (err) {
+            //     console.error("API Failed:", err);
+            // }
         } else {
             console.error(result.message);
         }
     };
     return (
         <div className="otp-page">
-
-            {displaypage && !loader && (
-
+            {missingParams ? (
                 <div className="otp-card">
-                    <h2 className="otp-title">OTP Verification</h2>
-
-                    <div className="info-box">
-                        <span><strong>Survey ID:</strong> {surveyID}</span>
-                        <span><strong>Tenant ID:</strong> {tenantId}</span>
-                        <p><strong>Mobile:</strong> {mobileNumber}</p>
-                    </div>
-
-                    <p className="otp-subtext">
-                        Enter the 6-digit OTP sent to your mobile
-                    </p>
-
-                    <OtpInput onComplete={handleOtpComplete} />
+                    <h2 className="otp-title">Invalid QR Code</h2>
+                    <p className="otp-subtext">Please scan a valid QR code to proceed</p>
                 </div>
+            ) : (
+                <>
+                    {displaypage && !loader && (
+                        <div className="otp-card">
+                            <h2 className="otp-title">OTP Verification</h2>
 
-            )}
-
+                            <div className="info-box">
+                                <span><strong>Survey ID:</strong> {surveyID}</span>
+                                <span><strong>Tenant ID:</strong> {tenantId}</span>
+                                <p><strong>Mobile:</strong> {mobileNumber}</p>
+                            </div>
 
+                            <p className="otp-subtext">
+                                Enter the 6-digit OTP sent to your mobile
+                            </p>
 
+                            <OtpInput onComplete={handleOtpComplete} />
+                        </div>
+                    )}
+                </>
+            )}
         </div>
-
-
     )
 }
 export default ProppertyQRData;
\ No newline at end of file
diff --git a/web/egov-common-screen/src/utils/privateRoute.jsx b/web/egov-common-screen/src/utils/privateRoute.jsx
new file mode 100644
index 0000000000..14e0e85d99
--- /dev/null
+++ b/web/egov-common-screen/src/utils/privateRoute.jsx
@@ -0,0 +1,13 @@
+import { Navigate } from "react-router-dom";
+import { storage } from "./localstorage"; 
+
+const PrivateRoute = ({ children }) => {
+  const user = storage.get("user-info"); 
+  if (!user) {
+    return <Navigate to="/propertyQRData" replace />;   
+  }
+
+  return children;
+};
+
+export default PrivateRoute;
\ No newline at end of file

From 3c1a4464f0033419eb6704709b0bf31c079b4cb5 Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Mon, 2 Mar 2026 10:38:51 +0530
Subject: [PATCH 07/24] PI-20685 Needed Renewal of year 25-26 and new
 application of year 26-27

---
 .../src/ui-molecules-local/Footer/index.js    | 189 +++++++++---------
 1 file changed, 98 insertions(+), 91 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-molecules-local/Footer/index.js b/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-molecules-local/Footer/index.js
index 2675e35817..a949415d75 100644
--- a/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-molecules-local/Footer/index.js
+++ b/web/rainmaker/dev-packages/egov-workflow-dev/src/ui-molecules-local/Footer/index.js
@@ -21,13 +21,13 @@ import "./index.css";
 class Footer extends React.Component {
   state = {
     open: false,
-    nocValid : false,
+    nocValid: false,
     data: {},
     employeeList: [],
-    tlpopUp : false,
-    licenseData : [],
-    wFCode : "",
-    isHAZ : false
+    tlpopUp: false,
+    licenseData: [],
+    wFCode: "",
+    isHAZ: false
     //responseLength: 0
   };
 
@@ -82,7 +82,7 @@ class Footer extends React.Component {
   openActionDialog = async (item, label) => {
     const { dataPath, state } = this.props;
     let diffDays;
-    
+
     const getdate = get(
       state,
       "screenConfiguration.preparedFinalObject.FireNOCs[0].fireNOCDetails.applicationNumber"
@@ -93,7 +93,7 @@ class Footer extends React.Component {
     );
     const firenocstatus = get(
       state,
-      "screenConfiguration.preparedFinalObject.FireNOCs[0].fireNOCDetails.status","NA"
+      "screenConfiguration.preparedFinalObject.FireNOCs[0].fireNOCDetails.status", "NA"
     );
     if (getdate) {
       const cd = getdate.split("PB-FN-");
@@ -106,8 +106,8 @@ class Footer extends React.Component {
       console.log(diffTime + " milliseconds");
       console.log(diffDays + " days");
     }
-    if(firenocstatus && firenocstatus.toUpperCase() == "FIELDINSPECTION"){
-      this.setState({ nocValid: true});
+    if (firenocstatus && firenocstatus.toUpperCase() == "FIELDINSPECTION") {
+      this.setState({ nocValid: true });
     }
     //if(firenocstatus.toUpperCase() == "CITIZENACTIONREQUIRED-DV" || firenocstatus.toUpperCase() == "CITIZENACTIONREQUIRED"){
     if (true) {
@@ -119,19 +119,19 @@ class Footer extends React.Component {
       // else{
       const { handleFieldChange, setRoute, dataPath, onDialogButtonClick } = this.props;
       let employeeList = [], empList = [];
-      
+
       if (item.buttonLabel === "ACTIVATE_CONNECTION") {
         if (item.moduleName === "NewWS1" || item.moduleName === "NewSW1") {
           item.showEmployeeList = false;
         }
       }
-      
+
       if (item.buttonLabel === "APPROVE_CONNECTION") {
         if (item.moduleName === "DisconnectWSConnection" || item.moduleName === "DisconnectSWConnection") {
           item.showEmployeeList = false;
         }
       }
-      
+
       if (dataPath === "BPA") {
         handleFieldChange(`${dataPath}.comment`, "");
         handleFieldChange(`${dataPath}.assignees`, "");
@@ -348,83 +348,90 @@ class Footer extends React.Component {
       open: false
     });
   };
-  openTLPopup = async (financialYear, tenantId)=>{
-      //console.log("shdgshdfs")
-      
-      let payload = null;
-      let uuType ="TL"
-      const { setRoute, state, toggleSnackbar } = this.props;
-      const licences = get(
-        state.screenConfiguration.preparedFinalObject,
-        `Licenses`
-      );
-      const licenseWorkflow = get(
-        state.screenConfiguration.preparedFinalObject,
-        `Licenses[0].workflowCode`
-      );
-      this.setState({
-        wFCode : licenseWorkflow
-      })
-      var nextFinancialYear = await getNextFinancialYearForRenewal(
-        financialYear
+  openTLPopup = async (financialYear, tenantId) => {
+    //console.log("shdgshdfs")
+
+    let payload = null;
+    let uuType = "TL"
+    const { setRoute, state, toggleSnackbar } = this.props;
+    const licences = get(
+      state.screenConfiguration.preparedFinalObject,
+      `Licenses`
+    );
+    const licenseWorkflow = get(
+      state.screenConfiguration.preparedFinalObject,
+      `Licenses[0].workflowCode`
+    );
+    this.setState({
+      wFCode: licenseWorkflow
+    })
+    const currentMonth = new Date().getMonth() + 1;
+    const currentFinancialYear = this.getCurrentFinancialYear();
+    const financialYearToUse =
+      currentMonth === 3
+        ? await getNextFinancialYearForRenewal(currentFinancialYear)
+        : currentFinancialYear;
+    // var nextFinancialYear = await getNextFinancialYearForRenewal(
+    //   financialYear
+    // );
+    // var currentFinancialYear = this.getCurrentFinancialYear();
+
+    //nextFinancialYear = financialYearToUse;
+    const wfCode = "DIRECTRENEWAL";
+    set(licences[0], "action", "INITIATE");
+    set(licences[0], "workflowCode", wfCode);
+    set(licences[0], "applicationType", "RENEWAL");
+    set(licences[0], "financialYear", financialYearToUse);
+    set(licences[0], "tradeLicenseDetail.adhocPenalty", null);
+    set(licences[0], "tradeLicenseDetail.adhocExemption", null);
+    this.setState({
+      tlpopUp: true,
+      licenseData: licences[0]
+    })
+    let mdmsBody = {
+      MdmsCriteria: {
+        tenantId: "pb",
+        moduleDetails: [
+          {
+            moduleName: "TradeLicense",
+            masterDetails: [{ name: "TradeType" }]
+          }
+        ]
+      }
+    };
+    let tradeDataFetched = get(licences[0], "tradeLicenseDetail")
+    try {
+
+      payload = await httpRequest(
+        "post",
+        "/egov-mdms-service/v1/_search",
+        "_search",
+        [],
+        mdmsBody
       );
-      var currentFinancialYear = this.getCurrentFinancialYear();
-      nextFinancialYear = currentFinancialYear;
-      const wfCode = "DIRECTRENEWAL";
-        set(licences[0], "action", "INITIATE");
-        set(licences[0], "workflowCode", wfCode);
-        set(licences[0], "applicationType", "RENEWAL");
-        set(licences[0], "financialYear", nextFinancialYear);
-        set(licences[0], "tradeLicenseDetail.adhocPenalty", null);
-        set(licences[0], "tradeLicenseDetail.adhocExemption", null);
-        this.setState({
-          tlpopUp : true,
-          licenseData : licences[0]
-        })
-        let mdmsBody = {
-          MdmsCriteria: {
-            tenantId: "pb",
-            moduleDetails: [
-              {
-                moduleName: "TradeLicense",
-                masterDetails: [{ name: "TradeType"}]
-              }
-            ]
+      const tradeUnitMDMS = payload.MdmsRes.TradeLicense;
+      for (let tradeData of tradeDataFetched.tradeUnits) {
+        //  console.log("tradeData"+JSON.stringify(tradeData))
+        for (let tradeMdms of tradeUnitMDMS.TradeType) {
+          if (tradeData.tradeType === tradeMdms.code) {
+            // console.log(tradeData.tradeType+"==>"+tradeMdms.ishazardous)
+            if (tradeMdms.ishazardous === true) {
+              this.setState({
+                isHAZ: true
+              })
+              return false;
+            }
+
           }
-        };
-        let tradeDataFetched = get(licences[0],"tradeLicenseDetail")
-        try {
-            
-          payload = await httpRequest(
-            "post",
-            "/egov-mdms-service/v1/_search",
-            "_search",
-            [],
-            mdmsBody
-          );
-          const tradeUnitMDMS = payload.MdmsRes.TradeLicense;
-           for(let tradeData of tradeDataFetched.tradeUnits){
-            //  console.log("tradeData"+JSON.stringify(tradeData))
-             for(let tradeMdms of tradeUnitMDMS.TradeType){
-              if(tradeData.tradeType === tradeMdms.code){
-                 // console.log(tradeData.tradeType+"==>"+tradeMdms.ishazardous)
-                 if(tradeMdms.ishazardous === true){
-                  this.setState({
-                      isHAZ : true
-                    })
-                    return false;
-                 }
-                
-               }
-             }
-           } 
-          
-        }catch(e){
-          console.log(e.message)
         }
-      
+      }
+
+    } catch (e) {
+      console.log(e.message)
+    }
+
   }
-  ;
+    ;
   render() {
     const {
       contractData,
@@ -444,7 +451,7 @@ class Footer extends React.Component {
         const { buttonLabel, moduleName } = item;
 
         return {
-          labelName:  buttonLabel ,
+          labelName: buttonLabel,
           labelKey: `WF_${appName.toUpperCase()}_${moduleName.toUpperCase()}_${buttonLabel}`,
           link: () => {
             (moduleName === "NewTL" || moduleName === "EDITRENEWAL") && buttonLabel === "APPLY" ? onDialogButtonClick(buttonLabel, isDocRequired) :
@@ -528,8 +535,8 @@ class Footer extends React.Component {
           label: "Submit",
           labelKey: "WF_TL_RENEWAL_SUBMIT_BUTTON",
           link: () => {
-           // this.renewTradelicence(financialYear, tenantId);
-           this.openTLPopup(financialYear, tenantId, licenseWorkflow);
+            // this.renewTradelicence(financialYear, tenantId);
+            this.openTLPopup(financialYear, tenantId, licenseWorkflow);
           }
         };
         if (responseLength > 1) {
@@ -589,9 +596,9 @@ class Footer extends React.Component {
         <TlRenewDialog
           open={tlpopUp}
           onClose={this.tlPopUpClose}
-          licenseData ={licenseData}
-          wFCode = {wFCode}
-          isHAZ ={isHAZ}
+          licenseData={licenseData}
+          wFCode={wFCode}
+          isHAZ={isHAZ}
         />
       </div>
     );

From 61fd79eb261051a1feceb0f13ec603dc6c31bd54 Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Thu, 26 Feb 2026 15:37:44 +0530
Subject: [PATCH 08/24] mono bhasini code

---
 .../egov-ui-kit-dev/src/hocs/index.css        |  47 ++++
 .../src/hocs/withAuthorization.js             | 204 +++++++++---------
 2 files changed, 154 insertions(+), 97 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/index.css b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/index.css
index ee3012690c..a167efba4b 100644
--- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/index.css
+++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/index.css
@@ -203,3 +203,50 @@
 .rainmaker-action-menu::-webkit-scrollbar-resizer {
   background-color: transparent;
 }
+.language-plugin{
+    position: fixed; 
+    bottom: 8rem; 
+    right: 20px;
+    z-index: 99999;
+    background: linear-gradient(135deg, rgb(37, 99, 235), rgb(124, 58, 237));
+    padding: 6px 10px;
+    border-radius:8px;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
+    display: flex;
+    align-items: center;
+}       
+.language-plugin svg path{
+  fill: #FFF;
+} 
+.language-plugin:hover{
+  transform: translateY(-3px) scale(1.03);
+  box-shadow:
+    0 10px 20px rgba(0, 0, 0, 0.25),
+    0 0 20px rgba(59, 130, 246, 0.5),
+    0 0 35px rgba(14, 165, 233, 0.4);
+}
+.language-plugin-landing{
+   position: fixed; 
+    top: 16px; 
+    right: 20px;
+    z-index: 99999;
+    background: #FFF;
+    padding: 6px 10px;
+    border-radius:8px;
+    display: flex;
+    align-items: center;
+    backdrop-filter: blur(12px);
+  -webkit-backdrop-filter: blur(12px);
+   box-shadow:0 8px 32px rgba(0, 0, 0, 0.2);
+  transition: all 0.3s ease;
+}
+.language-plugin-landing:hover{
+  transform: translateY(-3px) scale(1.03);
+  box-shadow:
+    0 10px 20px rgba(0, 0, 0, 0.25),
+    0 0 20px rgba(59, 130, 246, 0.5),
+    0 0 35px rgba(14, 165, 233, 0.4);
+}
+.margin-right-50{
+  margin-right: 50px;
+}
diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/withAuthorization.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/withAuthorization.js
index a41e0bd3d9..0d92873585 100644
--- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/withAuthorization.js
+++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/withAuthorization.js
@@ -49,6 +49,11 @@ const withAuthorization = (options = {}) => (Component) => {
       // This component is wrapped by multiple HOCs and would cause duplicate API calls
       // Only fetch on navigation via componentDidUpdate
       console.log('[withAuthorization] componentDidMount - Skipping initial fetch (handled by App.js)');
+        const script = document.createElement("script");
+        script.id = "bhashini-translation-script";
+        script.src = "https://translation-plugin.bhashini.co.in/v3/website_translation_utility.js";
+        script.async = true;
+        document.body.appendChild(script);
     }
 
     citizenTenantId = () => {
@@ -102,7 +107,7 @@ const withAuthorization = (options = {}) => (Component) => {
       // FIX: Use componentDidUpdate instead of deprecated componentWillReceiveProps
       // Only fetch locale if the route actually changed (not on every prop change)
       if (this.props.location && prevProps.location &&
-          this.props.location.pathname !== prevProps.location.pathname) {
+        this.props.location.pathname !== prevProps.location.pathname) {
         this.fetchLocale();
       }
     }
@@ -198,119 +203,124 @@ const withAuthorization = (options = {}) => (Component) => {
       let drawerClsName = menuDrawerOpen ? "full-menu-drawer" : "icon-menu-drawer";
       let screencls = menuDrawerOpen ? "with-full-menu" : "with-icon-menu";
       return (
-        <div className="rainmaker-header-cont" style={{ position: "relative" }}>
-          {!hideHeader && authenticated ? (
-            <Header
-              title={title}
-              titleAddon={role !== hideFor && titleAddon && titleAddon}
-              //titleObject={role !== hideFor && titleObject && titleObject}
-              hasLocalisation={hasLocalisation}
-              userInfo={userInfo}
-              role={role}
-              options={options}
-              history={history}
-              refreshButton={refreshButton}
-              sortButton={sortButton}
-              searchButton={searchButton}
-              helpButton={helpButton}
-              notificationButton={notificationButton}
-              //className={isHomeScreen&&process.env.REACT_APP_NAME==="Citizen" ? "rainmaker-header-home-small-screen" : "rainmaker-header"}
-              className={"rainmaker-header"}
-            />
-          ) : null}
-          <div className=" col-xs-12" style={{ padding: 0 }}>
-            {!hideActionMenu && authenticated && (
-              <div>
-                <div className={`col-xs-2 action-menu-drawer show-action-menu ${drawerClsName}`} id="menu-container">
-                  <div className="rainmaker-action-menu">
-                    <ActionMenu
-                      role={role}
-                      toggleDrawer={(menuItmeClick = true) => {
-                        this.toggleDrawer(menuItmeClick);
-                      }}
-                      menuDrawerOpen={menuDrawerOpen}
-                    />
+        <div>
+          <div className="rainmaker-header-cont" style={{ position: "relative" }}>
+            {!hideHeader && authenticated ? (
+              <Header
+                title={title}
+                titleAddon={role !== hideFor && titleAddon && titleAddon}
+                //titleObject={role !== hideFor && titleObject && titleObject}
+                hasLocalisation={hasLocalisation}
+                userInfo={userInfo}
+                role={role}
+                options={options}
+                history={history}
+                refreshButton={refreshButton}
+                sortButton={sortButton}
+                searchButton={searchButton}
+                helpButton={helpButton}
+                notificationButton={notificationButton}
+                //className={isHomeScreen&&process.env.REACT_APP_NAME==="Citizen" ? "rainmaker-header-home-small-screen" : "rainmaker-header"}
+                className={"rainmaker-header"}
+              />
+            ) : null}
+            <div className=" col-xs-12" style={{ padding: 0 }}>
+              {!hideActionMenu && authenticated && (
+                <div>
+                  <div className={`col-xs-2 action-menu-drawer show-action-menu ${drawerClsName}`} id="menu-container">
+                    <div className="rainmaker-action-menu">
+                      <ActionMenu
+                        role={role}
+                        toggleDrawer={(menuItmeClick = true) => {
+                          this.toggleDrawer(menuItmeClick);
+                        }}
+                        menuDrawerOpen={menuDrawerOpen}
+                      />
+                    </div>
                   </div>
+                  <div className="col-xs-2  show-action-menu" /> {/*Dummy div for proper alignment - fixed positioning drawbacks*/}
                 </div>
-                <div className="col-xs-2  show-action-menu" /> {/*Dummy div for proper alignment - fixed positioning drawbacks*/}
-              </div>
-            )}
+              )}
 
-            <div className={`col-xs-12 col-sm-10 ${screencls}`} style={{ padding: 0 }}>
-              {authenticated ? (
-                <div>
-                  {!hideTitle && role !== hideFor && (
-                    <div>
-                      <div className={"screen-title-label col-xs-8"} style={{ padding: "24px 0 8px 16px" }}>
-                        <Label
-                          className={titleBackground ? "title-white-background screen-title-label" : "screen-title-label"}
-                          label={role === customFor ? customTitle : title}
-                          containerStyle={{ marginRight: 3 }}
-                          dark={true}
-                          bold={true}
-                          fontSize={20}
-                        />
-                        {titleAddon && (
+              <div className={`col-xs-12 col-sm-10 ${screencls}`} style={{ padding: 0 }}>
+                {authenticated ? (
+                  <div>
+                    {!hideTitle && role !== hideFor && (
+                      <div>
+                        <div className={"screen-title-label col-xs-8"} style={{ padding: "24px 0 8px 16px" }}>
                           <Label
                             className={titleBackground ? "title-white-background screen-title-label" : "screen-title-label"}
-                            label={titleAddon}
+                            label={role === customFor ? customTitle : title}
+                            containerStyle={{ marginRight: 3 }}
                             dark={true}
                             bold={true}
                             fontSize={20}
                           />
-                        )}
-                        {titleObject && (
-                          <div className="rainmaker-displayInline">
-                            {titleObject.map((item) => {
-                              return (
-                                <Label
-                                  className={titleBackground ? "title-white-background screen-title-label" : "screen-title-label"}
-                                  label={item}
-                                  dark={true}
-                                  bold={true}
-                                  fontSize={20}
-                                  containerStyle={{ marginRight: 5 }}
-                                />
-                              );
-                            })}
-                          </div>
-                        )}
-                      </div>
-                      {sortButton && (
-                        <div className="sort-button col-xs-4" style={{ padding: "20px 20px 0px 0px" }}>
-                          <div
-                            className="rainmaker-displayInline"
-                            style={{ cursor: "pointer", justifyContent: "flex-end" }}
-                            onClick={this.onSortClick}
-                          >
+                          {titleAddon && (
                             <Label
-                              label="ES_SORT_BUTTON"
-                              color="rgba(0, 0, 0, 0.8700000047683716)"
-                              containerStyle={{ marginRight: 5 }}
-                              labelStyle={{ fontWeight: 500 }}
+                              className={titleBackground ? "title-white-background screen-title-label" : "screen-title-label"}
+                              label={titleAddon}
+                              dark={true}
+                              bold={true}
+                              fontSize={20}
                             />
-                            <Icon style={style.iconStyle} action="action" name="swap-vert" color="#484848" />
-                          </div>
-                          <SortDialog sortPopOpen={this.state.sortPopOpen} closeSortDialog={this.closeSortDialog} />
+                          )}
+                          {titleObject && (
+                            <div className="rainmaker-displayInline">
+                              {titleObject.map((item) => {
+                                return (
+                                  <Label
+                                    className={titleBackground ? "title-white-background screen-title-label" : "screen-title-label"}
+                                    label={item}
+                                    dark={true}
+                                    bold={true}
+                                    fontSize={20}
+                                    containerStyle={{ marginRight: 5 }}
+                                  />
+                                );
+                              })}
+                            </div>
+                          )}
                         </div>
-                      )}
-                    </div>
-                  )}
-                  <Component
-                    {...this.props}
-                    title={title}
-                    renderCustomTitleForPt={this.renderCustomTitleForPt}
-                    renderCustomTitle={this.renderCustomTitle}
-                  />
-                </div>
-              ) : null}
+                        {sortButton && (
+                          <div className="sort-button col-xs-4" style={{ padding: "20px 20px 0px 0px" }}>
+                            <div
+                              className="rainmaker-displayInline"
+                              style={{ cursor: "pointer", justifyContent: "flex-end" }}
+                              onClick={this.onSortClick}
+                            >
+                              <Label
+                                label="ES_SORT_BUTTON"
+                                color="rgba(0, 0, 0, 0.8700000047683716)"
+                                containerStyle={{ marginRight: 5 }}
+                                labelStyle={{ fontWeight: 500 }}
+                              />
+                              <Icon style={style.iconStyle} action="action" name="swap-vert" color="#484848" />
+                            </div>
+                            <SortDialog sortPopOpen={this.state.sortPopOpen} closeSortDialog={this.closeSortDialog} />
+                          </div>
+                        )}
+                      </div>
+                    )}
+                    <Component
+                      {...this.props}
+                      title={title}
+                      renderCustomTitleForPt={this.renderCustomTitleForPt}
+                      renderCustomTitle={this.renderCustomTitle}
+                    />
+                  </div>
+                ) : null}
+              </div>
             </div>
-          </div>
-          {/* {!hideFooter && authenticated ? (
+            {/* {!hideFooter && authenticated ? (
             <div className="hidden-md hidden-sm hidden-lg">
               <Footer history={history} role={role} />
             </div>
           ) : null} */}
+          </div>
+          <div className="language-plugin">
+            <div className="bhashini-plugin-container"></div>
+          </div>
         </div>
       );
     }

From 2855aa6680e91617cac7629438ec40605965d926 Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Fri, 27 Feb 2026 12:33:40 +0530
Subject: [PATCH 09/24] PI-20678 Implement bhashini in Mono-UI

---
 .../src/hocs/withoutAuthorization.js          | 116 ++++++++++--------
 1 file changed, 62 insertions(+), 54 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/withoutAuthorization.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/withoutAuthorization.js
index ca5a85dbc5..abffe3086e 100644
--- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/withoutAuthorization.js
+++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/hocs/withoutAuthorization.js
@@ -27,7 +27,7 @@ const getUlbGradeLabel = (ulbGrade) => {
 const withoutAuthorization = (redirectionUrl) => (Component) => {
   class Wrapper extends React.Component {
     state = {
-      languageSelected: getLocale()||"en_IN",
+      languageSelected: getLocale() || "en_IN",
     };
     style = {
       baseStyle: {
@@ -73,7 +73,7 @@ const withoutAuthorization = (redirectionUrl) => (Component) => {
 
     componentDidMount() {
       if (this.props.authenticated && !isPublicSearch()) {
-        if(!this.props.isOpenLink){
+        if (!this.props.isOpenLink) {
           this.props.history.push(redirectionUrl);
         }
       }
@@ -83,6 +83,11 @@ const withoutAuthorization = (redirectionUrl) => (Component) => {
         setLocale(locale);
         this.onLanguageChange(locale);
       }
+      const script = document.createElement("script");
+      script.id = "bhashini-translation-script";
+      script.src = "https://translation-plugin.bhashini.co.in/v3/website_translation_utility.js";
+      script.async = true;
+      document.body.appendChild(script);
     }
 
     onLanguageChange = (event, index, value) => {
@@ -96,11 +101,11 @@ const withoutAuthorization = (redirectionUrl) => (Component) => {
         tenantId = userInfo && userInfo.permanentCity;
         tenantId = tenantInfo ? tenantInfo : tenantId;
       }
-      var resetList=[];
-      var newList =JSON.stringify(resetList);
+      var resetList = [];
+      var newList = JSON.stringify(resetList);
       setStoredModulesList(newList);
-      let locale= getLocale();
-      let resultArray=[];
+      let locale = getLocale();
+      let resultArray = [];
       setLocalizationLabels(locale, resultArray);
       this.props.fetchLocalizationLabel(value, tenantId, tenantId);
     };
@@ -117,62 +122,65 @@ const withoutAuthorization = (redirectionUrl) => (Component) => {
       const { style } = this;
       return (
         <div>
+          <div className="language-plugin">
+            <div className="bhashini-plugin-container"></div>
+          </div>
           {/* FIXME need to move appbar as new component */}
           {isOpenLink ? (
-            <div className="rainmaker-header-cont" style={isPublicSearch ? style.headerStyle : { position: "relative" }}>
-              <div style={{ lineHeight: "64px" }}>
-                <AppBar
-                  className="rainmaker-header"
-                  title={
-                    <div className="citizen-header-logo-label">
-                      <div className={logoClassName}>
-                        <img src={ulbLogo ? ulbLogo : pbLogo} onError={(event) => event.target.setAttribute("src", pbLogo)} />
+              <div className="rainmaker-header-cont" style={isPublicSearch ? style.headerStyle : { position: "relative" }}>
+                <div style={{ lineHeight: "64px" }}>
+                  <AppBar
+                    className="rainmaker-header"
+                    title={
+                      <div className="citizen-header-logo-label">
+                        <div className={logoClassName}>
+                          <img src={ulbLogo ? ulbLogo : pbLogo} onError={(event) => event.target.setAttribute("src", pbLogo)} />
+                        </div>
+                        {!isPublicSearch && <div className="rainmaker-displayInline">
+                          <Label
+                            containerStyle={{ marginLeft: "10px" }}
+                            className="screenHeaderLabelStyle appbar-municipal-label"
+                            label={ulbName && `TENANT_TENANTS_${ulbName.toUpperCase().replace(/[.]/g, "_")}`}
+                          />
+                          <Label
+                            containerStyle={{ marginLeft: "4px" }}
+                            className="screenHeaderLabelStyle appbar-municipal-label"
+                            label={defaultTitle}
+                          />
+                        </div>}
                       </div>
-                      {!isPublicSearch && <div className="rainmaker-displayInline">
-                        <Label
-                          containerStyle={{ marginLeft: "10px" }}
-                          className="screenHeaderLabelStyle appbar-municipal-label"
-                          label={ulbName && `TENANT_TENANTS_${ulbName.toUpperCase().replace(/[.]/g, "_")}`}
-                        />
-                        <Label
-                          containerStyle={{ marginLeft: "4px" }}
-                          className="screenHeaderLabelStyle appbar-municipal-label"
-                          label={defaultTitle}
-                        />
-                      </div>}
+                    }
+                    titleStyle={style.titleStyle}
+                    {...rest}
+                  >
+                    <Toolbar className="app-toolbar" style={{ padding: "0px", height: "64px", background: "#ffffff" }}>
+                      {hasLocalisation && (
+                        <div className="userSettingsContainer">
+                          <DropDown
+                            onChange={this.onLanguageChange}
+                            listStyle={style.listStyle}
+                            style={style.baseStyle}
+                            labelStyle={style.label}
+                            dropDownData={languages}
+                            value={languageSelected}
+                            underlineStyle={{ borderBottom: "none" }}
+                          />
+                        </div>
+                      )}
+                    </Toolbar>
+                    <div className="appbar-right-logo">
+                      <img src={digitLogo} />
                     </div>
-                  }
-                  titleStyle={style.titleStyle}
-                  {...rest}
-                >
-                  <Toolbar className="app-toolbar" style={{ padding: "0px", height: "64px", background: "#ffffff" }}>
-                    {hasLocalisation && (
-                      <div className="userSettingsContainer">
-                        <DropDown
-                          onChange={this.onLanguageChange}
-                          listStyle={style.listStyle}
-                          style={style.baseStyle}
-                          labelStyle={style.label}
-                          dropDownData={languages}
-                          value={languageSelected}
-                          underlineStyle={{ borderBottom: "none" }}
-                        />
-                      </div>
-                    )}
-                  </Toolbar>
-                  <div className="appbar-right-logo">
-                    <img src={digitLogo} />
-                  </div>
-                </AppBar>
-              </div>
-              <div>
-                <Component {...this.props} />
+                  </AppBar>
+                </div>
+                <div>
+                  <Component {...this.props} />
+                </div>
               </div>
-            </div>
           ) : (
             <Component {...this.props} />
           )}
-          
+
         </div>
       );
     }

From b511265824a17b33d59abe77c03e80d058a4313a Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Mon, 2 Mar 2026 12:39:10 +0530
Subject: [PATCH 10/24] remove logs and add authorization in constant

---
 .../src/components/propertyQRData/constant.jsx        |  1 +
 .../src/components/propertyQRData/function.jsx        | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/egov-common-screen/src/components/propertyQRData/constant.jsx b/web/egov-common-screen/src/components/propertyQRData/constant.jsx
index fa8fcc2911..94870c30b3 100644
--- a/web/egov-common-screen/src/components/propertyQRData/constant.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/constant.jsx
@@ -1 +1,2 @@
 export const statetenantId = 'pb'
+export const AUTHORIZATION_TOKEN = "Basic ZWdvdi11c2VyLWNsaWVudDplZ292LXVzZXItc2VjcmV0";
diff --git a/web/egov-common-screen/src/components/propertyQRData/function.jsx b/web/egov-common-screen/src/components/propertyQRData/function.jsx
index c6c16ab73c..cc368e3d95 100644
--- a/web/egov-common-screen/src/components/propertyQRData/function.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/function.jsx
@@ -1,5 +1,5 @@
 import API from "./api";
-import { statetenantId } from "./constant";
+import { statetenantId, AUTHORIZATION_TOKEN} from "./constant";
 import { showSuccess, showError } from "../../utils/toast";
 import { use } from "react";
 import axios from "axios";
@@ -9,7 +9,7 @@ export const checkMobileNumber = async (number) => {
     const isMobileValid = mobileNumberPattern.test(number);
     if(isMobileValid){
        const data =  await sendOtp(number);
-       console.log("data",data)
+       //console.log("data",data)
     }
 }
 export const sendOtp = async (mobileNumber) => {
@@ -20,7 +20,7 @@ export const sendOtp = async (mobileNumber) => {
       "/user-otp/v1/_send?tenantId=pb",
       payload
     );
-    console.log("response",response.data)
+   // console.log("response",response.data)
      showSuccess("Enter OTP");
 
   } catch (error) {
@@ -48,7 +48,7 @@ const createOtpPayload = (mobileNumber, tenantId, userType='CITIZEN') => ({
 
 export const loginWithOtp = async (mobileNumber, otp, userType='CITIZEN') => {
   try {
-    debugger
+    //debugger
     // Create form-urlencoded body
     const params = new URLSearchParams();
     params.append("username", mobileNumber);
@@ -64,8 +64,7 @@ export const loginWithOtp = async (mobileNumber, otp, userType='CITIZEN') => {
       {
         headers: {
           "Content-Type": "application/x-www-form-urlencoded",
-          Authorization:
-            "Basic ZWdvdi11c2VyLWNsaWVudDplZ292LXVzZXItc2VjcmV0",
+          Authorization: AUTHORIZATION_TOKEN,
         },
       }
     );

From 607705162c7919bef1a538cc23158d58713cfefd Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Mon, 2 Mar 2026 12:56:59 +0530
Subject: [PATCH 11/24] add css file

---
 .../src/components/propertyQRData/index.css   | 213 ++++++++++++++++++
 1 file changed, 213 insertions(+)
 create mode 100644 web/egov-common-screen/src/components/propertyQRData/index.css

diff --git a/web/egov-common-screen/src/components/propertyQRData/index.css b/web/egov-common-screen/src/components/propertyQRData/index.css
new file mode 100644
index 0000000000..2269f479b6
--- /dev/null
+++ b/web/egov-common-screen/src/components/propertyQRData/index.css
@@ -0,0 +1,213 @@
+.otp-container {
+  display: flex;
+  gap: 10px;
+  justify-content: center;
+}
+
+.otp-input {
+  width: 48px;
+  height: 48px;
+  border: 2px solid #ccc;
+  border-radius: 8px;
+  text-align: center;
+  font-size: 22px;
+  font-weight: 600;
+  outline: none;
+  transition: 0.2s;
+}
+
+.otp-input:focus {
+  border-color: #4f46e5;
+  box-shadow: 0 0 0 2px rgba(79, 70, 229, 0.2);
+}
+.otp-page {
+  min-height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(135deg, #4f46e5, #06b6d4);
+  padding: 14px;
+}
+
+.otp-card {
+  background: white;
+  width: 100%;
+  max-width: 420px;
+  padding: 24px 20px;
+  border-radius: 14px;
+  box-shadow: 0 8px 28px rgba(0, 0, 0, 0.15);
+  text-align: center;
+}
+
+/* Typography */
+
+.otp-title {
+  font-size: 22px;
+  margin-bottom: 10px;
+}
+
+.otp-subtext {
+  font-size: 13px;
+  margin-bottom: 14px;
+}
+
+/* Info Box */
+
+.info-box {
+ font-size: 14px;
+    padding: 10px;
+    margin-bottom: 14px;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+}
+
+/* Button */
+
+.verify-btn {
+  margin-top: 18px;
+  width: 100%;
+  padding: 12px;
+  border-radius: 10px;
+  font-size: 15px;
+}
+
+/* OTP Input Boxes */
+
+.otp-container {
+  gap: 8px;
+}
+
+.otp-input {
+  width: 42px;
+  height: 42px;
+  font-size: 18px;
+}
+
+/* Tablet */
+
+@media (min-width: 640px) {
+  .otp-card {
+    padding: 28px 24px;
+  }
+
+  .otp-title {
+    font-size: 24px;
+  }
+
+  .otp-input {
+    width: 48px;
+    height: 48px;
+    font-size: 20px;
+  }
+}
+
+/* Desktop */
+
+@media (min-width: 1024px) {
+  .otp-card {
+    max-width: 440px;
+  }
+}
+/* Container styling */
+.property_card-container {
+  display: flex;
+  flex-wrap: wrap;        /* Allows wrapping */
+  gap: 20px;
+  padding: 20px;
+  justify-content: flex-start;
+}
+
+
+.property-card {
+  background: #ffffff;
+  border-radius: 16px;
+  padding: 20px;
+  width: 100%;
+  max-width: 320px;
+  box-shadow: 0 10px 25px rgba(0, 0, 0, 0.08);
+  transition: all 0.3s ease;
+  border: 1px solid #f0f0f0;
+}
+
+.property-card:hover {
+  transform: translateY(-4px);
+  box-shadow: 0 16px 35px rgba(0, 0, 0, 0.12);
+}
+
+/* Property ID */
+.property-id {
+  font-size: 18px;
+  font-weight: 700;
+  color: #2b2d42;
+  margin-bottom: 12px;
+}
+
+/* Label + Value row */
+.property-row {
+  margin-bottom: 8px;
+  font-size: 14px;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.property-label {
+  font-weight: 600;
+  color: #6c757d;
+  margin-right: 6px;
+}
+
+.property-value {
+  color: #212529;
+  font-weight: 500;
+}
+
+/* Address */
+.property-address {
+  margin-top: 10px;
+  font-size: 14px;
+  color: #495057;
+  line-height: 1.5;
+}
+
+/* Status Badge */
+.status-badge {
+  display: inline-block;
+  padding: 4px 10px;
+  border-radius: 20px;
+  font-size: 12px;
+  font-weight: 600;
+  margin-top: 10px;
+}
+
+/* Status Colors */
+.status-active {
+  background: #e6f7ee;
+  color: #1b8a5a;
+}
+
+.status-inworkflow {
+  background: #fff4e5;
+  color: #d97706;
+}
+
+/* Button */
+.property-btn {
+  margin-top: 16px;
+  width: 100%;
+  padding: 10px 0;
+  border: none;
+  border-radius: 10px;
+  background: linear-gradient(135deg, #4f46e5, #6366f1);
+  color: #fff;
+  font-weight: 600;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.property-btn:hover {
+  opacity: 0.9;
+  transform: translateY(-1px);
+}
\ No newline at end of file

From ac2a86523cb174384f574767fd86d84992c76343 Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Tue, 3 Mar 2026 15:06:27 +0530
Subject: [PATCH 12/24] new change common screen

---
 web/egov-common-screen/src/App.jsx            |  2 +-
 .../propertyQRData/displayPropertyRecord.jsx  |  1 +
 .../components/propertyQRData/function.jsx    | 28 +++++++++++++++++++
 .../src/components/propertyQRData/index.jsx   |  9 +++---
 web/egov-common-screen/vite.config.js         |  2 +-
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/web/egov-common-screen/src/App.jsx b/web/egov-common-screen/src/App.jsx
index 4741079c4e..3c623c1c18 100644
--- a/web/egov-common-screen/src/App.jsx
+++ b/web/egov-common-screen/src/App.jsx
@@ -30,7 +30,7 @@ function App() {
     <>
 
       {/* //basename="/common" */}
-      <BrowserRouter basename="/common">
+      <BrowserRouter basename="/">
 
 
         <Layout>
diff --git a/web/egov-common-screen/src/components/propertyQRData/displayPropertyRecord.jsx b/web/egov-common-screen/src/components/propertyQRData/displayPropertyRecord.jsx
index 0d7016b2d1..138d086ade 100644
--- a/web/egov-common-screen/src/components/propertyQRData/displayPropertyRecord.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/displayPropertyRecord.jsx
@@ -34,6 +34,7 @@ const DisplayPropertyRecord = () => {
     }, [surveyID, tenantId, mobileNumber]);
    // console.log("propertyData", propertyData)
    const editPropertyurl = (propertyID, tenantid)=>{
+    debugger
     let url = `/citizen/property-tax/assessment-form?assessmentId=0&purpose=update&propertyId=${propertyID}&tenantId=${tenantid}`;
     window.location.replace(url);   
    }
diff --git a/web/egov-common-screen/src/components/propertyQRData/function.jsx b/web/egov-common-screen/src/components/propertyQRData/function.jsx
index cc368e3d95..0e4d070a84 100644
--- a/web/egov-common-screen/src/components/propertyQRData/function.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/function.jsx
@@ -1,6 +1,7 @@
 import API from "./api";
 import { statetenantId, AUTHORIZATION_TOKEN} from "./constant";
 import { showSuccess, showError } from "../../utils/toast";
+import { storage } from "../../utils/localstorage";
 import { use } from "react";
 import axios from "axios";
 export const checkMobileNumber = async (number) => {
@@ -135,3 +136,30 @@ export const getAddressArray = (propertyaddress) => {
   // Remove null, undefined, empty string
   return addressParts.filter(Boolean);
 };
+
+export const setUserDetails = (userData, statetenantId)=>{
+      storage.set("user-info", userData.UserRequest);
+      storage.set("token", userData.access_token);
+      storage.set("tenant-id",statetenantId);
+      storage.set("refresh-token", userData.refresh_token);
+      storage.set("module", "rainmaker-common");
+      storage.set("locale", "en_IN");
+      storage.set("isNative",false);
+      storage.set("expires-in",userData.expires_in);
+      storage.set("CITIZEN.CITY",userData.UserRequest.permanentCity);
+      storage.set("path","");
+      storage.set("menuPath","");
+      storage.set("menuName","");
+      storage.set("Citizen.user-info", userData.UserRequest);
+      storage.set("Citizen.token", userData.access_token);
+      storage.set("Citizen.tenant-id",statetenantId);
+      storage.set("Citizen.refresh-token", userData.refresh_token);
+      storage.set("Citizen.module", "rainmaker-common");
+      storage.set("Citizen.locale", "en_IN");
+      storage.set("Citizen.isNative",false);
+      storage.set("Citizen.expires-in",userData.expires_in);
+      storage.set("Citizen.CITIZEN.CITY",userData.UserRequest.permanentCity);
+      storage.set("Citizen.path","");
+      storage.set("Citizen.menuPath","");
+      storage.set("Citizen.menuName","");
+}
\ No newline at end of file
diff --git a/web/egov-common-screen/src/components/propertyQRData/index.jsx b/web/egov-common-screen/src/components/propertyQRData/index.jsx
index 4c00ff1915..143939029b 100644
--- a/web/egov-common-screen/src/components/propertyQRData/index.jsx
+++ b/web/egov-common-screen/src/components/propertyQRData/index.jsx
@@ -5,7 +5,7 @@ import './index.css'
 import { useNavigate } from 'react-router-dom';
 import OtpInput from './otpInput';
 import { useSearchParams } from 'react-router-dom';
-import { checkMobileNumber, loginWithOtp, searchPropertyBySurvey } from './function.jsx'
+import { checkMobileNumber, loginWithOtp, setUserDetails } from './function.jsx'
 import { statetenantId } from "./constant.jsx"
 //URL : propertyQRData?surveyid=123&tenantid=pb.amritsar&mobileno=9335130557
 import { showLoading, showError } from "../../utils/toast.jsx"
@@ -57,9 +57,10 @@ const ProppertyQRData = () => {
         const result = await loginWithOtp(mobileNumber, otp);
         if (result.success) {
             console.log("Access Token:", result);
-            storage.set("user-info", result.data.UserRequest);
-            storage.set("token", result.data.access_token);
-            storage.set("tenant-id", statetenantId);
+            // storage.set("user-info", result.data.UserRequest);
+            // storage.set("token", result.data.access_token);
+            // storage.set("tenant-id", statetenantId);
+            setUserDetails(result.data, statetenantId)
             const qs = new URLSearchParams({
                 surveyid: surveyID,
                 tenantid: tenantId,
diff --git a/web/egov-common-screen/vite.config.js b/web/egov-common-screen/vite.config.js
index 8a3f795da9..3b302f18c7 100644
--- a/web/egov-common-screen/vite.config.js
+++ b/web/egov-common-screen/vite.config.js
@@ -7,7 +7,7 @@ export default defineConfig(({ mode }) => {
 
   return {
     plugins: [react()],
-    base: "/common",
+    base: "/",
 
     server: {
       host: "localhost",

From ed9b161e9a09f9bd090a5660ee97a55194016b81 Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Tue, 3 Mar 2026 15:29:52 +0530
Subject: [PATCH 13/24] add common

---
 web/egov-common-screen/src/App.jsx    | 2 +-
 web/egov-common-screen/vite.config.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/egov-common-screen/src/App.jsx b/web/egov-common-screen/src/App.jsx
index 3c623c1c18..4741079c4e 100644
--- a/web/egov-common-screen/src/App.jsx
+++ b/web/egov-common-screen/src/App.jsx
@@ -30,7 +30,7 @@ function App() {
     <>
 
       {/* //basename="/common" */}
-      <BrowserRouter basename="/">
+      <BrowserRouter basename="/common">
 
 
         <Layout>
diff --git a/web/egov-common-screen/vite.config.js b/web/egov-common-screen/vite.config.js
index 3b302f18c7..8a3f795da9 100644
--- a/web/egov-common-screen/vite.config.js
+++ b/web/egov-common-screen/vite.config.js
@@ -7,7 +7,7 @@ export default defineConfig(({ mode }) => {
 
   return {
     plugins: [react()],
-    base: "/",
+    base: "/common",
 
     server: {
       host: "localhost",

From 1e5d670a9c4af9d1e7bc67c060e7532e5d2a26b9 Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Tue, 3 Mar 2026 17:50:49 +0530
Subject: [PATCH 14/24] PI-20750 Put a msg in employee login for both mono-ui
 and digit-ui

---
 .../src/modules/employee/User/Login/index.js  | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/web/rainmaker/packages/employee/src/modules/employee/User/Login/index.js b/web/rainmaker/packages/employee/src/modules/employee/User/Login/index.js
index 96e94c5899..d69300906f 100644
--- a/web/rainmaker/packages/employee/src/modules/employee/User/Login/index.js
+++ b/web/rainmaker/packages/employee/src/modules/employee/User/Login/index.js
@@ -10,9 +10,29 @@ const LoginFormHOC = formHoc({ formKey: "employeeLogin" })(LoginForm);
 const Login = ({ bannerUrl, logoUrl }) => {
   return (
     <Banner hideBackButton={false} bannerUrl={bannerUrl} logoUrl={logoUrl}>
-      {/* <marquee style={{ color: "white", fontStyle: "italic", fontSize: "20px", margin: "20px 0" }}>
-         Planned Downtime Notice: The mSeva Punjab application will be unavailable from 15th August 2025 to 18th August 2025 due to scheduled maintenance. We regret the inconvenience and appreciate your understanding.
-      </marquee> */}
+      {<div
+        style={{
+          maxWidth: "1200px",
+          margin: "25px auto",
+          padding: "18px 28px",
+          borderRadius: "16px",
+          background: "rgba(255, 77, 79, 0.9)",
+          boxShadow: "0 10px 30px rgba(0, 0, 0, 0.3)",
+          display: "flex",
+          alignItems: "center",
+          gap: "16px",
+          color: "#ffffff",
+          fontSize: "18px",
+          fontWeight: "500",
+          transition: "all 0.3s ease-in-out",
+        }}
+      >
+        <span style={{ fontSize: "24px" }}>🔐</span>
+        <span>
+          Effective <strong>March 05, 2026</strong>, extra login security has been enabled. Please make sure your mobile number is updated to receive OTP verification.
+        </span>
+        <span>05 ਮਾਰਚ, 2026 ਤੋਂ, ਵਾਧੂ ਲੌਗਇਨ ਸੁਰੱਖਿਆ ਨੂੰ ਸਮਰੱਥ ਬਣਾਇਆ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡਾ ਮੋਬਾਈਲ ਨੰਬਰ OTP ਪੁਸ਼ਟੀਕਰਨ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ ਹੈ।</span>
+      </div>}
       <LoginFormHOC logoUrl={logoUrl} />
     </Banner>
   );

From 53909c8bbbbca15590da1ca07e5c94534aab1796 Mon Sep 17 00:00:00 2001
From: erramesh000 <erramesh000@gmail.com>
Date: Fri, 6 Mar 2026 10:13:22 +0530
Subject: [PATCH 15/24] Updated Related Sewerage Connectio text field WS and SW

---
 .../wns/applyResource/additionalDetails.js    |  19 +-
 .../specs/wns/applyResource/review-owner.js   | 171 +++++++++++-------
 .../specs/wns/applyResource/reviewOwner.js    | 138 ++++++++------
 .../service-details.js                        |   2 +
 4 files changed, 203 insertions(+), 127 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/additionalDetails.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/additionalDetails.js
index ee02bc3446..dc89ba2acd 100644
--- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/additionalDetails.js
+++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/additionalDetails.js
@@ -340,11 +340,11 @@ export const additionDetails = getCommonCard({
           // pattern: /^[0-9]*$/i,
           errorMessage: "ERR_DEFAULT_INPUT_FIELD_MSG"
         }),
-        
+
         afterFieldChange: async (action, state, dispatch) => {
           let ConectionCategory = await get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.connectionCategory");
           let connType = await get(state, "screenConfiguration.preparedFinalObject.applyScreen.connectionType");
-          
+
           if (ConectionCategory === "REGULARIZED" || ConectionCategory === 'DISCHARGE_CONNECTION') {
             dispatch(
               handleField(
@@ -884,6 +884,21 @@ export const additionDetails = getCommonCard({
         errorMessage: "ERR_DEFAULT_INPUT_FIELD_MSG",
         jsonPath: "applyScreen.additionalDetails.initialMeterReading"
       }),
+      relatedSwConnection: getTextField({
+        label: {
+          labelKey: "WS_ADDN_DETAILS_RELATED_SW_CONNECTION"
+        },
+        placeholder: {
+          labelKey: "WS_ADDN_DETAILS_RELATED_SW_CONNECTION_PLACEHOLDER"
+        },
+        gridDefination: {
+          xs: 12,
+          sm: 6
+        },
+
+        errorMessage: "ERR_DEFAULT_INPUT_FIELD_MSG",
+        jsonPath: "applyScreen.relatedSwConnection"
+      }),
       ...WSMeterMakes,
 
     })
diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/review-owner.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/review-owner.js
index ce51213e2e..8cdfaa80cd 100644
--- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/review-owner.js
+++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/review-owner.js
@@ -18,7 +18,7 @@ import {
   handleScreenConfigurationFieldChange as handleField,
   prepareFinalObject
 } from "egov-ui-framework/ui-redux/screen-configuration/actions";
-import { convertEpochToDateAndHandleNA, handleNA,handleNAnew, handleRoadType } from "../../utils";
+import { convertEpochToDateAndHandleNA, handleNA, handleNAnew, handleRoadType } from "../../utils";
 import { serviceConst } from "../../../../../ui-utils/commons";
 
 
@@ -382,6 +382,22 @@ export const activateDetailsMeter = {
       jsonPath: "WaterConnectionOld[0].additionalDetails.avarageMeterReading",
       callBack: handleNA
     }
+  ),
+  relatedSwConnection: getLabelWithValueForModifiedLabel(
+    {
+      labelName: "Related SW Connection",
+      labelKey: "WS_ADDN_DETAILS_RELATED_SW_CONNECTION"
+    },
+    {
+      jsonPath: "WaterConnection[0].relatedSwConnection",
+      callBack: handleNA
+    }, {
+    labelKey: "WS_ADDN_DETAILS_RELATED_SW_CONNECTION"
+  },
+    {
+      jsonPath: "WaterConnectionOld[0].relatedSwConnection",
+      callBack: handleNA
+    }
   )
 
 }
@@ -407,8 +423,10 @@ export const activationDetailsContainer = {
     //   }
     // ),
     reviewConnectionExecutionDate: getDateField({
-      label: { labelName: "Connection Execution Date",
-            labelKey: "WS_SERV_DETAIL_CONN_EXECUTION_DATE"},
+      label: {
+        labelName: "Connection Execution Date",
+        labelKey: "WS_SERV_DETAIL_CONN_EXECUTION_DATE"
+      },
 
       gridDefination: {
         xs: 12,
@@ -432,7 +450,7 @@ export const activationDetailsContainer = {
       },
       sourceJsonPath: "WaterConnection[0].meterId",
       required: true,
-   //   pattern: /^[a-z0-9]+$/i,
+      //   pattern: /^[a-z0-9]+$/i,
       errorMessage: "ERR_DEFAULT_INPUT_FIELD_MSG",
       jsonPath: "WaterConnection[0].meterId"
     }),
@@ -464,6 +482,21 @@ export const activationDetailsContainer = {
       errorMessage: "ERR_DEFAULT_INPUT_FIELD_MSG",
       jsonPath: "WaterConnection[0].additionalDetails.initialMeterReading"
     }),
+    relatedSwConnection: getTextField({
+      label: {
+        labelKey: "WS_ADDN_DETAILS_RELATED_SW_CONNECTION"
+      },
+      placeholder: {
+        labelKey: "WS_ADDN_DETAILS_RELATED_SW_CONNECTION_PLACEHOLDER"
+      },
+      gridDefination: {
+        xs: 12,
+        sm: 6
+      },
+
+      errorMessage: "ERR_DEFAULT_INPUT_FIELD_MSG",
+      jsonPath: "applyScreen.relatedSwConnection"
+    }),
     // ...WSMeterMakes,
     meterMake: getTextField({
       label: {
@@ -498,78 +531,78 @@ export const activationDetailsContainer = {
       jsonPath: "WaterConnection[0].additionalDetails.avarageMeterReading"
     }),
     button: getCommonContainer({
-			buttonContainer: getCommonContainer({
-					searchButton: {
-					uiFramework: "custom-atoms-local",
-					moduleName: "egov-pt",
-					componentPath: "Button",
-					gridDefination: {
-						xs: 12,
-						sm: 6
-					},
-					props: {
-						variant: "contained",
-						className: "public-domain-search-buttons",
-						style: {
-							color: "white",
-							margin: "8px",
-							backgroundColor: "rgb(254, 122, 81)",
-							borderRadius: "2px",
-							width: "220px",
-							height: "48px"
-						}
-					},
-					children: {
-						buttonLabel: getLabel({
-							labelName: "Update",
-							labelKey: "Update"
-						})
-					},
-					onClickDefination: {
-						action: "condition",
-						callBack:  async(state, dispatch) => {
+      buttonContainer: getCommonContainer({
+        searchButton: {
+          uiFramework: "custom-atoms-local",
+          moduleName: "egov-pt",
+          componentPath: "Button",
+          gridDefination: {
+            xs: 12,
+            sm: 6
+          },
+          props: {
+            variant: "contained",
+            className: "public-domain-search-buttons",
+            style: {
+              color: "white",
+              margin: "8px",
+              backgroundColor: "rgb(254, 122, 81)",
+              borderRadius: "2px",
+              width: "220px",
+              height: "48px"
+            }
+          },
+          children: {
+            buttonLabel: getLabel({
+              labelName: "Update",
+              labelKey: "Update"
+            })
+          },
+          onClickDefination: {
+            action: "condition",
+            callBack: async (state, dispatch) => {
               let tenantid = getQueryArg(window.location.href, "tenantId");
-                let applicationNumber = getQueryArg(window.location.href, "applicationNumber");
-                let serviceType = getQueryArg(window.location.href, "service");
-                
-               // console.log(state.screenConfiguration.preparedFinalObject.WaterConnection,"ddd");
-                let WaterConnection =[];
-               
-                WaterConnection = state.screenConfiguration.preparedFinalObject.WaterConnection[0];
-               //  state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.meterMake = parseInt(state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.meterMake);
-               state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.initialMeterReading = parseInt(state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.initialMeterReading);
+              let applicationNumber = getQueryArg(window.location.href, "applicationNumber");
+              let serviceType = getQueryArg(window.location.href, "service");
+
+              // console.log(state.screenConfiguration.preparedFinalObject.WaterConnection,"ddd");
+              let WaterConnection = [];
+
+              WaterConnection = state.screenConfiguration.preparedFinalObject.WaterConnection[0];
+              //  state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.meterMake = parseInt(state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.meterMake);
+              state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.initialMeterReading = parseInt(state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.initialMeterReading);
               state.screenConfiguration.preparedFinalObject.WaterConnection[0].connectionExecutionDate = new Date(state.screenConfiguration.preparedFinalObject.WaterConnection[0].connectionExecutionDate).getTime();
-                state.screenConfiguration.preparedFinalObject.WaterConnection[0].meterInstallationDate = new Date(state.screenConfiguration.preparedFinalObject.WaterConnection[0].meterInstallationDate).getTime();
-                state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.avarageMeterReading = parseInt(state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.avarageMeterReading);
-               let mydatadum = [
-                  { key: "tenantId", value: tenantid },
-                  { key: "applicationNumber", value: applicationNumber }
-                ];
-              
-                const responseWater = await httpRequest(
-                  "post",
-                  "/ws-services/wc/_search",
-                  "_search",
-                  mydatadum
-                );
-                
-                if (responseWater.WaterConnection && responseWater.WaterConnection.length > 0) {
+              state.screenConfiguration.preparedFinalObject.WaterConnection[0].meterInstallationDate = new Date(state.screenConfiguration.preparedFinalObject.WaterConnection[0].meterInstallationDate).getTime();
+              state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.avarageMeterReading = parseInt(state.screenConfiguration.preparedFinalObject.WaterConnection[0].additionalDetails.avarageMeterReading);
+              let mydatadum = [
+                { key: "tenantId", value: tenantid },
+                { key: "applicationNumber", value: applicationNumber }
+              ];
+
+              const responseWater = await httpRequest(
+                "post",
+                "/ws-services/wc/_search",
+                "_search",
+                mydatadum
+              );
+
+              if (responseWater.WaterConnection && responseWater.WaterConnection.length > 0) {
                 //  WaterConnection.push(responseWater.WaterConnection[0]);"isworkflowdisabled":true,
 
-                }
-                dispatch(prepareFinalObject("WaterConnection[0].isworkflowdisabled", true));
-                WaterConnection
-               if(serviceType == "WATER"){
-                 let responce = await httpRequest("post","/ws-services/wc/_update","_update", [], { WaterConnection: WaterConnection });
-                 if(responce.WaterConnection.length > 0 ){
+              }
+              dispatch(prepareFinalObject("WaterConnection[0].isworkflowdisabled", true));
+              WaterConnection
+              if (serviceType == "WATER") {
+                let responce = await httpRequest("post", "/ws-services/wc/_update", "_update", [], { WaterConnection: WaterConnection });
+                if (responce.WaterConnection.length > 0) {
                   alert("Updated Meter Details");
-                 }
                 }
+              }
             }
-					}
-				}
-			})
-		}),
+          }
+        }
+      })
+    }),
   })
 };
 export const activateDetailsNonMeter = {
diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/reviewOwner.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/reviewOwner.js
index e99c6665d1..6ef68b72d2 100644
--- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/reviewOwner.js
+++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/reviewOwner.js
@@ -7,7 +7,7 @@ import {
   getDivider,
   getLabelWithValueForModifiedLabel
 } from "egov-ui-framework/ui-config/screens/specs/utils";
-import { convertEpochToDateAndHandleNA, handleNA,handleNAnew, handleRoadType } from '../../utils';
+import { convertEpochToDateAndHandleNA, handleNA, handleNAnew, handleRoadType } from '../../utils';
 import { changeStep } from "./footer";
 
 const getHeader = label => {
@@ -38,7 +38,7 @@ const roadCuttingChargesHeader = getHeader({
 });
 const roadCuttingChargesHeadersw = getHeader({
   labelKey: "Sewerage Road Cutting Charges"
- // labelKey: "WS_ROAD_CUTTING_CHARGE_DETAILSsss"
+
 });
 
 
@@ -237,8 +237,10 @@ export const reviewMeterMakeReading = getLabelWithValueForModifiedLabel(
     labelName: "Initial Meter Reading",
     labelKey: "WS_ADDN_DETAILS_INITIAL_METER_MAKE"
   },
-  { jsonPath: "applyScreen.additionalDetails.meterMake",
-    callBack: handleNA },
+  {
+    jsonPath: "applyScreen.additionalDetails.meterMake",
+    callBack: handleNA
+  },
   {
     labelKey: "WS_OLD_LABEL_NAME"
   },
@@ -252,8 +254,10 @@ export const reviewAverageMakeReading = getLabelWithValueForModifiedLabel(
     labelName: "Initial Meter Reading",
     labelKey: "WS_ADDN_DETAILS_INITIAL_AVERAGE_MAKE"
   },
-  { jsonPath: "applyScreen.additionalDetails.avarageMeterReading",
-    callBack: handleNA },
+  {
+    jsonPath: "applyScreen.additionalDetails.avarageMeterReading",
+    callBack: handleNA
+  },
   {
     labelKey: "WS_OLD_LABEL_NAME"
   },
@@ -262,7 +266,23 @@ export const reviewAverageMakeReading = getLabelWithValueForModifiedLabel(
     callBack: handleNA
   }
 );
-
+export const relatedSwConnection = getLabelWithValueForModifiedLabel(
+  {
+    labelName: "Related SW Connection",
+    labelKey: "WS_ADDN_DETAILS_RELATED_SW_CONNECTION"
+  },
+  {
+    jsonPath: "applyScreen.relatedSwConnection",
+    callBack: handleNA
+  },
+  {
+    labelKey: "WS_OLD_LABEL_NAME"
+  },
+  {
+    jsonPath: "WaterConnectionOld[0].relatedSwConnection",
+    callBack: handleNA
+  }
+);
 export const reviewWaterSource = getLabelWithValueForModifiedLabel(
   {
     labelName: "Water Source",
@@ -417,8 +437,10 @@ export const reviewPlumberName = getLabelWithValueForModifiedLabel(
     labelName: "Plumber Name",
     labelKey: "WS_ADDN_DETAILS_PLUMBER_NAME_LABEL"
   },
-  { jsonPath: "applyScreen.plumberInfo[0].name",
-    callBack: handleNA },
+  {
+    jsonPath: "applyScreen.plumberInfo[0].name",
+    callBack: handleNA
+  },
   {
     labelKey: "WS_OLD_LABEL_NAME"
   },
@@ -528,8 +550,10 @@ export const reviewMeterId = getLabelWithValueForModifiedLabel(
     labelName: "Meter ID",
     labelKey: "WS_SERV_DETAIL_METER_ID"
   },
-  { jsonPath: "applyScreen.meterId",
-    callBack: handleNA },
+  {
+    jsonPath: "applyScreen.meterId",
+    callBack: handleNA
+  },
   {
     labelKey: "WS_OLD_LABEL_NAME"
   },
@@ -562,8 +586,9 @@ export const reviewInitialMeterReading = getLabelWithValueForModifiedLabel(
     labelName: "Initial Meter Reading",
     labelKey: "WS_ADDN_DETAILS_INITIAL_METER_READING"
   },
-  { jsonPath: "applyScreen.additionalDetails.initialMeterReading",
-    callBack: handleNAnew 
+  {
+    jsonPath: "applyScreen.additionalDetails.initialMeterReading",
+    callBack: handleNAnew
   },
   {
     labelKey: "WS_OLD_LABEL_NAME"
@@ -655,7 +680,7 @@ const connectionDetails = getCommonContainer({
   reviewWaterSource,
   // reviewWaterSubSource,
   reviewPipeSize,
-  
+
   reviewWaterClosets,
   reviewNumberOfToilets,
   reviewSubUsageType,
@@ -675,26 +700,26 @@ const roadCuttingCharges = {
   props: {
     className: "applicant-summary",
     scheama: getCommonContainer({
-        reviewRoadType : getLabelWithValue(
-          {
-            labelName: "Road Type",
-            labelKey: "WS_ADDN_DETAIL_ROAD_TYPE"
-          },
-          {
-            jsonPath: "applyScreen.roadCuttingInfo[0].roadType",
-            callBack: handleRoadType
-          }
-        ),
-        reviewArea : getLabelWithValue(
-          {
-            labelName: "Area (in sq ft)",
-            labelKey: "WS_ADDN_DETAILS_AREA_LABEL"
-          },
-          {
-            jsonPath: "applyScreen.roadCuttingInfo[0].roadCuttingArea",
-            callBack: handleNA
-          }
-        ),
+      reviewRoadType: getLabelWithValue(
+        {
+          labelName: "Road Type",
+          labelKey: "WS_ADDN_DETAIL_ROAD_TYPE"
+        },
+        {
+          jsonPath: "applyScreen.roadCuttingInfo[0].roadType",
+          callBack: handleRoadType
+        }
+      ),
+      reviewArea: getLabelWithValue(
+        {
+          labelName: "Area (in sq ft)",
+          labelKey: "WS_ADDN_DETAILS_AREA_LABEL"
+        },
+        {
+          jsonPath: "applyScreen.roadCuttingInfo[0].roadCuttingArea",
+          callBack: handleNA
+        }
+      ),
     }),
     items: [],
     hasAddItem: false,
@@ -710,7 +735,7 @@ const roadCuttingExtraCharges = getCommonContainer({
   reviewCompositionFee,
   reviewUserCharges,
   reviewOthersFee,
-  
+
 });
 const roadCuttingChargessw = {
   uiFramework: "custom-containers",
@@ -718,26 +743,26 @@ const roadCuttingChargessw = {
   props: {
     className: "applicant-summary",
     scheama: getCommonContainer({
-        reviewRoadTypesw : getLabelWithValue(
-          {
-            labelName: "Road Type",
-            labelKey: "SW_ADDN_DETAIL_ROAD_TYPE"
-          },
-          {     
-            jsonPath: "applyScreen.roadCuttingInfosw[0].roadType",
-            callBack: handleRoadType
-          }
-        ),
-        reviewArea : getLabelWithValue(
-          {
-            labelName: "Area (in sq ft)",
-            labelKey: "SW_ADDN_DETAILS_AREA_LABEL"
-          },
-          {
-            jsonPath: "applyScreen.roadCuttingInfosw[0].roadCuttingArea",
-            callBack: handleNA
-          }
-        ),
+      reviewRoadTypesw: getLabelWithValue(
+        {
+          labelName: "Road Type",
+          labelKey: "SW_ADDN_DETAIL_ROAD_TYPE"
+        },
+        {
+          jsonPath: "applyScreen.roadCuttingInfosw[0].roadType",
+          callBack: handleRoadType
+        }
+      ),
+      reviewArea: getLabelWithValue(
+        {
+          labelName: "Area (in sq ft)",
+          labelKey: "SW_ADDN_DETAILS_AREA_LABEL"
+        },
+        {
+          jsonPath: "applyScreen.roadCuttingInfosw[0].roadCuttingArea",
+          callBack: handleNA
+        }
+      ),
     }),
     items: [],
     hasAddItem: false,
@@ -750,7 +775,7 @@ const roadCuttingChargessw = {
 }
 
 export const reviewCompositionFeesw = getLabelWithValueForModifiedLabel(
-  
+
   {
     labelName: "Area (in sq ft)",
     labelKey: "SW_ADDN_DETAILS_COMPOSITION_LABEL"
@@ -814,4 +839,5 @@ const activationDetails = getCommonContainer({
   reviewInitialMeterReading,
   reviewMeterMakeReading,
   reviewAverageMakeReading,
+  relatedSwConnection,
 });
diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/connectionDetailsResource/service-details.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/connectionDetailsResource/service-details.js
index 211def050e..1660bbd561 100644
--- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/connectionDetailsResource/service-details.js
+++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/connectionDetailsResource/service-details.js
@@ -27,6 +27,7 @@ export const waterDetails = () => {
       waterSource: getLabelWithValue({ labelKey: "WS_SERV_DETAIL_WATER_SOURCE" }, { jsonPath: "WaterConnection[0].waterSource" }),
       ledgerId: getLabelWithValue({ labelKey: "WS_SERV_DETAIL_LEDGER_ID" }, { jsonPath: "WaterConnection[0].additionalDetails.ledgerId", callBack: checkValueForNA }),
       averageMeterReading: getLabelWithValue({ labelKey: "AVERAGE METER READING" }, { jsonPath: "WaterConnection[0].additionalDetails.avarageMeterReading" }),
+      relatedSwConnection: getLabelWithValue({ labelKey: "WS_SERV_DETAIL_RELATED_SW_CONNECTION" }, { jsonPath: "WaterConnection[0].relatedSwConnection", callBack: checkValueForNA }),
       group: getLabelWithValue({ labelKey: "Group" }, { jsonPath: "WaterConnection[0].additionalDetails.groups" }),
       oldConsumerNo: getLabelWithValue({ labelKey: "WS_OLD_CONSUMER_NO" }, { jsonPath: "WaterConnection[0].oldConnectionNo", callBack: checkValueForNA }),
     })
@@ -40,6 +41,7 @@ export const waterDetails = () => {
       waterSource: getLabelWithValue({ labelKey: "WS_SERV_DETAIL_WATER_SOURCE" }, { jsonPath: "WaterConnection[0].waterSource" }),
       ledgerId: getLabelWithValue({ labelKey: "WS_SERV_DETAIL_LEDGER_ID" }, { jsonPath: "WaterConnection[0].additionalDetails.ledgerId", callBack: checkValueForNA }),
       averageMeterReading: getLabelWithValue({ labelKey: "AVERAGE METER READING" }, { jsonPath: "WaterConnection[0].additionalDetails.avarageMeterReading" }),
+      relatedSwConnection: getLabelWithValue({ labelKey: "WS_SERV_DETAIL_RELATED_SW_CONNECTION" }, { jsonPath: "WaterConnection[0].relatedSwConnection", callBack: checkValueForNA }),
       group: getLabelWithValue({ labelKey: "Group" }, { jsonPath: "WaterConnection[0].additionalDetails.groups" }),
       // waterSubSource: getLabelWithValue({ labelKey: "WS_SERV_DETAIL_WATER_SUB_SOURCE" }, { jsonPath: "WaterConnection[0].waterSubSource" }),
       numberOfTaps: getLabelWithValue({ labelKey: "WS_SERV_DETAIL_NO_OF_TAPS" }, { jsonPath: "WaterConnection[0].noOfTaps" }),

From bcad3508bb73a43f0abf0b295be5289a62f60e5e Mon Sep 17 00:00:00 2001
From: erramesh000 <erramesh000@gmail.com>
Date: Fri, 6 Mar 2026 13:05:07 +0530
Subject: [PATCH 16/24] Fixed issues NONRESIDENTIAL.INSTITUTIONAL

---
 .../specs/abg/propertyMapped/ptmapedPopup.js  | 48 +++++++++----------
 .../screens/specs/abg/ptMaps/ptmapPopup.js    |  4 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/ptmapedPopup.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/ptmapedPopup.js
index e3de6687ca..b75ffc1cf8 100644
--- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/ptmapedPopup.js
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/ptmapedPopup.js
@@ -123,7 +123,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
         // Map usageCategory to category code
         const raw = String(usageCategory || "").trim().toUpperCase();
         if (raw.includes("RESIDENTIAL") && !raw.includes("NONRESIDENTIAL")) return "110";
-        if (raw.includes("COMMERCIAL") || raw.includes("NONRESIDENTIAL")) return "111";
+        if (raw.includes("COMMERCIAL") || raw.includes("NONRESIDENTIAL") || raw.includes("INSTITUTIONAL")) return "111";
         if (raw.includes("INDUSTRIAL")) return "112";
         if (raw.includes("OTHERS")) return "113";
         if (raw.includes("AGRICULTURE")) return "109";
@@ -204,7 +204,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                 (x) => String(x.name).trim().toUpperCase() === "RESIDENTIAL"
             );
             setUsageCategoryState((residential && residential.code) || "110");
-        } else if (raw.includes("COMMERCIAL") || raw.includes("NONRESIDENTIAL")) {
+        } else if (raw.includes("COMMERCIAL") || raw.includes("NONRESIDENTIAL") || raw.includes("INSTITUTIONAL")) {
             const commercial = USAGE_CATEGORY_OPTIONS.find(
                 (x) => String(x.name).trim().toUpperCase() === "COMMERCIAL"
             );
@@ -243,7 +243,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
         const fetchRevenueData = async () => {
             try {
                 setIsSubmitting(true);
-               
+
                 console.log("Prepared object:", prepared);
 
                 // Try multiple paths to get tenantId
@@ -271,7 +271,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                     requestBody
                 );
 
-                
+
                 setRevenueData(response);
 
                 const propertydisits = (response && response.districts) || [];
@@ -281,7 +281,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                 if (Array.isArray(propertydisits) && propertydisits.length > 0) {
 
                     setDistricts(propertydisits);
-                   
+
 
                     // If no persisted district, auto-select based on login/tenant (first available)
                     const persistedDistrict = localStorage.getItem("ptmap_district") || "";
@@ -296,7 +296,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                         }
                     }
                 } else {
-                   
+
                     setDistricts([]);
                 }
 
@@ -626,7 +626,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                     requestBody
                 );
 
-              
+
 
                 // Extract tehsils from response
                 const tehsilsData = (response && response.tehsils) || [];
@@ -662,7 +662,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
         if (selectedTehsil) {
             try {
                 setIsSubmitting(true);
-              
+
 
                 const requestBody = {
                     searchCriteria: {
@@ -689,11 +689,11 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                     response.data
                 )) || [];
 
-              
+
 
                 if (Array.isArray(villagesData) && villagesData.length > 0) {
                     setVillages(villagesData);
-                  
+
                 } else {
                     console.warn('No villages found for tehsil');
                     setVillages([]);
@@ -720,7 +720,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
         if (selectedVillage) {
             try {
                 setIsSubmitting(true);
-              
+
                 const requestBody = {
                     searchCriteria: {
                         villageId: selectedVillage,
@@ -745,7 +745,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                     response.segmentList ||
                     response.data
                 )) || [];
-             
+
 
                 if (Array.isArray(segmentsData) && segmentsData.length > 0) {
                     setSegments(segmentsData);
@@ -779,7 +779,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
         // Fetch sub-segments for selected segment
         try {
             setIsSubmitting(true);
-       
+
             const subSegRequestBody = {
                 searchCriteria: {
                     segmentId: selectedSegment,
@@ -788,7 +788,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                 }
             };
 
-    
+
 
             const subSegResponse = await httpRequest(
                 "post",
@@ -798,7 +798,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                 subSegRequestBody
             );
 
-            
+
 
             const subSegmentsData = (subSegResponse && (
                 subSegResponse.subSegments ||
@@ -812,7 +812,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                     code: String(s.code || s.subSegmentId || s.id || s.value || idx + 1),
                     name: s.name || s.label || s.display || s.subSegmentName || (s.code || `Sub-Segment ${idx + 1}`)
                 }));
-               
+
                 setSubSegments(subSegmentOptions);
             } else {
                 console.warn('No sub-segments found for segment');
@@ -846,7 +846,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
 
         try {
             setIsSubmitting(true);
-         
+
 
             const requestBody = {
                 searchCriteria: {
@@ -863,7 +863,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                 }
             };
 
-         
+
 
             const url = "/egov-property-rate/property-rate/_search";
 
@@ -892,7 +892,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
 
             setIsSubmitting(false);
         } catch (error) {
-           
+
             setIsSubmitting(false);
             setMappedRate(0);
             setMappedRateId(0);
@@ -919,7 +919,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
 
         try {
             setIsSubmitting(true);
-        
+
 
             const requestBody = {
                 searchCriteria: {
@@ -940,7 +940,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                 requestBody
             );
 
-         
+
 
             const usageData = (response && (
                 response.usageCategories ||
@@ -1116,7 +1116,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
 
         try {
             setIsSubmitting(true);
-            
+
             const requestBody = {
                 PropertyRates: [{
                     id: rowdatacomplete.integration_id,
@@ -1137,7 +1137,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
 
                 }]
             };
-          
+
 
             const url = "/egov-property-rate/property-rate/_update";
 
@@ -1149,7 +1149,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
                 requestBody
             );
 
-         
+
 
             // Close all popups first, then show success message
             if (response) {
diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/ptMaps/ptmapPopup.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/ptMaps/ptmapPopup.js
index 567c06f055..82b728612c 100644
--- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/ptMaps/ptmapPopup.js
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/ptMaps/ptmapPopup.js
@@ -128,7 +128,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
         const raw = String(rawUsageCategory || "").trim().toUpperCase();
         // exact-only match
         if (raw === "RESIDENTIAL" || raw === "110") return "110";
-        if (raw === "NONRESIDENTIAL.COMMERCIAL" || raw === "NONRESIDENTIAL.OTHERS" || raw === "111") return "111";
+        if (raw === "NONRESIDENTIAL.COMMERCIAL" || raw === "NONRESIDENTIAL.OTHERS" || raw === "NONRESIDENTIAL.INSTITUTIONAL" || raw === "111") return "111";
         if (raw === "NONRESIDENTIAL.INDUSTRIAL" || raw === "112") return "112";
         return "";
     };
@@ -149,7 +149,7 @@ const PTmapPopup = ({ propertiesId, ownerName, ownerMobile, locality, landArea,
 
         // exact match for RESIDENTIAL, COMMERCIAL, INDUSTRIAL, or OTHERS
         const isResidentialExact = raw === "RESIDENTIAL" || raw === "110";
-        const isCommercialExact = raw === "NONRESIDENTIAL.COMMERCIAL" || raw === "NONRESIDENTIAL.OTHERS" || raw === "NONRESIDENTIAL" || raw === "111";
+        const isCommercialExact = raw === "NONRESIDENTIAL.COMMERCIAL" || raw === "NONRESIDENTIAL.OTHERS" || raw === "NONRESIDENTIAL.INSTITUTIONAL" || raw === "NONRESIDENTIAL" || raw === "111";
         const isIndustrialExact = raw === "NONRESIDENTIAL.INDUSTRIAL" || raw === "112";
 
         if (isResidentialExact) {

From 9dec78f4a9df99a6134bfffbb4fcbf252811c86e Mon Sep 17 00:00:00 2001
From: erramesh000 <erramesh000@gmail.com>
Date: Fri, 6 Mar 2026 16:25:48 +0530
Subject: [PATCH 17/24] Update Bulkmeter Screen

---
 .../screens/specs/abg/bulkmeterreading.js     | 187 ++++++++++++
 .../screens/specs/abg/gBmr/functions.js       | 233 ++++++++++++++
 .../screens/specs/abg/gBmr/groupBillSearch.js | 249 +++++++++++++++
 .../screens/specs/abg/gBmr/searchResults.js   | 286 ++++++++++++++++++
 4 files changed, 955 insertions(+)
 create mode 100644 web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/bulkmeterreading.js
 create mode 100644 web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js
 create mode 100644 web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/groupBillSearch.js
 create mode 100644 web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js

diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/bulkmeterreading.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/bulkmeterreading.js
new file mode 100644
index 0000000000..d72ef8abf9
--- /dev/null
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/bulkmeterreading.js
@@ -0,0 +1,187 @@
+import {
+  getBreak, getCommonHeader, getLabel, getCommonCard,
+  getCommonContainer,
+  getTextField, getSelectField
+} from "egov-ui-framework/ui-config/screens/specs/utils";
+import { prepareFinalObject } from "egov-ui-framework/ui-redux/screen-configuration/actions";
+import { getTenantId } from "egov-ui-kit/utils/localStorageUtils";
+import { httpRequest } from "../../../../ui-utils";
+import { getBoundaryData } from "../../../../ui-utils/commons";
+import {
+  abgSearchCard,
+  //mergeDownloadButton, 
+  resetFields
+} from "./gBmr/groupBillSearch";
+
+// import { updateAllReadings } from "./gBmr/functions";
+import { searchResults, brmeterReading, updateAllButton, updateAllReadings } from "./gBmr/searchResults";
+import "./index.css";
+
+const tenantId = getTenantId();
+
+const header = getCommonHeader({
+  labelName: "Bulk Meter Reading",
+  labelKey: "Bulk Meter Reading"
+});
+
+const getMDMSData = async (action, state, dispatch) => {
+  const tenantId = getTenantId();
+  let mdmsBody = {
+    MdmsCriteria: {
+      tenantId: tenantId,
+      moduleDetails: [
+        {
+          moduleName: "egf-master",
+          masterDetails: [
+            { name: "FinancialYear", filter: "[?(@.module=='PT')]" } //FY Filter hardcoded for PT
+          ]
+        },
+        {
+          moduleName: "BillingService",
+          masterDetails: [
+            {
+              name: "BusinessService"
+              // filter: "[?(@.type=='Adhoc')]"
+            },
+            {
+              name: "TaxHeadMaster"
+            },
+            {
+              name: "TaxPeriod"
+            }
+          ]
+        },
+        {
+          moduleName: "common-masters",
+          masterDetails: [
+            {
+              name: "uiCommonPay"
+            }
+          ]
+        },
+        {
+          moduleName: "tenant",
+          masterDetails: [
+            {
+              name: "tenants"
+            }
+          ]
+        }
+      ]
+    }
+  };
+  try {
+    const payload = await httpRequest(
+      "post",
+      "/egov-mdms-service/v1/_search",
+      "_search",
+      [],
+      mdmsBody
+    );
+    payload.MdmsRes.BillingService.BusinessService = payload.MdmsRes.BillingService.BusinessService.filter(service => service.billGineiURL);
+    dispatch(prepareFinalObject("searchScreenMdmsData", payload.MdmsRes));
+  } catch (e) {
+    console.log(e);
+  }
+};
+
+const getData = async (action, state, dispatch) => {
+  await getMDMSData(action, state, dispatch);
+};
+
+const abgSearchAndResult = {
+  uiFramework: "material-ui",
+  name: "bulkmeterreading",
+  beforeInitScreen: (action, state, dispatch) => {
+    resetFields(state, dispatch);
+    getData(action, state, dispatch).then(responseAction => {
+      const queryObj = [{ key: "tenantId", value: tenantId }];
+      getBoundaryData(action, state, dispatch, queryObj, tenantId);
+    });
+    return action;
+  },
+  components: {
+    div: {
+      uiFramework: "custom-atoms",
+      componentPath: "Form",
+      props: {
+        className: "common-div-css",
+        id: "bulkmeterreading"
+      },
+      children: {
+        headerDiv: {
+          uiFramework: "custom-atoms",
+          componentPath: "Container",
+
+          children: {
+            header: {
+              gridDefination: {
+                xs: 12,
+                sm: 6
+              },
+              ...header
+            }
+          }
+        },
+        abgSearchCard,
+        breakAfterSearch: getBreak(),
+        // progressStatus,
+        searchResults,
+        breakAfterSearchResults: getBreak(),
+
+        button: getCommonContainer({
+          buttonContainer: getCommonContainer({
+            firstCont: {
+              uiFramework: "custom-atoms",
+              componentPath: "Div",
+              gridDefination: {
+                xs: 12,
+                sm: 3
+              }
+            },
+
+            updateAllButton: {
+              componentPath: "Button",
+              gridDefination: {
+                xs: 12,
+                sm: 3
+              },
+              props: {
+                variant: "contained",
+                style: {
+                  color: "white",
+                  backgroundColor: "#FE7A51",
+                  borderRadius: "2px",
+                  width: window.innerWidth > 480 ? "80%" : "100%",
+                  height: "48px"
+                }
+              },
+              children: {
+                buttonLabel: getLabel({
+                  labelName: "Update All Readings",
+                  labelKey: "Update All Readings"
+                })
+              },
+              onClickDefination: {
+                action: "condition",
+                callBack: updateAllReadings
+              }
+            },
+            lastCont: {
+              uiFramework: "custom-atoms",
+              componentPath: "Div",
+              gridDefination: {
+                xs: 12,
+                sm: 3
+              }
+            }
+          })
+        })
+
+      }
+    },
+    //mergeDownloadButton
+  }
+};
+
+export default abgSearchAndResult;
diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js
new file mode 100644
index 0000000000..4086a9b773
--- /dev/null
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js
@@ -0,0 +1,233 @@
+import get from "lodash/get";
+//import { getGroupBillSearch } from "../../../../../ui-utils/commons";
+import {
+  handleScreenConfigurationFieldChange as handleField,
+  prepareFinalObject,
+  toggleSpinner,
+  toggleSnackbar
+} from "egov-ui-framework/ui-redux/screen-configuration/actions";
+import { httpRequest } from "egov-ui-framework/ui-utils/api";
+import {
+  convertEpochToDate,
+  validateFields,
+  getTextToLocalMapping
+} from "../../utils/index";
+import { getTenantId, getUserInfo } from "egov-ui-kit/utils/localStorageUtils";
+import isEmpty from "lodash/isEmpty"
+import { loadUlbLogo } from "../../utils/receiptTransformer";
+
+// const tenantId = getTenantId();
+const tenantId = getTenantId();
+export const updatesingleReading = async (consumerId, lastReading, currentReadingRaw, currentReading, billingPeriod, status, readingDate, tenantId) => {
+  debugger;
+  const payload = {
+    meterReadingslist: [
+      {
+        currentReadingDate: readingDate,
+        currentReading: currentReading,
+        billingPeriod: billingPeriod,
+        meterStatus: status,
+        connectionNo: consumerId,
+        lastReading: lastReading,
+        lastReadingDate: 1705343399000,
+        tenantId: tenantId,
+        generateDemand: true
+      }
+    ]
+
+
+  };
+  try {
+    const url = "/ws-calculator/meterConnection/_createmultiple";
+
+
+    const response = await httpRequest("post", url, "_update", [], payload);
+
+
+    return response;
+  } catch (e) {
+    console.error("API error:", e);
+    throw e;
+  }
+};
+
+export const searchApiCall = async (state, dispatch) => {
+  debugger;
+  showHideTable(false, dispatch);
+  //showHideMergeButton(false, dispatch);
+  let searchScreenObject = get(
+    state.screenConfiguration.preparedFinalObject,
+    "searchCriteria",
+    {}
+  );
+  const isSearchBoxFirstRowValid = validateFields(
+    "components.div.children.abgSearchCard.children.cardContent.children.searchContainer.children",
+    state,
+    dispatch,
+    "bulkmeterreading"
+  );
+
+  const isSearchBoxSecondRowValid = validateFields(
+    "components.div.children.abgSearchCard.children.cardContent.children.searchContainer.children",
+    state,
+    dispatch,
+    "bulkmeterreading"
+  );
+
+  if (!(isSearchBoxFirstRowValid && isSearchBoxSecondRowValid)) {
+    dispatch(
+      toggleSnackbar(
+        true,
+        {
+          labelName: "Please fill at least one field to start search",
+          labelKey: "ABG_SEARCH_SELECT_AT_LEAST_ONE_TOAST_MESSAGE"
+        },
+        "warning"
+      )
+    );
+  } else if (
+    Object.keys(searchScreenObject).length == 0 ||
+    Object.values(searchScreenObject).every(x => x === "")
+  ) {
+    dispatch(
+      toggleSnackbar(
+        true,
+        {
+          labelName: "Please fill at least one field to start search",
+          labelKey: "ABG_SEARCH_SELECT_AT_LEAST_ONE_TOAST_MESSAGE"
+        },
+        "warning"
+      )
+    );
+  } else {
+    for (var key in searchScreenObject) {
+      if (
+        searchScreenObject.hasOwnProperty(key) &&
+        searchScreenObject[key] === ""
+      ) {
+        delete searchScreenObject[key];
+      }
+    }
+    let serviceObject = get(
+      state.screenConfiguration.preparedFinalObject,
+      "searchScreenMdmsData.BillingService.BusinessService"
+    ).filter(item => item.code === searchScreenObject.businesService);
+
+    searchScreenObject.url = serviceObject && serviceObject[0] && serviceObject[0].billGineiURL;
+    searchScreenObject.tenantId = process.env.REACT_APP_NAME === "Employee" ? getTenantId() : JSON.parse(getUserInfo()).permanentCity;
+    const getGroupBillSearch = async (dispatch, searchScreenObject) => {
+      debugger;
+
+      try {
+        dispatch(toggleSpinner(true));
+        const requestBody = {
+          tenantId: searchScreenObject.tenantId || tenantId,
+          locality: "ALOC2",
+          offset: searchScreenObject.offset !== undefined ? searchScreenObject.offset : 0
+        };
+        const url = `ws-calculator/meterConnection/_searchV2?tenantId=${encodeURIComponent(requestBody.tenantId)}&locality=${encodeURIComponent(requestBody.locality)}&offset=${encodeURIComponent(requestBody.offset)}`;
+        const response = await httpRequest("post", url, "_searchV2", []);
+        // dispatch(toggleSpinner(false));
+        // return response;
+
+        const bills = (response && response.meterReadings) || [];
+        dispatch(
+          prepareFinalObject("searchScreenMdmsData.meterReadings", bills)
+        );
+        dispatch(toggleSpinner(false));
+        return response;
+      } catch (error) {
+        dispatch(toggleSpinner(false));
+        dispatch(
+          toggleSnackbar(
+            true,
+            { labelName: error.message || "Something went wrong", labelKey: error.message || "ERROR" },
+            "error"
+          )
+        );
+        return {};
+      }
+
+
+    };
+    const responseFromAPI = await getGroupBillSearch(dispatch, searchScreenObject);
+
+
+    const bills = (responseFromAPI && responseFromAPI.meterReadings) || [];
+    dispatch(
+      prepareFinalObject("searchScreenMdmsData.billSearchResponse", bills)
+    );
+    const response = [];
+    for (let i = 0; i < bills.length; i++) {
+
+      response.push({
+        connectionNo: get(bills[i], "connectionNo"),
+
+        lastReading: get(bills[i], "currentReading"),
+        // currentReading may come from API (per consumer). Use existing field if present.
+        currentReading: get(bills[i], "currentReading") || "",
+        currentReadingDate: get(bills[i], "currentReadingDate"),
+        billingPeriod: get(bills[i], "billingPeriod"),
+        meterStatus: get(bills[i], "meterStatus"),
+        tenantId: tenantId
+      })
+
+    }
+    try {
+      let data = response.map(item => ({
+        ["Consumer ID"]: item.connectionNo || "-",
+
+        // last confirmed reading from system
+        ["Last Reading"]: item.currentReading || "-",
+
+        // user will enter these for bulk update; keep empty initially
+        ["New Reading(in KL)"]: "",
+        ["New Reading Date"]: "",
+
+        // existing reading date from system
+        ["Current Reading Date"]:
+          convertEpochToDate(item.currentReadingDate) || "-",
+        ["Billing Period"]: item.billingPeriod || "-",
+        ["Status"]: item.meterStatus || "-",
+        ["TENANT_ID"]: item.tenantId
+      }));
+      dispatch(
+        handleField(
+          "bulkmeterreading",
+          "components.div.children.searchResults",
+          "props.data",
+          data
+        )
+      );
+      dispatch(
+        handleField(
+          "bulkmeterreading",
+          "components.div.children.searchResults",
+          "props.rows",
+          data.length
+        )
+      );
+      showHideTable(true, dispatch);
+      if (!isEmpty(response)) {
+
+        loadUlbLogo(tenantId);
+      };
+    } catch (error) {
+      dispatch(toggleSnackbar(true, error.message, "error"));
+      console.log(error);
+    }
+  }
+};
+
+const showHideTable = (booleanHideOrShow, dispatch) => {
+  dispatch(
+    handleField(
+      "bulkmeterreading",
+      "components.div.children.searchResults",
+      "visible",
+      booleanHideOrShow
+    )
+  );
+};
+
+
diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/groupBillSearch.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/groupBillSearch.js
new file mode 100644
index 0000000000..a8bc0a1ca8
--- /dev/null
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/groupBillSearch.js
@@ -0,0 +1,249 @@
+import {
+  getCommonCard,
+  getCommonContainer,
+  getLabel, getTextField, getSelectField
+} from "egov-ui-framework/ui-config/screens/specs/utils";
+import { handleScreenConfigurationFieldChange as handleField } from "egov-ui-framework/ui-redux/screen-configuration/actions";
+import { getTenantId, getUserInfo } from "egov-ui-kit/utils/localStorageUtils";
+import { generateMultipleBill } from "../../utils/receiptPdf";
+import { searchApiCall, updatesingleReading } from "./functions";
+
+
+const tenantId = process.env.REACT_APP_NAME === "Employee" ? getTenantId() : JSON.parse(getUserInfo()).permanentCity;
+export const resetFields = (state, dispatch) => {
+
+  dispatch(
+    handleField(
+      "bulkmeterreading",
+      "components.div.children.abgSearchCard.children.cardContent.children.searchContainer.children.ulb",
+      "props.value",
+      tenantId
+    )
+  );
+  dispatch(
+    handleField(
+      "bulkmeterreading",
+      "components.div.children.abgSearchCard.children.cardContent.children.searchContainer.children.consumerId",
+      "props.value",
+      ""
+    )
+  );
+  dispatch(
+    handleField(
+      "bulkmeterreading",
+      "components.div.children.abgSearchCard.children.cardContent.children.searchContainer.children.locMohalla",
+      "props.value",
+      ""
+    )
+  );
+  dispatch(
+    handleField(
+      "bulkmeterreading",
+      "components.div.children.abgSearchCard.children.cardContent.children.searchContainer.children.locMohalla",
+      "props.error",
+      false
+    )
+  );
+  dispatch(
+    handleField(
+      "bulkmeterreading",
+      "components.div.children.abgSearchCard.children.cardContent.children.searchContainer.children.locMohalla",
+      "props.helperText",
+      ""
+    )
+  );
+  dispatch(
+    handleField(
+      "bulkmeterreading",
+      "components.div.children.abgSearchCard.children.cardContent.children.searchContainer.children.serviceCategory",
+      "props.value",
+      ""
+    )
+  );
+  dispatch(
+    handleField(
+      "bulkmeterreading",
+      "components.div.children.abgSearchCard.children.cardContent.children.searchContainer.children.serviceCategory",
+      "props.error",
+      false
+    )
+  );
+  dispatch(
+    handleField(
+      "bulkmeterreading",
+      "components.div.children.abgSearchCard.children.cardContent.children.searchContainer.children.serviceCategory",
+      "props.helperText",
+      ""
+    )
+  );
+};
+
+export const abgSearchCard = getCommonCard({
+  searchContainer: getCommonContainer(
+    {
+      ulb: {
+        uiFramework: "custom-containers-local",
+        moduleName: "egov-abg",
+        componentPath: "AutosuggestContainer",
+        props: {
+          label: {
+            labelName: "ULB",
+            labelKey: "ABG_ULB_LABEL"
+          },
+          localePrefix: {
+            moduleName: "TENANT",
+            masterName: "TENANTS"
+          },
+          optionLabel: "name",
+          placeholder: {
+            labelName: "Select ULB",
+            labelKey: "ABG_ULB_PLACEHOLDER"
+          },
+          required: true,
+          value: tenantId,
+          disabled: true,
+          isClearable: true,
+          labelsFromLocalisation: true,
+          className: "autocomplete-dropdown",
+          jsonPath: "searchCriteria.tenantId",
+          sourceJsonPath: "searchScreenMdmsData.tenant.tenants",
+        },
+        required: true,
+        jsonPath: "searchCriteria.tenantId",
+        disabled: false,
+        gridDefination: {
+          xs: 12,
+          sm: 4
+        }
+      },
+
+      locMohalla: {
+        uiFramework: "custom-containers-local",
+        moduleName: "egov-abg",
+        componentPath: "AutosuggestContainer",
+        gridDefination: {
+          xs: 12,
+          sm: 4
+        },
+        jsonPath: "searchCriteria.locality",
+        required: true,
+        props: {
+          className: "autocomplete-dropdown",
+          label: {
+            labelName: "Location/Mohalla",
+            labelKey: "ABG_LOCMOHALLA_LABEL"
+          },
+          placeholder: {
+            labelName: "Select Location/Mohalla",
+            labelKey: "ABG_LOCMOHALLA_PLACEHOLDER"
+          },
+          jsonPath: "searchCriteria.locality",
+          sourceJsonPath: "searchScreenMdmsData.localities",
+          labelsFromLocalisation: true,
+          required: true,
+          isClearable: true,
+        }
+      },
+      // consumerId: getTextField({
+      //   label: {
+      //     labelName: "Consumer ID",
+      //     labelKey: "ABG_CONSUMER_ID_LABEL"
+      //   },
+      //   placeholder: {
+      //     labelName: "Enter Consumer ID",
+      //     labelKey: "ABG_CONSUMER_ID_PLACEHOLDER"
+      //   },
+      //   gridDefination: {
+      //     xs: 12,
+      //     sm: 4
+      //   },
+      //   required: false,
+      //   jsonPath: "searchCriteria.consumerCode"
+      // })
+
+    },
+    {
+      style: {
+        overflow: "visible"
+      }
+    }
+  ),
+
+  button: getCommonContainer({
+    buttonContainer: getCommonContainer({
+      firstCont: {
+        uiFramework: "custom-atoms",
+        componentPath: "Div",
+        gridDefination: {
+          xs: 12,
+          sm: 3
+        }
+      },
+      resetButton: {
+        componentPath: "Button",
+        gridDefination: {
+          xs: 12,
+          sm: 3
+        },
+        props: {
+          variant: "outlined",
+          style: {
+            color: "#FE7A51",
+            border: "#FE7A51 solid 1px",
+            borderRadius: "2px",
+            width: window.innerWidth > 480 ? "80%" : "100%",
+            height: "48px"
+          }
+        },
+        children: {
+          buttonLabel: getLabel({
+            labelName: "RESET",
+            labelKey: "ABG_RESET_BUTTON"
+          })
+        },
+        onClickDefination: {
+          action: "condition",
+          callBack: resetFields
+        }
+      },
+      searchButton: {
+        componentPath: "Button",
+        gridDefination: {
+          xs: 12,
+          sm: 3
+          // align: "center"
+        },
+        props: {
+          variant: "contained",
+          style: {
+            color: "white",
+            backgroundColor: "#FE7A51",
+            borderRadius: "2px",
+            width: window.innerWidth > 480 ? "80%" : "100%",
+            height: "48px"
+          }
+        },
+        children: {
+          buttonLabel: getLabel({
+            labelName: "Search",
+            labelKey: "ABG_GROUP_BILL_SEARCH_BUTTON"
+          })
+        },
+        onClickDefination: {
+          action: "condition",
+          callBack: searchApiCall
+        }
+      },
+      lastCont: {
+        uiFramework: "custom-atoms",
+        componentPath: "Div",
+        gridDefination: {
+          xs: 12,
+          sm: 3
+        }
+      }
+    })
+  })
+});
+
+
diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js
new file mode 100644
index 0000000000..a4f88b4720
--- /dev/null
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js
@@ -0,0 +1,286 @@
+import React from "react";
+import get from "lodash/get";
+import { sortByEpoch, getEpochForDate } from "../../utils";
+import { generateSingleBill } from "../../utils/receiptPdf";
+import { httpRequest } from "egov-ui-framework/ui-utils/api.js";
+import { localStorageGet } from "egov-ui-kit/utils/localStorageUtils";
+import { download, downloadBill } from "egov-common/ui-utils/commons";
+import { updatesingleReading } from "./functions";
+
+
+export const searchResults = {
+  uiFramework: "custom-molecules",
+  componentPath: "Table",
+  visible: false,
+  props: {
+    columns: [
+      { labelName: "Consumer ID", labelKey: "Consumer ID" },
+
+      { labelName: "Last Reading", labelKey: "Last Reading" },
+      {
+        labelName: "New Reading(in KL)",
+        labelKey: "New Reading(in KL)",
+        options: {
+          filter: false,
+          customBodyRender: (value, tableMeta, updateValue) => {
+            // Last Reading is the second column (index 1)
+            const lastReading = tableMeta.rowData && tableMeta.rowData[1];
+            return (
+              <input
+                type="number"
+                min={lastReading || 0}
+                className="bulk-new-reading"
+                style={{ width: "120px", padding: "6px", boxSizing: "border-box" }}
+                // defaultValue={value || ""}
+                onInput={e => {
+                  e.target.value = e.target.value.replace(/[^0-9]/g, "");
+                }}
+                onBlur={e => {
+                  const v = e.target.value.trim();
+                  if (v === "") { updateValue(""); return; }
+                  const numeric = Number(v);
+                  const min = Number(lastReading || 0);
+                  if (!Number.isFinite(numeric) || numeric < min) {
+                    // reset and notify user
+                    e.target.value = "";
+                    updateValue("");
+                    alert("Please enter a numeric value greater than or equal to Last Reading");
+                  } else {
+                    updateValue(v);
+                  }
+                }}
+              />
+            );
+          }
+        }
+      },
+      {
+        labelName: "New Reading Date",
+        labelKey: "New Reading Date",
+        options: {
+          filter: false,
+          customBodyRender: (value, tableMeta, updateValue) => {
+            // Disable dates earlier than Current Reading Date for that row
+            const currentReadingDateDisplay =
+              tableMeta.rowData && tableMeta.rowData[4]; // e.g. "05/02/2026"
+
+            let minDate = "";
+            if (
+              currentReadingDateDisplay &&
+              currentReadingDateDisplay !== "-" &&
+              currentReadingDateDisplay.indexOf("/") > -1
+            ) {
+              const [dd, mm, yyyy] = currentReadingDateDisplay.split("/");
+              if (dd && mm && yyyy) {
+                minDate = `${yyyy}-${mm.padStart(2, "0")}-${dd.padStart(2, "0")}`;
+              }
+            }
+            return (
+              <input
+                type="date"
+                min={minDate || undefined}
+                className="bulk-new-reading-date"
+                style={{ width: "160px", padding: "6px", boxSizing: "border-box" }}
+                // defaultValue={value || today}
+                onChange={e => updateValue(e.target.value)}
+              />
+            );
+          }
+        }
+      },
+      { labelName: "Current Reading Date", labelKey: "Current Reading Date" },
+      { labelName: "Billing Period", labelKey: "Billing Period" },
+      { labelName: "Status", labelKey: "Status" },
+      {
+        labelName: "Tenant Id",
+        labelKey: "TENANT_ID",
+        options: {
+          display: false
+        }
+      },
+      {
+        labelName: "Action",
+        labelKey: "ABG_COMMON_TABLE_COL_ACTION",
+        options: {
+          filter: false,
+          customBodyRender: (value, tableMeta, updateValue) => {
+            debugger;
+            let readingDatenew = tableMeta.rowData && tableMeta.rowData[3] ? tableMeta.rowData[3] : null;
+            readingDatenew = readingDatenew ? readingDatenew.split("-").reverse().join("/") : null;
+            const handleUpdate = async () => {
+              const consumerId = tableMeta.rowData && tableMeta.rowData[0];
+              const lastReading = Number(tableMeta.rowData && tableMeta.rowData[1]) || 0;
+              const currentReadingRaw = Number(tableMeta.rowData && tableMeta.rowData[2]) || 0;
+              const currentReadingDate = tableMeta.rowData && tableMeta.rowData[4] ? getEpochForDate(tableMeta.rowData[4]) : null;
+              const currentReading = Number(currentReadingRaw) || 0;
+              const billingPeriod = readingDatenew ? `${tableMeta.rowData[4]} - ${readingDatenew}` : "";
+              const readingDate = readingDatenew ? getEpochForDate(readingDatenew) : null;
+              const status = tableMeta.rowData && tableMeta.rowData[6];
+              const tenantId = tableMeta.rowData && tableMeta.rowData[7];
+
+              if (!currentReadingRaw || !Number.isFinite(currentReading)) {
+                alert("Please enter a numeric Current Reading greater than or equal to Last Reading before updating");
+                return;
+              }
+
+              if (currentReading < lastReading) {
+                alert("Please enter a numeric Current Reading greater than or equal to Last Reading before updating");
+                return;
+              }
+
+              // New Reading Date must not be earlier than Current Reading Date
+              if (readingDate && currentReadingDate && readingDate < currentReadingDate) {
+                alert("New Reading Date cannot be earlier than Current Reading Date");
+                return;
+              }
+
+              try {
+                const resp = await updatesingleReading(consumerId, lastReading, currentReadingRaw, currentReading, billingPeriod, status, readingDate, tenantId);
+                // updatesingleReading may return response or throw on error
+                alert("Update successful for Consumer ID: " + (consumerId || ""));
+              } catch (err) {
+                console.error(err);
+                alert("Update failed: " + (err && err.message ? err.message : "Unknown error"));
+              }
+            };
+
+            return (
+              <button
+                type="button"
+                style={{ padding: "6px 12px", cursor: "pointer" }}
+                onClick={handleUpdate}
+              >
+                Update
+              </button>
+            );
+          }
+        }
+      },
+    ],
+    title: { labelName: "Search Results for Group Bills", labelKey: "BILL_GENIE_GROUP_SEARCH_HEADER" },
+    rows: "",
+    options: {
+      filter: false,
+      download: false,
+      responsive: "stacked",
+      pagination: false,
+      selectableRows: false,
+      hover: true,
+      rowsPerPageOptions: [10, 15, 20],
+    },
+    customSortColumn: {
+      column: "Date Created",
+      sortingFn: (data, i, sortDateOrder) => {
+        const epochDates = data.reduce((acc, curr) => {
+          acc.push([...curr, getEpochForDate(curr[4], "dayend")]);
+          return acc;
+        }, []);
+        const order = sortDateOrder === "asc" ? true : false;
+        const finalData = sortByEpoch(epochDates, !order).map(item => {
+          item.pop();
+          return item;
+        });
+        return { data: finalData, currentOrder: !order ? "asc" : "desc" };
+      }
+    }
+  }
+};
+export const updateAllReadings = async (state, dispatch) => {
+  debugger;
+
+  // will contain only complete & valid rows
+  let allarray = [];
+
+  // get table data from screen config
+  const rows = get(
+    state,
+    "screenConfiguration.screenConfig.bulkmeterreading.components.div.children.searchResults.props.data",
+    []
+  );
+
+  // read the live values typed in the table inputs
+  const readingInputs = document.querySelectorAll("input.bulk-new-reading");
+  const dateInputs = document.querySelectorAll("input.bulk-new-reading-date");
+
+  for (let i = 0; i < rows.length; i++) {
+    const row = rows[i];
+
+    // Support both object-style rows and array-style rows
+    const isArrayRow = Array.isArray(row);
+
+    const consumerId = isArrayRow ? row[0] : row["Consumer ID"];
+    const lastReading = Number(isArrayRow ? row[1] : row["Last Reading"]) || 0;
+
+    // New reading / date: always take what user typed in the row inputs
+    const currentReadingRawEl = readingInputs[i];
+    const newReadingDateEl = dateInputs[i];
+    const currentReadingRaw = currentReadingRawEl ? currentReadingRawEl.value : "";
+    const newReadingDate = newReadingDateEl ? newReadingDateEl.value : "";
+
+    const currentReadingDateDisplay = isArrayRow ? row[4] : row["Current Reading Date"];
+    const status = isArrayRow ? row[6] : row["Status"];
+    const tenantId = isArrayRow ? row[7] : row["TENANT_ID"];
+
+    // only take complete rows (both value and date filled)
+    if (!currentReadingRaw || !newReadingDate) {
+      continue;
+    }
+
+    const currentReading = Number(currentReadingRaw) || 0;
+
+    // skip invalid readings
+    if (!Number.isFinite(currentReading) || currentReading < lastReading) {
+      continue;
+    }
+
+    const readingDatenew = newReadingDate
+      ? newReadingDate.split("-").reverse().join("/")
+      : null;
+    const billingPeriod =
+      readingDatenew && currentReadingDateDisplay
+        ? `${currentReadingDateDisplay} - ${readingDatenew}`
+        : "";
+    const readingDate = readingDatenew ? getEpochForDate(readingDatenew) : null;
+
+    // New Reading Date must not be earlier than Current Reading Date
+    const currentReadingDateEpoch = currentReadingDateDisplay
+      ? getEpochForDate(currentReadingDateDisplay)
+      : null;
+    if (readingDate && currentReadingDateEpoch && readingDate < currentReadingDateEpoch) {
+      // skip this row if date is invalid
+      continue;
+    }
+
+    // push only complete row into array
+    allarray.push({
+      consumerId,
+      lastReading,
+      newReading: currentReadingRaw,
+      newReadingDate,
+      currentReadingDate: currentReadingDateDisplay,
+      billingPeriod,
+      status,
+      tenantId,
+      readingDate
+    });
+
+    // call single update API
+    try {
+      await updatesingleReading(
+        consumerId,
+        lastReading,
+        currentReadingRaw,
+        currentReading,
+        billingPeriod,
+        status,
+        readingDate,
+        tenantId
+      );
+    } catch (err) {
+      console.error(`Failed to update Consumer ${consumerId}:`, err);
+    }
+  }
+
+
+  return allarray;
+};
\ No newline at end of file

From d32b764feec6e50e51d905651c0bf05a83907cd9 Mon Sep 17 00:00:00 2001
From: erramesh000 <erramesh000@gmail.com>
Date: Mon, 9 Mar 2026 15:14:31 +0530
Subject: [PATCH 18/24] Fixed issues lastReadingDate

---
 .../src/ui-config/screens/specs/abg/gBmr/functions.js    | 9 ++++-----
 .../ui-config/screens/specs/abg/gBmr/searchResults.js    | 9 +++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js
index 4086a9b773..3acd188181 100644
--- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js
@@ -18,8 +18,8 @@ import { loadUlbLogo } from "../../utils/receiptTransformer";
 
 // const tenantId = getTenantId();
 const tenantId = getTenantId();
-export const updatesingleReading = async (consumerId, lastReading, currentReadingRaw, currentReading, billingPeriod, status, readingDate, tenantId) => {
-  debugger;
+export const updatesingleReading = async (consumerId, lastReading, currentReadingRaw, currentReading, billingPeriod, status, readingDate, lastReadingDate, tenantId) => {
+
   const payload = {
     meterReadingslist: [
       {
@@ -29,7 +29,7 @@ export const updatesingleReading = async (consumerId, lastReading, currentReadin
         meterStatus: status,
         connectionNo: consumerId,
         lastReading: lastReading,
-        lastReadingDate: 1705343399000,
+        lastReadingDate: lastReadingDate,
         tenantId: tenantId,
         generateDemand: true
       }
@@ -52,7 +52,7 @@ export const updatesingleReading = async (consumerId, lastReading, currentReadin
 };
 
 export const searchApiCall = async (state, dispatch) => {
-  debugger;
+
   showHideTable(false, dispatch);
   //showHideMergeButton(false, dispatch);
   let searchScreenObject = get(
@@ -116,7 +116,6 @@ export const searchApiCall = async (state, dispatch) => {
     searchScreenObject.url = serviceObject && serviceObject[0] && serviceObject[0].billGineiURL;
     searchScreenObject.tenantId = process.env.REACT_APP_NAME === "Employee" ? getTenantId() : JSON.parse(getUserInfo()).permanentCity;
     const getGroupBillSearch = async (dispatch, searchScreenObject) => {
-      debugger;
 
       try {
         dispatch(toggleSpinner(true));
diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js
index a4f88b4720..7cfa5074b8 100644
--- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js
@@ -104,7 +104,6 @@ export const searchResults = {
         options: {
           filter: false,
           customBodyRender: (value, tableMeta, updateValue) => {
-            debugger;
             let readingDatenew = tableMeta.rowData && tableMeta.rowData[3] ? tableMeta.rowData[3] : null;
             readingDatenew = readingDatenew ? readingDatenew.split("-").reverse().join("/") : null;
             const handleUpdate = async () => {
@@ -112,6 +111,7 @@ export const searchResults = {
               const lastReading = Number(tableMeta.rowData && tableMeta.rowData[1]) || 0;
               const currentReadingRaw = Number(tableMeta.rowData && tableMeta.rowData[2]) || 0;
               const currentReadingDate = tableMeta.rowData && tableMeta.rowData[4] ? getEpochForDate(tableMeta.rowData[4]) : null;
+              const lastReadingDate = tableMeta.rowData && tableMeta.rowData[4] ? getEpochForDate(tableMeta.rowData[4]) : null;
               const currentReading = Number(currentReadingRaw) || 0;
               const billingPeriod = readingDatenew ? `${tableMeta.rowData[4]} - ${readingDatenew}` : "";
               const readingDate = readingDatenew ? getEpochForDate(readingDatenew) : null;
@@ -135,7 +135,7 @@ export const searchResults = {
               }
 
               try {
-                const resp = await updatesingleReading(consumerId, lastReading, currentReadingRaw, currentReading, billingPeriod, status, readingDate, tenantId);
+                const resp = await updatesingleReading(consumerId, lastReading, currentReadingRaw, currentReading, billingPeriod, status, readingDate, lastReadingDate, tenantId);
                 // updatesingleReading may return response or throw on error
                 alert("Update successful for Consumer ID: " + (consumerId || ""));
               } catch (err) {
@@ -186,9 +186,7 @@ export const searchResults = {
   }
 };
 export const updateAllReadings = async (state, dispatch) => {
-  debugger;
 
-  // will contain only complete & valid rows
   let allarray = [];
 
   // get table data from screen config
@@ -218,6 +216,7 @@ export const updateAllReadings = async (state, dispatch) => {
     const newReadingDate = newReadingDateEl ? newReadingDateEl.value : "";
 
     const currentReadingDateDisplay = isArrayRow ? row[4] : row["Current Reading Date"];
+    const lastReadingDate = isArrayRow ? row[4] : row["Current Reading Date"];
     const status = isArrayRow ? row[6] : row["Status"];
     const tenantId = isArrayRow ? row[7] : row["TENANT_ID"];
 
@@ -258,6 +257,7 @@ export const updateAllReadings = async (state, dispatch) => {
       newReading: currentReadingRaw,
       newReadingDate,
       currentReadingDate: currentReadingDateDisplay,
+      lastReadingDate,
       billingPeriod,
       status,
       tenantId,
@@ -272,6 +272,7 @@ export const updateAllReadings = async (state, dispatch) => {
         currentReadingRaw,
         currentReading,
         billingPeriod,
+        lastReadingDate,
         status,
         readingDate,
         tenantId

From 4b106b9a3f02aad6644ea6500478b1891318a95f Mon Sep 17 00:00:00 2001
From: anujkit <chauhan.chauhan5@gmail.com>
Date: Tue, 10 Mar 2026 17:04:25 +0530
Subject: [PATCH 19/24] add egov-pdf code

---
 .../ui-config/screens/specs/abg/groupBills.js |  4 +-
 .../screens/specs/utils/receiptPdf.js         | 80 +++++++++----------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBills.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBills.js
index 59b2196714..15cd8e4161 100644
--- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBills.js
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBills.js
@@ -145,8 +145,8 @@ const abgSearchAndResult = {
                     ? `/egov-ui-framework/abg/groupBillDownloads`
                     : `/abg/groupBillDownloads`
               },
-              //visible: (process.env.REACT_APP_NAME === "Citizen") ? false : true
-              visible: false 
+              visible: (process.env.REACT_APP_NAME === "Citizen") ? false : true
+              //visible: false 
             }
           }
         },
diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/receiptPdf.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/receiptPdf.js
index 3c8f4ed808..16b4b4aaa2 100644
--- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/receiptPdf.js
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/receiptPdf.js
@@ -226,47 +226,47 @@ export const generateMultipleBill = async (state, dispatch, type) => {
 
    
 
-  //allBills = allBills.filter(bill => bill.status === 'ACTIVE' && bill.totalAmount > 0);
-  // if (
-  //   batchtype == 'Locality' && locality &&
-  //   !Array.isArray(locality) &&
-  //   typeof locality === "string" &&
-  //   locality.trim() !== ""
-  // ) {
-  //   try {
-  //           const egovPdfResponse = await batchMergeAndDownload(
-  //           billkey,
-  //           locality,
-  //           businessService,
-  //           tenantId
-  //         );
-  //         let labelKey = egovPdfResponse.message+" Job ID :"+egovPdfResponse.jobId
-  //           dispatch(
-  //             toggleSnackbar(
-  //               true,
-  //               {
-  //                 labelName: labelKey,
-  //                 labelKey: labelKey
-  //               },
-  //               "warning"
-  //             )
-  //           );
-  //       } catch (error) {
-  //         console.error("Error while batch merge and download:", error);
-  //          dispatch(
-  //             toggleSnackbar(
-  //               true,
-  //               {
-  //                 labelName: error,
-  //                 labelKey: error
-  //               },
-  //               "warning"
-  //             )
-  //           );
-  //       }
-  // } else {
+  allBills = allBills.filter(bill => bill.status === 'ACTIVE' && bill.totalAmount > 0);
+   if (
+     batchtype == 'Locality' && locality &&
+     !Array.isArray(locality) &&
+     typeof locality === "string" &&
+     locality.trim() !== ""
+   ) {
+     try {
+             const egovPdfResponse = await batchMergeAndDownload(
+             billkey,
+             locality,
+             businessService,
+             tenantId
+           );
+           let labelKey = egovPdfResponse.message+" Job ID :"+egovPdfResponse.jobId
+             dispatch(
+               toggleSnackbar(
+                 true,
+                 {
+                   labelName: labelKey,
+                   labelKey: labelKey
+                 },
+                 "warning"
+               )
+             );
+         } catch (error) {
+           console.error("Error while batch merge and download:", error);
+            dispatch(
+               toggleSnackbar(
+                 true,
+                 {
+                   labelName: error,
+                   labelKey: error
+                 },
+                 "warning"
+               )
+             );
+         }
+   } else {
     allBills && allBills.length > 0 && await downloadMultipleBill(allBills, billkey, businessService);
- // }
+  }
   /* 
 To Download Files based on Filestoreid logic
  

From b91eb4697a07ea6ca1d10366b4702e3b44dbd2c7 Mon Sep 17 00:00:00 2001
From: erramesh000 <erramesh000@gmail.com>
Date: Wed, 11 Mar 2026 16:44:19 +0530
Subject: [PATCH 20/24] Disable search by mobile number citizen side PI-20837

---
 .../specs/pt-mutation/mutation-methods.js     | 374 +++++++++---------
 1 file changed, 187 insertions(+), 187 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/mutation-methods.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/mutation-methods.js
index 2cdcc79b90..d0b320d878 100644
--- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/mutation-methods.js
+++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/mutation-methods.js
@@ -48,7 +48,7 @@ export const resetFields = (state, dispatch) => {
         false
       )
     );
-  }else{
+  } else {
     dispatch(
       handleField(
         "propertySearch",
@@ -170,118 +170,118 @@ export const searchPropertyDetails = getCommonCard({
 
   subParagraph: getCommonParagraph({
     labelName: "Provide at least one non-mandatory parameter to search for an application (In case of Search by locality and name . please select city name again)",
-   //labelKey: "PT_HOME_SEARCH_RESULTS_DESC"
+    //labelKey: "PT_HOME_SEARCH_RESULTS_DESC"
     labelKey: "Provide at least one non-mandatory parameter to search for an application (In case of search by locality and name . please select city name again)",
-    
+
   }
   ),
 
   ulbCityContainer: getCommonContainer({
     ulbCity: {
       ...getSelectField({
-      uiFramework: "custom-containers-local",
-      moduleName: "egov-pt",
-      componentPath: "AutosuggestContainer",
-      props: {
-        className: "autocomplete-dropdown",
-        suggestions: [],
-        label: {
-          labelName: "ULB",
-          labelKey: "PT_ULB_CITY"
-        },
-        placeholder: {
-          labelName: "Select ULB",
-          labelKey: "PT_ULB_CITY_PLACEHOLDER"
-        },
-        localePrefix: {
-          moduleName: "TENANT",
-          masterName: "TENANTS"
+        uiFramework: "custom-containers-local",
+        moduleName: "egov-pt",
+        componentPath: "AutosuggestContainer",
+        props: {
+          className: "autocomplete-dropdown",
+          suggestions: [],
+          label: {
+            labelName: "ULB",
+            labelKey: "PT_ULB_CITY"
+          },
+          placeholder: {
+            labelName: "Select ULB",
+            labelKey: "PT_ULB_CITY_PLACEHOLDER"
+          },
+          localePrefix: {
+            moduleName: "TENANT",
+            masterName: "TENANTS"
+          },
+          jsonPath: "ptSearchScreen.tenantId",
+          sourceJsonPath: "searchScreenMdmsData.tenant.tenants",
+          labelsFromLocalisation: true,
+          required: true,
+          isClearable: true,
+          disabled: process.env.REACT_APP_NAME === "Citizen" ? false : true,
+          inputLabelProps: {
+            shrink: true
+          }
         },
+        required: true,
         jsonPath: "ptSearchScreen.tenantId",
         sourceJsonPath: "searchScreenMdmsData.tenant.tenants",
-        labelsFromLocalisation: true,
-        required: true,
-        isClearable: true,
-        disabled: process.env.REACT_APP_NAME === "Citizen" ? false : true,
-        inputLabelProps: {
-          shrink: true
-        }
-      },
-      required: true,
-      jsonPath: "ptSearchScreen.tenantId",
-      sourceJsonPath: "searchScreenMdmsData.tenant.tenants",
-    }),
-    beforeFieldChange: async (action, state, dispatch) => {
-      //Below only runs for citizen - not required here in employee
-
-      try {
-        let payload = await httpRequest(
-          "post",
-          "/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=REVENUE&boundaryType=Locality",
-          "_search",
-          [{ key: "tenantId", value: action.value }],
-          {}
-        );
-        console.log("payload", payload)
-        const mohallaData =
-          payload &&
-          payload.TenantBoundary[0] &&
-          payload.TenantBoundary[0].boundary &&
-          payload.TenantBoundary[0].boundary.reduce((result, item) => {
-            result.push({
-              ...item,
-              name: `${action.value
-                .toUpperCase()
-                .replace(
-                  /[.]/g,
-                  "_"
-                )}_REVENUE_${item.code
+      }),
+      beforeFieldChange: async (action, state, dispatch) => {
+        //Below only runs for citizen - not required here in employee
+
+        try {
+          let payload = await httpRequest(
+            "post",
+            "/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=REVENUE&boundaryType=Locality",
+            "_search",
+            [{ key: "tenantId", value: action.value }],
+            {}
+          );
+          console.log("payload", payload)
+          const mohallaData =
+            payload &&
+            payload.TenantBoundary[0] &&
+            payload.TenantBoundary[0].boundary &&
+            payload.TenantBoundary[0].boundary.reduce((result, item) => {
+              result.push({
+                ...item,
+                name: `${action.value
                   .toUpperCase()
-                  .replace(/[._:-\s\/]/g, "_")}`
-            });
-            return result;
-          }, []);
-
-        console.log(mohallaData, "mohallaData")
-
-
-
-        dispatch(
-          prepareFinalObject(
-            "applyScreenMdmsData.tenant.localities",
-            mohallaData
-          )
-        );
-        dispatch(
-          handleField(
-            "apply",
-            "components.div.children.formwizardSecondStep.children.propertyLocationDetails.children.cardContent.children.propertyDetailsConatiner.children.propertyMohalla",
-            "props.suggestions",
-            mohallaData
-          )
-        );
-        const mohallaLocalePrefix = {
-          moduleName: action.value,
-          masterName: "REVENUE"
-        };
-        dispatch(
-          handleField(
-            "apply",
-            "components.div.children.formwizardSecondStep.children.propertyLocationDetails.children.cardContent.children.propertyDetailsConatiner.children.propertyMohalla",
-            "props.localePrefix",
-            mohallaLocalePrefix
-          )
-        );
-
-         dispatch(
-           fetchLocalizationLabel(getLocale(), action.value, action.value)
-         );
-
-      } catch (e) {
-        console.log(e);
-      }
+                  .replace(
+                    /[.]/g,
+                    "_"
+                  )}_REVENUE_${item.code
+                    .toUpperCase()
+                    .replace(/[._:-\s\/]/g, "_")}`
+              });
+              return result;
+            }, []);
+
+          console.log(mohallaData, "mohallaData")
+
+
+
+          dispatch(
+            prepareFinalObject(
+              "applyScreenMdmsData.tenant.localities",
+              mohallaData
+            )
+          );
+          dispatch(
+            handleField(
+              "apply",
+              "components.div.children.formwizardSecondStep.children.propertyLocationDetails.children.cardContent.children.propertyDetailsConatiner.children.propertyMohalla",
+              "props.suggestions",
+              mohallaData
+            )
+          );
+          const mohallaLocalePrefix = {
+            moduleName: action.value,
+            masterName: "REVENUE"
+          };
+          dispatch(
+            handleField(
+              "apply",
+              "components.div.children.formwizardSecondStep.children.propertyLocationDetails.children.cardContent.children.propertyDetailsConatiner.children.propertyMohalla",
+              "props.localePrefix",
+              mohallaLocalePrefix
+            )
+          );
+
+          dispatch(
+            fetchLocalizationLabel(getLocale(), action.value, action.value)
+          );
+
+        } catch (e) {
+          console.log(e);
+        }
 
-    },
+      },
       gridDefination: {
         xs: 12,
         sm: 4
@@ -309,7 +309,7 @@ export const searchPropertyDetails = getCommonCard({
       required: false,
       pattern: getPattern("MobileNo"),
       jsonPath: "ptSearchScreen.mobileNumber",
-      // disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
+      disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
       errorMessage: "ERR_INVALID_MOBILE_NUMBER"
     }),
     propertyTaxUniqueId: getTextField({
@@ -350,101 +350,101 @@ export const searchPropertyDetails = getCommonCard({
       errorMessage: "ERR_INVALID_PROPERTY_ID",
       jsonPath: "ptSearchScreen.oldpropertyids"
     }),
-    
-  //-------------locality--------------
-  propertyMohalla: {
-    uiFramework: "custom-containers",
-    componentPath: "AutosuggestContainer",
-    jsonPath:"ptSearchScreen.locality",
-    required: true,
-    props: {
-      style: {
-        width: "100%",
-        cursor: "pointer"
+
+    //-------------locality--------------
+    propertyMohalla: {
+      uiFramework: "custom-containers",
+      componentPath: "AutosuggestContainer",
+      jsonPath: "ptSearchScreen.locality",
+      required: true,
+      props: {
+        style: {
+          width: "100%",
+          cursor: "pointer"
+        },
+        label: {
+          labelName: "Locality/Mohalla",
+          // labelKey: "NOC_PROPERTY_DETAILS_MOHALLA_LABEL"
+        },
+        placeholder: {
+          labelName: "Select Locality/Mohalla",
+          //labelKey: "NOC_PROPERTY_DETAILS_MOHALLA_PLACEHOLDER"
+        },
+        jsonPath: "ptSearchScreen.locality",
+        sourceJsonPath: "applyScreenMdmsData.tenant.localities",
+        labelsFromLocalisation: true,
+        errorMessage: "ERR_DEFAULT_INPUT_FIELD_MSG",
+        suggestions: [],
+        fullwidth: true,
+        required: false,
+        // disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
+        // type:hidden,
+        inputLabelProps: {
+          shrink: true
+        }
+        // className: "tradelicense-mohalla-apply"
+      },
+      beforeFieldChange: async (action, state, dispatch) => {
+        // dispatch(
+        //   prepareFinalObject(
+        //     "Licenses[0].tradeLicenseDetail.address.locality.name",
+        //     action.value && action.value.label
+        //   )
+        // );
       },
+      gridDefination: {
+        xs: 12,
+        sm: 4
+      }
+    },
+    //---------------locality-end--------------
+    //-------------------Owner Name----------------------
+    ownerName: getTextField({
       label: {
-        labelName: "Locality/Mohalla",
-       // labelKey: "NOC_PROPERTY_DETAILS_MOHALLA_LABEL"
+        labelName: "Owner Name",
+        labelKey: "Owner Name"
       },
       placeholder: {
-        labelName: "Select Locality/Mohalla",
-        //labelKey: "NOC_PROPERTY_DETAILS_MOHALLA_PLACEHOLDER"
+        labelName: "Enter Owner Name",
+        labelKey: "Owner Name"
+      },
+      gridDefination: {
+        xs: 12,
+        sm: 4,
+
       },
-      jsonPath:"ptSearchScreen.locality",
-      sourceJsonPath: "applyScreenMdmsData.tenant.localities",
-      labelsFromLocalisation: true,
-      errorMessage: "ERR_DEFAULT_INPUT_FIELD_MSG",
-      suggestions: [],
-      fullwidth: true,
       required: false,
+      // pattern: /^[^\$\"'<>?\\\\~`!@$%^()+={}\[\]*:;“”‘’]{1,64}$/i,
+      errorMessage: "ERR_INVALID_PROPERTY_ID",
+      jsonPath: "ptSearchScreen.name",
       // disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
-     // type:hidden,
-      inputLabelProps: {
-        shrink: true
-      }
-      // className: "tradelicense-mohalla-apply"
-    },
-    beforeFieldChange: async (action, state, dispatch) => {
-      // dispatch(
-      //   prepareFinalObject(
-      //     "Licenses[0].tradeLicenseDetail.address.locality.name",
-      //     action.value && action.value.label
-      //   )
-      // );
-    },
-    gridDefination: {
-      xs: 12,
-      sm: 4
-    }
-  },
-  //---------------locality-end--------------
-  //-------------------Owner Name----------------------
-  ownerName: getTextField({
-    label: {
-      labelName: "Owner Name",
-      labelKey: "Owner Name"
-    },
-    placeholder: {
-      labelName: "Enter Owner Name",
-      labelKey: "Owner Name"
-    },
-    gridDefination: {
-      xs: 12,
-      sm: 4,
+    }),
 
-    },
-    required: false,
-   // pattern: /^[^\$\"'<>?\\\\~`!@$%^()+={}\[\]*:;“”‘’]{1,64}$/i,
-    errorMessage: "ERR_INVALID_PROPERTY_ID",
-    jsonPath: "ptSearchScreen.name",
-    // disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
-  }),
+    surveyId: getTextField({
+      label: {
+        labelName: "Survey Id",
+        labelKey: "Survey Id"
+      },
+      placeholder: {
+        labelName: "Enter Survey Id",
+        labelKey: "Survey Id"
+      },
+      gridDefination: {
+        xs: 12,
+        sm: 4,
 
-  surveyId: getTextField({
-    label: {
-      labelName: "Survey Id",
-      labelKey: "Survey Id"
-    },
-    placeholder: {
-      labelName: "Enter Survey Id",
-      labelKey: "Survey Id"
-    },
-    gridDefination: {
-      xs: 12,
-      sm: 4,
+      },
+      required: false,
+      // pattern: /^[^\$\"'<>?\\\\~`!@$%^()+={}\[\]*:;“”‘’]{1,64}$/i,
+      errorMessage: "ERR_INVALID_SURVEY_ID",
+      jsonPath: "ptSearchScreen.surveyId",
+      disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
+    }),
 
-    },
-    required: false,
-   // pattern: /^[^\$\"'<>?\\\\~`!@$%^()+={}\[\]*:;“”‘’]{1,64}$/i,
-    errorMessage: "ERR_INVALID_SURVEY_ID",
-    jsonPath: "ptSearchScreen.surveyId",
-    disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
-  }),
 
-  
-  //-------------------End SurveyId --------------------------------
+    //-------------------End SurveyId --------------------------------
   }),
- 
+
   button: getCommonContainer({
     buttonContainer: getCommonContainer({
       resetButton: {
@@ -560,7 +560,7 @@ export const searchApplicationDetails = getCommonCard({
         position: "start"
       },
       required: false,
-    //  disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
+      disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
       pattern: getPattern("MobileNo"),
       jsonPath: "ptSearchScreen.mobileNumber",
       errorMessage: "ERR_INVALID_MOBILE_NUMBER"
@@ -580,7 +580,7 @@ export const searchApplicationDetails = getCommonCard({
 
       },
       required: false,
-     // disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
+      // disabled: process.env.REACT_APP_NAME === "Citizen" ? true : false,
       pattern: /^[a-zA-Z0-9-]*$/i,
       errorMessage: "ERR_INVALID_PROPERTY_ID",
       jsonPath: "ptSearchScreen.ids"

From 8642de4cea9dca6b1bc17cecba2ab795e39de556 Mon Sep 17 00:00:00 2001
From: erramesh000 <erramesh000@gmail.com>
Date: Thu, 12 Mar 2026 15:02:46 +0530
Subject: [PATCH 21/24] Updated employee digit url

---
 web/egov-common-screen/src/components/Header/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/egov-common-screen/src/components/Header/index.jsx b/web/egov-common-screen/src/components/Header/index.jsx
index 02e71a9c2f..f105a5ecc3 100644
--- a/web/egov-common-screen/src/components/Header/index.jsx
+++ b/web/egov-common-screen/src/components/Header/index.jsx
@@ -11,7 +11,7 @@ export default function Header() {
     const hostname = typeof window !== "undefined" ? window.location.hostname : "";
 
     const baseUrl = `https://${hostname}/digit-ui`;
-    const baseUrlMseva = `https://${hostname}`;
+    // const baseUrlMseva = `https://${hostname}`;
     return (
         <>
             <div>
@@ -45,7 +45,7 @@ export default function Header() {
                         </div>
                         <div className="col-sm-12 col-md-6">
                             <div className="rightharder">
-                                <a href={`${baseUrlMseva}/employee`}target="_blank">
+                                <a href={`${baseUrl}/employee`} target="_blank">
                                     Employee Login
                                 </a>
                                 {" | "}

From 1b62ee0147f8640022aafc74a7340b24439cdd9c Mon Sep 17 00:00:00 2001
From: erramesh000 <erramesh000@gmail.com>
Date: Fri, 13 Mar 2026 10:36:34 +0530
Subject: [PATCH 22/24] Remove alert text One-Time Settlement for Property
 citizen Side

---
 .../src/common/propertyTax/Property/index.js                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/index.js
index 4b19fdde71..c53b097509 100644
--- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/index.js
+++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/index.js
@@ -208,9 +208,9 @@ class Property extends Component {
         dialogueOpen: true,
         urlToAppend: getPropertyLink(propertyId, tenantId, PROPERTY_FORM_PURPOSE.ASSESS, -1, assessmentNo),
       });
-      if (process.env.REACT_APP_NAME === "Citizen") {
-        alert("One-Time Settlement for Property Tax has been enabled in mSeva. Please review and re-assess your property details before proceeding with payment.");
-      }
+      // if (process.env.REACT_APP_NAME === "Citizen") {
+      //   alert("One-Time Settlement for Property Tax has been enabled in mSeva. Please review and re-assess your property details before proceeding with payment.");
+      // }
     }
   };
   onEditPropertyClick = () => {

From 9531ed8d74e04d33ffeb99023b470b7039363d58 Mon Sep 17 00:00:00 2001
From: erramesh000 <erramesh000@gmail.com>
Date: Fri, 20 Mar 2026 15:53:12 +0530
Subject: [PATCH 23/24] Fixed related SW connection field issues

---
 .../wns/applyResource/additionalDetails.js    |  17 +-
 .../screens/specs/wns/applyResource/footer.js | 277 +++++++++---------
 .../egov-wns-dev/src/ui-utils/commons.js      |  20 +-
 3 files changed, 176 insertions(+), 138 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/additionalDetails.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/additionalDetails.js
index dc89ba2acd..a110479d38 100644
--- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/additionalDetails.js
+++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/additionalDetails.js
@@ -417,6 +417,14 @@ export const additionDetails = getCommonCard({
                 true
               )
             );
+            dispatch(
+              handleField(
+                "apply",
+                `components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.relatedSwConnection`,
+                "visible",
+                false
+              )
+            );
             dispatch(
               handleField(
                 "apply",
@@ -433,7 +441,14 @@ export const additionDetails = getCommonCard({
                 true
               )
             );
-
+            dispatch(
+              handleField(
+                "apply",
+                `components.div.children.formwizardSecondStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.initialMeterReading`,
+                "visible",
+                false
+              )
+            );
           }
 
         }
diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/footer.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/footer.js
index f50f7b65f7..2ef22767eb 100644
--- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/footer.js
+++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/footer.js
@@ -29,20 +29,20 @@ import commonConfig from "config/common.js";
 const isMode = isModifyMode();
 const isModeAction = isModifyModeAction();
 const setReviewPageRoute = (state, dispatch) => {
-  let serviceType = get (state, "screenConfiguration.preparedFinalObject.applyScreen.service");
-  let roadCuttingInfo ;
-  if(serviceType === "Sewerage"){
-     roadCuttingInfo = get(state, "screenConfiguration.preparedFinalObject.applyScreen.roadCuttingInfosw", []);
-     dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.userCharges", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.userChargessw")));
-     dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.othersFee", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.othersFeesw")));
-     dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.compositionFee", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.compositionFeesw")));
-  }else{
-     roadCuttingInfo = get(state, "screenConfiguration.preparedFinalObject.applyScreen.roadCuttingInfo", []);
-     dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.userCharges", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.userCharges")));
-     dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.othersFee", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.othersFee")));
-     dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.compositionFee", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.compositionFee")));
+  let serviceType = get(state, "screenConfiguration.preparedFinalObject.applyScreen.service");
+  let roadCuttingInfo;
+  if (serviceType === "Sewerage") {
+    roadCuttingInfo = get(state, "screenConfiguration.preparedFinalObject.applyScreen.roadCuttingInfosw", []);
+    dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.userCharges", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.userChargessw")));
+    dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.othersFee", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.othersFeesw")));
+    dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.compositionFee", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.compositionFeesw")));
+  } else {
+    roadCuttingInfo = get(state, "screenConfiguration.preparedFinalObject.applyScreen.roadCuttingInfo", []);
+    dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.userCharges", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.userCharges")));
+    dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.othersFee", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.othersFee")));
+    dispatch(prepareFinalObject("WaterConnection[0].additionalDetails.compositionFee", get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.compositionFee")));
   }
-  
+
   if (roadCuttingInfo && roadCuttingInfo.length > 0) {
     let formatedRoadCuttingInfo = roadCuttingInfo.filter(value => value.isEmpty !== true);
     dispatch(prepareFinalObject("applyScreen.roadCuttingInfo", formatedRoadCuttingInfo));
@@ -368,7 +368,7 @@ const callBackForNext = async (state, dispatch) => {
                   )
                 }
               } else if (sewerage) {
-                
+
                 if (validateFeildsForSewerage(applyScreenObject)) {
                   isFormValid = true;
                   hasFieldToaster = false;
@@ -499,9 +499,9 @@ const callBackForNext = async (state, dispatch) => {
         subUsageType && subUsageType.map(items => {
           if (items["parentUsageType"] === propertyUsageType) {
             let obj = {};
-             obj.code = items.code;  
-            obj.name = items.name; 
-              obj.parentUsageType = items.parentUsageType,
+            obj.code = items.code;
+            obj.name = items.name;
+            obj.parentUsageType = items.parentUsageType,
               obj.active = items.active
             usageTypes.push(obj);
             if (waterSubUsageType === items.name) {
@@ -539,7 +539,7 @@ const callBackForNext = async (state, dispatch) => {
         let connType = get(state.screenConfiguration.preparedFinalObject, "applyScreen.connectionType", "");
         let applicationNumber = get(state.screenConfiguration.preparedFinalObject, "applyScreen.applicationNo", "");
         if (applicationStatus === "PENDING_FOR_CONNECTION_ACTIVATION" && window.location.href.includes("action=edit")) {
-          
+
           const sewerage = get(
             state.screenConfiguration.preparedFinalObject,
             "applyScreen.sewerage"
@@ -553,27 +553,27 @@ const callBackForNext = async (state, dispatch) => {
             state.screenConfiguration.preparedFinalObject,
             "applyScreen.discharge"
           );
-          
+
           // Show sewerage-specific field handling only for sewerage-only applications
-          if(sewerage && !water && !discharge){
-          // if(sewerage){
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "props.required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "props.required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "props.required", false));
+          if (sewerage && !water && !discharge) {
+            // if(sewerage){
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "props.required", false));
           }
           // For water or discharge applications, treat them the same way
           if (applicationNumber.includes("WS") || discharge) {
-          // if (applicationNumber.includes("WS")) {
+            // if (applicationNumber.includes("WS")) {
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "required", false));
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "props.required", false));
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "required", true));
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "props.required", true));
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "required", true));
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "props.required", true));
-            
+
             // Only make subUsageType required if water service is selected (not for discharge-only)
             if (water) {
               dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.subUsageType", "required", true));
@@ -597,7 +597,7 @@ const callBackForNext = async (state, dispatch) => {
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfWaterClosets", "required", false));
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfWaterClosets", "props.required", false));
           } else if (sewerage && !water && !discharge) {
-          // } else {
+            // } else {
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfToilets", "required", true));
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfToilets", "props.required", true));
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfWaterClosets", "required", true));
@@ -646,7 +646,7 @@ const callBackForNext = async (state, dispatch) => {
           dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.enterArea", "props.required", false));
           dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.roadType", "required", false));
           dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.roadType", "props.required", false));
-        } 
+        }
         else {
           const sewerage = get(
             state.screenConfiguration.preparedFinalObject,
@@ -660,61 +660,61 @@ const callBackForNext = async (state, dispatch) => {
             state.screenConfiguration.preparedFinalObject,
             "applyScreen.discharge"
           );
-          
+
           // Show sewerage fields only if sewerage is selected (and not water or discharge)
-          if(sewerage && !water && !discharge){
-          // if(sewerage){
+          if (sewerage && !water && !discharge) {
+            // if(sewerage){
             dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "props.required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "props.required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "props.required", false));
-          }
-else{
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfToilets", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfToilets", "props.required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfWaterClosets", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfWaterClosets", "props.required", false));
-
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "required", true));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "props.required", true));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "props.required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "props.required", false));
-          
-          // Only make subUsageType required if water service is selected (not for discharge-only or sewerage-only)
-          if (water) {
-            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.subUsageType", "required", true));
-            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.subUsageType", "props.required", true));
-          } else {
-            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.subUsageType", "required", false));
-            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.subUsageType", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "props.required", false));
           }
-          // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.waterSourceType", "required", false ) ); 
-          // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.waterSourceType", "props.required", false ) );
-          // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.dynamicMdmsWaterSource.props.dropdownFields[0]", "isRequired", false) ); 
-          // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.dynamicMdmsWaterSource.props.dropdownFields[0]", "requiredValue", false ) ); 
-          // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.dynamicMdmsWaterSource.props.dropdownFields[1]", "isRequired", false ) ); 
-          // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.dynamicMdmsWaterSource.props.dropdownFields[1]", "requiredValue", false ) );
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.connectionExecutionDate", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.connectionExecutionDate", "props.required", false));
+          else {
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfToilets", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfToilets", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfWaterClosets", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.noOfWaterClosets", "props.required", false));
 
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.enterArea", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.enterArea", "props.required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.roadType", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.roadType", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "required", true));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.connectionType", "props.required", true));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.numberOfTaps", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.pipeSize", "props.required", false));
 
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.connectionExecutionDate", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.connectionExecutionDate", "props.required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.initialMeterReading", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.initialMeterReading", "props.required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.meterID", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.meterID", "props.required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.meterInstallationDate", "required", false));
-          dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.meterInstallationDate", "props.required", false));
-}
+            // Only make subUsageType required if water service is selected (not for discharge-only or sewerage-only)
+            if (water) {
+              dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.subUsageType", "required", true));
+              dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.subUsageType", "props.required", true));
+            } else {
+              dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.subUsageType", "required", false));
+              dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.subUsageType", "props.required", false));
+            }
+            // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.waterSourceType", "required", false ) ); 
+            // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.waterSourceType", "props.required", false ) );
+            // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.dynamicMdmsWaterSource.props.dropdownFields[0]", "isRequired", false) ); 
+            // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.dynamicMdmsWaterSource.props.dropdownFields[0]", "requiredValue", false ) ); 
+            // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.dynamicMdmsWaterSource.props.dropdownFields[1]", "isRequired", false ) ); 
+            // dispatch( handleField( "apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children.dynamicMdmsWaterSource.props.dropdownFields[1]", "requiredValue", false ) );
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.connectionExecutionDate", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.connectionExecutionDate", "props.required", false));
+
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.enterArea", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.enterArea", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.roadType", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer.children.cardContent.children.applicantTypeContainer.children.roadCuttingChargeInfoCard.children.multipleApplicantInfo.props.scheama.children.cardContent.children.roadDetails.children.roadType", "props.required", false));
+
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.connectionExecutionDate", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.connectionExecutionDate", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.initialMeterReading", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.initialMeterReading", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.meterID", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.meterID", "props.required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.meterInstallationDate", "required", false));
+            dispatch(handleField("apply", "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.meterInstallationDate", "props.required", false));
+          }
         }
         if (connType === undefined || connType === "Non Metered" || connType === "Bulk-supply" || connType !== "Metered") {
           showHideFeilds(dispatch, false);
@@ -734,7 +734,7 @@ else{
         if (roadCuttingInfo && roadCuttingInfo.length > 0) {
           dispatch(prepareFinalObject("applyScreen.tempRoadCuttingInfo", roadCuttingInfo));
           let formatedRoadCuttingInfo = roadCuttingInfo.filter(value => value.emptyObj !== true);
-          if (applicationNumber.includes("SW")){
+          if (applicationNumber.includes("SW")) {
             dispatch(prepareFinalObject("applyScreen.roadCuttingInfosw", formatedRoadCuttingInfo));
             dispatch(prepareFinalObject("applyScreen.additionalDetails.userChargessw", swUserCharges));
             dispatch(prepareFinalObject("applyScreen.additionalDetails.othersFeesw", swOthersFee));
@@ -743,7 +743,7 @@ else{
             dispatch(prepareFinalObject("applyScreen.additionalDetails.othersFee", ""));
             dispatch(prepareFinalObject("applyScreen.additionalDetails.compositionFee", ""));
             dispatch(prepareFinalObject("applyScreen.roadCuttingInfo", []));
-          }else{
+          } else {
             dispatch(prepareFinalObject("applyScreen.roadCuttingInfo", formatedRoadCuttingInfo));
             dispatch(prepareFinalObject("applyScreen.additionalDetails.userCharges", swUserCharges));
             dispatch(prepareFinalObject("applyScreen.additionalDetails.othersFee", swOthersFee));
@@ -752,7 +752,7 @@ else{
             dispatch(prepareFinalObject("applyScreen.additionalDetails.othersFeesw", ""));
             dispatch(prepareFinalObject("applyScreen.additionalDetails.compositionFeesw", ""));
             dispatch(prepareFinalObject("applyScreen.roadCuttingInfosw", []));
-          }          
+          }
         }
         let UsageType = get(state, "screenConfiguration.preparedFinalObject.applyScreen.property.usageCategory");
         if (UsageType === "MIXED") {
@@ -804,23 +804,23 @@ else{
   }
   /* validations for Additional /Docuemnts details screen */
   if (activeStep === 2 && process.env.REACT_APP_NAME !== "Citizen") {
-    
+
     // Get application type flags from Redux state
     const isDischargeApplication = get(state, "screenConfiguration.preparedFinalObject.applyScreen.discharge", false);
     const isWaterApplication = get(state, "screenConfiguration.preparedFinalObject.applyScreen.water", false);
-    const isSewerageApplication = get(state, "screenConfiguration.preparedFinalObject.applyScreen.sewerage", false);   
+    const isSewerageApplication = get(state, "screenConfiguration.preparedFinalObject.applyScreen.sewerage", false);
     let validate = true;
     // Special validation for discharge-only applications
     if (isDischargeApplication && !isWaterApplication && !isSewerageApplication) {
       // For discharge-only apps, check if discharge fee is entered
       let dischargeFee = get(state, "screenConfiguration.preparedFinalObject.applyScreen.additionalDetails.dischargeFee", null);
-       //validate = dischargeFee && dischargeFee > 0;
+      //validate = dischargeFee && dischargeFee > 0;
       validate = validateFieldsNew("components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children", state, dispatch);
     } else {
       // For water/sewerage applications, use standard validation
       validate = validateFieldsNew("components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.connectiondetailscontainer.children.cardContent.children.connectionDetails.children", state, dispatch);
     }
-    
+
     if (validate) {
       isFormValid = true;
       hasFieldToaster = false;
@@ -854,11 +854,11 @@ else{
       // }
     }
     else {
-        
+
       let roadCuttingInfo = get(state, "screenConfiguration.preparedFinalObject.applyScreen.roadCuttingInfo", []);
       let roadCuttingInfosw = get(state, "screenConfiguration.preparedFinalObject.applyScreen.roadCuttingInfosw", []);
-      if (roadCuttingInfo === 'NA') roadCuttingInfo =[]
-      if (roadCuttingInfosw === 'NA') roadCuttingInfosw =[]
+      if (roadCuttingInfo === 'NA') roadCuttingInfo = []
+      if (roadCuttingInfosw === 'NA') roadCuttingInfosw = []
       let applicationStatus = get(state.screenConfiguration.preparedFinalObject, "applyScreen.applicationStatus", "");
       if (applicationStatus === "PENDING_FOR_CONNECTION_ACTIVATION") {
         let waterSourceType = get(state.screenConfiguration.preparedFinalObject, "DynamicMdms.ws-services-masters.waterSource.selectedValues[0].waterSourceType", "");
@@ -1004,15 +1004,15 @@ else{
   if (activeStep === 3) {
     let waterId
     let sewerId
-    if (!isModifyMode()){
+    if (!isModifyMode()) {
       waterId = get(state, "screenConfiguration.preparedFinalObject.WaterConnection[0].id");
       sewerId = get(state, "screenConfiguration.preparedFinalObject.SewerageConnection[0].id");
-    }else{
+    } else {
       waterId = get(state, "screenConfiguration.preparedFinalObject.WaterConnection[0].water");
       sewerId = get(state, "screenConfiguration.preparedFinalObject.SewerageConnection[0].sewerage");
     }
-     
-    
+
+
     let roadCuttingInfo = get(state, "screenConfiguration.preparedFinalObject.applyScreen.roadCuttingInfo", []);
     // Check application types
     const isDischargeApplication = get(state, "screenConfiguration.preparedFinalObject.applyScreen.discharge", false);
@@ -1062,46 +1062,61 @@ else{
   }
   let applyFor = get(state.screenConfiguration.preparedFinalObject, "applyScreen");
   if (!isModifyMode()) {
-    const waterVisible = applyFor.water ;
+    const waterVisible = applyFor.water;
     const sewerageVisible = applyFor.sewerage;
     const dischargeVisible = applyFor.discharge;
-  dispatch(
-    handleField(
-      "apply",
-      "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer",
-      "visible",
-      waterVisible
-    )
-  );
-
-  dispatch(
-    handleField(
-      "apply",
-      "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainersw",
-      "visible",
-      sewerageVisible
-    )
-  );
+    dispatch(
+      handleField(
+        "apply",
+        "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer",
+        "visible",
+        waterVisible
+      )
+    );
+    dispatch(
+      handleField(
+        "apply",
+        `components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.relatedSwConnection`,
+        "visible",
+        waterVisible
+      )
+    );
 
-}else{
-  dispatch(
-    handleField(
-      "apply",
-      "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer",
-      "visible",
-      false
-    )
-  );
+    dispatch(
+      handleField(
+        "apply",
+        "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainersw",
+        "visible",
+        sewerageVisible
+      )
+    );
 
-  dispatch(
-    handleField(
-      "apply",
-      "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainersw",
-      "visible",
-      false
-    )
-  );
-}
+  } else {
+    dispatch(
+      handleField(
+        "apply",
+        "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainer",
+        "visible",
+        false
+      )
+    );
+    dispatch(
+      handleField(
+        "apply",
+        `components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.relatedSwConnection`,
+        "visible",
+        false
+      )
+    );
+    dispatch(
+      handleField(
+        "apply",
+        "components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.roadCuttingChargeContainersw",
+        "visible",
+        false
+      )
+    );
+  }
 };
 
 const moveToSuccess = (combinedArray, dispatch) => {
diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-utils/commons.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-utils/commons.js
index 781c8e1cbd..c9b2010459 100644
--- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-utils/commons.js
+++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-utils/commons.js
@@ -610,7 +610,7 @@ export const prepareDocumentsUploadData = (state, dispatch) => {
 };
 
 const parserFunction = (state) => {
-    
+
     let queryObject = JSON.parse(JSON.stringify(get(state.screenConfiguration.preparedFinalObject, "applyScreen", {})));
     //console.log("Hello Test"+JSON.stringify(queryObject))
     let iPin = getIPin();
@@ -1122,6 +1122,14 @@ export const applyForSewerage = async (state, dispatch) => {
                 false
             )
         );
+        dispatch(
+            handleField(
+                "apply",
+                `components.div.children.formwizardThirdStep.children.additionDetails.children.cardContent.children.activationDetailsContainer.children.cardContent.children.activeDetails.children.relatedSwConnection`,
+                "visible",
+                false
+            )
+        );
         dispatch(
             handleField(
                 "apply",
@@ -1151,7 +1159,7 @@ export const applyForSewerage = async (state, dispatch) => {
         //queryObject.tenantId = (queryObject && queryObject.property && queryObject.property.tenantId) ? queryObject.property.tenantId : null;
         queryObject.tenantId = parsedTenantId;
         if (method === "UPDATE") {
-            
+
             queryObject.additionalDetails.appCreatedDate = get(
                 state.screenConfiguration.preparedFinalObject,
                 "SewerageConnection[0].additionalDetails.appCreatedDate"
@@ -1197,7 +1205,7 @@ export const applyForSewerage = async (state, dispatch) => {
             }
             queryObject.additionalDetails.locality = queryObject.property.address.locality.code;
             today = convertDateToEpoch(today);
-            
+
             let today = new Date();
             let dd = String(today.getDate()).padStart(2, '0');
             let mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
@@ -1233,7 +1241,7 @@ export const applyForSewerage = async (state, dispatch) => {
 }
 
 export const applyForBothWaterAndSewerage = async (state, dispatch) => {
-    
+
     let method;
 
     let queryObject = parserFunction(state);
@@ -1651,9 +1659,9 @@ export const getPastPaymentsForSewerage = async (dispatch) => {
 export const createMeterReading = async (dispatch, body, mode) => {
     dispatch(toggleSpinner());
     let url
-    if(mode === 'edit'){
+    if (mode === 'edit') {
         url = "/ws-calculator/meterConnection/_update"
-    }else{
+    } else {
         url = "/ws-calculator/meterConnection/_create"
     }
     try {

From 149bfaba4965d51e6e5b813b034e73fa374823b8 Mon Sep 17 00:00:00 2001
From: erramesh000 <erramesh000@gmail.com>
Date: Tue, 7 Apr 2026 10:27:35 +0530
Subject: [PATCH 24/24] Updated Bulkmeter screen

---
 .../screens/specs/abg/bulkmeterreading.js     |  2 +-
 .../screens/specs/abg/gBmr/functions.js       |  2 +-
 .../screens/specs/abg/gBmr/searchResults.js   | 88 +++++++++++++++----
 3 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/bulkmeterreading.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/bulkmeterreading.js
index d72ef8abf9..f165bd0ca1 100644
--- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/bulkmeterreading.js
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/bulkmeterreading.js
@@ -14,7 +14,7 @@ import {
 } from "./gBmr/groupBillSearch";
 
 // import { updateAllReadings } from "./gBmr/functions";
-import { searchResults, brmeterReading, updateAllButton, updateAllReadings } from "./gBmr/searchResults";
+import { searchResults, updateAllReadings } from "./gBmr/searchResults";
 import "./index.css";
 
 const tenantId = getTenantId();
diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js
index 3acd188181..90c428682a 100644
--- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/functions.js
@@ -121,7 +121,7 @@ export const searchApiCall = async (state, dispatch) => {
         dispatch(toggleSpinner(true));
         const requestBody = {
           tenantId: searchScreenObject.tenantId || tenantId,
-          locality: "ALOC2",
+          locality: searchScreenObject.locality || "",
           offset: searchScreenObject.offset !== undefined ? searchScreenObject.offset : 0
         };
         const url = `ws-calculator/meterConnection/_searchV2?tenantId=${encodeURIComponent(requestBody.tenantId)}&locality=${encodeURIComponent(requestBody.locality)}&offset=${encodeURIComponent(requestBody.offset)}`;
diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js
index 7cfa5074b8..da0b33f93d 100644
--- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js
+++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/gBmr/searchResults.js
@@ -17,6 +17,7 @@ export const searchResults = {
       { labelName: "Consumer ID", labelKey: "Consumer ID" },
 
       { labelName: "Last Reading", labelKey: "Last Reading" },
+      { labelName: "Current Reading Date", labelKey: "Current Reading Date" },
       {
         labelName: "New Reading(in KL)",
         labelKey: "New Reading(in KL)",
@@ -25,17 +26,21 @@ export const searchResults = {
           customBodyRender: (value, tableMeta, updateValue) => {
             // Last Reading is the second column (index 1)
             const lastReading = tableMeta.rowData && tableMeta.rowData[1];
+            const status = tableMeta.rowData && tableMeta.rowData[6];
+            const isEditable = ["Working", "Breakdown", "Locked"].includes(status);
             return (
               <input
                 type="number"
                 min={lastReading || 0}
                 className="bulk-new-reading"
                 style={{ width: "120px", padding: "6px", boxSizing: "border-box" }}
+                disabled={!isEditable}
                 // defaultValue={value || ""}
                 onInput={e => {
                   e.target.value = e.target.value.replace(/[^0-9]/g, "");
                 }}
                 onBlur={e => {
+                  if (!isEditable) return;
                   const v = e.target.value.trim();
                   if (v === "") { updateValue(""); return; }
                   const numeric = Number(v);
@@ -62,7 +67,9 @@ export const searchResults = {
           customBodyRender: (value, tableMeta, updateValue) => {
             // Disable dates earlier than Current Reading Date for that row
             const currentReadingDateDisplay =
-              tableMeta.rowData && tableMeta.rowData[4]; // e.g. "05/02/2026"
+              tableMeta.rowData && tableMeta.rowData[2]; // e.g. "05/02/2026"
+            const status = tableMeta.rowData && tableMeta.rowData[6];
+            const isEditable = ["Working", "Breakdown", "Locked"].includes(status);
 
             let minDate = "";
             if (
@@ -81,16 +88,56 @@ export const searchResults = {
                 min={minDate || undefined}
                 className="bulk-new-reading-date"
                 style={{ width: "160px", padding: "6px", boxSizing: "border-box" }}
+                disabled={!isEditable}
                 // defaultValue={value || today}
-                onChange={e => updateValue(e.target.value)}
+                onChange={e => {
+                  if (!isEditable) return;
+                  updateValue(e.target.value);
+                }}
               />
             );
           }
         }
       },
-      { labelName: "Current Reading Date", labelKey: "Current Reading Date" },
+
       { labelName: "Billing Period", labelKey: "Billing Period" },
-      { labelName: "Status", labelKey: "Status" },
+      {
+        labelName: "Status",
+        labelKey: "Status",
+        options: {
+          filter: false,
+          customBodyRender: (value, tableMeta, updateValue) => {
+            const statusOptions = [
+              "Working",
+              "Locked",
+              "No-meter",
+              "Breakdown",
+              "No_Meter",
+              "Reset",
+              "NULL",
+              "Replacement"
+            ];
+            const currentStatus = value || "";
+            return (
+              <select
+                className="bulk-status-select"
+                style={{ width: "140px", padding: "6px", boxSizing: "border-box" }}
+                value={currentStatus}
+                onChange={e => {
+                  updateValue(e.target.value);
+                }}
+              >
+                <option value="">Select status</option>
+                {statusOptions.map(option => (
+                  <option key={option} value={option}>
+                    {option}
+                  </option>
+                ))}
+              </select>
+            );
+          }
+        }
+      },
       {
         labelName: "Tenant Id",
         labelKey: "TENANT_ID",
@@ -104,20 +151,21 @@ export const searchResults = {
         options: {
           filter: false,
           customBodyRender: (value, tableMeta, updateValue) => {
-            let readingDatenew = tableMeta.rowData && tableMeta.rowData[3] ? tableMeta.rowData[3] : null;
+            let readingDatenew = tableMeta.rowData && tableMeta.rowData[4] ? tableMeta.rowData[4] : null;
             readingDatenew = readingDatenew ? readingDatenew.split("-").reverse().join("/") : null;
             const handleUpdate = async () => {
               const consumerId = tableMeta.rowData && tableMeta.rowData[0];
               const lastReading = Number(tableMeta.rowData && tableMeta.rowData[1]) || 0;
-              const currentReadingRaw = Number(tableMeta.rowData && tableMeta.rowData[2]) || 0;
-              const currentReadingDate = tableMeta.rowData && tableMeta.rowData[4] ? getEpochForDate(tableMeta.rowData[4]) : null;
-              const lastReadingDate = tableMeta.rowData && tableMeta.rowData[4] ? getEpochForDate(tableMeta.rowData[4]) : null;
+              const currentReadingDate = tableMeta.rowData && tableMeta.rowData[2] ? getEpochForDate(tableMeta.rowData[2]) : null;
+              const lastReadingDate = currentReadingDate;
+              const currentReadingRaw = Number(tableMeta.rowData && tableMeta.rowData[3]) || 0;
               const currentReading = Number(currentReadingRaw) || 0;
-              const billingPeriod = readingDatenew ? `${tableMeta.rowData[4]} - ${readingDatenew}` : "";
+              const billingPeriod = readingDatenew ? `${tableMeta.rowData[2]} - ${readingDatenew}` : "";
               const readingDate = readingDatenew ? getEpochForDate(readingDatenew) : null;
-              const status = tableMeta.rowData && tableMeta.rowData[6];
+              const statusSelects = document.querySelectorAll("select.bulk-status-select");
+              const statusFromSelect = statusSelects[tableMeta.rowIndex] && statusSelects[tableMeta.rowIndex].value;
+              const status = statusFromSelect || (tableMeta.rowData && tableMeta.rowData[6]) || "";
               const tenantId = tableMeta.rowData && tableMeta.rowData[7];
-
               if (!currentReadingRaw || !Number.isFinite(currentReading)) {
                 alert("Please enter a numeric Current Reading greater than or equal to Last Reading before updating");
                 return;
@@ -172,7 +220,7 @@ export const searchResults = {
       column: "Date Created",
       sortingFn: (data, i, sortDateOrder) => {
         const epochDates = data.reduce((acc, curr) => {
-          acc.push([...curr, getEpochForDate(curr[4], "dayend")]);
+          acc.push([...curr, getEpochForDate(curr[2], "dayend")]);
           return acc;
         }, []);
         const order = sortDateOrder === "asc" ? true : false;
@@ -199,6 +247,7 @@ export const updateAllReadings = async (state, dispatch) => {
   // read the live values typed in the table inputs
   const readingInputs = document.querySelectorAll("input.bulk-new-reading");
   const dateInputs = document.querySelectorAll("input.bulk-new-reading-date");
+  const statusSelects = document.querySelectorAll("select.bulk-status-select");
 
   for (let i = 0; i < rows.length; i++) {
     const row = rows[i];
@@ -215,11 +264,18 @@ export const updateAllReadings = async (state, dispatch) => {
     const currentReadingRaw = currentReadingRawEl ? currentReadingRawEl.value : "";
     const newReadingDate = newReadingDateEl ? newReadingDateEl.value : "";
 
-    const currentReadingDateDisplay = isArrayRow ? row[4] : row["Current Reading Date"];
-    const lastReadingDate = isArrayRow ? row[4] : row["Current Reading Date"];
-    const status = isArrayRow ? row[6] : row["Status"];
+    const currentReadingDateDisplay = isArrayRow ? row[2] : row["Current Reading Date"];
+    const lastReadingDate = getEpochForDate(currentReadingDateDisplay);
+    const statusFromRow = isArrayRow ? row[6] : row["Status"];
+    const status = statusSelects[i] && statusSelects[i].value ? statusSelects[i].value : statusFromRow;
     const tenantId = isArrayRow ? row[7] : row["TENANT_ID"];
 
+    // only allow bulk update for selected meter statuses
+    const isEditableStatus = ["Working", "Breakdown", "Locked"].includes(status);
+    if (!isEditableStatus) {
+      continue;
+    }
+
     // only take complete rows (both value and date filled)
     if (!currentReadingRaw || !newReadingDate) {
       continue;
@@ -272,9 +328,9 @@ export const updateAllReadings = async (state, dispatch) => {
         currentReadingRaw,
         currentReading,
         billingPeriod,
-        lastReadingDate,
         status,
         readingDate,
+        lastReadingDate,
         tenantId
       );
     } catch (err) {