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

added reason for slot timediff

Browse Source
This commit is contained in:
Jörg Henke
2024-01-05 15:02:00 +01:00
parent 8f414e1964
commit 2e0f7ff3c3
4 changed files with 70 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -23,7 +23,7 @@ apply plugin: 'maven-publish'
apply plugin: 'eclipse'
group = 'de.jottyfan'
version = '20240104b'
version = '20240105'
def artifactId = 'timetrackjooq'
def versionNumber = version

17
src/main/java/de/jottyfan/timetrack/db/done/tables/TRequiredWorktime.java
View File

@ -10,7 +10,6 @@ import de.jottyfan.timetrack.db.done.tables.records.TRequiredWorktimeRecord;
import de.jottyfan.timetrack.db.profile.tables.TLogin;
import java.time.LocalDate;
import java.time.LocalTime;
import java.util.Arrays;
import java.util.List;
import java.util.function.Function;
@ -60,11 +59,6 @@ public class TRequiredWorktime extends TableImpl<TRequiredWorktimeRecord> {
*/
public final TableField<TRequiredWorktimeRecord, Integer> PK_REQUIRED_WORKTIME = createField(DSL.name("pk_required_worktime"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/**
* The column <code>done.t_required_worktime.required</code>.
*/
public final TableField<TRequiredWorktimeRecord, LocalTime> REQUIRED = createField(DSL.name("required"), SQLDataType.LOCALTIME(6).nullable(false).defaultValue(DSL.field(DSL.raw("'08:00:00'::time without time zone"), SQLDataType.LOCALTIME)), this, "");
/**
* The column <code>done.t_required_worktime.day</code>.
*/
@ -80,6 +74,11 @@ public class TRequiredWorktime extends TableImpl<TRequiredWorktimeRecord> {
*/
public final TableField<TRequiredWorktimeRecord, Integer> REQUIRED_MINUTES = createField(DSL.name("required_minutes"), SQLDataType.INTEGER.nullable(false).defaultValue(DSL.field(DSL.raw("480"), SQLDataType.INTEGER)), this, "");
/**
* The column <code>done.t_required_worktime.reason</code>.
*/
public final TableField<TRequiredWorktimeRecord, String> REASON = createField(DSL.name("reason"), SQLDataType.CLOB, this, "");
private TRequiredWorktime(Name alias, Table<TRequiredWorktimeRecord> aliased) {
this(alias, aliased, null);
}
@ -194,14 +193,14 @@ public class TRequiredWorktime extends TableImpl<TRequiredWorktimeRecord> {
// -------------------------------------------------------------------------
@Override
public Row5<Integer, LocalTime, LocalDate, Integer, Integer> fieldsRow() {
public Row5<Integer, LocalDate, Integer, Integer, String> fieldsRow() {
return (Row5) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(Function5<? super Integer, ? super LocalTime, ? super LocalDate, ? super Integer, ? super Integer, ? extends U> from) {
public <U> SelectField<U> mapping(Function5<? super Integer, ? super LocalDate, ? super Integer, ? super Integer, ? super String, ? extends U> from) {
return convertFrom(Records.mapping(from));
}
@ -209,7 +208,7 @@ public class TRequiredWorktime extends TableImpl<TRequiredWorktimeRecord> {
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
*/
public <U> SelectField<U> mapping(Class<U> toType, Function5<? super Integer, ? super LocalTime, ? super LocalDate, ? super Integer, ? super Integer, ? extends U> from) {
public <U> SelectField<U> mapping(Class<U> toType, Function5<? super Integer, ? super LocalDate, ? super Integer, ? super Integer, ? super String, ? extends U> from) {
return convertFrom(toType, Records.mapping(from));
}
}

119
src/main/java/de/jottyfan/timetrack/db/done/tables/records/TRequiredWorktimeRecord.java
View File

@ -7,7 +7,6 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.TRequiredWorktime;
import java.time.LocalDate;
import java.time.LocalTime;
import org.jooq.Field;
import org.jooq.Record1;
@ -20,7 +19,7 @@ import org.jooq.impl.UpdatableRecordImpl;
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TRequiredWorktimeRecord extends UpdatableRecordImpl<TRequiredWorktimeRecord> implements Record5<Integer, LocalTime, LocalDate, Integer, Integer> {
public class TRequiredWorktimeRecord extends UpdatableRecordImpl<TRequiredWorktimeRecord> implements Record5<Integer, LocalDate, Integer, Integer, String> {
private static final long serialVersionUID = 1L;
@ -38,60 +37,60 @@ public class TRequiredWorktimeRecord extends UpdatableRecordImpl<TRequiredWorkti
return (Integer) get(0);
}
/**
* Setter for <code>done.t_required_worktime.required</code>.
*/
public void setRequired(LocalTime value) {
set(1, value);
}
/**
* Getter for <code>done.t_required_worktime.required</code>.
*/
public LocalTime getRequired() {
return (LocalTime) get(1);
}
/**
* Setter for <code>done.t_required_worktime.day</code>.
*/
public void setDay(LocalDate value) {
set(2, value);
set(1, value);
}
/**
* Getter for <code>done.t_required_worktime.day</code>.
*/
public LocalDate getDay() {
return (LocalDate) get(2);
return (LocalDate) get(1);
}
/**
* Setter for <code>done.t_required_worktime.fk_login</code>.
*/
public void setFkLogin(Integer value) {
set(3, value);
set(2, value);
}
/**
* Getter for <code>done.t_required_worktime.fk_login</code>.
*/
public Integer getFkLogin() {
return (Integer) get(3);
return (Integer) get(2);
}
/**
* Setter for <code>done.t_required_worktime.required_minutes</code>.
*/
public void setRequiredMinutes(Integer value) {
set(4, value);
set(3, value);
}
/**
* Getter for <code>done.t_required_worktime.required_minutes</code>.
*/
public Integer getRequiredMinutes() {
return (Integer) get(4);
return (Integer) get(3);
}
/**
* Setter for <code>done.t_required_worktime.reason</code>.
*/
public void setReason(String value) {
set(4, value);
}
/**
* Getter for <code>done.t_required_worktime.reason</code>.
*/
public String getReason() {
return (String) get(4);
}
// -------------------------------------------------------------------------
@ -108,12 +107,12 @@ public class TRequiredWorktimeRecord extends UpdatableRecordImpl<TRequiredWorkti
// -------------------------------------------------------------------------
@Override
public Row5<Integer, LocalTime, LocalDate, Integer, Integer> fieldsRow() {
public Row5<Integer, LocalDate, Integer, Integer, String> fieldsRow() {
return (Row5) super.fieldsRow();
}
@Override
public Row5<Integer, LocalTime, LocalDate, Integer, Integer> valuesRow() {
public Row5<Integer, LocalDate, Integer, Integer, String> valuesRow() {
return (Row5) super.valuesRow();
}
@ -123,75 +122,75 @@ public class TRequiredWorktimeRecord extends UpdatableRecordImpl<TRequiredWorkti
}
@Override
public Field<LocalTime> field2() {
return TRequiredWorktime.T_REQUIRED_WORKTIME.REQUIRED;
}
@Override
public Field<LocalDate> field3() {
public Field<LocalDate> field2() {
return TRequiredWorktime.T_REQUIRED_WORKTIME.DAY;
}
@Override
public Field<Integer> field4() {
public Field<Integer> field3() {
return TRequiredWorktime.T_REQUIRED_WORKTIME.FK_LOGIN;
}
@Override
public Field<Integer> field5() {
public Field<Integer> field4() {
return TRequiredWorktime.T_REQUIRED_WORKTIME.REQUIRED_MINUTES;
}
@Override
public Field<String> field5() {
return TRequiredWorktime.T_REQUIRED_WORKTIME.REASON;
}
@Override
public Integer component1() {
return getPkRequiredWorktime();
}
@Override
public LocalTime component2() {
return getRequired();
}
@Override
public LocalDate component3() {
public LocalDate component2() {
return getDay();
}
@Override
public Integer component4() {
public Integer component3() {
return getFkLogin();
}
@Override
public Integer component5() {
public Integer component4() {
return getRequiredMinutes();
}
@Override
public String component5() {
return getReason();
}
@Override
public Integer value1() {
return getPkRequiredWorktime();
}
@Override
public LocalTime value2() {
return getRequired();
}
@Override
public LocalDate value3() {
public LocalDate value2() {
return getDay();
}
@Override
public Integer value4() {
public Integer value3() {
return getFkLogin();
}
@Override
public Integer value5() {
public Integer value4() {
return getRequiredMinutes();
}
@Override
public String value5() {
return getReason();
}
@Override
public TRequiredWorktimeRecord value1(Integer value) {
setPkRequiredWorktime(value);
@ -199,31 +198,31 @@ public class TRequiredWorktimeRecord extends UpdatableRecordImpl<TRequiredWorkti
}
@Override
public TRequiredWorktimeRecord value2(LocalTime value) {
setRequired(value);
return this;
}
@Override
public TRequiredWorktimeRecord value3(LocalDate value) {
public TRequiredWorktimeRecord value2(LocalDate value) {
setDay(value);
return this;
}
@Override
public TRequiredWorktimeRecord value4(Integer value) {
public TRequiredWorktimeRecord value3(Integer value) {
setFkLogin(value);
return this;
}
@Override
public TRequiredWorktimeRecord value5(Integer value) {
public TRequiredWorktimeRecord value4(Integer value) {
setRequiredMinutes(value);
return this;
}
@Override
public TRequiredWorktimeRecord values(Integer value1, LocalTime value2, LocalDate value3, Integer value4, Integer value5) {
public TRequiredWorktimeRecord value5(String value) {
setReason(value);
return this;
}
@Override
public TRequiredWorktimeRecord values(Integer value1, LocalDate value2, Integer value3, Integer value4, String value5) {
value1(value1);
value2(value2);
value3(value3);
@ -246,14 +245,14 @@ public class TRequiredWorktimeRecord extends UpdatableRecordImpl<TRequiredWorkti
/**
* Create a detached, initialised TRequiredWorktimeRecord
*/
public TRequiredWorktimeRecord(Integer pkRequiredWorktime, LocalTime required, LocalDate day, Integer fkLogin, Integer requiredMinutes) {
public TRequiredWorktimeRecord(Integer pkRequiredWorktime, LocalDate day, Integer fkLogin, Integer requiredMinutes, String reason) {
super(TRequiredWorktime.T_REQUIRED_WORKTIME);
setPkRequiredWorktime(pkRequiredWorktime);
setRequired(required);
setDay(day);
setFkLogin(fkLogin);
setRequiredMinutes(requiredMinutes);
setReason(reason);
resetChangedOnNotNull();
}
}

3
src/main/resources/done_ext.sql
View File

@ -2,6 +2,7 @@ create table done.t_required_worktime (
pk_required_worktime int primary key generated always as identity,
required_minutes int not null default 480,
day date not null,
reason text,
fk_login int not null references profile.t_login(pk),
unique(day, fk_login)
);
@ -80,4 +81,4 @@ with x(dayworktime, day, fk_login, required, starttime, endtime) as (
grant select on done.v_day to timetrack;
create or replace view done.v_version as select 20240104 as version;
create or replace view done.v_version as select 20240105 as version;