sebastian/timemanager
Template
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

issue-47 #60

Merged
sebastian merged 13 commits from issue-47 into master 2023-11-13 18:54:08 +01:00
Conversation 0 Commits 13 Files Changed 42 +24 -20
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 01e3d87026 - Show all commits

32
backend/.idea/workspace.xml
View File

@ -4,18 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix wrong date">
<change afterPath="$PROJECT_DIR$/../frontend/nginx.conf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../frontend/proxy.conf.json" afterDir="false" />
<list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Deploy on docker (not productive yet!)">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../docker-compose.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/Dockerfile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/angular.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/angular.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/nginx/nginx.conf.template" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/nginx/run_nginx.sh" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -559,14 +550,21 @@
<option name="project" value="LOCAL" />
<updated>1699786723938</updated>
</task>
<option name="localTasksCounter" value="42" />
<task id="LOCAL-00042" summary="Deploy on docker (not productive yet!)">
<option name="closed" value="true" />
<created>1699803821051</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1699803821051</updated>
</task>
<option name="localTasksCounter" value="43" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="List missed Schedules" />
<MESSAGE value="Forget single schedule" />
<MESSAGE value="Fix marking finished task as overdue" />
<MESSAGE value="Write simple Testcase for ci/cd" />
@ -591,7 +589,8 @@
<MESSAGE value="Update values of datetime picker automatically for editing" />
<MESSAGE value="Adapt datetime-picker" />
<MESSAGE value="Fix wrong date" />
<option name="LAST_COMMIT_MESSAGE" value="Fix wrong date" />
<MESSAGE value="Deploy on docker (not productive yet!)" />
<option name="LAST_COMMIT_MESSAGE" value="Deploy on docker (not productive yet!)" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -611,6 +610,11 @@
<line>93</line>
<option name="timeStamp" value="16" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/core/services/TaskService.java</url>
<line>92</line>
<option name="timeStamp" value="35" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>

12
backend/src/main/java/core/services/TaskService.java
View File

@ -77,11 +77,6 @@ public class TaskService {
return new ServiceResult<>(ServiceExitCode.INVALID_PARAMETER);
}
//Check for invalid date (deadline before start
if(taskFieldInfo.getStartDate() != null && taskFieldInfo.getDeadline() != null &&
taskFieldInfo.getDeadline().isBefore(taskFieldInfo.getStartDate())) {
return new ServiceResult<>(ServiceExitCode.INVALID_PARAMETER);
}
task.setEta(taskFieldInfo.getEta());
task.setStartDate(taskFieldInfo.getStartDate());
task.setDeadline(taskFieldInfo.getDeadline());
@ -91,7 +86,12 @@ public class TaskService {
public void deleteTask(Task task) {
//taskScheduleService.deleteScheduleByTask(task);
taskRepository.deleteByTaskID(task.getTaskID());
System.err.println(task.getTaskID());
task.getTaskgroup().getTasks().remove(task);
taskgroupRepository.save(task.getTaskgroup());
task.setTaskgroup(null);
taskRepository.save(task);
taskRepository.delete(task);
}
public void clearTasks(Taskgroup taskgroup) {