-
{(hasError || isInitialLoad) && (
diff --git a/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx b/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx
index 1ffb246..ef8970a 100644
--- a/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx
+++ b/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react';
import Table from '@/components/common/Table';
-import { getQuarterPeriods , resubmitSurvey } from '@/services/submissions/submissionService';
+import { getQuarterPeriods } from '@/services/submissions/submissionService';
import { getEmirates, fetchVariationReasons, fetchZeroTargetReasons } from '@/services/masters/masterService';
const caretUpSrc = '/assets/images/caret-up.svg';
const caretDownSrc = '/assets/images/CaretDown-black.svg';
@@ -360,9 +360,7 @@ const ReviewSubmit = ({
const [emirateName, setEmirateName] = useState('');
const [variationReasons, setVariationReasons] = useState([]);
const [zeroTargetReasons, setZeroTargetReasons] = useState([]);
- const [isSavingDraft, setIsSavingDraft] = React.useState(false);
- const [productOptions, setProductOptions] = React.useState([]);
-
+
useEffect(() => {
const fetchEmiratesData = async () => {
try {
@@ -445,193 +443,6 @@ const ReviewSubmit = ({
return '';
});
- const handleSaveDraft = async () => {
- try {
- setIsSavingDraft(true);
-
- // Get current submission from localStorage
- const currentSubmissionStr = localStorage.getItem('currentSubmission');
- if (!currentSubmissionStr) {
- throw new Error('Current submission data not found');
- }
- const currentSubmission = JSON.parse(currentSubmissionStr);
- const currentQuarter = localStorage.getItem('currentQuarter');
- const currentYear = localStorage.getItem('currentYear');
-
- // Get establishment ID from current submission
- const submissionId = currentSubmission.id;
- const establishmentId = currentSubmission.establishment_id;
-
- if (!establishmentId) {
- throw new Error('Establishment ID not found in submission');
- }
-
- // Get user profile from localStorage
- const userProfileStr = localStorage.getItem('user_profile');
- if (!userProfileStr) {
- throw new Error('User profile not found');
- }
-
- const userProfile = JSON.parse(userProfileStr);
- const createdById = userProfile?.id;
-
- if (!createdById) {
- throw new Error('User ID not found in profile');
- }
-
- // Get quarter and year from current submission
- const effectiveQuarter = currentQuarter;
- const effectiveYear = currentYear;
-
- if (!effectiveQuarter || !effectiveYear) {
- throw new Error('Quarter and year are required in submission');
- }
-
- // Get establishment data
- const establishment = currentSubmission.establishment;
- if (!establishment) {
- throw new Error('Establishment data not found in submission');
- }
-
- // Prepare products data
- const formattedProducts = products.map(product => ({
- id: product.id || 0,
- product_id: product.product_id || null,
- unit_id: product.unit || '',
- annual_installed_capacity: product.capacity || '0',
- previous_quantity_period_one: product.octQuantity || '0',
- previous_quantity_period_two: product.novQuantity || '0',
- previous_quantity_period_three: product.decQuantity || '0',
- previous_cost_period_one: product.octCost || '0',
- previous_cost_period_two: product.novCost || '0',
- previous_cost_period_three: product.decCost || '0',
- current_quantity_period_one: product.janQuantity || '0',
- current_quantity_period_two: product.febQuantity || '0',
- current_quantity_period_three: product.marQuantity || '0',
- current_cost_period_one: product.janCost || '0',
- current_cost_period_two: product.febCost || '0',
- current_cost_period_three: product.marCost || '0',
- forecast_quantity_period_one: product.aprQuantity || '0',
- forecast_quantity_period_two: product.mayQuantity || '0',
- forecast_quantity_period_three: product.junQuantity || '0',
- forecast_cost_period_one: product.aprCost || '0',
- forecast_cost_period_two: product.mayCost || '0',
- forecast_cost_period_three: product.junCost || '0',
- variation_reason_master_id: product.variationReason || null,
- other_variation_reason: product.otherVariationReason || '',
- zero_target_reason_master_id: product.zeroTargetReason || null,
- other_zero_target_reason: product.otherZeroTargetReason || '',
- remarks: product.remarks || ''
- }));
-
- // Prepare the complete payload
- const payload = {
- establishment_id: establishmentId,
- quarter: effectiveQuarter,
- year: effectiveYear,
- emirati_male: establishment.emirati_male || 0,
- emirati_female: establishment.emirati_female || 0,
- non_emirati_male: establishment.non_emirati_male || 0,
- non_emirati_female: establishment.non_emirati_female || 0,
- total_emirati: establishment.total_emirati || 0,
- total_employees: establishment.total_employees || 0,
- status: "Draft",
- created_by: createdById,
- products: formattedProducts
- };
- let response;
- try {
- if (submissionId) {
- // Update existing submission
- response = await resubmitSurvey(submissionId, payload);
- // Handle different response formats
- const responseData = response?.data || response;
-
- if (responseData) {
- // Update local storage with the updated submission
- const updatedSubmission = {
- ...currentSubmission,
- ...responseData,
- updated_at: new Date().toISOString()
- };
- localStorage.setItem('currentSubmission', JSON.stringify(updatedSubmission));
-
- toast.success('Draft updated successfully', {
- position: "top-right",
- autoClose: 3000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true
- });
- return; // Success, exit the function
- }
- } else {
- // Create new submission
- response = await submitSurvey(payload);
- // Handle different response formats
- const responseData = response?.data || response;
-
- if (responseData && (responseData.id || responseData.submission_id)) {
- // Update local storage with the new submission ID
- const updatedSubmission = {
- ...currentSubmission,
- id: responseData.id || responseData.submission_id,
- status: 'Draft',
- created_at: new Date().toISOString()
- };
- localStorage.setItem('currentSubmission', JSON.stringify(updatedSubmission));
-
- toast.success('Draft saved successfully', {
- position: "top-right",
- autoClose: 3000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true
- });
- return; // Success, exit the function
- }
- }
-
- // If we get here, the response wasn't in the expected format
- throw new Error('Unexpected response format from server');
-
- } catch (apiError) {
- console.error('API Error details:', {
- message: apiError.message,
- response: apiError.response,
- stack: apiError.stack
- });
-
- // If we have a response with error details, use that
- if (apiError.response?.data) {
- const errorMessage = apiError.response.data.message || apiError.response.data.error || 'Unknown server error';
- throw new Error(`Server error: ${errorMessage}`);
- }
-
- // Otherwise, rethrow the original error
- throw apiError;
- }
- } catch (error) {
- console.error('Error in handleSaveDraft:', {
- name: error.name,
- message: error.message,
- stack: error.stack
- });
-
- toast.error(error.message || 'Failed to save draft. Please try again.', {
- position: "top-right",
- autoClose: 5000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true
- });
- } finally {
- setIsSavingDraft(false);
- }
-};
const handleSubmit = () => {
try {
const submissionData = formatSubmissionData(
@@ -1231,16 +1042,6 @@ const ReviewSubmit = ({
-
-
-
-
-
-
+
+
-