Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fixed GETting of subtasks
  • Loading branch information
Claxtastic committed May 23, 2020
commit 967950da7b30d98af2a222a6b3105af99b0580c5
4 changes: 2 additions & 2 deletions client/src/components/AddTaskDialog/AddTaskDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ class AddTaskDialog extends React.Component {
var dueDate;
this.state.showDatePicker ? dueDate = this.state.selectedDate : dueDate = null;
var task = this.createTask(this.state.title, this.state.subTasks, dueDate);
// POST to backend
// Create JSON to POST
var taskJson = {
title: task.props.title,
subTasks: task.props.subTasks,
subTasks: Object.values(task.props.subTasks),
dueDate: task.props.dueDate
};
TaskService.postTask(taskJson);
Expand Down
1 change: 0 additions & 1 deletion client/src/components/Tasks/Tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ class Tasks extends React.Component {

// Add a newly created task to the rendered list
addTask(task) {
console.log(task.props.dueDate);
this.setState({
tasks: [
...this.state.tasks,
Expand Down
2 changes: 1 addition & 1 deletion client/src/service/TaskService.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class TaskService {
number={key}
removeTask={removeTask}
title={taskData.title}
subTasks={taskData.subtasks}
subTasks={taskData.subTasks}
dueDate={taskData.dueDate}/>
}
return taskComponents;
Expand Down
10 changes: 5 additions & 5 deletions server/src/main/java/com/group6/taskblaster/task/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@ public class Task {
private String title;

@ElementCollection(targetClass=String.class)
private List<String> subtasks;
private List<String> subTasks;

private String dueDate;

public Task() { }

public Task(String title, List<String> subtasks, String dueDate) {
public Task(String title, List<String> subTasks, String dueDate) {
this.title = title;
this.subtasks = subtasks;
this.subTasks = subTasks;
this.dueDate = dueDate;
}

public long getId() { return this.id; }
public String getTitle() { return this.title; }
public List<String> getSubtasks() { return subtasks; }
public List<String> getSubTasks() { return subTasks; }
public String getDueDate() { return this.dueDate; }

public void setId(final long id) { this.id = id; }
public void setTitle(final String title) { this.title = title; }
public void setSubttasks(final List<String> subtasks) { this.subtasks = subtasks; }
public void setSubTasks(final List<String> subTasks) { this.subTasks = subTasks; }
public void setDueDate(final String date) { this.dueDate = date; }

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public List<Task> getAllTasks() {

@PostMapping("/addtask")
public void postTask(@RequestBody Task task) {
System.out.println(task.getSubTasks());
repository.save(task);
// Task postedTask = repository.save(task);
// URI uri = ServletUriComponentsBuilder.fromCurrentRequest().path()
Expand Down