Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public TaskDTO createTask(TaskRequestDTO request) {
task.setDateCreated(LocalDate.now());
task.setTeam(team);
task.setPriority(priority);

task.setDueDate(request.getDueDate());
if (request.getDescription() != null) {
task.setDescription(request.getDescription());
}
Expand Down
9 changes: 0 additions & 9 deletions frontend/react-app/src/CreateTask.test.js

This file was deleted.

13 changes: 0 additions & 13 deletions frontend/react-app/src/CreateTaskForm.test.js

This file was deleted.

91 changes: 67 additions & 24 deletions frontend/react-app/src/components/CreateTaskForm.jsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,53 @@
import { useState, useEffect } from 'react';
import {useForm} from 'react-hook-form'
import { useState, useEffect, useMemo } from 'react';
import {useForm, Controller} from 'react-hook-form'
import Select from 'react-select'
import '../css/CreateTaskForm.css'
import {assignMemberToTask, getTeamsForMember} from '../api/teamMemberApi'
import {assignMemberToTask, getTeamsForMember, massAssignMemberToTask} from '../api/teamMemberApi'
import { createTask } from '../api/taskApi';
import { useCookies } from 'react-cookie';
import { getTeamMembers } from '../api/teamApi';
function CreateTaskForm(){
const [cookies] = useCookies(['userInfo'])
const userId = cookies.userInfo.accountId

function CreateTaskForm({userId}){

const [userTeams, setData] = useState([]);
const [loading, setLoading] = useState(true);
const [teamMembers, setTeamMembers] = useState([]);
const { register, handleSubmit, formState: {errors}} = useForm();
const { register, handleSubmit, formState: {errors}, control} = useForm();
function getTeamMemberIds(teamMembers){
return teamMembers.map((teamMember)=>(
teamMember.value
))
}
const customStyles = {
control: (provided) => ({
...provided,
width: '100%',
minWidth: '100px',
maxWidth: '100%',
minHeight: '30px',
maxHeight: '100%',
border: '2px solid grey',
borderRadius: '10px',
paddingLeft: '8px',
backgroundColor: '#BFCDE0',
margin: '10px 0px',
cursor: 'pointer'
}),
option: (provided, state) =>({
...provided,
cursor: state.isSelected ? 'default' : 'pointer',
})
};
function formatTeamData(myTeamMembers){
return myTeamMembers.map((teamMember)=>(
{
value: teamMember.accountId,
label: teamMember.userName
}
))
}
//Once team is selected get the team members
const teamSelected = ((event)=>{
setTeamMembers([])
console.log(getTeamMembers(event.target.value))
getTeamMembers(event.target.value).then((results)=>setTeamMembers(results))
})
Expand All @@ -26,6 +60,7 @@ function CreateTaskForm(){
setLoading(false)
}
},[]);
const data = useMemo(()=>(teamMembers),[teamMembers])
const onSubmit = async (data)=> {
try {
createTask(
Expand All @@ -39,21 +74,21 @@ function CreateTaskForm(){

).then((response)=>{
if(Array.isArray(data.assignees)){
data.assignees.map((assignee)=>{
assignMemberToTask(response.taskId ,assignee.accountId).then((result)=>{
const assignees = getTeamMemberIds(data.assignees);
massAssignMemberToTask(response.taskId ,assignees).then((result)=>{
//debugging
console.log(result)
alert("TASK CREATED")
})
})}else{
assignMemberToTask(response.taskId ,data.assignees).then((result)=>{
})
}else{
assignMemberToTask(response.taskId ,data.assignees.value).then((result)=>{
//debugging
console.log(result)
alert("TASK CREATED")
})
}
})
window.location.href="/home";
//window.location.href="/home";
} catch (error) {
console.log(error)
alert("FAILED IN MAKING TASK");
Expand Down Expand Up @@ -95,15 +130,23 @@ function CreateTaskForm(){
</label>
<label className='majorLabel'>
Assigned To:
{teamMembers.length !== 0&&(<p>
<select id="" {...register('assignees',{required: true})}>
<option disabled selected value=''>Assign Users</option>
<option value={userId}>Yourself</option>
{teamMembers.map((teamMember)=>(
<option value={teamMember.accountId}>{teamMember.userName}</option>
))}
</select></p>)}
{teamMembers.length===0&&(
{data.length !== 0&&(<Controller
control={control}
className='Select'
name="assignees"
rules={{required:true}}
defaultValue={[]}
render={({field}) => (
<Select
{...field}
options={formatTeamData(data)}
isMulti

styles={customStyles}

/>)}
/>)}
{(data.length===0)&&(
<select {...register('assignees',{required: true})}>
<option disabled selected value =''>CHOOSE TEAM TO CHOOSE MEMBERS</option>
</select>
Expand All @@ -113,7 +156,7 @@ function CreateTaskForm(){
Add Discription

<div>
<input type="text" name="input-description" id="description" className='input'{...register("description", { required: false })}/>
<input type="text" name="input-description" id="description" className='input'{...register("description", { required: true })}/>
</div>
</label>
<label>
Expand Down
2 changes: 1 addition & 1 deletion frontend/react-app/src/components/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function Header(){

<h1 className ="inHeader">
<ul className ='list'>
<li className ="logo list"><span><a href="#">Whatever we Call this</a></span></li>
<li className ="logo list"><span><a href="/home">Whatever we Call this</a></span></li>
<li><span><a href="/home">Home</a></span></li>
<li><span><a href="/my-tasks">Tasks</a></span></li>
<li><span><a href="/profile">Profile</a></span></li>
Expand Down
5 changes: 5 additions & 0 deletions frontend/react-app/src/pages/CreateTask.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@ import fakeTeamData from "../FakeData/fakeTeamData.json"
import Header from "../components/Header"
import CreateTaskForm from "../components/CreateTaskForm"
import "../css/CreateTask.css"
import { useCookies } from 'react-cookie';
function CreateTask(){

const [cookies] = useCookies(['userInfo'])
const userId = cookies.userInfo.accountId

return (
<div className='pageContainer'>
<Header/>
<div className='pageBody'>

<CreateTaskForm
team={fakeTeamData}
userId={userId}
/>

</div>
Expand Down
6 changes: 6 additions & 0 deletions frontend/react-app/src/tests/CreateTaskForm.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// For some reson jest can't find imports on this page idk why they are correct
test("renders Task page", () => {

//check if the Create Task is rendered with all team members as options is rendered
expect(true)
});
29 changes: 0 additions & 29 deletions frontend/react-app/src/tests/Profile.test.js

This file was deleted.