diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/viewStatementConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/viewStatementConfig.js index 643912dc7a..edfba61f48 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/viewStatementConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/configs/viewStatementConfig.js @@ -42,6 +42,7 @@ export const data = (statementDetails, rawData, oldData) => { : statementDetails?.basicSorDetails.filter((ob) => ob?.type === "M").length != 0 ? statementDetails?.basicSorDetails.filter((ob) => ob?.type === "M")[0]?.amount.toFixed(2) : parseFloat(0).toFixed(2), + amountStyle:{maxWidth:"12%",textAlign:"end"} }, { key: "STATEMENT_LABOUR", @@ -50,6 +51,7 @@ export const data = (statementDetails, rawData, oldData) => { : statementDetails?.basicSorDetails.filter((ob) => ob?.type === "L").length != 0 ? statementDetails?.basicSorDetails.filter((ob) => ob?.type === "L")[0]?.amount.toFixed(2) : parseFloat(0).toFixed(2), + amountStyle:{maxWidth:"12%",textAlign:"end"} }, { key: "STATEMENT_MACHINERY", @@ -58,6 +60,7 @@ export const data = (statementDetails, rawData, oldData) => { : statementDetails?.basicSorDetails.filter((ob) => ob?.type === "E").length != 0 ? statementDetails?.basicSorDetails.filter((ob) => ob?.type === "E")[0]?.amount.toFixed(2) : parseFloat(0).toFixed(2), + amountStyle:{maxWidth:"12%",textAlign:"end"} }, { @@ -67,6 +70,7 @@ export const data = (statementDetails, rawData, oldData) => { return acc + (ob?.additionalDetails?.labourCessAmount || 0); }, 0) || 0 ).toFixed(2), + amountStyle:{maxWidth:"12%",textAlign:"end"} }, ], }, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/ViewAnalysisStatement.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/ViewAnalysisStatement.js index 00ec466413..bffe16c913 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/ViewAnalysisStatement.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/ViewAnalysisStatement.js @@ -319,7 +319,7 @@ const ViewAnalysisStatement = ({ formData, ...props }) => { success={showToast?.success} label={t(showToast?.label)} isDleteBtn={true} - style={{ width: "100%", display: "flex", justifyContent: "space-between", whiteSpace: "nowrap" }} + style={{ width: "100%", display: "flex", justifyContent: "space-between" }} onClose={() => setShowToast(false)} /> )} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/ViewAnalysisStatementPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/ViewAnalysisStatementPage.js index 318220f382..47181ebdc7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/ViewAnalysisStatementPage.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/ViewAnalysisStatementPage.js @@ -445,15 +445,15 @@ const ViewAnalysisStatement = () => { // }, // }; -let InfoCardData = { - "Info": "STATEMENT_ANALYSIS_INFO_LABEL", - "reasons": [ - "STATEMENT_ANALYSIS_INFO_1", - "STATEMENT_ANALYSIS_INFO_2", - "STATEMENT_ANALYSIS_INFO_3", - "STATEMENT_ANALYSIS_INFO_4" - ] -} +// let InfoCardData = { +// "Info": "STATEMENT_ANALYSIS_INFO_LABEL", +// "reasons": [ +// "STATEMENT_ANALYSIS_INFO_1", +// "STATEMENT_ANALYSIS_INFO_2", +// "STATEMENT_ANALYSIS_INFO_3", +// "STATEMENT_ANALYSIS_INFO_4" +// ] +// } const config = data(statement?.[0],statement,oldData); @@ -468,13 +468,7 @@ let InfoCardData = { { downloadStatus&& HandleDownloadPdf()} downloadBtnClassName={"employee-download-btn-className"} label={t("CS_COMMON_DOWNLOAD")} /> }
- -

{t(InfoCardData?.Info)}

- {InfoCardData?.reasons.map((reason, index) => ( -

{t(reason)}

- ))} -
} - /> + {toast?.show && } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/configs/viewUtilConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/configs/viewUtilConfig.js index f64709609c..9ae7beed84 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/configs/viewUtilConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/configs/viewUtilConfig.js @@ -40,6 +40,7 @@ export const data = (statementDetails, rawData,oldData) => { : statementDetails?.basicSorDetails.filter((ob) => ob?.type === "M").length != 0 ? statementDetails?.basicSorDetails.filter((ob) => ob?.type === "M")[0]?.amount.toFixed(2) : parseFloat(0).toFixed(2), + amountStyle:{maxWidth:"12%",textAlign:"end"} }, { key: "STATEMENT_LABOUR", @@ -48,6 +49,7 @@ export const data = (statementDetails, rawData,oldData) => { : statementDetails?.basicSorDetails.filter((ob) => ob?.type === "L").length != 0 ? statementDetails?.basicSorDetails.filter((ob) => ob?.type === "L")[0]?.amount.toFixed(2) : parseFloat(0).toFixed(2), + amountStyle:{maxWidth:"12%",textAlign:"end"} }, { key: "STATEMENT_MACHINERY", @@ -56,6 +58,7 @@ export const data = (statementDetails, rawData,oldData) => { : statementDetails?.basicSorDetails.filter((ob) => ob?.type === "E").length != 0 ? statementDetails?.basicSorDetails.filter((ob) => ob?.type === "E")[0]?.amount.toFixed(2) : parseFloat(0).toFixed(2), + amountStyle:{maxWidth:"12%",textAlign:"end"} }, { @@ -65,6 +68,7 @@ export const data = (statementDetails, rawData,oldData) => { return acc + (ob?.additionalDetails?.labourCessAmount || 0); }, 0) || 0 ).toFixed(2), + amountStyle:{maxWidth:"12%",textAlign:"end"} }, ], }, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/viewUtilization.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/viewUtilization.js index da1ad3bbea..b42dfb639e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/viewUtilization.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/pages/employee/viewUtilization.js @@ -418,15 +418,15 @@ const ViewUtilization = () => { const config = data(statement?.[0], statement,oldData); - let InfoCardData = { - "Info": "STATEMENT_UTILIZATION_INFO_LABEL", - "reasons": [ - "STATEMENT_UTILIZATION_INFO_1", - "STATEMENT_UTILIZATION_INFO_2", - "STATEMENT_UTILIZATION_INFO_3", - "STATEMENT_UTILIZATION_INFO_4" - ] - } + // let InfoCardData = { + // "Info": "STATEMENT_UTILIZATION_INFO_LABEL", + // "reasons": [ + // "STATEMENT_UTILIZATION_INFO_1", + // "STATEMENT_UTILIZATION_INFO_2", + // "STATEMENT_UTILIZATION_INFO_3", + // "STATEMENT_UTILIZATION_INFO_4" + // ] + // } //if (isProjectLoading || isDetailedEstimateLoading | isDetailedEstimatesLoading) return ; const HandleDownloadPdf = () => { @@ -446,13 +446,7 @@ const ViewUtilization = () => { {downloadStatus&& HandleDownloadPdf()} downloadBtnClassName={"employee-download-btn-className"} label={t("CS_COMMON_DOWNLOAD")} />}
- -

{t(InfoCardData?.Info)}

- {InfoCardData?.reasons.map((reason, index) => ( -

{t(reason)}

- ))} -
} - /> + {toast?.show && ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/src/components/SORDetailsTemplate.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/src/components/SORDetailsTemplate.js index baa3c1f484..504cf30d9e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/src/components/SORDetailsTemplate.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/src/components/SORDetailsTemplate.js @@ -84,7 +84,7 @@ const SORDetailsTemplate = (props) => { const errorContainerStyles = { display: "block", height: "1rem", overflow: "hidden" }; const columns = [ - { label: t("RA_SNO"), key: "sno" }, + //{ label: t("RA_SNO"), key: "sno" }, { label: t("RA_CODE"), key: "sorCode" }, { label: t("RA_NAME"), key: "description" }, { label: t("RA_UOM"), key: "uom" }, @@ -126,19 +126,19 @@ const SORDetailsTemplate = (props) => { const getStyles = (index) => { let obj = {}; switch (index) { + // case 1: + // obj = { width: "1rem" }; + // break; case 1: - obj = { width: "1rem" }; - break; - case 2: obj = { width: "8rem" }; break; - case 3: + case 2: obj = { width: "70rem" }; break; - case 4: + case 3: obj = { width: "10rem" }; break; - case 5: + case 4: obj = pageType === "VIEW" ? { width: "15rem", textAlign: "right" } : { width: "15rem" }; break; case 6: @@ -198,7 +198,7 @@ const SORDetailsTemplate = (props) => { )} - +
{/*SORDetails?.filter((ob) => ob?.sorType === props?.config?.sorType).length > 0 && diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/renderUtils.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/renderUtils.js index 3f0080341b..dfb017415d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/renderUtils.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/renderUtils.js @@ -41,9 +41,9 @@ export const RenderDataSection = ({ section }) => { /* privacy object set to the Row Component */ privacy={row?.value?.privacy} rowContainerStyle={{}} - textStyle={row?.textStyle} + textStyle={{}} labelStyle={{}} - amountStyle={{}} + amountStyle={row?.amountStyle || {}} /> ); })}