Skip to content

fixed duplicate headerandAccessor method in my tasks and team tasks pages #236

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

Merged
JamesBirni merged 1 commit into from
Mar 28, 2025
Merged

fixed duplicate headerandAccessor method in my tasks and team tasks pages #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
198 changes: 89 additions & 109 deletions frontend/react-app/src/pages/MyTasks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,118 +73,98 @@ useEffect(()=>{
useEffect(() => {

console.log("Tasks To Do (after state update):", tasksToDo);
}, [tasksToDo]);




const headerAndAccessors = [
{
Header: "Task Name",
accessor: "name",
Cell: (original) => (
<Link to="/view-task" state={{taskToSee: original.value, teamMembers: original.cell.row.values.assignees}}>{original.value.title}</Link>
)
},
{
Header: "TeamId",
accessor:"team",
},
{
Header: "ID",
accessor:"id",
},
{
Header: "Assignee(s)",
accessor: "assignees",
},
{
Header: "Status",
accessor: "status",
},
{
Header: "Priority",
accessor: "priority",
},
{
Header: "Due Date",
accessor: "dueDate",
},
{
Header: "Is Locked",
accessor: "isLocked",
}
]
const headerAndAccessorsComplete = [
{
Header: "Task Name",
accessor: "name",
Cell: (original) => (
<Link to="/view-task" state={{taskToSee: original.value, teamMembers: original.cell.row.values.assignees}}>{original.value.title}</Link>
)
},
{
Header: "Team",
accessor:"team",
},
{
Header: "ID",
accessor:"id",
},
{
Header: "Assignee(s)",
accessor: "assignees",
},
{
Header: "Due Date",
accessor: "dueDate",
},
{
Header: "Date Completed",
accessor: "dateCompteted",
}
]
if(loading){
return (<div>Loading...</div>)
}, [tasksToDo]);

const commonColumns = [
{
Header: "Task Name",
accessor: "name",
Cell: (original) => (
<Link to="/view-task" state={{taskToSee: original.value, teamMembers: original.cell.row.values.assignees}}>{original.value.title}</Link>
)
},
{
Header: "Team ID",
accessor:"team",
},
{
Header: "Task ID",
accessor:"id",
},
{
Header: "Assignee(s)",
accessor: "assignees",
},
{
Header: "Due Date",
accessor: "dueDate",
},
]


const headerAndAccessors = [
...commonColumns,
{
Header: "Status",
accessor: "status",
},
{
Header: "Priority",
accessor: "priority",
},
{
Header: "Is Locked",
accessor: "isLocked",
}
return (

<div className='pageContainer'>
<Header/>
<div className='pageBody'>
<div class="content-wrapper flexbox">

<h1>My Tasks</h1>
<span class ="taskBox">
{setUpData(tasksToDo).length > 0 ? (
<TaskList
dataToUse={setUpData(tasksToDo)}
headersAndAccessors={headerAndAccessors}
/>
) : (
<p>No tasks to do</p>
)}


</span>
<a href="/create-task"><button className="create-task-btn">Create Task</button></a>

<h2>My Completed Tasks</h2>
{setUpDataCompleted(tasksToDo).length > 0 ? (
<TaskList
dataToUse={setUpDataCompleted(tasksToDo)}
headersAndAccessors={headerAndAccessorsComplete}
/>
) : (
<h2>No tasks completed</h2>
)}


]
const headerAndAccessorsComplete = [
...commonColumns,
{
Header: "Date Completed",
accessor: "dateCompteted",
}
]
if(loading){
return (<div>Loading...</div>)
}
return (

<div className='pageContainer'>
<Header/>
<div className='pageBody'>
<div class="content-wrapper flexbox">

<h1>My Tasks</h1>
<span class ="taskBox">
{setUpData(tasksToDo).length > 0 ? (
<TaskList
dataToUse={setUpData(tasksToDo)}
headersAndAccessors={headerAndAccessors}
/>
) : (
<p>No tasks to do</p>
)}

</div>
</div>

</span>
<a href="/create-task"><button className="create-task-btn">Create Task</button></a>

<h2>My Completed Tasks</h2>
{setUpDataCompleted(tasksToDo).length > 0 ? (
<TaskList
dataToUse={setUpDataCompleted(tasksToDo)}
headersAndAccessors={headerAndAccessorsComplete}
/>
) : (
<h2>No tasks completed</h2>
)}



</div>
</div>
);
</div>
);


}
Expand Down
58 changes: 20 additions & 38 deletions frontend/react-app/src/pages/TeamTasks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,45 +39,8 @@ function setUpDataCompleted(results) {
isLocked: taskItem.isLocked.toString()
}));
}
const headerAndAccessors = [
{
Header: "Task Name",
accessor: "name",
Cell: (original) => (
<Link to="/view-task" state={{taskToSee: original.value, teamMembers: original.cell.row.values.assignees}}>{original.value.title}</Link>
)
},
{
Header: "ID",
accessor:"id",
},
{
Header: "Assignee(s)",
accessor: "assignees",
},
{
Header: "Priority",
accessor: "priority",
},
{
Header: "Status",
accessor: "status",
},

{
Header: "Due Date",
accessor: "dueDate",
},
{
Header: "Is Locked",
accessor: "isLocked",
}
]




const headerAndAccessorsComplete = [
const commonColumns= [
{
Header: "Task Name",
accessor: "name",
Expand All @@ -97,6 +60,25 @@ const headerAndAccessorsComplete = [
Header: "Due Date",
accessor: "dueDate",
},
]
const headerAndAccessors = [
...commonColumns,
{
Header: "Priority",
accessor: "priority",
},
{
Header: "Status",
accessor: "status",
},
{
Header: "Is Locked",
accessor: "isLocked",
}
]

const headerAndAccessorsComplete = [
...commonColumns,
{
Header: "Date Completed",
accessor: "dateCompteted",
Expand Down
Loading