-
+
updateProductField(p.id, 'aprQuantity', e.target.value)}
/>
+ {formErrors[`aprQuantity_${idx}`] && (
+
{formErrors[`aprQuantity_${idx}`]}
+ )}
-
+
updateProductField(p.id, 'mayQuantity', e.target.value)}
/>
+ {formErrors[`mayQuantity_${idx}`] && (
+
{formErrors[`mayQuantity_${idx}`]}
+ )}
-
-
-
+
+
updateProductField(p.id, 'junQuantity', e.target.value)}
/>
+ {formErrors[`junQuantity_${idx}`] && (
+
{formErrors[`junQuantity_${idx}`]}
+ )}
-
+
updateProductField(p.id, 'aprCost', e.target.value)}
/>
+ {formErrors[`aprCost_${idx}`] && (
+
{formErrors[`aprCost_${idx}`]}
+ )}
-
+
updateProductField(p.id, 'mayCost', e.target.value)}
/>
+ {formErrors[`mayCost_${idx}`] && (
+
{formErrors[`mayCost_${idx}`]}
+ )}
-
+
updateProductField(p.id, 'junCost', e.target.value)}
/>
+ {formErrors[`junCost_${idx}`] && (
+
{formErrors[`junCost_${idx}`]}
+ )}
@@ -806,7 +1228,7 @@ const ProductData = ({
Back
+
+ {/* Success Popup - Moved to root level */}
+ {showSuccessPopup && (
+
+
+
+ {/* Green Check Icon */}
+
+
+ {/* Title */}
+
+ Submission successful
+
+
+ {/* Message */}
+
+ Thank you. Your IP Quarterly Survey for {establishmentData?.quarter} {establishmentData?.year} has been submitted.
+
+
+ {/* Button */}
+
+
+
+
+ )}
);
};
diff --git a/ipi-survey-platform/src/services/submissions/submissionService.js b/ipi-survey-platform/src/services/submissions/submissionService.js
index 1d68eb1..9c929a5 100644
--- a/ipi-survey-platform/src/services/submissions/submissionService.js
+++ b/ipi-survey-platform/src/services/submissions/submissionService.js
@@ -2,6 +2,7 @@ import { getRequest, postRequest } from '@/services/api/CommonService';
import resolveEstablishmentId from '@/services/utils/establishment';
const endpoint = '/submissions';
+const QUARTER_PERIODS_ENDPOINT = 'https://ipi.venbait.in/api/getQuarterPeriods';
// Add this new function to fetch submissions with pagination
export const getSubmissions = async (page = 1, limit = 100, config = {}) => {
@@ -51,9 +52,46 @@ export const fetchSubmissionDetail = async (submissionId, config = {}) => {
};
// Add the new function to the default export
+export const getQuarterPeriods = async (currentYear, currentQuarter) => {
+ try {
+ const response = await postRequest(QUARTER_PERIODS_ENDPOINT, {
+ current_year: currentYear,
+ current_quarter: currentQuarter
+ });
+ return response.data;
+ } catch (error) {
+ console.error('Error fetching quarter periods:', error);
+ throw error;
+ }
+};
+
+export const getPreviousForecastData = async (establishmentId, quarter, year, productId) => {
+ try {
+ const response = await getRequest(
+ `https://ipi.venbait.in/api/submissions/getPreviousForecastData`,
+ {
+ params: {
+ establishment_id: establishmentId,
+ quarter: quarter,
+ year: year,
+ product_id: productId
+ }
+ }
+ );
+ // Check if response has data property and return it, otherwise return the response as is
+ return response.data || response;
+ } catch (error) {
+ console.error('Error fetching previous forecast data:', error);
+ // Instead of throwing, return null to handle the error gracefully
+ return null;
+ }
+};
+
export default {
- getSubmissions, // Add this line
+ getSubmissions,
submitSurvey,
fetchSubmissionHistory,
fetchSubmissionDetail,
+ getQuarterPeriods,
+ getPreviousForecastData
};
\ No newline at end of file