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

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management

Browse Source
This commit is contained in:
ashutosh.nehete 2025-09-22 13:13:22 +05:30
commit 69cc3b9383
3 changed files with 83 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/Project/Teams.jsx
View File

@ -269,17 +269,17 @@ const filterAndSearchEmployees = useCallback(() => {
<div className="row d-flex justify-content-between mb-4">
<div className="col-md-6 col-12 d-flex align-items-center">
<div className="dataTables_length text-start py-1 px-0 col-md-4 col-12">
{servicesLoading ? null : assignedServices && assignedServices.length > 0 ? (
{!servicesLoading && assignedServices?.length > 0 && (
assignedServices.length > 1 ? (
<label>
<select
name="serviceFilter"
name="DataTables_Table_0_length"
aria-controls="DataTables_Table_0"
className="form-select form-select-sm"
aria-label="Select Service"
value={selectedService}
onChange={handleServiceChange}
style={{ fontSize: "0.875rem", height: "32px", width: "190px" }}
style={{ fontSize: "0.875rem", height: "35px", width: "190px" }}
>
<option value="">All Services</option>
{assignedServices.map((service) => (
@ -290,18 +290,10 @@ const filterAndSearchEmployees = useCallback(() => {
</select>
</label>
) : (
<div>
<h5>{assignedServices[0].name}</h5>
</div>
)
) : (
<div>
</div>
)}
</div>
</div>
<div className="col-md-6 col-12 d-flex justify-content-end align-items-center">
<div className="form-check form-switch me-2 mt-2">

34
src/pages/Activities/DailyTask.jsx
View File

@ -167,45 +167,34 @@ const DailyTask = () => {
{!selectedProject && (<div className="text-center text-muted">Please Select Project</div>)}
<div className="d-flex align-items-center justify-content-between mb-2">
{/* --- Left: Service Dropdown + Filter Icon --- */}
<div className="d-flex align-items-center gap-6">
<div className="me-3">
{servicesLoading ? (
<span></span>
) : assignedServices?.length > 1 ? (
{!servicesLoading && assignedServices?.length > 0 && (
assignedServices.length > 1 ? (
<label>
<select
name="serviceSelect"
name="DataTables_Table_0_length"
aria-controls="DataTables_Table_0"
className="form-select form-select-sm"
aria-label="Select Service"
value={selectedService}
onChange={handleServiceChange}
style={{ fontSize: "0.875rem", height: "32px", minWidth: "190px" }}
style={{ fontSize: "0.875rem", height: "35px", width: "190px" }}
>
<option value="">All Services</option>
{assignedServices.map((service) => (
<option key={service.id} value={service.id}>
{service.name}
</option>
))}
</select>
</label>
) : (
<div
className="ms-4 mt-2"
>
{assignedServices?.length === 1
? <h5>{assignedServices[0].name}</h5>
: "No service available"}
</div>
<h5>{assignedServices[0].name}</h5>
)
)}
</div>
{/* <FilterIcon
taskListData={TaskList}
onApplyFilters={setFilters}
currentSelectedBuilding={filters.selectedBuilding}
currentSelectedFloors={filters.selectedFloors}
currentSelectedActivities={filters.selectedActivities}
selectedProject={selectedProject}
/> */}
</div>
{/* --- Right: DateRangePicker --- */}
@ -291,7 +280,6 @@ const DailyTask = () => {
</tbody>
</table>
</div>
</div>
</div>
</div>

27
src/pages/Activities/TaskPlannng.jsx
View File

@ -39,29 +39,34 @@ const TaskPlannng = () => {
<div className="card">
<div className="card-body">
{/* Service Dropdown */}
<div className="mb-1 ms-2">
{assignedServices?.length > 1 ? (
<div
className="dataTables_length text-start py-2 px-5 col-md-4 col-12"
id="DataTables_Table_0_length"
>
{!servicesLoading && assignedServices?.length > 0 && (
assignedServices.length > 1 ? (
<label>
<select
id="serviceSelect"
className="form-select"
name="DataTables_Table_0_length"
aria-controls="DataTables_Table_0"
className="form-select form-select-sm"
aria-label="Select Service"
value={selectedService}
onChange={handleServiceChange}
style={{ fontSize: "0.875rem", height: "35px", width: "190px" }}
>
<option value="">All Services</option>
{assignedServices.map((service) => (
<option key={service.id} value={service.id}>
{service.name}
</option>
))}
</select>
</label>
) : (
<div
className="text-start"
>
{assignedServices?.length === 1
? <h5>{ assignedServices[0].name}</h5>
: "No service available"}
</div>
<h5>{assignedServices[0].name}</h5>
)
)}
</div>