From 4d7a26fa2b783e8747a9f27712e55094a790cfa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Henke?= Date: Tue, 9 May 2023 11:07:31 +0200 Subject: [PATCH] enhanced modeling --- .../config/InitialConfiguration.java | 2 +- .../{spring => modules}/IndexController.java | 10 +- .../calendar/CalendarController.java | 8 +- .../modules/calendar/CalendarService.java | 31 ++ .../timetrack/modules/calendar/EventBean.java | 363 ++++++++++++++++++ .../contact/ContactBean.java | 2 +- .../contact/ContactController.java | 2 +- .../contact}/ContactGateway.java | 3 +- .../contact}/ContactService.java | 5 +- .../contact/IContactService.java | 2 +- .../{spring => modules}/done/DoneBean.java | 2 +- .../done/DoneController.java | 2 +- .../impl => modules/done}/DoneGateway.java | 3 +- .../{spring => modules}/done/DoneModel.java | 2 +- .../impl => modules/done}/DoneService.java | 6 +- .../done/IDoneService.java | 2 +- .../{spring => modules}/done/SummaryBean.java | 2 +- .../done/job/IJobService.java | 2 +- .../done/job/JobController.java | 6 +- .../impl => modules/done/job}/JobGateway.java | 2 +- .../impl => modules/done/job}/JobService.java | 3 +- .../done/module/IModuleService.java | 2 +- .../done/module/ModuleController.java | 6 +- .../done/module}/ModuleGateway.java | 2 +- .../done/module}/ModuleService.java | 5 +- .../done/project/IProjectService.java | 2 +- .../done/project/ProjectController.java | 7 +- .../done/project}/ProjectGateway.java | 2 +- .../done/project}/ProjectService.java | 3 +- .../note/INoteService.java | 2 +- .../{spring => modules}/note/NoteBean.java | 2 +- .../note/NoteController.java | 2 +- .../impl => modules/note}/NoteGateway.java | 3 +- .../impl => modules/note}/NoteService.java | 5 +- .../templates/calendar/calendar.html | 20 +- 35 files changed, 452 insertions(+), 71 deletions(-) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/IndexController.java (86%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/calendar/CalendarController.java (60%) create mode 100644 src/main/java/de/jottyfan/timetrack/modules/calendar/CalendarService.java create mode 100644 src/main/java/de/jottyfan/timetrack/modules/calendar/EventBean.java rename src/main/java/de/jottyfan/timetrack/{spring => modules}/contact/ContactBean.java (97%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/contact/ContactController.java (98%) rename src/main/java/de/jottyfan/timetrack/{spring/contact/impl => modules/contact}/ContactGateway.java (98%) rename src/main/java/de/jottyfan/timetrack/{spring/contact/impl => modules/contact}/ContactService.java (91%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/contact/IContactService.java (89%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/DoneBean.java (99%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/DoneController.java (99%) rename src/main/java/de/jottyfan/timetrack/{spring/done/impl => modules/done}/DoneGateway.java (99%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/DoneModel.java (95%) rename src/main/java/de/jottyfan/timetrack/{spring/done/impl => modules/done}/DoneService.java (94%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/IDoneService.java (95%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/SummaryBean.java (99%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/job/IJobService.java (83%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/job/JobController.java (92%) rename src/main/java/de/jottyfan/timetrack/{spring/done/job/impl => modules/done/job}/JobGateway.java (97%) rename src/main/java/de/jottyfan/timetrack/{spring/done/job/impl => modules/done/job}/JobService.java (91%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/module/IModuleService.java (83%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/module/ModuleController.java (92%) rename src/main/java/de/jottyfan/timetrack/{spring/done/module/impl => modules/done/module}/ModuleGateway.java (97%) rename src/main/java/de/jottyfan/timetrack/{spring/done/module/impl => modules/done/module}/ModuleService.java (86%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/project/IProjectService.java (83%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/done/project/ProjectController.java (90%) rename src/main/java/de/jottyfan/timetrack/{spring/done/project/impl => modules/done/project}/ProjectGateway.java (97%) rename src/main/java/de/jottyfan/timetrack/{spring/done/project/impl => modules/done/project}/ProjectService.java (90%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/note/INoteService.java (89%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/note/NoteBean.java (97%) rename src/main/java/de/jottyfan/timetrack/{spring => modules}/note/NoteController.java (98%) rename src/main/java/de/jottyfan/timetrack/{spring/note/impl => modules/note}/NoteGateway.java (98%) rename src/main/java/de/jottyfan/timetrack/{spring/note/impl => modules/note}/NoteService.java (92%) diff --git a/src/main/java/de/jottyfan/timetrack/config/InitialConfiguration.java b/src/main/java/de/jottyfan/timetrack/config/InitialConfiguration.java index 8d77343..f1b60a2 100644 --- a/src/main/java/de/jottyfan/timetrack/config/InitialConfiguration.java +++ b/src/main/java/de/jottyfan/timetrack/config/InitialConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy; -import de.jottyfan.timetrack.spring.done.DoneModel; +import de.jottyfan.timetrack.modules.done.DoneModel; /** * diff --git a/src/main/java/de/jottyfan/timetrack/spring/IndexController.java b/src/main/java/de/jottyfan/timetrack/modules/IndexController.java similarity index 86% rename from src/main/java/de/jottyfan/timetrack/spring/IndexController.java rename to src/main/java/de/jottyfan/timetrack/modules/IndexController.java index 722d6cf..dba2254 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/IndexController.java +++ b/src/main/java/de/jottyfan/timetrack/modules/IndexController.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring; +package de.jottyfan.timetrack.modules; import java.time.Duration; import java.time.LocalDate; @@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import de.jottyfan.timetrack.spring.done.DoneBean; -import de.jottyfan.timetrack.spring.done.DoneModel; -import de.jottyfan.timetrack.spring.done.IDoneService; -import de.jottyfan.timetrack.spring.done.SummaryBean; +import de.jottyfan.timetrack.modules.done.DoneBean; +import de.jottyfan.timetrack.modules.done.DoneModel; +import de.jottyfan.timetrack.modules.done.IDoneService; +import de.jottyfan.timetrack.modules.done.SummaryBean; /** * diff --git a/src/main/java/de/jottyfan/timetrack/spring/calendar/CalendarController.java b/src/main/java/de/jottyfan/timetrack/modules/calendar/CalendarController.java similarity index 60% rename from src/main/java/de/jottyfan/timetrack/spring/calendar/CalendarController.java rename to src/main/java/de/jottyfan/timetrack/modules/calendar/CalendarController.java index 0e6982c..89189b7 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/calendar/CalendarController.java +++ b/src/main/java/de/jottyfan/timetrack/modules/calendar/CalendarController.java @@ -1,5 +1,6 @@ -package de.jottyfan.timetrack.spring.calendar; +package de.jottyfan.timetrack.modules.calendar; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -12,9 +13,12 @@ import org.springframework.web.bind.annotation.GetMapping; @Controller public class CalendarController { + @Autowired + private CalendarService service; + @GetMapping("/calendar") public String getCalendar(Model model) { - // TODO: implement + model.addAttribute("events", service.getJsonEvents()); return "/calendar/calendar"; } } diff --git a/src/main/java/de/jottyfan/timetrack/modules/calendar/CalendarService.java b/src/main/java/de/jottyfan/timetrack/modules/calendar/CalendarService.java new file mode 100644 index 0000000..f5ea9e7 --- /dev/null +++ b/src/main/java/de/jottyfan/timetrack/modules/calendar/CalendarService.java @@ -0,0 +1,31 @@ +package de.jottyfan.timetrack.modules.calendar; + +import org.springframework.stereotype.Service; + +/** + * + * @author jotty + * + */ +@Service +public class CalendarService { + + // TODO: implement a davical database reader as a repository + // TODO: implement a caldav client as repository + // TODO: implement a radicale file reader as repository + // TODO: create resource management database table for the calendar + + public String getJsonEvents() { + StringBuilder buf = new StringBuilder("["); + + // TODO: use List instead + + buf.append( + "{ id: 'example3', title: 'all day event', start: '2023-05-08', allDay: true, backgroundColor: 'darkcyan'},"); + buf.append(" { id: 'i1', title: 'overlapping', start: '2023-05-08T10:00', end: '2023-05-09T10:00'},"); + buf.append(" { id: 'i2', title: 'developing', start: '2023-05-09T08:00', end: '2023-05-09T10:15'}"); + buf.append("]"); + return buf.toString(); + } + +} diff --git a/src/main/java/de/jottyfan/timetrack/modules/calendar/EventBean.java b/src/main/java/de/jottyfan/timetrack/modules/calendar/EventBean.java new file mode 100644 index 0000000..7038729 --- /dev/null +++ b/src/main/java/de/jottyfan/timetrack/modules/calendar/EventBean.java @@ -0,0 +1,363 @@ +package de.jottyfan.timetrack.modules.calendar; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +/** + * + * @author jotty + * + */ +public class EventBean implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + private String groupId; + private Boolean allDay; + private LocalDateTime start; + private LocalDateTime end; + private String startStr; + private String endStr; + private String title; + private String url; + private final List classNames; + private Boolean editable; + private Boolean startEditable; + private Boolean durationEditable; + private Boolean resourceEditable; + private String display; // valid values are: auto, block, list-item, background, inverse-background, + // none + private Boolean overlap; + private String constraint; + private String backgroundColor; + private String boderColor; + private String textColor; + private String extendedProps; + private String source; + + public EventBean() { + classNames = new ArrayList<>(); + } + + @Override + public String toString() { + StringBuilder buf = new StringBuilder("{"); + buf.append("id:'").append(id).append("',"); + buf.append("groupId:'").append(groupId).append("',"); + buf.append("allDay:'").append(allDay).append("',"); + // TODO: extend; also, only on demand (not null), or better use Gson for the json conversion +// .append(", start=").append(start).append(", end=").append(end).append(", startStr=").append(startStr) +// .append(", endStr=").append(endStr).append(", title=").append(title).append(", url=").append(url) +// .append(", classNames=").append(classNames).append(", editable=").append(editable).append(", startEditable=") +// .append(startEditable).append(", durationEditable=").append(durationEditable).append(", resourceEditable=") +// .append(resourceEditable).append(", display=").append(display).append(", overlap=").append(overlap) +// .append(", constraint=").append(constraint).append(", backgroundColor=").append(backgroundColor) +// .append(", boderColor=").append(boderColor).append(", textColor=").append(textColor).append(", extendedProps=") +// .append(extendedProps).append(", source=").append(source).append("]"); + return buf.toString(); + } + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(String id) { + this.id = id; + } + + /** + * @return the groupId + */ + public String getGroupId() { + return groupId; + } + + /** + * @param groupId the groupId to set + */ + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + /** + * @return the allDay + */ + public Boolean getAllDay() { + return allDay; + } + + /** + * @param allDay the allDay to set + */ + public void setAllDay(Boolean allDay) { + this.allDay = allDay; + } + + /** + * @return the start + */ + public LocalDateTime getStart() { + return start; + } + + /** + * @param start the start to set + */ + public void setStart(LocalDateTime start) { + this.start = start; + } + + /** + * @return the end + */ + public LocalDateTime getEnd() { + return end; + } + + /** + * @param end the end to set + */ + public void setEnd(LocalDateTime end) { + this.end = end; + } + + /** + * @return the startStr + */ + public String getStartStr() { + return startStr; + } + + /** + * @param startStr the startStr to set + */ + public void setStartStr(String startStr) { + this.startStr = startStr; + } + + /** + * @return the endStr + */ + public String getEndStr() { + return endStr; + } + + /** + * @param endStr the endStr to set + */ + public void setEndStr(String endStr) { + this.endStr = endStr; + } + + /** + * @return the title + */ + public String getTitle() { + return title; + } + + /** + * @param title the title to set + */ + public void setTitle(String title) { + this.title = title; + } + + /** + * @return the url + */ + public String getUrl() { + return url; + } + + /** + * @param url the url to set + */ + public void setUrl(String url) { + this.url = url; + } + + /** + * @return the classNames + */ + public List getClassNames() { + return classNames; + } + + /** + * @return the editable + */ + public Boolean getEditable() { + return editable; + } + + /** + * @param editable the editable to set + */ + public void setEditable(Boolean editable) { + this.editable = editable; + } + + /** + * @return the startEditable + */ + public Boolean getStartEditable() { + return startEditable; + } + + /** + * @param startEditable the startEditable to set + */ + public void setStartEditable(Boolean startEditable) { + this.startEditable = startEditable; + } + + /** + * @return the durationEditable + */ + public Boolean getDurationEditable() { + return durationEditable; + } + + /** + * @param durationEditable the durationEditable to set + */ + public void setDurationEditable(Boolean durationEditable) { + this.durationEditable = durationEditable; + } + + /** + * @return the resourceEditable + */ + public Boolean getResourceEditable() { + return resourceEditable; + } + + /** + * @param resourceEditable the resourceEditable to set + */ + public void setResourceEditable(Boolean resourceEditable) { + this.resourceEditable = resourceEditable; + } + + /** + * @return the display + */ + public String getDisplay() { + return display; + } + + /** + * @param display the display to set + */ + public void setDisplay(String display) { + this.display = display; + } + + /** + * @return the overlap + */ + public Boolean getOverlap() { + return overlap; + } + + /** + * @param overlap the overlap to set + */ + public void setOverlap(Boolean overlap) { + this.overlap = overlap; + } + + /** + * @return the constraint + */ + public String getConstraint() { + return constraint; + } + + /** + * @param constraint the constraint to set + */ + public void setConstraint(String constraint) { + this.constraint = constraint; + } + + /** + * @return the backgroundColor + */ + public String getBackgroundColor() { + return backgroundColor; + } + + /** + * @param backgroundColor the backgroundColor to set + */ + public void setBackgroundColor(String backgroundColor) { + this.backgroundColor = backgroundColor; + } + + /** + * @return the boderColor + */ + public String getBoderColor() { + return boderColor; + } + + /** + * @param boderColor the boderColor to set + */ + public void setBoderColor(String boderColor) { + this.boderColor = boderColor; + } + + /** + * @return the textColor + */ + public String getTextColor() { + return textColor; + } + + /** + * @param textColor the textColor to set + */ + public void setTextColor(String textColor) { + this.textColor = textColor; + } + + /** + * @return the extendedProps + */ + public String getExtendedProps() { + return extendedProps; + } + + /** + * @param extendedProps the extendedProps to set + */ + public void setExtendedProps(String extendedProps) { + this.extendedProps = extendedProps; + } + + /** + * @return the source + */ + public String getSource() { + return source; + } + + /** + * @param source the source to set + */ + public void setSource(String source) { + this.source = source; + } +} diff --git a/src/main/java/de/jottyfan/timetrack/spring/contact/ContactBean.java b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactBean.java similarity index 97% rename from src/main/java/de/jottyfan/timetrack/spring/contact/ContactBean.java rename to src/main/java/de/jottyfan/timetrack/modules/contact/ContactBean.java index 7f8afc4..d282b7e 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/contact/ContactBean.java +++ b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactBean.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.contact; +package de.jottyfan.timetrack.modules.contact; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/timetrack/spring/contact/ContactController.java b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactController.java similarity index 98% rename from src/main/java/de/jottyfan/timetrack/spring/contact/ContactController.java rename to src/main/java/de/jottyfan/timetrack/modules/contact/ContactController.java index 2e02c26..bfa389a 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/contact/ContactController.java +++ b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactController.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.contact; +package de.jottyfan.timetrack.modules.contact; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/de/jottyfan/timetrack/spring/contact/impl/ContactGateway.java b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactGateway.java similarity index 98% rename from src/main/java/de/jottyfan/timetrack/spring/contact/impl/ContactGateway.java rename to src/main/java/de/jottyfan/timetrack/modules/contact/ContactGateway.java index 23b9ea7..b437483 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/contact/impl/ContactGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactGateway.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.contact.impl; +package de.jottyfan.timetrack.modules.contact; import static de.jottyfan.timetrack.db.contact.Tables.T_CONTACT; @@ -24,7 +24,6 @@ import org.springframework.stereotype.Repository; import de.jottyfan.timetrack.db.contact.enums.EnumContacttype; import de.jottyfan.timetrack.db.contact.tables.records.TContactRecord; -import de.jottyfan.timetrack.spring.contact.ContactBean; /** * diff --git a/src/main/java/de/jottyfan/timetrack/spring/contact/impl/ContactService.java b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactService.java similarity index 91% rename from src/main/java/de/jottyfan/timetrack/spring/contact/impl/ContactService.java rename to src/main/java/de/jottyfan/timetrack/modules/contact/ContactService.java index d37959e..b68657d 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/contact/impl/ContactService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/contact/ContactService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.contact.impl; +package de.jottyfan.timetrack.modules.contact; import java.util.ArrayList; import java.util.List; @@ -13,9 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import de.jottyfan.timetrack.spring.contact.ContactBean; -import de.jottyfan.timetrack.spring.contact.IContactService; - /** * * @author henkej diff --git a/src/main/java/de/jottyfan/timetrack/spring/contact/IContactService.java b/src/main/java/de/jottyfan/timetrack/modules/contact/IContactService.java similarity index 89% rename from src/main/java/de/jottyfan/timetrack/spring/contact/IContactService.java rename to src/main/java/de/jottyfan/timetrack/modules/contact/IContactService.java index dc917ad..6906637 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/contact/IContactService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/contact/IContactService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.contact; +package de.jottyfan.timetrack.modules.contact; import java.util.List; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/DoneBean.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java similarity index 99% rename from src/main/java/de/jottyfan/timetrack/spring/done/DoneBean.java rename to src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java index 09cbae4..03c5263 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/DoneBean.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneBean.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done; +package de.jottyfan.timetrack.modules.done; import java.io.Serializable; import java.time.Duration; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/DoneController.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneController.java similarity index 99% rename from src/main/java/de/jottyfan/timetrack/spring/done/DoneController.java rename to src/main/java/de/jottyfan/timetrack/modules/done/DoneController.java index 75e7584..0877851 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/DoneController.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneController.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done; +package de.jottyfan.timetrack.modules.done; import java.time.Duration; import java.time.LocalDate; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneGateway.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java similarity index 99% rename from src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneGateway.java rename to src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java index ae3f1d8..3e1aa76 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneGateway.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.impl; +package de.jottyfan.timetrack.modules.done; import static de.jottyfan.timetrack.db.done.Tables.T_DONE; import static de.jottyfan.timetrack.db.done.Tables.V_BILLING; @@ -36,7 +36,6 @@ import de.jottyfan.timetrack.db.done.tables.records.VModuleRecord; import de.jottyfan.timetrack.db.done.tables.records.VProjectRecord; import de.jottyfan.timetrack.db.profile.tables.records.TLoginRecord; import de.jottyfan.timetrack.help.LocalDateHelper; -import de.jottyfan.timetrack.spring.done.DoneBean; /** * diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/DoneModel.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java similarity index 95% rename from src/main/java/de/jottyfan/timetrack/spring/done/DoneModel.java rename to src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java index 61cc22f..5236585 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/DoneModel.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneModel.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done; +package de.jottyfan.timetrack.modules.done; import java.io.Serializable; import java.time.LocalDate; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneService.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneService.java similarity index 94% rename from src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneService.java rename to src/main/java/de/jottyfan/timetrack/modules/done/DoneService.java index f4c5cb9..68ac4d4 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.impl; +package de.jottyfan.timetrack.modules.done; import java.time.LocalDate; import java.util.ArrayList; @@ -18,9 +18,7 @@ import de.jottyfan.timetrack.db.done.tables.records.VBillingRecord; import de.jottyfan.timetrack.db.done.tables.records.VJobRecord; import de.jottyfan.timetrack.db.done.tables.records.VModuleRecord; import de.jottyfan.timetrack.db.done.tables.records.VProjectRecord; -import de.jottyfan.timetrack.spring.done.DoneBean; -import de.jottyfan.timetrack.spring.done.IDoneService; -import de.jottyfan.timetrack.spring.note.impl.NoteService; +import de.jottyfan.timetrack.modules.note.NoteService; /** * diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/IDoneService.java b/src/main/java/de/jottyfan/timetrack/modules/done/IDoneService.java similarity index 95% rename from src/main/java/de/jottyfan/timetrack/spring/done/IDoneService.java rename to src/main/java/de/jottyfan/timetrack/modules/done/IDoneService.java index 86c39f6..09f8aa3 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/IDoneService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/IDoneService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done; +package de.jottyfan.timetrack.modules.done; import java.time.LocalDate; import java.util.List; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/SummaryBean.java b/src/main/java/de/jottyfan/timetrack/modules/done/SummaryBean.java similarity index 99% rename from src/main/java/de/jottyfan/timetrack/spring/done/SummaryBean.java rename to src/main/java/de/jottyfan/timetrack/modules/done/SummaryBean.java index 975affd..df3cebf 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/SummaryBean.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/SummaryBean.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done; +package de.jottyfan.timetrack.modules.done; import java.io.Serializable; import java.time.Duration; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/job/IJobService.java b/src/main/java/de/jottyfan/timetrack/modules/done/job/IJobService.java similarity index 83% rename from src/main/java/de/jottyfan/timetrack/spring/done/job/IJobService.java rename to src/main/java/de/jottyfan/timetrack/modules/done/job/IJobService.java index 54c55b1..fd362eb 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/job/IJobService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/job/IJobService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.job; +package de.jottyfan.timetrack.modules.done.job; import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/job/JobController.java b/src/main/java/de/jottyfan/timetrack/modules/done/job/JobController.java similarity index 92% rename from src/main/java/de/jottyfan/timetrack/spring/done/job/JobController.java rename to src/main/java/de/jottyfan/timetrack/modules/done/job/JobController.java index 8d0486a..938bbfa 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/job/JobController.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/job/JobController.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.job; +package de.jottyfan.timetrack.modules.done.job; import javax.annotation.security.RolesAllowed; @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; -import de.jottyfan.timetrack.spring.done.DoneController; -import de.jottyfan.timetrack.spring.done.DoneModel; +import de.jottyfan.timetrack.modules.done.DoneController; +import de.jottyfan.timetrack.modules.done.DoneModel; /** * diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/job/impl/JobGateway.java b/src/main/java/de/jottyfan/timetrack/modules/done/job/JobGateway.java similarity index 97% rename from src/main/java/de/jottyfan/timetrack/spring/done/job/impl/JobGateway.java rename to src/main/java/de/jottyfan/timetrack/modules/done/job/JobGateway.java index 4315586..b0c1a9e 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/job/impl/JobGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/job/JobGateway.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.job.impl; +package de.jottyfan.timetrack.modules.done.job; import static de.jottyfan.timetrack.db.done.Tables.T_JOB; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/job/impl/JobService.java b/src/main/java/de/jottyfan/timetrack/modules/done/job/JobService.java similarity index 91% rename from src/main/java/de/jottyfan/timetrack/spring/done/job/impl/JobService.java rename to src/main/java/de/jottyfan/timetrack/modules/done/job/JobService.java index e41d238..4ac0373 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/job/impl/JobService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/job/JobService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.job.impl; +package de.jottyfan.timetrack.modules.done.job; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -9,7 +9,6 @@ import org.springframework.transaction.annotation.Transactional; import de.jottyfan.timetrack.db.done.tables.records.TJobRecord; import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; -import de.jottyfan.timetrack.spring.done.job.IJobService; @Service @Transactional(transactionManager = "transactionManager") diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/module/IModuleService.java b/src/main/java/de/jottyfan/timetrack/modules/done/module/IModuleService.java similarity index 83% rename from src/main/java/de/jottyfan/timetrack/spring/done/module/IModuleService.java rename to src/main/java/de/jottyfan/timetrack/modules/done/module/IModuleService.java index e486be9..adfb014 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/module/IModuleService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/module/IModuleService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.module; +package de.jottyfan.timetrack.modules.done.module; import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/module/ModuleController.java b/src/main/java/de/jottyfan/timetrack/modules/done/module/ModuleController.java similarity index 92% rename from src/main/java/de/jottyfan/timetrack/spring/done/module/ModuleController.java rename to src/main/java/de/jottyfan/timetrack/modules/done/module/ModuleController.java index 1efbf66..1331a9d 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/module/ModuleController.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/module/ModuleController.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.module; +package de.jottyfan.timetrack.modules.done.module; import javax.annotation.security.RolesAllowed; @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; -import de.jottyfan.timetrack.spring.done.DoneController; -import de.jottyfan.timetrack.spring.done.DoneModel; +import de.jottyfan.timetrack.modules.done.DoneController; +import de.jottyfan.timetrack.modules.done.DoneModel; /** * diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/module/impl/ModuleGateway.java b/src/main/java/de/jottyfan/timetrack/modules/done/module/ModuleGateway.java similarity index 97% rename from src/main/java/de/jottyfan/timetrack/spring/done/module/impl/ModuleGateway.java rename to src/main/java/de/jottyfan/timetrack/modules/done/module/ModuleGateway.java index 4044e70..4864219 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/module/impl/ModuleGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/module/ModuleGateway.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.module.impl; +package de.jottyfan.timetrack.modules.done.module; import static de.jottyfan.timetrack.db.done.Tables.T_MODULE; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/module/impl/ModuleService.java b/src/main/java/de/jottyfan/timetrack/modules/done/module/ModuleService.java similarity index 86% rename from src/main/java/de/jottyfan/timetrack/spring/done/module/impl/ModuleService.java rename to src/main/java/de/jottyfan/timetrack/modules/done/module/ModuleService.java index 1ca7b3b..c1896af 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/module/impl/ModuleService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/module/ModuleService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.module.impl; +package de.jottyfan.timetrack.modules.done.module; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -9,8 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import de.jottyfan.timetrack.db.done.tables.records.TModuleRecord; import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; -import de.jottyfan.timetrack.spring.done.module.IModuleService; -import de.jottyfan.timetrack.spring.done.project.IProjectService; +import de.jottyfan.timetrack.modules.done.project.IProjectService; @Service @Transactional(transactionManager = "transactionManager") diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/project/IProjectService.java b/src/main/java/de/jottyfan/timetrack/modules/done/project/IProjectService.java similarity index 83% rename from src/main/java/de/jottyfan/timetrack/spring/done/project/IProjectService.java rename to src/main/java/de/jottyfan/timetrack/modules/done/project/IProjectService.java index 7831456..8de6709 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/project/IProjectService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/project/IProjectService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.project; +package de.jottyfan.timetrack.modules.done.project; import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/project/ProjectController.java b/src/main/java/de/jottyfan/timetrack/modules/done/project/ProjectController.java similarity index 90% rename from src/main/java/de/jottyfan/timetrack/spring/done/project/ProjectController.java rename to src/main/java/de/jottyfan/timetrack/modules/done/project/ProjectController.java index 8bd5ac2..f377ab1 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/project/ProjectController.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/project/ProjectController.java @@ -1,7 +1,6 @@ -package de.jottyfan.timetrack.spring.done.project; +package de.jottyfan.timetrack.modules.done.project; import javax.annotation.security.RolesAllowed; -import javax.servlet.http.HttpServletRequest; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -15,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; -import de.jottyfan.timetrack.spring.done.DoneController; -import de.jottyfan.timetrack.spring.done.DoneModel; +import de.jottyfan.timetrack.modules.done.DoneController; +import de.jottyfan.timetrack.modules.done.DoneModel; /** * diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/project/impl/ProjectGateway.java b/src/main/java/de/jottyfan/timetrack/modules/done/project/ProjectGateway.java similarity index 97% rename from src/main/java/de/jottyfan/timetrack/spring/done/project/impl/ProjectGateway.java rename to src/main/java/de/jottyfan/timetrack/modules/done/project/ProjectGateway.java index 0bcc188..38e85b5 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/project/impl/ProjectGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/project/ProjectGateway.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.project.impl; +package de.jottyfan.timetrack.modules.done.project; import static de.jottyfan.timetrack.db.done.Tables.T_PROJECT; diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/project/impl/ProjectService.java b/src/main/java/de/jottyfan/timetrack/modules/done/project/ProjectService.java similarity index 90% rename from src/main/java/de/jottyfan/timetrack/spring/done/project/impl/ProjectService.java rename to src/main/java/de/jottyfan/timetrack/modules/done/project/ProjectService.java index 829e7b9..d4397f7 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/project/impl/ProjectService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/done/project/ProjectService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.done.project.impl; +package de.jottyfan.timetrack.modules.done.project; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -8,7 +8,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import de.jottyfan.timetrack.db.done.tables.records.TProjectRecord; -import de.jottyfan.timetrack.spring.done.project.IProjectService; @Service @Transactional(transactionManager = "transactionManager") diff --git a/src/main/java/de/jottyfan/timetrack/spring/note/INoteService.java b/src/main/java/de/jottyfan/timetrack/modules/note/INoteService.java similarity index 89% rename from src/main/java/de/jottyfan/timetrack/spring/note/INoteService.java rename to src/main/java/de/jottyfan/timetrack/modules/note/INoteService.java index 3dafc46..c9f0656 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/note/INoteService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/note/INoteService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.note; +package de.jottyfan.timetrack.modules.note; import java.util.List; diff --git a/src/main/java/de/jottyfan/timetrack/spring/note/NoteBean.java b/src/main/java/de/jottyfan/timetrack/modules/note/NoteBean.java similarity index 97% rename from src/main/java/de/jottyfan/timetrack/spring/note/NoteBean.java rename to src/main/java/de/jottyfan/timetrack/modules/note/NoteBean.java index 02958d5..5d5e94a 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/note/NoteBean.java +++ b/src/main/java/de/jottyfan/timetrack/modules/note/NoteBean.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.note; +package de.jottyfan.timetrack.modules.note; import java.io.Serializable; diff --git a/src/main/java/de/jottyfan/timetrack/spring/note/NoteController.java b/src/main/java/de/jottyfan/timetrack/modules/note/NoteController.java similarity index 98% rename from src/main/java/de/jottyfan/timetrack/spring/note/NoteController.java rename to src/main/java/de/jottyfan/timetrack/modules/note/NoteController.java index 2b8aae1..abd829d 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/note/NoteController.java +++ b/src/main/java/de/jottyfan/timetrack/modules/note/NoteController.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.note; +package de.jottyfan.timetrack.modules.note; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/de/jottyfan/timetrack/spring/note/impl/NoteGateway.java b/src/main/java/de/jottyfan/timetrack/modules/note/NoteGateway.java similarity index 98% rename from src/main/java/de/jottyfan/timetrack/spring/note/impl/NoteGateway.java rename to src/main/java/de/jottyfan/timetrack/modules/note/NoteGateway.java index ec0c1c7..4a26896 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/note/impl/NoteGateway.java +++ b/src/main/java/de/jottyfan/timetrack/modules/note/NoteGateway.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.note.impl; +package de.jottyfan.timetrack.modules.note; import static de.jottyfan.timetrack.db.note.Tables.T_NOTE; @@ -25,7 +25,6 @@ import org.springframework.stereotype.Repository; import de.jottyfan.timetrack.db.note.enums.EnumCategory; import de.jottyfan.timetrack.db.note.enums.EnumNotetype; import de.jottyfan.timetrack.db.note.tables.records.TNoteRecord; -import de.jottyfan.timetrack.spring.note.NoteBean; /** * diff --git a/src/main/java/de/jottyfan/timetrack/spring/note/impl/NoteService.java b/src/main/java/de/jottyfan/timetrack/modules/note/NoteService.java similarity index 92% rename from src/main/java/de/jottyfan/timetrack/spring/note/impl/NoteService.java rename to src/main/java/de/jottyfan/timetrack/modules/note/NoteService.java index 06a7b32..0086be6 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/note/impl/NoteService.java +++ b/src/main/java/de/jottyfan/timetrack/modules/note/NoteService.java @@ -1,4 +1,4 @@ -package de.jottyfan.timetrack.spring.note.impl; +package de.jottyfan.timetrack.modules.note; import java.util.ArrayList; import java.util.List; @@ -13,9 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import de.jottyfan.timetrack.spring.note.INoteService; -import de.jottyfan.timetrack.spring.note.NoteBean; - /** * * @author henkej diff --git a/src/main/resources/templates/calendar/calendar.html b/src/main/resources/templates/calendar/calendar.html index f761b2b..f0a6701 100644 --- a/src/main/resources/templates/calendar/calendar.html +++ b/src/main/resources/templates/calendar/calendar.html @@ -6,7 +6,7 @@ Kalender
    @@ -17,30 +17,28 @@
    -