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

Jump to bottom

updated master data + bugs related to master data #1497

Merged
merged 1 commit into from
Oct 10, 2024
Merged

updated master data + bugs related to master data #1497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions ...-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/SetupMicroplanConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ export const MicroplanConfig = (totalFormData, dataParams, isSubmitting, summary
component: "CampaignDetails",
withoutLabel: true,
disable: false,
showPopupOnSubmission: {
alertMessage: "ALERT_MESSAGE_CAMPAIGN",
alertHeader: "ALERT_HEADER_CAMPAIGN"
},
// showPopupOnSubmission: {
// alertMessage: "ALERT_MESSAGE_CAMPAIGN",
// alertHeader: "ALERT_HEADER_CAMPAIGN"
// },
nipunarora-eGov marked this conversation as resolved.
Show resolved Hide resolved
customProps: {
module: "HCM",
sessionData: totalFormData,
Expand Down
6 changes: 3 additions & 3 deletions ...ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
<React.Fragment>
<Stepper
customSteps={[
"HCM_CAMPAIGN_SETUP_DETAILS",
"MP_CAMPAIGN_SETUP_DETAILS",
nipunarora-eGov marked this conversation as resolved.
Show resolved Hide resolved
"MICROPLAN_DETAILS",
"MP_BOUNDARY_SELECTION",
"MP_MANAGING_DATA",
Expand All @@ -259,13 +259,13 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
})}
onSubmit={onSubmit}
showSecondaryLabel={true}
secondaryLabel={t("HCM_BACK")}
secondaryLabel={t("MP_BACK")}
actionClassName={"actionBarClass"}
className="setup-campaign"
cardClassName="setup-campaign-card"
noCardStyle={true}
onSecondayActionClick={onSecondayActionClick}
label={t("HCM_NEXT")}
label={t("MP_NEXT")}
/>
{/* {actionBar === "true" && (
<ActionBar style={{ zIndex: "19" }}>
Expand Down
2 changes: 1 addition & 1 deletion ...th/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const App = ({ path, stateCode, userType, tenants,BOUNDARY_HIERARCHY_TYPE, hiera
"hcm-microplanning",
[
{ name: "MicroplanNamingConvention" },
{ name: "MicroplanNamingRegx" },
{ name: "MicroplanNamingRegex" },
nipunarora-eGov marked this conversation as resolved.
Show resolved Hide resolved
{ name: "ResourceDistributionStrategy"},
{ name: "HypothesisAssumptions"},
{ name: "RuleConfigureOutput" },
Expand Down
4 changes: 2 additions & 2 deletions health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/utils/utilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ const formValidator = (formData, key, state) => {

const microplanDetailsValidator = () => {
function validateName(name) {
const microplanNamingRegxString = state?.MicroplanNamingRegx?.[0]?.data;
const namePattern = new RegExp(microplanNamingRegxString);
const microplanNamingRegexString = state?.MicroplanNamingRegex?.[0]?.data;
const namePattern = new RegExp(microplanNamingRegexString);
nipunarora-eGov marked this conversation as resolved.
Show resolved Hide resolved
return namePattern.test(name);
}

Expand Down