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 index 2ee5d6a58d8..b9ab05a3814 100644 --- 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 @@ -1191,6 +1191,6 @@ tbody { color: #C5C5C5 !important; } -.back-button-xlsxpreview{ +.back-button-xlsxpreview { width: 170px; } \ No newline at end of file diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js index 7c04a1b4084..088efd48620 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js @@ -358,7 +358,7 @@ const FormulaConfigWrapper = ({ onSelect, props: customProps }) => { -
+
@@ -373,7 +373,7 @@ const FormulaConfigWrapper = ({ onSelect, props: customProps }) => {
-
+
!deletedFormulas?.includes(item.output))} diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js index 794a6a369fd..b3fb823d8d0 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, Fragment, useContext, useRef } from "react"; import { useTranslation } from "react-i18next"; -import { Card, Header, DeleteIconv2, LabelFieldPair, AddIcon, Button, CardText } from "@egovernments/digit-ui-react-components"; -import { Dropdown, CheckBox, PopUp } from "@egovernments/digit-ui-components"; +import { Header, DeleteIconv2, LabelFieldPair, AddIcon, CardText } from "@egovernments/digit-ui-react-components"; +import { Dropdown, CheckBox, PopUp, Card, Button, Divider } from "@egovernments/digit-ui-components"; import { PRIMARY_COLOR } from "../utils/utilities"; import { useFormulaContext } from "./FormulaConfigWrapper"; import _ from "lodash"; @@ -28,7 +28,7 @@ const FormulaConfiguration = ({ onSelect, category, customProps, formulas: initi setFormulas(initialFormulas); }, [initialFormulas]); - const handleDeleteClick = (index,formula) => { + const handleDeleteClick = (index, formula) => { setFormulaToDelete(formula); setShowPopUp(true); }; @@ -43,7 +43,7 @@ const FormulaConfiguration = ({ onSelect, category, customProps, formulas: initi //matching output for deleting a formula const updatedFormulas = formulas.filter(operation => { - if(operation.output === formulaToDelete.output){ + if (operation.output === formulaToDelete.output) { return false } return true @@ -70,27 +70,27 @@ const FormulaConfiguration = ({ onSelect, category, customProps, formulas: initi //now basically check whether this is getting used in any of the input or assumptionValue //if yes clear that const updatedFormulaValues = prevValues?.map(formula => { - if(formula.input === deletedFormulaOutput && formula.assumptionValue === deletedFormulaOutput){ + if (formula.input === deletedFormulaOutput && formula.assumptionValue === deletedFormulaOutput) { const updatedFormulaObj = { ...formula, - input:"", - assumptionValue:"" + input: "", + assumptionValue: "" } return updatedFormulaObj } - else if(formula.input === deletedFormulaOutput ){ + else if (formula.input === deletedFormulaOutput) { const updatedFormulaObj = { ...formula, - input:"" + input: "" } return updatedFormulaObj - }else if(formula.assumptionValue === deletedFormulaOutput){ + } else if (formula.assumptionValue === deletedFormulaOutput) { const updatedFormulaObj = { ...formula, - assumptionValue:"" + assumptionValue: "" } return updatedFormulaObj - } else{ + } else { return formula } }) @@ -135,8 +135,8 @@ const FormulaConfiguration = ({ onSelect, category, customProps, formulas: initi return ( <> - -
{t(category)}
+ +
{t(category)}

{t(`Please configure the formula with respect to the assumptions considered for resource estimation`)}

@@ -161,89 +161,84 @@ const FormulaConfiguration = ({ onSelect, category, customProps, formulas: initi ] return ( <> - - - {`${t(formula.output)}`} -
=
- { - handleFormulaChange(formula.output, "input", value, category); - }} - selected={() => ({ code: formula.input })} - optionKey="code" - showToolTip={true} - style={{ width: "20rem" }} - /> +
+ + + {`${t(formula.output)}`} +
=
+ { + handleFormulaChange(formula.output, "input", value, category); + }} + selected={() => ({ code: formula.input })} + optionKey="code" + showToolTip={true} + style={{ width: "20rem" }} + /> + + ({ + code: operator.operatorCode, + label: operator.operatorName, + }))} + select={(value) => { + handleFormulaChange(formula.output, "operatorName", { code: value.label }, category); + }} + selected={() => ({ label: formula.operatorName })} + optionKey="label" + showToolTip={true} + style={{ width: "10rem" }} + /> + { + handleFormulaChange(formula.output, "assumptionValue", value, category); + }} + selected={() => ({ code: formula.assumptionValue })} + optionKey="code" + showToolTip={true} + style={{ width: "15rem" }} + /> +
- ({ - code: operator.operatorCode, - label: operator.operatorName, - }))} - select={(value) => { - handleFormulaChange(formula.output, "operatorName", {code:value.label}, category); - }} - selected={() => ({ label: formula.operatorName })} - optionKey="label" - showToolTip={true} - style={{ width: "10rem" }} - /> - { - handleFormulaChange(formula.output, "assumptionValue", value, category); - }} - selected={() => ({ code: formula.assumptionValue })} - optionKey="code" - showToolTip={true} - style={{ width: "15rem" }} - /> -
@@ -530,7 +538,7 @@ function RoleTableComposer({ nationalRoles }) { data={HrmsData?.data} pagination progressPending={isLoading || isHrmsLoading} - progressComponent={} + progressComponent={} paginationServer paginationTotalRows={totalRows} customStyles={tableCustomStyle} diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/TableSearchBar.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/TableSearchBar.js index 51681512e96..c71f5d022a9 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/TableSearchBar.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/TableSearchBar.js @@ -2,14 +2,14 @@ import React, { useState } from 'react'; import { useTranslation } from "react-i18next"; import PropTypes from 'prop-types'; -const TableSearchField = ({ onSearch}) => { +const TableSearchField = ({ onSearch }) => { const { t } = useTranslation(); const [query, setQuery] = useState(''); const handleInputChange = (e) => { const newQuery = e.target.value; setQuery(newQuery); - onSearch(newQuery); + onSearch(newQuery); }; return ( @@ -51,7 +51,7 @@ const styles = { width: '100%', padding: '8px 40px 8px 12px', // Adds space on the right for the icon border: '1px solid #ccc', - borderRadius: '4px', + borderRadius: '0px', outline: 'none', fontSize: '16px', boxSizing: 'border-box', @@ -66,7 +66,7 @@ const styles = { }; TableSearchField.propTypes = { - onSearch: PropTypes.func.isRequired, - }; + onSearch: PropTypes.func.isRequired, +}; export default TableSearchField; diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js index 3170bab30a7..42145854632 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js @@ -230,8 +230,8 @@ function UserAccess({ category, setData, nationalRoles }) { return ( <> - -
{t(category)}
+ +
{t(category)}

{t(`${category}_DESCRIPTION`)}

@@ -283,8 +283,8 @@ function UserAccess({ category, setData, nationalRoles }) { type={"default"} heading={t(`${category}_POPUP_HEADING`)} children={[]} - onOverlayClick={() => {}} - footerChildren={[