Compare commits
2 Commits
f09fee5a55
...
addRestart
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0cd0f5f4df | ||
|
|
e2e832cfcf |
14
.gitea/workflows/restart.yaml
Normal file
14
.gitea/workflows/restart.yaml
Normal file
@@ -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
|
||||
@@ -19,7 +19,6 @@ 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.jetbrains.annotations.NotNull;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
|
||||
import java.time.LocalDate;
|
||||
@@ -151,14 +150,8 @@ public class DashboardOverView extends VerticalLayout {
|
||||
chartLayout.setSpacing(true);
|
||||
|
||||
Component categoryChart = createCategoryBarChart(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.setFlexGrow(1, categoryChart);
|
||||
@@ -191,30 +184,18 @@ public class DashboardOverView extends VerticalLayout {
|
||||
calculateDaysWithDayStatus.apply(scopedEntries, DayStatus.SICK)
|
||||
);
|
||||
|
||||
KeyFigureWidget timeBalance = new KeyFigureWidget(
|
||||
"Time Balance",
|
||||
getTimeBalance(scopedEntries)
|
||||
KeyFigureWidget deviation = new KeyFigureWidget(
|
||||
"Deviation",
|
||||
"" + scopedEntries.stream()
|
||||
.map(entry -> timeEntryService.calculateNetWorkMinutes(entry) - entry.getTargetMinutes())
|
||||
.reduce(0, Integer::sum)
|
||||
);
|
||||
|
||||
keyFigureLayout.getStyle().setBackgroundColor("lightgray");
|
||||
keyFigureLayout.getStyle().setBorder("1px solid black" );
|
||||
keyFigureLayout.getStyle().setMargin("10px");
|
||||
|
||||
keyFigureLayout.add(timeBalance, workingDays, remoteDays, officeDays, vacationDays, sickDays);
|
||||
keyFigureLayout.add(deviation, workingDays, remoteDays, officeDays, vacationDays, sickDays);
|
||||
|
||||
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) {
|
||||
Map<String, Long> statusCount = entries.stream()
|
||||
.collect(Collectors.groupingBy(e -> e.getStatus().name(), Collectors.counting()));
|
||||
|
||||
Reference in New Issue
Block a user