diff --git a/src/components/common/FilterIcon.jsx b/src/components/common/FilterIcon.jsx index 0f938e1a..2dc43daa 100644 --- a/src/components/common/FilterIcon.jsx +++ b/src/components/common/FilterIcon.jsx @@ -203,7 +203,7 @@ const FilterIcon = ({ <>

  • -
    Floors
    +
    Floors
    {uniqueFloors.length > 0 ? ( uniqueFloors.map((floor, idx) => ( @@ -235,7 +235,7 @@ const FilterIcon = ({ <>

  • -
    Activities
    +
    Activities
    {uniqueActivities.length > 0 ? ( uniqueActivities.map((activity, idx) => ( diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx index b935b0a6..ca676647 100644 --- a/src/pages/Activities/DailyTask.jsx +++ b/src/pages/Activities/DailyTask.jsx @@ -162,7 +162,7 @@ const DailyTask = () => {
    -
    +
    {!selectedProject && (
    Please Select Project
    )} @@ -172,7 +172,7 @@ const DailyTask = () => {
    {servicesLoading ? ( - Loading... + ) : assignedServices?.length > 1 ? ( ) : (
    {assignedServices?.length === 1 - ? assignedServices[0].name + ?
    {assignedServices[0].name}
    : "No service available"}
    )}
    + {/* */} +
    + + {/* --- Right: DateRangePicker --- */} +
    { currentSelectedActivities={filters.selectedActivities} selectedProject={selectedProject} /> -
    - - {/* --- Right: DateRangePicker --- */} -
    { dateFormat="DD-MM-YYYY" />
    +
    {/* --- Table --- */}