Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEATURE/HCMPRE-0112: Mandatory Sign for assumptions and Formula Screen #2281

Open
wants to merge 5 commits into
base: console
Choose a base branch
from
Open

FEATURE/HCMPRE-0112: Mandatory Sign for assumptions and Formula Screen #2281

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a71670
Preview for summary screen
abishekTa-egov Mar 18, 2025
37b8308
mandatory sign
abishekTa-egov Mar 18, 2025
8a592d9
Merge branch 'console' into BUGFIX/HCMPRE-0112
nipunarora-eGov Mar 18, 2025
48c5926
custom formulas should not be mandatory
abishekTa-egov Mar 19, 2025
4950cee
Merge branch 'BUGFIX/HCMPRE-0112' of https://github.com/egovernments/…
abishekTa-egov Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/DataMgmtComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ export const DataMgmtComponent = ({ customProps, setupCompleted }) => {
}} // Passing the download function
status="completed"
rowDetails={item}



/>
)

Expand Down
1 change: 0 additions & 1 deletion ...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FileComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ const FileComponent = ({ title, fileName, status, auditDetails, editHandler, del
Digit.Utils.campaign.downloadExcelWithCustomName({ fileStoreId: file?.filestoreId, customName: fileNameWithoutExtension });
}
};

return (
<Card type="secondary">
<div className="dm-parent-container" style={{ background: "#FAFAFA", margin: "0" }}>
Expand Down
1 change: 1 addition & 0 deletions .../web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ const FormulaConfiguration = ({ onSelect, category, customProps, formulas: initi
<LabelFieldPair className="formula-label-field">
<span className="assumption-label-icon-wrapper">
<span className="assumption-label-icon-wrapper-label">{`${t(formula.output)}`}</span>
<span className="mandatory-span">*</span>
{category === "CAMPAIGN_VEHICLES" || formula?.source === "CUSTOM" ? null : (
<span className="icon-wrapper">
<TooltipWrapper
Expand Down
4 changes: 2 additions & 2 deletions ...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ const Hypothesis = ({ category, assumptions: initialAssumptions, setShowToast, a
<div className="assumption-label">
<span className="assumption-label-icon-wrapper">
<span className="assumption-label-icon-wrapper-label">{`${t(item)}`}</span>
{/* {category === "CAMPAIGN_VEHICLES" || sourceCheck === "CUSTOM" ? null : <span className="mandatory-span">*</span>} */}
{category === "CAMPAIGN_VEHICLES" || sourceCheck === "CUSTOM" ? null : <span className="mandatory-span">*</span>}
{category === "CAMPAIGN_VEHICLES" || sourceCheck === "CUSTOM" ? null : (
<span className="icon-wrapper">
<TooltipWrapper
Expand All @@ -172,7 +172,7 @@ const Hypothesis = ({ category, assumptions: initialAssumptions, setShowToast, a
</span>
)}
</span>
</div>
</div>

<div className="fieldv1-deleteIcon-container">
<FieldV1
Expand Down