Feat(task): Display Tasks for curent calendar week and not for seven …

src/dashboard/HotContacts.tsx

@@ -50,7 +50,7 @@ export const HotContacts = () => {
                         component={Link}
                         to="/contacts/create"
                     >
-                        <ControlPointIcon fontSize="inherit" />
+                        <ControlPointIcon fontSize="inherit" color="primary" />
                     </IconButton>
                 </Tooltip>
             </Box>

src/dashboard/TasksList.tsx

@@ -2,15 +2,23 @@ import * as React from 'react';
 import { Card, Box, Stack, Typography } from '@mui/material';
 import AssignmentTurnedInIcon from '@mui/icons-material/AssignmentTurnedIn';
 import { AddTask } from '../tasks/AddTask';
-import { startOfToday, endOfToday, addDays } from 'date-fns';
+import {
+    startOfToday,
+    endOfToday,
+    endOfTomorrow,
+    endOfWeek,
+    getDay,
+} from 'date-fns';
 import { TasksListFilter } from './TasksListFilter';
 import { TasksListEmpty } from './TasksListEmpty';
 
 const today = new Date();
+const todayDayOfWeek = getDay(today);
+const isBeforeFriday = todayDayOfWeek < 5; // Friday is represented by 5
 const startOfTodayDateISO = startOfToday().toISOString();
 const endOfTodayDateISO = endOfToday().toISOString();
-const startOfWeekDateISO = addDays(today, 1).toISOString();
-const endOfWeekDateISO = addDays(today, 7).toISOString();
+const endOfTomorrowDateISO = endOfTomorrow().toISOString();
+const endOfWeekDateISO = endOfWeek(today, { weekStartsOn: 0 }).toISOString();
 
 const taskFilters = {
     overdue: { 'done_date@is': null, 'due_date@lt': startOfTodayDateISO },
@@ -22,11 +30,11 @@ const taskFilters = {
     tomorrow: {
         'done_date@is': null,
         'due_date@gt': endOfTodayDateISO,
-        'due_date@lt': startOfWeekDateISO,
+        'due_date@lt': endOfTomorrowDateISO,
     },
     thisWeek: {
         'done_date@is': null,
-        'due_date@gte': startOfWeekDateISO,
+        'due_date@gte': endOfTomorrowDateISO,
         'due_date@lte': endOfWeekDateISO,
     },
     later: { 'done_date@is': null, 'due_date@gt': endOfWeekDateISO },
@@ -59,10 +67,12 @@ export const TasksList = () => {
                         title="Tomorrow"
                         filter={taskFilters.tomorrow}
                     />
-                    <TasksListFilter
-                        title="This week"
-                        filter={taskFilters.thisWeek}
-                    />
+                    {isBeforeFriday && (
+                        <TasksListFilter
+                            title="This week"
+                            filter={taskFilters.thisWeek}
+                        />
+                    )}
                     <TasksListFilter title="Later" filter={taskFilters.later} />
                 </Stack>
             </Card>

src/providers/fakerest/dataGenerator/tasks.ts

@@ -49,6 +49,7 @@ export const generateTasks = (db: Db) => {
                 new Date(Date.now() + 100 * 24 * 60 * 60 * 1000)
             ).toISOString(),
             done_date: undefined,
+            sales_id: 0,
         };
     });
 };

src/providers/fakerest/dataProvider.ts

@@ -24,7 +24,7 @@ import { authProvider, USER_STORAGE_KEY } from './authProvider';
 import generateData from './dataGenerator';
 import { withSupabaseFilterAdapter } from './internal/supabaseAdapter';
 
-const baseDataProvider = fakeRestDataProvider(generateData(), false, 300);
+const baseDataProvider = fakeRestDataProvider(generateData(), true, 300);
 
 const TASK_MARKED_AS_DONE = 'TASK_MARKED_AS_DONE';
 const TASK_MARKED_AS_UNDONE = 'TASK_MARKED_AS_UNDONE';

src/tasks/AddTask.tsx

@@ -63,7 +63,7 @@ export const AddTask = ({
                         to={'#'}
                         onClick={handleOpen}
                     >
-                        <ControlPointIcon fontSize="inherit" />
+                        <ControlPointIcon fontSize="inherit" color="primary" />
                     </IconButton>
                 </Tooltip>
             ) : (