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.

Sign up for GitHub

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

filter user annotations in all flows #773

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

filter user annotations in all flows #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1248e80
filter annotations by user
ayushpanwar25 Sep 26, 2023
90266a3
Merge branch 'develop' into const-branch
ayushpanwar25 Sep 26, 2023
1ac5469
autosave fix
ayushpanwar25 Sep 26, 2023
6120849
Merge branch 'develop' into const-branch
ayushpanwar25 Sep 27, 2023
e87f8f9
Merge branch 'develop' into const-branch
ishvindersethi22 Sep 27, 2023
b7308aa
Merge branch 'develop' into const-branch
ayushpanwar25 Oct 23, 2023
1d73ad1
minor changes
ayushpanwar25 Oct 23, 2023
ae8fb8d
minor changes
ayushpanwar25 Oct 25, 2023
27ae9d7
user filter lsf
ayushpanwar25 Oct 26, 2023
6e72120
Merge branch 'develop' into const-branch
ayushpanwar25 Oct 26, 2023
c90c45f
add warning to keep first segment/box
ayushpanwar25 Oct 26, 2023
46e6df1
Merge branch 'develop' into const-branch
ishvindersethi22 Oct 29, 2023
a932591
Merge branch 'develop' into const-branch
ishvindersethi22 Nov 17, 2023
fc1800e
Merge branch 'develop' into const-branch
ayushpanwar25 Nov 22, 2023
4ec14d2
Merge branch 'develop' into const-branch
ishvindersethi22 Dec 11, 2023
a78c4a2
Merge branch 'develop' into const-branch
ishvindersethi22 Jan 5, 2024
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
13 changes: 7 additions & 6 deletions src/redux/actions/api/LSFAPI/LSFAPI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const patchAnnotation = async (
});
return res;
} catch (err) {
return err;
return { err, status: 400 };
}
};

Expand All @@ -133,7 +133,7 @@ const patchReview = async (
autoSave=false
) => {
try {
await axiosInstance.patch(`/annotation/${annotationID}/`, {
const res = await axiosInstance.patch(`/annotation/${annotationID}/`, {
lead_time: (new Date() - load_time) / 1000 + Number(lead_time ?? 0),
annotation_status: review_status,
result: result,
Expand All @@ -150,13 +150,14 @@ const patchReview = async (
}),
...(autoSave && { auto_save: true }),
});
return res;
// if (review_status === "to_be_revised") {
// await axiosInstance.patch(`/annotation/${parentAnnotation}/`, {
// annotation_status: review_status,
// });
// }
} catch (err) {
return err;
return { err, status: 400 };
}
};

Expand All @@ -173,17 +174,17 @@ const patchSuperChecker = async (
) => {
console.log(superchecknotes,"superchecknotes")
try {
await axiosInstance.patch(`/annotation/${annotationID}/`, {
const res = await axiosInstance.patch(`/annotation/${annotationID}/`, {
lead_time: (new Date() - load_time) / 1000 + Number(lead_time ?? 0),
annotation_status: review_status,
result: result,
parent_annotation: parentAnnotation,
supercheck_notes: superchecknotes,
...(autoSave && { auto_save: true }),
});

return res;
} catch (err) {
return err;
return { err, status: 400 };
}
};

Expand Down
243 changes: 126 additions & 117 deletions src/ui/pages/component/CL-Transcription/SuperCheckerStageButtons.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ const SuperCheckerStageButtons = ({
disableSkip,
anchorEl,
setAnchorEl,
filterMessage,
disableBtns,
// taskData,
}) => {
// const classes = AudioTranscriptionLandingStyle();
Expand Down Expand Up @@ -127,7 +129,7 @@ const SuperCheckerStageButtons = ({
</div>

<Grid container spacing={1} sx={{ mt: 2, mb: 5, ml: 3 }}>
<Grid item>
{!disableBtns && <Grid item>
{taskData?.super_check_user === user?.id && (
<Tooltip title="Save task for later">
<Button
Expand All @@ -154,7 +156,7 @@ const SuperCheckerStageButtons = ({
</Button>
</Tooltip>
)}
</Grid>
</Grid>}

<Grid item>
<Tooltip title="Go to next task">
Expand All @@ -175,137 +177,144 @@ const SuperCheckerStageButtons = ({
</Tooltip>
</Grid>

<Grid item>
{!disableSkip && taskData?.super_check_user === user?.id && (
<Tooltip title="skip to next task">
<Button
value="Skip"
type="default"
variant="outlined"
{!disableBtns && <>
<Grid item>
{!disableSkip && taskData?.super_check_user === user?.id && (
<Tooltip title="skip to next task">
<Button
value="Skip"
type="default"
variant="outlined"
onClick={() =>
handleSuperCheckerClick(
"skipped",
SuperChecker.id,
SuperChecker.lead_time,
)
}
style={{
minWidth: "120px",
border: "1px solid gray",
color: "#d00",
pt: 2,
pb: 2,
}}
// className="lsf-button"
>
Skip
</Button>
</Tooltip>
)}
</Grid>
<Grid item>
{taskData?.super_check_user === user?.id && (
<Tooltip title="Reject">
<Button
value="rejected"
type="default"
variant="outlined"
onClick={() =>
handleSuperCheckerClick(
"rejected",
SuperChecker.id,
SuperChecker.lead_time,
SuperChecker.parent_annotation
)
}
disabled={
ProjectData.revision_loop_count >
taskData?.revision_loop_count?.super_check_count
? false
: true
}
style={{
minWidth: "120px",
border: "1px solid gray",
color: (
ProjectData.revision_loop_count >
taskData?.revision_loop_count?.super_check_count
? false
: true
)
? "#B2BABB"
: "#f5222d",
pt: 2,
pb: 2,
}}
>
Reject
</Button>
</Tooltip>
)}
</Grid>
<Grid item>
{taskData?.super_check_user === user?.id && (
<Tooltip title="Validate">
<Button
id="accept-button"
value="Validate"
type="default"
aria-controls={open ? "accept-menu" : undefined}
aria-haspopup="true"
aria-expanded={open ? "true" : undefined}
style={{
minWidth: "120px",
border: "1px solid gray",
color: "#52c41a",
pt: 3,
pb: 3,
}}
onClick={handleClick}
endIcon={<KeyboardArrowDownIcon />}
>
Validate
</Button>
</Tooltip>
)}
<StyledMenu
id="accept-menu"
MenuListProps={{
"aria-labelledby": "accept-button",
}}
anchorEl={anchorEl}
open={open}
onClose={handleClose}
>
<MenuItem
onClick={() =>
handleSuperCheckerClick(
"skipped",
"validated",
SuperChecker.id,
SuperChecker.lead_time,
SuperChecker.parent_annotation
)
}
style={{
minWidth: "120px",
border: "1px solid gray",
color: "#d00",
pt: 2,
pb: 2,
}}
// className="lsf-button"
disableRipple
>
Skip
</Button>
</Tooltip>
)}
</Grid>
<Grid item>
{taskData?.super_check_user === user?.id && (
<Tooltip title="Reject">
<Button
value="rejected"
type="default"
variant="outlined"
Validated No Changes
</MenuItem>
<MenuItem
onClick={() =>
handleSuperCheckerClick(
"rejected",
"validated_with_changes",
SuperChecker.id,
SuperChecker.lead_time,
SuperChecker.parent_annotation
)
}
disabled={
ProjectData.revision_loop_count >
taskData?.revision_loop_count?.super_check_count
? false
: true
}
style={{
minWidth: "120px",
border: "1px solid gray",
color: (
ProjectData.revision_loop_count >
taskData?.revision_loop_count?.super_check_count
? false
: true
)
? "#B2BABB"
: "#f5222d",
pt: 2,
pb: 2,
}}
>
Reject
</Button>
</Tooltip>
)}
</Grid>
<Grid item>
{taskData?.super_check_user === user?.id && (
<Tooltip title="Validate">
<Button
id="accept-button"
value="Validate"
type="default"
aria-controls={open ? "accept-menu" : undefined}
aria-haspopup="true"
aria-expanded={open ? "true" : undefined}
style={{
minWidth: "120px",
border: "1px solid gray",
color: "#52c41a",
pt: 3,
pb: 3,
}}
onClick={handleClick}
endIcon={<KeyboardArrowDownIcon />}
disableRipple
>
Validate
</Button>
</Tooltip>
)}
<StyledMenu
id="accept-menu"
MenuListProps={{
"aria-labelledby": "accept-button",
}}
anchorEl={anchorEl}
open={open}
onClose={handleClose}
>
<MenuItem
onClick={() =>
handleSuperCheckerClick(
"validated",
SuperChecker.id,
SuperChecker.lead_time,
SuperChecker.parent_annotation
)
}
disableRipple
>
Validated No Changes
</MenuItem>
<MenuItem
onClick={() =>
handleSuperCheckerClick(
"validated_with_changes",
SuperChecker.id,
SuperChecker.lead_time,
SuperChecker.parent_annotation
)
}
disableRipple
>
Validated with Changes
</MenuItem>
</StyledMenu>
</Grid>
Validated with Changes
</MenuItem>
</StyledMenu>
</Grid>
</>}
</Grid>
{filterMessage && (
<Alert severity="info" sx={{ ml:2,mb: 2,width:"95%" }}>
{filterMessage}
</Alert>
)}
</>
);
};
Expand Down
1 change: 1 addition & 0 deletions src/ui/pages/component/common/Tooltip.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const LightTooltip = styled(({ className, ...props }) => (
color: 'rgba(0, 0, 0, 0.87)',
boxShadow: theme.shadows[1],
fontSize: 11,
maxWidth: 400,
},
}));

Expand Down
Loading