From 9373eacab7253b4a6710b38da00074dfa7b85460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Henke?= Date: Wed, 8 Nov 2023 17:06:24 +0100 Subject: [PATCH] use start time from now rounded for favorites, too --- build.gradle | 2 +- .../de/jottyfan/timetrack/modules/done/DoneGateway.java | 7 ++++--- .../de/jottyfan/timetrack/modules/done/DoneService.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 30387bd..0000940 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { apply plugin: 'io.spring.dependency-management' group = 'de.jottyfan' -version = '1.4.1' +version = '1.4.2' description = """timetrack""" diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java index e98e4ce..c70b19c 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java @@ -32,6 +32,7 @@ import org.jooq.SelectConditionStep; import org.jooq.SelectLimitPercentStep; import org.jooq.UpdateConditionStep; import org.jooq.exception.DataAccessException; +import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -524,12 +525,12 @@ public class DoneGateway { * * @param fkFavorite the id of the favorite */ - public void useFav(Integer fkFavorite) { + public void useFav(Integer fkFavorite, LocalDateTime startTime) { InsertOnDuplicateStep sql = getJooq() // @formatter:off - .insertInto(T_DONE, T_DONE.FK_LOGIN, T_DONE.FK_PROJECT, T_DONE.FK_MODULE, T_DONE.FK_JOB, T_DONE.FK_BILLING) + .insertInto(T_DONE, T_DONE.FK_LOGIN, T_DONE.FK_PROJECT, T_DONE.FK_MODULE, T_DONE.FK_JOB, T_DONE.FK_BILLING, T_DONE.TIME_FROM) .select(getJooq() - .select(T_FAVORITE.FK_LOGIN, T_FAVORITE.FK_PROJECT, T_FAVORITE.FK_MODULE, T_FAVORITE.FK_JOB, T_FAVORITE.FK_BILLING) + .select(T_FAVORITE.FK_LOGIN, T_FAVORITE.FK_PROJECT, T_FAVORITE.FK_MODULE, T_FAVORITE.FK_JOB, T_FAVORITE.FK_BILLING, DSL.val(startTime)) .from(T_FAVORITE) .where(T_FAVORITE.PK_FAVORITE.eq(fkFavorite))); // @formatter:on diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneService.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneService.java index 6306dbb..777b831 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneService.java @@ -222,7 +222,7 @@ public class DoneService { public void usefavorite(Integer fkFavorite) { try { - new DoneGateway(dsl).useFav(fkFavorite); + new DoneGateway(dsl).useFav(fkFavorite, timeService.roundTime(LocalDateTime.now(), INTERVAL)); } catch (Exception e) { } }