Commit Graph

295 Commits

Author SHA1 Message Date
Sebastian Böckelmann
cf7e2c5377 Include Statusfarbe of Tasks in TaskDetailOverview and fix wrong task date undefined error
All checks were successful
Java CI with Maven / test (push) Successful in 35s
Java CI with Maven / build-and-push-frontend (push) Successful in 6s
Java CI with Maven / build-and-push-backend (push) Successful in 11s
2023-11-18 10:14:17 +01:00
bcaae74516 Merge pull request 'issue-68' (#73) from issue-68 into master
All checks were successful
Java CI with Maven / test (push) Successful in 35s
Java CI with Maven / build-and-push-frontend (push) Successful in 2m1s
Java CI with Maven / build-and-push-backend (push) Successful in 1m20s
Reviewed-on: #73
2023-11-18 09:45:21 +01:00
Sebastian Böckelmann
fe9fae871a Adapt testdata to newly introduced finishable attribute
All checks were successful
Java CI with Maven / test (push) Successful in 35s
Java CI with Maven / build-and-push-frontend (push) Successful in 7s
Java CI with Maven / build-and-push-backend (push) Successful in 7s
2023-11-18 09:43:44 +01:00
Sebastian Böckelmann
de01f5a100 Unfinish task and allow unfinishable tasks
Some checks failed
Java CI with Maven / build-and-push-frontend (push) Successful in 8s
Java CI with Maven / build-and-push-backend (push) Successful in 7s
Java CI with Maven / test (push) Failing after 35s
2023-11-18 09:36:26 +01:00
Sebastian Böckelmann
eb3dba0830 Allow Taskcreation without specifying start and deadline
All checks were successful
Java CI with Maven / test (push) Successful in 37s
Java CI with Maven / build-and-push-frontend (push) Successful in 6s
Java CI with Maven / build-and-push-backend (push) Successful in 7s
2023-11-18 09:05:31 +01:00
19f3b6cf65 Merge pull request 'Fix routing to fix task in scheduler' (#72) from issue-51 into master
All checks were successful
Java CI with Maven / test (push) Successful in 35s
Java CI with Maven / build-and-push-frontend (push) Successful in 2m7s
Java CI with Maven / build-and-push-backend (push) Successful in 1m25s
Reviewed-on: #72
2023-11-18 08:51:12 +01:00
Sebastian Böckelmann
7b7d85d873 Navigate to task by given taskID of schedule and not fixed one from route param
All checks were successful
Java CI with Maven / test (push) Successful in 35s
Java CI with Maven / build-and-push-frontend (push) Successful in 6s
Java CI with Maven / build-and-push-backend (push) Successful in 7s
2023-11-18 08:48:45 +01:00
edf19a52ba Merge pull request 'issue-57' (#71) from issue-57 into master
All checks were successful
Java CI with Maven / test (push) Successful in 34s
Java CI with Maven / build-and-push-frontend (push) Successful in 2m0s
Java CI with Maven / build-and-push-backend (push) Successful in 1m27s
Reviewed-on: #71
2023-11-18 08:39:12 +01:00
Sebastian Böckelmann
ec5c74ca7d Remove unfinished schedules from Taskoverview and taskgroup-overview
All checks were successful
Java CI with Maven / test (push) Successful in 34s
Java CI with Maven / build-and-push-frontend (push) Successful in 8s
Java CI with Maven / build-and-push-backend (push) Successful in 8s
2023-11-18 08:36:37 +01:00
Sebastian Böckelmann
938087f8b3 Remove unstarted schedules from db when task is finished
All checks were successful
Java CI with Maven / test (push) Successful in 36s
Java CI with Maven / build-and-push-frontend (push) Successful in 5s
Java CI with Maven / build-and-push-backend (push) Successful in 7s
2023-11-18 08:07:07 +01:00
e49b40fd48 Merge pull request 'issue-52' (#70) from issue-52 into master
All checks were successful
Java CI with Maven / test (push) Successful in 36s
Java CI with Maven / build-and-push-frontend (push) Successful in 2m1s
Java CI with Maven / build-and-push-backend (push) Successful in 1m41s
Reviewed-on: #70
2023-11-17 18:01:56 +01:00
Sebastian Böckelmann
5441ce0fbc Remove workspace.xml
All checks were successful
Java CI with Maven / test (push) Successful in 37s
Java CI with Maven / build-and-push-frontend (push) Successful in 2m8s
Java CI with Maven / build-and-push-backend (push) Successful in 1m28s
2023-11-17 18:01:40 +01:00
Sebastian Böckelmann
912d8cc22f Delete workspace xml
All checks were successful
Java CI with Maven / build (push) Successful in 36s
2023-11-17 18:00:56 +01:00
Sebastian Böckelmann
f88e97348e Remove Debugging of starttime from schedule now
All checks were successful
Java CI with Maven / build (push) Successful in 33s
2023-11-17 17:58:15 +01:00
Sebastian Böckelmann
59e79a306f Fix timezone offset in docker deployment
All checks were successful
Java CI with Maven / build (push) Successful in 37s
2023-11-17 17:56:17 +01:00
df8227a1f3 Merge pull request 'docker-deployment' (#67) from docker-deployment into master
All checks were successful
Java CI with Maven / test (push) Successful in 34s
Java CI with Maven / build-and-push-frontend (push) Successful in 2m11s
Java CI with Maven / build-and-push-backend (push) Successful in 1m30s
Reviewed-on: #67
2023-11-14 09:02:19 +01:00
Sebastian Böckelmann
8a86241e86 Perform building only on master branch (missed one step in building frontend
All checks were successful
Java CI with Maven / build-and-push-frontend (push) Successful in 8s
Java CI with Maven / build-and-push-backend (push) Successful in 8s
Java CI with Maven / test (push) Successful in 37s
2023-11-14 08:54:21 +01:00
Sebastian Böckelmann
e68f8e9432 Perform building only on master branch
All checks were successful
Java CI with Maven / test (push) Successful in 36s
Java CI with Maven / build-and-push-frontend (push) Successful in 10s
Java CI with Maven / build-and-push-backend (push) Successful in 7s
2023-11-14 08:52:19 +01:00
Sebastian Böckelmann
7d63cd19cb Build backend automatic
All checks were successful
Java CI with Maven / test (push) Successful in 34s
Java CI with Maven / build-and-push-frontend (push) Successful in 2m5s
Java CI with Maven / build-and-push-backend (push) Successful in 2m5s
2023-11-14 08:44:31 +01:00
Sebastian Böckelmann
e4daee49a1 Include repo owner in image name and tag
All checks were successful
Java CI with Maven / test (push) Successful in 36s
Java CI with Maven / build-and-push-frontend (push) Successful in 2m2s
2023-11-14 08:31:12 +01:00
Sebastian Böckelmann
af716718de Adapt reponame to lowercase
Some checks failed
Java CI with Maven / test (push) Successful in 36s
Java CI with Maven / build-and-push-frontend (push) Failing after 2m1s
2023-11-14 08:15:07 +01:00
Sebastian Böckelmann
523fa972f0 Fix docker tag to match repo name
Some checks failed
Java CI with Maven / test (push) Successful in 35s
Java CI with Maven / build-and-push-frontend (push) Failing after 16s
2023-11-14 08:11:45 +01:00
Sebastian Böckelmann
cf06f8107b Fix name of image to match case sensitivity
Some checks failed
Java CI with Maven / test (push) Successful in 39s
Java CI with Maven / build-and-push-frontend (push) Failing after 2m3s
2023-11-14 07:56:51 +01:00
Sebastian Böckelmann
afee5680e1 Set context of frontend docker build to frontend/.
Some checks failed
Java CI with Maven / test (push) Successful in 36s
Java CI with Maven / build-and-push-frontend (push) Failing after 2m0s
2023-11-14 07:52:41 +01:00
Sebastian Böckelmann
785032812f Remove tem. backend deployment from actions and add docker context to frontend build
Some checks failed
Java CI with Maven / test (push) Successful in 37s
Java CI with Maven / build-and-push-frontend (push) Failing after 20s
2023-11-14 07:49:55 +01:00
89a0979921 Merge pull request 'Adapt docker tag' (#66) from docker-deployment into master
Some checks failed
Java CI with Maven / test (push) Successful in 37s
Java CI with Maven / build-and-push-frontend (push) Failing after 20s
Java CI with Maven / build-and-push-backend (push) Failing after 17s
Reviewed-on: Sebastian/TimeManager#66
2023-11-13 22:57:07 +01:00
Sebastian Böckelmann
a4e7b12908 Adapt docker tag
All checks were successful
Java CI with Maven / test (push) Successful in 39s
Java CI with Maven / build-and-push-frontend (push) Successful in 13s
Java CI with Maven / build-and-push-backend (push) Successful in 14s
2023-11-13 22:56:33 +01:00
cb3394d7c4 Merge pull request 'docker-deployment' (#65) from docker-deployment into master
Some checks failed
Java CI with Maven / test (push) Successful in 37s
Java CI with Maven / build-and-push-frontend (push) Failing after 15s
Java CI with Maven / build-and-push-backend (push) Failing after 15s
Reviewed-on: Sebastian/TimeManager#65
2023-11-13 22:53:29 +01:00
Sebastian Böckelmann
f001abd73d Merge remote-tracking branch 'origin/docker-deployment' into docker-deployment
All checks were successful
Java CI with Maven / test (push) Successful in 36s
Java CI with Maven / build-and-push-frontend (push) Successful in 13s
Java CI with Maven / build-and-push-backend (push) Successful in 13s
# Conflicts:
#	backend/.idea/workspace.xml
2023-11-13 22:52:01 +01:00
Sebastian Böckelmann
a19de7b1b5 Change branch to push on to master 2023-11-13 22:51:19 +01:00
cf312ecc26 Merge pull request 'issue-52' (#64) from issue-52 into docker-deployment
All checks were successful
Java CI with Maven / test (push) Successful in 36s
Java CI with Maven / build-and-push-frontend (push) Successful in 14s
Reviewed-on: Sebastian/TimeManager#64
2023-11-13 22:48:50 +01:00
Sebastian Böckelmann
2d4c44ee09 Change context of dockerfile to frontend
All checks were successful
Java CI with Maven / test (push) Successful in 37s
Java CI with Maven / build-and-push-frontend (push) Successful in 15s
2023-11-13 22:40:24 +01:00
Sebastian Böckelmann
aa9b462c96 Change context of dockerfile
All checks were successful
Java CI with Maven / test (push) Successful in 37s
Java CI with Maven / build-and-push-frontend (push) Successful in 13s
2023-11-13 22:38:50 +01:00
Sebastian Böckelmann
0e28d59e3c Change dockerimage for continues deployment to ubuntu-latest
All checks were successful
Java CI with Maven / test (push) Successful in 1m34s
Java CI with Maven / build-and-push-frontend (push) Successful in 20s
2023-11-13 22:32:02 +01:00
Sebastian Böckelmann
8936dd65f4 Change dockerimage for continues deployment
Some checks reported warnings
Java CI with Maven / build-and-push-frontend (push) Has been cancelled
Java CI with Maven / test (push) Has been cancelled
2023-11-13 22:26:13 +01:00
Sebastian Böckelmann
ab43c49507 Change path to Dockerfile
Some checks failed
Java CI with Maven / test (push) Successful in 51s
Java CI with Maven / build-and-push-frontend (push) Failing after 9s
2023-11-13 22:03:55 +01:00
Sebastian Böckelmann
be6ab301c6 Build frontend automatically
Some checks failed
Java CI with Maven / test (push) Successful in 49s
Java CI with Maven / build-and-push-frontend (push) Failing after 17s
2023-11-13 22:01:00 +01:00
Sebastian Böckelmann
4f4c556bb9 Use moment for parsing dates of taskfieldinfo and adapt annotation for spring json parsing
All checks were successful
Java CI with Maven / build (push) Successful in 45s
2023-11-13 19:49:36 +01:00
617bac4d25 Merge pull request 'issue-52' (#63) from issue-52 into master
All checks were successful
Java CI with Maven / build (push) Successful in 43s
Reviewed-on: Sebastian/TimeManager#63
2023-11-13 19:44:12 +01:00
Sebastian Böckelmann
9ca128d80d Use moment to format date correctly for api
All checks were successful
Java CI with Maven / build (push) Successful in 42s
2023-11-13 19:42:40 +01:00
Sebastian Böckelmann
7974bba473 Fix error 500 when scheduling a basic schedule for today
All checks were successful
Java CI with Maven / build (push) Successful in 47s
2023-11-13 19:42:13 +01:00
79034a5b3a Merge pull request 'issue-54' (#62) from issue-54 into master
All checks were successful
Java CI with Maven / build (push) Successful in 43s
Reviewed-on: Sebastian/TimeManager#62
2023-11-13 19:34:10 +01:00
Sebastian Böckelmann
290cdd2fbf Rename activeTime in TaskScheduleStopResponse to workTime to match angular model (Fix NAN minutes in dashboard)
All checks were successful
Java CI with Maven / build (push) Successful in 45s
2023-11-13 19:32:28 +01:00
Sebastian Böckelmann
fa6b1b4fa1 Display Running For counter independently of scheduletype
All checks were successful
Java CI with Maven / build (push) Successful in 44s
2023-11-13 19:28:43 +01:00
89158aee1d Merge pull request 'issue-22' (#61) from issue-22 into master
All checks were successful
Java CI with Maven / build (push) Successful in 43s
Reviewed-on: Sebastian/TimeManager#61
2023-11-13 19:21:45 +01:00
Sebastian Böckelmann
1e492a9111 Reset navigation link list when navigation back
All checks were successful
Java CI with Maven / build (push) Successful in 44s
2023-11-13 19:20:28 +01:00
Sebastian Böckelmann
2477f32d0b Fix order of navigation link list
All checks were successful
Java CI with Maven / build (push) Successful in 44s
2023-11-13 19:11:55 +01:00
db6e40e713 Merge pull request 'issue-47' (#60) from issue-47 into master
All checks were successful
Java CI with Maven / build (push) Successful in 43s
Reviewed-on: Sebastian/TimeManager#60
2023-11-13 18:54:08 +01:00
Sebastian Böckelmann
281d37cf0b Compile fresh backend when building docker image
All checks were successful
Java CI with Maven / build (push) Successful in 44s
2023-11-13 18:39:25 +01:00
55d2d4936e Merge pull request 'Merge pullrequest docker-deployment into issue-47' (#59) from docker-deployment into issue-47
All checks were successful
Java CI with Maven / build (push) Successful in 45s
Reviewed-on: Sebastian/TimeManager#59
2023-11-13 18:19:48 +01:00