Merge pull request #824 from AI4Bharat/Rahul-537

Rahul 537
AI4Bharat · Sep 10, 2024 · 528693f · 528693f
2 parents 0f7794a + d092a6a
commit 528693f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/src/config/tableColumns.js b/src/config/tableColumns.js
@@ -196,6 +196,15 @@ export const videoTaskListColumns = [
       },
     },
   },
+  {
+    name: "eta",
+    label: "ETA",
+    options: {
+      customBodyRender: (value) => {
+        return <Box>{moment(value).format("DD/MM/YYYY HH:mm:ss")}</Box>;
+      },
+    },
+  },
   {
     name: "status",
     label: "Status",
@@ -338,6 +347,20 @@ export const taskListColumns = [
       },
     },
   },
+  {
+    name: "eta",  
+    label: "ETA",  
+    options: {
+      customBodyRender: (value) => {
+        if (value) {
+          const formattedETA = new Date(value).toLocaleString();
+          return <Box>{formattedETA}</Box>;
+        }
+        return <Box>N/A</Box>;
+      },
+    },
+  },
+
   {
     name: "time_spent",
     label: "Time Spent",

diff --git a/src/containers/Organization/OrgLevelTaskList.jsx b/src/containers/Organization/OrgLevelTaskList.jsx
@@ -211,7 +211,7 @@ const OrgLevelTaskList = () => {
       "description",
       "created_at",
       "updated_at",
-      "video_name",
+      // "video_name",
     ];
     allCols.forEach((ele) => {
       if (displayColsLocalStorage && ele in displayColsLocalStorage) {

diff --git a/src/containers/Organization/Project/TaskList.jsx b/src/containers/Organization/Project/TaskList.jsx
@@ -214,7 +214,7 @@ const TaskList = () => {
       "description",
       "created_at",
       "updated_at",
-      "video_name",
+      // "video_name",
     ];
     allCols.forEach((ele) => {
       if (displayColsLocalStorage && ele in displayColsLocalStorage) {