Skip to content

Commit

Permalink
added new changes
Browse files Browse the repository at this point in the history
  • Loading branch information
sagarika-padmanaban committed Dec 20, 2023
1 parent 254d397 commit 3519936
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/redux/actions/api/Tasks/GetTasksByProjectId.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
this.type = constants.GET_TASK_LIST;
let queryString = `?project_id=${projectId}${pageNo ? "&page="+pageNo : ""}${countPerPage ?"&records="+countPerPage : ""}`;
let querystr = pull === "All" ?"": `&editable=${pullvalue}`
let querystr1 = rejected === "Yes" ?`&rejected=`+true:rejected === "No"? `&rejected=`+false:""
let querystr1 = rejected === "Yes" ?`&rejected=`+"True":rejected === "No"? `&rejected=`+false:""
for (let key in selectedFilters) {
if (selectedFilters[key] && selectedFilters[key] !== -1) {
switch (key) {
Expand Down
4 changes: 2 additions & 2 deletions src/ui/pages/component/Project/FilterList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const FilterList = (props) => {
console.log(filterStatusData, selectedStatus, currentFilters);
const pulledstatus = currentFilters?.annotation_status ? ["Pulled By reviewer", "Not Pulled By reviewer"]
: currentFilters?.review_status ? ["Pulled By SuperChecker", "Not Pulled By SuperChecker"] : null;
const rejectedStatus = ["Yes", "No"];
const rejectedStatus = ["Yes"];
const handleStatusChange = (e) => {
let statusvalue = !!currentFilters?.annotation_status ? "annotation_status" : "review_status"
// let pullvalue = (pull == 'Pulled By reviewer' || pull == 'Pulled By SuperChecker') ? false :
Expand Down Expand Up @@ -199,7 +199,7 @@ const FilterList = (props) => {
</MenuItem>
))}
</Select>
</FormControl> : currentFilters?.review_status && selectedStatus == "unreviewed" || selectedStatus == "accepted_with_major_changes" || selectedStatus == "accepted_with_minor_changes" || selectedStatus == "accepted" ? <FormControl sx={{ m: 1, minWidth: 125 }} size="small" >
</FormControl> : currentFilters?.review_status && selectedStatus == "accepted_with_major_changes" || selectedStatus == "accepted_with_minor_changes" || selectedStatus == "accepted" ? <FormControl sx={{ m: 1, minWidth: 125 }} size="small" >
<InputLabel id="project-type-label" sx={{
fontSize: "16px",
position: "inherit",
Expand Down

0 comments on commit 3519936

Please sign in to comment.