issue-52 #70
@ -4,7 +4,12 @@
|
|||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Edit and Delete in Draggable Scheduler" />
|
<list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix parsing datetime">
|
||||||
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/../docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../docker-compose.yml" afterDir="false" />
|
||||||
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
@ -174,11 +179,11 @@
|
|||||||
</configuration>
|
</configuration>
|
||||||
<recent_temporary>
|
<recent_temporary>
|
||||||
<list>
|
<list>
|
||||||
<item itemvalue="JUnit.TaskServiceTest" />
|
|
||||||
<item itemvalue="JUnit.ScheduleServiceTest.scheduleNow" />
|
<item itemvalue="JUnit.ScheduleServiceTest.scheduleNow" />
|
||||||
<item itemvalue="JUnit.ScheduleServiceTest.scheduleAdvanced" />
|
|
||||||
<item itemvalue="JUnit.ScheduleServiceTest.editscheduleAdvanced" />
|
|
||||||
<item itemvalue="JUnit.ScheduleServiceTest.editBasicSchedule" />
|
<item itemvalue="JUnit.ScheduleServiceTest.editBasicSchedule" />
|
||||||
|
<item itemvalue="JUnit.ScheduleServiceTest.editscheduleAdvanced" />
|
||||||
|
<item itemvalue="JUnit.ScheduleServiceTest.scheduleAdvanced" />
|
||||||
|
<item itemvalue="JUnit.TaskServiceTest" />
|
||||||
</list>
|
</list>
|
||||||
</recent_temporary>
|
</recent_temporary>
|
||||||
</component>
|
</component>
|
||||||
@ -218,7 +223,6 @@
|
|||||||
<workItem from="1699639316405" duration="9267000" />
|
<workItem from="1699639316405" duration="9267000" />
|
||||||
<workItem from="1699684493731" duration="1121000" />
|
<workItem from="1699684493731" duration="1121000" />
|
||||||
<workItem from="1699769541677" duration="7576000" />
|
<workItem from="1699769541677" duration="7576000" />
|
||||||
<workItem from="1699898375418" duration="325000" />
|
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
|
<task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
@ -572,29 +576,15 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1699806194258</updated>
|
<updated>1699806194258</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00045" summary="Fix parsing datetime (diesmal hoffentlich wirklich)">
|
<option name="localTasksCounter" value="45" />
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1699809089060</created>
|
|
||||||
<option name="number" value="00045" />
|
|
||||||
<option name="presentableId" value="LOCAL-00045" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1699809089060</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00046" summary="Edit and Delete in Draggable Scheduler">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1699824923378</created>
|
|
||||||
<option name="number" value="00046" />
|
|
||||||
<option name="presentableId" value="LOCAL-00046" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1699824923378</updated>
|
|
||||||
</task>
|
|
||||||
<option name="localTasksCounter" value="47" />
|
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
<option name="version" value="3" />
|
<option name="version" value="3" />
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
|
<MESSAGE value="Write simple Testcase for ci/cd" />
|
||||||
|
<MESSAGE value="Deactivate Overall System test (temporarly)" />
|
||||||
<MESSAGE value="Fix failing test case" />
|
<MESSAGE value="Fix failing test case" />
|
||||||
<MESSAGE value="TaskgroupRepsitoryTest" />
|
<MESSAGE value="TaskgroupRepsitoryTest" />
|
||||||
<MESSAGE value="TaskgroupRepsitoryTest (+Delete)" />
|
<MESSAGE value="TaskgroupRepsitoryTest (+Delete)" />
|
||||||
@ -618,9 +608,7 @@
|
|||||||
<MESSAGE value="Deploy on docker (not productive yet!)" />
|
<MESSAGE value="Deploy on docker (not productive yet!)" />
|
||||||
<MESSAGE value="Fix deleting tasks" />
|
<MESSAGE value="Fix deleting tasks" />
|
||||||
<MESSAGE value="Fix parsing datetime" />
|
<MESSAGE value="Fix parsing datetime" />
|
||||||
<MESSAGE value="Fix parsing datetime (diesmal hoffentlich wirklich)" />
|
<option name="LAST_COMMIT_MESSAGE" value="Fix parsing datetime" />
|
||||||
<MESSAGE value="Edit and Delete in Draggable Scheduler" />
|
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="Edit and Delete in Draggable Scheduler" />
|
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager>
|
<breakpoint-manager>
|
||||||
@ -630,31 +618,11 @@
|
|||||||
<line>57</line>
|
<line>57</line>
|
||||||
<option name="timeStamp" value="12" />
|
<option name="timeStamp" value="12" />
|
||||||
</line-breakpoint>
|
</line-breakpoint>
|
||||||
<line-breakpoint enabled="true" type="java-line">
|
|
||||||
<url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
|
|
||||||
<line>98</line>
|
|
||||||
<option name="timeStamp" value="16" />
|
|
||||||
</line-breakpoint>
|
|
||||||
<line-breakpoint enabled="true" type="java-line">
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
<url>file://$PROJECT_DIR$/src/main/java/core/services/TaskService.java</url>
|
<url>file://$PROJECT_DIR$/src/main/java/core/services/TaskService.java</url>
|
||||||
<line>93</line>
|
<line>93</line>
|
||||||
<option name="timeStamp" value="35" />
|
<option name="timeStamp" value="35" />
|
||||||
</line-breakpoint>
|
</line-breakpoint>
|
||||||
<line-breakpoint enabled="true" type="java-line">
|
|
||||||
<url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
|
|
||||||
<line>83</line>
|
|
||||||
<option name="timeStamp" value="36" />
|
|
||||||
</line-breakpoint>
|
|
||||||
<line-breakpoint enabled="true" type="java-line">
|
|
||||||
<url>file://$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java</url>
|
|
||||||
<line>99</line>
|
|
||||||
<option name="timeStamp" value="37" />
|
|
||||||
</line-breakpoint>
|
|
||||||
<line-breakpoint enabled="true" type="java-line">
|
|
||||||
<url>file://$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java</url>
|
|
||||||
<line>100</line>
|
|
||||||
<option name="timeStamp" value="38" />
|
|
||||||
</line-breakpoint>
|
|
||||||
</breakpoints>
|
</breakpoints>
|
||||||
</breakpoint-manager>
|
</breakpoint-manager>
|
||||||
</component>
|
</component>
|
||||||
|
@ -165,6 +165,9 @@ public class ScheduleController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ServiceResult<AbstractSchedule> scheduleResult = taskScheduleService.scheduleNow(permissionResult.getResult());
|
ServiceResult<AbstractSchedule> scheduleResult = taskScheduleService.scheduleNow(permissionResult.getResult());
|
||||||
|
BasicTaskSchedule basicTaskSchedule = (BasicTaskSchedule) scheduleResult.getResult();
|
||||||
|
System.err.println(basicTaskSchedule.getStartTime());
|
||||||
|
//System.err.println(scheduleResult.getResult().toScheduleInfo());
|
||||||
if(scheduleResult.getExitCode() == ServiceExitCode.ENTITY_ALREADY_EXIST) {
|
if(scheduleResult.getExitCode() == ServiceExitCode.ENTITY_ALREADY_EXIST) {
|
||||||
return ResponseEntity.status(409).body(new SimpleStatusResponse("failed"));
|
return ResponseEntity.status(409).body(new SimpleStatusResponse("failed"));
|
||||||
} else {
|
} else {
|
||||||
|
@ -7,6 +7,8 @@ services:
|
|||||||
container_name: timemanager-db
|
container_name: timemanager-db
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: edkvcjReDxJ9Z8hq
|
MYSQL_ROOT_PASSWORD: edkvcjReDxJ9Z8hq
|
||||||
|
ports:
|
||||||
|
- "3306:3306"
|
||||||
backend:
|
backend:
|
||||||
build:
|
build:
|
||||||
context: ./backend
|
context: ./backend
|
||||||
@ -21,6 +23,9 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- "db"
|
- "db"
|
||||||
restart: always
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- /etc/localtime:/etc/localtime:ro
|
||||||
|
- /etc/timezone:/etc/timezone:ro
|
||||||
frontend:
|
frontend:
|
||||||
build:
|
build:
|
||||||
context: ./frontend
|
context: ./frontend
|
||||||
|
Loading…
Reference in New Issue
Block a user