Skip to content

Commit 6e1bc10

Browse files
committed
work
1 parent 6ed4bc3 commit 6e1bc10

24 files changed

+352
-265
lines changed

src/main/java/org/woehlke/java/simpleworklist/domain/AbstractController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1313
import org.woehlke.java.simpleworklist.domain.db.data.Task;
1414
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
15-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
15+
import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
1616
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
1717
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
1818
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
@@ -30,7 +30,7 @@
3030
import java.util.Locale;
3131

3232
import static java.util.Locale.GERMAN;
33-
import static org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.*;
33+
import static org.woehlke.java.simpleworklist.domain.db.data.TaskState.*;
3434

3535
/**
3636
* Created by tw on 14.02.16.

src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectIdController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
2121
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
2222
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
23-
import org.woehlke.java.simpleworklist.domain.meso.move.MoveTaskService;
24-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
23+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.MoveTaskService;
24+
import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
2525
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
2626
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
2727
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
@@ -32,7 +32,7 @@
3232
import java.util.List;
3333
import java.util.Locale;
3434

35-
import static org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.PROJECTS;
35+
import static org.woehlke.java.simpleworklist.domain.db.data.TaskState.PROJECTS;
3636

3737
/**
3838
* Created by tw on 14.02.16.

src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectRootController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
2222
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
2323
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
24-
import org.woehlke.java.simpleworklist.domain.meso.move.MoveTaskService;
25-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
24+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.MoveTaskService;
25+
import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
2626
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
2727
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
2828
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
@@ -32,7 +32,7 @@
3232
import java.util.Locale;
3333
import java.util.UUID;
3434

35-
import static org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.PROJECTS;
35+
import static org.woehlke.java.simpleworklist.domain.db.data.TaskState.PROJECTS;
3636

3737
@Slf4j
3838
@Controller

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Task.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.format.annotation.DateTimeFormat;
2727
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
2828
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
29-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
3029
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
3130
import org.woehlke.java.simpleworklist.application.framework.AuditModel;
3231
import org.woehlke.java.simpleworklist.application.framework.ComparableById;
@@ -75,8 +74,8 @@
7574
@NamedQuery(
7675
name = "findByTaskStateTrashAndContext",
7776
query = "select t from Task t " +
78-
"where t.taskState = org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.TRASH " +
79-
"or t.taskState = org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.DELETED " +
77+
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.TaskState.TRASH " +
78+
"or t.taskState = org.woehlke.java.simpleworklist.domain.db.data.TaskState.DELETED " +
8079
"and t.context = :context",
8180
lockMode = LockModeType.READ
8281
)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.meso.taskworkflow;
1+
package org.woehlke.java.simpleworklist.domain.db.data;
22

33
import java.io.Serializable;
44
import java.util.Arrays;
@@ -9,7 +9,6 @@
99
*/
1010
public enum TaskState implements Serializable {
1111

12-
1312
INBOX("fas fa-inbox"),
1413
TODAY("fas fa-clock"),
1514
NEXT("fas fa-cogs"),

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/project/ProjectControllerServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import javax.validation.constraints.NotNull;
2121
import java.util.Locale;
2222

23-
import static org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.PROJECTS;
23+
import static org.woehlke.java.simpleworklist.domain.db.data.TaskState.PROJECTS;
2424

2525
@Slf4j
2626
@Service

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.springframework.stereotype.Repository;
1111
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1212
import org.woehlke.java.simpleworklist.domain.db.data.Task;
13-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
13+
import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
1414
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1515

1616
@Repository

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.woehlke.java.simpleworklist.domain.db.data.Context;
66
import org.woehlke.java.simpleworklist.domain.db.data.Project;
77
import org.woehlke.java.simpleworklist.domain.db.data.Task;
8-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
8+
import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
99

1010
import java.util.List;
1111

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1212
import org.woehlke.java.simpleworklist.domain.db.data.Task;
1313
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectRepository;
14-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
14+
import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
1515

1616
import javax.validation.Valid;
1717
import javax.validation.constraints.Min;
Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
package org.woehlke.java.simpleworklist.domain.meso;
2+
3+
import lombok.extern.slf4j.Slf4j;
4+
import org.springframework.beans.factory.annotation.Autowired;
5+
import org.springframework.stereotype.Controller;
6+
import org.springframework.ui.Model;
7+
import org.springframework.web.bind.annotation.ModelAttribute;
8+
import org.springframework.web.bind.annotation.PathVariable;
9+
import org.springframework.web.bind.annotation.RequestMapping;
10+
import org.springframework.web.bind.annotation.RequestMethod;
11+
import org.woehlke.java.simpleworklist.domain.AbstractController;
12+
import org.woehlke.java.simpleworklist.domain.db.data.Context;
13+
import org.woehlke.java.simpleworklist.domain.db.data.Project;
14+
import org.woehlke.java.simpleworklist.domain.db.data.Task;
15+
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
16+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.MoveTaskService;
17+
18+
import javax.validation.constraints.NotNull;
19+
20+
@Slf4j
21+
@Controller
22+
@RequestMapping(path = "/taskstate/task")
23+
public class TaskMoveController extends AbstractController {
24+
25+
private final MoveTaskService moveTaskService;
26+
27+
@Autowired
28+
public TaskMoveController(MoveTaskService moveTaskService) {
29+
this.moveTaskService = moveTaskService;
30+
}
31+
32+
@RequestMapping(path = "/{taskId}/move/to/project/{projectId}", method = RequestMethod.GET)
33+
public final String moveTaskToAnotherProject(
34+
@NotNull @PathVariable("taskId") Task task,
35+
@NotNull @PathVariable("projectId") Project project,
36+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
37+
Model model
38+
) {
39+
task = moveTaskService.moveTaskToAnotherProject(task,project);
40+
userSession.setLastProjectId(project.getId());
41+
model.addAttribute("userSession",userSession);
42+
model.addAttribute("dataPage", true);
43+
return task.getTaskState().getUrl();
44+
}
45+
46+
@RequestMapping(path = "/{taskId}/move/to/project/root", method = RequestMethod.GET)
47+
public final String moveTaskToRootProject(
48+
@NotNull @PathVariable("taskId") Task task,
49+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
50+
Model model
51+
) {
52+
task = moveTaskService.moveTaskToRootProject(task);
53+
userSession.setLastProjectId(0L);
54+
model.addAttribute("userSession",userSession);
55+
model.addAttribute("dataPage", true);
56+
return task.getTaskState().getUrl();
57+
}
58+
59+
@RequestMapping(path = "/{taskId}/move/to/taskstate/inbox", method = RequestMethod.GET)
60+
public final String moveTaskToInbox(
61+
@NotNull @PathVariable("taskId") Task task,
62+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
63+
Model model
64+
) {
65+
log.info("dragged and dropped "+task.getId()+" to inbox");
66+
task = moveTaskService.moveTaskToInbox(task);
67+
model.addAttribute("userSession", userSession);
68+
model.addAttribute("dataPage", true);
69+
return task.getTaskState().getUrl();
70+
}
71+
72+
@RequestMapping(path = "/{taskId}/move/to/taskstate/today", method = RequestMethod.GET)
73+
public final String moveTaskToToday(
74+
@NotNull @PathVariable("taskId") Task task,
75+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
76+
Model model
77+
) {
78+
log.info("dragged and dropped "+task.getId()+" to today");
79+
task = moveTaskService.moveTaskToToday(task);
80+
model.addAttribute("userSession", userSession);
81+
model.addAttribute("dataPage", true);
82+
return task.getTaskState().getUrl();
83+
}
84+
85+
@RequestMapping(path = "/{taskId}/move/to/taskstate/next", method = RequestMethod.GET)
86+
public final String moveTaskToNext(
87+
@NotNull @PathVariable("taskId") Task task,
88+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
89+
Model model
90+
) {
91+
log.info("dragged and dropped "+task.getId()+" to next");
92+
task = moveTaskService.moveTaskToNext(task);
93+
model.addAttribute("userSession", userSession);
94+
model.addAttribute("dataPage", true);
95+
return task.getTaskState().getUrl();
96+
}
97+
98+
@RequestMapping(path = "/{taskId}/move/to/taskstate/waiting", method = RequestMethod.GET)
99+
public final String moveTaskToWaiting(
100+
@NotNull @PathVariable("taskId") Task task,
101+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
102+
Model model
103+
) {
104+
log.info("dragged and dropped "+task.getId()+" to waiting");
105+
task = moveTaskService.moveTaskToWaiting(task);
106+
model.addAttribute("userSession", userSession);
107+
model.addAttribute("dataPage", true);
108+
return task.getTaskState().getUrl();
109+
}
110+
111+
@RequestMapping(path = "/{taskId}/move/to/taskstate/someday", method = RequestMethod.GET)
112+
public final String moveTaskToSomeday(
113+
@NotNull @PathVariable("taskId") Task task,
114+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
115+
Model model
116+
) {
117+
log.info("dragged and dropped "+task.getId()+" to someday");
118+
task = moveTaskService.moveTaskToSomeday(task);
119+
model.addAttribute("userSession", userSession);
120+
model.addAttribute("dataPage", true);
121+
return task.getTaskState().getUrl();
122+
}
123+
124+
@RequestMapping(path = "/{taskId}/move/to/taskstate/focus", method = RequestMethod.GET)
125+
public final String moveTaskToFocus(
126+
@NotNull @PathVariable("taskId") Task task,
127+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
128+
Model model
129+
) {
130+
log.info("dragged and dropped "+task.getId()+" to focus");
131+
task = moveTaskService.moveTaskToFocus(task);
132+
model.addAttribute("userSession", userSession);
133+
model.addAttribute("dataPage", true);
134+
return task.getTaskState().getUrl();
135+
}
136+
137+
@RequestMapping(path = "/{taskId}/move/to/taskstate/completed", method = RequestMethod.GET)
138+
public final String moveTaskToCompleted(
139+
@NotNull @PathVariable("taskId") Task task,
140+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
141+
Model model
142+
) {
143+
log.info("dragged and dropped "+task.getId()+" to completed");
144+
task = moveTaskService.moveTaskToCompleted(task);
145+
model.addAttribute("userSession", userSession);
146+
model.addAttribute("dataPage", true);
147+
return task.getTaskState().getUrl();
148+
}
149+
150+
@RequestMapping(path = "/{taskId}/move/to/taskstate/trash", method = RequestMethod.GET)
151+
public final String moveTaskToTrash(
152+
@NotNull @PathVariable("taskId") Task task,
153+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
154+
Model model
155+
) {
156+
log.info("dragged and dropped "+task.getId()+" to trash");
157+
task = moveTaskService.moveTaskToTrash(task);
158+
model.addAttribute("userSession", userSession);
159+
model.addAttribute("dataPage", true);
160+
return task.getTaskState().getUrl();
161+
}
162+
163+
@RequestMapping(path = "/completed/move/to/trash", method = RequestMethod.GET)
164+
public final String moveAllCompletedToTrash(
165+
@ModelAttribute("userSession") UserSessionBean userSession,
166+
Model model
167+
) {
168+
Context context = super.getContext(userSession);
169+
moveTaskService.moveAllCompletedToTrash(context);
170+
model.addAttribute("userSession", userSession);
171+
model.addAttribute("dataPage", true);
172+
return "redirect:/taskstate/trash";
173+
}
174+
175+
@RequestMapping(path = "/trash/empty", method = RequestMethod.GET)
176+
public final String emptyTrash(
177+
@ModelAttribute("userSession") UserSessionBean userSession,
178+
Model model
179+
) {
180+
Context context = super.getContext(userSession);
181+
moveTaskService.emptyTrash(context);
182+
model.addAttribute("userSession", userSession);
183+
model.addAttribute("dataPage", true);
184+
return "redirect:/taskstate/trash";
185+
}
186+
187+
}

0 commit comments

Comments
 (0)