From 0629b6171d97a5be383a97faecbc9820a8ef912e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Henke?= Date: Mon, 8 Mar 2021 23:34:34 +0100 Subject: [PATCH] full calendar instead of bootsfaces calendar --- build.gradle | 2 +- .../timetrack/modules/done/DoneBean.java | 17 +- .../timetrack/modules/done/DoneGateway.java | 29 +-- .../timetrack/modules/done/RgbColor.java | 10 + .../fullcalendar/ColorfulFCEventBean.java | 89 ++++++++ .../done/fullcalendar/FCEventBean.java | 198 ++++++++++++++++++ .../done/fullcalendar/FCEventList.java | 40 ++++ src/main/webapp/pages/done/init.xhtml | 11 +- src/main/webapp/resources/css/style.css | 6 +- .../jslibs/fullcalendar/locales-all.min.js | 1 + .../jslibs/fullcalendar/main.min.css | 1 + .../resources/jslibs/fullcalendar/main.min.js | 6 + .../webapp/resources/my/fullcalendar.xhtml | 83 ++++++++ 13 files changed, 463 insertions(+), 30 deletions(-) create mode 100644 src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/ColorfulFCEventBean.java create mode 100644 src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/FCEventBean.java create mode 100644 src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/FCEventList.java create mode 100644 src/main/webapp/resources/jslibs/fullcalendar/locales-all.min.js create mode 100644 src/main/webapp/resources/jslibs/fullcalendar/main.min.css create mode 100644 src/main/webapp/resources/jslibs/fullcalendar/main.min.js create mode 100644 src/main/webapp/resources/my/fullcalendar.xhtml diff --git a/build.gradle b/build.gradle index f094e72..35adf97 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'war' apply plugin: 'eclipse' group = 'jottyfan' -version = '1.1.5' +version = '1.1.6' description = """timetrack""" diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java index 07adeae..9f2891a 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java @@ -122,15 +122,6 @@ public class DoneBean implements Bean, Serializable, Comparable { return ldt; } - public String getProjectNameWithBilling() { - StringBuilder buf = new StringBuilder(); - buf.append(project == null ? "" : project.getName()); - if (billing != null) { - buf.append(" (").append(billing.getShortcut()).append(")"); - } - return buf.toString(); - } - public String getProjectName() { return project == null ? "" : project.getName(); } @@ -146,6 +137,14 @@ public class DoneBean implements Bean, Serializable, Comparable { public String getBillingName() { return billing == null ? "" : billing.getName(); } + + public String getBillingShortcut() { + return billing == null ? "" : billing.getShortcut(); + } + + public String getBillingCsskey() { + return billing == null ? "" : billing.getCsskey(); + } public String getTimeFromString() { return timeFrom == null ? "" : timeFrom.format(hhmm); diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java index 4c1eee5..5c4dc37 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java @@ -33,7 +33,6 @@ import org.jooq.Record; import org.jooq.Record3; import org.jooq.Record4; import org.jooq.Record5; -import org.jooq.Record6; import org.jooq.Record7; import org.jooq.SelectConditionStep; import org.jooq.SelectJoinStep; @@ -48,8 +47,8 @@ import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; import de.jottyfan.timetrack.modules.JooqGateway; -import net.bootsfaces.component.fullCalendar.FullCalendarEventBean; -import net.bootsfaces.component.fullCalendar.FullCalendarEventList; +import de.jottyfan.timetrack.modules.done.fullcalendar.ColorfulFCEventBean; +import de.jottyfan.timetrack.modules.done.fullcalendar.FCEventList; /** * @@ -386,14 +385,15 @@ public class DoneGateway extends JooqGateway { */ public String getAllCalendarEvents() throws DataAccessException, ClassNotFoundException, SQLException { try (CloseableDSLContext jooq = getJooq()) { - SelectConditionStep> sql = jooq + SelectConditionStep> sql = jooq // @formatter:off .select(T_DONE.TIME_FROM, T_DONE.TIME_UNTIL, T_PROJECT.NAME, T_MODULE.NAME, T_JOB.NAME, - T_BILLING.CSSKEY) + T_BILLING.CSSKEY, + T_BILLING.SHORTCUT) .from(T_DONE) .leftJoin(T_PROJECT).on(T_PROJECT.PK.eq(T_DONE.FK_PROJECT)) .leftJoin(T_MODULE).on(T_MODULE.PK.eq(T_DONE.FK_MODULE)) @@ -402,7 +402,7 @@ public class DoneGateway extends JooqGateway { .where(T_DONE.FK_LOGIN.eq(getFkLogin())); // @formatter:on LOGGER.debug(sql.toString()); - FullCalendarEventList list = new FullCalendarEventList(); + FCEventList list = new FCEventList(); for (Record r : sql.fetch()) { String projectName = r.get(T_PROJECT.NAME); String moduleName = r.get(T_MODULE.NAME); @@ -410,6 +410,7 @@ public class DoneGateway extends JooqGateway { LocalDateTime timeFrom = r.get(T_DONE.TIME_FROM); LocalDateTime timeUntil = r.get(T_DONE.TIME_UNTIL); String cssKey = r.get(T_BILLING.CSSKEY); + String shortcut = r.get(T_BILLING.SHORTCUT); StringBuilder buf = new StringBuilder(); buf.append(projectName); @@ -418,14 +419,14 @@ public class DoneGateway extends JooqGateway { buf.append(": "); buf.append(jobName); - FullCalendarEventBean bean = new FullCalendarEventBean(buf.toString(), - java.util.Date.from(timeFrom.atZone(ZoneId.systemDefault()).toInstant())) { - private static final long serialVersionUID = 1L; - - @Override - public void addExtendedFields(StringBuilder buf) { - } - }; + Date theDate = Date.from(timeFrom.atZone(ZoneId.systemDefault()).toInstant()); + + ColorfulFCEventBean bean = new ColorfulFCEventBean(buf.toString(), + theDate, new RgbColor().determineTextcolorFromCssKey(cssKey)); + bean.setProject(projectName); + bean.setModule(moduleName); + bean.setJob(jobName); + bean.setBilling(shortcut); Date endDate = timeUntil == null ? null : Date.from(timeUntil.atZone(ZoneId.systemDefault()).toInstant()); bean.setEnd(endDate); if (cssKey != null && !cssKey.isBlank()) { diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/RgbColor.java b/src/main/java/de/jottyfan/timetrack/modules/done/RgbColor.java index 5c169e3..28eadfc 100644 --- a/src/main/java/de/jottyfan/timetrack/modules/done/RgbColor.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/RgbColor.java @@ -58,4 +58,14 @@ public class RgbColor { map.put("WP5", "rgb(255, 0, 0)"); return map.get(cssKey); } + + public String determineTextcolorFromCssKey(String cssKey) { + Map map = new HashMap<>(); + map.put("TA3", "rgb(0, 0, 0)"); + map.put("WP2", "rgb(0, 0, 0)"); + map.put("WP4", "rgb(0, 0, 0)"); + map.put("WP5", "rgb(0, 0, 0)"); + String value = map.get(cssKey); + return value == null ? "rgb(255, 255, 255)" : value; + } } diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/ColorfulFCEventBean.java b/src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/ColorfulFCEventBean.java new file mode 100644 index 0000000..dd058ec --- /dev/null +++ b/src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/ColorfulFCEventBean.java @@ -0,0 +1,89 @@ +package de.jottyfan.timetrack.modules.done.fullcalendar; + +import java.util.Date; + +/** + * + * @author henkej + * + */ +public class ColorfulFCEventBean extends FCEventBean { + private static final long serialVersionUID = 1L; + private final String textColor; + private String billing; + private String project; + private String module; + private String job; + + public ColorfulFCEventBean(String title, Date start, String textColor) { + super(title, start); + this.textColor = textColor; + } + + @Override + public String getExtendedFields() { + StringBuilder buf = new StringBuilder(); + addParam(buf, "textColor", textColor); + addParam(buf, "billing", billing); + addParam(buf, "project", project); + addParam(buf, "module", module); + addParam(buf, "job", job); + return buf.toString(); + } + + /** + * @return the billing + */ + public String getBilling() { + return billing; + } + + /** + * @param billing the billing to set + */ + public void setBilling(String billing) { + this.billing = billing; + } + + /** + * @return the project + */ + public String getProject() { + return project; + } + + /** + * @param project the project to set + */ + public void setProject(String project) { + this.project = project; + } + + /** + * @return the module + */ + public String getModule() { + return module; + } + + /** + * @param module the module to set + */ + public void setModule(String module) { + this.module = module; + } + + /** + * @return the job + */ + public String getJob() { + return job; + } + + /** + * @param job the job to set + */ + public void setJob(String job) { + this.job = job; + } +} diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/FCEventBean.java b/src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/FCEventBean.java new file mode 100644 index 0000000..f6203ab --- /dev/null +++ b/src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/FCEventBean.java @@ -0,0 +1,198 @@ +package de.jottyfan.timetrack.modules.done.fullcalendar; + +import java.io.Serializable; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; + +/** + * + * @author henkej + * + */ +public abstract class FCEventBean implements Serializable { + private static final long serialVersionUID = 1L; + + private String title; + private Boolean allDay; + private Date start; + private Date end; + private Boolean editable; + private Boolean startEditable; + private Boolean durationEditable; + private String color; + private String url; + + public FCEventBean(String title, Date start) { + super(); + this.title = title; + this.start = start; + } + + protected String toJavascriptDate(Date date){ + if (date == null) { + return null; + } + StringBuilder buf = new StringBuilder("new Date("); + Calendar cal = new GregorianCalendar(); + cal.setTime(date); + buf.append(cal.get(Calendar.YEAR)).append(","); + buf.append(cal.get(Calendar.MONTH)).append(","); + buf.append(cal.get(Calendar.DAY_OF_MONTH)).append(","); + buf.append(cal.get(Calendar.HOUR_OF_DAY)).append(","); + buf.append(cal.get(Calendar.MINUTE)).append(","); + buf.append(cal.get(Calendar.SECOND)); + buf.append(")"); + return buf.toString(); + } + + /** + * get extended fields to json string + */ + public abstract String getExtendedFields(); + + /** + * adds a param to buf if value is not null + * + * @param buf the buffer + * @param name the name + * @param value the value + * @param encapsulate if true, encapsulate value by ' + * @param appendComma if true, append a comma + */ + public void addParam(StringBuilder buf, String name, String value, boolean encapsulate, boolean appendComma) { + if (value != null) { + buf.append(name).append(":"); + buf.append(encapsulate ? "'" : "").append(value).append(encapsulate ? "'" : ""); + buf.append(appendComma ? "," : ""); + } + } + + /** + * adds a param to buf if value is not null and append a comma + * + * @param buf the buffer + * @param name the name + * @param value the value + * @param encapsulate if true, encapsulate value by ' + */ + public void addParam(StringBuilder buf, String name, String value, boolean encapsulate) { + addParam(buf, name, value, encapsulate, true); + } + + /** + * adds a param to buf if value is not null and encapsulate it with ' and add a comma + * + * @param buf the buffer + * @param name the name + * @param value the value + */ + public void addParam(StringBuilder buf, String name, String value) { + addParam(buf, name, value, true, true); + } + + /** + * adds a param to buf if value is not null and do not encapsulate it with ' but add a comma + * + * @param buf the buffer + * @param name the name + * @param value the value + */ + public void addParam(StringBuilder buf, String name, Boolean value) { + addParam(buf, name, value == null ? null : value.toString(), false, true); + } + + public String toJson() { + StringBuilder buf = new StringBuilder("{"); + addParam(buf, "title", title); + addParam(buf, "allDay", allDay); + addParam(buf, "editable", editable); + addParam(buf, "startEditable", startEditable); + addParam(buf, "durationEditable", durationEditable); + addParam(buf, "color", color); + addParam(buf, "end", toJavascriptDate(end), false); + addParam(buf, "url", url); + + buf.append(getExtendedFields()); + // this is the last element, we need no trailing , + addParam(buf, "start", toJavascriptDate(start), false, false); + buf.append("}"); + return buf.toString(); + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Boolean getAllDay() { + return allDay; + } + + public void setAllDay(Boolean allDay) { + this.allDay = allDay; + } + + public Date getStart() { + return start; + } + + public void setStart(Date start) { + this.start = start; + } + + public Date getEnd() { + return end; + } + + public void setEnd(Date end) { + this.end = end; + } + + public Boolean getEditable() { + return editable; + } + + public void setEditable(Boolean editable) { + this.editable = editable; + } + + public Boolean getDurationEditable() { + return durationEditable; + } + + public void setDurationEditable(Boolean durationEditable) { + this.durationEditable = durationEditable; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public static long getSerialversionuid() { + return serialVersionUID; + } + + public Boolean getStartEditable() { + return startEditable; + } + + public void setStartEditable(Boolean startEditable) { + this.startEditable = startEditable; + } +} diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/FCEventList.java b/src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/FCEventList.java new file mode 100644 index 0000000..3e38359 --- /dev/null +++ b/src/main/java/de/jottyfan/timetrack/modules/done/fullcalendar/FCEventList.java @@ -0,0 +1,40 @@ +package de.jottyfan.timetrack.modules.done.fullcalendar; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * + * @author henkej + * + */ +public class FCEventList implements Serializable { + private static final long serialVersionUID = 1L; + + private List list; + + public FCEventList() { + super(); + this.list = new ArrayList(); + } + + public String toJson() { + StringBuilder buf = new StringBuilder("["); + Iterator iterator = list.iterator(); + while (iterator.hasNext()) { + buf.append(iterator.next().toJson()); + if (iterator.hasNext()) { + buf.append(","); + } + } + buf.append("]"); + return buf.toString(); + } + + public List getList() { + return this.list; + } + +} diff --git a/src/main/webapp/pages/done/init.xhtml b/src/main/webapp/pages/done/init.xhtml index f5d7b7e..aa74de7 100644 --- a/src/main/webapp/pages/done/init.xhtml +++ b/src/main/webapp/pages/done/init.xhtml @@ -24,7 +24,10 @@ - + + + + @@ -87,10 +90,8 @@

- -