updated master data + bugs related to master data (#1497)

egovernments · Oct 10, 2024 · c78d6f0 · c78d6f0
1 parent b82b6fc
commit c78d6f0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/...-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/SetupMicroplanConfig.js b/...-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/SetupMicroplanConfig.js
@@ -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"
+ // },
  customProps: {
  module: "HCM",
  sessionData: totalFormData,

diff --git a/...ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js b/...ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js
@@ -238,7 +238,7 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
  <React.Fragment>
  <Stepper
  customSteps={[
- "HCM_CAMPAIGN_SETUP_DETAILS",
+ "MP_CAMPAIGN_SETUP_DETAILS",
  "MICROPLAN_DETAILS",
  "MP_BOUNDARY_SELECTION",
  "MP_MANAGING_DATA",
@@ -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" }}>

diff --git a/...th/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/index.js b/...th/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/index.js
@@ -42,7 +42,7 @@ const App = ({ path, stateCode, userType, tenants,BOUNDARY_HIERARCHY_TYPE, hiera
  "hcm-microplanning",
  [
  { name: "MicroplanNamingConvention" },
- { name: "MicroplanNamingRegx" },
+ { name: "MicroplanNamingRegex" },
  { name: "ResourceDistributionStrategy"},
  { name: "HypothesisAssumptions"},
  { name: "RuleConfigureOutput" },

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/utils/utilities.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/utils/utilities.js
@@ -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);
  return namePattern.test(name);
  }