+
{/* Only render LabelFieldPair if resultArray has items */}
{resultArray.length > 0 && (
-
+
handleDropdownChange("status", value)} // Function to handle selection
/>
)}
+
+
+
+ handleDropdownChange("onRoadCondition", value)}
+ t={t}
+ disabled={false}
+ />
+
+
+
+
+ handleDropdownChange("terrain", value)}
+ t={t}
+ disabled={false}
+ />
+
+
+
+ {state.securityQuestions.map((item, index) => {
+ // Transform item.values into an array of objects
+ const options = item.values.map((value) => ({
+ code: value,
+ name: value,
+ active: true,
+ }));
+
+ return (
+
+
+ handleDropdownChange(`securityQ${index + 1}`, value)} // Handle selection
+ t={(key) => key} // Translation function (you can replace as needed)
+ disabled={false}
+ />
+
+ );
+ })}
+
);
@@ -97,4 +174,4 @@ InboxFilterWrapper.defaultProps = {
optionsKey: "name",
};
-export default InboxFilterWrapper;
+export default InboxFilterWrapper;
\ No newline at end of file
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
index 8b657392351..67fa5fec1bb 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
@@ -33,7 +33,7 @@ const PlanInbox = () => {
const [hierarchyLevel, setHierarchyLevel] = useState("");
const [censusData, setCensusData] = useState([]);
const [boundaries, setBoundaries] = useState([]);
- const [selectedFilter, setSelectedFilter] = useState(null);
+ const [selectedFilter, setSelectedFilter] = useState({status:null,onRoadCondition:null,terrain:null,securityQ1:null,securityQ2:null});
const [activeFilter, setActiveFilter] = useState({});
const [actionBarPopUp, setactionBarPopUp] = useState(false);
const [selectedRows, setSelectedRows] = useState([]);
@@ -120,7 +120,7 @@ const PlanInbox = () => {
};
useEffect(() => {
- if (selectedFilter === "VALIDATED") {
+ if (selectedFilter?.status === "VALIDATED") {
setActiveLink({ code: "", name: "" });
setShowTab(false);
} else {
@@ -132,7 +132,7 @@ const PlanInbox = () => {
setShowTab(true);
}
}
- }, [selectedFilter]);
+ }, [selectedFilter?.status]);
const selectProps = {
hideLabel: true,
@@ -171,7 +171,11 @@ const PlanInbox = () => {
tenantId: tenantId,
active: true,
jurisdiction: censusJurisdiction,
- status: selectedFilter !== null && selectedFilter !== undefined ? selectedFilter : "",
+ status: selectedFilter?.status !== null && selectedFilter?.status !== undefined ? selectedFilter?.status : "",
+ onRoadCondition:selectedFilter.onRoadCondition,
+ terrain:selectedFilter?.terrain,
+ securityQ1:selectedFilter?.securityQ1,
+ securityQ2:selectedFilter?.securityQ2,
assignee: user.info.uuid,
planConfigurationId: microplanId,
limit: limitAndOffset?.limit,
@@ -206,8 +210,10 @@ const PlanInbox = () => {
tenantId: tenantId,
active: true,
jurisdiction: censusJurisdiction,
- status: selectedFilter !== null && selectedFilter !== undefined ? selectedFilter : "",
- ...(activeLink.code == "ASSIGNED_TO_ALL" || selectedFilter == "VALIDATED" ? {} : { assignee: user.info.uuid }),
+ status: selectedFilter?.status !== null && selectedFilter?.status !== undefined ? selectedFilter?.status : "",
+ ...(activeLink.code == "ASSIGNED_TO_ALL" || selectedFilter?.status == "VALIDATED" ? {} : { assignee: user.info.uuid }),
+ terrain:selectedFilter?.terrain,
+ onRoadCondition:selectedFilter?.onRoadCondition,
planConfigurationId: microplanId, //list of plan ids
limit: limitAndOffset?.limit,
offset: limitAndOffset?.offset,
@@ -366,7 +372,7 @@ const PlanInbox = () => {
businessServices: "PLAN_ESTIMATION",
},
config: {
- enabled: selectedFilter ? true : false,
+ enabled: selectedFilter?.status ? true : false,
select: (data) => {
return data.BusinessServices?.[0];
},
@@ -375,8 +381,8 @@ const PlanInbox = () => {
useEffect(() => {
if (workflowData) {
- // Assume selectedFilter maps to applicationStatus or state
- const selectedState = workflowData?.states?.find((state) => state.state === selectedFilter);
+ // Assume selectedFilter.filterValue maps to applicationStatus or state
+ const selectedState = workflowData?.states?.find((state) => state.state === selectedFilter?.status);
// Filter actions based on the selected state
const availableActions = selectedState?.actions?.filter((action) => action.roles.some((role) => userRoles.includes(role)));
@@ -384,7 +390,7 @@ const PlanInbox = () => {
// Update the available actions state
setAvailableActionsForUser(availableActions || []);
}
- }, [workflowData, selectedFilter]);
+ }, [workflowData, selectedFilter?.status]);
// if availableActionsForUser is defined and is an array
const actionsMain = availableActionsForUser?.length > 0 ? availableActionsForUser : [];
@@ -409,15 +415,19 @@ const PlanInbox = () => {
);
setActiveFilter(reorderedStatusCount);
const activeFilterKeys = Object.keys(reorderedStatusCount || {});
- if (selectedFilter === null || selectedFilter === undefined || selectedFilter === "" || !activeFilterKeys.includes(selectedFilter)) {
- setSelectedFilter(activeFilterKeys[0]);
+ if (selectedFilter?.filterValue === null || selectedFilter?.status=== undefined || selectedFilter?.status === "") {
+ setSelectedFilter((prev) => ({
+ ...prev, // Spread the previous state to retain other attributes
+ status: activeFilterKeys[0], // Update only the `status` key
+ }));
+
}
setVillagesSelected(0);
setSelectedRows([]);
if (activeLink.code === "ASSIGNED_TO_ME") {
setAssignedToMeCount(planWithCensus?.TotalCount);
- setAssignedToAllCount(planWithCensus?.StatusCount[selectedFilter] || 0);
+ setAssignedToAllCount(planWithCensus?.StatusCount[selectedFilter?.status] || 0);
} else {
setAssignedToAllCount(planWithCensus?.TotalCount);
}
@@ -425,13 +435,13 @@ const PlanInbox = () => {
const uniqueAssignees = [...new Set(planWithCensus?.planData?.flatMap((item) => item.assignee || []))];
setAssigneeUuids(uniqueAssignees.join(","));
}
- }, [planWithCensus, selectedFilter, activeLink]);
+ }, [planWithCensus, selectedFilter?.status, activeLink]);
useEffect(() => {
if (censusJurisdiction?.length > 0) {
refetchPlanWithCensus(); // Trigger the API call again after activeFilter changes
}
- }, [selectedFilter, activeLink, censusJurisdiction, limitAndOffset]);
+ }, [selectedFilter?.status, activeLink, censusJurisdiction, limitAndOffset]);
const reqCri = {
url: `/${hrms_context_path}/employees/_search`,
@@ -484,7 +494,7 @@ const PlanInbox = () => {
}, [processData]);
useEffect(() => {
- if (selectedFilter === "VALIDATED") {
+ if (selectedFilter?.status === "VALIDATED") {
setActiveLink({ code: "", name: "" });
setShowTab(false);
} else {
@@ -496,10 +506,15 @@ const PlanInbox = () => {
setShowTab(true);
}
}
- }, [selectedFilter]);
+ }, [selectedFilter?.status]);
- const onFilter = (selectedStatus) => {
- setSelectedFilter(selectedStatus?.code);
+ const onFilter = (filterValue) => {
+ setSelectedFilter((prev)=>(
+ {
+ ...prev,
+ ...filterValue
+ }
+ ));
setCurrentPage(1);
setLimitAndOffset((prev)=>{
return {
@@ -513,10 +528,12 @@ const PlanInbox = () => {
});
};
- const clearFilters = () => {
- if (selectedFilter !== Object.entries(activeFilter)?.[0]?.[0]) {
- setSelectedFilter(Object.entries(activeFilter)?.[0]?.[0]);
- }
+ const clearFilters = () => {
+ setSelectedFilter((prev)=>(
+ {
+ status:Object.entries(activeFilter)?.[0]?.[0]
+ }
+ ));
setCurrentPage(1);
setLimitAndOffset((prev)=>{
return {
@@ -787,13 +804,13 @@ const PlanInbox = () => {
};
const getButtonState = (action) => {
- if (selectedFilter === "PENDING_FOR_VALIDATION" && action === "VALIDATE") {
+ if (selectedFilter?.status === "PENDING_FOR_VALIDATION" && action === "VALIDATE") {
return true;
}
- if (selectedFilter === "PENDING_FOR_APPROVAL" && (action === "APPROVE" || action === "ROOT_APPROVE")) {
+ if (selectedFilter?.status === "PENDING_FOR_APPROVAL" && (action === "APPROVE" || action === "ROOT_APPROVE")) {
return true;
}
- if (selectedFilter === "VALIDATED" && action === "SEND_BACK_FOR_CORRECTION") {
+ if (selectedFilter?.status === "VALIDATED" && action === "SEND_BACK_FOR_CORRECTION") {
return true;
}
return false;
@@ -839,7 +856,7 @@ const PlanInbox = () => {
{`${t("LOGGED_IN_AS")} ${userName} - ${t(userRole)}`}