Changes in Infrastructure.

src/components/common/FilterIcon.jsx

@@ -203,7 +203,7 @@ const FilterIcon = ({
           <>
             <li><hr className="my-1" /></li>
             <li>
-              <div className="fw-bold text-dark mb-1">Floors</div>
+              <div className="fw-bold text-dark mb-2 mt-2">Floors</div>
               <div className="row">
                 {uniqueFloors.length > 0 ? (
                   uniqueFloors.map((floor, idx) => (
@@ -235,7 +235,7 @@ const FilterIcon = ({
           <>
             <li><hr className="my-1" /></li>
             <li>
-              <div className="fw-bold text-dark mb-1">Activities</div>
+              <div className="fw-bold text-dark mb-2 mt-2">Activities</div>
               <div className="row">
                 {uniqueActivities.length > 0 ? (
                   uniqueActivities.map((activity, idx) => (

src/pages/Activities/DailyTask.jsx

@@ -162,7 +162,7 @@ const DailyTask = () => {
       <div className="container-fluid">
         <Breadcrumb data={[{ label: "Home", link: "/dashboard" }, { label: "Daily Progress Report" }]} />
 
-        <div className="card card-action mb-6">
+        <div className="card card-action mb-6 p-5">
           <div className="card-body p-1 p-sm-2">
             {!selectedProject && (<div className="text-center text-muted">Please Select Project</div>)}
 
@@ -172,7 +172,7 @@ const DailyTask = () => {
               <div className="d-flex align-items-center gap-6">
                 <div className="me-3">
                   {servicesLoading ? (
-                    <span>Loading...</span>
+                    <span></span>
                   ) : assignedServices?.length > 1 ? (
                     <select
                       name="serviceSelect"
@@ -189,24 +189,27 @@ const DailyTask = () => {
                     </select>
                   ) : (
                     <div
-                      style={{
+                      className="ms-4 mt-2"
-                        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
+                        ? <h5>{assignedServices[0].name}</h5>
                         : "No service available"}
                     </div>
                   )}
                 </div>
 
+                {/* <FilterIcon
+                  taskListData={TaskList}
+                  onApplyFilters={setFilters}
+                  currentSelectedBuilding={filters.selectedBuilding}
+                  currentSelectedFloors={filters.selectedFloors}
+                  currentSelectedActivities={filters.selectedActivities}
+                  selectedProject={selectedProject}
+                /> */}
+              </div>
+
+              {/* --- Right: DateRangePicker --- */}
+              <div className="d-flex justify-content-end align-items-center gap-3 me-3">
                 <FilterIcon
                   taskListData={TaskList}
                   onApplyFilters={setFilters}
@@ -215,10 +218,6 @@ const DailyTask = () => {
                   currentSelectedActivities={filters.selectedActivities}
                   selectedProject={selectedProject}
                 />
-              </div>
-
-              {/* --- Right: DateRangePicker --- */}
-              <div className="me-8">
                 <DateRangePicker
                   onRangeChange={setDateRange}
                   endDateMode="today"
@@ -226,6 +225,7 @@ const DailyTask = () => {
                   dateFormat="DD-MM-YYYY"
                 />
               </div>
+
             </div>
             {/* --- Table --- */}
             <div className="table-responsive text-nowrap mt-3" style={{ minHeight: "200px" }}>