diff --git a/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx b/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx index 9bb60c6..4a81288 100644 --- a/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx +++ b/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx @@ -6,7 +6,6 @@ import apiClient from '@/services/api/apiClient'; import { getBeforePreviousData, getQuarterPeriods } from '@/services/submissions/submissionService'; import { getProductSubmissionHistory } from '@/services/submissions/submissionService'; import { Line } from 'react-chartjs-2'; -import { putRequest } from '@/services/api/CommonService'; // Helper function to get months for quarter @@ -705,7 +704,7 @@ setAdditionalForecastMonths([ setActionLoading(true); try { - const response = await putRequest(`/approveOrRejectSubmission/${id}`, { + const response = await apiClient.put(`/approveOrRejectSubmission/${id}`, { approve_reject_status: 1, remarks: '' }); @@ -743,7 +742,7 @@ setAdditionalForecastMonths([ setActionLoading(true); try { - const response = await putRequest(`/approveOrRejectSubmission/${id}`, { + const response = await apiClient.put(`/approveOrRejectSubmission/${id}`, { approve_reject_status: 0, remarks: rejectReason.trim() }); @@ -830,18 +829,23 @@ setAdditionalForecastMonths([ const getCellClass = (previousValue, currentValue, isFirstMonth = false) => { if (isFirstMonth || !varianceHighlighting) return ''; - // 🔴 Above 100 selected → disable ALL highlighting - if (threshold > 100) return ''; - const variance = calculateVariance(previousValue, currentValue); const absVariance = Math.abs(variance); + // 🟡 Above 100 selected → ONLY > 100% highlight + if (threshold > 100) { + if (absVariance <= 100) return ''; + return variance > 0 ? 'bg-[#F0FDF4]' : 'bg-[#FEF2F2]'; + } + + // 🟢 Normal case (≤ threshold) if (absVariance > threshold) return ''; return variance > 0 ? 'bg-[#F0FDF4]' : 'bg-[#FEF2F2]'; }; + const getBorderClass = (previousValue, currentValue, isFirstMonth = false) => { if (isFirstMonth || !varianceHighlighting) return ''; @@ -1174,10 +1178,10 @@ console.log("label",additionalForecastLabel) - {varianceHighlighting && ( + {varianceHighlighting && (