change runner

Co-authored-by: Nils Burghardt <nilzbu@gmail.com>
Reviewed-on: #8

.gitea/workflows/restart.yaml

@@ -0,0 +1,14 @@
+name: Docker Restart Manuell
+
+on:
+  workflow_dispatch:
+
+jobs:
+  restart-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Compose Restart
+        run: |
+          cd /pfad/zum/docker-verzeichnis
+          docker compose down
+          docker compose up -d

src/main/java/de/nilzbu/mytimetracker/model/DayStatus.java

@@ -1,5 +1,8 @@
 package de.nilzbu.mytimetracker.model;
 
+import lombok.Getter;
+
+@Getter
 public enum DayStatus {
     OFFICE("In office"),
     REMOTE("Remote work"),
@@ -12,7 +15,4 @@ public enum DayStatus {
         this.displayName = displayName;
     }
 
-    public String getDisplayName() {
-        return displayName;
-    }
 }

src/main/java/de/nilzbu/mytimetracker/repository/TimeEntryRepository.java

@@ -12,10 +12,6 @@ public interface TimeEntryRepository extends JpaRepository<TimeEntry, Long> {
 
     List<TimeEntry> findAllByUserOrderByDateDesc(User user);
 
-    Optional<TimeEntry> findTopByUserOrderByDateDesc(User user);
-
-    boolean existsByUserAndDate(User user, LocalDate date);
-
     Optional<TimeEntry> findByUserAndDate(User user, LocalDate date);
 
     List<TimeEntry> findByUserAndDateBetween(User user, LocalDate start, LocalDate end);

src/main/java/de/nilzbu/mytimetracker/security/SecurityConfig.java

@@ -12,10 +12,7 @@ public class SecurityConfig extends VaadinWebSecurity {
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        // Standard-Konfiguration von Vaadin-Security erweitern
         super.configure(http);
-
-        // Login-View setzen
         setLoginView(http, LoginView.class);
     }
 

src/main/java/de/nilzbu/mytimetracker/service/TimeEntryService.java

@@ -49,6 +49,10 @@ public class TimeEntryService {
         return repository.findByUserAndDateBetween(user, start, end);
     }
 
+    public int getNumberOfEntriesForMonth(User user, int year, int month) {
+        return getEntriesForMonth(user, year, month).size();
+    }
+
     public List<TimeEntry> getEntriesForQuarter(User user, int year, int quarter) {
         int startMonth = (quarter - 1) * 3 + 1;
         LocalDate start = LocalDate.of(year, startMonth, 1);
@@ -56,12 +60,20 @@ public class TimeEntryService {
         return repository.findByUserAndDateBetween(user, start, end);
     }
 
+    public int getNumberOfEntriesForQuarter(User user, int year, int month) {
+        return getEntriesForQuarter(user, year, month).size();
+    }
+
     public List<TimeEntry> getEntriesForYear(User user, int year) {
         LocalDate start = LocalDate.of(year, 1, 1);
         LocalDate end = LocalDate.of(year, 12, 31);
         return repository.findByUserAndDateBetween(user, start, end);
     }
 
+    public int getNumberOfEntriesForYear(User user, int year) {
+        return getEntriesForYear(user, year).size();
+    }
+
     public Optional<LocalDate> getEarliestEntryDate(User user) {
         return repository.findFirstByUserOrderByDateAsc(user)
                 .map(TimeEntry::getDate);

src/main/java/de/nilzbu/mytimetracker/ui/component/ChartJsComponent.java

@@ -1,11 +1,10 @@
 package de.nilzbu.mytimetracker.ui.component;
 
-import com.vaadin.flow.component.HasSize;
+import com.vaadin.flow.component.AttachEvent;
-import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.dependency.NpmPackage;
-import com.vaadin.flow.component.Tag;
+import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.AttachEvent;
 import elemental.json.Json;
 import elemental.json.JsonArray;
 import elemental.json.JsonObject;
@@ -31,9 +30,15 @@ public class ChartJsComponent extends Div {
 
     @Override
     protected void onAttach(AttachEvent attachEvent) {
+        renderChart();
+    }
+
+    private void renderChart() {
         getElement().executeJs(
                 """
                 const canvas = document.createElement('canvas');
+                canvas.style.width = "100%";
+                canvas.style.height = "100%";
                 this.appendChild(canvas);
                 const ctx = canvas.getContext('2d');
                 new Chart(ctx, {
@@ -54,47 +59,54 @@ public class ChartJsComponent extends Div {
                   }
                 });
                 """,
-                getChartTypeFromData(chartData),
+                detectChartType(chartData),
                 chartData,
                 chartTitle
         );
     }
 
-    private String getChartTypeFromData(JsonObject data) {
+    /**
-        // Default zu bar wenn keine sinnvolle Bestimmung möglich ist
+     * Bestimmt den Diagrammtyp basierend auf dem Dataset.
+     */
+    private String detectChartType(JsonObject data) {
         try {
             JsonArray datasets = data.getArray("datasets");
             if (datasets.length() > 0) {
-                JsonObject first = datasets.getObject(0);
+                JsonObject firstDataset = datasets.getObject(0);
-                if (first.hasKey("fill") && !first.getBoolean("fill")) {
+                if (firstDataset.hasKey("fill") && !firstDataset.getBoolean("fill")) {
                     return "line";
                 }
             }
-        } catch (Exception ignored) {}
+        } catch (Exception ignored) {
+        }
         return "bar";
     }
 
-    // Balkendiagramm für Kategorien
+    /**
+     * Erstellt ein Balkendiagramm für Kategoriezählungen.
+     */
     public static JsonObject generateBarChartData(Map<String, Long> categoryCounts) {
         JsonObject data = Json.createObject();
         JsonArray labels = Json.createArray();
         JsonArray values = Json.createArray();
-        JsonArray backgroundColors = Json.createArray();
+        JsonArray colors = Json.createArray();
 
-        String[] defaultColors = {"#1e7e34", "#138496", "#ffc107", "#dc3545", "#6f42c1", "#20c997"};
+        String[] defaultColors = {
+                "#1e7e34", "#138496", "#ffc107", "#dc3545", "#6f42c1", "#20c997"
+        };
 
-        int i = 0;
+        int index = 0;
         for (Map.Entry<String, Long> entry : categoryCounts.entrySet()) {
-            labels.set(i, Json.create(entry.getKey()));
+            labels.set(index, Json.create(entry.getKey()));
-            values.set(i, Json.create(entry.getValue()));
+            values.set(index, Json.create(entry.getValue()));
-            backgroundColors.set(i, Json.create(defaultColors[i % defaultColors.length]));
+            colors.set(index, Json.create(defaultColors[index % defaultColors.length]));
-            i++;
+            index++;
         }
 
         JsonObject dataset = Json.createObject();
-        dataset.put("label", "Einträge nach Kategorie");
+        dataset.put("label", "Entries by Category");
         dataset.put("data", values);
-        dataset.put("backgroundColor", backgroundColors);
+        dataset.put("backgroundColor", colors);
 
         JsonArray datasets = Json.createArray();
         datasets.set(0, dataset);
@@ -105,19 +117,21 @@ public class ChartJsComponent extends Div {
         return data;
     }
 
-    // Liniendiagramm für Überstunden-Saldo (in Stunden)
+    /**
-    public static JsonObject generateLineChartData(List<LocalDate> dates, List<Double> saldoValues) {
+     * Erstellt ein Liniendiagramm zur Darstellung des Überzeit-Saldos.
+     */
+    public static JsonObject generateLineChartData(List<LocalDate> dates, List<Double> balanceValues) {
         JsonObject data = Json.createObject();
         JsonArray labels = Json.createArray();
         JsonArray values = Json.createArray();
 
         for (int i = 0; i < dates.size(); i++) {
             labels.set(i, Json.create(dates.get(i).toString()));
-            values.set(i, Json.create(saldoValues.get(i)));
+            values.set(i, Json.create(balanceValues.get(i)));
         }
 
         JsonObject dataset = Json.createObject();
-        dataset.put("label", "Überstunden-Saldo (h)");
+        dataset.put("label", "Overtime Balance (hours)");
         dataset.put("data", values);
         dataset.put("borderColor", "rgb(54, 162, 235)");
         dataset.put("tension", 0.1);

src/main/java/de/nilzbu/mytimetracker/ui/layout/MainLayout.java

@@ -8,9 +8,9 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.router.RouterLink;
 import com.vaadin.flow.server.VaadinServletRequest;
 import com.vaadin.flow.server.VaadinServletResponse;
-import de.nilzbu.mytimetracker.ui.view.MainView;
+import de.nilzbu.mytimetracker.ui.view.DashboardOverView;
 import de.nilzbu.mytimetracker.ui.view.TimeEntryView;
-import de.nilzbu.mytimetracker.ui.view.UserAdminView;
+import de.nilzbu.mytimetracker.ui.view.UserManagementView;
 import jakarta.annotation.security.PermitAll;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -19,44 +19,46 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 
 @PermitAll
-
 public class MainLayout extends AppLayout {
 
     public MainLayout() {
-        createHeader();
+        buildHeader();
     }
 
-    private void createHeader() {
+    private void buildHeader() {
-        H1 logo = new H1("Time Tracker");
+        H1 title = new H1("Time Tracker");
-        logo.getStyle()
+        title.getStyle()
                 .set("font-size", "var(--lumo-font-size-l)")
                 .set("margin", "0");
 
-        RouterLink homeLink = new RouterLink("Dashboard", MainView.class);
+        RouterLink dashboardLink = new RouterLink("Dashboard", DashboardOverView.class);
         RouterLink bookingsLink = new RouterLink("Bookings", TimeEntryView.class);
-        RouterLink userAdminView = new RouterLink("Admin", UserAdminView.class);
+        RouterLink adminLink = new RouterLink("Admin", UserManagementView.class);
-        homeLink.getStyle().set("margin-left", "2em");
+
+        dashboardLink.getStyle().set("margin-left", "2em");
         bookingsLink.getStyle().set("margin-left", "2em");
-        userAdminView.getStyle().set("margin-left", "2em");
+        adminLink.getStyle().set("margin-left", "2em");
 
-        Button logoutButton = new Button("Logout", event -> handleLogout());
+        Button logoutButton = new Button("Logout", event -> performLogout());
 
-        HorizontalLayout header = new HorizontalLayout(logo, homeLink, bookingsLink, userAdminView, logoutButton);
+        HorizontalLayout headerLayout = new HorizontalLayout(
-        header.setDefaultVerticalComponentAlignment(FlexComponent.Alignment.CENTER);
+                title, dashboardLink, bookingsLink, adminLink, logoutButton
-        header.setWidthFull();
+        );
-        header.setPadding(true);
+        headerLayout.setDefaultVerticalComponentAlignment(FlexComponent.Alignment.CENTER);
-        header.setSpacing(true);
+        headerLayout.setWidthFull();
+        headerLayout.setPadding(true);
+        headerLayout.setSpacing(true);
 
-        addToNavbar(header);
+        addToNavbar(headerLayout);
     }
 
-    private void handleLogout() {
+    private void performLogout() {
         HttpServletRequest request = VaadinServletRequest.getCurrent().getHttpServletRequest();
         HttpServletResponse response = VaadinServletResponse.getCurrent().getHttpServletResponse();
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
-        if (auth != null) {
+        if (authentication != null) {
-            new SecurityContextLogoutHandler().logout(request, response, auth);
+            new SecurityContextLogoutHandler().logout(request, response, authentication);
         }
 
         getUI().ifPresent(ui -> ui.getPage().setLocation("/login"));

src/main/java/de/nilzbu/mytimetracker/ui/view/DashboardOverView.java

@@ -4,29 +4,33 @@ import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.combobox.ComboBox;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.tabs.Tab;
 import com.vaadin.flow.component.tabs.Tabs;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
+import de.nilzbu.mytimetracker.model.DayStatus;
 import de.nilzbu.mytimetracker.model.TimeEntry;
 import de.nilzbu.mytimetracker.model.User;
 import de.nilzbu.mytimetracker.repository.UserRepository;
 import de.nilzbu.mytimetracker.service.TimeEntryService;
 import de.nilzbu.mytimetracker.ui.component.ChartJsComponent;
 import de.nilzbu.mytimetracker.ui.layout.MainLayout;
+import de.nilzbu.mytimetracker.ui.widget.KeyFigureWidget;
 import jakarta.annotation.security.PermitAll;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.time.LocalDate;
 import java.util.*;
+import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 @PermitAll
 @PageTitle("Dashboard")
 @Route(value = "", layout = MainLayout.class)
-public class MainView extends VerticalLayout {
+public class DashboardOverView extends VerticalLayout {
 
     private final TimeEntryService timeEntryService;
     private final UserRepository userRepository;
@@ -39,7 +43,10 @@ public class MainView extends VerticalLayout {
     private final Div filterContainer = new Div();
     private final Div contentContainer = new Div();
 
-    public MainView(TimeEntryService timeEntryService, UserRepository userRepository) {
+    private final BiFunction<List<TimeEntry>, DayStatus, String> calculateDaysWithDayStatus =
+            (scopedEntries, status) -> "%d".formatted(scopedEntries.stream().filter(entry -> entry.getStatus().equals(status)).count());
+
+    public DashboardOverView(TimeEntryService timeEntryService, UserRepository userRepository) {
         this.timeEntryService = timeEntryService;
         this.userRepository = userRepository;
 
@@ -50,13 +57,11 @@ public class MainView extends VerticalLayout {
     }
 
     private void configureLayout() {
-        setSizeFull();
         setPadding(false);
         setSpacing(false);
         setMargin(false);
 
         contentContainer.setSizeFull();
-        contentContainer.getStyle().set("overflow", "auto");
         setFlexGrow(1, contentContainer);
     }
 
@@ -121,6 +126,7 @@ public class MainView extends VerticalLayout {
             default -> timeEntryService.getEntriesForUser(currentUser);
         };
 
+        renderKeyFigures(entries);
         renderCharts(entries);
     }
 
@@ -139,16 +145,13 @@ public class MainView extends VerticalLayout {
     private void renderCharts(List<TimeEntry> scopedEntries) {
         List<TimeEntry> allEntries = timeEntryService.getEntriesForUser(currentUser);
 
-        VerticalLayout chartLayout = new VerticalLayout();
+        HorizontalLayout chartLayout = new HorizontalLayout();
-        chartLayout.setSizeFull();
         chartLayout.setPadding(false);
         chartLayout.setSpacing(true);
 
         Component categoryChart = createCategoryBarChart(scopedEntries);
         Component overtimeChart = createOvertimeLineChart(allEntries, scopedEntries);
 
-        categoryChart.getStyle().set("minHeight", "45vh");
-        overtimeChart.getStyle().set("minHeight", "50vh");
 
         chartLayout.add(categoryChart, overtimeChart);
         chartLayout.setFlexGrow(1, categoryChart);
@@ -157,6 +160,42 @@ public class MainView extends VerticalLayout {
         contentContainer.add(chartLayout);
     }
 
+    private void renderKeyFigures(List<TimeEntry> scopedEntries) {
+        HorizontalLayout keyFigureLayout = new HorizontalLayout();
+
+        KeyFigureWidget workingDays = new KeyFigureWidget("Working Days", "" + scopedEntries.size());
+
+        KeyFigureWidget remoteDays = new KeyFigureWidget(
+                "Remote Days", calculateDaysWithDayStatus.apply(scopedEntries, DayStatus.REMOTE)
+        );
+
+        KeyFigureWidget officeDays = new KeyFigureWidget(
+                "Office Days",
+                calculateDaysWithDayStatus.apply(scopedEntries, DayStatus.OFFICE)
+        );
+
+        KeyFigureWidget vacationDays = new KeyFigureWidget(
+                "Vacation Days",
+                calculateDaysWithDayStatus.apply(scopedEntries, DayStatus.VACATION)
+        );
+
+        KeyFigureWidget sickDays = new KeyFigureWidget(
+                "Sick Days",
+                calculateDaysWithDayStatus.apply(scopedEntries, DayStatus.SICK)
+        );
+
+        KeyFigureWidget deviation = new KeyFigureWidget(
+                "Deviation",
+                "" + scopedEntries.stream()
+                        .map(entry -> timeEntryService.calculateNetWorkMinutes(entry) - entry.getTargetMinutes())
+                        .reduce(0, Integer::sum)
+        );
+
+        keyFigureLayout.add(deviation, workingDays, remoteDays, officeDays, vacationDays, sickDays);
+
+        contentContainer.add(keyFigureLayout);
+    }
+
     private Component createCategoryBarChart(List<TimeEntry> entries) {
         Map<String, Long> statusCount = entries.stream()
                 .collect(Collectors.groupingBy(e -> e.getStatus().name(), Collectors.counting()));
@@ -191,6 +230,7 @@ public class MainView extends VerticalLayout {
 
         return new ChartJsComponent(
                 ChartJsComponent.generateLineChartData(scopedDates, saldoValues),
-                "Overtime Balance Over Time (in hours)");
+                "Overtime Balance Over Time (in hours)"
+        );
     }
 }

src/main/java/de/nilzbu/mytimetracker/ui/view/TimeEntryView.java

@@ -22,6 +22,7 @@ import jakarta.annotation.security.PermitAll;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Route(value = "time-entry", layout = MainLayout.class)
 @PageTitle("Time Entry")
@@ -47,10 +48,16 @@ public class TimeEntryView extends VerticalLayout {
     private final Grid<TimeEntry> entryGrid = new Grid<>(TimeEntry.class, false);
     private TimeEntry selectedEntry = null;
 
+    private final DatePicker fromDate = new DatePicker("From");
+    private final DatePicker toDate = new DatePicker("To");
+    private final Button applyFilterBtn = new Button("Apply Filter");
+
     public TimeEntryView(TimeEntryService timeEntryService, UserRepository userRepository) {
         this.timeEntryService = timeEntryService;
         this.userRepository = userRepository;
 
+        setSizeFull();
+
         initializeUser();
         configureFormFields();
         configureButtons();
@@ -58,7 +65,7 @@ public class TimeEntryView extends VerticalLayout {
 
         datePicker.addValueChangeListener(e -> toggleSaveButton());
 
-        add(buildFormLayout(), buildButtonLayout(), entryGrid);
+        add(buildFormLayout(), buildButtonLayout(), buildDateRangeFilterLayout(), entryGrid);
         refreshGrid();
         toggleSaveButton();
     }
@@ -88,6 +95,14 @@ public class TimeEntryView extends VerticalLayout {
         return new HorizontalLayout(saveBtn, updateBtn, deleteBtn);
     }
 
+    private HorizontalLayout buildDateRangeFilterLayout() {
+        applyFilterBtn.addClickListener(e -> refreshGrid());
+
+        HorizontalLayout filterLayout = new HorizontalLayout(fromDate, toDate, applyFilterBtn);
+        filterLayout.setAlignItems(Alignment.END);
+        return filterLayout;
+    }
+
     private void configureButtons() {
         saveBtn.addClickListener(e -> saveEntry());
         updateBtn.addClickListener(e -> updateEntry());
@@ -144,21 +159,39 @@ public class TimeEntryView extends VerticalLayout {
     }
 
     private void configureGrid() {
-        entryGrid.addColumn(TimeEntry::getDate).setHeader("Date");
+        entryGrid.setSizeFull();
-        entryGrid.addColumn(TimeEntry::getStartTime).setHeader("Start");
+
-        entryGrid.addColumn(TimeEntry::getEndTime).setHeader("End");
+        entryGrid.addColumn(TimeEntry::getDate).setHeader("Date").setSortable(true);
-        entryGrid.addColumn(TimeEntry::getPauseMinutes).setHeader("Break (min)");
+        entryGrid.addColumn(TimeEntry::getStartTime).setHeader("Start").setSortable(true);
-        entryGrid.addColumn(TimeEntry::getTargetMinutes).setHeader("Target (min)");
+        entryGrid.addColumn(TimeEntry::getEndTime).setHeader("End").setSortable(true);
-        entryGrid.addColumn(timeEntryService::calculateNetWorkMinutes).setHeader("Actual (min)");
+        entryGrid.addColumn(TimeEntry::getPauseMinutes).setHeader("Break (min)").setSortable(true);
-        entryGrid.addColumn(TimeEntry::getStatus).setHeader("Status");
+        entryGrid.addColumn(TimeEntry::getTargetMinutes).setHeader("Target (min)").setSortable(true);
-        entryGrid.addColumn(TimeEntry::getComment).setHeader("Comment");
+        entryGrid.addColumn(timeEntryService::calculateNetWorkMinutes).setHeader("Actual (min)").setSortable(true);
-        entryGrid.addColumn(timeEntryService::calculateDeviation).setHeader("Deviation (min)");
+        entryGrid.addColumn(TimeEntry::getStatus).setHeader("Status").setSortable(true);
+        entryGrid.addColumn(TimeEntry::getComment).setHeader("Comment").setSortable(true);
+        entryGrid.addColumn(timeEntryService::calculateDeviation).setHeader("Deviation (min)").setSortable(true);
+
+        entryGrid.getColumns().forEach(col -> col.setAutoWidth(true));
 
         entryGrid.asSingleSelect().addValueChangeListener(event -> populateForm(event.getValue()));
     }
 
     private void refreshGrid() {
-        entryGrid.setItems(timeEntryService.getEntriesForUser(currentUser));
+        List<TimeEntry> entries = timeEntryService.getEntriesForUser(currentUser);
+
+        if (fromDate.getValue() != null) {
+            entries = entries.stream()
+                    .filter(entry -> !entry.getDate().isBefore(fromDate.getValue()))
+                    .toList();
+        }
+
+        if (toDate.getValue() != null) {
+            entries = entries.stream()
+                    .filter(entry -> !entry.getDate().isAfter(toDate.getValue()))
+                    .toList();
+        }
+
+        entryGrid.setItems(entries);
     }
 
     private void populateForm(TimeEntry entry) {

src/main/java/de/nilzbu/mytimetracker/ui/widget/KeyFigureWidget.java

@@ -0,0 +1,15 @@
+package de.nilzbu.mytimetracker.ui.widget;
+
+import com.vaadin.flow.component.html.NativeLabel;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+
+public class KeyFigureWidget extends VerticalLayout {
+
+    public KeyFigureWidget(String name, String value) {
+        NativeLabel nameLabel = new NativeLabel(name + ":");
+        NativeLabel valueLabel = new NativeLabel(value);
+        valueLabel.getStyle().set("font-weight", "bold");
+        add(nameLabel, valueLabel);
+    }
+}
+