work/timetrack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimized reason for slot difference

Browse Source
This commit is contained in:
Jörg Henke
2024-01-05 15:12:32 +01:00
parent 5117fd0e71
commit 689a601c8c
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -23,7 +23,7 @@ repositories {
} }
dependencies { dependencies {
implementation 'de.jottyfan:timetrackjooq:20240104b' implementation 'de.jottyfan:timetrackjooq:20240105'
implementation 'org.apache.logging.log4j:log4j-api:latest.release' implementation 'org.apache.logging.log4j:log4j-api:latest.release'
implementation 'org.apache.logging.log4j:log4j-core:latest.release' implementation 'org.apache.logging.log4j:log4j-core:latest.release'

29
src/main/java/de/jottyfan/timetrack/modules/done/DoneRepository.java
View File

@ -23,6 +23,7 @@ import org.jooq.InsertOnDuplicateSetMoreStep;
import org.jooq.InsertOnDuplicateStep; import org.jooq.InsertOnDuplicateStep;
import org.jooq.Record1; import org.jooq.Record1;
import org.jooq.Record3; import org.jooq.Record3;
import org.jooq.Record4;
import org.jooq.Record5; import org.jooq.Record5;
import org.jooq.SelectConditionStep; import org.jooq.SelectConditionStep;
import org.jooq.SelectHavingStep; import org.jooq.SelectHavingStep;
@ -160,11 +161,11 @@ public class DoneRepository {
} }
public Map<LocalDate, SlotBean> getSlots(LocalDate from, LocalDate until, String login) { public Map<LocalDate, SlotBean> getSlots(LocalDate from, LocalDate until, String login) {
SelectSeekStep1<Record3<Integer, LocalDate, Integer>, LocalDate> sql = jooq SelectSeekStep1<Record4<Integer, LocalDate, String, Integer>, LocalDate> sql = jooq
// @formatter:off // @formatter:off
.select(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME, .select(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME,
T_REQUIRED_WORKTIME.DAY, T_REQUIRED_WORKTIME.DAY,
// T_REQUIRED_WORKTIME.REASON, T_REQUIRED_WORKTIME.REASON,
T_REQUIRED_WORKTIME.REQUIRED_MINUTES) T_REQUIRED_WORKTIME.REQUIRED_MINUTES)
.from(T_REQUIRED_WORKTIME) .from(T_REQUIRED_WORKTIME)
.innerJoin(T_LOGIN).on(T_LOGIN.PK.eq(T_REQUIRED_WORKTIME.FK_LOGIN)) .innerJoin(T_LOGIN).on(T_LOGIN.PK.eq(T_REQUIRED_WORKTIME.FK_LOGIN))
@ -174,14 +175,14 @@ public class DoneRepository {
.orderBy(T_REQUIRED_WORKTIME.DAY); .orderBy(T_REQUIRED_WORKTIME.DAY);
// @formatter:on // @formatter:on
LOGGER.trace(sql); LOGGER.trace(sql);
Iterator<Record3<Integer, LocalDate, Integer>> i = sql.fetch().iterator(); Iterator<Record4<Integer, LocalDate, String, Integer>> i = sql.fetch().iterator();
Map<LocalDate, SlotBean> map = new HashMap<>(); Map<LocalDate, SlotBean> map = new HashMap<>();
while (i.hasNext()) { while (i.hasNext()) {
Record3<Integer, LocalDate, Integer> n = i.next(); Record4<Integer, LocalDate, String, Integer> n = i.next();
LocalDate day = n.get(T_REQUIRED_WORKTIME.DAY); LocalDate day = n.get(T_REQUIRED_WORKTIME.DAY);
Integer pk = n.get(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME); Integer pk = n.get(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME);
Integer minutes = n.get(T_REQUIRED_WORKTIME.REQUIRED_MINUTES); Integer minutes = n.get(T_REQUIRED_WORKTIME.REQUIRED_MINUTES);
String reason = null; // n.get(T_REQUIRED_WORKTIME.REASON); String reason = n.get(T_REQUIRED_WORKTIME.REASON);
map.put(day, SlotBean.of(pk, day, minutes, reason)); map.put(day, SlotBean.of(pk, day, minutes, reason));
} }
return map; return map;
@ -195,11 +196,11 @@ public class DoneRepository {
* @return the slot or null * @return the slot or null
*/ */
public SlotBean getSlot(Integer id, String login) { public SlotBean getSlot(Integer id, String login) {
SelectConditionStep<Record3<Integer, LocalDate, Integer>> sql = jooq SelectConditionStep<Record4<Integer, LocalDate, String, Integer>> sql = jooq
// @formatter:off // @formatter:off
.select(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME, .select(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME,
T_REQUIRED_WORKTIME.DAY, T_REQUIRED_WORKTIME.DAY,
// T_REQUIRED_WORKTIME.REASON, T_REQUIRED_WORKTIME.REASON,
T_REQUIRED_WORKTIME.REQUIRED_MINUTES) T_REQUIRED_WORKTIME.REQUIRED_MINUTES)
.from(T_REQUIRED_WORKTIME) .from(T_REQUIRED_WORKTIME)
.innerJoin(T_LOGIN).on(T_LOGIN.PK.eq(T_REQUIRED_WORKTIME.FK_LOGIN)) .innerJoin(T_LOGIN).on(T_LOGIN.PK.eq(T_REQUIRED_WORKTIME.FK_LOGIN))
@ -207,10 +208,10 @@ public class DoneRepository {
.and(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME.eq(id)); .and(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME.eq(id));
// @formatter:on // @formatter:on
LOGGER.trace(sql); LOGGER.trace(sql);
Record3<Integer, LocalDate, Integer> r = sql.fetchOne(); Record4<Integer, LocalDate, String, Integer> r = sql.fetchOne();
return r == null ? null return r == null ? null
: SlotBean.of(r.get(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME), r.get(T_REQUIRED_WORKTIME.DAY), : SlotBean.of(r.get(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME), r.get(T_REQUIRED_WORKTIME.DAY),
r.get(T_REQUIRED_WORKTIME.REQUIRED_MINUTES), null/*r.get(T_REQUIRED_WORKTIME.REASON)*/); r.get(T_REQUIRED_WORKTIME.REQUIRED_MINUTES), r.get(T_REQUIRED_WORKTIME.REASON));
} }
public void addSlot(SlotBean bean, String login) { public void addSlot(SlotBean bean, String login) {
@ -219,16 +220,16 @@ public class DoneRepository {
.insertInto(T_REQUIRED_WORKTIME, .insertInto(T_REQUIRED_WORKTIME,
T_REQUIRED_WORKTIME.DAY, T_REQUIRED_WORKTIME.DAY,
T_REQUIRED_WORKTIME.REQUIRED_MINUTES, T_REQUIRED_WORKTIME.REQUIRED_MINUTES,
// T_REQUIRED_WORKTIME.REASON, T_REQUIRED_WORKTIME.REASON,
T_REQUIRED_WORKTIME.FK_LOGIN) T_REQUIRED_WORKTIME.FK_LOGIN)
.select(jooq .select(jooq
.select(DSL.val(bean.getDay()), DSL.val(bean.getMinutes()), /* DSL.val(bean.getReason()), */ T_LOGIN.PK) .select(DSL.val(bean.getDay()), DSL.val(bean.getMinutes()), DSL.val(bean.getReason()), T_LOGIN.PK)
.from(T_LOGIN) .from(T_LOGIN)
.where(T_LOGIN.LOGIN.eq(login))) .where(T_LOGIN.LOGIN.eq(login)))
.onConflict(T_REQUIRED_WORKTIME.FK_LOGIN, T_REQUIRED_WORKTIME.DAY) .onConflict(T_REQUIRED_WORKTIME.FK_LOGIN, T_REQUIRED_WORKTIME.DAY)
.doUpdate() .doUpdate()
.set(T_REQUIRED_WORKTIME.REQUIRED_MINUTES, bean.getMinutes()); .set(T_REQUIRED_WORKTIME.REQUIRED_MINUTES, bean.getMinutes())
// .set(T_REQUIRED_WORKTIME.REASON, bean.getReason()); .set(T_REQUIRED_WORKTIME.REASON, bean.getReason());
// @formatter:off // @formatter:off
LOGGER.trace(sql); LOGGER.trace(sql);
sql.execute(); sql.execute();
@ -239,7 +240,7 @@ public class DoneRepository {
// @formatter:off // @formatter:off
.update(T_REQUIRED_WORKTIME) .update(T_REQUIRED_WORKTIME)
.set(T_REQUIRED_WORKTIME.REQUIRED_MINUTES, bean.getMinutes()) .set(T_REQUIRED_WORKTIME.REQUIRED_MINUTES, bean.getMinutes())
// .set(T_REQUIRED_WORKTIME.REASON, bean.getReason()) .set(T_REQUIRED_WORKTIME.REASON, bean.getReason())
.where(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME.eq(bean.getId())) .where(T_REQUIRED_WORKTIME.PK_REQUIRED_WORKTIME.eq(bean.getId()))
.and(T_REQUIRED_WORKTIME.FK_LOGIN.in(jooq .and(T_REQUIRED_WORKTIME.FK_LOGIN.in(jooq
.select(T_LOGIN.PK) .select(T_LOGIN.PK)

2
src/main/resources/templates/done/list.html
View File

@ -265,7 +265,7 @@
</a><a th:href="@{/done/slot/add?day={d}(d=${s.day})}" class="slot_badge_middle" th:unless="${s.id}"> </a><a th:href="@{/done/slot/add?day={d}(d=${s.day})}" class="slot_badge_middle" th:unless="${s.id}">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
</a> </a>
<span class="slot_badge_middle slot_reason" th:if="${s.reason}" th:text="${s.reason}"></span><span class="slot_badge_right boldy" th:text="${s.printTime()}" th:if="${s.id}"></span><span <span class="slot_badge_middle slot_reason" th:if="${s.reason}" th:text="${s.reason}"></span><span th:class="${s.reason != null ? 'slot_badge_right' : 'slot_badge_right boldy'}" th:text="${s.printTime()}" th:if="${s.id}"></span><span
class="slot_badge_right" th:unless="${s.id}">&nbsp;--:--&nbsp;</span> class="slot_badge_right" th:unless="${s.id}">&nbsp;--:--&nbsp;</span>
</div> </div>
</div> </div>