Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master-merge-5-12 #513

Merged
merged 29 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f492f83
moved cards simuntaneously
harsh12-99 Oct 4, 2023
91b6420
Merge pull request #503 from AI4Bharat/CL-526
harsh12-99 Oct 5, 2023
0f54956
fix for snackbar closing immediately for transcription task
Chetan-Gudagamanal Oct 11, 2023
f8c17ca
fixed issue while dragging first subtitle card in bottom timeline
Chetan-Gudagamanal Oct 12, 2023
7c934d7
Merge pull request #504 from AI4Bharat/fix_for_snackbar_closing_immed…
AlpanaMajhi Oct 16, 2023
613f714
Merge branch 'develop2' into fix_for_first_subtitle_drag_issue_in_tim…
Chetan-Gudagamanal Oct 17, 2023
1a9da49
fixed the issue of first subtitle drag which holds on to mouse keypre…
Chetan-Gudagamanal Oct 17, 2023
474604a
Newsletter changes
AlpanaMajhi Oct 23, 2023
592eec8
added delete voiceover and reopen task feature
Chetan-Gudagamanal Nov 6, 2023
16dbc56
updated button name in previous commit
Chetan-Gudagamanal Nov 6, 2023
7d6d9f4
Merge pull request #506 from AI4Bharat/reopen_task_by_deleting_voiceo…
AlpanaMajhi Nov 8, 2023
6b80a8d
Merge pull request #505 from AI4Bharat/fix_for_first_subtitle_drag_is…
AlpanaMajhi Nov 8, 2023
f2c59e4
added feature to not allow voiceover time change and new subtitle box
Chetan-Gudagamanal Nov 8, 2023
ba768bf
Merge pull request #508 from AI4Bharat/feature_for_not_allowing_voice…
AlpanaMajhi Nov 8, 2023
90124e7
newsletter changes
AlpanaMajhi Nov 14, 2023
0f12b5c
Merge branch 'develop2' into newsletter
AlpanaMajhi Nov 14, 2023
7e7e5c1
added modal for task reopen if voiceover dependency present
Chetan-Gudagamanal Nov 20, 2023
a91dfb8
rearranged failInfoOnSave cols and updated reopen dialog message
Chetan-Gudagamanal Nov 21, 2023
33dfd4b
newsletter preview changes
AlpanaMajhi Nov 22, 2023
ac8f8e3
Merge pull request #509 from AI4Bharat/task_reopen_dialog_modal
AlpanaMajhi Nov 26, 2023
e7f4bb1
video update
AlpanaMajhi Nov 27, 2023
92a8148
display bad sentances on transcription complete
Chetan-Gudagamanal Nov 29, 2023
af6b3a8
Merge pull request #511 from AI4Bharat/badsentances_display_for_trans…
AlpanaMajhi Nov 29, 2023
51f863d
Merge branch 'develop2' into merge-video
AlpanaMajhi Dec 1, 2023
b218a21
settings
AlpanaMajhi Dec 1, 2023
4db3ae6
coverted bool to string
AlpanaMajhi Dec 1, 2023
d46b9ef
api integrated for bulk update and removed message for delete vo
AlpanaMajhi Dec 5, 2023
ac1993d
daily emails bug fixed
AlpanaMajhi Dec 5, 2023
139fd58
resolved conflicts
AlpanaMajhi Dec 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/common/DeleteDialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ const DeleteDialog = ({
Cancel
</Button>
<Button
color="error"
variant="contained"
onClick={() => submit()}
autoFocus
Expand Down
120 changes: 120 additions & 0 deletions src/common/TaskReopenDialog.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
import React from "react";

//Components
import {
Box,
Button,
Dialog,
DialogActions,
DialogContent,
DialogContentText,
Table,
TableBody,
TableCell,
TableHead,
TableRow,
Tooltip,
} from "@mui/material";
import Loader from "./Spinner";

const headers = ["Video Id", "Task Type", "Target Language", "Video Name"];

const TaskReopenDialog = ({
openDialog,
handleClose,
submit,
message,
loading,
taskReopenResponse,
}) => {
return (
<Dialog
open={openDialog}
onClose={handleClose}
aria-labelledby="alert-dialog-title"
aria-describedby="alert-dialog-description"
maxWidth={"md"}
PaperProps={{ style: { borderRadius: "10px" } }}
>
<DialogContent>
<DialogContentText id="alert-dialog-description">
{message}
{/* <br/> */}
{/* If you continue, corresponding Voice-Over task would be deleted. */}
{taskReopenResponse && (
<TableRow
style={{
borderLeft: `2px solid #E9F7EF`,
borderRight: `2px solid #E9F7EF`,
backgroundColor: "#fff",
}}
>
<TableCell colSpan={9} sx={{ borderBottom: "none" }}>
<Box>
<Table size="large">
<TableHead>
<TableRow
style={{
height: "60px",
}}
>
{headers.map((item, index) => {
return (
<TableCell key={index} sx={{ padding: "6px 16px" }}>
{item}
</TableCell>
);
})}
</TableRow>
</TableHead>
<TableBody>
{taskReopenResponse.map((item, index) => {
return (
<TableRow
key={index}
style={{
backgroundColor: "rgba(254, 191, 44, 0.1)",
height: "60px",
}}
>
<TableCell>{item.video_id}</TableCell>
<TableCell>{item.task_type}</TableCell>
<TableCell>
{item.target_language}
</TableCell>
<TableCell>{item.video_name}</TableCell>
</TableRow>
);
})}
</TableBody>
</Table>
</Box>
</TableCell>
</TableRow>
)}
</DialogContentText>
</DialogContent>
<DialogActions sx={{ p: "0 20px 20px 20px" }}>
<Button
variant="text"
onClick={handleClose}
sx={{ lineHeight: "1", borderRadius: "8px" }}
>
Cancel
</Button>
<Button
color="error"
variant="contained"
onClick={() => submit()}
autoFocus
sx={{ lineHeight: "1", borderRadius: "8px" }}
>
Reopen
{loading && <Loader size={20} margin="0 0 0 5px" color="secondary" />}
</Button>
</DialogActions>
</Dialog>
);
};

export default TaskReopenDialog;
Loading
Loading