Merge pull request #693 from odisha-muktasoft/UCEM-949

Ucem 949
odisha-muktasoft · Oct 9, 2024 · da67c1a · da67c1a
2 parents bf6bfbb + 8c00cc7
commit da67c1a
Show file tree

Hide file tree

Showing 44 changed files with 125 additions and 107 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -10,20 +10,20 @@
   },
   "devDependencies": {
     "@egovernments/digit-ui-react-components": "1.5.12",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.45",
     "@egovernments/digit-ui-libraries": "1.5.0",
     "@egovernments/digit-ui-module-core": "1.8.2-beta.20",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
-    "@egovernments/digit-ui-module-attendencemgmt": "0.4.10",
-    "@egovernments/digit-ui-module-contracts": "0.4.10",
-    "@egovernments/digit-ui-module-measurement":"0.2.10",
-    "@egovernments/digit-ui-module-estimate": "0.4.15",
-    "@egovernments/digit-ui-module-masters": "0.4.14",
-    "@egovernments/digit-ui-module-project": "0.4.10",
-    "@egovernments/digit-ui-module-expenditure": "0.4.8",
-    "@egovernments/digit-ui-customisation-mukta": "0.2.7",
-    "@egovernments/digit-ui-module-rate-analysis": "0.4.8",
+    "@egovernments/digit-ui-module-attendencemgmt": "0.4.11",
+    "@egovernments/digit-ui-module-contracts": "0.4.11",
+    "@egovernments/digit-ui-module-measurement":"0.2.11",
+    "@egovernments/digit-ui-module-estimate": "0.4.16",
+    "@egovernments/digit-ui-module-masters": "0.4.15",
+    "@egovernments/digit-ui-module-project": "0.4.11",
+    "@egovernments/digit-ui-module-expenditure": "0.4.9",
+    "@egovernments/digit-ui-customisation-mukta": "0.2.8",
+    "@egovernments/digit-ui-module-rate-analysis": "0.4.9",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-customisation-mukta",
-    "version": "0.2.7",
+    "version": "0.2.8",
     "description": "MUKTA Customisation of Works UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",
@@ -19,7 +19,7 @@
     },
     "dependencies": {
       "@egovernments/digit-ui-react-components": "^1.5.0",
-      "@egovernments/digit-ui-components": "0.0.2-beta.44",
+      "@egovernments/digit-ui-components": "0.0.2-beta.45",
       "react": "17.0.2",
       "react-date-range": "^1.4.0",
       "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-works-css",
-  "version": "0.2.51",
+  "version": "0.2.52",
   "license": "MIT",
   "author": "Jagankumar <[email protected]>",
   "main": "dist/index.css",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/searchSor.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/searchSor.scss
@@ -13,7 +13,7 @@ ul.suggestions-sor {
     padding: 0;
     margin: 0;
     position: absolute;
-    width: 205%;
+    width: 100%;
     background-color: #fff;
     border: 1px solid #ccc;
     border-top: none;

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/index.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/index.scss
@@ -992,6 +992,13 @@ input[type="number"] {
   background-color: #fff;
 }
 
+.fc-header-texts-new{
+  color: #000 !important;
+  display: flex;
+  border: none !important;
+  background-color: #ffffff !important;
+}
+
 .fc-paragraph {
   text-align: justify;
   padding-left: 9px;

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json
@@ -23,7 +23,7 @@
     "react-scripts": "^4.0.1"
   },
   "dependencies": {
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.45",
     "axios": "1.4.0",
     "babel-preset-react": "6.24.1",
     "lodash": "^4.17.21",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-attendencemgmt",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "description": "Attendence Management Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-react-components": "^1.5.0",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.45",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-contracts",
-    "version": "0.4.10",
+    "version": "0.4.11",
     "description": "Contracts Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",
@@ -19,7 +19,7 @@
     },
     "dependencies": {
       "@egovernments/digit-ui-react-components": "^1.5.0",
-      "@egovernments/digit-ui-components": "0.0.2-beta.44",
+      "@egovernments/digit-ui-components": "0.0.2-beta.45",
       "lodash": "^4.17.21",
       "react": "17.0.2",
       "react-date-range": "^1.4.0",

diff --git a/...o-ui/web/micro-ui-internals/packages/modules/Contracts/src/components/ViewEstimateDocs.js b/...o-ui/web/micro-ui-internals/packages/modules/Contracts/src/components/ViewEstimateDocs.js
@@ -36,7 +36,7 @@ function ViewEstimateDocs(props) {
         {documents?.map((document, index) => (
             <React.Fragment key={index}>
             {/* {document?.title ? <CardSubHeader style={{ marginTop: "32px", marginBottom: "8px", color: "#505A5F", fontSize: "24px" }}>{t(document?.title)}</CardSubHeader>: null} */}
-            {document?.title ? <TextBlock subHeader={t(document?.title)} subHeaderClasName={"view-subheader"}></TextBlock> : null}
+            {document?.title ? <TextBlock subHeader={t(document?.title)} subHeaderClassName={"view-subheader"}></TextBlock> : null}
             <div style={{ display: "flex", flexWrap: "wrap", justifyContent: "flex-start" }}>
                 {document?.values && document?.values.length>0 ? document?.values?.map((value, index) => (
                 <a target="_" href={pdfFiles[value.fileStoreId]?.split(",")[0]} style={{ minWidth: "80px", marginRight: "10px", maxWidth: "100px", height: "auto" }} key={index}>

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-estimate",
-  "version": "0.4.15",
+  "version": "0.4.16",
   "description": "Estimate Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-react-components": "^1.5.0",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.45",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
     "react-dom": "17.0.2",

diff --git a/...i/web/micro-ui-internals/packages/modules/Estimate/src/components/OverheadDetailsTable.js b/...i/web/micro-ui-internals/packages/modules/Estimate/src/components/OverheadDetailsTable.js
@@ -162,7 +162,7 @@ const OverheadDetailsTable = ({ data }) => {
               ></Amount>
             }
           </CardSectionHeader> */}
-          <TextBlock subHeader={`${t("WORKS_TABLE_TOTAL_AMOUNT")} :`} subHeaderClasName={"table_total_amount"}></TextBlock>
+          <TextBlock subHeader={`${t("WORKS_TABLE_TOTAL_AMOUNT")} :`} subHeaderClassName={"table_total_amount"}></TextBlock>
           <TextBlock
             subHeader={
               <Amount
@@ -174,7 +174,7 @@ const OverheadDetailsTable = ({ data }) => {
                 rupeeSymbol={true}
               ></Amount>
             }
-            subHeaderClasName={"table_total_amount_value"}
+            subHeaderClassName={"table_total_amount_value"}
           ></TextBlock>
         </div>
       </div>

diff --git a/...-ui/web/micro-ui-internals/packages/modules/Estimate/src/components/ViewTotalEstAmount.js b/...-ui/web/micro-ui-internals/packages/modules/Estimate/src/components/ViewTotalEstAmount.js
@@ -17,7 +17,7 @@ const ViewTotalEstAmount = ({ detail, ...props }) => {
 
         <TextBlock
           subHeader={detail?.showTitle ? t(detail?.showTitle) : t("TOTAL_EST_AMOUNT")}
-          subHeaderClasName={`table_total_amount ${"estimate_amount"}`}
+          subHeaderClassName={`table_total_amount ${"estimate_amount"}`}
         ></TextBlock>
         <TextBlock
           subHeader={
@@ -32,7 +32,7 @@ const ViewTotalEstAmount = ({ detail, ...props }) => {
                   2
                 )}`
           }
-          subHeaderClasName={`table_total_amount_value ${"estimate_amount"}`}
+          subHeaderClassName={`table_total_amount_value ${"estimate_amount"}`}
         ></TextBlock>
       </div>
     </div>

diff --git a/...-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/OverheadsTable.js b/...-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/OverheadsTable.js
@@ -447,7 +447,7 @@ const OverheadsTable = ({ control, watch, ...props }) => {
               }
             </CardSectionHeader> */}
 
-            <TextBlock subHeader={`${t("WORKS_TABLE_TOTAL_AMOUNT")} :`} subHeaderClasName={"table_total_amount"}></TextBlock>
+            <TextBlock subHeader={`${t("WORKS_TABLE_TOTAL_AMOUNT")} :`} subHeaderClassName={"table_total_amount"}></TextBlock>
             <TextBlock
               subHeader={
                 <Amount
@@ -468,7 +468,7 @@ const OverheadsTable = ({ control, watch, ...props }) => {
                   sameDisplay={true}
                 ></Amount>
               }
-              subHeaderClasName={"table_total_amount_value"}
+              subHeaderClassName={"table_total_amount_value"}
             ></TextBlock>
           </div>
         </div>

diff --git a/...-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/TotalEstAmount.js b/...-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/TotalEstAmount.js
@@ -42,11 +42,11 @@ const TotalEstAmount = ({ formData, setValue, t, ...props }) => {
 
         <TextBlock
           subHeader={window.location.href.includes("/estimate/") ? t("TOTAL_CREATE_EST_AMOUNT") : t("TOTAL_EST_AMOUNT")}
-          subHeaderClasName={`table_total_amount ${"estimate_amount"}`}
+          subHeaderClassName={`table_total_amount ${"estimate_amount"}`}
         ></TextBlock>
         <TextBlock
           subHeader={`₹ ${Digit.Utils.dss.formatterWithoutRound(Math.round(getTotalAmount), "number")}.00`}
-          subHeaderClasName={`table_total_amount_value ${"estimate_amount"}`}
+          subHeaderClassName={`table_total_amount_value ${"estimate_amount"}`}
         ></TextBlock>
       </div>
     </div>

diff --git a/...b/micro-ui-internals/packages/modules/Estimate/src/pages/employee/ViewDetailedEstimate.js b/...b/micro-ui-internals/packages/modules/Estimate/src/pages/employee/ViewDetailedEstimate.js
@@ -128,7 +128,7 @@ const ViewDetailedEstimate = () => {
   const handleActionBar = (option) => {
     if(validationData && Object.keys(validationData)?.length > 0 && validationData?.type?.includes(option?.name))
     {
-      setToast({typa: validationData?.error ? "error" : "", label: validationData?.label, show:true})
+      setToast({type: validationData?.error ? "error" : "", label: validationData?.label, show:true})
       return;
     }
     if (option?.name === "CREATE_CONTRACT") {

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-expenditure",
-    "version": "0.4.8",
+    "version": "0.4.9",
     "description": "Expenditure Management Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",
@@ -19,7 +19,7 @@
     },
     "dependencies": {
       "@egovernments/digit-ui-react-components": "^1.5.0",
-      "@egovernments/digit-ui-components": "0.0.2-beta.44",
+      "@egovernments/digit-ui-components": "0.0.2-beta.45",
       "lodash": "^4.17.21",
       "react": "17.0.2",
       "react-date-range": "^1.4.0",

diff --git a/...micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/components/PayableAmt.js b/...micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/components/PayableAmt.js
@@ -11,8 +11,8 @@ const PayableAmt = ({ detail }) => {
         {/* <CardSectionHeader style={{ fontSize: "18px", marginRight: "1rem", marginBottom: "0px", color: "#505A5F",width:"fit-content" }}>{t("EXP_NET_PAYABLE")}</CardSectionHeader>
             <CardSectionHeader style={{ marginBottom: "0px" ,width:"fit-content"}}>{`₹ ${detail?.value}`}</CardSectionHeader> */}
 
-        <TextBlock subHeader={t("EXP_NET_PAYABLE")} subHeaderClasName={`table_total_amount`}></TextBlock>
-        <TextBlock subHeader={`₹ ${detail?.value}`} subHeaderClasName={`table_total_amount_value`}></TextBlock>
+        <TextBlock subHeader={t("EXP_NET_PAYABLE")} subHeaderClassName={`table_total_amount`}></TextBlock>
+        <TextBlock subHeader={`₹ ${detail?.value}`} subHeaderClassName={`table_total_amount_value`}></TextBlock>
       </div>
     </div>
   );

diff --git a/...-ui-internals/packages/modules/Expenditure/src/configs/createPurchaseBillConfigMUKTA.json b/...-ui-internals/packages/modules/Expenditure/src/configs/createPurchaseBillConfigMUKTA.json
@@ -35,43 +35,47 @@
                   "isMandatory": false,
                   "key": "basicDetails_workOrderNumber",
                   "type": "text",
-                  "disable": true,
+                  "disable": false,
                   "populators": {
                     "name": "basicDetails_workOrderNumber",
-                    "customClass": "fc-header-texts"
+                    "customClass": "fc-header-texts-new",
+                    "nonEditable":true
                   }
                 },
                 {
                   "label": "WORKS_PROJECT_ID",
                   "isMandatory": false,
                   "key": "basicDetails_projectID",
                   "type": "text",
-                  "disable": true,
+                  "disable": false,
                   "populators": {
                     "name": "basicDetails_projectID",
-                    "customClass": "fc-header-texts"
+                    "customClass": "fc-header-texts-new",
+                    "nonEditable":true
                   }
                 },
                 {
                   "label": "PROJECTS_DESCRIPTION",
                   "isMandatory": false,
                   "key": "basicDetails_projectDesc",
                   "type": "text",
-                  "disable": true,
+                  "disable": false,
                   "populators": {
                     "name": "basicDetails_projectDesc",
-                    "customClass": "fc-header-texts"
+                    "customClass": "fc-header-texts-new",
+                    "nonEditable":true
                   }
                 },
                 {
                   "label": "ES_COMMON_LOCATION",
                   "isMandatory": false,
                   "key": "basicDetails_location",
                   "type": "text",
-                  "disable": true,
+                  "disable": false,
                   "populators": {
                     "name": "basicDetails_location",
-                    "customClass": "fc-header-texts"
+                    "customClass": "fc-header-texts-new",
+                    "nonEditable":true
                   }
                 }
               ]
@@ -246,7 +250,7 @@
                   },
                   "populators": {
                     "name": "billDetails_billAmt",
-                    "customClass": "fc-header-texts",
+                    "customClass": "fc-header-texts-new",
                     "error": "EXP_BILL_AMOUNT_ERR"
                   }
                 },

diff --git a/...web/micro-ui-internals/packages/modules/Expenditure/src/pageComponents/TotalBillAmount.js b/...web/micro-ui-internals/packages/modules/Expenditure/src/pageComponents/TotalBillAmount.js
@@ -33,10 +33,10 @@ const TotalBillAmount = ({ formData, setValue, ...props }) => {
         {/* <CardSectionHeader
           style={{ marginBottom: "0px", fontFamily: "Roboto", fontSize: "28px", fontWeight: 700, lineHeight: "32.81px", textAlign: "left" }}
         >{`₹ ${Digit.Utils.dss.formatterWithoutRound(getTotalAmount, "number")}`}</CardSectionHeader> */}
-        <TextBlock subHeader={t("EXP_NET_PAYABLE")} subHeaderClasName={"table_total_amount"}></TextBlock>
+        <TextBlock subHeader={t("EXP_NET_PAYABLE")} subHeaderClassName={"table_total_amount"}></TextBlock>
         <TextBlock
           subHeader={`₹ ${Digit.Utils.dss.formatterWithoutRound(getTotalAmount, "number")}`}
-          subHeaderClasName={`table_total_amount_value`}
+          subHeaderClassName={`table_total_amount_value`}
         ></TextBlock>
       </div>
     </div>

diff --git a/...micro-ui-internals/packages/modules/Expenditure/src/pageComponents/ViewTotalBillAmount.js b/...micro-ui-internals/packages/modules/Expenditure/src/pageComponents/ViewTotalBillAmount.js
@@ -13,8 +13,8 @@ const TotalBillAmountView = ({ detail, ...props }) => {
         </CardSectionHeader>
         <CardSectionHeader style={{ marginBottom: "0px",width:"fit-content" }}>{`₹ ${detail?.value}`}</CardSectionHeader> */}
 
-        <TextBlock subHeader={detail?.key ? t(detail.key) : t("RT_TOTAL")} subHeaderClasName={"table_total_amount"}></TextBlock>
-        <TextBlock subHeader={`₹ ${detail?.value}`} subHeaderClasName={`table_total_amount_value`}></TextBlock>
+        <TextBlock subHeader={detail?.key ? t(detail.key) : t("RT_TOTAL")} subHeaderClassName={"table_total_amount"}></TextBlock>
+        <TextBlock subHeader={`₹ ${detail?.value}`} subHeaderClassName={`table_total_amount_value`}></TextBlock>
       </div>
     </div>
   );

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-masters",
-    "version": "0.4.14",
+    "version": "0.4.15",
     "description": "Masters Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",
@@ -19,7 +19,7 @@
     },
     "dependencies": {
         "@egovernments/digit-ui-react-components": "^1.5.0",
-        "@egovernments/digit-ui-components": "0.0.2-beta.44",
+        "@egovernments/digit-ui-components": "0.0.2-beta.45",
         "lodash": "^4.17.21",
         "react": "17.0.2",
         "react-date-range": "^1.4.0",

diff --git a/...nternals/packages/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/index.js b/...nternals/packages/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/index.js
@@ -42,7 +42,7 @@ const ModifyWageSeeker = () => {
 
     //Call Search Wage Seeker
     const payload = {
-        Individual: { individualId }
+        Individual: { individualId : [individualId] }
     }
     const searchParams = { offset: 0, limit: 100 }
     const {isLoading: wageSeekerDataFetching, data: wageSeekerData, isError, isSuccess, error} = Digit.Hooks.wageSeeker.useWageSeekerDetails({tenantId, data: payload, searchParams, config:{

diff --git a/...cro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js b/...cro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js
@@ -19,7 +19,7 @@ const ViewWageSeeker = () => {
 
   const payload = {
     Individual: {
-      individualId
+      individualId: [individualId]
     }
   }
   const searchParams = {

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-measurement",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "Measurement Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-react-components": "^1.5.0",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.45",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
     "react-dom": "17.0.2",