Merge pull request #520 from AI4Bharat/CL-579

CL-579 -- sorted project task list and added bg music in VO task export
AI4Bharat · Dec 13, 2023 · d65c39a · d65c39a
2 parents c91a7f6 + 093d17b
commit d65c39a
Show file tree

Hide file tree

Showing 6 changed files with 165 additions and 94 deletions.
diff --git a/src/common/ExportDialog.jsx b/src/common/ExportDialog.jsx
@@ -17,7 +17,7 @@ import {
   Typography,
 } from "@mui/material";
 import CloseIcon from "@mui/icons-material/Close";
-import { speakerInfoOptions } from "config";
+import { speakerInfoOptions, bgMusicOptions } from "config";
 
 const ExportDialog = ({
   open,
@@ -27,7 +27,8 @@ const ExportDialog = ({
   handleExportSubmitClick,
   handleExportRadioButtonChange,
 }) => {
-  const { transcription, translation, voiceover, speakerInfo } = exportTypes;
+  const { transcription, translation, voiceover, speakerInfo, bgMusic } =
+    exportTypes;
 
   const transcriptExportTypes = useSelector(
     (state) => state.getTranscriptExportTypes.data.export_types
@@ -140,8 +141,12 @@ const ExportDialog = ({
             </DialogActions>
           </>
         ) : (
+          <></>
+        )}
+
+        {taskType?.includes("VOICEOVER") && (
           <>
-            {/* <DialogContentText id="select-speaker-info" sx={{ mt: 2 }}>
+            <DialogContentText id="select-speaker-info" sx={{ mt: 2 }}>
               Background Music
             </DialogContentText>
             <DialogActions sx={{ my: 1, justifyContent: "flex-start" }}>
@@ -160,7 +165,7 @@ const ExportDialog = ({
                   ))}
                 </RadioGroup>
               </FormControl>
-            </DialogActions> */}
+            </DialogActions>
           </>
         )}
 

diff --git a/src/config/tableColumns.js b/src/config/tableColumns.js
@@ -270,51 +270,6 @@ export const taskListColumns = [
       customBodyRender: renderTaskListColumnCell,
     },
   },
-  {
-    name: "created_at",
-    label: "Created At",
-    options: {
-      display: false,
-      customBodyRender: (value, tableMeta) => {
-        const { tableData: data, rowIndex } = tableMeta;
-        const selectedTask = data[rowIndex];
-
-        return (
-          <Box
-            style={{
-              color: selectedTask.is_active ? "" : "grey",
-            }}
-          >
-            {moment(value).format("DD/MM/YYYY HH:mm:ss")}
-          </Box>
-        );
-      },
-    },
-  },
-
-  {
-    name: "updated_at",
-    label: "Updated At",
-    options: {
-      display: false,
-      customBodyRender: (value, tableMeta) => {
-        const { tableData: data, rowIndex } = tableMeta;
-        const selectedTask = data[rowIndex];
-
-        return (
-          <Box
-            style={{
-              color: selectedTask.is_active ? "" : "grey",
-            }}
-          >
-            {moment(value).format("DD/MM/YYYY HH:mm:ss")}
-          </Box>
-        );
-      },
-    },
-  },
-
-
   {
     name: "src_language_label",
     label: "Source Language",

diff --git a/src/containers/Organization/OrgLevelTaskList.jsx b/src/containers/Organization/OrgLevelTaskList.jsx
@@ -725,9 +725,10 @@ const OrgLevelTaskList = () => {
       name: "created_at",
       label: "Created At",
       options: {
+        filter: false,
         sort: false,
         canBeSorted: true,
-        display: columnDisplay.createdAt,
+        display: columnDisplay.created_at,
         customHeadLabelRender: CustomTableHeader,
         customBodyRender: (value, tableMeta) => {
           const { tableData: data, rowIndex } = tableMeta;
@@ -750,7 +751,8 @@ const OrgLevelTaskList = () => {
       name: "updated_at",
       label: "Updated At",
       options: {
-        display: columnDisplay.createdAt,
+        filter: false,
+        display: columnDisplay.updated_at,
         sort: false,
         canBeSorted: true,
         customHeadLabelRender: CustomTableHeader,