From 120592219f76e82a8c873d471de373f16c1223f3 Mon Sep 17 00:00:00 2001
From: Neeraj-gagat <neerajgagat9999@gmail.com>
Date: Sun, 7 Dec 2025 04:36:55 +0530
Subject: [PATCH] fixed #250-Add-Task-goes-blank

---
 .../components/HomeComponents/Tasks/ReportsView.tsx   |  4 +++-
 .../src/components/HomeComponents/Tasks/Tasks.tsx     | 11 +++++++----
 .../HomeComponents/Tasks/__tests__/Tasks.test.tsx     |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/HomeComponents/Tasks/ReportsView.tsx b/frontend/src/components/HomeComponents/Tasks/ReportsView.tsx
index a45798d7..6be314cb 100644
--- a/frontend/src/components/HomeComponents/Tasks/ReportsView.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/ReportsView.tsx
@@ -36,7 +36,9 @@ export const ReportsView: React.FC<ReportsViewProps> = ({ tasks }) => {
   };
 
   const dailyData = [{ name: 'Today', ...countStatuses(today) }];
-  const weeklyData = [{ name: 'This Week', ...countStatuses(startOfWeek) }];
+  const sevenDaysAgo = getStartOfDay(new Date());
+  sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
+  const weeklyData = [{ name: 'This Week', ...countStatuses(sevenDaysAgo) }];
   const monthlyData = [{ name: 'This Month', ...countStatuses(startOfMonth) }];
 
   return (
diff --git a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
index b1a0d5cb..0657d807 100644
--- a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
@@ -1147,11 +1147,11 @@ export const Tasks = (
                                 <Select
                                   value={
                                     isCreatingNewProject
-                                      ? ''
-                                      : newTask.project || ''
+                                      ? '__CREATE_NEW__'
+                                      : newTask.project || '__NONE__'
                                   }
                                   onValueChange={(value: string) => {
-                                    if (value === '') {
+                                    if (value === '__CREATE_NEW__') {
                                       // User selected "create new project" option
                                       setIsCreatingNewProject(true);
                                       setNewTask({ ...newTask, project: '' });
@@ -1175,6 +1175,9 @@ export const Tasks = (
                                     />
                                   </SelectTrigger>
                                   <SelectContent>
+                                    <SelectItem value="__NONE__">
+                                      No project
+                                    </SelectItem>
                                     {uniqueProjects.map((project: string) => (
                                       <SelectItem
                                         key={project}
@@ -1185,7 +1188,7 @@ export const Tasks = (
                                       </SelectItem>
                                     ))}
                                     <SelectItem
-                                      value=""
+                                      value="__CREATE_NEW__"
                                       data-testid="project-option-create"
                                     >
                                       + Create new project…
diff --git a/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx b/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
index 2a742243..31a29c84 100644
--- a/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
@@ -475,7 +475,7 @@ describe('Tasks Component', () => {
     fireEvent.click(screen.getByRole('button', { name: /add task/i }));
 
     const projectSelect = await screen.findByTestId('project-select');
-    fireEvent.change(projectSelect, { target: { value: '' } }); // Empty string triggers "create new project" mode
+    fireEvent.change(projectSelect, { target: { value: '__CREATE_NEW__' } }); // Empty string triggers "create new project" mode
 
     const newProjectInput =
       await screen.findByPlaceholderText('New project name');