4 Commits

Author SHA1 Message Date
Nils Burghardt
0cd0f5f4df change runner 2025-07-21 14:18:03 +02:00
Nils Burghardt
e2e832cfcf add restart action 2025-07-21 14:09:13 +02:00
Nils Burghardt
ea9ceaa57e remove unused method 2025-07-21 12:51:38 +02:00
Nils Burghardt
68ab7f49f1 add key figures 2025-07-21 12:32:24 +02:00
3 changed files with 8 additions and 31 deletions

View File

@@ -9,6 +9,6 @@ jobs:
steps: steps:
- name: Docker Compose Restart - name: Docker Compose Restart
run: | run: |
cd /home/docker/apps/mytimetracker cd /pfad/zum/docker-verzeichnis
docker compose down docker compose down
docker compose up -d docker compose up -d

View File

@@ -23,10 +23,6 @@ public class TimeEntryService {
return repository.findAllByUserOrderByDateDesc(user); return repository.findAllByUserOrderByDateDesc(user);
} }
public int getNumberOfEntriesForUser(User user) {
return getEntriesForUser(user).size();
}
public TimeEntry save(TimeEntry entry) { public TimeEntry save(TimeEntry entry) {
return repository.save(entry); return repository.save(entry);
} }

View File

@@ -19,7 +19,6 @@ import de.nilzbu.mytimetracker.ui.component.ChartJsComponent;
import de.nilzbu.mytimetracker.ui.layout.MainLayout; import de.nilzbu.mytimetracker.ui.layout.MainLayout;
import de.nilzbu.mytimetracker.ui.widget.KeyFigureWidget; import de.nilzbu.mytimetracker.ui.widget.KeyFigureWidget;
import jakarta.annotation.security.PermitAll; import jakarta.annotation.security.PermitAll;
import org.jetbrains.annotations.NotNull;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import java.time.LocalDate; import java.time.LocalDate;
@@ -151,14 +150,8 @@ public class DashboardOverView extends VerticalLayout {
chartLayout.setSpacing(true); chartLayout.setSpacing(true);
Component categoryChart = createCategoryBarChart(scopedEntries); Component categoryChart = createCategoryBarChart(scopedEntries);
categoryChart.getStyle().setBackgroundColor("lightgray");
categoryChart.getStyle().setBorder("1px solid black" );
categoryChart.getStyle().setMargin("10px");
Component overtimeChart = createOvertimeLineChart(allEntries, scopedEntries); Component overtimeChart = createOvertimeLineChart(allEntries, scopedEntries);
overtimeChart.getStyle().setBackgroundColor("lightgray");
overtimeChart.getStyle().setBorder("1px solid black" );
overtimeChart.getStyle().setMargin("10px");
chartLayout.add(categoryChart, overtimeChart); chartLayout.add(categoryChart, overtimeChart);
chartLayout.setFlexGrow(1, categoryChart); chartLayout.setFlexGrow(1, categoryChart);
@@ -191,30 +184,18 @@ public class DashboardOverView extends VerticalLayout {
calculateDaysWithDayStatus.apply(scopedEntries, DayStatus.SICK) calculateDaysWithDayStatus.apply(scopedEntries, DayStatus.SICK)
); );
KeyFigureWidget timeBalance = new KeyFigureWidget( KeyFigureWidget deviation = new KeyFigureWidget(
"Time Balance", "Deviation",
getTimeBalance(scopedEntries) "" + scopedEntries.stream()
.map(entry -> timeEntryService.calculateNetWorkMinutes(entry) - entry.getTargetMinutes())
.reduce(0, Integer::sum)
); );
keyFigureLayout.getStyle().setBackgroundColor("lightgray"); keyFigureLayout.add(deviation, workingDays, remoteDays, officeDays, vacationDays, sickDays);
keyFigureLayout.getStyle().setBorder("1px solid black" );
keyFigureLayout.getStyle().setMargin("10px");
keyFigureLayout.add(timeBalance, workingDays, remoteDays, officeDays, vacationDays, sickDays);
contentContainer.add(keyFigureLayout); contentContainer.add(keyFigureLayout);
} }
@NotNull
private String getTimeBalance(List<TimeEntry> scopedEntries) {
Integer minutes = scopedEntries.stream()
.map(entry -> timeEntryService.calculateNetWorkMinutes(entry) - entry.getTargetMinutes())
.reduce(0, Integer::sum);
double hours = minutes / 60.0;
return "%.2f h".formatted(hours);
}
private Component createCategoryBarChart(List<TimeEntry> entries) { private Component createCategoryBarChart(List<TimeEntry> entries) {
Map<String, Long> statusCount = entries.stream() Map<String, Long> statusCount = entries.stream()
.collect(Collectors.groupingBy(e -> e.getStatus().name(), Collectors.counting())); .collect(Collectors.groupingBy(e -> e.getStatus().name(), Collectors.counting()));