Merge pull request #690 from odisha-muktasoft/UCEM-920

ui-ux fixes
odisha-muktasoft · Oct 8, 2024 · 29abab6 · 29abab6
2 parents 8ccc3c5 + 49bd7ca
commit 29abab6
Show file tree

Hide file tree

Showing 30 changed files with 198 additions and 129 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.43",
+    "@egovernments/digit-ui-components": "0.0.2-beta.44",
     "@egovernments/digit-ui-libraries": "1.5.0",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.19",
+    "@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.9",
-    "@egovernments/digit-ui-module-contracts": "0.4.8",
-    "@egovernments/digit-ui-module-measurement":"0.2.8",
-    "@egovernments/digit-ui-module-estimate": "0.4.14",
-    "@egovernments/digit-ui-module-masters": "0.4.13",
-    "@egovernments/digit-ui-module-project": "0.4.9",
-    "@egovernments/digit-ui-module-expenditure": "0.4.6",
-    "@egovernments/digit-ui-customisation-mukta": "0.2.6",
-    "@egovernments/digit-ui-module-rate-analysis": "0.4.6",
+    "@egovernments/digit-ui-module-attendencemgmt": "0.4.10",
+    "@egovernments/digit-ui-module-contracts": "0.4.9",
+    "@egovernments/digit-ui-module-measurement":"0.2.9",
+    "@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.7",
+    "@egovernments/digit-ui-customisation-mukta": "0.2.7",
+    "@egovernments/digit-ui-module-rate-analysis": "0.4.7",
     "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/example/public/index.html b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -11,7 +11,7 @@
   <meta name="theme-color" content="#00bcd1" />
   <title>MUKTASoft</title>
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].36/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].37/dist/index.css" />
 
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
   <!-- <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigsWorks.js"></script> -->

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.6",
+    "version": "0.2.7",
     "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.43",
+      "@egovernments/digit-ui-components": "0.0.2-beta.44",
       "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.50",
+  "version": "0.2.51",
   "license": "MIT",
   "author": "Jagankumar <[email protected]>",
   "main": "dist/index.css",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/estimate.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/estimate.scss
@@ -1,5 +1,5 @@
 .sor-dropdowns {
-  margin-top: 10px;
+  margin-top: 24px;
   width: 70%;
   display: flex;
   justify-content: space-between;
@@ -20,26 +20,46 @@
 
 .search-sor-container {
   display: flex;
-  width: 69.25%; /* make it 69.25*/
+  width: 70%; /* make it 69.25*/
   justify-content: space-between;
   flex-wrap: wrap;
 }
 
 .search-sor-button {
   display: flex;
+  flex: 1;
   flex-direction: row;
-  justify-content: space-around;
+  justify-content: space-between;
+  gap: 24px;
+  flex-wrap: wrap;
+
+  @media (min-aspect-ratio: 9/16) and (max-aspect-ratio: 3/4)  {
+    /* Media query for tablets */
+    max-width: 27.5rem;
+  }
+
+  @media (max-aspect-ratio: 9/16) {
+    /* Media query for mobile */
+    max-width: 100%;
+    width: 100%;
+  }
+
+  @media (min-aspect-ratio: 3/4) {
+    /* Media query for desktop */
+    max-width: 37.5rem;
+  }
 }
 .search-sor-label {
   margin-top: 26px;
+  max-width: 20%;
+  width: 20%;
 }
 
 .add-sor-button {
   padding: 10px 50px 10px 50px;
   margin-top: 20px;
   width: 8.625rem; /*width: 8.625rem;*/ 
   height: 2.5rem;
-  margin-left : 158px /*158*/
 }
 
 .search-sor-input {

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/measurement.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/measurement.scss
@@ -57,7 +57,6 @@
   margin: 10px;
   box-shadow: none;
   padding: 8px 35px 8px 35px;
-  border-radius: 8px;
 }
 
 .done-button,

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
@@ -2,10 +2,10 @@
 
 .search-bar-sor {
     position: relative;
-    width: 300px;
     /* Set your desired width */
-    margin: 20px;
     margin-bottom: 0px;
+    flex: 1;
+    flex-shrink: 0;
 }
 
 ul.suggestions-sor {

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.43",
+    "@egovernments/digit-ui-components": "0.0.2-beta.44",
     "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.9",
+  "version": "0.4.10",
   "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.43",
+    "@egovernments/digit-ui-components": "0.0.2-beta.44",
     "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.8",
+    "version": "0.4.9",
     "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.43",
+      "@egovernments/digit-ui-components": "0.0.2-beta.44",
       "lodash": "^4.17.21",
       "react": "17.0.2",
       "react-date-range": "^1.4.0",

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.14",
+  "version": "0.4.15",
   "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.43",
+    "@egovernments/digit-ui-components": "0.0.2-beta.44",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
     "react-dom": "17.0.2",

diff --git a/...micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/SearchBar.js b/...micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/SearchBar.js
@@ -1,6 +1,7 @@
-import { TextInput } from "@egovernments/digit-ui-react-components";
+// import { TextInput } from "@egovernments/digit-ui-react-components";
 import React, { useState, useEffect, useRef } from "react";
 import { useTranslation } from "react-i18next";
+import {TextInput } from "@egovernments/digit-ui-components";
 
 const SearchBar = (props) => {
   const { t } = useTranslation();
@@ -82,21 +83,23 @@ const SearchBar = (props) => {
   };
 
   return (
-    <div className={"search-bar-sor"} ref={menuRef}>
-      <TextInput type="text" name={"Search"} placeholder={props?.placeholder ? props?.placeholder : "Type any SOR description..."} value={inputValue} onChange={handleInputChange} customClass="search-sor-input"/>
+    <div className={"search-bar-sor"} style={{marginTop:"24px"}} ref={menuRef}>
+      <TextInput
+        type="text"
+        name={"Search"}
+        placeholder={props?.placeholder ? props?.placeholder : "Type any SOR description..."}
+        value={inputValue}
+        onChange={handleInputChange}
+        // customClass="search-sor-input"
+      />
       {suggestions?.length > 0 && (
-      <ul
-        className="suggestions-sor" style={{zIndex:"10", maxHeight:"33rem", overflow:"auto"}}
-      >
-        {suggestions.map((option) => (
-          <li
-            key={option.id}
-            onClick={() => handleSelectOption(option)}
-          >
-            {option.description}
-          </li>
-        ))}
-      </ul>
+        <ul className="suggestions-sor" style={{ zIndex: "10", maxHeight: "33rem", overflow: "auto" }}>
+          {suggestions.map((option) => (
+            <li key={option.id} onClick={() => handleSelectOption(option)}>
+              {option.description}
+            </li>
+          ))}
+        </ul>
       )}
     </div>
   );

diff --git a/...micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchSor.js b/...micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchSor.js
@@ -183,6 +183,7 @@ const searchSor = (props) => {
         label={t("ESTIMATE_ADD_LABEL")}
         onClick={buttonClick}
         className={"add-sor-button"}
+        style={{marginTop:"24px"}}
       />
       </div>
       </div>

diff --git a/...-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchTemplate.js b/...-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchTemplate.js
@@ -1,7 +1,7 @@
-import { TextInput } from "@egovernments/digit-ui-react-components";
+// import { TextInput } from "@egovernments/digit-ui-react-components";
 import React, { useEffect, useState, useCallback, useRef } from "react";
 import { useTranslation } from "react-i18next";
-import {Toast,Button } from "@egovernments/digit-ui-components";
+import {Toast,Button,TextInput } from "@egovernments/digit-ui-components";
 
 const fetchSorDetails = async (inputDATA) => {
  //method to fetch the data for estimate template
@@ -363,14 +363,14 @@ const searchTemplate = (props) => {
      <div className="search-sor-container">
        <span className="search-sor-label">{t("ESTIMATE_SEARCH_TEMPLATE_LABEL")}</span>
        <div className="search-sor-button">
-         <div className={"search-bar-sor"} style={{ margin: "20px 1.4rem 0" }} ref={menuRef}>
+         <div className={"search-bar-sor"} style={{ margin:"0px", marginTop: "20px", width:"unset" ,flex:1,maxWidth:"37.5rem"}} ref={menuRef}>
            <TextInput
              type="text"
              name={"Search"}
              placeholder={t("SEARCH_TEMPLATE_HINT")}
              value={inputValue}
              onChange={handleSearchTextChange}
-             customClass="search-sor-input"
+            //  customClass="search-sor-input"
            />
            {suggestions?.length > 0 && (
              <ul className="suggestions-sor" style={{ zIndex: "21", maxHeight: "33rem", overflow: "auto" }}>
@@ -382,7 +382,7 @@ const searchTemplate = (props) => {
              </ul>
            )}
          </div>
-         <Button label={t("ESTIMATE_ADD_LABEL")} onClick={buttonClick} className={"add-sor-button"} />
+         <Button label={t("ESTIMATE_ADD_LABEL")} onClick={buttonClick} className={"add-sor-button"}/>
        </div>
      </div>
      {showToast?.show && (

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.6",
+    "version": "0.4.7",
     "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.43",
+      "@egovernments/digit-ui-components": "0.0.2-beta.44",
       "lodash": "^4.17.21",
       "react": "17.0.2",
       "react-date-range": "^1.4.0",

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.13",
+    "version": "0.4.14",
     "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.43",
+        "@egovernments/digit-ui-components": "0.0.2-beta.44",
         "lodash": "^4.17.21",
         "react": "17.0.2",
         "react-date-range": "^1.4.0",

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.8",
+  "version": "0.2.9",
   "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.43",
+    "@egovernments/digit-ui-components": "0.0.2-beta.44",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
     "react-dom": "17.0.2",

diff --git a/...cro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MeasureTable.js b/...cro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MeasureTable.js
@@ -336,7 +336,8 @@ const MeasureTable = (props) => {
                                     fontSize: "medium",
                                     bottom : "100%",
                                     overflow : "auto",
-
+                                    left:"100%",
+                                    marginLeft:"0px"
                                 }}>
                                     {row.description}
                                 </span>}

diff --git a/...cro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/ViewOnlyCard.js b/...cro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/ViewOnlyCard.js
@@ -16,7 +16,7 @@ const ViewOnlyCard = (props) => {
     SOR?.reduce((acc, item) => acc + parseFloat(item?.amount), 0) + NONSOR?.reduce((acc, item) => acc + parseFloat(item?.amount), 0) || 0;
 
   return (
-    <div style={{ display: "flex", justifyContent: "flex-end", marginTop: props?.mode === "VIEW" ? "-4rem" : "2rem" }}>
+    <div style={{ display: "flex", justifyContent: "flex-end", marginTop: props?.mode === "VIEW" ? "-4rem" : "0rem" ,...style}}>
       <div className="total_amount_wrapper">
         {/* <CardSectionHeader style={{ marginRight: "1rem", marginBottom: "0px", color: "#505A5F", fontSize: "18px",width:"fit-content" }}>
           {t("MB_AMOUNT_TOTAL")}

diff --git a/...eb/micro-ui-internals/packages/modules/Measurement/src/configs/MeasurementCreateConfig.js b/...eb/micro-ui-internals/packages/modules/Measurement/src/configs/MeasurementCreateConfig.js
@@ -197,6 +197,7 @@ export const CreateConfig = ({ defaultValue, measurement, mbnumber }) => {
           {
             head: "",
             subHead: "",
+            sectionClassName:"viewstatement-viewamount-wrapper-create",
             body: [
               {
                 type: "component",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-project",
-    "version": "0.4.9",
+    "version": "0.4.10",
     "description": "Project 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.43",
+        "@egovernments/digit-ui-components": "0.0.2-beta.44",
         "lodash": "^4.17.21",
         "react": "17.0.2",
         "react-date-range": "^1.4.0",