diff --git a/src/dashboard/HotContacts.tsx b/src/dashboard/HotContacts.tsx
index da8c116..226df8d 100644
--- a/src/dashboard/HotContacts.tsx
+++ b/src/dashboard/HotContacts.tsx
@@ -50,7 +50,7 @@ export const HotContacts = () => {
component={Link}
to="/contacts/create"
>
-
+
diff --git a/src/dashboard/TasksList.tsx b/src/dashboard/TasksList.tsx
index 8d7ec06..2ee0811 100644
--- a/src/dashboard/TasksList.tsx
+++ b/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}
/>
-
+ {isBeforeFriday && (
+
+ )}
diff --git a/src/providers/fakerest/dataGenerator/tasks.ts b/src/providers/fakerest/dataGenerator/tasks.ts
index 7d17e7e..e7ce318 100644
--- a/src/providers/fakerest/dataGenerator/tasks.ts
+++ b/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,
};
});
};
diff --git a/src/providers/fakerest/dataProvider.ts b/src/providers/fakerest/dataProvider.ts
index f7befd0..abdb021 100644
--- a/src/providers/fakerest/dataProvider.ts
+++ b/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';
diff --git a/src/tasks/AddTask.tsx b/src/tasks/AddTask.tsx
index c7362aa..b815214 100644
--- a/src/tasks/AddTask.tsx
+++ b/src/tasks/AddTask.tsx
@@ -63,7 +63,7 @@ export const AddTask = ({
to={'#'}
onClick={handleOpen}
>
-
+
) : (