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

Change the position of Datepicker and Dropdown box.

Browse Source
This commit is contained in:
Kartik Sharma 2025-09-19 19:50:50 +05:30
parent e9d8b6daea
commit 27b62c858d
1 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,28 +165,48 @@ const DailyTask = () => {
<div className="card card-action mb-6"> <div className="card card-action mb-6">
<div className="card-body p-1 p-sm-2"> <div className="card-body p-1 p-sm-2">
{!selectedProject && (<div className="text-center text-muted">Please Select Project</div>)} {!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 justify-content-between mb-2">
<div className="d-flex align-items-center"> {/* --- Left: Service Dropdown + Filter Icon --- */}
<DateRangePicker <div className="d-flex align-items-center gap-6">
onRangeChange={setDateRange} <div className="me-3">
endDateMode="today" {servicesLoading ? (
DateDifference="6" <span>Loading...</span>
dateFormat="DD-MM-YYYY" ) : 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 <FilterIcon
taskListData={TaskList} taskListData={TaskList}
onApplyFilters={setFilters} onApplyFilters={setFilters}
@ -197,26 +217,16 @@ const DailyTask = () => {
/> />
</div> </div>
<div> {/* --- Right: DateRangePicker --- */}
<select <div className="me-8">
name="serviceSelect" <DateRangePicker
className="form-select form-select-sm" onRangeChange={setDateRange}
value={selectedService} endDateMode="today"
onChange={handleServiceChange} DateDifference="6"
style={{ fontSize: "0.875rem", height: "32px", width: "190px" }} dateFormat="DD-MM-YYYY"
> />
{servicesLoading && <option>Loading...</option>}
{assignedServices?.map((service) => (
<option key={service.id} value={service.id}>
{service.name}
</option>
))}
</select>
</div> </div>
</div> </div>
{/* --- Table --- */} {/* --- Table --- */}
<div className="table-responsive text-nowrap mt-3" style={{ minHeight: "200px" }}> <div className="table-responsive text-nowrap mt-3" style={{ minHeight: "200px" }}>
<table className="table"> <table className="table">
@ -288,4 +298,4 @@ const DailyTask = () => {
</> </>
); );
}; };
export default DailyTask; export default DailyTask;