Feature/bug (#1773)

* z-index and camapaign-name in preview * ui-ux-demo-review * version updates * ver * Update ViewHierarchy.js --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>
egovernments · Nov 7, 2024 · 2cecab5 · 2cecab5
1 parent a5d7c67
commit 2cecab5
Show file tree

Hide file tree

Showing 21 changed files with 309 additions and 223 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.27/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.28/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.27",
+  "version": "0.1.28",
   "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/pages/employee/checklist.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/checklist.scss
@@ -334,7 +334,7 @@
 
 /* Header styling */
 .mobile-header h2 {
-    color: #555;
+    color: #000000;
     font-size: 0.875rem;
     /* 14px */
     margin-bottom: 0.3125rem;
@@ -351,6 +351,7 @@
     font-weight: theme(digitv2.fontWeight.bold);
     padding: 0 0.3125rem;
     font-size: larger;
+    font-family: 'Roboto Condensed', sans-serif;
     /* 0 to 5px */
 }
 
@@ -379,6 +380,7 @@
 .mobile-question {
     font-weight: theme(digitv2.fontWeight.bold);
     font-size: 0.875rem;
+    color: #000000;
     /* 14px */
 }
 
@@ -398,7 +400,7 @@
 }
 
 .mandatory-asterisk {
-    color: #c84c0e;
+    color: #B91900;
     margin-left: 4px;
     /* Adjust spacing between the question number and asterisk */
 }

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -77,6 +77,7 @@
 .mandatory-span {
   font-size: 1rem;
   font-weight: 700;
+  color: #c84c0e !important;
 }
 
 .digit-employee-card-input.numeric {
@@ -435,7 +436,7 @@ tbody {
 .add-new-product-container {
   border: 1px solid #d6d5d4;
   background-color: #fafafa;
-  width: 70%;
+  width: 100%;
   padding-top: 0;
 
   .heading-bar {
@@ -464,6 +465,7 @@ tbody {
 
 .page-padding-fix {
   margin-top: 1.5rem;
+  padding: 1.5rem;
 }
 
 .addProductActionClass {

diff --git a/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/AddProductField.js b/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/AddProductField.js
@@ -63,6 +63,7 @@ const AddProductField = ({ onSelect }) => {
         {t(`HCM_CAMPAIGN_ADD_NEW_PRODUCT_DESCRIPTION_PRE_TEXT`)} <b> {t(`HCM_CAMPAIGN_ADD_NEW_PRODUCT_DESCRIPTION_BOLD_TEXT`)} </b>
         {t(`HCM_CAMPAIGN_ADD_NEW_PRODUCT_DESCRIPTION_POST_TEXT`)}
       </p>
+      <div style={{height:"1.5rem"}}></div>
       {productFieldData?.map((field, index) => {
         return (
           <Card className="add-new-product-container">
@@ -101,7 +102,7 @@ const AddProductField = ({ onSelect }) => {
               />
             </LabelFieldPair>
             <LabelFieldPair>
-              <div className="product-label-field" style={{ alignSelf: "flex-start", marginTop: "1rem" }}>
+              <div className="product-label-field" style={{position: "relative", top: "-1rem"}}>
                 <span>{`${t("HCM_PRODUCT_TYPE")}`}</span>
                 <span className="mandatory-span">*</span>
               </div>

diff --git a/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/Checkboxes.js b/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/Checkboxes.js
@@ -30,7 +30,8 @@ const Checkboxes = ({
   addComment,
   handleOptionComment,
   typeOfCall,
-  parentNumber
+  parentNumber,
+  questionNumber
 }) => {
   let dis = typeOfCall === "view" ? true : false;
   return (
@@ -90,16 +91,16 @@ const Checkboxes = ({
           }
         </>
       ))}
-      {!dis && <div>
+      {!dis && <div style={{marginTop: "0.8rem"}}>
         <Button
           // className="custom-class"
           icon="AddIcon"
           iconFill=""
-          label={t("ADD_OPTIONS")}
+          label={`${t("ADD_OPTIONS")} ${questionNumber}`}
           onClick={() => addOption()}
           size="medium"
           title=""
-          variation="teritiary"
+          variation="link"
           textStyles={{ width: 'unset' }}
         />
       </div>}
@@ -178,7 +179,7 @@ const CheckBoxOption = ({
             disabled={dis}
             ref={optionInputRef}
             type="text"
-            value={title}
+            value={t(title)}
             onChange={(ev) => updateOption({ value: ev.target.value, id: index })}
             onBlur={() => setIsFocused(false)}
             onFocus={() => setIsFocused(true)}
@@ -250,7 +251,7 @@ const CheckBoxOption = ({
               iconFill=""
               label={t(`DELETE`)}
               onClick={() => removeOption(index)}
-              size=""
+              size="medium"
               style={{}}
               title=""
               variation="link"