added euCanSHare wp

This commit is contained in:
2020-06-17 15:08:58 +02:00
parent bb558531df
commit ac49e03199
69 changed files with 1742 additions and 140 deletions

View File

@ -22,7 +22,7 @@ apply plugin: 'eclipse'
apply plugin: 'nu.studer.jooq' apply plugin: 'nu.studer.jooq'
group = 'jottyfan' group = 'jottyfan'
version = '1.1.0' version = '1.1.1'
description = """timetrack""" description = """timetrack"""

View File

@ -13,7 +13,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.impl.CatalogImpl; import org.jooq.impl.CatalogImpl;
@ -32,7 +32,7 @@ import org.jooq.impl.CatalogImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class DefaultCatalog extends CatalogImpl { public class DefaultCatalog extends CatalogImpl {
private static final long serialVersionUID = 1875812553; private static final long serialVersionUID = 1609733166;
/** /**
* The reference instance of <code></code> * The reference instance of <code></code>

View File

@ -11,7 +11,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.Table; import org.jooq.Table;
@ -31,7 +31,7 @@ import org.jooq.impl.SchemaImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Contact extends SchemaImpl { public class Contact extends SchemaImpl {
private static final long serialVersionUID = 2007599284; private static final long serialVersionUID = -253386273;
/** /**
* The reference instance of <code>contact</code> * The reference instance of <code>contact</code>

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.contact;
import de.jottyfan.timetrack.db.contact.tables.TContact; import de.jottyfan.timetrack.db.contact.tables.TContact;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Index; import org.jooq.Index;
import org.jooq.OrderField; import org.jooq.OrderField;

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.contact;
import de.jottyfan.timetrack.db.contact.tables.TContact; import de.jottyfan.timetrack.db.contact.tables.TContact;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
/** /**

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.contact.enums;
import de.jottyfan.timetrack.db.contact.Contact; import de.jottyfan.timetrack.db.contact.Contact;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.EnumType; import org.jooq.EnumType;

View File

@ -12,7 +12,7 @@ import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TContact extends TableImpl<TContactRecord> { public class TContact extends TableImpl<TContactRecord> {
private static final long serialVersionUID = -1913430710; private static final long serialVersionUID = 1122078543;
/** /**
* The reference instance of <code>contact.t_contact</code> * The reference instance of <code>contact.t_contact</code>

View File

@ -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.enums.EnumContacttype;
import de.jottyfan.timetrack.db.contact.tables.TContact; import de.jottyfan.timetrack.db.contact.tables.TContact;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record5; import org.jooq.Record5;
@ -28,7 +28,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TContactRecord extends TableRecordImpl<TContactRecord> implements Record5<Integer, String, String, String, EnumContacttype> { public class TContactRecord extends TableRecordImpl<TContactRecord> implements Record5<Integer, String, String, String, EnumContacttype> {
private static final long serialVersionUID = 875007667; private static final long serialVersionUID = 1184347110;
/** /**
* Setter for <code>contact.t_contact.pk</code>. * Setter for <code>contact.t_contact.pk</code>.

View File

@ -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.VDaysummary;
import de.jottyfan.timetrack.db.done.tables.VDone; import de.jottyfan.timetrack.db.done.tables.VDone;
import de.jottyfan.timetrack.db.done.tables.VDuration; 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.VHamster;
import de.jottyfan.timetrack.db.done.tables.VHamstersummary; import de.jottyfan.timetrack.db.done.tables.VHamstersummary;
import de.jottyfan.timetrack.db.done.tables.VTasklist; 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.VTotalofday;
import de.jottyfan.timetrack.db.done.tables.VWorktime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.Table; import org.jooq.Table;
@ -43,7 +46,7 @@ import org.jooq.impl.SchemaImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Done extends SchemaImpl { public class Done extends SchemaImpl {
private static final long serialVersionUID = -1471367006; private static final long serialVersionUID = -1147316456;
/** /**
* The reference instance of <code>done</code> * The reference instance of <code>done</code>
@ -95,6 +98,11 @@ public class Done extends SchemaImpl {
*/ */
public final VDuration V_DURATION = de.jottyfan.timetrack.db.done.tables.VDuration.V_DURATION; public final VDuration V_DURATION = de.jottyfan.timetrack.db.done.tables.VDuration.V_DURATION;
/**
* The table <code>done.v_eucanshare</code>.
*/
public final VEucanshare V_EUCANSHARE = de.jottyfan.timetrack.db.done.tables.VEucanshare.V_EUCANSHARE;
/** /**
* The table <code>done.v_hamster</code>. * The table <code>done.v_hamster</code>.
*/ */
@ -110,11 +118,21 @@ public class Done extends SchemaImpl {
*/ */
public final VTasklist V_TASKLIST = de.jottyfan.timetrack.db.done.tables.VTasklist.V_TASKLIST; public final VTasklist V_TASKLIST = de.jottyfan.timetrack.db.done.tables.VTasklist.V_TASKLIST;
/**
* The table <code>done.v_timelength</code>.
*/
public final VTimelength V_TIMELENGTH = de.jottyfan.timetrack.db.done.tables.VTimelength.V_TIMELENGTH;
/** /**
* The table <code>done.v_totalofday</code>. * The table <code>done.v_totalofday</code>.
*/ */
public final VTotalofday V_TOTALOFDAY = de.jottyfan.timetrack.db.done.tables.VTotalofday.V_TOTALOFDAY; public final VTotalofday V_TOTALOFDAY = de.jottyfan.timetrack.db.done.tables.VTotalofday.V_TOTALOFDAY;
/**
* The table <code>done.v_worktime</code>.
*/
public final VWorktime V_WORKTIME = de.jottyfan.timetrack.db.done.tables.VWorktime.V_WORKTIME;
/** /**
* No further instances allowed * No further instances allowed
*/ */
@ -146,9 +164,12 @@ public class Done extends SchemaImpl {
VDaysummary.V_DAYSUMMARY, VDaysummary.V_DAYSUMMARY,
VDone.V_DONE, VDone.V_DONE,
VDuration.V_DURATION, VDuration.V_DURATION,
VEucanshare.V_EUCANSHARE,
VHamster.V_HAMSTER, VHamster.V_HAMSTER,
VHamstersummary.V_HAMSTERSUMMARY, VHamstersummary.V_HAMSTERSUMMARY,
VTasklist.V_TASKLIST, VTasklist.V_TASKLIST,
VTotalofday.V_TOTALOFDAY); VTimelength.V_TIMELENGTH,
VTotalofday.V_TOTALOFDAY,
VWorktime.V_WORKTIME);
} }
} }

View File

@ -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.TModule;
import de.jottyfan.timetrack.db.done.tables.TProject; import de.jottyfan.timetrack.db.done.tables.TProject;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Index; import org.jooq.Index;
import org.jooq.OrderField; import org.jooq.OrderField;

View File

@ -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.VDaysummary;
import de.jottyfan.timetrack.db.done.tables.VDone; import de.jottyfan.timetrack.db.done.tables.VDone;
import de.jottyfan.timetrack.db.done.tables.VDuration; 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.VHamster;
import de.jottyfan.timetrack.db.done.tables.VHamstersummary; import de.jottyfan.timetrack.db.done.tables.VHamstersummary;
import de.jottyfan.timetrack.db.done.tables.VTasklist; 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.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; public static final VDuration V_DURATION = VDuration.V_DURATION;
/**
* The table <code>done.v_eucanshare</code>.
*/
public static final VEucanshare V_EUCANSHARE = VEucanshare.V_EUCANSHARE;
/** /**
* The table <code>done.v_hamster</code>. * The table <code>done.v_hamster</code>.
*/ */
@ -94,8 +102,18 @@ public class Tables {
*/ */
public static final VTasklist V_TASKLIST = VTasklist.V_TASKLIST; public static final VTasklist V_TASKLIST = VTasklist.V_TASKLIST;
/**
* The table <code>done.v_timelength</code>.
*/
public static final VTimelength V_TIMELENGTH = VTimelength.V_TIMELENGTH;
/** /**
* The table <code>done.v_totalofday</code>. * The table <code>done.v_totalofday</code>.
*/ */
public static final VTotalofday V_TOTALOFDAY = VTotalofday.V_TOTALOFDAY; public static final VTotalofday V_TOTALOFDAY = VTotalofday.V_TOTALOFDAY;
/**
* The table <code>done.v_worktime</code>.
*/
public static final VWorktime V_WORKTIME = VWorktime.V_WORKTIME;
} }

View File

@ -12,14 +12,14 @@ import java.sql.Timestamp;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
import org.jooq.Index; import org.jooq.Index;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Row8; import org.jooq.Row9;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Table; import org.jooq.Table;
import org.jooq.TableField; import org.jooq.TableField;
@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TDone extends TableImpl<TDoneRecord> { public class TDone extends TableImpl<TDoneRecord> {
private static final long serialVersionUID = -2079648247; private static final long serialVersionUID = -1009395311;
/** /**
* The reference instance of <code>done.t_done</code> * The reference instance of <code>done.t_done</code>
@ -95,6 +95,11 @@ public class TDone extends TableImpl<TDoneRecord> {
*/ */
public final TableField<TDoneRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); public final TableField<TDoneRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>done.t_done.wp</code>.
*/
public final TableField<TDoneRecord, String> WP = createField(DSL.name("wp"), org.jooq.impl.SQLDataType.CLOB, this, "");
/** /**
* Create a <code>done.t_done</code> table reference * Create a <code>done.t_done</code> table reference
*/ */
@ -165,11 +170,11 @@ public class TDone extends TableImpl<TDoneRecord> {
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Row8 type methods // Row9 type methods
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row8<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer> fieldsRow() { public Row9<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer, String> fieldsRow() {
return (Row8) super.fieldsRow(); return (Row9) super.fieldsRow();
} }
} }

View File

@ -12,7 +12,7 @@ import java.sql.Timestamp;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TJob extends TableImpl<TJobRecord> { public class TJob extends TableImpl<TJobRecord> {
private static final long serialVersionUID = 300367621; private static final long serialVersionUID = 1198013806;
/** /**
* The reference instance of <code>done.t_job</code> * The reference instance of <code>done.t_job</code>

View File

@ -12,7 +12,7 @@ import java.sql.Timestamp;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TModule extends TableImpl<TModuleRecord> { public class TModule extends TableImpl<TModuleRecord> {
private static final long serialVersionUID = 1907331946; private static final long serialVersionUID = 1195797689;
/** /**
* The reference instance of <code>done.t_module</code> * The reference instance of <code>done.t_module</code>

View File

@ -12,7 +12,7 @@ import java.sql.Timestamp;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TProject extends TableImpl<TProjectRecord> { public class TProject extends TableImpl<TProjectRecord> {
private static final long serialVersionUID = -609416251; private static final long serialVersionUID = 760221750;
/** /**
* The reference instance of <code>done.t_project</code> * The reference instance of <code>done.t_project</code>

View File

@ -7,7 +7,7 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VDailyRecord; 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.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -35,7 +35,7 @@ import org.jooq.types.YearToSecond;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDaily extends TableImpl<VDailyRecord> { public class VDaily extends TableImpl<VDailyRecord> {
private static final long serialVersionUID = -220365849; private static final long serialVersionUID = -310161174;
/** /**
* The reference instance of <code>done.v_daily</code> * The reference instance of <code>done.v_daily</code>

View File

@ -10,7 +10,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VDaylimitsRecord;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -37,7 +37,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDaylimits extends TableImpl<VDaylimitsRecord> { public class VDaylimits extends TableImpl<VDaylimitsRecord> {
private static final long serialVersionUID = 1186965315; private static final long serialVersionUID = -1022072072;
/** /**
* The reference instance of <code>done.v_daylimits</code> * The reference instance of <code>done.v_daylimits</code>

View File

@ -10,7 +10,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VDaysummaryRecord;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -38,7 +38,7 @@ import org.jooq.types.YearToSecond;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDaysummary extends TableImpl<VDaysummaryRecord> { public class VDaysummary extends TableImpl<VDaysummaryRecord> {
private static final long serialVersionUID = 524060696; private static final long serialVersionUID = 1541117915;
/** /**
* The reference instance of <code>done.v_daysummary</code> * The reference instance of <code>done.v_daysummary</code>

View File

@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VDoneRecord;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -36,7 +36,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDone extends TableImpl<VDoneRecord> { public class VDone extends TableImpl<VDoneRecord> {
private static final long serialVersionUID = -842360229; private static final long serialVersionUID = -1832237834;
/** /**
* The reference instance of <code>done.v_done</code> * The reference instance of <code>done.v_done</code>

View File

@ -7,7 +7,7 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VDurationRecord; 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.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -35,7 +35,7 @@ import org.jooq.types.YearToSecond;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDuration extends TableImpl<VDurationRecord> { public class VDuration extends TableImpl<VDurationRecord> {
private static final long serialVersionUID = -578535096; private static final long serialVersionUID = -942666083;
/** /**
* The reference instance of <code>done.v_duration</code> * The reference instance of <code>done.v_duration</code>

View File

@ -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<VEucanshareRecord> {
private static final long serialVersionUID = 1375477301;
/**
* The reference instance of <code>done.v_eucanshare</code>
*/
public static final VEucanshare V_EUCANSHARE = new VEucanshare();
/**
* The class holding records for this type
*/
@Override
public Class<VEucanshareRecord> getRecordType() {
return VEucanshareRecord.class;
}
/**
* The column <code>done.v_eucanshare.fk_done</code>.
*/
public final TableField<VEucanshareRecord, Integer> FK_DONE = createField(DSL.name("fk_done"), org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* The column <code>done.v_eucanshare.workday</code>.
*/
public final TableField<VEucanshareRecord, Date> WORKDAY = createField(DSL.name("workday"), org.jooq.impl.SQLDataType.DATE, this, "");
/**
* The column <code>done.v_eucanshare.duration</code>.
*/
public final TableField<VEucanshareRecord, YearToSecond> DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.INTERVAL, this, "");
/**
* The column <code>done.v_eucanshare.project_name</code>.
*/
public final TableField<VEucanshareRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* The column <code>done.v_eucanshare.module_name</code>.
*/
public final TableField<VEucanshareRecord, String> MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* The column <code>done.v_eucanshare.job_name</code>.
*/
public final TableField<VEucanshareRecord, String> JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* The column <code>done.v_eucanshare.fk_login</code>.
*/
public final TableField<VEucanshareRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* The column <code>done.v_eucanshare.wp</code>.
*/
public final TableField<VEucanshareRecord, String> WP = createField(DSL.name("wp"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* Create a <code>done.v_eucanshare</code> table reference
*/
public VEucanshare() {
this(DSL.name("v_eucanshare"), null);
}
/**
* Create an aliased <code>done.v_eucanshare</code> table reference
*/
public VEucanshare(String alias) {
this(DSL.name(alias), V_EUCANSHARE);
}
/**
* Create an aliased <code>done.v_eucanshare</code> table reference
*/
public VEucanshare(Name alias) {
this(alias, V_EUCANSHARE);
}
private VEucanshare(Name alias, Table<VEucanshareRecord> aliased) {
this(alias, aliased, null);
}
private VEucanshare(Name alias, Table<VEucanshareRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""));
}
public <O extends Record> VEucanshare(Table<O> child, ForeignKey<O, VEucanshareRecord> 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<Integer, Date, YearToSecond, String, String, String, Integer, String> fieldsRow() {
return (Row8) super.fieldsRow();
}
}

View File

@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VHamsterRecord;
import java.sql.Date; import java.sql.Date;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -37,7 +37,7 @@ import org.jooq.types.YearToSecond;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VHamster extends TableImpl<VHamsterRecord> { public class VHamster extends TableImpl<VHamsterRecord> {
private static final long serialVersionUID = -137413152; private static final long serialVersionUID = -1309111431;
/** /**
* The reference instance of <code>done.v_hamster</code> * The reference instance of <code>done.v_hamster</code>

View File

@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VHamstersummaryRecord;
import java.sql.Date; import java.sql.Date;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -36,7 +36,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VHamstersummary extends TableImpl<VHamstersummaryRecord> { public class VHamstersummary extends TableImpl<VHamstersummaryRecord> {
private static final long serialVersionUID = -285333605; private static final long serialVersionUID = -1084154956;
/** /**
* The reference instance of <code>done.v_hamstersummary</code> * The reference instance of <code>done.v_hamstersummary</code>

View File

@ -7,7 +7,7 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VTasklistRecord; 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.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -34,7 +34,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VTasklist extends TableImpl<VTasklistRecord> { public class VTasklist extends TableImpl<VTasklistRecord> {
private static final long serialVersionUID = -109801723; private static final long serialVersionUID = -601090984;
/** /**
* The reference instance of <code>done.v_tasklist</code> * The reference instance of <code>done.v_tasklist</code>

View File

@ -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<VTimelengthRecord> {
private static final long serialVersionUID = -181048501;
/**
* The reference instance of <code>done.v_timelength</code>
*/
public static final VTimelength V_TIMELENGTH = new VTimelength();
/**
* The class holding records for this type
*/
@Override
public Class<VTimelengthRecord> getRecordType() {
return VTimelengthRecord.class;
}
/**
* The column <code>done.v_timelength.day</code>.
*/
public final TableField<VTimelengthRecord, String> DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* The column <code>done.v_timelength.duration</code>.
*/
public final TableField<VTimelengthRecord, YearToSecond> DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.INTERVAL, this, "");
/**
* The column <code>done.v_timelength.fk_done</code>.
*/
public final TableField<VTimelengthRecord, Integer> FK_DONE = createField(DSL.name("fk_done"), org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* The column <code>done.v_timelength.fk_login</code>.
*/
public final TableField<VTimelengthRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* Create a <code>done.v_timelength</code> table reference
*/
public VTimelength() {
this(DSL.name("v_timelength"), null);
}
/**
* Create an aliased <code>done.v_timelength</code> table reference
*/
public VTimelength(String alias) {
this(DSL.name(alias), V_TIMELENGTH);
}
/**
* Create an aliased <code>done.v_timelength</code> table reference
*/
public VTimelength(Name alias) {
this(alias, V_TIMELENGTH);
}
private VTimelength(Name alias, Table<VTimelengthRecord> aliased) {
this(alias, aliased, null);
}
private VTimelength(Name alias, Table<VTimelengthRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""));
}
public <O extends Record> VTimelength(Table<O> child, ForeignKey<O, VTimelengthRecord> 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<String, YearToSecond, Integer, Integer> fieldsRow() {
return (Row4) super.fieldsRow();
}
}

View File

@ -7,7 +7,7 @@ package de.jottyfan.timetrack.db.done.tables;
import de.jottyfan.timetrack.db.done.Done; import de.jottyfan.timetrack.db.done.Done;
import de.jottyfan.timetrack.db.done.tables.records.VTotalofdayRecord; 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.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -34,7 +34,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VTotalofday extends TableImpl<VTotalofdayRecord> { public class VTotalofday extends TableImpl<VTotalofdayRecord> {
private static final long serialVersionUID = 1381929458; private static final long serialVersionUID = 46814145;
/** /**
* The reference instance of <code>done.v_totalofday</code> * The reference instance of <code>done.v_totalofday</code>

View File

@ -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<VWorktimeRecord> {
private static final long serialVersionUID = -330427149;
/**
* The reference instance of <code>done.v_worktime</code>
*/
public static final VWorktime V_WORKTIME = new VWorktime();
/**
* The class holding records for this type
*/
@Override
public Class<VWorktimeRecord> getRecordType() {
return VWorktimeRecord.class;
}
/**
* The column <code>done.v_worktime.day</code>.
*/
public final TableField<VWorktimeRecord, String> DAY = createField(DSL.name("day"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* The column <code>done.v_worktime.duration</code>.
*/
public final TableField<VWorktimeRecord, String> DURATION = createField(DSL.name("duration"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* The column <code>done.v_worktime.duration_hours</code>.
*/
public final TableField<VWorktimeRecord, Double> DURATION_HOURS = createField(DSL.name("duration_hours"), org.jooq.impl.SQLDataType.DOUBLE, this, "");
/**
* The column <code>done.v_worktime.project_name</code>.
*/
public final TableField<VWorktimeRecord, String> PROJECT_NAME = createField(DSL.name("project_name"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* The column <code>done.v_worktime.module_name</code>.
*/
public final TableField<VWorktimeRecord, String> MODULE_NAME = createField(DSL.name("module_name"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* The column <code>done.v_worktime.job_name</code>.
*/
public final TableField<VWorktimeRecord, String> JOB_NAME = createField(DSL.name("job_name"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* The column <code>done.v_worktime.wp</code>.
*/
public final TableField<VWorktimeRecord, String> WP = createField(DSL.name("wp"), org.jooq.impl.SQLDataType.CLOB, this, "");
/**
* The column <code>done.v_worktime.fk_login</code>.
*/
public final TableField<VWorktimeRecord, Integer> FK_LOGIN = createField(DSL.name("fk_login"), org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* Create a <code>done.v_worktime</code> table reference
*/
public VWorktime() {
this(DSL.name("v_worktime"), null);
}
/**
* Create an aliased <code>done.v_worktime</code> table reference
*/
public VWorktime(String alias) {
this(DSL.name(alias), V_WORKTIME);
}
/**
* Create an aliased <code>done.v_worktime</code> table reference
*/
public VWorktime(Name alias) {
this(alias, V_WORKTIME);
}
private VWorktime(Name alias, Table<VWorktimeRecord> aliased) {
this(alias, aliased, null);
}
private VWorktime(Name alias, Table<VWorktimeRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""));
}
public <O extends Record> VWorktime(Table<O> child, ForeignKey<O, VWorktimeRecord> 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<String, String, Double, String, String, String, String, Integer> fieldsRow() {
return (Row8) super.fieldsRow();
}
}

View File

@ -8,11 +8,11 @@ import de.jottyfan.timetrack.db.done.tables.TDone;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record8; import org.jooq.Record9;
import org.jooq.Row8; import org.jooq.Row9;
import org.jooq.impl.TableRecordImpl; import org.jooq.impl.TableRecordImpl;
@ -27,9 +27,9 @@ import org.jooq.impl.TableRecordImpl;
comments = "This class is generated by jOOQ" comments = "This class is generated by jOOQ"
) )
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record8<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer> { public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record9<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer, String> {
private static final long serialVersionUID = 254775418; private static final long serialVersionUID = -1941900551;
/** /**
* Setter for <code>done.t_done.lastchange</code>. * Setter for <code>done.t_done.lastchange</code>.
@ -143,18 +143,32 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record8
return (Integer) get(7); return (Integer) get(7);
} }
/**
* Setter for <code>done.t_done.wp</code>.
*/
public void setWp(String value) {
set(8, value);
}
/**
* Getter for <code>done.t_done.wp</code>.
*/
public String getWp() {
return (String) get(8);
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Record8 type implementation // Record9 type implementation
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Row8<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer> fieldsRow() { public Row9<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer, String> fieldsRow() {
return (Row8) super.fieldsRow(); return (Row9) super.fieldsRow();
} }
@Override @Override
public Row8<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer> valuesRow() { public Row9<Timestamp, Integer, Timestamp, Timestamp, Integer, Integer, Integer, Integer, String> valuesRow() {
return (Row8) super.valuesRow(); return (Row9) super.valuesRow();
} }
@Override @Override
@ -197,6 +211,11 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record8
return TDone.T_DONE.FK_LOGIN; return TDone.T_DONE.FK_LOGIN;
} }
@Override
public Field<String> field9() {
return TDone.T_DONE.WP;
}
@Override @Override
public Timestamp component1() { public Timestamp component1() {
return getLastchange(); return getLastchange();
@ -237,6 +256,11 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record8
return getFkLogin(); return getFkLogin();
} }
@Override
public String component9() {
return getWp();
}
@Override @Override
public Timestamp value1() { public Timestamp value1() {
return getLastchange(); return getLastchange();
@ -277,6 +301,11 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record8
return getFkLogin(); return getFkLogin();
} }
@Override
public String value9() {
return getWp();
}
@Override @Override
public TDoneRecord value1(Timestamp value) { public TDoneRecord value1(Timestamp value) {
setLastchange(value); setLastchange(value);
@ -326,7 +355,13 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record8
} }
@Override @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); value1(value1);
value2(value2); value2(value2);
value3(value3); value3(value3);
@ -335,6 +370,7 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record8
value6(value6); value6(value6);
value7(value7); value7(value7);
value8(value8); value8(value8);
value9(value9);
return this; return this;
} }
@ -352,7 +388,7 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record8
/** /**
* Create a detached, initialised TDoneRecord * 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); super(TDone.T_DONE);
set(0, lastchange); set(0, lastchange);
@ -363,5 +399,6 @@ public class TDoneRecord extends TableRecordImpl<TDoneRecord> implements Record8
set(5, fkModule); set(5, fkModule);
set(6, fkJob); set(6, fkJob);
set(7, fkLogin); set(7, fkLogin);
set(8, wp);
} }
} }

View File

@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.TJob;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record3; import org.jooq.Record3;
@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TJobRecord extends TableRecordImpl<TJobRecord> implements Record3<Timestamp, Integer, String> { public class TJobRecord extends TableRecordImpl<TJobRecord> implements Record3<Timestamp, Integer, String> {
private static final long serialVersionUID = 501080223; private static final long serialVersionUID = -1298990074;
/** /**
* Setter for <code>done.t_job.lastchange</code>. * Setter for <code>done.t_job.lastchange</code>.

View File

@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.TModule;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record3; import org.jooq.Record3;
@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TModuleRecord extends TableRecordImpl<TModuleRecord> implements Record3<Timestamp, Integer, String> { public class TModuleRecord extends TableRecordImpl<TModuleRecord> implements Record3<Timestamp, Integer, String> {
private static final long serialVersionUID = 1180844514; private static final long serialVersionUID = 1225434375;
/** /**
* Setter for <code>done.t_module.lastchange</code>. * Setter for <code>done.t_module.lastchange</code>.

View File

@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.TProject;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record3; import org.jooq.Record3;
@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TProjectRecord extends TableRecordImpl<TProjectRecord> implements Record3<Timestamp, Integer, String> { public class TProjectRecord extends TableRecordImpl<TProjectRecord> implements Record3<Timestamp, Integer, String> {
private static final long serialVersionUID = 1864163507; private static final long serialVersionUID = 1716720610;
/** /**
* Setter for <code>done.t_project.lastchange</code>. * Setter for <code>done.t_project.lastchange</code>.

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VDaily; import de.jottyfan.timetrack.db.done.tables.VDaily;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record4; import org.jooq.Record4;
@ -28,7 +28,7 @@ import org.jooq.types.YearToSecond;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDailyRecord extends TableRecordImpl<VDailyRecord> implements Record4<YearToSecond, String, String, Integer> { public class VDailyRecord extends TableRecordImpl<VDailyRecord> implements Record4<YearToSecond, String, String, Integer> {
private static final long serialVersionUID = 111682889; private static final long serialVersionUID = 272286224;
/** /**
* Setter for <code>done.v_daily.worktime</code>. * Setter for <code>done.v_daily.worktime</code>.

View File

@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.VDaylimits;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record4; import org.jooq.Record4;
@ -30,7 +30,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implements Record4<Timestamp, OffsetDateTime, String, Integer> { public class VDaylimitsRecord extends TableRecordImpl<VDaylimitsRecord> implements Record4<Timestamp, OffsetDateTime, String, Integer> {
private static final long serialVersionUID = 1544678482; private static final long serialVersionUID = -1076103395;
/** /**
* Setter for <code>done.v_daylimits.work_start</code>. * Setter for <code>done.v_daylimits.work_start</code>.

View File

@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.done.tables.VDaysummary;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record7; import org.jooq.Record7;
@ -31,7 +31,7 @@ import org.jooq.types.YearToSecond;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implements Record7<YearToSecond, YearToSecond, Timestamp, OffsetDateTime, String, String, Integer> { public class VDaysummaryRecord extends TableRecordImpl<VDaysummaryRecord> implements Record7<YearToSecond, YearToSecond, Timestamp, OffsetDateTime, String, String, Integer> {
private static final long serialVersionUID = -531239752; private static final long serialVersionUID = -524282795;
/** /**
* Setter for <code>done.v_daysummary.breaktime</code>. * Setter for <code>done.v_daysummary.breaktime</code>.

View File

@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.VDone;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record8; import org.jooq.Record8;
@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8<Integer, Integer, Timestamp, Timestamp, String, String, String, String> { public class VDoneRecord extends TableRecordImpl<VDoneRecord> implements Record8<Integer, Integer, Timestamp, Timestamp, String, String, String, String> {
private static final long serialVersionUID = -311533849; private static final long serialVersionUID = 933997970;
/** /**
* Setter for <code>done.v_done.fk_done</code>. * Setter for <code>done.v_done.fk_done</code>.

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VDuration; import de.jottyfan.timetrack.db.done.tables.VDuration;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record7; import org.jooq.Record7;
@ -28,7 +28,7 @@ import org.jooq.types.YearToSecond;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VDurationRecord extends TableRecordImpl<VDurationRecord> implements Record7<String, YearToSecond, String, String, String, String, Integer> { public class VDurationRecord extends TableRecordImpl<VDurationRecord> implements Record7<String, YearToSecond, String, String, String, String, Integer> {
private static final long serialVersionUID = 794239622; private static final long serialVersionUID = -1641325525;
/** /**
* Setter for <code>done.v_duration.day</code>. * Setter for <code>done.v_duration.day</code>.

View File

@ -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<VEucanshareRecord> implements Record8<Integer, Date, YearToSecond, String, String, String, Integer, String> {
private static final long serialVersionUID = 2139665588;
/**
* Setter for <code>done.v_eucanshare.fk_done</code>.
*/
public void setFkDone(Integer value) {
set(0, value);
}
/**
* Getter for <code>done.v_eucanshare.fk_done</code>.
*/
public Integer getFkDone() {
return (Integer) get(0);
}
/**
* Setter for <code>done.v_eucanshare.workday</code>.
*/
public void setWorkday(Date value) {
set(1, value);
}
/**
* Getter for <code>done.v_eucanshare.workday</code>.
*/
public Date getWorkday() {
return (Date) get(1);
}
/**
* Setter for <code>done.v_eucanshare.duration</code>.
*/
public void setDuration(YearToSecond value) {
set(2, value);
}
/**
* Getter for <code>done.v_eucanshare.duration</code>.
*/
public YearToSecond getDuration() {
return (YearToSecond) get(2);
}
/**
* Setter for <code>done.v_eucanshare.project_name</code>.
*/
public void setProjectName(String value) {
set(3, value);
}
/**
* Getter for <code>done.v_eucanshare.project_name</code>.
*/
public String getProjectName() {
return (String) get(3);
}
/**
* Setter for <code>done.v_eucanshare.module_name</code>.
*/
public void setModuleName(String value) {
set(4, value);
}
/**
* Getter for <code>done.v_eucanshare.module_name</code>.
*/
public String getModuleName() {
return (String) get(4);
}
/**
* Setter for <code>done.v_eucanshare.job_name</code>.
*/
public void setJobName(String value) {
set(5, value);
}
/**
* Getter for <code>done.v_eucanshare.job_name</code>.
*/
public String getJobName() {
return (String) get(5);
}
/**
* Setter for <code>done.v_eucanshare.fk_login</code>.
*/
public void setFkLogin(Integer value) {
set(6, value);
}
/**
* Getter for <code>done.v_eucanshare.fk_login</code>.
*/
public Integer getFkLogin() {
return (Integer) get(6);
}
/**
* Setter for <code>done.v_eucanshare.wp</code>.
*/
public void setWp(String value) {
set(7, value);
}
/**
* Getter for <code>done.v_eucanshare.wp</code>.
*/
public String getWp() {
return (String) get(7);
}
// -------------------------------------------------------------------------
// Record8 type implementation
// -------------------------------------------------------------------------
@Override
public Row8<Integer, Date, YearToSecond, String, String, String, Integer, String> fieldsRow() {
return (Row8) super.fieldsRow();
}
@Override
public Row8<Integer, Date, YearToSecond, String, String, String, Integer, String> valuesRow() {
return (Row8) super.valuesRow();
}
@Override
public Field<Integer> field1() {
return VEucanshare.V_EUCANSHARE.FK_DONE;
}
@Override
public Field<Date> field2() {
return VEucanshare.V_EUCANSHARE.WORKDAY;
}
@Override
public Field<YearToSecond> field3() {
return VEucanshare.V_EUCANSHARE.DURATION;
}
@Override
public Field<String> field4() {
return VEucanshare.V_EUCANSHARE.PROJECT_NAME;
}
@Override
public Field<String> field5() {
return VEucanshare.V_EUCANSHARE.MODULE_NAME;
}
@Override
public Field<String> field6() {
return VEucanshare.V_EUCANSHARE.JOB_NAME;
}
@Override
public Field<Integer> field7() {
return VEucanshare.V_EUCANSHARE.FK_LOGIN;
}
@Override
public Field<String> 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);
}
}

View File

@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.VHamster;
import java.sql.Date; import java.sql.Date;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record6; import org.jooq.Record6;
@ -30,7 +30,7 @@ import org.jooq.types.YearToSecond;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VHamsterRecord extends TableRecordImpl<VHamsterRecord> implements Record6<Date, YearToSecond, String, String, String, String> { public class VHamsterRecord extends TableRecordImpl<VHamsterRecord> implements Record6<Date, YearToSecond, String, String, String, String> {
private static final long serialVersionUID = 1475398201; private static final long serialVersionUID = 1135919574;
/** /**
* Setter for <code>done.v_hamster.workday</code>. * Setter for <code>done.v_hamster.workday</code>.

View File

@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.done.tables.VHamstersummary;
import java.sql.Date; import java.sql.Date;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record6; import org.jooq.Record6;
@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord> implements Record6<Date, String, String, String, String, String> { public class VHamstersummaryRecord extends TableRecordImpl<VHamstersummaryRecord> implements Record6<Date, String, String, String, String, String> {
private static final long serialVersionUID = 742713887; private static final long serialVersionUID = 1731792914;
/** /**
* Setter for <code>done.v_hamstersummary.workday</code>. * Setter for <code>done.v_hamstersummary.workday</code>.

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VTasklist; import de.jottyfan.timetrack.db.done.tables.VTasklist;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record6; import org.jooq.Record6;
@ -27,7 +27,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VTasklistRecord extends TableRecordImpl<VTasklistRecord> implements Record6<String, String, String, String, String, Integer> { public class VTasklistRecord extends TableRecordImpl<VTasklistRecord> implements Record6<String, String, String, String, String, Integer> {
private static final long serialVersionUID = -1505579480; private static final long serialVersionUID = -1593590961;
/** /**
* Setter for <code>done.v_tasklist.day</code>. * Setter for <code>done.v_tasklist.day</code>.

View File

@ -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<VTimelengthRecord> implements Record4<String, YearToSecond, Integer, Integer> {
private static final long serialVersionUID = -328020269;
/**
* Setter for <code>done.v_timelength.day</code>.
*/
public void setDay(String value) {
set(0, value);
}
/**
* Getter for <code>done.v_timelength.day</code>.
*/
public String getDay() {
return (String) get(0);
}
/**
* Setter for <code>done.v_timelength.duration</code>.
*/
public void setDuration(YearToSecond value) {
set(1, value);
}
/**
* Getter for <code>done.v_timelength.duration</code>.
*/
public YearToSecond getDuration() {
return (YearToSecond) get(1);
}
/**
* Setter for <code>done.v_timelength.fk_done</code>.
*/
public void setFkDone(Integer value) {
set(2, value);
}
/**
* Getter for <code>done.v_timelength.fk_done</code>.
*/
public Integer getFkDone() {
return (Integer) get(2);
}
/**
* Setter for <code>done.v_timelength.fk_login</code>.
*/
public void setFkLogin(Integer value) {
set(3, value);
}
/**
* Getter for <code>done.v_timelength.fk_login</code>.
*/
public Integer getFkLogin() {
return (Integer) get(3);
}
// -------------------------------------------------------------------------
// Record4 type implementation
// -------------------------------------------------------------------------
@Override
public Row4<String, YearToSecond, Integer, Integer> fieldsRow() {
return (Row4) super.fieldsRow();
}
@Override
public Row4<String, YearToSecond, Integer, Integer> valuesRow() {
return (Row4) super.valuesRow();
}
@Override
public Field<String> field1() {
return VTimelength.V_TIMELENGTH.DAY;
}
@Override
public Field<YearToSecond> field2() {
return VTimelength.V_TIMELENGTH.DURATION;
}
@Override
public Field<Integer> field3() {
return VTimelength.V_TIMELENGTH.FK_DONE;
}
@Override
public Field<Integer> 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);
}
}

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.done.tables.records;
import de.jottyfan.timetrack.db.done.tables.VTotalofday; import de.jottyfan.timetrack.db.done.tables.VTotalofday;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record6; import org.jooq.Record6;
@ -27,7 +27,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VTotalofdayRecord extends TableRecordImpl<VTotalofdayRecord> implements Record6<String, String, String, String, String, Integer> { public class VTotalofdayRecord extends TableRecordImpl<VTotalofdayRecord> implements Record6<String, String, String, String, String, Integer> {
private static final long serialVersionUID = -383740435; private static final long serialVersionUID = -1877583070;
/** /**
* Setter for <code>done.v_totalofday.breaktime</code>. * Setter for <code>done.v_totalofday.breaktime</code>.

View File

@ -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<VWorktimeRecord> implements Record8<String, String, Double, String, String, String, String, Integer> {
private static final long serialVersionUID = 647750108;
/**
* Setter for <code>done.v_worktime.day</code>.
*/
public void setDay(String value) {
set(0, value);
}
/**
* Getter for <code>done.v_worktime.day</code>.
*/
public String getDay() {
return (String) get(0);
}
/**
* Setter for <code>done.v_worktime.duration</code>.
*/
public void setDuration(String value) {
set(1, value);
}
/**
* Getter for <code>done.v_worktime.duration</code>.
*/
public String getDuration() {
return (String) get(1);
}
/**
* Setter for <code>done.v_worktime.duration_hours</code>.
*/
public void setDurationHours(Double value) {
set(2, value);
}
/**
* Getter for <code>done.v_worktime.duration_hours</code>.
*/
public Double getDurationHours() {
return (Double) get(2);
}
/**
* Setter for <code>done.v_worktime.project_name</code>.
*/
public void setProjectName(String value) {
set(3, value);
}
/**
* Getter for <code>done.v_worktime.project_name</code>.
*/
public String getProjectName() {
return (String) get(3);
}
/**
* Setter for <code>done.v_worktime.module_name</code>.
*/
public void setModuleName(String value) {
set(4, value);
}
/**
* Getter for <code>done.v_worktime.module_name</code>.
*/
public String getModuleName() {
return (String) get(4);
}
/**
* Setter for <code>done.v_worktime.job_name</code>.
*/
public void setJobName(String value) {
set(5, value);
}
/**
* Getter for <code>done.v_worktime.job_name</code>.
*/
public String getJobName() {
return (String) get(5);
}
/**
* Setter for <code>done.v_worktime.wp</code>.
*/
public void setWp(String value) {
set(6, value);
}
/**
* Getter for <code>done.v_worktime.wp</code>.
*/
public String getWp() {
return (String) get(6);
}
/**
* Setter for <code>done.v_worktime.fk_login</code>.
*/
public void setFkLogin(Integer value) {
set(7, value);
}
/**
* Getter for <code>done.v_worktime.fk_login</code>.
*/
public Integer getFkLogin() {
return (Integer) get(7);
}
// -------------------------------------------------------------------------
// Record8 type implementation
// -------------------------------------------------------------------------
@Override
public Row8<String, String, Double, String, String, String, String, Integer> fieldsRow() {
return (Row8) super.fieldsRow();
}
@Override
public Row8<String, String, Double, String, String, String, String, Integer> valuesRow() {
return (Row8) super.valuesRow();
}
@Override
public Field<String> field1() {
return VWorktime.V_WORKTIME.DAY;
}
@Override
public Field<String> field2() {
return VWorktime.V_WORKTIME.DURATION;
}
@Override
public Field<Double> field3() {
return VWorktime.V_WORKTIME.DURATION_HOURS;
}
@Override
public Field<String> field4() {
return VWorktime.V_WORKTIME.PROJECT_NAME;
}
@Override
public Field<String> field5() {
return VWorktime.V_WORKTIME.MODULE_NAME;
}
@Override
public Field<String> field6() {
return VWorktime.V_WORKTIME.JOB_NAME;
}
@Override
public Field<String> field7() {
return VWorktime.V_WORKTIME.WP;
}
@Override
public Field<Integer> 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);
}
}

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.note;
import de.jottyfan.timetrack.db.note.tables.TNote; import de.jottyfan.timetrack.db.note.tables.TNote;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Index; import org.jooq.Index;
import org.jooq.OrderField; import org.jooq.OrderField;

View File

@ -11,7 +11,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.Table; import org.jooq.Table;
@ -31,7 +31,7 @@ import org.jooq.impl.SchemaImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Note extends SchemaImpl { public class Note extends SchemaImpl {
private static final long serialVersionUID = -1212898548; private static final long serialVersionUID = 462162811;
/** /**
* The reference instance of <code>note</code> * The reference instance of <code>note</code>

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.note;
import de.jottyfan.timetrack.db.note.tables.TNote; import de.jottyfan.timetrack.db.note.tables.TNote;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
/** /**

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.note.enums;
import de.jottyfan.timetrack.db.note.Note; import de.jottyfan.timetrack.db.note.Note;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.EnumType; import org.jooq.EnumType;

View File

@ -6,7 +6,7 @@ package de.jottyfan.timetrack.db.note.enums;
import de.jottyfan.timetrack.db.note.Note; import de.jottyfan.timetrack.db.note.Note;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.EnumType; import org.jooq.EnumType;

View File

@ -14,7 +14,7 @@ import java.sql.Timestamp;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -42,7 +42,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TNote extends TableImpl<TNoteRecord> { public class TNote extends TableImpl<TNoteRecord> {
private static final long serialVersionUID = 338893308; private static final long serialVersionUID = -601146141;
/** /**
* The reference instance of <code>note.t_note</code> * The reference instance of <code>note.t_note</code>

View File

@ -10,7 +10,7 @@ import de.jottyfan.timetrack.db.note.tables.TNote;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record6; import org.jooq.Record6;
@ -31,7 +31,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TNoteRecord extends TableRecordImpl<TNoteRecord> implements Record6<Integer, String, EnumCategory, EnumNotetype, String, Timestamp> { public class TNoteRecord extends TableRecordImpl<TNoteRecord> implements Record6<Integer, String, EnumCategory, EnumNotetype, String, Timestamp> {
private static final long serialVersionUID = -1917591496; private static final long serialVersionUID = 828107821;
/** /**
* Setter for <code>note.t_note.pk</code>. * Setter for <code>note.t_note.pk</code>.

View File

@ -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.TLoginrole;
import de.jottyfan.timetrack.db.profile.tables.TRole; import de.jottyfan.timetrack.db.profile.tables.TRole;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Index; import org.jooq.Index;
import org.jooq.OrderField; import org.jooq.OrderField;

View File

@ -14,7 +14,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Catalog; import org.jooq.Catalog;
import org.jooq.Table; import org.jooq.Table;
@ -34,7 +34,7 @@ import org.jooq.impl.SchemaImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Profile extends SchemaImpl { public class Profile extends SchemaImpl {
private static final long serialVersionUID = -1284423911; private static final long serialVersionUID = -215060084;
/** /**
* The reference instance of <code>profile</code> * The reference instance of <code>profile</code>

View File

@ -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.TRole;
import de.jottyfan.timetrack.db.profile.tables.VLoginrole; import de.jottyfan.timetrack.db.profile.tables.VLoginrole;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
/** /**

View File

@ -12,7 +12,7 @@ import java.sql.Timestamp;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TLogin extends TableImpl<TLoginRecord> { public class TLogin extends TableImpl<TLoginRecord> {
private static final long serialVersionUID = 950956330; private static final long serialVersionUID = 2055988705;
/** /**
* The reference instance of <code>profile.t_login</code> * The reference instance of <code>profile.t_login</code>

View File

@ -12,7 +12,7 @@ import java.sql.Timestamp;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TLoginrole extends TableImpl<TLoginroleRecord> { public class TLoginrole extends TableImpl<TLoginroleRecord> {
private static final long serialVersionUID = 1800752164; private static final long serialVersionUID = 404673647;
/** /**
* The reference instance of <code>profile.t_loginrole</code> * The reference instance of <code>profile.t_loginrole</code>

View File

@ -12,7 +12,7 @@ import java.sql.Timestamp;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TRole extends TableImpl<TRoleRecord> { public class TRole extends TableImpl<TRoleRecord> {
private static final long serialVersionUID = 482541526; private static final long serialVersionUID = -1967676639;
/** /**
* The reference instance of <code>profile.t_role</code> * The reference instance of <code>profile.t_role</code>

View File

@ -9,7 +9,7 @@ import de.jottyfan.timetrack.db.profile.tables.records.VLoginroleRecord;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey; import org.jooq.ForeignKey;
@ -36,7 +36,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VLoginrole extends TableImpl<VLoginroleRecord> { public class VLoginrole extends TableImpl<VLoginroleRecord> {
private static final long serialVersionUID = 964647722; private static final long serialVersionUID = -1240355347;
/** /**
* The reference instance of <code>profile.v_loginrole</code> * The reference instance of <code>profile.v_loginrole</code>

View File

@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.profile.tables.TLogin;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record7; import org.jooq.Record7;
@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Record7<Timestamp, Integer, String, String, String, Timestamp, String> { public class TLoginRecord extends TableRecordImpl<TLoginRecord> implements Record7<Timestamp, Integer, String, String, String, Timestamp, String> {
private static final long serialVersionUID = 1230282197; private static final long serialVersionUID = 386473188;
/** /**
* Setter for <code>profile.t_login.lastchange</code>. * Setter for <code>profile.t_login.lastchange</code>.

View File

@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.profile.tables.TLoginrole;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record4; import org.jooq.Record4;
@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TLoginroleRecord extends TableRecordImpl<TLoginroleRecord> implements Record4<Timestamp, Integer, Integer, Integer> { public class TLoginroleRecord extends TableRecordImpl<TLoginroleRecord> implements Record4<Timestamp, Integer, Integer, Integer> {
private static final long serialVersionUID = 440650070; private static final long serialVersionUID = -986073453;
/** /**
* Setter for <code>profile.t_loginrole.lastchange</code>. * Setter for <code>profile.t_loginrole.lastchange</code>.

View File

@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.profile.tables.TRole;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record3; import org.jooq.Record3;
@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TRoleRecord extends TableRecordImpl<TRoleRecord> implements Record3<Timestamp, Integer, String> { public class TRoleRecord extends TableRecordImpl<TRoleRecord> implements Record3<Timestamp, Integer, String> {
private static final long serialVersionUID = -108760046; private static final long serialVersionUID = -1034367197;
/** /**
* Setter for <code>profile.t_role.lastchange</code>. * Setter for <code>profile.t_role.lastchange</code>.

View File

@ -8,7 +8,7 @@ import de.jottyfan.timetrack.db.profile.tables.VLoginrole;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.annotation.Generated; import javax.annotation.processing.Generated;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.Record5; import org.jooq.Record5;
@ -29,7 +29,7 @@ import org.jooq.impl.TableRecordImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" }) @SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implements Record5<String, String, String, Timestamp, String> { public class VLoginroleRecord extends TableRecordImpl<VLoginroleRecord> implements Record5<String, String, String, Timestamp, String> {
private static final long serialVersionUID = 1784395796; private static final long serialVersionUID = 332588237;
/** /**
* Setter for <code>profile.v_loginrole.login</code>. * Setter for <code>profile.v_loginrole.login</code>.

View File

@ -10,13 +10,17 @@ public class DailySummaryBean {
private final String moduleName; private final String moduleName;
private final String jobName; private final String jobName;
private final String duration; 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(); super();
this.projectName = projectName; this.projectName = projectName;
this.moduleName = moduleName; this.moduleName = moduleName;
this.jobName = jobName; this.jobName = jobName;
this.duration = duration; this.duration = duration;
this.wp = wp;
this.durationHours = durationHours;
} }
public String getProjectName() { public String getProjectName() {
@ -33,5 +37,19 @@ public class DailySummaryBean {
public String getDuration() { public String getDuration() {
return duration; return duration;
}; }
/**
* @return the wp
*/
public String getWp() {
return wp;
}
/**
* @return the durationHours
*/
public Double getDurationHours() {
return durationHours;
};
} }

View File

@ -31,6 +31,7 @@ public class DoneBean implements Bean, Serializable, Comparable<DoneBean> {
private TProjectRecord project; private TProjectRecord project;
private TModuleRecord module; private TModuleRecord module;
private TJobRecord activity; private TJobRecord activity;
private String wp;
public DoneBean() { public DoneBean() {
} }
@ -43,6 +44,7 @@ public class DoneBean implements Bean, Serializable, Comparable<DoneBean> {
this.project = projectMap.get(r.getFkProject()); this.project = projectMap.get(r.getFkProject());
this.module = moduleMap.get(r.getFkModule()); this.module = moduleMap.get(r.getFkModule());
this.activity = jobMap.get(r.getFkJob()); this.activity = jobMap.get(r.getFkJob());
this.wp = r.getWp();
} }
/** /**
@ -119,6 +121,15 @@ public class DoneBean implements Bean, Serializable, Comparable<DoneBean> {
return ldt; 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() { public String getProjectName() {
return project == null ? "" : project.getName(); return project == null ? "" : project.getName();
} }
@ -196,4 +207,18 @@ public class DoneBean implements Bean, Serializable, Comparable<DoneBean> {
public void setActivity(TJobRecord activity) { public void setActivity(TJobRecord activity) {
this.activity = 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;
}
} }

View File

@ -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_MODULE;
import static de.jottyfan.timetrack.db.done.Tables.T_PROJECT; 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_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_TOTALOFDAY;
import static de.jottyfan.timetrack.db.done.Tables.V_WORKTIME;
import static de.jottyfan.timetrack.db.profile.Tables.T_LOGIN; import static de.jottyfan.timetrack.db.profile.Tables.T_LOGIN;
import java.sql.Date; import java.sql.Date;
@ -23,11 +23,12 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.jooq.DSLContext; import org.jooq.DSLContext;
import org.jooq.DeleteConditionStep; import org.jooq.DeleteConditionStep;
import org.jooq.InsertValuesStep6; import org.jooq.InsertValuesStep7;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.Record3; import org.jooq.Record3;
import org.jooq.Record4; import org.jooq.Record4;
import org.jooq.Record5; import org.jooq.Record5;
import org.jooq.Record6;
import org.jooq.SelectConditionStep; import org.jooq.SelectConditionStep;
import org.jooq.SelectJoinStep; import org.jooq.SelectJoinStep;
import org.jooq.SelectWhereStep; import org.jooq.SelectWhereStep;
@ -202,7 +203,7 @@ public class DoneGateway extends JooqGateway {
Integer fkLogin = getFkLogin(); Integer fkLogin = getFkLogin();
try (DSLContext jooq = getJooq()) { try (DSLContext jooq = getJooq()) {
InsertValuesStep6<TDoneRecord, Timestamp, Timestamp, Integer, Integer, Integer, Integer> sql = jooq InsertValuesStep7<TDoneRecord, Timestamp, Timestamp, Integer, Integer, Integer, String, Integer> sql = jooq
// @formatter:off // @formatter:off
.insertInto(T_DONE, .insertInto(T_DONE,
T_DONE.TIME_FROM, T_DONE.TIME_FROM,
@ -210,8 +211,9 @@ public class DoneGateway extends JooqGateway {
T_DONE.FK_PROJECT, T_DONE.FK_PROJECT,
T_DONE.FK_MODULE, T_DONE.FK_MODULE,
T_DONE.FK_JOB, T_DONE.FK_JOB,
T_DONE.WP,
T_DONE.FK_LOGIN) 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 // @formatter:on
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
sql.execute(); 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_PROJECT, bean.getProject() == null ? null : bean.getProject().getPk())
.set(T_DONE.FK_JOB, bean.getActivity() == null ? null : bean.getActivity().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.FK_MODULE, bean.getModule() == null ? null : bean.getModule().getPk())
.set(T_DONE.WP, bean.getWp())
.where(T_DONE.PK.eq(bean.getPk())); .where(T_DONE.PK.eq(bean.getPk()));
// @formatter:on // @formatter:on
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
@ -304,24 +307,28 @@ public class DoneGateway extends JooqGateway {
*/ */
public List<DailySummaryBean> getAllJobs(java.util.Date day) throws DataAccessException, ClassNotFoundException, SQLException { public List<DailySummaryBean> getAllJobs(java.util.Date day) throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (DSLContext jooq = getJooq()) {
SelectConditionStep<Record4<String, String, String, String>> sql = jooq SelectConditionStep<Record6<String, Double, String, String, String, String>> sql = jooq
// @formatter:off // @formatter:off
.select(V_TASKLIST.DURATION, .select(V_WORKTIME.DURATION,
V_TASKLIST.PROJECT_NAME, V_WORKTIME.DURATION_HOURS,
V_TASKLIST.MODULE_NAME, V_WORKTIME.PROJECT_NAME,
V_TASKLIST.JOB_NAME) V_WORKTIME.MODULE_NAME,
.from(V_TASKLIST) V_WORKTIME.JOB_NAME,
.where(V_TASKLIST.DAY.eq(new SimpleDateFormat("yyyy-MM-dd").format(day))) V_WORKTIME.WP)
.and(V_TASKLIST.FK_LOGIN.eq(getFkLogin())); .from(V_WORKTIME)
.where(V_WORKTIME.DAY.eq(new SimpleDateFormat("yyyy-MM-dd").format(day)))
.and(V_WORKTIME.FK_LOGIN.eq(getFkLogin()));
// @formatter:on // @formatter:on
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
List<DailySummaryBean> list = new ArrayList<>(); List<DailySummaryBean> list = new ArrayList<>();
for (Record4<String, String, String, String> r : sql.fetch()) { for (Record6<String, Double, String, String, String, String> r : sql.fetch()) {
String duration = r.get(V_TASKLIST.DURATION); String duration = r.get(V_WORKTIME.DURATION);
String projectName = r.get(V_TASKLIST.PROJECT_NAME); Double durationHours = r.get(V_WORKTIME.DURATION_HOURS);
String moduleName = r.get(V_TASKLIST.MODULE_NAME); String projectName = r.get(V_WORKTIME.PROJECT_NAME);
String jobName = r.get(V_TASKLIST.JOB_NAME); String moduleName = r.get(V_WORKTIME.MODULE_NAME);
list.add(new DailySummaryBean(projectName, moduleName, jobName, duration)); 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; return list;
} }
@ -337,10 +344,11 @@ public class DoneGateway extends JooqGateway {
*/ */
public String getAllCalendarEvents() throws DataAccessException, ClassNotFoundException, SQLException { public String getAllCalendarEvents() throws DataAccessException, ClassNotFoundException, SQLException {
try (DSLContext jooq = getJooq()) { try (DSLContext jooq = getJooq()) {
SelectConditionStep<Record5<Timestamp, Timestamp, String, String, String>> sql = jooq SelectConditionStep<Record6<Timestamp, Timestamp, String, String, String, String>> sql = jooq
// @formatter:off // @formatter:off
.select(T_DONE.TIME_FROM, .select(T_DONE.TIME_FROM,
T_DONE.TIME_UNTIL, T_DONE.TIME_UNTIL,
T_DONE.WP,
T_PROJECT.NAME, T_PROJECT.NAME,
T_MODULE.NAME, T_MODULE.NAME,
T_JOB.NAME) T_JOB.NAME)
@ -356,11 +364,15 @@ public class DoneGateway extends JooqGateway {
String projectName = r.get(T_PROJECT.NAME); String projectName = r.get(T_PROJECT.NAME);
String moduleName = r.get(T_MODULE.NAME); String moduleName = r.get(T_MODULE.NAME);
String jobName = r.get(T_JOB.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 timeFrom = r.get(T_DONE.TIME_FROM);
java.util.Date timeUntil = r.get(T_DONE.TIME_UNTIL); java.util.Date timeUntil = r.get(T_DONE.TIME_UNTIL);
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
buf.append(projectName); buf.append(projectName);
if (wp != null && !wp.isBlank()) {
buf.append(" (").append(wp).append(")");
}
buf.append(", "); buf.append(", ");
buf.append(moduleName); buf.append(moduleName);
buf.append(": "); buf.append(": ");

View File

@ -208,7 +208,11 @@ public class DoneModel implements Model, Serializable {
for (DailySummaryBean sdb : allJobs) { for (DailySummaryBean sdb : allJobs) {
buf.append(thatday).append("\t"); buf.append(thatday).append("\t");
buf.append(sdb.getDuration()).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.getModuleName()).append("\t");
buf.append(sdb.getJobName()).append("\t"); buf.append(sdb.getJobName()).append("\t");
buf.append("\n"); buf.append("\n");

View File

@ -41,10 +41,11 @@
</ui:repeat> </ui:repeat>
</b:buttonGroup> </b:buttonGroup>
</h:panelGrid> </h:panelGrid>
<b:panelGrid colSpans="4,4,4" size="xs"> <b:panelGrid colSpans="3,3,3,3" size="xs">
<h:outputText value="Projekt" /> <h:outputText value="Projekt" />
<h:outputText value="Modul" /> <h:outputText value="Modul" />
<h:outputText value="Tätigkeit" /> <h:outputText value="Tätigkeit" />
<h:outputText value="euCanShare WP" />
<b:selectOneMenu id="project" value="#{doneModel.bean.project}"> <b:selectOneMenu id="project" value="#{doneModel.bean.project}">
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" /> <f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.projects}" var="i" itemValue="#{i}" itemLabel="#{i.name}" /> <f:selectItems value="#{doneModel.projects}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
@ -57,6 +58,12 @@
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" /> <f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.activities}" var="i" itemValue="#{i}" itemLabel="#{i.name}" /> <f:selectItems value="#{doneModel.activities}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
</b:selectOneMenu> </b:selectOneMenu>
<b:selectOneMenu id="wp" value="#{doneModel.bean.wp}">
<f:selectItem itemValue="" itemLabel="---" />
<f:selectItem itemValue="WP2" itemLabel="WP2 - Opal/Mica/..." />
<f:selectItem itemValue="WP4" itemLabel="WP4 - Square²" />
<f:selectItem itemValue="WP5" itemLabel="WP5 - SHIP-Datenbereitstellung" />
</b:selectOneMenu>
</b:panelGrid> </b:panelGrid>
<b:buttonGroup> <b:buttonGroup>
<b:commandButton action="#{doneControl.toList}" immediate="true" value="Abbrechen" /> <b:commandButton action="#{doneControl.toList}" immediate="true" value="Abbrechen" />
@ -67,6 +74,7 @@
$("[id='formular:projectInner']").attr("size", 25); $("[id='formular:projectInner']").attr("size", 25);
$("[id='formular:moduleInner']").attr("size", 25); $("[id='formular:moduleInner']").attr("size", 25);
$("[id='formular:activityInner']").attr("size", 25); $("[id='formular:activityInner']").attr("size", 25);
$("[id='formular:wpInner']").attr("size", 25);
}); });
</script> </script>
</b:form> </b:form>

View File

@ -41,10 +41,11 @@
</ui:repeat> </ui:repeat>
</b:buttonGroup> </b:buttonGroup>
</h:panelGrid> </h:panelGrid>
<b:panelGrid colSpans="4,4,4" size="xs"> <b:panelGrid colSpans="3,3,3,3" size="xs">
<h:outputText value="Projekt (#{doneModel.bean.projectName})" /> <h:outputText value="Projekt (#{doneModel.bean.projectName})" />
<h:outputText value="Modul (#{doneModel.bean.moduleName})" /> <h:outputText value="Modul (#{doneModel.bean.moduleName})" />
<h:outputText value="Tätigkeit (#{doneModel.bean.jobName})" /> <h:outputText value="Tätigkeit (#{doneModel.bean.jobName})" />
<h:outputText value="euCanSHare WP" />
<b:selectOneMenu id="project" value="#{doneModel.bean.project}"> <b:selectOneMenu id="project" value="#{doneModel.bean.project}">
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" /> <f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.projects}" var="i" itemValue="#{i}" itemLabel="#{i.name}" /> <f:selectItems value="#{doneModel.projects}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
@ -57,6 +58,12 @@
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" /> <f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.activities}" var="i" itemValue="#{i}" itemLabel="#{i.name}" /> <f:selectItems value="#{doneModel.activities}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
</b:selectOneMenu> </b:selectOneMenu>
<b:selectOneMenu id="wp" value="#{doneModel.bean.wp}">
<f:selectItem itemValue="" itemLabel="---" />
<f:selectItem itemValue="WP2" itemLabel="WP2 - Opal/Mica/..." />
<f:selectItem itemValue="WP4" itemLabel="WP4 - Square²" />
<f:selectItem itemValue="WP5" itemLabel="WP5 - SHIP-Datenbereitstellung" />
</b:selectOneMenu>
</b:panelGrid> </b:panelGrid>
<b:buttonGroup> <b:buttonGroup>
<b:commandButton action="#{doneControl.toList}" immediate="true" value="Abbrechen" /> <b:commandButton action="#{doneControl.toList}" immediate="true" value="Abbrechen" />
@ -67,6 +74,7 @@
$("[id='formular:projectInner']").attr("size", 25); $("[id='formular:projectInner']").attr("size", 25);
$("[id='formular:moduleInner']").attr("size", 25); $("[id='formular:moduleInner']").attr("size", 25);
$("[id='formular:activityInner']").attr("size", 25); $("[id='formular:activityInner']").attr("size", 25);
$("[id='formular:wpInner']").attr("size", 25);
}); });
</script> </script>
</b:form> </b:form>

View File

@ -24,7 +24,7 @@
<b:commandButton action="#{doneControl.toDelete(b)}" value="Entfernen" look="danger" iconAwesome="trash" /> <b:commandButton action="#{doneControl.toDelete(b)}" value="Entfernen" look="danger" iconAwesome="trash" />
</b:dataTableColumn> </b:dataTableColumn>
<b:dataTableColumn label="" value="#{b.timeSummary}" contentStyleClass="doneoverviewtext" style="width: 128px !important" orderable="false" /> <b:dataTableColumn label="" value="#{b.timeSummary}" contentStyleClass="doneoverviewtext" style="width: 128px !important" orderable="false" />
<b:dataTableColumn label="" value="#{b.projectName}" contentStyleClass="doneoverviewtextemph" style="width: 128px !important" orderable="false" /> <b:dataTableColumn label="" value="#{b.projectNameWithWP}" contentStyleClass="doneoverviewtextemph" style="width: 160px !important" orderable="false" />
<b:dataTableColumn label="" value="#{b.timeDiff}" contentStyleClass="doneoverviewtextemph" style="width: 64px !important" orderable="false" /> <b:dataTableColumn label="" value="#{b.timeDiff}" contentStyleClass="doneoverviewtextemph" style="width: 64px !important" orderable="false" />
<b:dataTableColumn label="" style="width: 100px !important" orderable="false"> <b:dataTableColumn label="" style="width: 100px !important" orderable="false">
<b:commandButton action="#{doneControl.toEdit(b)}" value="Editieren" look="warning" iconAwesome="pencil" /> <b:commandButton action="#{doneControl.toEdit(b)}" value="Editieren" look="warning" iconAwesome="pencil" />
@ -74,9 +74,12 @@
<b:dataTable value="#{doneModel.allJobs}" var="col" border="false" info="false" paginated="false" <b:dataTable value="#{doneModel.allJobs}" var="col" border="false" info="false" paginated="false"
searching="false"> searching="false">
<b:dataTableColumn label="" value="#{col.projectName}" contentStyle="font-size: 120%" orderable="false" /> <b:dataTableColumn label="" value="#{col.projectName}" contentStyle="font-size: 120%" orderable="false" />
<b:dataTableColumn label="" orderable="false">
<b:badge value="#{col.wp}" styleClass="#{col.wp}" />
</b:dataTableColumn>
<b:dataTableColumn label="" value="#{col.moduleName}" contentStyle="font-size: 120%" orderable="false" /> <b:dataTableColumn label="" value="#{col.moduleName}" contentStyle="font-size: 120%" orderable="false" />
<b:dataTableColumn label="" value="#{col.jobName}" contentStyle="font-size: 120%" orderable="false" /> <b:dataTableColumn label="" value="#{col.jobName}" contentStyle="font-size: 120%" orderable="false" />
<b:dataTableColumn label="" value="#{col.duration}" contentStyle="font-size: 120%" orderable="false" /> <b:dataTableColumn label="" value="#{col.duration} = #{col.durationHours} h" contentStyle="font-size: 120%" orderable="false" />
</b:dataTable> </b:dataTable>
</b:tab> </b:tab>
<b:tab title="Anhang"> <b:tab title="Anhang">

View File

@ -29,3 +29,19 @@
.dangerWell { .dangerWell {
background-image: linear-gradient(to bottom, #eacaca 0%, #fff7f7 100%) !important; background-image: linear-gradient(to bottom, #eacaca 0%, #fff7f7 100%) !important;
} }
.WP2 {
color: black !important;
background-color: #ffe169 !important;
}
.WP4 {
color: white !important;
background-color: #69c3ff !important;
}
.WP5 {
color: black !important;
background-color: #e396ff !important;
}