Merge pull request #754 from odisha-muktasoft/AUDIT-FIXES-1

audit-fixes-1
odisha-muktasoft · Oct 23, 2024 · eac9ad3 · eac9ad3
2 parents 11d18e0 + 92e88c2
commit eac9ad3
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 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
@@ -15,7 +15,7 @@
     "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@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",

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
@@ -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;
 }
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
@@ -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
@@ -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
@@ -51,7 +51,6 @@
             padding: 8px;
             --text-opacity: 1;
             color: #C84C0E;
-            color: rgba(244, 119, 56, var(--text-opacity));
         }
     }
 }
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.14",
+  "version": "0.4.15",
   "description": "Attendence Management Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/...nals/packages/modules/AttendenceMgmt/src/pages/employee/viewAttendance/ViewAttendances.js b/...nals/packages/modules/AttendenceMgmt/src/pages/employee/viewAttendance/ViewAttendances.js
@@ -83,7 +83,7 @@ const ViewAttendance = () => {
   return (
     <React.Fragment>
       <div className={"employee-application-details"} style={{ marginBottom: "24px",alignItems:"center" }}>
-        <Header styles={{}} className="works-header-view">{showEditTitle ? t("ATM_EDIT_ATTENDENCE") : t("ATM_VIEW_ATTENDENCE")}</Header>
+        <Header styles={{}} className={`works-header-view ${showEditTitle ? "" : "works_attendance_view"}`}>{showEditTitle ? t("ATM_EDIT_ATTENDENCE") : t("ATM_VIEW_ATTENDENCE")}</Header>
         {/* <MultiLink
          onHeadClick={() => HandleDownloadPdf()}
          downloadBtnClassName={"employee-download-btn-className"}

diff --git a/...b/micro-ui-internals/packages/modules/Expenditure/src/components/CreateBill/MBDetailes.js b/...b/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 (
-    <div style={{ marginBottom: "2rem" }}>
+    <div>
       {/* {!isMeasurementLoading && allMeasurementsIds && !(allMeasurementsIds?.length > 0) && <CitizenInfoLabel textStyle={{color:"#505A5F"}} fill={"#D4351C"} style={{marginBottom:"2rem", maxWidth:"40%",backgroundColor:"#EFC7C1"}} info={t("WORKS_PB_INFO")} text={t("WORKS_INFO_MB_NOT_CREATED")} />} */}
       {!isMeasurementLoading && allMeasurementsIds && !(allMeasurementsIds?.length > 0) && (
         <InfoCard

diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
@@ -22,7 +22,7 @@
     "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@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",