Merge pull request #672 from odisha-muktasoft/ui-ux-fixes

updated versions
odisha-muktasoft · Sep 19, 2024 · fd15507 · fd15507
2 parents 1160f09 + 1ad7a14
commit fd15507
Show file tree

Hide file tree

Showing 36 changed files with 400 additions and 332 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.37",
-    "@egovernments/digit-ui-libraries": "1.5.0",
+    "@egovernments/digit-ui-components": "0.0.2-beta.40",
+    "@egovernments/digit-ui-libraries": "1.5.1",
     "@egovernments/digit-ui-module-core": "1.8.2-beta.10",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
-    "@egovernments/digit-ui-module-attendencemgmt": "0.4.6",
-    "@egovernments/digit-ui-module-contracts": "0.4.6",
-    "@egovernments/digit-ui-module-measurement":"0.2.3",
-    "@egovernments/digit-ui-module-estimate": "0.4.9",
-    "@egovernments/digit-ui-module-masters": "0.4.8",
-    "@egovernments/digit-ui-module-project": "0.4.6",
-    "@egovernments/digit-ui-module-expenditure": "0.4.4",
-    "@egovernments/digit-ui-customisation-mukta": "0.2.4",
-    "@egovernments/digit-ui-module-rate-analysis": "0.4.4",
+    "@egovernments/digit-ui-module-attendencemgmt": "0.4.7",
+    "@egovernments/digit-ui-module-contracts": "0.4.7",
+    "@egovernments/digit-ui-module-measurement":"0.2.4",
+    "@egovernments/digit-ui-module-estimate": "0.4.10",
+    "@egovernments/digit-ui-module-masters": "0.4.9",
+    "@egovernments/digit-ui-module-project": "0.4.7",
+    "@egovernments/digit-ui-module-expenditure": "0.4.5",
+    "@egovernments/digit-ui-customisation-mukta": "0.2.5",
+    "@egovernments/digit-ui-module-rate-analysis": "0.4.5",
     "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].30/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].34/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.4",
+    "version": "0.2.5",
     "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.37",
+      "@egovernments/digit-ui-components": "0.0.2-beta.40",
       "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.45",
+  "version": "0.2.46",
   "license": "MIT",
   "author": "Jagankumar <[email protected]>",
   "main": "dist/index.css",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss
@@ -123,4 +123,30 @@
   }
   .msb-sidebar{
     z-index: 1000;
-  }
+  }
+
+  .digit-header-content{
+    &.label{
+      font-family: theme(digitv2.fontFamily.sans);
+      font-style: theme(digitv2.fontStyle.normal);
+      font-weight: theme(digitv2.fontWeight.regular);
+      line-height: theme(digitv2.lineHeight.lineheight2);
+
+      @media (max-aspect-ratio: 9/16) {
+        /* Media query for mobile */
+        font-size: theme(digitv2.fontSize.label.mobile);
+      }
+
+      @media (min-aspect-ratio: 9/16) and (max-aspect-ratio: 3/4) {
+        /* Media query for tablets */
+        font-size: theme(digitv2.fontSize.label.tablet);
+      }
+
+      @media (min-aspect-ratio: 3/4) {
+        /* Media query for desktop */
+        font-size: theme(digitv2.fontSize.label.desktop);
+      }
+    }
+  }
+
+
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
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-libraries",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
   "source": "src/index.js",
@@ -23,6 +23,7 @@
     "react-scripts": "^4.0.1"
   },
   "dependencies": {
+    "@egovernments/digit-ui-components": "0.0.2-beta.40",
     "axios": "1.4.0",
     "babel-preset-react": "6.24.1",
     "lodash": "^4.17.21",

diff --git a/...end/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/statusBasedNavigation.js b/...end/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/statusBasedNavigation.js
@@ -1,6 +1,7 @@
 import React from "react";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
+import { Button} from "@egovernments/digit-ui-components";
 
 export const statusBasedNavigation = ( status, contractOrProjectNumber, measurementOrEstimateNumber, tenantId, value, mode = "MEASUREMENT", businessId ) => {
     const { t } = useTranslation();
@@ -34,7 +35,15 @@ export const statusBasedNavigation = ( status, contractOrProjectNumber, measurem
 
     return (
         <Link to={linkTo}>
-            {value ? value : t("ES_COMMON_NA")}
+            <Button
+                className=""
+                iconFill=""
+                label={value ? value : t("ES_COMMON_NA")}
+                size="medium"
+                style={{ padding: "0px" }}
+                title=""
+                variation="link"
+              />
         </Link>
     );
 };
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.6",
+  "version": "0.4.7",
   "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.37",
+    "@egovernments/digit-ui-components": "0.0.2-beta.40",
     "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.6",
+    "version": "0.4.7",
     "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.37",
+      "@egovernments/digit-ui-components": "0.0.2-beta.40",
       "lodash": "^4.17.21",
       "react": "17.0.2",
       "react-date-range": "^1.4.0",

diff --git a/...b/micro-ui-internals/packages/modules/Contracts/src/configs/createWorkOrderConfigMUKTA.js b/...b/micro-ui-internals/packages/modules/Contracts/src/configs/createWorkOrderConfigMUKTA.js
@@ -88,9 +88,9 @@ const createWorkOrderConfigMUKTA = ({defaultValues, documents, officerInCharge,
                   optionsKey: "name",
                   error: "WORKS_REQUIRED_ERR",
                   required: false,
-                  optionsCustomStyle: {
-                    top: "2.5rem"
-                  },
+                  // optionsCustomStyle: {
+                  //   top: "2.5rem"
+                  // },
                   options : nameOfCBO
                 }
               },
@@ -117,9 +117,9 @@ const createWorkOrderConfigMUKTA = ({defaultValues, documents, officerInCharge,
                   optionsKey: "name",
                   error: "WORKS_REQUIRED_ERR",
                   required: false,
-                  optionsCustomStyle: {
-                    top: "2.5rem"
-                  },
+                  // optionsCustomStyle: {
+                  //   top: "2.5rem"
+                  // },
                   mdmsConfig: {
                     masterName: "CBORoles",
                     moduleName: "works",
@@ -138,9 +138,9 @@ const createWorkOrderConfigMUKTA = ({defaultValues, documents, officerInCharge,
                   optionsKey: "name",
                   error: "WORKS_REQUIRED_ERR",
                   required: false,
-                  optionsCustomStyle: {
-                    top: "2.5rem"
-                  },
+                  // optionsCustomStyle: {
+                  //   top: "2.5rem"
+                  // },
                   options : officerInCharge
                 }
               },

diff --git a/...micro-ui-internals/packages/modules/Contracts/src/configs/createWorkOrderConfigMUKTA.json b/...micro-ui-internals/packages/modules/Contracts/src/configs/createWorkOrderConfigMUKTA.json
@@ -105,9 +105,6 @@
                     "optionsKey": "name",
                     "error": "WORKS_REQUIRED_ERR",
                     "required": false,
-                    "optionsCustomStyle": {
-                      "top": "2.5rem"
-                    },
                     "options": []
                   }
                 },
@@ -139,9 +136,6 @@
                     "optionsKey": "name",
                     "error": "WORKS_REQUIRED_ERR",
                     "required": false,
-                    "optionsCustomStyle": {
-                      "top": "2.5rem"
-                    },
                     "options" : []
                   }
                 },
@@ -161,9 +155,6 @@
                     "optionsKey": "name",
                     "error": "WORKS_REQUIRED_ERR",
                     "required": false,
-                    "optionsCustomStyle": {
-                      "top": "2.5rem"
-                    },
                     "options": []
                   }
                 },

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.9",
+    "version": "0.4.10",
     "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.37",
+      "@egovernments/digit-ui-components": "0.0.2-beta.40",
       "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/configs/inboxConfigMukta.js b/...micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/inboxConfigMukta.js
@@ -77,9 +77,9 @@ const inboxConfigMukta = () => {
               populators: {
                 name: "projectType",
                 optionsKey: "name",
-                optionsCustomStyle: {
-                  top: "2.3rem",
-                },
+                // optionsCustomStyle: {
+                //   top: "2.3rem",
+                // },
                 mdmsConfig: {
                   masterName: "ProjectType",
                   moduleName: "works",
@@ -223,9 +223,9 @@ const inboxConfigMukta = () => {
               isMandatory: false,
               disable: false,
               populators: {
-                optionsCustomStyle: {
-                  top: "2.3rem",
-                },
+                // optionsCustomStyle: {
+                //   top: "2.3rem",
+                // },
                 name: "ward",
                 type: "ward",
                 optionsKey: "i18nKey",

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.4",
+    "version": "0.4.5",
     "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.37",
+      "@egovernments/digit-ui-components": "0.0.2-beta.40",
       "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/Expenditure/src/configs/CreatePAWMSConfig.js b/...o-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/CreatePAWMSConfig.js
@@ -50,9 +50,9 @@ export const CreatePAWMSConfig = {
                   "type": "ward",
                   "optionsKey": "i18nKey",
                   "allowMultiSelect": false,
-                  "optionsCustomStyle": {
-                    "top": "2.3rem"
-                  }
+                  // "optionsCustomStyle": {
+                  //   "top": "2.3rem"
+                  // }
                 }
               },
               {
@@ -63,9 +63,9 @@ export const CreatePAWMSConfig = {
                 "populators": {
                   "name": "billType",
                   "optionsKey": "name",
-                  "optionsCustomStyle": {
-                    "top": "2.3rem"
-                  },
+                  // "optionsCustomStyle": {
+                  //   "top": "2.3rem"
+                  // },
                   "mdmsConfig": {
                     "masterName": "BusinessService",
                     "moduleName": "expense",
@@ -113,9 +113,9 @@ export const CreatePAWMSConfig = {
                 "isMandatory": false,
                 "disable": false,
                 "populators": {
-                  "optionsCustomStyle": {
-                    "top": "2.3rem"
-                  },
+                  // "optionsCustomStyle": {
+                  //   "top": "2.3rem"
+                  // },
                   "name": "status",
                   "optionsKey": "i18nKey",
                   "allowMultiSelect": false,

diff --git a/...cro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/InboxBillConfig.js b/...cro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/InboxBillConfig.js
@@ -84,9 +84,9 @@ export const InboxBillConfig = {
                   "populators": {
                     "name": "billType",
                     "optionsKey": "name",
-                    "optionsCustomStyle": {
-                      "top": "2.3rem"
-                    },
+                    // "optionsCustomStyle": {
+                    //   "top": "2.3rem"
+                    // },
                     "mdmsConfig": {
                       "masterName": "BusinessService",
                       "moduleName": "expense",

diff --git a/...-ui-internals/packages/modules/Expenditure/src/configs/createPurchaseBillConfigMUKTA.json b/...-ui-internals/packages/modules/Expenditure/src/configs/createPurchaseBillConfigMUKTA.json
@@ -109,9 +109,6 @@
                       "name": "invoiceDetails_organisationType",
                       "optionsKey": "name",
                       "error": "WORKS_REQUIRED_ERR",
-                      "optionsCustomStyle": {
-                          "top": "2.3rem"
-                      },
                       "options": []
                   }
                 },
@@ -130,9 +127,6 @@
                       "name": "invoiceDetails_vendor",
                       "optionsKey": "name",
                       "error": "WORKS_REQUIRED_ERR",
-                      "optionsCustomStyle": {
-                          "top": "2.3rem"
-                      },
                       "options": []
                   }
                 },

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