From 8f866d4820213b0b97fe2c8bb17a72ef62308209 Mon Sep 17 00:00:00 2001
From: Pattadon <pattadon2546pn@gmail.com>
Date: Mon, 27 Nov 2023 15:41:16 +0700
Subject: [PATCH 1/4] Fix typo in setFirstName function

---
 frontend/src/components/profile/ProfileUpdateComponent.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/profile/ProfileUpdateComponent.jsx b/frontend/src/components/profile/ProfileUpdateComponent.jsx
index a38558c..ce3758c 100644
--- a/frontend/src/components/profile/ProfileUpdateComponent.jsx
+++ b/frontend/src/components/profile/ProfileUpdateComponent.jsx
@@ -102,7 +102,7 @@ export function ProfileUpdateComponent() {
           placeholder="Enter your first name"
           className="input w-full"
           value={firstName}
-          onChange={(e) => setFullName(e.target.value)}
+          onChange={(e) => setFirstName(e.target.value)}
         />
       </div>
 

From cbe1e04da0ddef6598f85e920bd47e7aedf22065 Mon Sep 17 00:00:00 2001
From: Chaiyawut Thengket <santa081831@gmail.com>
Date: Mon, 27 Nov 2023 15:51:32 +0700
Subject: [PATCH 2/4] add field

---
 backend/users/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/users/views.py b/backend/users/views.py
index 7446d7b..19db6d2 100644
--- a/backend/users/views.py
+++ b/backend/users/views.py
@@ -72,4 +72,4 @@ class UserDataRetriveViewset(viewsets.GenericViewSet, mixins.RetrieveModelMixin)
     def retrieve(self, request, *args, **kwargs):
         serializer = self.get_serializer(request.user)
         return Response(serializer.data)
-        
\ No newline at end of file
+        

From 3c74d43f4921144e0644d59b16222ec080c7c6ae Mon Sep 17 00:00:00 2001
From: Chaiyawut Thengket <santa081831@gmail.com>
Date: Mon, 27 Nov 2023 15:52:13 +0700
Subject: [PATCH 3/4] add field

---
 backend/users/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/users/views.py b/backend/users/views.py
index 19db6d2..9470dc9 100644
--- a/backend/users/views.py
+++ b/backend/users/views.py
@@ -63,7 +63,7 @@ class CustomUserProfileUpdate(APIView):
             return Response(serializer.data)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
     
-    
+
 class UserDataRetriveViewset(viewsets.GenericViewSet, mixins.RetrieveModelMixin):
     queryset = CustomUser.objects.all()
     permission_classes = (IsAuthenticated,)

From c98ff37b1b09bd1f8c90332becdd8424cd0ae743 Mon Sep 17 00:00:00 2001
From: Pattadon <pattadon2546pn@gmail.com>
Date: Mon, 27 Nov 2023 15:56:44 +0700
Subject: [PATCH 4/4] Fix progress calculation and add totalTaskToday state

---
 .../src/components/dashboard/dashboard.jsx     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/dashboard/dashboard.jsx b/frontend/src/components/dashboard/dashboard.jsx
index 005f98a..74b4ac8 100644
--- a/frontend/src/components/dashboard/dashboard.jsx
+++ b/frontend/src/components/dashboard/dashboard.jsx
@@ -28,6 +28,7 @@ export function Dashboard() {
   const [totalTask, setTotalTask] = useState(0);
   const [totalCompletedTasks, settotalCompletedTasks] = useState(0);
   const [totalCompletedTasksToday, setTotalCompletedTasksToday] = useState(0);
+  const [totalTaskToday, setTotalTaskToday] = useState(0);
   const [progressData, setProgressData] = useState(0);
   const [overdueTask, setOverdueTask] = useState(0);
 
@@ -36,19 +37,16 @@ export function Dashboard() {
       const response = await axiosInstance.get("/dashboard/todostats/");
       const totalTaskValue = response.data.total_tasks || 0;
       const totalCompletedTasksValue = response.data.total_completed_tasks || 0;
+      const totalTaskTodayValue = response.data.total_task_today || 0;
       const totalCompletedTasksTodayValue =
-        response.data.total_completed_tasks_today || 0;
-      const totalTaskToday = response.data.total_task_today || 0;
-      const totalCompletedTasksToday = response.data.tasks_completed_today || 0;
+        response.data.tasks_completed_today || 0;
       const overdueTasks = response.data.overdue_tasks || 0;
-
-      const progress =
-        (totalCompletedTasksToday / totalCompletedTasksToday) * 100;
+      const progress = (totalCompletedTasksToday / totalTaskToday) * 100;
 
       setTotalTask(totalTaskValue);
       settotalCompletedTasks(totalCompletedTasksValue);
       setTotalCompletedTasksToday(totalCompletedTasksTodayValue);
-      setTotalTaskToday(totalTaskToday);
+      setTotalTaskToday(totalTaskTodayValue);
       setProgressData(progress);
       setOverdueTask(overdueTasks);
     };
@@ -147,7 +145,11 @@ export function Dashboard() {
                   <Flex className="flex-col items-center">
                     <ProgressCircle
                       className="mt-6"
-                      value={progressData}
+                      value={
+                        isNaN(progressData) || !isFinite(progressData)
+                          ? 0
+                          : `${progressData.toFixed(0)}%`
+                      }
                       size={200}
                       strokeWidth={10}
                       radius={60}