Adding Dropdown and API call in Daily Progress Report. #413
@ -165,28 +165,48 @@ const DailyTask = () => {
|
||||
<div className="card card-action mb-6">
|
||||
<div className="card-body p-1 p-sm-2">
|
||||
{!selectedProject && (<div className="text-center text-muted">Please Select Project</div>)}
|
||||
{/* --- Filters --- */}
|
||||
{/* <div className="d-flex align-items-center mb-2">
|
||||
<DateRangePicker onRangeChange={setDateRange} endDateMode="today" DateDifference="6" dateFormat="DD-MM-YYYY" />
|
||||
<FilterIcon
|
||||
taskListData={TaskList}
|
||||
onApplyFilters={setFilters}
|
||||
currentSelectedBuilding={filters.selectedBuilding}
|
||||
currentSelectedFloors={filters.selectedFloors}
|
||||
currentSelectedActivities={filters.selectedActivities}
|
||||
selectedProject={selectedProject}
|
||||
/>
|
||||
</div> */}
|
||||
|
||||
<div className="d-flex align-items-center justify-content-between mb-2">
|
||||
|
||||
<div className="d-flex align-items-center">
|
||||
<DateRangePicker
|
||||
onRangeChange={setDateRange}
|
||||
endDateMode="today"
|
||||
DateDifference="6"
|
||||
dateFormat="DD-MM-YYYY"
|
||||
/>
|
||||
{/* --- Left: Service Dropdown + Filter Icon --- */}
|
||||
<div className="d-flex align-items-center gap-6">
|
||||
<div className="me-3">
|
||||
{servicesLoading ? (
|
||||
<span>Loading...</span>
|
||||
) : assignedServices?.length > 1 ? (
|
||||
<select
|
||||
name="serviceSelect"
|
||||
className="form-select form-select-sm"
|
||||
value={selectedService}
|
||||
onChange={handleServiceChange}
|
||||
style={{ fontSize: "0.875rem", height: "32px", minWidth: "190px" }}
|
||||
>
|
||||
{assignedServices.map((service) => (
|
||||
<option key={service.id} value={service.id}>
|
||||
{service.name}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
) : (
|
||||
<div
|
||||
style={{
|
||||
fontSize: "0.875rem",
|
||||
height: "32px",
|
||||
width: "190px",
|
||||
border: "1px solid #ced4da",
|
||||
borderRadius: "0.25rem",
|
||||
padding: "4px 8px",
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
}}
|
||||
>
|
||||
{assignedServices?.length === 1
|
||||
? assignedServices[0].name
|
||||
: "No service available"}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<FilterIcon
|
||||
taskListData={TaskList}
|
||||
onApplyFilters={setFilters}
|
||||
@ -197,26 +217,16 @@ const DailyTask = () => {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<select
|
||||
name="serviceSelect"
|
||||
className="form-select form-select-sm"
|
||||
value={selectedService}
|
||||
onChange={handleServiceChange}
|
||||
style={{ fontSize: "0.875rem", height: "32px", width: "190px" }}
|
||||
>
|
||||
{servicesLoading && <option>Loading...</option>}
|
||||
{assignedServices?.map((service) => (
|
||||
<option key={service.id} value={service.id}>
|
||||
{service.name}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
{/* --- Right: DateRangePicker --- */}
|
||||
<div className="me-8">
|
||||
<DateRangePicker
|
||||
onRangeChange={setDateRange}
|
||||
endDateMode="today"
|
||||
DateDifference="6"
|
||||
dateFormat="DD-MM-YYYY"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
{/* --- Table --- */}
|
||||
<div className="table-responsive text-nowrap mt-3" style={{ minHeight: "200px" }}>
|
||||
<table className="table">
|
||||
@ -288,4 +298,4 @@ const DailyTask = () => {
|
||||
</>
|
||||
);
|
||||
};
|
||||
export default DailyTask;
|
||||
export default DailyTask;
|
Loading…
x
Reference in New Issue
Block a user