nilzbu/mytimetracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature/2_adjust_dashboard #14

Merged
nilzbu merged 4 commits from feature/2_adjust_dashboard into master 2025-07-21 12:53:03 +00:00
Conversation 0 Commits 4 Files Changed 1 +26 -7
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f09fee5a55 - Show all commits

33
src/main/java/de/nilzbu/mytimetracker/ui/view/DashboardOverView.java
View File

@@ -19,6 +19,7 @@ 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;
@@ -150,8 +151,14 @@ public class DashboardOverView extends VerticalLayout {
chartLayout.setSpacing(true); chartLayout.setSpacing(true);
Component categoryChart = createCategoryBarChart(scopedEntries); Component categoryChart = createCategoryBarChart(scopedEntries);
Component overtimeChart = createOvertimeLineChart(allEntries, scopedEntries); categoryChart.getStyle().setBackgroundColor("lightgray");
categoryChart.getStyle().setBorder("1px solid black" );
categoryChart.getStyle().setMargin("10px");
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);
@@ -184,18 +191,30 @@ public class DashboardOverView extends VerticalLayout {
calculateDaysWithDayStatus.apply(scopedEntries, DayStatus.SICK) calculateDaysWithDayStatus.apply(scopedEntries, DayStatus.SICK)
); );
KeyFigureWidget deviation = new KeyFigureWidget( KeyFigureWidget timeBalance = new KeyFigureWidget(
"Deviation", "Time Balance",
"" + scopedEntries.stream() getTimeBalance(scopedEntries)
.map(entry -> timeEntryService.calculateNetWorkMinutes(entry) - entry.getTargetMinutes())
.reduce(0, Integer::sum)
); );
keyFigureLayout.add(deviation, workingDays, remoteDays, officeDays, vacationDays, sickDays); keyFigureLayout.getStyle().setBackgroundColor("lightgray");
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()));