diff --git a/build.gradle b/build.gradle index 1d8339b..4a75906 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'eclipse' apply plugin: 'nu.studer.jooq' group = 'jottyfan' -version = '1.1.0' +version = '1.1.1' description = """timetrack""" diff --git a/src/jooq/java/de/jottyfan/timetrack/db/DefaultCatalog.java b/src/jooq/java/de/jottyfan/timetrack/db/DefaultCatalog.java index 7ad48dd..a179fee 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/DefaultCatalog.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/DefaultCatalog.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Schema; import org.jooq.impl.CatalogImpl; @@ -32,7 +32,7 @@ import org.jooq.impl.CatalogImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = 1875812553; + private static final long serialVersionUID = 1609733166; /** * The reference instance of diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/Contact.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/Contact.java index 1accc22..fbbc824 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/Contact.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/Contact.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Catalog; import org.jooq.Table; @@ -31,7 +31,7 @@ import org.jooq.impl.SchemaImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Contact extends SchemaImpl { - private static final long serialVersionUID = 2007599284; + private static final long serialVersionUID = -253386273; /** * The reference instance of contact diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/Indexes.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/Indexes.java index baf9b37..2c91112 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/Indexes.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/Indexes.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.contact; import de.jottyfan.timetrack.db.contact.tables.TContact; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Index; import org.jooq.OrderField; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/Tables.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/Tables.java index dcc488d..36a7c61 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/Tables.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/Tables.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.contact; import de.jottyfan.timetrack.db.contact.tables.TContact; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; /** diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/enums/EnumContacttype.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/enums/EnumContacttype.java index 46b8517..709086a 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/enums/EnumContacttype.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/enums/EnumContacttype.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.contact.enums; import de.jottyfan.timetrack.db.contact.Contact; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Catalog; import org.jooq.EnumType; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/TContact.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/TContact.java index 82a4eef..a1444cb 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/TContact.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/TContact.java @@ -12,7 +12,7 @@ import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TContact extends TableImpl { - private static final long serialVersionUID = -1913430710; + private static final long serialVersionUID = 1122078543; /** * The reference instance of contact.t_contact diff --git a/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/records/TContactRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/records/TContactRecord.java index d0ff648..75f950f 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/records/TContactRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/contact/tables/records/TContactRecord.java @@ -7,7 +7,7 @@ package de.jottyfan.timetrack.db.contact.tables.records; import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; import de.jottyfan.timetrack.db.contact.tables.TContact; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record5; @@ -28,7 +28,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TContactRecord extends TableRecordImpl implements Record5 { - private static final long serialVersionUID = 875007667; + private static final long serialVersionUID = 1184347110; /** * Setter for contact.t_contact.pk. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/Done.java b/src/jooq/java/de/jottyfan/timetrack/db/done/Done.java index aed00a0..535c134 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/Done.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/Done.java @@ -14,16 +14,19 @@ import de.jottyfan.timetrack.db.done.tables.VDaylimits; import de.jottyfan.timetrack.db.done.tables.VDaysummary; import de.jottyfan.timetrack.db.done.tables.VDone; import de.jottyfan.timetrack.db.done.tables.VDuration; +import de.jottyfan.timetrack.db.done.tables.VEucanshare; import de.jottyfan.timetrack.db.done.tables.VHamster; import de.jottyfan.timetrack.db.done.tables.VHamstersummary; import de.jottyfan.timetrack.db.done.tables.VTasklist; +import de.jottyfan.timetrack.db.done.tables.VTimelength; import de.jottyfan.timetrack.db.done.tables.VTotalofday; +import de.jottyfan.timetrack.db.done.tables.VWorktime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Catalog; import org.jooq.Table; @@ -43,7 +46,7 @@ import org.jooq.impl.SchemaImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Done extends SchemaImpl { - private static final long serialVersionUID = -1471367006; + private static final long serialVersionUID = -1147316456; /** * The reference instance of done @@ -95,6 +98,11 @@ public class Done extends SchemaImpl { */ public final VDuration V_DURATION = de.jottyfan.timetrack.db.done.tables.VDuration.V_DURATION; + /** + * The table done.v_eucanshare. + */ + public final VEucanshare V_EUCANSHARE = de.jottyfan.timetrack.db.done.tables.VEucanshare.V_EUCANSHARE; + /** * The table done.v_hamster. */ @@ -110,11 +118,21 @@ public class Done extends SchemaImpl { */ public final VTasklist V_TASKLIST = de.jottyfan.timetrack.db.done.tables.VTasklist.V_TASKLIST; + /** + * The table done.v_timelength. + */ + public final VTimelength V_TIMELENGTH = de.jottyfan.timetrack.db.done.tables.VTimelength.V_TIMELENGTH; + /** * The table done.v_totalofday. */ public final VTotalofday V_TOTALOFDAY = de.jottyfan.timetrack.db.done.tables.VTotalofday.V_TOTALOFDAY; + /** + * The table done.v_worktime. + */ + public final VWorktime V_WORKTIME = de.jottyfan.timetrack.db.done.tables.VWorktime.V_WORKTIME; + /** * No further instances allowed */ @@ -146,9 +164,12 @@ public class Done extends SchemaImpl { VDaysummary.V_DAYSUMMARY, VDone.V_DONE, VDuration.V_DURATION, + VEucanshare.V_EUCANSHARE, VHamster.V_HAMSTER, VHamstersummary.V_HAMSTERSUMMARY, VTasklist.V_TASKLIST, - VTotalofday.V_TOTALOFDAY); + VTimelength.V_TIMELENGTH, + VTotalofday.V_TOTALOFDAY, + VWorktime.V_WORKTIME); } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/Indexes.java b/src/jooq/java/de/jottyfan/timetrack/db/done/Indexes.java index 0a7dd7b..9029e33 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/Indexes.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/Indexes.java @@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.TJob; import de.jottyfan.timetrack.db.done.tables.TModule; import de.jottyfan.timetrack.db.done.tables.TProject; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Index; import org.jooq.OrderField; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/Tables.java b/src/jooq/java/de/jottyfan/timetrack/db/done/Tables.java index 292e780..0eb523d 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/Tables.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/Tables.java @@ -13,12 +13,15 @@ import de.jottyfan.timetrack.db.done.tables.VDaylimits; import de.jottyfan.timetrack.db.done.tables.VDaysummary; import de.jottyfan.timetrack.db.done.tables.VDone; import de.jottyfan.timetrack.db.done.tables.VDuration; +import de.jottyfan.timetrack.db.done.tables.VEucanshare; import de.jottyfan.timetrack.db.done.tables.VHamster; import de.jottyfan.timetrack.db.done.tables.VHamstersummary; import de.jottyfan.timetrack.db.done.tables.VTasklist; +import de.jottyfan.timetrack.db.done.tables.VTimelength; import de.jottyfan.timetrack.db.done.tables.VTotalofday; +import de.jottyfan.timetrack.db.done.tables.VWorktime; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; /** @@ -79,6 +82,11 @@ public class Tables { */ public static final VDuration V_DURATION = VDuration.V_DURATION; + /** + * The table done.v_eucanshare. + */ + public static final VEucanshare V_EUCANSHARE = VEucanshare.V_EUCANSHARE; + /** * The table done.v_hamster. */ @@ -94,8 +102,18 @@ public class Tables { */ public static final VTasklist V_TASKLIST = VTasklist.V_TASKLIST; + /** + * The table done.v_timelength. + */ + public static final VTimelength V_TIMELENGTH = VTimelength.V_TIMELENGTH; + /** * The table done.v_totalofday. */ public static final VTotalofday V_TOTALOFDAY = VTotalofday.V_TOTALOFDAY; + + /** + * The table done.v_worktime. + */ + public static final VWorktime V_WORKTIME = VWorktime.V_WORKTIME; } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TDone.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TDone.java index ec02b15..e95c895 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TDone.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TDone.java @@ -12,14 +12,14 @@ import java.sql.Timestamp; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Row8; +import org.jooq.Row9; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TDone extends TableImpl { - private static final long serialVersionUID = -2079648247; + private static final long serialVersionUID = -1009395311; /** * The reference instance of done.t_done @@ -95,6 +95,11 @@ public class TDone extends TableImpl { */ public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + /** + * The column done.t_done.wp. + */ + public final TableField WP = createField(DSL.name("wp"), org.jooq.impl.SQLDataType.CLOB, this, ""); + /** * Create a done.t_done table reference */ @@ -165,11 +170,11 @@ public class TDone extends TableImpl { } // ------------------------------------------------------------------------- - // Row8 type methods + // Row9 type methods // ------------------------------------------------------------------------- @Override - public Row8 fieldsRow() { - return (Row8) super.fieldsRow(); + public Row9 fieldsRow() { + return (Row9) super.fieldsRow(); } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TJob.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TJob.java index dad7f1a..0f4fab4 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TJob.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TJob.java @@ -12,7 +12,7 @@ import java.sql.Timestamp; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TJob extends TableImpl { - private static final long serialVersionUID = 300367621; + private static final long serialVersionUID = 1198013806; /** * The reference instance of done.t_job diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TModule.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TModule.java index e74a4f9..0ddda86 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TModule.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TModule.java @@ -12,7 +12,7 @@ import java.sql.Timestamp; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TModule extends TableImpl { - private static final long serialVersionUID = 1907331946; + private static final long serialVersionUID = 1195797689; /** * The reference instance of done.t_module diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TProject.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TProject.java index ab6a717..21b3994 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TProject.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/TProject.java @@ -12,7 +12,7 @@ import java.sql.Timestamp; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TProject extends TableImpl { - private static final long serialVersionUID = -609416251; + private static final long serialVersionUID = 760221750; /** * The reference instance of done.t_project diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaily.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaily.java index 1f691fb..1498f29 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaily.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaily.java @@ -7,7 +7,7 @@ package de.jottyfan.timetrack.db.done.tables; import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.tables.records.VDailyRecord; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -35,7 +35,7 @@ import org.jooq.types.YearToSecond; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VDaily extends TableImpl { - private static final long serialVersionUID = -220365849; + private static final long serialVersionUID = -310161174; /** * The reference instance of done.v_daily diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaylimits.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaylimits.java index ce66486..b01f020 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaylimits.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaylimits.java @@ -10,7 +10,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VDaylimitsRecord; import java.sql.Timestamp; import java.time.OffsetDateTime; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -37,7 +37,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VDaylimits extends TableImpl { - private static final long serialVersionUID = 1186965315; + private static final long serialVersionUID = -1022072072; /** * The reference instance of done.v_daylimits diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaysummary.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaysummary.java index 1af7965..93440ca 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaysummary.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDaysummary.java @@ -10,7 +10,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VDaysummaryRecord; import java.sql.Timestamp; import java.time.OffsetDateTime; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -38,7 +38,7 @@ import org.jooq.types.YearToSecond; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VDaysummary extends TableImpl { - private static final long serialVersionUID = 524060696; + private static final long serialVersionUID = 1541117915; /** * The reference instance of done.v_daysummary diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDone.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDone.java index 4837691..91d7ece 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDone.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDone.java @@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VDoneRecord; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -36,7 +36,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VDone extends TableImpl { - private static final long serialVersionUID = -842360229; + private static final long serialVersionUID = -1832237834; /** * The reference instance of done.v_done diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDuration.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDuration.java index 35f22f2..36948b6 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDuration.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VDuration.java @@ -7,7 +7,7 @@ package de.jottyfan.timetrack.db.done.tables; import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.tables.records.VDurationRecord; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -35,7 +35,7 @@ import org.jooq.types.YearToSecond; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VDuration extends TableImpl { - private static final long serialVersionUID = -578535096; + private static final long serialVersionUID = -942666083; /** * The reference instance of done.v_duration diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VEucanshare.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VEucanshare.java new file mode 100644 index 0000000..973106f --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VEucanshare.java @@ -0,0 +1,167 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables; + + +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VEucanshareRecord; + +import java.sql.Date; + +import javax.annotation.processing.Generated; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row8; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VEucanshare extends TableImpl { + + private static final long serialVersionUID = 1375477301; + + /** + * The reference instance of done.v_eucanshare + */ + public static final VEucanshare V_EUCANSHARE = new VEucanshare(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VEucanshareRecord.class; + } + + /** + * The column done.v_eucanshare.fk_done. + */ + public final TableField FK_DONE = createField(DSL.name("fk_done"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * The column done.v_eucanshare.workday. + */ + public final TableField WORKDAY = createField(DSL.name("workday"), org.jooq.impl.SQLDataType.DATE, this, ""); + + /** + * The column done.v_eucanshare.duration. + */ + public final TableField DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); + + /** + * The column done.v_eucanshare.project_name. + */ + public final TableField PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_eucanshare.module_name. + */ + public final TableField MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_eucanshare.job_name. + */ + public final TableField JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_eucanshare.fk_login. + */ + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * The column done.v_eucanshare.wp. + */ + public final TableField WP = createField(DSL.name("wp"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * Create a done.v_eucanshare table reference + */ + public VEucanshare() { + this(DSL.name("v_eucanshare"), null); + } + + /** + * Create an aliased done.v_eucanshare table reference + */ + public VEucanshare(String alias) { + this(DSL.name(alias), V_EUCANSHARE); + } + + /** + * Create an aliased done.v_eucanshare table reference + */ + public VEucanshare(Name alias) { + this(alias, V_EUCANSHARE); + } + + private VEucanshare(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private VEucanshare(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment("")); + } + + public VEucanshare(Table child, ForeignKey key) { + super(child, key, V_EUCANSHARE); + } + + @Override + public Schema getSchema() { + return Done.DONE; + } + + @Override + public VEucanshare as(String alias) { + return new VEucanshare(DSL.name(alias), this); + } + + @Override + public VEucanshare as(Name alias) { + return new VEucanshare(alias, this); + } + + /** + * Rename this table + */ + @Override + public VEucanshare rename(String name) { + return new VEucanshare(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VEucanshare rename(Name name) { + return new VEucanshare(name, null); + } + + // ------------------------------------------------------------------------- + // Row8 type methods + // ------------------------------------------------------------------------- + + @Override + public Row8 fieldsRow() { + return (Row8) super.fieldsRow(); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamster.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamster.java index e3a5274..7fea784 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamster.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamster.java @@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VHamsterRecord; import java.sql.Date; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -37,7 +37,7 @@ import org.jooq.types.YearToSecond; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VHamster extends TableImpl { - private static final long serialVersionUID = -137413152; + private static final long serialVersionUID = -1309111431; /** * The reference instance of done.v_hamster diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamstersummary.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamstersummary.java index c158fde..1f10852 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamstersummary.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VHamstersummary.java @@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VHamstersummaryRecord; import java.sql.Date; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -36,7 +36,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VHamstersummary extends TableImpl { - private static final long serialVersionUID = -285333605; + private static final long serialVersionUID = -1084154956; /** * The reference instance of done.v_hamstersummary diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTasklist.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTasklist.java index 31cbca1..cbc93b2 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTasklist.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTasklist.java @@ -7,7 +7,7 @@ package de.jottyfan.timetrack.db.done.tables; import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.tables.records.VTasklistRecord; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -34,7 +34,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VTasklist extends TableImpl { - private static final long serialVersionUID = -109801723; + private static final long serialVersionUID = -601090984; /** * The reference instance of done.v_tasklist diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTimelength.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTimelength.java new file mode 100644 index 0000000..a70d366 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTimelength.java @@ -0,0 +1,145 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables; + + +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VTimelengthRecord; + +import javax.annotation.processing.Generated; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row4; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VTimelength extends TableImpl { + + private static final long serialVersionUID = -181048501; + + /** + * The reference instance of done.v_timelength + */ + public static final VTimelength V_TIMELENGTH = new VTimelength(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VTimelengthRecord.class; + } + + /** + * The column done.v_timelength.day. + */ + public final TableField DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_timelength.duration. + */ + public final TableField DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.INTERVAL, this, ""); + + /** + * The column done.v_timelength.fk_done. + */ + public final TableField FK_DONE = createField(DSL.name("fk_done"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * The column done.v_timelength.fk_login. + */ + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * Create a done.v_timelength table reference + */ + public VTimelength() { + this(DSL.name("v_timelength"), null); + } + + /** + * Create an aliased done.v_timelength table reference + */ + public VTimelength(String alias) { + this(DSL.name(alias), V_TIMELENGTH); + } + + /** + * Create an aliased done.v_timelength table reference + */ + public VTimelength(Name alias) { + this(alias, V_TIMELENGTH); + } + + private VTimelength(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private VTimelength(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment("")); + } + + public VTimelength(Table child, ForeignKey key) { + super(child, key, V_TIMELENGTH); + } + + @Override + public Schema getSchema() { + return Done.DONE; + } + + @Override + public VTimelength as(String alias) { + return new VTimelength(DSL.name(alias), this); + } + + @Override + public VTimelength as(Name alias) { + return new VTimelength(alias, this); + } + + /** + * Rename this table + */ + @Override + public VTimelength rename(String name) { + return new VTimelength(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VTimelength rename(Name name) { + return new VTimelength(name, null); + } + + // ------------------------------------------------------------------------- + // Row4 type methods + // ------------------------------------------------------------------------- + + @Override + public Row4 fieldsRow() { + return (Row4) super.fieldsRow(); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTotalofday.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTotalofday.java index b741885..77f843a 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTotalofday.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VTotalofday.java @@ -7,7 +7,7 @@ package de.jottyfan.timetrack.db.done.tables; import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.tables.records.VTotalofdayRecord; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -34,7 +34,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VTotalofday extends TableImpl { - private static final long serialVersionUID = 1381929458; + private static final long serialVersionUID = 46814145; /** * The reference instance of done.v_totalofday diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VWorktime.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VWorktime.java new file mode 100644 index 0000000..1dd5e65 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/VWorktime.java @@ -0,0 +1,164 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables; + + +import de.jottyfan.timetrack.db.done.Done; +import de.jottyfan.timetrack.db.done.tables.records.VWorktimeRecord; + +import javax.annotation.processing.Generated; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row8; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VWorktime extends TableImpl { + + private static final long serialVersionUID = -330427149; + + /** + * The reference instance of done.v_worktime + */ + public static final VWorktime V_WORKTIME = new VWorktime(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return VWorktimeRecord.class; + } + + /** + * The column done.v_worktime.day. + */ + public final TableField DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_worktime.duration. + */ + public final TableField DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_worktime.duration_hours. + */ + public final TableField DURATION_HOURS = createField(DSL.name("duration_hours"), org.jooq.impl.SQLDataType.DOUBLE, this, ""); + + /** + * The column done.v_worktime.project_name. + */ + public final TableField PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_worktime.module_name. + */ + public final TableField MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_worktime.job_name. + */ + public final TableField JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_worktime.wp. + */ + public final TableField WP = createField(DSL.name("wp"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column done.v_worktime.fk_login. + */ + public final TableField FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * Create a done.v_worktime table reference + */ + public VWorktime() { + this(DSL.name("v_worktime"), null); + } + + /** + * Create an aliased done.v_worktime table reference + */ + public VWorktime(String alias) { + this(DSL.name(alias), V_WORKTIME); + } + + /** + * Create an aliased done.v_worktime table reference + */ + public VWorktime(Name alias) { + this(alias, V_WORKTIME); + } + + private VWorktime(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private VWorktime(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment("")); + } + + public VWorktime(Table child, ForeignKey key) { + super(child, key, V_WORKTIME); + } + + @Override + public Schema getSchema() { + return Done.DONE; + } + + @Override + public VWorktime as(String alias) { + return new VWorktime(DSL.name(alias), this); + } + + @Override + public VWorktime as(Name alias) { + return new VWorktime(alias, this); + } + + /** + * Rename this table + */ + @Override + public VWorktime rename(String name) { + return new VWorktime(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public VWorktime rename(Name name) { + return new VWorktime(name, null); + } + + // ------------------------------------------------------------------------- + // Row8 type methods + // ------------------------------------------------------------------------- + + @Override + public Row8 fieldsRow() { + return (Row8) super.fieldsRow(); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TDoneRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TDoneRecord.java index edf6af2..4ffc47c 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TDoneRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TDoneRecord.java @@ -8,11 +8,11 @@ import de.jottyfan.timetrack.db.done.tables.TDone; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; -import org.jooq.Record8; -import org.jooq.Row8; +import org.jooq.Record9; +import org.jooq.Row9; import org.jooq.impl.TableRecordImpl; @@ -27,9 +27,9 @@ import org.jooq.impl.TableRecordImpl; comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TDoneRecord extends TableRecordImpl implements Record8 { +public class TDoneRecord extends TableRecordImpl implements Record9 { - private static final long serialVersionUID = 254775418; + private static final long serialVersionUID = -1941900551; /** * Setter for done.t_done.lastchange. @@ -143,18 +143,32 @@ public class TDoneRecord extends TableRecordImpl implements Record8 return (Integer) get(7); } + /** + * Setter for done.t_done.wp. + */ + public void setWp(String value) { + set(8, value); + } + + /** + * Getter for done.t_done.wp. + */ + public String getWp() { + return (String) get(8); + } + // ------------------------------------------------------------------------- - // Record8 type implementation + // Record9 type implementation // ------------------------------------------------------------------------- @Override - public Row8 fieldsRow() { - return (Row8) super.fieldsRow(); + public Row9 fieldsRow() { + return (Row9) super.fieldsRow(); } @Override - public Row8 valuesRow() { - return (Row8) super.valuesRow(); + public Row9 valuesRow() { + return (Row9) super.valuesRow(); } @Override @@ -197,6 +211,11 @@ public class TDoneRecord extends TableRecordImpl implements Record8 return TDone.T_DONE.FK_LOGIN; } + @Override + public Field field9() { + return TDone.T_DONE.WP; + } + @Override public Timestamp component1() { return getLastchange(); @@ -237,6 +256,11 @@ public class TDoneRecord extends TableRecordImpl implements Record8 return getFkLogin(); } + @Override + public String component9() { + return getWp(); + } + @Override public Timestamp value1() { return getLastchange(); @@ -277,6 +301,11 @@ public class TDoneRecord extends TableRecordImpl implements Record8 return getFkLogin(); } + @Override + public String value9() { + return getWp(); + } + @Override public TDoneRecord value1(Timestamp value) { setLastchange(value); @@ -326,7 +355,13 @@ public class TDoneRecord extends TableRecordImpl implements Record8 } @Override - public TDoneRecord values(Timestamp value1, Integer value2, Timestamp value3, Timestamp value4, Integer value5, Integer value6, Integer value7, Integer value8) { + public TDoneRecord value9(String value) { + setWp(value); + return this; + } + + @Override + public TDoneRecord values(Timestamp value1, Integer value2, Timestamp value3, Timestamp value4, Integer value5, Integer value6, Integer value7, Integer value8, String value9) { value1(value1); value2(value2); value3(value3); @@ -335,6 +370,7 @@ public class TDoneRecord extends TableRecordImpl implements Record8 value6(value6); value7(value7); value8(value8); + value9(value9); return this; } @@ -352,7 +388,7 @@ public class TDoneRecord extends TableRecordImpl implements Record8 /** * Create a detached, initialised TDoneRecord */ - public TDoneRecord(Timestamp lastchange, Integer pk, Timestamp timeFrom, Timestamp timeUntil, Integer fkProject, Integer fkModule, Integer fkJob, Integer fkLogin) { + public TDoneRecord(Timestamp lastchange, Integer pk, Timestamp timeFrom, Timestamp timeUntil, Integer fkProject, Integer fkModule, Integer fkJob, Integer fkLogin, String wp) { super(TDone.T_DONE); set(0, lastchange); @@ -363,5 +399,6 @@ public class TDoneRecord extends TableRecordImpl implements Record8 set(5, fkModule); set(6, fkJob); set(7, fkLogin); + set(8, wp); } } diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TJobRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TJobRecord.java index 3f419a4..cf8b1bd 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TJobRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TJobRecord.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.TJob; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record3; @@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TJobRecord extends TableRecordImpl implements Record3 { - private static final long serialVersionUID = 501080223; + private static final long serialVersionUID = -1298990074; /** * Setter for done.t_job.lastchange. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TModuleRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TModuleRecord.java index b4268d1..032088e 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TModuleRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TModuleRecord.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.TModule; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record3; @@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TModuleRecord extends TableRecordImpl implements Record3 { - private static final long serialVersionUID = 1180844514; + private static final long serialVersionUID = 1225434375; /** * Setter for done.t_module.lastchange. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TProjectRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TProjectRecord.java index e1bf472..a3e4c2e 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TProjectRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/TProjectRecord.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.TProject; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record3; @@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TProjectRecord extends TableRecordImpl implements Record3 { - private static final long serialVersionUID = 1864163507; + private static final long serialVersionUID = 1716720610; /** * Setter for done.t_project.lastchange. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDailyRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDailyRecord.java index e18ff61..b672cef 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDailyRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDailyRecord.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records; import de.jottyfan.timetrack.db.done.tables.VDaily; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record4; @@ -28,7 +28,7 @@ import org.jooq.types.YearToSecond; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VDailyRecord extends TableRecordImpl implements Record4 { - private static final long serialVersionUID = 111682889; + private static final long serialVersionUID = 272286224; /** * Setter for done.v_daily.worktime. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaylimitsRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaylimitsRecord.java index e600d3f..7b954c0 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaylimitsRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaylimitsRecord.java @@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.VDaylimits; import java.sql.Timestamp; import java.time.OffsetDateTime; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record4; @@ -30,7 +30,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VDaylimitsRecord extends TableRecordImpl implements Record4 { - private static final long serialVersionUID = 1544678482; + private static final long serialVersionUID = -1076103395; /** * Setter for done.v_daylimits.work_start. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaysummaryRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaysummaryRecord.java index 9ee880a..241ab51 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaysummaryRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDaysummaryRecord.java @@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.VDaysummary; import java.sql.Timestamp; import java.time.OffsetDateTime; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record7; @@ -31,7 +31,7 @@ import org.jooq.types.YearToSecond; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VDaysummaryRecord extends TableRecordImpl implements Record7 { - private static final long serialVersionUID = -531239752; + private static final long serialVersionUID = -524282795; /** * Setter for done.v_daysummary.breaktime. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDoneRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDoneRecord.java index 6a082ca..db58ac5 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDoneRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDoneRecord.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.VDone; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record8; @@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VDoneRecord extends TableRecordImpl implements Record8 { - private static final long serialVersionUID = -311533849; + private static final long serialVersionUID = 933997970; /** * Setter for done.v_done.fk_done. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDurationRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDurationRecord.java index 5df0c4b..12b5637 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDurationRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VDurationRecord.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records; import de.jottyfan.timetrack.db.done.tables.VDuration; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record7; @@ -28,7 +28,7 @@ import org.jooq.types.YearToSecond; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VDurationRecord extends TableRecordImpl implements Record7 { - private static final long serialVersionUID = 794239622; + private static final long serialVersionUID = -1641325525; /** * Setter for done.v_duration.day. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VEucanshareRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VEucanshareRecord.java new file mode 100644 index 0000000..93236b2 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VEucanshareRecord.java @@ -0,0 +1,368 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables.records; + + +import de.jottyfan.timetrack.db.done.tables.VEucanshare; + +import java.sql.Date; + +import javax.annotation.processing.Generated; + +import org.jooq.Field; +import org.jooq.Record8; +import org.jooq.Row8; +import org.jooq.impl.TableRecordImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VEucanshareRecord extends TableRecordImpl implements Record8 { + + private static final long serialVersionUID = 2139665588; + + /** + * Setter for done.v_eucanshare.fk_done. + */ + public void setFkDone(Integer value) { + set(0, value); + } + + /** + * Getter for done.v_eucanshare.fk_done. + */ + public Integer getFkDone() { + return (Integer) get(0); + } + + /** + * Setter for done.v_eucanshare.workday. + */ + public void setWorkday(Date value) { + set(1, value); + } + + /** + * Getter for done.v_eucanshare.workday. + */ + public Date getWorkday() { + return (Date) get(1); + } + + /** + * Setter for done.v_eucanshare.duration. + */ + public void setDuration(YearToSecond value) { + set(2, value); + } + + /** + * Getter for done.v_eucanshare.duration. + */ + public YearToSecond getDuration() { + return (YearToSecond) get(2); + } + + /** + * Setter for done.v_eucanshare.project_name. + */ + public void setProjectName(String value) { + set(3, value); + } + + /** + * Getter for done.v_eucanshare.project_name. + */ + public String getProjectName() { + return (String) get(3); + } + + /** + * Setter for done.v_eucanshare.module_name. + */ + public void setModuleName(String value) { + set(4, value); + } + + /** + * Getter for done.v_eucanshare.module_name. + */ + public String getModuleName() { + return (String) get(4); + } + + /** + * Setter for done.v_eucanshare.job_name. + */ + public void setJobName(String value) { + set(5, value); + } + + /** + * Getter for done.v_eucanshare.job_name. + */ + public String getJobName() { + return (String) get(5); + } + + /** + * Setter for done.v_eucanshare.fk_login. + */ + public void setFkLogin(Integer value) { + set(6, value); + } + + /** + * Getter for done.v_eucanshare.fk_login. + */ + public Integer getFkLogin() { + return (Integer) get(6); + } + + /** + * Setter for done.v_eucanshare.wp. + */ + public void setWp(String value) { + set(7, value); + } + + /** + * Getter for done.v_eucanshare.wp. + */ + public String getWp() { + return (String) get(7); + } + + // ------------------------------------------------------------------------- + // Record8 type implementation + // ------------------------------------------------------------------------- + + @Override + public Row8 fieldsRow() { + return (Row8) super.fieldsRow(); + } + + @Override + public Row8 valuesRow() { + return (Row8) super.valuesRow(); + } + + @Override + public Field field1() { + return VEucanshare.V_EUCANSHARE.FK_DONE; + } + + @Override + public Field field2() { + return VEucanshare.V_EUCANSHARE.WORKDAY; + } + + @Override + public Field field3() { + return VEucanshare.V_EUCANSHARE.DURATION; + } + + @Override + public Field field4() { + return VEucanshare.V_EUCANSHARE.PROJECT_NAME; + } + + @Override + public Field field5() { + return VEucanshare.V_EUCANSHARE.MODULE_NAME; + } + + @Override + public Field field6() { + return VEucanshare.V_EUCANSHARE.JOB_NAME; + } + + @Override + public Field field7() { + return VEucanshare.V_EUCANSHARE.FK_LOGIN; + } + + @Override + public Field field8() { + return VEucanshare.V_EUCANSHARE.WP; + } + + @Override + public Integer component1() { + return getFkDone(); + } + + @Override + public Date component2() { + return getWorkday(); + } + + @Override + public YearToSecond component3() { + return getDuration(); + } + + @Override + public String component4() { + return getProjectName(); + } + + @Override + public String component5() { + return getModuleName(); + } + + @Override + public String component6() { + return getJobName(); + } + + @Override + public Integer component7() { + return getFkLogin(); + } + + @Override + public String component8() { + return getWp(); + } + + @Override + public Integer value1() { + return getFkDone(); + } + + @Override + public Date value2() { + return getWorkday(); + } + + @Override + public YearToSecond value3() { + return getDuration(); + } + + @Override + public String value4() { + return getProjectName(); + } + + @Override + public String value5() { + return getModuleName(); + } + + @Override + public String value6() { + return getJobName(); + } + + @Override + public Integer value7() { + return getFkLogin(); + } + + @Override + public String value8() { + return getWp(); + } + + @Override + public VEucanshareRecord value1(Integer value) { + setFkDone(value); + return this; + } + + @Override + public VEucanshareRecord value2(Date value) { + setWorkday(value); + return this; + } + + @Override + public VEucanshareRecord value3(YearToSecond value) { + setDuration(value); + return this; + } + + @Override + public VEucanshareRecord value4(String value) { + setProjectName(value); + return this; + } + + @Override + public VEucanshareRecord value5(String value) { + setModuleName(value); + return this; + } + + @Override + public VEucanshareRecord value6(String value) { + setJobName(value); + return this; + } + + @Override + public VEucanshareRecord value7(Integer value) { + setFkLogin(value); + return this; + } + + @Override + public VEucanshareRecord value8(String value) { + setWp(value); + return this; + } + + @Override + public VEucanshareRecord values(Integer value1, Date value2, YearToSecond value3, String value4, String value5, String value6, Integer value7, String value8) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + value5(value5); + value6(value6); + value7(value7); + value8(value8); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VEucanshareRecord + */ + public VEucanshareRecord() { + super(VEucanshare.V_EUCANSHARE); + } + + /** + * Create a detached, initialised VEucanshareRecord + */ + public VEucanshareRecord(Integer fkDone, Date workday, YearToSecond duration, String projectName, String moduleName, String jobName, Integer fkLogin, String wp) { + super(VEucanshare.V_EUCANSHARE); + + set(0, fkDone); + set(1, workday); + set(2, duration); + set(3, projectName); + set(4, moduleName); + set(5, jobName); + set(6, fkLogin); + set(7, wp); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamsterRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamsterRecord.java index 0dd9382..e0e6f8f 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamsterRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamsterRecord.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.VHamster; import java.sql.Date; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record6; @@ -30,7 +30,7 @@ import org.jooq.types.YearToSecond; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VHamsterRecord extends TableRecordImpl implements Record6 { - private static final long serialVersionUID = 1475398201; + private static final long serialVersionUID = 1135919574; /** * Setter for done.v_hamster.workday. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamstersummaryRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamstersummaryRecord.java index 899ae8c..3d5a7c1 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamstersummaryRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VHamstersummaryRecord.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.VHamstersummary; import java.sql.Date; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record6; @@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VHamstersummaryRecord extends TableRecordImpl implements Record6 { - private static final long serialVersionUID = 742713887; + private static final long serialVersionUID = 1731792914; /** * Setter for done.v_hamstersummary.workday. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTasklistRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTasklistRecord.java index df9bd1d..ba4294d 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTasklistRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTasklistRecord.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records; import de.jottyfan.timetrack.db.done.tables.VTasklist; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record6; @@ -27,7 +27,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VTasklistRecord extends TableRecordImpl implements Record6 { - private static final long serialVersionUID = -1505579480; + private static final long serialVersionUID = -1593590961; /** * Setter for done.v_tasklist.day. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTimelengthRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTimelengthRecord.java new file mode 100644 index 0000000..d21b9e7 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTimelengthRecord.java @@ -0,0 +1,218 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables.records; + + +import de.jottyfan.timetrack.db.done.tables.VTimelength; + +import javax.annotation.processing.Generated; + +import org.jooq.Field; +import org.jooq.Record4; +import org.jooq.Row4; +import org.jooq.impl.TableRecordImpl; +import org.jooq.types.YearToSecond; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VTimelengthRecord extends TableRecordImpl implements Record4 { + + private static final long serialVersionUID = -328020269; + + /** + * Setter for done.v_timelength.day. + */ + public void setDay(String value) { + set(0, value); + } + + /** + * Getter for done.v_timelength.day. + */ + public String getDay() { + return (String) get(0); + } + + /** + * Setter for done.v_timelength.duration. + */ + public void setDuration(YearToSecond value) { + set(1, value); + } + + /** + * Getter for done.v_timelength.duration. + */ + public YearToSecond getDuration() { + return (YearToSecond) get(1); + } + + /** + * Setter for done.v_timelength.fk_done. + */ + public void setFkDone(Integer value) { + set(2, value); + } + + /** + * Getter for done.v_timelength.fk_done. + */ + public Integer getFkDone() { + return (Integer) get(2); + } + + /** + * Setter for done.v_timelength.fk_login. + */ + public void setFkLogin(Integer value) { + set(3, value); + } + + /** + * Getter for done.v_timelength.fk_login. + */ + public Integer getFkLogin() { + return (Integer) get(3); + } + + // ------------------------------------------------------------------------- + // Record4 type implementation + // ------------------------------------------------------------------------- + + @Override + public Row4 fieldsRow() { + return (Row4) super.fieldsRow(); + } + + @Override + public Row4 valuesRow() { + return (Row4) super.valuesRow(); + } + + @Override + public Field field1() { + return VTimelength.V_TIMELENGTH.DAY; + } + + @Override + public Field field2() { + return VTimelength.V_TIMELENGTH.DURATION; + } + + @Override + public Field field3() { + return VTimelength.V_TIMELENGTH.FK_DONE; + } + + @Override + public Field field4() { + return VTimelength.V_TIMELENGTH.FK_LOGIN; + } + + @Override + public String component1() { + return getDay(); + } + + @Override + public YearToSecond component2() { + return getDuration(); + } + + @Override + public Integer component3() { + return getFkDone(); + } + + @Override + public Integer component4() { + return getFkLogin(); + } + + @Override + public String value1() { + return getDay(); + } + + @Override + public YearToSecond value2() { + return getDuration(); + } + + @Override + public Integer value3() { + return getFkDone(); + } + + @Override + public Integer value4() { + return getFkLogin(); + } + + @Override + public VTimelengthRecord value1(String value) { + setDay(value); + return this; + } + + @Override + public VTimelengthRecord value2(YearToSecond value) { + setDuration(value); + return this; + } + + @Override + public VTimelengthRecord value3(Integer value) { + setFkDone(value); + return this; + } + + @Override + public VTimelengthRecord value4(Integer value) { + setFkLogin(value); + return this; + } + + @Override + public VTimelengthRecord values(String value1, YearToSecond value2, Integer value3, Integer value4) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VTimelengthRecord + */ + public VTimelengthRecord() { + super(VTimelength.V_TIMELENGTH); + } + + /** + * Create a detached, initialised VTimelengthRecord + */ + public VTimelengthRecord(String day, YearToSecond duration, Integer fkDone, Integer fkLogin) { + super(VTimelength.V_TIMELENGTH); + + set(0, day); + set(1, duration); + set(2, fkDone); + set(3, fkLogin); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTotalofdayRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTotalofdayRecord.java index 52be9e2..7fd0e69 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTotalofdayRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VTotalofdayRecord.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records; import de.jottyfan.timetrack.db.done.tables.VTotalofday; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record6; @@ -27,7 +27,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VTotalofdayRecord extends TableRecordImpl implements Record6 { - private static final long serialVersionUID = -383740435; + private static final long serialVersionUID = -1877583070; /** * Setter for done.v_totalofday.breaktime. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VWorktimeRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VWorktimeRecord.java new file mode 100644 index 0000000..c061976 --- /dev/null +++ b/src/jooq/java/de/jottyfan/timetrack/db/done/tables/records/VWorktimeRecord.java @@ -0,0 +1,365 @@ +/* + * This file is generated by jOOQ. + */ +package de.jottyfan.timetrack.db.done.tables.records; + + +import de.jottyfan.timetrack.db.done.tables.VWorktime; + +import javax.annotation.processing.Generated; + +import org.jooq.Field; +import org.jooq.Record8; +import org.jooq.Row8; +import org.jooq.impl.TableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.12.1" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class VWorktimeRecord extends TableRecordImpl implements Record8 { + + private static final long serialVersionUID = 647750108; + + /** + * Setter for done.v_worktime.day. + */ + public void setDay(String value) { + set(0, value); + } + + /** + * Getter for done.v_worktime.day. + */ + public String getDay() { + return (String) get(0); + } + + /** + * Setter for done.v_worktime.duration. + */ + public void setDuration(String value) { + set(1, value); + } + + /** + * Getter for done.v_worktime.duration. + */ + public String getDuration() { + return (String) get(1); + } + + /** + * Setter for done.v_worktime.duration_hours. + */ + public void setDurationHours(Double value) { + set(2, value); + } + + /** + * Getter for done.v_worktime.duration_hours. + */ + public Double getDurationHours() { + return (Double) get(2); + } + + /** + * Setter for done.v_worktime.project_name. + */ + public void setProjectName(String value) { + set(3, value); + } + + /** + * Getter for done.v_worktime.project_name. + */ + public String getProjectName() { + return (String) get(3); + } + + /** + * Setter for done.v_worktime.module_name. + */ + public void setModuleName(String value) { + set(4, value); + } + + /** + * Getter for done.v_worktime.module_name. + */ + public String getModuleName() { + return (String) get(4); + } + + /** + * Setter for done.v_worktime.job_name. + */ + public void setJobName(String value) { + set(5, value); + } + + /** + * Getter for done.v_worktime.job_name. + */ + public String getJobName() { + return (String) get(5); + } + + /** + * Setter for done.v_worktime.wp. + */ + public void setWp(String value) { + set(6, value); + } + + /** + * Getter for done.v_worktime.wp. + */ + public String getWp() { + return (String) get(6); + } + + /** + * Setter for done.v_worktime.fk_login. + */ + public void setFkLogin(Integer value) { + set(7, value); + } + + /** + * Getter for done.v_worktime.fk_login. + */ + public Integer getFkLogin() { + return (Integer) get(7); + } + + // ------------------------------------------------------------------------- + // Record8 type implementation + // ------------------------------------------------------------------------- + + @Override + public Row8 fieldsRow() { + return (Row8) super.fieldsRow(); + } + + @Override + public Row8 valuesRow() { + return (Row8) super.valuesRow(); + } + + @Override + public Field field1() { + return VWorktime.V_WORKTIME.DAY; + } + + @Override + public Field field2() { + return VWorktime.V_WORKTIME.DURATION; + } + + @Override + public Field field3() { + return VWorktime.V_WORKTIME.DURATION_HOURS; + } + + @Override + public Field field4() { + return VWorktime.V_WORKTIME.PROJECT_NAME; + } + + @Override + public Field field5() { + return VWorktime.V_WORKTIME.MODULE_NAME; + } + + @Override + public Field field6() { + return VWorktime.V_WORKTIME.JOB_NAME; + } + + @Override + public Field field7() { + return VWorktime.V_WORKTIME.WP; + } + + @Override + public Field field8() { + return VWorktime.V_WORKTIME.FK_LOGIN; + } + + @Override + public String component1() { + return getDay(); + } + + @Override + public String component2() { + return getDuration(); + } + + @Override + public Double component3() { + return getDurationHours(); + } + + @Override + public String component4() { + return getProjectName(); + } + + @Override + public String component5() { + return getModuleName(); + } + + @Override + public String component6() { + return getJobName(); + } + + @Override + public String component7() { + return getWp(); + } + + @Override + public Integer component8() { + return getFkLogin(); + } + + @Override + public String value1() { + return getDay(); + } + + @Override + public String value2() { + return getDuration(); + } + + @Override + public Double value3() { + return getDurationHours(); + } + + @Override + public String value4() { + return getProjectName(); + } + + @Override + public String value5() { + return getModuleName(); + } + + @Override + public String value6() { + return getJobName(); + } + + @Override + public String value7() { + return getWp(); + } + + @Override + public Integer value8() { + return getFkLogin(); + } + + @Override + public VWorktimeRecord value1(String value) { + setDay(value); + return this; + } + + @Override + public VWorktimeRecord value2(String value) { + setDuration(value); + return this; + } + + @Override + public VWorktimeRecord value3(Double value) { + setDurationHours(value); + return this; + } + + @Override + public VWorktimeRecord value4(String value) { + setProjectName(value); + return this; + } + + @Override + public VWorktimeRecord value5(String value) { + setModuleName(value); + return this; + } + + @Override + public VWorktimeRecord value6(String value) { + setJobName(value); + return this; + } + + @Override + public VWorktimeRecord value7(String value) { + setWp(value); + return this; + } + + @Override + public VWorktimeRecord value8(Integer value) { + setFkLogin(value); + return this; + } + + @Override + public VWorktimeRecord values(String value1, String value2, Double value3, String value4, String value5, String value6, String value7, Integer value8) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + value5(value5); + value6(value6); + value7(value7); + value8(value8); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached VWorktimeRecord + */ + public VWorktimeRecord() { + super(VWorktime.V_WORKTIME); + } + + /** + * Create a detached, initialised VWorktimeRecord + */ + public VWorktimeRecord(String day, String duration, Double durationHours, String projectName, String moduleName, String jobName, String wp, Integer fkLogin) { + super(VWorktime.V_WORKTIME); + + set(0, day); + set(1, duration); + set(2, durationHours); + set(3, projectName); + set(4, moduleName); + set(5, jobName); + set(6, wp); + set(7, fkLogin); + } +} diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/Indexes.java b/src/jooq/java/de/jottyfan/timetrack/db/note/Indexes.java index 02c69d2..d664889 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/Indexes.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/Indexes.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.note; import de.jottyfan.timetrack.db.note.tables.TNote; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Index; import org.jooq.OrderField; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/Note.java b/src/jooq/java/de/jottyfan/timetrack/db/note/Note.java index ffb6be6..3ba2701 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/Note.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/Note.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Catalog; import org.jooq.Table; @@ -31,7 +31,7 @@ import org.jooq.impl.SchemaImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Note extends SchemaImpl { - private static final long serialVersionUID = -1212898548; + private static final long serialVersionUID = 462162811; /** * The reference instance of note diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/Tables.java b/src/jooq/java/de/jottyfan/timetrack/db/note/Tables.java index 54fb5fa..10a9ebe 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/Tables.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/Tables.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.note; import de.jottyfan.timetrack.db.note.tables.TNote; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; /** diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumCategory.java b/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumCategory.java index 81f0502..0d3af5e 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumCategory.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumCategory.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.note.enums; import de.jottyfan.timetrack.db.note.Note; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Catalog; import org.jooq.EnumType; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumNotetype.java b/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumNotetype.java index fef53a4..9b9e250 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumNotetype.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/enums/EnumNotetype.java @@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.note.enums; import de.jottyfan.timetrack.db.note.Note; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Catalog; import org.jooq.EnumType; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/tables/TNote.java b/src/jooq/java/de/jottyfan/timetrack/db/note/tables/TNote.java index cf2e4c1..5181695 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/tables/TNote.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/tables/TNote.java @@ -14,7 +14,7 @@ import java.sql.Timestamp; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -42,7 +42,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TNote extends TableImpl { - private static final long serialVersionUID = 338893308; + private static final long serialVersionUID = -601146141; /** * The reference instance of note.t_note diff --git a/src/jooq/java/de/jottyfan/timetrack/db/note/tables/records/TNoteRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/note/tables/records/TNoteRecord.java index a68ef8c..4ea0623 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/note/tables/records/TNoteRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/note/tables/records/TNoteRecord.java @@ -10,7 +10,7 @@ import de.jottyfan.timetrack.db.note.tables.TNote; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record6; @@ -31,7 +31,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TNoteRecord extends TableRecordImpl implements Record6 { - private static final long serialVersionUID = -1917591496; + private static final long serialVersionUID = 828107821; /** * Setter for note.t_note.pk. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/Indexes.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/Indexes.java index 24508a3..52ddabe 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/Indexes.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/Indexes.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.profile.tables.TLogin; import de.jottyfan.timetrack.db.profile.tables.TLoginrole; import de.jottyfan.timetrack.db.profile.tables.TRole; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Index; import org.jooq.OrderField; diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/Profile.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/Profile.java index 151caaa..927b548 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/Profile.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/Profile.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Catalog; import org.jooq.Table; @@ -34,7 +34,7 @@ import org.jooq.impl.SchemaImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Profile extends SchemaImpl { - private static final long serialVersionUID = -1284423911; + private static final long serialVersionUID = -215060084; /** * The reference instance of profile diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/Tables.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/Tables.java index c077a49..5bf61ea 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/Tables.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/Tables.java @@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.profile.tables.TLoginrole; import de.jottyfan.timetrack.db.profile.tables.TRole; import de.jottyfan.timetrack.db.profile.tables.VLoginrole; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; /** diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLogin.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLogin.java index ae6768d..5cbf76a 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLogin.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLogin.java @@ -12,7 +12,7 @@ import java.sql.Timestamp; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TLogin extends TableImpl { - private static final long serialVersionUID = 950956330; + private static final long serialVersionUID = 2055988705; /** * The reference instance of profile.t_login diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLoginrole.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLoginrole.java index b1e7554..311c2b4 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLoginrole.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TLoginrole.java @@ -12,7 +12,7 @@ import java.sql.Timestamp; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TLoginrole extends TableImpl { - private static final long serialVersionUID = 1800752164; + private static final long serialVersionUID = 404673647; /** * The reference instance of profile.t_loginrole diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TRole.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TRole.java index 96c26d4..11e43ad 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TRole.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/TRole.java @@ -12,7 +12,7 @@ import java.sql.Timestamp; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TRole extends TableImpl { - private static final long serialVersionUID = 482541526; + private static final long serialVersionUID = -1967676639; /** * The reference instance of profile.t_role diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/VLoginrole.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/VLoginrole.java index a7a4f4a..224c3d5 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/VLoginrole.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/VLoginrole.java @@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.profile.tables.records.VLoginroleRecord; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.ForeignKey; @@ -36,7 +36,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VLoginrole extends TableImpl { - private static final long serialVersionUID = 964647722; + private static final long serialVersionUID = -1240355347; /** * The reference instance of profile.v_loginrole diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginRecord.java index 57a2429..36c6644 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginRecord.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.profile.tables.TLogin; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record7; @@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TLoginRecord extends TableRecordImpl implements Record7 { - private static final long serialVersionUID = 1230282197; + private static final long serialVersionUID = 386473188; /** * Setter for profile.t_login.lastchange. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginroleRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginroleRecord.java index 17c362d..f76f392 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginroleRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TLoginroleRecord.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.profile.tables.TLoginrole; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record4; @@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TLoginroleRecord extends TableRecordImpl implements Record4 { - private static final long serialVersionUID = 440650070; + private static final long serialVersionUID = -986073453; /** * Setter for profile.t_loginrole.lastchange. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TRoleRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TRoleRecord.java index a347fdd..613eb2c 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TRoleRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/TRoleRecord.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.profile.tables.TRole; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record3; @@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TRoleRecord extends TableRecordImpl implements Record3 { - private static final long serialVersionUID = -108760046; + private static final long serialVersionUID = -1034367197; /** * Setter for profile.t_role.lastchange. diff --git a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/VLoginroleRecord.java b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/VLoginroleRecord.java index 9ef1330..93cd809 100644 --- a/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/VLoginroleRecord.java +++ b/src/jooq/java/de/jottyfan/timetrack/db/profile/tables/records/VLoginroleRecord.java @@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.profile.tables.VLoginrole; import java.sql.Timestamp; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.Record5; @@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class VLoginroleRecord extends TableRecordImpl implements Record5 { - private static final long serialVersionUID = 1784395796; + private static final long serialVersionUID = 332588237; /** * Setter for profile.v_loginrole.login. diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DailySummaryBean.java b/src/main/java/de/jottyfan/timetrack/modules/done/DailySummaryBean.java index c07abd1..457611a 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DailySummaryBean.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DailySummaryBean.java @@ -10,13 +10,17 @@ public class DailySummaryBean { private final String moduleName; private final String jobName; private final String duration; + private final String wp; + private final Double durationHours; - public DailySummaryBean(String projectName, String moduleName, String jobName, String duration) { + public DailySummaryBean(String projectName, String moduleName, String jobName, String duration, String wp, Double durationHours) { super(); this.projectName = projectName; this.moduleName = moduleName; this.jobName = jobName; this.duration = duration; + this.wp = wp; + this.durationHours = durationHours; } public String getProjectName() { @@ -33,5 +37,19 @@ public class DailySummaryBean { public String getDuration() { return duration; - }; + } + + /** + * @return the wp + */ + public String getWp() { + return wp; + } + + /** + * @return the durationHours + */ + public Double getDurationHours() { + return durationHours; + }; } diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java index edd4fdb..a0e679c 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java @@ -31,6 +31,7 @@ public class DoneBean implements Bean, Serializable, Comparable { private TProjectRecord project; private TModuleRecord module; private TJobRecord activity; + private String wp; public DoneBean() { } @@ -43,6 +44,7 @@ public class DoneBean implements Bean, Serializable, Comparable { this.project = projectMap.get(r.getFkProject()); this.module = moduleMap.get(r.getFkModule()); this.activity = jobMap.get(r.getFkJob()); + this.wp = r.getWp(); } /** @@ -119,6 +121,15 @@ public class DoneBean implements Bean, Serializable, Comparable { return ldt; } + public String getProjectNameWithWP() { + StringBuilder buf = new StringBuilder(); + buf.append(project == null ? "" : project.getName()); + if (wp != null && !wp.isBlank()) { + buf.append(" (").append(wp).append(")"); + } + return buf.toString(); + } + public String getProjectName() { return project == null ? "" : project.getName(); } @@ -196,4 +207,18 @@ public class DoneBean implements Bean, Serializable, Comparable { public void setActivity(TJobRecord activity) { this.activity = activity; } + + /** + * @return the wp + */ + public String getWp() { + return wp; + } + + /** + * @param wp the wp to set + */ + public void setWp(String wp) { + this.wp = wp; + } } 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 82354d7..8d20422 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java @@ -5,8 +5,8 @@ import static de.jottyfan.timetrack.db.done.Tables.T_JOB; import static de.jottyfan.timetrack.db.done.Tables.T_MODULE; import static de.jottyfan.timetrack.db.done.Tables.T_PROJECT; import static de.jottyfan.timetrack.db.done.Tables.V_HAMSTERSUMMARY; -import static de.jottyfan.timetrack.db.done.Tables.V_TASKLIST; import static de.jottyfan.timetrack.db.done.Tables.V_TOTALOFDAY; +import static de.jottyfan.timetrack.db.done.Tables.V_WORKTIME; import static de.jottyfan.timetrack.db.profile.Tables.T_LOGIN; import java.sql.Date; @@ -23,11 +23,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jooq.DSLContext; import org.jooq.DeleteConditionStep; -import org.jooq.InsertValuesStep6; +import org.jooq.InsertValuesStep7; import org.jooq.Record; import org.jooq.Record3; import org.jooq.Record4; import org.jooq.Record5; +import org.jooq.Record6; import org.jooq.SelectConditionStep; import org.jooq.SelectJoinStep; import org.jooq.SelectWhereStep; @@ -202,7 +203,7 @@ public class DoneGateway extends JooqGateway { Integer fkLogin = getFkLogin(); try (DSLContext jooq = getJooq()) { - InsertValuesStep6 sql = jooq + InsertValuesStep7 sql = jooq // @formatter:off .insertInto(T_DONE, T_DONE.TIME_FROM, @@ -210,8 +211,9 @@ public class DoneGateway extends JooqGateway { T_DONE.FK_PROJECT, T_DONE.FK_MODULE, T_DONE.FK_JOB, + T_DONE.WP, T_DONE.FK_LOGIN) - .values(bean.getTimeFrom(), bean.getTimeUntil(), fkProject, fkModule, fkJob, fkLogin); + .values(bean.getTimeFrom(), bean.getTimeUntil(), fkProject, fkModule, fkJob, bean.getWp(), fkLogin); // @formatter:on LOGGER.debug(sql.toString()); sql.execute(); @@ -235,6 +237,7 @@ public class DoneGateway extends JooqGateway { .set(T_DONE.FK_PROJECT, bean.getProject() == null ? null : bean.getProject().getPk()) .set(T_DONE.FK_JOB, bean.getActivity() == null ? null : bean.getActivity().getPk()) .set(T_DONE.FK_MODULE, bean.getModule() == null ? null : bean.getModule().getPk()) + .set(T_DONE.WP, bean.getWp()) .where(T_DONE.PK.eq(bean.getPk())); // @formatter:on LOGGER.debug(sql.toString()); @@ -304,24 +307,28 @@ public class DoneGateway extends JooqGateway { */ public List getAllJobs(java.util.Date day) throws DataAccessException, ClassNotFoundException, SQLException { try (DSLContext jooq = getJooq()) { - SelectConditionStep> sql = jooq + SelectConditionStep> sql = jooq // @formatter:off - .select(V_TASKLIST.DURATION, - V_TASKLIST.PROJECT_NAME, - V_TASKLIST.MODULE_NAME, - V_TASKLIST.JOB_NAME) - .from(V_TASKLIST) - .where(V_TASKLIST.DAY.eq(new SimpleDateFormat("yyyy-MM-dd").format(day))) - .and(V_TASKLIST.FK_LOGIN.eq(getFkLogin())); + .select(V_WORKTIME.DURATION, + V_WORKTIME.DURATION_HOURS, + V_WORKTIME.PROJECT_NAME, + V_WORKTIME.MODULE_NAME, + V_WORKTIME.JOB_NAME, + V_WORKTIME.WP) + .from(V_WORKTIME) + .where(V_WORKTIME.DAY.eq(new SimpleDateFormat("yyyy-MM-dd").format(day))) + .and(V_WORKTIME.FK_LOGIN.eq(getFkLogin())); // @formatter:on LOGGER.debug(sql.toString()); List list = new ArrayList<>(); - for (Record4 r : sql.fetch()) { - String duration = r.get(V_TASKLIST.DURATION); - String projectName = r.get(V_TASKLIST.PROJECT_NAME); - String moduleName = r.get(V_TASKLIST.MODULE_NAME); - String jobName = r.get(V_TASKLIST.JOB_NAME); - list.add(new DailySummaryBean(projectName, moduleName, jobName, duration)); + for (Record6 r : sql.fetch()) { + String duration = r.get(V_WORKTIME.DURATION); + Double durationHours = r.get(V_WORKTIME.DURATION_HOURS); + String projectName = r.get(V_WORKTIME.PROJECT_NAME); + String moduleName = r.get(V_WORKTIME.MODULE_NAME); + String jobName = r.get(V_WORKTIME.JOB_NAME); + String wp = r.get(V_WORKTIME.WP); + list.add(new DailySummaryBean(projectName, moduleName, jobName, duration, wp, durationHours)); } return list; } @@ -337,10 +344,11 @@ public class DoneGateway extends JooqGateway { */ public String getAllCalendarEvents() throws DataAccessException, ClassNotFoundException, SQLException { try (DSLContext jooq = getJooq()) { - SelectConditionStep> sql = jooq + SelectConditionStep> sql = jooq // @formatter:off .select(T_DONE.TIME_FROM, T_DONE.TIME_UNTIL, + T_DONE.WP, T_PROJECT.NAME, T_MODULE.NAME, T_JOB.NAME) @@ -356,11 +364,15 @@ public class DoneGateway extends JooqGateway { String projectName = r.get(T_PROJECT.NAME); String moduleName = r.get(T_MODULE.NAME); String jobName = r.get(T_JOB.NAME); + String wp = r.get(T_DONE.WP); java.util.Date timeFrom = r.get(T_DONE.TIME_FROM); java.util.Date timeUntil = r.get(T_DONE.TIME_UNTIL); StringBuilder buf = new StringBuilder(); buf.append(projectName); + if (wp != null && !wp.isBlank()) { + buf.append(" (").append(wp).append(")"); + } buf.append(", "); buf.append(moduleName); buf.append(": "); diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java index 20cd3fc..f7322a6 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java @@ -208,7 +208,11 @@ public class DoneModel implements Model, Serializable { for (DailySummaryBean sdb : allJobs) { buf.append(thatday).append("\t"); buf.append(sdb.getDuration()).append("\t"); - buf.append(sdb.getProjectName()).append("\t"); + buf.append(sdb.getProjectName()); + if (sdb.getWp() != null && !sdb.getWp().isBlank()) { + buf.append(" (").append(sdb.getWp()).append(")"); + } + buf.append("\t"); buf.append(sdb.getModuleName()).append("\t"); buf.append(sdb.getJobName()).append("\t"); buf.append("\n"); diff --git a/src/main/webapp/pages/done/add.xhtml b/src/main/webapp/pages/done/add.xhtml index 5cc7ffc..7fd99b7 100644 --- a/src/main/webapp/pages/done/add.xhtml +++ b/src/main/webapp/pages/done/add.xhtml @@ -41,10 +41,11 @@ - + + @@ -57,6 +58,12 @@ + + + + + + @@ -67,6 +74,7 @@ $("[id='formular:projectInner']").attr("size", 25); $("[id='formular:moduleInner']").attr("size", 25); $("[id='formular:activityInner']").attr("size", 25); + $("[id='formular:wpInner']").attr("size", 25); }); diff --git a/src/main/webapp/pages/done/edit.xhtml b/src/main/webapp/pages/done/edit.xhtml index 2fc05df..76de412 100644 --- a/src/main/webapp/pages/done/edit.xhtml +++ b/src/main/webapp/pages/done/edit.xhtml @@ -41,10 +41,11 @@ - + + @@ -57,6 +58,12 @@ + + + + + + @@ -67,6 +74,7 @@ $("[id='formular:projectInner']").attr("size", 25); $("[id='formular:moduleInner']").attr("size", 25); $("[id='formular:activityInner']").attr("size", 25); + $("[id='formular:wpInner']").attr("size", 25); }); diff --git a/src/main/webapp/pages/done/init.xhtml b/src/main/webapp/pages/done/init.xhtml index 9490a88..5358c51 100644 --- a/src/main/webapp/pages/done/init.xhtml +++ b/src/main/webapp/pages/done/init.xhtml @@ -24,7 +24,7 @@ - + @@ -74,9 +74,12 @@ + + + - + diff --git a/src/main/webapp/resources/css/style.css b/src/main/webapp/resources/css/style.css index f914e23..71ad53e 100644 --- a/src/main/webapp/resources/css/style.css +++ b/src/main/webapp/resources/css/style.css @@ -28,4 +28,20 @@ .dangerWell { background-image: linear-gradient(to bottom, #eacaca 0%, #fff7f7 100%) !important; -} \ No newline at end of file +} + +.WP2 { + color: black !important; + background-color: #ffe169 !important; +} + +.WP4 { + color: white !important; + background-color: #69c3ff !important; +} + +.WP5 { + color: black !important; + background-color: #e396ff !important; +} +