admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fixed service list show in Dialy Task

Browse Source
This commit is contained in:
pramod.mahajan 2025-10-10 18:08:21 +05:30
parent a2067e150d
commit 860779d096
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Organization/OrganizationsList.jsx
View File

@ -142,7 +142,7 @@ const OrganizationsList = ({searchText}) => {
colSpan={organizationsColumns.length + 1} colSpan={organizationsColumns.length + 1}
className="text-center" className="text-center"
> >
<p className="fw-semibold">Not Found</p> <p className="fw-semibold">{isLoading ? "Loading....":"Not Found Organization"}</p>
</td> </td>
</tr> </tr>
)} )}

9
src/pages/DailyProgressReport/DailyProgrssReport.jsx
View File

@ -8,6 +8,8 @@ import ReportTask from "../../components/Activities/ReportTask";
import TaskReportFilterPanel from "../../components/DailyProgressRport/TaskReportFilterPanel"; import TaskReportFilterPanel from "../../components/DailyProgressRport/TaskReportFilterPanel";
import { useFab } from "../../Context/FabContext"; import { useFab } from "../../Context/FabContext";
import SubTask from "../../components/Activities/SubTask"; import SubTask from "../../components/Activities/SubTask";
import { useProjectAssignedServices } from "../../hooks/useProjects";
import { useSelectedProject } from "../../slices/apiDataManager";
const DailyProgrssContext = createContext(); const DailyProgrssContext = createContext();
export const useDailyProgrssContext = () => { export const useDailyProgrssContext = () => {
@ -21,10 +23,11 @@ export const useDailyProgrssContext = () => {
}; };
const DailyProgrssReport = () => { const DailyProgrssReport = () => {
const selectedProject = useSelectedProject()
const [service, setService] = useState(""); const [service, setService] = useState("");
const [filter,setFilter] = useState('') const [filter,setFilter] = useState('')
const { setOffcanvasContent, setShowTrigger } = useFab(); 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 }); const [modal, setModal] = useState({ type: null, data: null });
@ -86,7 +89,7 @@ const DailyProgrssReport = () => {
/> />
<div className="card card-fullscreen p-5"> <div className="card card-fullscreen p-5">
{data?.data?.length > 0 && (<div className="col-sm-4 col-md-3 col-12"> {data?.length > 0 && (<div className="col-sm-4 col-md-3 col-12">
<select <select
className="form-select form-select-sm" className="form-select form-select-sm"
value={service ?? ""} value={service ?? ""}
@ -99,7 +102,7 @@ const DailyProgrssReport = () => {
<option value=""> <option value="">
All Services All Services
</option> </option>
{data?.data?.map((service) => ( {data?.map((service) => (
<option key={service.id} value={service.id}> <option key={service.id} value={service.id}>
{service.name} {service.name}
</option> </option>