diff --git a/src/components/Organization/OrganizationsList.jsx b/src/components/Organization/OrganizationsList.jsx index af981025..dc2e977e 100644 --- a/src/components/Organization/OrganizationsList.jsx +++ b/src/components/Organization/OrganizationsList.jsx @@ -142,7 +142,7 @@ const OrganizationsList = ({searchText}) => { colSpan={organizationsColumns.length + 1} className="text-center" > -

Not Found

+

{isLoading ? "Loading....":"Not Found Organization"}

)} diff --git a/src/pages/DailyProgressReport/DailyProgrssReport.jsx b/src/pages/DailyProgressReport/DailyProgrssReport.jsx index 2e027935..1985db38 100644 --- a/src/pages/DailyProgressReport/DailyProgrssReport.jsx +++ b/src/pages/DailyProgressReport/DailyProgrssReport.jsx @@ -8,6 +8,8 @@ import ReportTask from "../../components/Activities/ReportTask"; import TaskReportFilterPanel from "../../components/DailyProgressRport/TaskReportFilterPanel"; import { useFab } from "../../Context/FabContext"; import SubTask from "../../components/Activities/SubTask"; +import { useProjectAssignedServices } from "../../hooks/useProjects"; +import { useSelectedProject } from "../../slices/apiDataManager"; const DailyProgrssContext = createContext(); export const useDailyProgrssContext = () => { @@ -21,10 +23,11 @@ export const useDailyProgrssContext = () => { }; const DailyProgrssReport = () => { + const selectedProject = useSelectedProject() const [service, setService] = useState(""); const [filter,setFilter] = useState('') const { setOffcanvasContent, setShowTrigger } = useFab(); - const { data, isLoading, isError, error } = useServices(); + const { data, isLoading, isError, error } = useProjectAssignedServices(selectedProject); const [modal, setModal] = useState({ type: null, data: null }); @@ -86,7 +89,7 @@ const DailyProgrssReport = () => { />
- {data?.data?.length > 0 && (
+ {data?.length > 0 && (