From 92e88c27f37625092d45b799aa42059c146738ef Mon Sep 17 00:00:00 2001 From: Swathi-eGov Date: Wed, 23 Oct 2024 15:00:09 +0530 Subject: [PATCH] audit-fixes-1 --- .../micro-ui/web/micro-ui-internals/example/package.json | 4 ++-- .../packages/css/src/components/estimate.scss | 8 ++++---- .../web/micro-ui-internals/packages/css/src/index.scss | 4 ++++ .../packages/css/src/pages/employee/index.scss | 3 ++- .../packages/css/src/pages/works/InboxLinks.scss | 1 - .../packages/modules/AttendenceMgmt/package.json | 2 +- .../src/pages/employee/viewAttendance/ViewAttendances.js | 2 +- .../packages/modules/Expenditure/package.json | 2 +- .../Expenditure/src/components/CreateBill/MBDetailes.js | 2 +- frontend/micro-ui/web/package.json | 4 ++-- 10 files changed, 18 insertions(+), 14 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 index e9174a9129..8c70005080 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -15,13 +15,13 @@ "@egovernments/digit-ui-module-core": "1.8.2-beta.24", "@egovernments/digit-ui-module-hrms": "1.5.26", "@egovernments/digit-ui-module-dss": "1.5.52", - "@egovernments/digit-ui-module-attendencemgmt": "0.4.14", + "@egovernments/digit-ui-module-attendencemgmt": "0.4.15", "@egovernments/digit-ui-module-contracts": "0.4.15", "@egovernments/digit-ui-module-measurement":"0.2.18", "@egovernments/digit-ui-module-estimate": "0.4.21", "@egovernments/digit-ui-module-masters": "0.4.20", "@egovernments/digit-ui-module-project": "0.4.16", - "@egovernments/digit-ui-module-expenditure": "0.4.20", + "@egovernments/digit-ui-module-expenditure": "0.4.21", "@egovernments/digit-ui-customisation-mukta": "0.2.13", "@egovernments/digit-ui-module-rate-analysis": "0.4.16", "http-proxy-middleware": "^1.0.5", 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 index 9c011dc404..49e7de13c8 100644 --- 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 @@ -78,8 +78,8 @@ border: 3px solid; width: 15%; padding: 10px 15px; - border-color: rgb(244, 119, 56); - color: rgb(244, 119, 56) !important; + border-color: #C84C0E; + color: #C84C0E !important; font-size: 16px; } @@ -100,7 +100,7 @@ border: 1px solid; width: 15%; padding: 10px 15px; - border-color: rgb(244, 119, 56); - color: rgb(244, 119, 56) !important; + border-color: #C84C0E; + color: #C84C0E !important; font-size: 16px; } \ No newline at end of file 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 index 89792f0eb9..0a49ad4fb4 100644 --- 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 @@ -1098,6 +1098,10 @@ input[type="number"] { &.works-header-view { font-size: 36px; } + + &.works_attendance_view{ + margin-bottom: 0px; + } } .submit-bar header { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss index 8fd0d1996c..a4dca368f8 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss @@ -354,7 +354,8 @@ } .link { - @apply text-primary-main cursor-pointer; + @apply cursor-pointer; + color: #C84C0E !important; :hover { @apply text-primary-dark; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/InboxLinks.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/InboxLinks.scss index ecf3d47e77..c0a2960728 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/InboxLinks.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/InboxLinks.scss @@ -51,7 +51,6 @@ padding: 8px; --text-opacity: 1; color: #C84C0E; - color: rgba(244, 119, 56, var(--text-opacity)); } } } \ No newline at end of file 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 index 5dc3ace1d1..af3942b500 100644 --- 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.14", + "version": "0.4.15", "description": "Attendence Management Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/viewAttendance/ViewAttendances.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/viewAttendance/ViewAttendances.js index b1cde7e20d..4df4cc6e42 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/viewAttendance/ViewAttendances.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pages/employee/viewAttendance/ViewAttendances.js @@ -83,7 +83,7 @@ const ViewAttendance = () => { return (
-
{showEditTitle ? t("ATM_EDIT_ATTENDENCE") : t("ATM_VIEW_ATTENDENCE")}
+
{showEditTitle ? t("ATM_EDIT_ATTENDENCE") : t("ATM_VIEW_ATTENDENCE")}
{/* HandleDownloadPdf()} downloadBtnClassName={"employee-download-btn-className"} 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 index d6fb26d8d5..73418b5200 100644 --- 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.20", + "version": "0.4.21", "description": "Expenditure Management Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/components/CreateBill/MBDetailes.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/components/CreateBill/MBDetailes.js index c7c17a848e..2da49d441d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/components/CreateBill/MBDetailes.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/components/CreateBill/MBDetailes.js @@ -49,7 +49,7 @@ const MBDetailes = ({ formdata }) => { let rowStyle = window?.location.href.includes("create-purchase-bill") ? {marginRight:"9%"} : {} return ( -
+
{/* {!isMeasurementLoading && allMeasurementsIds && !(allMeasurementsIds?.length > 0) && } */} {!isMeasurementLoading && allMeasurementsIds && !(allMeasurementsIds?.length > 0) && (