diff --git a/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx b/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx index 52a4064..61279c9 100644 --- a/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx +++ b/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx @@ -1284,9 +1284,12 @@ setAdditionalForecastMonths([ > - - Metric - + + Metric + {showPreviousNext ? ( <> @@ -1453,9 +1456,14 @@ setAdditionalForecastMonths([ - - Quantity ({product?.unit?.uom || 'units'}) - + +
+ Quantity + + ({product?.unit?.uom || 'units'}) + +
+ {showPreviousNext ? ( <> diff --git a/ipi-survey-platform/src/pages/Admin/Validations.jsx b/ipi-survey-platform/src/pages/Admin/Validations.jsx index a011bff..68614e6 100644 --- a/ipi-survey-platform/src/pages/Admin/Validations.jsx +++ b/ipi-survey-platform/src/pages/Admin/Validations.jsx @@ -92,7 +92,7 @@ const ManageSubmissions = () => { const [isRejecting, setIsRejecting] = React.useState(false); const [rejectReason, setRejectReason] = React.useState(''); const [showRejectError, setShowRejectError] = React.useState(false); - const pageSize = 10; + const [pageSize, setPageSize] = React.useState(10); const [isInitialLoad, setIsInitialLoad] = React.useState(true); const [filters, setFilters] = React.useState({ search: '', @@ -694,12 +694,17 @@ const summaryCounts = React.useMemo( rows={tableRows} separated columnWidths={columnWidths} - pagination={{ - currentPage, - onPageChange: setCurrentPage, - pageSize, - totalItems: filtered.length, - }} + pagination={{ + currentPage, + onPageChange: setCurrentPage, + pageSize, + totalItems: filtered.length, + pageSizeOptions: [10, 20, 50, 100], + onPageSizeChange: (size) => { + setPageSize(size); + setCurrentPage(1); + } +}} renderCell={(value, _, columnIndex) => { if (columnIndex === 7) return ( diff --git a/ipi-survey-platform/src/pages/ManufacturingIndex/ManufacturingIndex.jsx b/ipi-survey-platform/src/pages/ManufacturingIndex/ManufacturingIndex.jsx index 2ac8f7b..ce76e73 100644 --- a/ipi-survey-platform/src/pages/ManufacturingIndex/ManufacturingIndex.jsx +++ b/ipi-survey-platform/src/pages/ManufacturingIndex/ManufacturingIndex.jsx @@ -58,7 +58,7 @@ const ManufacturingIndex = () => { const [monthlyOverviewData, setMonthlyOverviewData] = useState(null); const [isPopupOpen, setIsPopupOpen] = useState(false); const [apiLoading, setApiLoading] = useState(false); - const [quarter, setQuarter] = useState(''); + const [quarter, setQuarter] = useState('All'); const [surveySubmitLoading, setSurveySubmitLoading] = useState(false); const [surveySubmitStatus, setSurveySubmitStatus] = useState(''); const [surveySubmitError, setSurveySubmitError] = useState(null); @@ -72,6 +72,10 @@ const ManufacturingIndex = () => { }); + useEffect(() => { + applyFilters(year, searchMonth, allMonths, quarter); +}, [year, quarter, searchMonth, allMonths]); + // Fetch data from API useEffect(() => { const fetchData = async () => { @@ -303,6 +307,7 @@ const ManufacturingIndex = () => { // Apply year, quarter and search filters const applyFilters = (selectedYear, searchTerm, monthsData = allMonths, selectedQuarter = quarter) => { + const filtered = monthsData.filter(month => { const matchesYear = selectedYear === 'All' || month.year.toString() === selectedYear; const matchesSearch = searchTerm === '' || month.month.toLowerCase().includes(searchTerm.toLowerCase()); @@ -319,20 +324,16 @@ const ManufacturingIndex = () => { }; const handleYearChange = (e) => { - const selectedYear = e.target.value; - setYear(selectedYear); - }; + setYear(e.target.value); +}; - const handleSearchMonth = (e) => { - const searchTerm = e.target.value; - setSearchMonth(searchTerm); - applyFilters(year, searchTerm); - }; +const handleQuarterChange = (e) => { + setQuarter(e.target.value); +}; - const handleQuarterChange = (e) => { - const selectedQuarter = e.target.value; - setQuarter(selectedQuarter); - }; +const handleSearchMonth = (e) => { + setSearchMonth(e.target.value); +}; const handleTriggerData = async () => { setError(null);