fixed assumption audit fixes (#1758)

egovernments · Nov 6, 2024 · be26161 · be26161
1 parent a3d07f5
commit be26161
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/health/micro-ui/web/micro-ui-internals/example/public/index.html b/health/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -12,7 +12,7 @@
   <title>DIGIT</title>
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.49/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.39/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.24/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.25/dist/index.css" />
 
   <!-- added below css for hcm-workbench module inclusion-->
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.41/dist/index.css" /> -->

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/package.json b/health/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-health-css",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss
@@ -2553,6 +2553,7 @@ $border-color: rgba(214, 213, 212, 1);
   display: flex;
   align-items: flex-start;
   margin: 0rem;
+  gap: 1.5rem;
 }
 
 .mp-hypothesis-label-field>div>span {
@@ -2569,16 +2570,20 @@ $border-color: rgba(214, 213, 212, 1);
 
 .fieldv1-deleteIcon-container {
   display: flex;
-  justify-content: center;
+  justify-content: flex-start;
   align-items: center;
-  width: 30rem !important;
+  width: 60% !important;
+
+  .digit-field{
+    min-width: 25rem !important;
+  }
 }
 
 .assumption-label {
   display: flex;
   flex-wrap: wrap;
   align-items: center;
-  width: 30rem;
+  width: 40%;
 }
 
 .kpi-container {

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/formulaConfig.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/formulaConfig.scss
@@ -1,6 +1,7 @@
 .formula-label-field{
     display: flex;
     gap:1.5rem;
+    align-items: center;
   }
   .equals-icon {
     font-family: 'Roboto Condensed';  /* Set font family */
@@ -20,6 +21,8 @@
     font-size: 1.2rem;
     margin-right: 2rem;
     font-weight: bold;
+
+    margin-top: 0.25rem;
   }
 
 /* styles.css */

diff --git a/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BulkUpload.js b/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BulkUpload.js
@@ -7,6 +7,7 @@ import XlsPreview from "./XlsPreview";
 import { PRIMARY_COLOR } from "../utils";
 import { Toast } from "@egovernments/digit-ui-components";
 import { CustomSVG } from "@egovernments/digit-ui-components";
+import { Button as ButtonNew } from "@egovernments/digit-ui-components";
 
 
 /**
@@ -147,24 +148,26 @@ const BulkUpload = ({ multiple = true, onSubmit, fileData, onFileDelete, onFileD
           <div style={{ marginLeft: "0.5rem", color: "#505A5F", fontWeight: "700" }}>{file.filename}</div>
         </div>
         <div className="delete-and-download-button">
-          <Button
+          <ButtonNew
             label={t("WBH_DOWNLOAD")}
             variation="secondary"
-            icon={<DownloadIcon styles={{ height: "1.25rem", width: "1.25rem" }} fill={PRIMARY_COLOR} />}
+            // icon={<DownloadIcon styles={{ height: "1.25rem", width: "1.25rem" }} fill={PRIMARY_COLOR} />}
             type="button"
-            className="workbench-download-template-btn hover"
-            onButtonClick={(e) => {
+            icon={"DownloadIcon"}
+            // className="workbench-download-template-btn hover"
+            onClick={(e) => {
               e.stopPropagation();
               handleFileDownload(e, fileUrl);
             }}
           />
-          <Button
+          <ButtonNew
             label={t("WBH_DELETE")}
             variation="secondary"
-            icon={<DeleteIconv2 styles={{ height: "1.25rem", width: "2.5rem" }} fill={PRIMARY_COLOR} />}
+            // icon={<DeleteIconv2 styles={{ height: "1.25rem", width: "2.5rem" }} fill={PRIMARY_COLOR} />}
             type="button"
-            className="workbench-download-template-btn hover"
-            onButtonClick={(e) => {
+            icon={"Delete"}
+            // className="workbench-download-template-btn hover"
+            onClick={(e) => {
               e.stopPropagation();
               handleFileDelete(file, index);
               setShowPreview(false);

diff --git a/health/micro-ui/web/public/index.html b/health/micro-ui/web/public/index.html
@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.49/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.39/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.24/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.25/dist/index.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT HCM</title>