From b5f8cb40148b5750d6fd83ac0ee3b0a2be0418d4 Mon Sep 17 00:00:00 2001 From: Malini Date: Thu, 6 Nov 2025 18:54:06 +0530 Subject: [PATCH] bug fixed in establishemnet --- .../src/pages/History/History.jsx | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/ipi-survey-platform/src/pages/History/History.jsx b/ipi-survey-platform/src/pages/History/History.jsx index 7dfde11..c5c0fa3 100644 --- a/ipi-survey-platform/src/pages/History/History.jsx +++ b/ipi-survey-platform/src/pages/History/History.jsx @@ -1,8 +1,8 @@ -import React, { useEffect, useState, useMemo,useCallback } from 'react'; +import React, { useEffect, useState, useMemo, useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; import Table from '@/components/common/Table'; import HeaderBar from '@/components/layout/HeaderBar'; -// import { fetchSubmissionHistory } from '@/services/submissions/submissionService.js'; +import { resolveEstablishmentId } from '@/services/utils/establishment'; import { fetchProducts } from '@/services/masters/masterService'; import { fetchSubmissionHistory, getSubmissionAuditHistory } from '@/services/submissions/submissionService'; @@ -71,7 +71,12 @@ const History = () => { // const loadAuditHistory = async () => { // setIsLoadingAudit(true); // try { - // const establishmentId = 41; // Replace with dynamic ID if available + // const establishmentId = resolveEstablishmentId(); + // if (!establishmentId) { + // console.error('No establishment ID found'); + // setIsLoadingAudit(false); + // return; + // } // const response = await getSubmissionAuditHistory(establishmentId, { // year: yearFilter || undefined, // quarter: quarterFilter || undefined, @@ -97,7 +102,13 @@ useEffect(() => { const loadAuditHistory = async () => { setIsLoadingAudit(true); try { - const establishmentId = 41; // Replace with dynamic ID if available + const establishmentId = resolveEstablishmentId(); + if (!establishmentId) { + console.error('No establishment ID found'); + setIsLoadingAudit(false); + showToast('error', 'No establishment ID found. Please log in again.'); + return; + } // Extract product_name from selected value ("HS - Product" → "Product") const productName = hscodeFilter.includes(" - ") @@ -108,6 +119,7 @@ useEffect(() => { yearFilter, quarterFilter, productName, + establishmentId }); const params = {