From f6e37d0f14214bd706b4bc95cda3674871f59b9d Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Tue, 16 May 2023 06:45:53 -0400
Subject: [PATCH] My Task page

---
 src/components/MyActiveJobs/MyActiveJobTable.jsx |  8 ++++----
 src/services/UsersService.js                     | 12 ++++++++++++
 src/views/MyTaskPage.jsx                         |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/components/MyActiveJobs/MyActiveJobTable.jsx b/src/components/MyActiveJobs/MyActiveJobTable.jsx
index dbae9da..f918103 100644
--- a/src/components/MyActiveJobs/MyActiveJobTable.jsx
+++ b/src/components/MyActiveJobs/MyActiveJobTable.jsx
@@ -68,10 +68,10 @@ export default function MyActiveJobTable({MyJobList, className }) {
                                                         Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
                                                         </span>
                                                         <span className="text-sm text-thin-light-gray">
-                                                        Expire:   <span className="text-purple"> {value.expire}</span>
+                                                        Due Date:   <span className="text-purple"> {value.delivery_date}</span>
                                                         </span>
                                                         <span className="text-sm text-thin-light-gray">
-                                                        Send to:   <span className="text-purple"> {value.job_to}</span>
+                                                        Confirmation:   <span className="text-purple"> {value.contract}</span>
                                                         </span>
 
                                                     </div>
@@ -82,10 +82,10 @@ export default function MyActiveJobTable({MyJobList, className }) {
                                             <td className="text-right py-4 px-2">
                                                 <button
                                                     type="button"
-                                                    onClick={()=>{setJobPopout({show:true, data:value})}}
+                                                    onClick={()=>{alert("Go to the full active job page");}}
                                                     className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                                                 >
-                                                    View
+                                                    Manage
                                                 </button>
                                             </td>
                                         </tr>
diff --git a/src/services/UsersService.js b/src/services/UsersService.js
index 72c70f2..7aca25a 100644
--- a/src/services/UsersService.js
+++ b/src/services/UsersService.js
@@ -198,6 +198,18 @@ class usersService {
         return this.postAuxEnd("/sendmoneyfee", postData);
     }
 
+    // Task for the person doing the job
+    getMyActiveTaskList(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            offset:0,
+            limit :100
+        };
+        return this.postAuxEnd("/activetaskslist", postData);
+    }
     getMyActiveJobList(){
         var postData = {
             uuid: localStorage.getItem("uid"),
diff --git a/src/views/MyTaskPage.jsx b/src/views/MyTaskPage.jsx
index a957162..08e2af8 100644
--- a/src/views/MyTaskPage.jsx
+++ b/src/views/MyTaskPage.jsx
@@ -10,7 +10,7 @@ export default function MyTaskPage() {
 
     const getMyActiveJobList = async () => {
         try {
-            const res = await api.getMyActiveJobList();
+            const res = await api.getMyActiveTaskList();
             setMyActiveJobList(res.data);
         } catch (error) {
             console.log("Error getting mode");