Merge pull request #819 from AI4Bharat/Rahul-534

Rahul 534
AI4Bharat · Sep 5, 2024 · 0f7794a · 0f7794a
2 parents 625826b + 348e8c4
commit 0f7794a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/config/tableColumns.js b/src/config/tableColumns.js
@@ -161,6 +161,10 @@ export const adminMemberListColumns = [
 ];
 
 export const videoTaskListColumns = [
+  {
+    name:"id",
+    label:"Task Id"
+  },
   {
     name: "task_type",
     label: "Task Type",
@@ -174,6 +178,15 @@ export const videoTaskListColumns = [
       },
     },
   },
+  {
+    name: "eta",
+    label: "ETA",
+    options: {
+      customBodyRender: (value) => {
+        return <Box>{moment(value).format("DD/MM/YYYY HH:mm:ss")}</Box>;
+      },
+    },
+  },
   {
     name: "created_at",
     label: "Created At",

diff --git a/src/containers/Organization/Project/Project.jsx b/src/containers/Organization/Project/Project.jsx
@@ -379,7 +379,11 @@ const Project = () => {
           >
             <Tab label={"Videos"} sx={{ fontSize: 16, fontWeight: "700" }} />
             <Tab label={"Tasks"} sx={{ fontSize: 16, fontWeight: "700" }} />
-            <Tab label={"Members"} sx={{ fontSize: 16, fontWeight: "700" }} />
+            {/* <Tab label={"Members1"} sx={{ fontSize: 16, fontWeight: "700" }} /> */}
+            {roles.filter((role) => role.value === userData?.role)[0]
+              ?.canAddMembers && (
+              <Tab label={"Members"} sx={{ fontSize: 16, fontWeight: "700" }} />
+            )}
             {roles.filter((role) => role.value === userData?.role)[0]
               ?.ProjectReport && (
               <Tab label={"Reports"} sx={{ fontSize: 16, fontWeight: "700" }} />