Erweitere die Tests

Reviewed-on: #30

.gitignore

@@ -2,6 +2,8 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+/.idea/*
+
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
@@ -107,3 +109,7 @@ Temporary Items
 /api/tests/_*
 /api/tests/*.suite.yml
 /api/.env
+/ui/static/print.css*
+/ui/static/global.css*
+/ui/static/bundle.css*
+/ui/.svelte-kit/

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-apache
+FROM php:8.4-apache-bookworm
 
 RUN apt update && apt install -y libpq-dev
 RUN docker-php-ext-install -j$(nproc) pdo pdo_pgsql

api/composer.json

@@ -16,21 +16,22 @@
         }
     ],
     "require": {
+        "php": "8.4.*",
         "slim/slim": "^4.7.1",
-        "vlucas/phpdotenv": "^4.2",
+        "vlucas/phpdotenv": "^v5.6.1",
-        "slim/psr7": "^1.3",
+        "slim/psr7": "^1.7.0",
         "php-di/slim-bridge": "^3.1.0",
         "jetbrains/phpstorm-attributes": "^1.0.0",
         "myclabs/php-enum": "^1.8.0",
         "ext-pdo": "*"
     },
     "require-dev": {
-        "phpstan/phpstan": "^0.12.80",
+        "phpstan/phpstan": "^2.1.12",
-        "codeception/codeception": "^4.1.18",
+        "codeception/codeception": "^5.2.1",
-        "codeception/module-phpbrowser": "^1.0.0",
+        "codeception/module-phpbrowser": "^3.0.1",
-        "codeception/module-asserts": "^1.0.0",
+        "codeception/module-asserts": "^3.1.0",
-        "codeception/module-db": "^1.1.0",
+        "codeception/module-db": "^3.2.2",
-        "codeception/module-rest": "^1.2.8"
+        "codeception/module-rest": "^3.4.1"
     },
     "autoload": {
         "psr-4": {

api/html/index.php

@@ -17,7 +17,7 @@ use TorstenHettstedt\TimekeepingApi\Middleware\OriginAccessControlHandler;
 $container = new Container();
 
 $container->set('databases', function () {
-    $dsn = "pgsql:host=${_ENV['DATABASES_HOST']};port=5432;dbname=${_ENV['DATABASES_NAME']}";
+    $dsn = "pgsql:host={$_ENV['DATABASES_HOST']};port=5432;dbname={$_ENV['DATABASES_NAME']}";
     return new PDO($dsn, $_ENV['DATABASES_USER'], $_ENV['DATABASES_PASS']);
 });
 

api/html/openapi.json

@@ -4,7 +4,7 @@
     "title": "Zeiterfassung App",
     "contact": {
       "name": "Torsten Lücke",
-      "url": "http://torsten-hettstedt.de",
+      "url": "https://torsten-hettstedt.de",
       "email": "arbeit@torsten-hettstedt.de"
     },
     "license": {
@@ -188,6 +188,10 @@
             "type": "string",
             "pattern": "[0-5]\\d:[0-5]\\d:[0-5]\\d",
             "example": "08:01:00"
+          },
+          "isHomeOffice": {
+            "description": "Wurde an diesem Tag zuhause gearbeitet?",
+            "type": "boolean"
           }
         }
       },
@@ -217,6 +221,10 @@
             "description": "Arbeitstage im Zeitraum",
             "type": "integer"
           },
+          "homeOfficeDays": {
+            "description": "Anzahl der Tage, an denen zuhause gearbeitet wurde.",
+            "type": "number"
+          },
           "overtime": {
             "description": "Überstunden im Zeitraum",
             "type": "string",

api/src/Controller/AbstractController.php

@@ -4,7 +4,9 @@ namespace TorstenHettstedt\TimekeepingApi\Controller;
 
 use JsonSerializable;
 use PDO;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Slim\Psr7\Response;
 
 abstract class AbstractController
@@ -18,6 +20,8 @@ abstract class AbstractController
      * @param ContainerInterface $container
      *
      * @throws NotDatabasesException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function __construct(ContainerInterface $container)
     {
@@ -34,7 +38,8 @@ abstract class AbstractController
      *
      * @return Response
      */
-    protected function printResponse(Response $response, mixed $data, int $status_code): Response {
+    protected function printResponse(Response $response, mixed $data, int $status_code): Response
+    {
         $payload = json_encode($data);
 
         $response->getBody()->write($payload);

api/src/Controller/HttpConflictRequestException.php

@@ -8,13 +8,8 @@ class HttpConflictRequestException extends HttpSpecializedException
 {
     /** @var int */
     protected $code = 409;
-
     /** @var string */
     protected $message = 'Conflict.';
-
+    protected string $title = '409 Conflict';
-    /** @var string  */
+    protected string $description = 'The 409 (Conflict) status code indicates that the request could not be completed due to a conflict with the current state of the target resource.';
-    protected $title = '409 Conflict';
-
-    /** @var string  */
-    protected $description = 'The 409 (Conflict) status code indicates that the request could not be completed due to a conflict with the current state of the target resource.';
 }

api/src/Controller/PreflightController.php

@@ -11,6 +11,7 @@ use TorstenHettstedt\TimekeepingApi\Middleware\OriginAccessControlHandler;
 
 class PreflightController
 {
+    /** @noinspection PhpUnused */
     public function preflight(Request $request, Response $response): ResponseInterface
     {
         return (new OriginAccessControlHandler())->originAccessControl($request, $response);

api/src/Controller/WorkingHoursController.php

@@ -23,7 +23,7 @@ class WorkingHoursController extends AbstractController
     /**
      * @param Request              $request
      * @param Response             $response
-     * @param mixed[]  $args
+     * @param array<string, mixed> $args
      *
      * @return Response
      *
@@ -34,7 +34,7 @@ class WorkingHoursController extends AbstractController
     {
         $body = $request->getParsedBody();
         $repository = new WorkingHoursRepository($this->databases);
-        $model = $this->buildModel($request, $args['id'], $body['workingTime']);
+        $model = $this->buildModel($request, $args['id'], $body['workingTime'], $body['isHomeOfficeDay'] ?? false);
         try {
             $repository->update($model);
         } catch (RepositoryRecordNotFoundException $exception) {
@@ -46,7 +46,7 @@ class WorkingHoursController extends AbstractController
     /**
      * @param Request              $request
      * @param Response             $response
-     * @param mixed[]  $args
+     * @param array<string, mixed> $args
      *
      * @return Response
      *
@@ -59,21 +59,29 @@ class WorkingHoursController extends AbstractController
         $repository = new WorkingHoursRepository($this->databases);
         $queryParams = $request->getQueryParams();
         try {
-            return $this->printResponse($response, $repository->findFiltered(
+            return $this->printResponse(
+                $response,
+                $repository->findFiltered(
                     $queryParams['start-date'] ?? null,
                     $queryParams['end-date'] ?? null
-            ), StatusCodeInterface::STATUS_OK);
+                ),
+                StatusCodeInterface::STATUS_OK
+            );
         } catch (RepositoryBadWhereDataException $exception) {
             throw new HttpBadRequestException($request, 'Ein Wert für das Datum im Query ist ungültig', $exception);
         } catch (Exception $exception) {
-            throw new HttpInternalServerErrorException($request, 'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception);
+            throw new HttpInternalServerErrorException(
+                $request,
+                'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank',
+                $exception
+            );
         }
     }
 
     /**
      * @param Request              $request
      * @param Response             $response
-     * @param mixed[]  $args
+     * @param array<string, mixed> $args
      *
      * @return Response
      *
@@ -88,14 +96,18 @@ class WorkingHoursController extends AbstractController
         } catch (RepositoryRecordNotFoundException $exception) {
             throw new HttpNotFoundException($request, 'Der Eintrag ist nicht vorhanden.', $exception);
         } catch (Exception $exception) {
-            throw new HttpInternalServerErrorException($request, 'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception);
+            throw new HttpInternalServerErrorException(
+                $request,
+                'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank',
+                $exception
+            );
         }
     }
 
     /**
      * @param Request              $request
      * @param Response             $response
-     * @param mixed[]  $args
+     * @param array<string, mixed> $args
      *
      * @return Response
      *
@@ -108,13 +120,22 @@ class WorkingHoursController extends AbstractController
     {
         $body = $request->getParsedBody();
         $repository = new WorkingHoursRepository($this->databases);
-        $model = $this->buildModel($request, $body['workingDay'], $body['workingTime']);
+        $model = $this->buildModel(
+            $request,
+            $body['workingDay'],
+            $body['workingTime'],
+            $body['isHomeOfficeDay'] ?? false
+        );
         try {
             $repository->insert($model);
         } catch (RepositoryRecordAlreadyExistException $exception) {
             throw new HttpConflictRequestException($request, 'Der Eintrag ist schon vorhanden.', $exception);
         } catch (Exception $exception) {
-            throw new HttpInternalServerErrorException($request, 'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception);
+            throw new HttpInternalServerErrorException(
+                $request,
+                'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank',
+                $exception
+            );
         }
         return $this->printResponse($response, $model, StatusCodeInterface::STATUS_CREATED);
     }
@@ -127,7 +148,7 @@ class WorkingHoursController extends AbstractController
      * @return WorkingHours
      * @throws HttpBadRequestException
      */
-    protected function buildModel(Request $request, string $date, string $time): WorkingHours
+    protected function buildModel(Request $request, string $date, string $time, bool $isHomeOffice): WorkingHours
     {
         try {
             $workingDay = new DateTime($date);
@@ -139,7 +160,10 @@ class WorkingHoursController extends AbstractController
         } catch (Exception $exception) {
             throw new HttpBadRequestException($request, 'Der Wert für die Zeit ist falsch', $exception);
         }
-        return (new WorkingHours())->setWorkingDay($workingDay)->setWorkingTime($workingTime);
+        return (new WorkingHours())
+            ->setWorkingDay($workingDay)
+            ->setWorkingTime($workingTime)
+            ->setIsHomeOffice($isHomeOffice);
     }
 
 }

api/src/Controller/WorkingHoursViewController.php

@@ -17,7 +17,7 @@ class WorkingHoursViewController extends AbstractController
     /**
      * @param Request              $request
      * @param Response             $response
-     * @param mixed[]  $args
+     * @param array<string, mixed> $args
      *
      * @return Response
      *
@@ -30,15 +30,17 @@ class WorkingHoursViewController extends AbstractController
         try {
             return $this->printResponse($response, $repository->findAll(), StatusCodeInterface::STATUS_OK);
         } catch (Exception $exception) {
-            throw new HttpInternalServerErrorException($request,
+            throw new HttpInternalServerErrorException(
-                'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception);
+                $request,
+                'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception
+            );
         }
     }
 
     /**
      * @param Request              $request
      * @param Response             $response
-     * @param mixed[]  $args
+     * @param array<string, mixed> $args
      *
      * @return Response
      *
@@ -51,15 +53,17 @@ class WorkingHoursViewController extends AbstractController
         try {
             return $this->printResponse($response, $repository->findAll(), StatusCodeInterface::STATUS_OK);
         } catch (Exception $exception) {
-            throw new HttpInternalServerErrorException($request,
+            throw new HttpInternalServerErrorException(
-                'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception);
+                $request,
+                'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception
+            );
         }
     }
 
     /**
      * @param Request              $request
      * @param Response             $response
-     * @param mixed[]  $args
+     * @param array<string, mixed> $args
      *
      * @return Response
      *
@@ -72,8 +76,10 @@ class WorkingHoursViewController extends AbstractController
         try {
             return $this->printResponse($response, $repository->findAll(), StatusCodeInterface::STATUS_OK);
         } catch (Exception $exception) {
-            throw new HttpInternalServerErrorException($request,
+            throw new HttpInternalServerErrorException(
-                'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception);
+                $request,
+                'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception
+            );
         }
     }
 

api/src/Middleware/ErrorHandler.php

@@ -1,10 +1,12 @@
-<?php /** @noinspection PhpUndefinedClassInspection */
+<?php
+/** @noinspection PhpUndefinedClassInspection */
 
 
 namespace TorstenHettstedt\TimekeepingApi\Middleware;
 
 
 use JetBrains\PhpStorm\ArrayShape;
+use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
@@ -14,12 +16,15 @@ use Throwable;
 
 class ErrorHandler
 {
+    /**
+     * @var App<ContainerInterface>
+     */
     protected App $app;
 
     /**
      * ErrorHandler constructor.
      *
-     * @param App $app
+     * @param App<ContainerInterface> $app
      */
     public function __construct(App $app)
     {
@@ -29,7 +34,7 @@ class ErrorHandler
     /**
      * @param Throwable $exception
      *
-     * @return mixed[]
+     * @return array<string, mixed>
      */
     #[ArrayShape([
         'timestamp' => "false|string",
@@ -71,8 +76,7 @@ class ErrorHandler
         bool $logErrors,
         bool $logErrorDetails,
         ?LoggerInterface $logger = null
-    ): ResponseInterface
+    ): ResponseInterface {
-    {
         if ($logger !== null && $logErrors === true) {
             $logger->error($exception->getMessage());
         }

api/src/Middleware/JsonBodyParserMiddleware.php

@@ -13,7 +13,7 @@ class JsonBodyParserMiddleware implements MiddlewareInterface
     {
         $contentType = $request->getHeaderLine('Content-Type');
 
-        if (strstr($contentType, 'application/json')) {
+        if (str_contains($contentType, 'application/json')) {
             $contents = json_decode(file_get_contents('php://input'), true);
             if (json_last_error() === JSON_ERROR_NONE) {
                 $request = $request->withParsedBody($contents);

api/src/Middleware/OriginAccessControlHandler.php

@@ -28,7 +28,6 @@ class OriginAccessControlHandler implements MiddlewareInterface
 
     public function originAccessControl(Request $request, Response $response): Response
     {
-
         $routeContext = RouteContext::fromRequest($request);
         $routingResults = $routeContext->getRoutingResults();
         $methods = $routingResults->getAllowedMethods();
@@ -53,6 +52,6 @@ class OriginAccessControlHandler implements MiddlewareInterface
 
     protected function buildOrigin(Request $request): string
     {
-        return $request->getHeaderLine('Origin') ?? '';
+        return $request->getHeaderLine('Origin');
     }
 }

api/src/Models/PeriodDesignationEnum.php

@@ -1,23 +1,16 @@
-<?php /** @noinspection PhpUnusedPrivateFieldInspection */
+<?php
+/** @noinspection PhpUnusedPrivateFieldInspection */
 
 
 namespace TorstenHettstedt\TimekeepingApi\Models;
 
-use MyCLabs\Enum\Enum;
-
 /**
  * Enum-Klasse für die unterstützten Periode-Definitionen.
  * Der Wert der Periode ist ein Format-String für {@link https://secure.php.net/manual/en/datetime.format.php}.
- *
- * @extends Enum<string>
- *
- * @method static PeriodDesignationEnum WEEKLY()
- * @method static PeriodDesignationEnum MONTHLY()
- * @method static PeriodDesignationEnum YEARLY()
  */
-class PeriodDesignationEnum extends Enum
+enum PeriodDesignationEnum: string
 {
-    private const WEEKLY = 'Y#W';
+    case WEEKLY  = 'Y#W';
-    private const MONTHLY = 'Y-m';
+    case MONTHLY = 'Y-m';
-    private const YEARLY = 'Y';
+    case YEARLY  = 'Y';
 }

api/src/Models/WorkingHours.php

@@ -12,54 +12,51 @@ class WorkingHours implements ModelInterface
 {
     protected ?DateTime $workingDay = null;
     protected ?DateInterval $workingTime = null;
+    protected bool $isHomeOffice = false;
 
-    /**
-     * @return DateTime|null
-     */
     public function getWorkingDay(): ?DateTime
     {
         return $this->workingDay;
     }
 
-    /**
+    public function setWorkingDay(DateTime $workingDay): static
-     * @param DateTime $workingDay
-     *
-     * @return WorkingHours
-     */
-    public function setWorkingDay(DateTime $workingDay): WorkingHours
     {
         $this->workingDay = $workingDay;
         return $this;
     }
 
-    /**
-     * @return DateInterval|null
-     */
     public function getWorkingTime(): ?DateInterval
     {
         return $this->workingTime;
     }
 
-    /**
+    public function setWorkingTime(DateInterval $workingTime): static
-     * @param DateInterval $workingTime
-     *
-     * @return WorkingHours
-     */
-    public function setWorkingTime(DateInterval $workingTime): WorkingHours
     {
         $this->workingTime = $workingTime;
         return $this;
     }
 
+    public function isHomeOffice(): bool
+    {
+        return $this->isHomeOffice;
+    }
+
+    public function setIsHomeOffice(bool $isHomeOffice): WorkingHours
+    {
+        $this->isHomeOffice = $isHomeOffice;
+        return $this;
+    }
+
     /**
      * @return array<string, string>
      */
-    #[ArrayShape(['workingDay' => "string", 'workingTime' => "string"])]
+    #[ArrayShape(['workingDay' => "string", 'workingTime' => "string", 'isHomeOffice' => "boolean"])]
     public function jsonSerialize(): array
     {
         return [
             'workingDay' => $this->getWorkingDay()->format('Y-m-d'),
-            'workingTime' => $this->getWorkingTime()->format('%H:%I:%S')
+            'workingTime' => $this->getWorkingTime()->format('%H:%I:%S'),
+            'isHomeOffice' => $this->isHomeOffice(),
         ];
     }
 }

api/src/Models/WorkingHoursView.php

@@ -10,93 +10,62 @@ use JetBrains\PhpStorm\ArrayShape;
 
 class WorkingHoursView implements ModelInterface
 {
-    protected DateTimeInterface $period;
-    protected PeriodDesignationEnum $periodDesignation;
-    protected int $workingDays;
-    protected DateInterval $totalHours;
-    protected DateInterval $overtime;
 
-    /**
-     * WorkingHoursView constructor.
-     *
-     * @param DateTimeInterface     $period
-     * @param PeriodDesignationEnum $periodDesignation
-     * @param int                   $workingDays
-     * @param DateInterval          $totalHours
-     * @param DateInterval          $overtime
-     */
     public function __construct(
-        DateTimeInterface $period,
+        protected DateTimeInterface $period,
-        PeriodDesignationEnum $periodDesignation,
+        protected PeriodDesignationEnum $periodDesignation,
-        int $workingDays,
+        protected int $workingDays,
-        DateInterval $totalHours,
+        protected DateInterval $totalHours,
-        DateInterval $overtime
+        private int $homeOfficeDays,
+        protected DateInterval $overtime
     ) {
-        $this->period = $period;
-        $this->periodDesignation = $periodDesignation;
-        $this->workingDays = $workingDays;
-        $this->totalHours = $totalHours;
-        $this->overtime = $overtime;
     }
 
-    /**
-     * @return DateTimeInterface
-     */
     public function getPeriod(): DateTimeInterface
     {
         return $this->period;
     }
 
-    /**
-     * @return PeriodDesignationEnum
-     */
     public function getPeriodDesignation(): PeriodDesignationEnum
     {
         return $this->periodDesignation;
     }
 
-    /**
-     * @return int
-     */
     public function getWorkingDays(): int
     {
         return $this->workingDays;
     }
 
-    /**
+    public function getHomeOfficeDays(): int
-     * @return DateInterval
+    {
-     */
+        return $this->homeOfficeDays;
+    }
+
     public function getTotalHours(): DateInterval
     {
         return $this->totalHours;
     }
 
-    /**
-     * @return DateInterval
-     */
     public function getOvertime(): DateInterval
     {
         return $this->overtime;
     }
 
-    /**
-     * @inheritDoc
-     *
-     * @return array<string, mixed>
-     */
     #[ArrayShape(['period'            => "string",
                   'periodDesignation' => "string",
                   'totalHours'        => "string",
                   'workingDays'       => "int",
+                  'homeOfficeDays'    => "int",
                   'overtime'          => "string"
     ])] public function jsonSerialize(): array
     {
         $formatOvertime = (($this->getOvertime()->invert === 1) ? '-' : '') . '%H:%I:%S';
         return [
-            'period'            => $this->getPeriod()->format($this->getPeriodDesignation()->getValue()),
+            'period'            => $this->getPeriod()->format($this->getPeriodDesignation()->value),
-            'periodDesignation' => strtolower($this->getPeriodDesignation()->getKey()),
+            'periodDesignation' => strtolower($this->getPeriodDesignation()->name),
             'workingDays'       => $this->getWorkingDays(),
             'totalHours'        => $this->getTotalHours()->format('%H:%I:%S'),
+            'homeOfficeDays'    => $this->getHomeOfficeDays(),
             'overtime'          => $this->getOvertime()->format($formatOvertime)
         ];
     }

api/src/Repositories/AbstractWorkingHoursViewRepository.php

@@ -20,7 +20,6 @@ abstract class AbstractWorkingHoursViewRepository implements RepositoryReaderInt
     protected const SQL_SELECT = '';
     protected const SQL_WHERE  = '';
 
-    protected PDO                   $database;
     protected PeriodDesignationEnum $periodDesignation;
 
     /**
@@ -28,9 +27,8 @@ abstract class AbstractWorkingHoursViewRepository implements RepositoryReaderInt
      *
      * @param PDO $database
      */
-    public function __construct(PDO $database)
+    public function __construct(protected PDO $database)
     {
-        $this->database = $database;
         $this->database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
     }
 
@@ -53,6 +51,7 @@ abstract class AbstractWorkingHoursViewRepository implements RepositoryReaderInt
                 $this->periodDesignation,
                 (int) $row['workingDays'],
                 $this->buildDateInterval($row['totalHours']),
+                (int) $row['homeOfficeDays'],
                 $this->buildDateInterval($row['overtime'])
             );
             $models[] = $model;
@@ -84,6 +83,7 @@ abstract class AbstractWorkingHoursViewRepository implements RepositoryReaderInt
             $this->periodDesignation,
             (int)$row['workingDays'],
             $this->buildDateInterval($row['totalHours']),
+            (int)$row['homeOfficeDays'],
             $this->buildDateInterval($row['overtime'])
         );
     }

api/src/Repositories/RepositoryReaderInterface.php

@@ -3,8 +3,10 @@
 
 namespace TorstenHettstedt\TimekeepingApi\Repositories;
 
+use TorstenHettstedt\TimekeepingApi\Models\ModelInterface;
+
 /**
- * @template T of \TorstenHettstedt\TimekeepingApi\Models\ModelInterface
+ * @template T of ModelInterface
  */
 interface RepositoryReaderInterface
 {

api/src/Repositories/RepositoryWriterInterface.php

@@ -3,8 +3,10 @@
 
 namespace TorstenHettstedt\TimekeepingApi\Repositories;
 
+use TorstenHettstedt\TimekeepingApi\Models\ModelInterface;
+
 /**
- * @template T of \TorstenHettstedt\TimekeepingApi\Models\ModelInterface
+ * @template T of ModelInterface
  */
 interface RepositoryWriterInterface
 {

api/src/Repositories/WorkingHoursMonthlyViewRepository.php

@@ -17,18 +17,16 @@ class WorkingHoursMonthlyViewRepository extends AbstractWorkingHoursViewReposito
             "Monat" as "period",
             "Gesamtarbeitszeit" as "totalHours",
             "Arbeitstage" as "workingDays",
+            "Home-Office-Tage" as "homeOfficeDays",
             "Überstunden" as "overtime"
         from "Arbeitszeiten - Monat"
 SQL;
-    protected const SQL_WHERE = ' where "Monat" = ?';
+    protected const string SQL_WHERE  = ' where "Monat" = ?';
-
-    protected PDO                   $database;
-    protected PeriodDesignationEnum $periodDesignation;
 
     public function __construct(PDO $database)
     {
         parent::__construct($database);
-        $this->periodDesignation = PeriodDesignationEnum::MONTHLY();
+        $this->periodDesignation = PeriodDesignationEnum::MONTHLY;
     }
 
     protected function buildDateFromPeriod(string $period): DateTimeInterface

api/src/Repositories/WorkingHoursRepository.php

@@ -20,17 +20,17 @@ use TorstenHettstedt\TimekeepingApi\Models\WorkingHours;
  */
 class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWriterInterface
 {
+    protected const string SQL_SELECT = <<<'SQL'
+select
+    "Datum" as "workingDay",
+    "Arbeitszeit" as "workingTime",
+    "HomeOffice" as "isHomeOfficeDay"
+from public."Arbeitszeiten"
+SQL;
 
-    protected PDO $database;
 
-    /**
+    public function __construct(protected PDO $database)
-     * WorkingHoursRepository constructor.
-     *
-     * @param PDO $database
-     */
-    public function __construct(PDO $database)
     {
-        $this->database = $database;
         $this->database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
     }
 
@@ -74,7 +74,8 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
             $model = new WorkingHours();
             $model
                 ->setWorkingDay(new DateTime($row['workingDay']))
-                ->setWorkingTime(new DateInterval('P0000-00-00T' . $row['workingTime']));
+                ->setWorkingTime(new DateInterval('P0000-00-00T' . $row['workingTime']))
+                ->setIsHomeOffice($row['isHomeOfficeDay']);
             $models[] = $model;
         }
         return $models;
@@ -96,7 +97,7 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
 
     protected function buildFindFilteredStatement(?string $start, ?string $end): ?PDOStatement
     {
-        $query = 'select "Datum" as "workingDay", "Arbeitszeit" as "workingTime" from public."Arbeitszeiten" ';
+        $query = static::SQL_SELECT . ' ';
         $query .= $this->buildFilterString($start, $end);
         $query .= 'order by "Datum"';
         $stmt = $this->database->prepare($query);
@@ -106,7 +107,7 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
         if (is_string($end)) {
             $stmt->bindParam(':end', $end);
         }
-        return $stmt ?? null;
+        return $stmt ?: null;
     }
 
     /**
@@ -121,7 +122,7 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
      */
     public function findByKey(mixed $primary_key): WorkingHours
     {
-        $stmt = $this->database->prepare('select "Datum" as "workingDay", "Arbeitszeit" as "workingTime" from public."Arbeitszeiten" where "Datum" = ?');
+        $stmt = $this->database->prepare(static::SQL_SELECT  . ' where "Datum" = ?');
         $stmt->bindParam(1, $primary_key);
         $stmt->execute();
         $row = $stmt->fetch();
@@ -131,7 +132,8 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
         $model = new WorkingHours();
         $model
             ->setWorkingDay(new DateTime($row['workingDay']))
-            ->setWorkingTime(new DateInterval('P0000-00-00T' . $row['workingTime']));
+            ->setWorkingTime(new DateInterval('P0000-00-00T' . $row['workingTime']))
+            ->setIsHomeOffice($row['isHomeOfficeDay']);
         return $model;
     }
 
@@ -146,6 +148,7 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
         if ($model instanceof WorkingHours) {
             $workingDay = $model->getWorkingDay()->format('Y-m-d');
             $workingTime = $model->getWorkingTime()->format('%H:%I:%S');
+            $isHomeOffice = $model->isHomeOffice();
         } else {
             throw new InvalidArgumentException('Es wird ein Modell der Klasse "' . WorkingHours::class . '" verlangt.');
         }
@@ -155,9 +158,15 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
             throw new RepositoryRecordAlreadyExistException();
         } /** @noinspection PhpUnusedLocalVariableInspection */
         catch (RepositoryRecordNotFoundException $exception) {
-            $stmt = $this->database->prepare('insert into  public."Arbeitszeiten" ("Datum", "Arbeitszeit") values (?, ?) on conflict do nothing');
+            $stmt = $this->database->prepare(<<<'SQL'
+insert into  public."Arbeitszeiten" ("Datum", "Arbeitszeit", "HomeOffice")
+values (?, ?, ?)
+on conflict do nothing
+SQL
+);
             $stmt->bindParam(1, $workingDay);
             $stmt->bindParam(2, $workingTime);
+            $stmt->bindParam(3, $isHomeOffice, PDO::PARAM_BOOL);
             $stmt->execute();
         }
     }
@@ -172,12 +181,19 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
         if ($model instanceof WorkingHours) {
             $workingDay = $model->getWorkingDay()->format('Y-m-d');
             $workingTime = $model->getWorkingTime()->format('%H:%I:%S');
+            $isHomeOffice = $model->isHomeOffice();
         } else {
             throw new InvalidArgumentException('Es wird ein Modell der Klasse "' . WorkingHours::class . '" verlangt.');
         }
-        $stmt = $this->database->prepare('update public."Arbeitszeiten" set "Arbeitszeit" = ? where "Datum" = ?');
+        $stmt = $this->database->prepare(<<<'SQL'
+update public."Arbeitszeiten"
+set "Arbeitszeit" = ?, "HomeOffice" = ?
+where "Datum" = ?
+SQL
+);
         $stmt->bindParam(1, $workingTime);
-        $stmt->bindParam(2, $workingDay);
+        $stmt->bindParam(2, $isHomeOffice, PDO::PARAM_BOOL);
+        $stmt->bindParam(3, $workingDay);
         $stmt->execute();
         if ($stmt->rowCount() < 1) {
             throw new RepositoryRecordNotFoundException();

api/src/Repositories/WorkingHoursWeeklyViewRepository.php

@@ -11,23 +11,21 @@ use TorstenHettstedt\TimekeepingApi\Models\PeriodDesignationEnum;
 class WorkingHoursWeeklyViewRepository extends AbstractWorkingHoursViewRepository
 {
 
-    protected const SQL_SELECT = <<<SQL
+    protected const string SQL_SELECT = <<<SQL
         select
             "Woche" as "period",
             "Gesamtarbeitszeit" as "totalHours",
             "Arbeitstage" as "workingDays",
+            "Home-Office-Tage" as "homeOfficeDays",
             "Überstunden" as "overtime"
         from "Arbeitszeiten - Woche"
 SQL;
-    protected const SQL_WHERE = ' where "Woche" = ?';
+    protected const string SQL_WHERE  = ' where "Woche" = ?';
-
-    protected PDO                   $database;
-    protected PeriodDesignationEnum $periodDesignation;
 
     public function __construct(PDO $database)
     {
         parent::__construct($database);
-        $this->periodDesignation = PeriodDesignationEnum::WEEKLY();
+        $this->periodDesignation = PeriodDesignationEnum::WEEKLY;
     }
 
     protected function buildDateFromPeriod(string $period): DateTimeInterface

api/src/Repositories/WorkingHoursYearlyViewRepository.php

@@ -11,23 +11,21 @@ use TorstenHettstedt\TimekeepingApi\Models\PeriodDesignationEnum;
 class WorkingHoursYearlyViewRepository extends AbstractWorkingHoursViewRepository
 {
 
-    protected const SQL_SELECT = <<<SQL
+    protected const string SQL_SELECT = <<<SQL
         select
             "Jahr" as "period",
             "Gesamtarbeitszeit" as "totalHours",
             "Arbeitstage" as "workingDays",
+            "Home-Office-Tage" as "homeOfficeDays",
             "Überstunden" as "overtime"
         from "Arbeitszeiten - Jahr"
 SQL;
-    protected const SQL_WHERE = ' where "Jahr" = ?';
+    protected const string SQL_WHERE  = ' where "Jahr" = ?';
-
-    protected PDO                   $database;
-    protected PeriodDesignationEnum $periodDesignation;
 
     public function __construct(PDO $database)
     {
         parent::__construct($database);
-        $this->periodDesignation = PeriodDesignationEnum::YEARLY();
+        $this->periodDesignation = PeriodDesignationEnum::YEARLY;
     }
 
     /**

api/tests/_data/dump.sql

@@ -13,23 +13,26 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
-DROP TABLE IF EXISTS public."Arbeitszeiten";
 DROP VIEW IF EXISTS public."Arbeitszeiten - Woche";
 DROP VIEW IF EXISTS public."Arbeitszeiten - Monat";
 DROP VIEW IF EXISTS public."Arbeitszeiten - Jahr";
+DROP TABLE IF EXISTS public."Arbeitszeiten";
 
 --
 -- Name: Arbeitszeiten; Type: TABLE; Schema: public; Owner: torsten
 --
 
-CREATE TABLE public."Arbeitszeiten" (
+CREATE TABLE public."Arbeitszeiten"
+(
     "Datum"       date                  not null,
     "Arbeitszeit" interval(6)           null,
+    "HomeOffice"  boolean default FALSE not null,
     constraint "Arbeitszeiten_pkey" primary key ("Datum")
 );
 
 
-ALTER TABLE public."Arbeitszeiten" OWNER TO bruce;
+ALTER TABLE public."Arbeitszeiten"
+    OWNER TO bruce;
 
 --
 -- Name: Arbeitszeiten - Jahr; Type: VIEW; Schema: public; Owner: torsten
@@ -37,112 +40,126 @@ ALTER TABLE public."Arbeitszeiten" OWNER TO bruce;
 
 CREATE OR REPLACE VIEW public."Arbeitszeiten - Jahr" AS
 SELECT (date_part('year'::text, "Arbeitszeiten"."Datum"))::text                      AS "Jahr",
-           sum("Arbeitszeiten"."Arbeitszeit") AS "Gesamtarbeitszeit",
+       sum("Arbeitszeiten"."Arbeitszeit")::interval                                  AS "Gesamtarbeitszeit",
-           count("Arbeitszeiten"."Datum") AS "Arbeitstage",
+       count("Arbeitszeiten"."Datum")::bigint                                        AS "Arbeitstage",
-           (sum("Arbeitszeiten"."Arbeitszeit") - ((count("Arbeitszeiten"."Datum"))::double precision * '08:00:00'::interval)) AS "Überstunden"
+       (sum("Arbeitszeiten"."Arbeitszeit") -
+        ((count("Arbeitszeiten"."Datum"))::double precision * '08:00:00'::interval)) AS "Überstunden",
+       (count(*) filter (where "Arbeitszeiten"."HomeOffice"))::int                   as "Home-Office-Tage"
 FROM public."Arbeitszeiten"
 GROUP BY (date_part('year'::text, "Arbeitszeiten"."Datum"))
 ORDER BY (date_part('year'::text, "Arbeitszeiten"."Datum"));
 
 
-ALTER TABLE public."Arbeitszeiten - Jahr" OWNER TO bruce;
+ALTER TABLE public."Arbeitszeiten - Jahr"
+    OWNER TO bruce;
 
 --
 -- Name: Arbeitszeiten - Monat; Type: VIEW; Schema: public; Owner: torsten
 --
 
 CREATE OR REPLACE VIEW public."Arbeitszeiten - Monat" AS
-    SELECT to_char(date_trunc('month'::text, ("Arbeitszeiten"."Datum")::timestamp with time zone), 'TMYYYY TMMonth'::text) AS "Monat",
+SELECT to_char(date_trunc('month'::text, ("Arbeitszeiten"."Datum")::timestamp with time zone),
-           sum("Arbeitszeiten"."Arbeitszeit") AS "Gesamtarbeitszeit",
+               'TMYYYY TMMonth'::text)                                               AS "Monat",
-           count("Arbeitszeiten"."Datum") AS "Arbeitstage",
+       sum("Arbeitszeiten"."Arbeitszeit")::interval                                  AS "Gesamtarbeitszeit",
-           (sum("Arbeitszeiten"."Arbeitszeit") - ((count("Arbeitszeiten"."Datum"))::double precision * '08:00:00'::interval)) AS "Überstunden"
+       count("Arbeitszeiten"."Datum")::bigint                                        AS "Arbeitstage",
+       (sum("Arbeitszeiten"."Arbeitszeit") -
+        ((count("Arbeitszeiten"."Datum"))::double precision * '08:00:00'::interval)) AS "Überstunden",
+       (count(*) filter (where "Arbeitszeiten"."HomeOffice"))::int                   as "Home-Office-Tage"
 FROM public."Arbeitszeiten"
 GROUP BY (date_trunc('month'::text, ("Arbeitszeiten"."Datum")::timestamp with time zone))
 ORDER BY (date_trunc('month'::text, ("Arbeitszeiten"."Datum")::timestamp with time zone));
 
 
-ALTER TABLE public."Arbeitszeiten - Monat" OWNER TO bruce;
+ALTER TABLE public."Arbeitszeiten - Monat"
+    OWNER TO bruce;
 
 --
 -- Name: Arbeitszeiten - Woche; Type: VIEW; Schema: public; Owner: torsten
 --
 
 CREATE OR REPLACE VIEW public."Arbeitszeiten - Woche" AS
-    SELECT to_char(date_trunc('week'::text, ("Arbeitszeiten"."Datum")::timestamp with time zone), 'TMYYYY#WW'::text) AS "Woche",
+SELECT to_char(date_trunc('week'::text, ("Arbeitszeiten"."Datum")::timestamp with time zone),
-           sum("Arbeitszeiten"."Arbeitszeit") AS "Gesamtarbeitszeit",
+               'TMYYYY#WW'::text)                                                    AS "Woche",
-           count("Arbeitszeiten"."Datum") AS "Arbeitstage",
+       sum("Arbeitszeiten"."Arbeitszeit")::interval                                  AS "Gesamtarbeitszeit",
-           (sum("Arbeitszeiten"."Arbeitszeit") - ((count("Arbeitszeiten"."Datum"))::double precision * '08:00:00'::interval)) AS "Überstunden"
+       count("Arbeitszeiten"."Datum")::bigint                                        AS "Arbeitstage",
+       (sum("Arbeitszeiten"."Arbeitszeit") -
+        ((count("Arbeitszeiten"."Datum"))::double precision * '08:00:00'::interval)) AS "Überstunden",
+       (count(*) filter (where "Arbeitszeiten"."HomeOffice"))::int                   as "Home-Office-Tage"
 FROM public."Arbeitszeiten"
 GROUP BY (date_trunc('week'::text, ("Arbeitszeiten"."Datum")::timestamp with time zone))
 ORDER BY (date_trunc('week'::text, ("Arbeitszeiten"."Datum")::timestamp with time zone));
 
 
-ALTER TABLE public."Arbeitszeiten - Woche" OWNER TO bruce;
+ALTER TABLE public."Arbeitszeiten - Woche"
+    OWNER TO bruce;
 
 --
 -- Data for Name: Arbeitszeiten; Type: TABLE DATA; Schema: public; Owner: torsten
 --
 
-COPY public."Arbeitszeiten" ("Datum", "Arbeitszeit") FROM stdin;
+INSERT INTO public."Arbeitszeiten" ("Datum", "Arbeitszeit")
-2020-01-07	08:06:00
+VALUES ('2020-01-07', '08:06:00'),
-2020-01-08	08:16:00
+       ('2020-01-08', '08:16:00'),
-2020-01-09	07:49:00
+       ('2020-01-09', '07:49:00'),
-2020-01-10	07:30:00
+       ('2020-01-10', '07:30:00'),
-2020-01-13	08:06:00
+       ('2020-01-13', '08:06:00'),
-2020-01-14	08:04:00
+       ('2020-01-14', '08:04:00'),
-2020-01-15	08:20:00
+       ('2020-01-15', '08:20:00'),
-2020-01-16	07:13:00
+       ('2020-01-16', '07:13:00'),
-2020-01-17	07:57:00
+       ('2020-01-17', '07:57:00'),
-2020-01-20	07:53:00
+       ('2020-01-20', '07:53:00'),
-2020-01-21	07:49:00
+       ('2020-01-21', '07:49:00'),
-2020-01-22	07:56:00
+       ('2020-01-22', '07:56:00'),
-2020-01-23	07:55:00
+       ('2020-01-23', '07:55:00'),
-2020-01-24	07:08:00
+       ('2020-01-24', '07:08:00'),
-2020-01-27	08:23:00
+       ('2020-01-27', '08:23:00'),
-2020-01-28	07:20:00
+       ('2020-01-28', '07:20:00'),
-2020-01-29	08:13:00
+       ('2020-01-29', '08:13:00'),
-2020-01-30	08:43:00
+       ('2020-01-30', '08:43:00'),
-2020-01-31	07:21:00
+       ('2020-01-31', '07:21:00'),
-2020-02-03	07:56:00
+       ('2020-02-03', '07:56:00'),
-2020-02-04	08:05:00
+       ('2020-02-04', '08:05:00'),
-2020-02-05	07:58:00
+       ('2020-02-05', '07:58:00'),
-2020-02-06	08:01:00
+       ('2020-02-06', '08:01:00')
-2020-02-07	07:59:00
+;
-2020-02-10	07:50:00
+
-2020-02-11	08:01:00
+INSERT INTO public."Arbeitszeiten" ("Datum", "Arbeitszeit", "HomeOffice")
-2020-02-12	08:14:00
+VALUES ('2020-02-07', '07:59:00', FALSE),
-2020-02-13	08:12:00
+       ('2020-02-10', '07:50:00', FALSE),
-2020-02-14	07:51:00
+       ('2020-02-11', '08:01:00', FALSE),
-2020-02-17	07:59:00
+       ('2020-02-12', '08:14:00', FALSE),
-2020-02-18	08:05:00
+       ('2020-02-13', '08:12:00', FALSE),
-2020-02-19	07:34:00
+       ('2020-02-14', '07:51:00', FALSE),
-2020-02-20	07:33:00
+       ('2020-02-17', '07:59:00', FALSE),
-2020-02-21	07:56:00
+       ('2020-02-18', '08:05:00', FALSE),
-2020-02-24	08:02:00
+       ('2020-02-19', '07:34:00', FALSE),
-2020-02-25	08:13:00
+       ('2020-02-20', '07:33:00', FALSE),
-2020-02-26	08:42:00
+       ('2020-02-21', '07:56:00', FALSE),
-2020-02-27	07:49:00
+       ('2020-02-24', '08:02:00', FALSE),
-2020-02-28	08:16:00
+       ('2020-02-25', '08:13:00', FALSE),
-2020-03-02	08:22:00
+       ('2020-02-26', '08:42:00', FALSE),
-2020-03-03	08:20:00
+       ('2020-02-27', '07:49:00', TRUE),
-2020-03-04	08:12:00
+       ('2020-02-28', '08:16:00', FALSE),
-2020-03-05	08:32:00
+       ('2020-03-02', '08:22:00', FALSE),
-2020-03-06	04:41:00
+       ('2020-03-03', '08:20:00', FALSE),
-2020-03-09	07:05:00
+       ('2020-03-04', '08:12:00', FALSE),
-2020-03-10	07:34:00
+       ('2020-03-05', '08:32:00', FALSE),
-2020-03-11	07:39:00
+       ('2020-03-06', '04:41:00', FALSE),
-2020-03-12	07:50:00
+       ('2020-03-09', '07:05:00', FALSE),
-2020-03-13	08:26:00
+       ('2020-03-10', '07:34:00', FALSE),
-2020-03-16	07:51:00
+       ('2020-03-11', '07:39:00', TRUE),
-2020-03-17	07:50:00
+       ('2020-03-12', '07:50:00', FALSE),
-2020-03-18	07:19:00
+       ('2020-03-13', '08:26:00', FALSE),
-2020-03-19	07:55:00
+       ('2020-03-16', '07:51:00', FALSE),
-2020-03-20	05:43:00
+       ('2020-03-17', '07:50:00', FALSE),
-2020-03-23	08:05:00
+       ('2020-03-18', '07:19:00', FALSE),
-2020-03-24	08:21:00
+       ('2020-03-19', '07:55:00', FALSE),
-2020-03-25	08:10:00
+       ('2020-03-20', '05:43:00', TRUE),
-2020-03-26	10:31:00
+       ('2020-03-23', '08:05:00', FALSE),
-2020-03-27	04:55:00
+       ('2020-03-24', '08:21:00', FALSE),
-2020-03-30	08:21:00
+       ('2020-03-25', '08:10:00', FALSE),
-2020-03-31	08:01:00
+       ('2020-03-26', '10:31:00', FALSE),
-\.
+       ('2020-03-27', '04:55:00', FALSE),
+       ('2020-03-30', '08:21:00', FALSE),
+       ('2020-03-31', '08:01:00', FALSE)
+;

api/tests/_support/Helper/Api.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Helper;
 
 // here you can define custom actions
@@ -15,6 +16,7 @@ class Api extends Module
     const WORKING_HOURS_JSON_FORMAT = [
         'workingDay'   => self::FORMAT_DATE,
         'workingTime'  => self::FORMAT_TIME,
+        'isHomeOffice' => 'boolean',
     ];
 
     const WORKING_HOURS_VIEW_JSON_FORMAT = [
@@ -22,6 +24,7 @@ class Api extends Module
         "periodDesignation" => "string",
         "totalHours"        => self::FORMAT_TIME,
         "workingDays"       => 'integer:>0',
+        'homeOfficeDays'    => 'integer:>=0',
         "overtime"          => self::FORMAT_TIME,
     ];
 

api/tests/api.suite.dist.yml

@@ -3,6 +3,6 @@ modules:
     enabled:
         - \Helper\Api
         - REST:
-              url: http://localhost:8091/
+              url: http://api:80/
               depends: PhpBrowser
               part: Json

api/tests/api/WorkingHours/CreateWorkingHoursCest.php

@@ -21,6 +21,22 @@ class CreateWorkingHoursCest
     }
 
     public function createWorkingHoursWithNewValidRecord(ApiTester $I): void
+    {
+        $I->haveHttpHeader('accept', 'application/json');
+        $I->haveHttpHeader('content-type', 'application/json');
+        $I->haveHttpHeader('Origin', Api::TEST_ORIGIN);
+        $I->sendPost('/working-hours', [
+            'workingDay'  => '2020-04-01',
+            'workingTime' => '08:00:00',
+            'isHomeOffice' => false,
+        ]);
+        $I->seeResponseCodeIs(HttpCode::CREATED);
+        $I->canSeeHttpHeader('Access-Control-Allow-Origin', Api::TEST_ORIGIN);
+        $I->seeResponseIsJson();
+        $I->seeResponseMatchesJsonType(Api::WORKING_HOURS_JSON_FORMAT);
+    }
+
+    public function createWorkingHoursWithNewValidRecordWithoutHomeOffice(ApiTester $I): void
     {
         $I->haveHttpHeader('accept', 'application/json');
         $I->haveHttpHeader('content-type', 'application/json');
@@ -44,6 +60,7 @@ class CreateWorkingHoursCest
         $I->sendPost('/working-hours', [
             'workingDay'  => '2020-04-01',
             'workingTime' => 8.0,
+            'isHomeOffice' => false,
         ]);
         $I->seeResponseCodeIs(HttpCode::BAD_REQUEST);
         $I->canSeeHttpHeader('Access-Control-Allow-Origin', Api::TEST_ORIGIN);
@@ -60,6 +77,7 @@ class CreateWorkingHoursCest
         $I->sendPost('/working-hours', [
             'workingDay'  => '2020-01-15',
             'workingTime' => '08:00:00',
+            'isHomeOffice' => false,
         ]);
         $I->seeResponseCodeIs(HttpCode::CONFLICT);
         $I->canSeeHttpHeader('Access-Control-Allow-Origin', Api::TEST_ORIGIN);

api/tests/api/WorkingHours/UpdateWorkingHoursCest.php

@@ -1,4 +1,5 @@
-<?php /** @noinspection PhpUnused */
+<?php
+/** @noinspection PhpUnused */
 
 namespace TorstenHettstedt\TimekeepingApi\Tests\Api\WorkingHours;
 
@@ -28,6 +29,7 @@ class UpdateWorkingHoursCest
         $I->sendPut('/working-hours/2020-01-15', [
             'workingDay'   => '2020-01-15',
             'workingTime'  => '10:00:00',
+            'isHomeOffice' => false,
         ]);
         $I->seeResponseCodeIs(HttpCode::OK);
         $I->canSeeHttpHeader('Access-Control-Allow-Origin', Api::TEST_ORIGIN);
@@ -43,6 +45,7 @@ class UpdateWorkingHoursCest
         $I->sendPut('/working-hours/2020-04-15', [
             'workingDay'  => '2020-04-15',
             'workingTime' => '10:00:00',
+            'isHomeOffice' => false,
         ]);
         $I->seeResponseCodeIs(HttpCode::NOT_FOUND);
         $I->canSeeHttpHeader('Access-Control-Allow-Origin', Api::TEST_ORIGIN);
@@ -58,6 +61,7 @@ class UpdateWorkingHoursCest
         $I->sendPut('/working-hours/2020-01-15', [
             'workingDay'  => '2020-01-15',
             'workingTime' => 8.0,
+            'isHomeOffice' => false,
         ]);
         $I->seeResponseCodeIs(HttpCode::BAD_REQUEST);
         $I->canSeeHttpHeader('Access-Control-Allow-Origin', Api::TEST_ORIGIN);

api/tests/unit/Controller/AbstractControllerTest.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Controller;
+
+use Codeception\Test\Unit;
+use Exception;
+use PDO;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\StreamInterface;
+use Slim\Psr7\Request;
+use Slim\Psr7\Response;
+
+class AbstractControllerTest extends Unit
+{
+
+    protected const FICTIONAL_STATUS_CODE = 666;
+
+    protected ContainerInterface  $container;
+    protected Request             $request;
+    protected Response|MockObject $response;
+
+    /**
+     * @throws Exception
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    protected function _before(): void
+    {
+        parent::_before();
+        /** @noinspection SpellCheckingInspection */
+        $this->container = $this->makeEmpty(ContainerInterface::class, [
+            'has' => true,
+            'get' => new PDO(
+                'pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass'
+            ),
+        ]);
+        $this->response = $this->createMock(Response::class);
+        $this->response->expects($this->any())->method('getStatusCode')->willReturn(self::FICTIONAL_STATUS_CODE);
+        $this->response->expects($this->any())->method('getBody')->willReturn(
+            $this->makeEmpty(StreamInterface::class, [
+                'write'       => function (mixed $data) {
+                    $this->assertIsString($data);
+                    $this->assertJson($data);
+                    return strlen($data);
+                },
+                'getContents' => 'abc',
+            ])
+        );
+        $this->response->expects($this->any())->method('withHeader')->willReturn($this->response);
+        $this->response->expects($this->any())->method('withStatus')->willReturn($this->response);
+    }
+}

api/tests/unit/Controller/WorkingHoursControllerTest.php

@@ -2,65 +2,47 @@
 
 namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Controller;
 
-use Codeception\Example;
+use Codeception\Attribute\DataProvider;
-use Codeception\Test\Unit;
 use Exception;
-use PDO;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
-use Psr\Http\Message\StreamInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Slim\Exception\HttpBadRequestException;
-use Slim\Exception\HttpInternalServerErrorException;
 use Slim\Exception\HttpNotFoundException;
 use Slim\Psr7\Request;
-use Slim\Psr7\Response;
 use TorstenHettstedt\TimekeepingApi\Controller\HttpConflictRequestException;
 use TorstenHettstedt\TimekeepingApi\Controller\NotDatabasesException;
 use TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursController;
 
-class WorkingHoursControllerTest extends Unit
+class WorkingHoursControllerTest extends AbstractControllerTest
 {
 
-    const EXISTING_DATE     = '2020-01-28';
+    protected const int    FICTIONAL_STATUS_CODE = 666;
-    const EXISTING_INTERVAL = '07:20:00';
+    public const    string EXISTING_DATE         = '2020-01-28';
-    const NEW_DATE          = '2020-04-01';
+    public const    string EXISTING_INTERVAL     = '07:20:00';
-    const NEW_INTERVAL      = '07:59:00';
+    public const    string NEW_DATE              = '2020-04-01';
-
+    public const    string NEW_INTERVAL          = '07:59:00';
-    protected ContainerInterface $container;
-    protected Request            $request;
-    protected Response           $response;
 
     /**
      * @throws Exception
+     * @throws \PHPUnit\Framework\MockObject\Exception
      */
     protected function _before(): void
     {
         parent::_before();
-        /** @noinspection SpellCheckingInspection */
-        $this->container = $this->makeEmpty(ContainerInterface::class, [
-            'has' => true,
-            'get' => new PDO('pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass'),
-        ]);
         $this->request = $this->makeEmpty(Request::class, [
             'getParsedBody' => [
                 'workingDay'      => self::EXISTING_DATE,
                 'workingTime'     => self::EXISTING_INTERVAL,
+                'isHomeOfficeDay' => true,
             ],
         ]);
-        $this->response = $this->makeEmpty(Response::class, [
-            'getBody'    => $this->makeEmpty(StreamInterface::class, [
-                'write' => function (mixed $data) {
-                    $this->assertIsString($data);
-                    $this->assertJson($data);
-                },
-            ]),
-            'withHeader' => $this->makeEmpty(Response::class, [
-                'withStatus' => $this->makeEmpty(Response::class),
-            ]),
-        ]);
     }
 
     /**
      * @throws NotDatabasesException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
     public function testConstructWithNonDatabase(): void
@@ -103,12 +85,12 @@ class WorkingHoursControllerTest extends Unit
     /**
      * @param array<string, string> $queryParams
      *
-     * @dataProvider valideFilterDataProvider
+     * @throws ContainerExceptionInterface
-     *
-     * @throws HttpInternalServerErrorException
      * @throws NotDatabasesException
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
+    #[DataProvider('valideFilterDataProvider')]
     public function testBrowseWithValideParameter(array $queryParams): void
     {
         $this->request = $this->makeEmpty(Request::class, [
@@ -116,7 +98,8 @@ class WorkingHoursControllerTest extends Unit
         ]);
         $controller = new WorkingHoursController($this->container);
         $response = $controller->browse($this->request, $this->response, []);
-        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
+        $this->assertNotEmpty($response->getBody()->getContents());
     }
 
     /**
@@ -246,12 +229,12 @@ class WorkingHoursControllerTest extends Unit
     /**
      * @param array<string, string> $queryParams
      *
-     * @dataProvider invalideFilterDataProvider
+     * @throws ContainerExceptionInterface
-     *
-     * @throws HttpInternalServerErrorException
      * @throws NotDatabasesException
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
+    #[DataProvider('invalideFilterDataProvider')]
     public function testBrowseWithInvalideParameter(array $queryParams): void
     {
         $this->request = $this->makeEmpty(Request::class, [
@@ -263,9 +246,10 @@ class WorkingHoursControllerTest extends Unit
     }
 
     /**
+     * @throws ContainerExceptionInterface
      * @throws NotDatabasesException
-     * @throws HttpBadRequestException
+     * @throws NotFoundExceptionInterface
-     * @throws HttpNotFoundException
+     * @throws Exception
      */
     public function testUpdateExistRecord(): void
     {
@@ -273,13 +257,37 @@ class WorkingHoursControllerTest extends Unit
         $response = $controller->update($this->request, $this->response, [
             'id' => self::EXISTING_DATE,
         ]);
-        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
+        $this->assertNotEmpty($response->getBody()->getContents());
     }
 
     /**
+     * @throws ContainerExceptionInterface
      * @throws NotDatabasesException
-     * @throws HttpBadRequestException
+     * @throws NotFoundExceptionInterface
-     * @throws HttpNotFoundException
+     * @throws Exception
+     */
+    public function testUpdateExistRecordWithoutHomeOffice(): void
+    {
+        $this->request = $this->makeEmpty(Request::class, [
+            'getParsedBody' => [
+                'workingDay'      => self::EXISTING_DATE,
+                'workingTime'     => self::EXISTING_INTERVAL,
+            ],
+        ]);
+        $controller = new WorkingHoursController($this->container);
+        $response = $controller->update($this->request, $this->response, [
+            'id' => self::EXISTING_DATE,
+        ]);
+        $this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
+        $this->assertNotEmpty($response->getBody()->getContents());
+    }
+
+    /**
+     * @throws ContainerExceptionInterface
+     * @throws NotDatabasesException
+     * @throws NotFoundExceptionInterface
+     * @throws Exception
      */
     public function testUpdateNotExistRecord(): void
     {
@@ -311,20 +319,19 @@ class WorkingHoursControllerTest extends Unit
      * @param string $date
      * @param string $time
      *
-     * @dataProvider invalidCreatDataProvider
+     * @throws ContainerExceptionInterface
-     *
-     * @throws HttpBadRequestException
-     * @throws HttpConflictRequestException
-     * @throws HttpInternalServerErrorException
      * @throws NotDatabasesException
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
-    public function testCreatInvalidData(string $date, string $time): void
+    #[DataProvider('invalidCreatDataProvider')]
+    public function testCreatInvalidData(string $date, string $time, bool $isHomeOffice = false): void
     {
         $this->request = $this->makeEmpty(Request::class, [
             'getParsedBody' => [
                 'workingDay'      => $date,
                 'workingTime'     => $time,
+                'isHomeOfficeDay' => $isHomeOffice,
             ],
         ]);
         $controller = new WorkingHoursController($this->container);
@@ -333,13 +340,33 @@ class WorkingHoursControllerTest extends Unit
     }
 
     /**
-     * @throws HttpBadRequestException
+     * @throws ContainerExceptionInterface
      * @throws NotDatabasesException
-     * @throws HttpInternalServerErrorException
+     * @throws NotFoundExceptionInterface
-     * @throws HttpConflictRequestException
      * @throws Exception
      */
     public function testCreatNewRecord(): void
+    {
+        $this->request = $this->makeEmpty(Request::class, [
+            'getParsedBody' => [
+                'workingDay'      => self::NEW_DATE,
+                'workingTime'     => self::NEW_INTERVAL,
+                'isHomeOfficeDay' => true,
+            ],
+        ]);
+        $controller = new WorkingHoursController($this->container);
+        $response = $controller->creat($this->request, $this->response, []);
+        $this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
+        $this->assertNotEmpty($response->getBody()->getContents());
+    }
+
+    /**
+     * @throws ContainerExceptionInterface
+     * @throws NotDatabasesException
+     * @throws NotFoundExceptionInterface
+     * @throws Exception
+     */
+    public function testCreatNewRecordWithoutHomeOffice(): void
     {
         $this->request = $this->makeEmpty(Request::class, [
             'getParsedBody' => [
@@ -349,14 +376,14 @@ class WorkingHoursControllerTest extends Unit
         ]);
         $controller = new WorkingHoursController($this->container);
         $response = $controller->creat($this->request, $this->response, []);
-        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
+        $this->assertNotEmpty($response->getBody()->getContents());
     }
 
     /**
-     * @throws HttpBadRequestException
+     * @throws ContainerExceptionInterface
-     * @throws HttpConflictRequestException
-     * @throws HttpInternalServerErrorException
      * @throws NotDatabasesException
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
     public function testCreatExistRecord(): void
@@ -365,6 +392,7 @@ class WorkingHoursControllerTest extends Unit
             'getParsedBody' => [
                 'workingDay'      => self::EXISTING_DATE,
                 'workingTime'     => self::EXISTING_INTERVAL,
+                'isHomeOfficeDay' => true,
             ],
         ]);
         $controller = new WorkingHoursController($this->container);
@@ -373,9 +401,10 @@ class WorkingHoursControllerTest extends Unit
     }
 
     /**
-     * @throws HttpInternalServerErrorException
+     * @throws ContainerExceptionInterface
-     * @throws HttpNotFoundException
      * @throws NotDatabasesException
+     * @throws NotFoundExceptionInterface
+     * @throws Exception
      */
     public function testReadExistRecord(): void
     {
@@ -383,13 +412,15 @@ class WorkingHoursControllerTest extends Unit
         $response = $controller->read($this->request, $this->response, [
             'id' => self::EXISTING_DATE,
         ]);
-        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
+        $this->assertNotEmpty($response->getBody()->getContents());
     }
 
     /**
-     * @throws HttpInternalServerErrorException
+     * @throws ContainerExceptionInterface
-     * @throws HttpNotFoundException
      * @throws NotDatabasesException
+     * @throws NotFoundExceptionInterface
+     * @throws Exception
      */
     public function testReadNotExistRecord(): void
     {

api/tests/unit/Controller/WorkingHoursViewControllerTest.php

@@ -2,49 +2,30 @@
 
 namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Controller;
 
-use Codeception\Test\Unit;
 use Exception;
-use PDO;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
-use Psr\Http\Message\StreamInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Slim\Psr7\Request;
-use Slim\Psr7\Response;
 use TorstenHettstedt\TimekeepingApi\Controller\NotDatabasesException;
 use TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursViewController;
 
-class WorkingHoursViewControllerTest extends Unit
+class WorkingHoursViewControllerTest extends AbstractControllerTest
 {
-    protected ContainerInterface $container;
-    protected Request $request;
-    protected Response $response;
-
     /**
      * @throws Exception
+     * @throws \PHPUnit\Framework\MockObject\Exception
      */
     protected function _before(): void
     {
         parent::_before();
-        /** @noinspection SpellCheckingInspection */
+        $this->request = $this->makeEmpty(Request::class);
-        $this->container = $this->makeEmpty(ContainerInterface::class, [
-            'has' => true,
-            'get' => new PDO('pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass')
-        ]);
-        $this->request = $this->makeEmpty(Request::class, []);
-        $this->response = $this->makeEmpty(Response::class, [
-            'getBody' => $this->makeEmpty(StreamInterface::class, [
-                'write' => function (mixed $data) {
-                    $this->assertIsString($data);
-                    $this->assertJson($data);
-                },
-            ]),
-            'withHeader' => $this->makeEmpty(Response::class, [
-                'withStatus' => $this->makeEmpty(Response::class),
-            ]),
-        ]);
     }
 
     /**
      * @throws NotDatabasesException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
     public function testConstructWithNonDatabase(): void
@@ -57,32 +38,44 @@ class WorkingHoursViewControllerTest extends Unit
     }
 
     /**
+     * @throws NotDatabasesException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
     public function testBrowseMonthly(): void
     {
         $controller = new WorkingHoursViewController($this->container);
         $response = $controller->browseMonthly($this->request, $this->response, []);
-        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
+        $this->assertNotEmpty($response->getBody()->getContents());
     }
 
     /**
+     * @throws NotDatabasesException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
     public function testBrowseYearly(): void
     {
         $controller = new WorkingHoursViewController($this->container);
         $response = $controller->browseYearly($this->request, $this->response, []);
-        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
+        $this->assertNotEmpty($response->getBody()->getContents());
     }
 
     /**
+     * @throws NotDatabasesException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
     public function testBrowseWeekly(): void
     {
         $controller = new WorkingHoursViewController($this->container);
         $response = $controller->browseWeekly($this->request, $this->response, []);
-        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
+        $this->assertNotEmpty($response->getBody()->getContents());
     }
 }

api/tests/unit/Middleware/ErrorHandlerTest.php

@@ -5,6 +5,7 @@ namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Middleware;
 use Codeception\Stub\Expected;
 use Codeception\Test\Unit;
 use Exception;
+use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -20,6 +21,7 @@ use TorstenHettstedt\TimekeepingApi\Middleware\ErrorHandler;
 class ErrorHandlerTest extends Unit
 {
 
+    /** @var App<ContainerInterface> */
     protected App                    $app;
     protected ServerRequestInterface $request;
     protected Exception              $exception;
@@ -38,6 +40,7 @@ class ErrorHandlerTest extends Unit
                         'write' => function (mixed $data) {
                             $this->assertIsString($data);
                             $this->assertJson($data);
+                            return strlen($data);
                         },
                     ]),
                 ]),
@@ -87,11 +90,10 @@ class ErrorHandlerTest extends Unit
             'file'     => '/path(to/file',
             'getTitle' => Expected::once('The Title'),
         ]);
-        $this->logger = $this->makeEmpty(LoggerInterface::class, []);
+        $this->logger = $this->makeEmpty(LoggerInterface::class);
 
         $middleWare = new ErrorHandler($this->app);
         $middleWare($this->request, $this->exception, true, true, true, $this->logger);
-
     }
 
     /**
@@ -104,7 +106,7 @@ class ErrorHandlerTest extends Unit
             'code'    => 400,
             'file'    => '/path(to/file',
         ]);
-        $this->logger = $this->makeEmpty(LoggerInterface::class, []);
+        $this->logger = $this->makeEmpty(LoggerInterface::class);
 
         $middleWare = new ErrorHandler($this->app);
         $middleWare($this->request, $this->exception, true, true, true, $this->logger);

api/tests/unit/Models/WorkingHoursTest.php

@@ -2,6 +2,7 @@
 
 namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Models;
 
+use Codeception\Attribute\DataProvider;
 use Codeception\Test\Unit;
 use DateInterval;
 use DateTime;
@@ -16,13 +17,14 @@ class WorkingHoursTest extends Unit
         $obj = new WorkingHours();
         $this->assertNull($obj->getWorkingDay());
         $this->assertNull($obj->getWorkingTime());
+        $this->assertFalse($obj->isHomeOffice());
 
         $this->expectException(Error::class);
         $obj->jsonSerialize();
     }
 
     /**
-     * @return array[]
+     * @return array<array<DateTime|DateInterval|array<string,string>>>
      */
     public function workingHoursProvider(): array
     {
@@ -33,7 +35,9 @@ class WorkingHoursTest extends Unit
                 [
                     'workingDay'   => '2020-11-30',
                     'workingTime'  => '08:00:00',
+                    'isHomeOffice' => true,
                 ],
+                true,
             ],
             [
                 new DateTime('2021-05-03'),
@@ -41,7 +45,9 @@ class WorkingHoursTest extends Unit
                 [
                     'workingDay'   => '2021-05-03',
                     'workingTime'  => '07:45:00',
+                    'isHomeOffice' => false,
                 ],
+                false,
             ],
         ];
     }
@@ -49,17 +55,14 @@ class WorkingHoursTest extends Unit
     /**
      * @param DateTime              $date
      * @param DateInterval          $interval
-     * @param array<string, string> $should_json
+     * @param array<string, string> $shouldJson
-     *
+     * @param bool                  $isHomeOffice
-     * @dataProvider workingHoursProvider
      */
-    public function testWorkingHoursWithContent(DateTime $date, DateInterval $interval, array $should_json): void
+    #[DataProvider('workingHoursProvider')]
+    public function testWorkingHoursWithContent(DateTime $date, DateInterval $interval, array $shouldJson, bool $isHomeOffice): void
     {
-
         $obj = new WorkingHours();
-        $obj
+        $obj->setWorkingDay($date)->setWorkingTime($interval)->setIsHomeOffice($isHomeOffice);
-            ->setWorkingDay($date)
-            ->setWorkingTime($interval);
 
         $this->assertNotNull($obj->getWorkingDay());
         $this->assertInstanceOf(DateTime::class, $obj->getWorkingDay());
@@ -69,8 +72,37 @@ class WorkingHoursTest extends Unit
         $this->assertInstanceOf(DateInterval::class, $obj->getWorkingTime());
         $this->assertEquals($interval, $obj->getWorkingTime());
 
+        $this->assertIsBool($obj->isHomeOffice());
+        $this->assertEquals($isHomeOffice, $obj->isHomeOffice());
+
         $json = $obj->jsonSerialize();
-        $this->assertIsArray($json);
+        $this->assertEquals($shouldJson, $json);
-        $this->assertEquals($should_json, $json);
+    }
+
+    /**
+     * @param DateTime              $date
+     * @param DateInterval          $interval
+     * @param array<string, string> $shouldJson
+     */
+    #[DataProvider('workingHoursProvider')]
+    public function testWorkingHoursWithContentWithoutHomeOfficeInformation(DateTime $date, DateInterval $interval, array $shouldJson): void
+    {
+        $shouldJson['isHomeOffice'] = false;
+        $obj = new WorkingHours();
+        $obj->setWorkingDay($date)->setWorkingTime($interval);
+
+        $this->assertNotNull($obj->getWorkingDay());
+        $this->assertInstanceOf(DateTime::class, $obj->getWorkingDay());
+        $this->assertEquals($date, $obj->getWorkingDay());
+
+        $this->assertNotNull($obj->getWorkingTime());
+        $this->assertInstanceOf(DateInterval::class, $obj->getWorkingTime());
+        $this->assertEquals($interval, $obj->getWorkingTime());
+
+        $this->assertIsBool($obj->isHomeOffice());
+        $this->assertFalse($obj->isHomeOffice());
+
+        $json = $obj->jsonSerialize();
+        $this->assertEquals($shouldJson, $json);
     }
 }

api/tests/unit/Models/WorkingHoursViewTest.php

@@ -2,6 +2,7 @@
 
 namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Models;
 
+use Codeception\Attribute\DataProvider;
 use Codeception\Test\Unit;
 use DateInterval;
 use DateTime;
@@ -13,72 +14,111 @@ class WorkingHoursViewTest extends Unit
 {
 
     /**
-     * @return array[]
+     * @return array<array{DateTime,PeriodDesignationEnum,int,DateInterval,DateInterval,array<string,mixed>}>
      */
     public function workingHoursProvider(): array
     {
         $date = new DateTime('2020-11-30');
         $work_days = 15;
+        $home_work_days = 12;
         $total_hours = new DateInterval("PT32H22M");
         $overtime = new DateInterval("PT22M");
         $absence_time = clone $overtime;
         $absence_time->invert = 1;
         return [
             [
-                $date, PeriodDesignationEnum::WEEKLY(), $work_days, $total_hours, $overtime,
+                $date,
+                PeriodDesignationEnum::WEEKLY,
+                $work_days,
+                $total_hours,
+                $home_work_days,
+                $overtime,
                 [
                     'period'            => '2020#49',
                     'periodDesignation' => 'weekly',
                     'workingDays'       => 15,
                     'totalHours'        => '32:22:00',
+                    'homeOfficeDays'    => $home_work_days,
                     'overtime'          => '00:22:00'
                 ],
             ],
             [
-                $date, PeriodDesignationEnum::WEEKLY(), $work_days, $total_hours, $absence_time,
+                $date,
+                PeriodDesignationEnum::WEEKLY,
+                $work_days,
+                $total_hours,
+                $home_work_days,
+                $absence_time,
                 [
                     'period'            => '2020#49',
                     'periodDesignation' => 'weekly',
                     'workingDays'       => 15,
                     'totalHours'        => '32:22:00',
+                    'homeOfficeDays'    => $home_work_days,
                     'overtime'          => '-00:22:00'
                 ],
             ],
             [
-                $date, PeriodDesignationEnum::MONTHLY(), $work_days, $total_hours, $overtime,
+                $date,
+                PeriodDesignationEnum::MONTHLY,
+                $work_days,
+                $total_hours,
+                $home_work_days,
+                $overtime,
                 [
                     'period'            => '2020-11',
                     'periodDesignation' => 'monthly',
                     'workingDays'       => 15,
                     'totalHours'        => '32:22:00',
+                    'homeOfficeDays'    => $home_work_days,
                     'overtime'          => '00:22:00'
                 ],
             ],
             [
-                $date, PeriodDesignationEnum::MONTHLY(), $work_days, $total_hours, $absence_time,
+                $date,
+                PeriodDesignationEnum::MONTHLY,
+                $work_days,
+                $total_hours,
+                $home_work_days,
+                $absence_time,
                 [
                     'period'            => '2020-11',
                     'periodDesignation' => 'monthly',
                     'workingDays'       => 15,
                     'totalHours'        => '32:22:00',
+                    'homeOfficeDays'    => $home_work_days,
                     'overtime'          => '-00:22:00'
                 ],
             ],
             [
-                $date, PeriodDesignationEnum::YEARLY(), $work_days, $total_hours, $overtime, [
+                $date,
+                PeriodDesignationEnum::YEARLY,
+                $work_days,
+                $total_hours,
+                $home_work_days,
+                $overtime,
+                [
                     'period'            => '2020',
                     'periodDesignation' => 'yearly',
                     'workingDays'       => 15,
                     'totalHours'        => '32:22:00',
+                    'homeOfficeDays'    => $home_work_days,
                     'overtime'          => '00:22:00'
                 ],
             ],
             [
-                $date, PeriodDesignationEnum::YEARLY(), $work_days, $total_hours, $absence_time, [
+                $date,
+                PeriodDesignationEnum::YEARLY,
+                $work_days,
+                $total_hours,
+                $home_work_days,
+                $absence_time,
+                [
                     'period'            => '2020',
                     'periodDesignation' => 'yearly',
                     'workingDays'       => 15,
                     'totalHours'        => '32:22:00',
+                    'homeOfficeDays'    => $home_work_days,
                     'overtime'          => '-00:22:00'
                 ],
             ],
@@ -90,46 +130,41 @@ class WorkingHoursViewTest extends Unit
      * @param PeriodDesignationEnum $periodDesignation
      * @param int                   $workingDays
      * @param DateInterval          $totalHours
+     * @param int                   $homeWorkDays ,
      * @param DateInterval          $overtime
-     * @param array<string, string>      $should_json
+     * @param array<string, string> $shouldJson
-     *
-     * @dataProvider workingHoursProvider
      */
+    #[DataProvider('workingHoursProvider')]
     public function testWorkingHoursViewWithContent(
         DateTimeInterface $period,
         PeriodDesignationEnum $periodDesignation,
         int $workingDays,
         DateInterval $totalHours,
+        int $homeWorkDays,
         DateInterval $overtime,
-        array $should_json
+        array $shouldJson
-    ): void
+    ): void {
-    {
+        $obj = new WorkingHoursView($period, $periodDesignation, $workingDays, $totalHours, $homeWorkDays, $overtime);
 
-        $obj = new WorkingHoursView($period, $periodDesignation, $workingDays, $totalHours, $overtime);
-
-        $this->assertNotNull($obj->getPeriod());
         $this->assertInstanceOf(DateTimeInterface::class, $obj->getPeriod());
         $this->assertEquals($period, $obj->getPeriod());
 
-        $this->assertNotNull($obj->getPeriodDesignation());
         $this->assertInstanceOf(PeriodDesignationEnum::class, $obj->getPeriodDesignation());
         $this->assertEquals($periodDesignation, $obj->getPeriodDesignation());
 
-        $this->assertNotNull($obj->getWorkingDays());
-        $this->assertIsInt($obj->getWorkingDays());
         $this->assertEquals($workingDays, $obj->getWorkingDays());
 
-        $this->assertNotNull($obj->getTotalHours());
         $this->assertInstanceOf(DateInterval::class, $obj->getTotalHours());
         $this->assertEquals($totalHours, $obj->getTotalHours());
 
-        $this->assertNotNull($obj->getOvertime());
+        $this->assertIsInt($obj->getHomeOfficeDays());
+        $this->assertEquals($homeWorkDays, $obj->getHomeOfficeDays());
+
         $this->assertInstanceOf(DateInterval::class, $obj->getOvertime());
         $this->assertEquals($overtime, $obj->getOvertime());
 
 
         $json = $obj->jsonSerialize();
-        $this->assertIsArray($json);
+        $this->assertEquals($shouldJson, $json);
-        $this->assertEquals($should_json, $json);
     }
 }

api/tests/unit/Repositories/WorkingHoursRepositoryTest.php

@@ -2,7 +2,7 @@
 
 namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Repositories;
 
-use Codeception\Example;
+use Codeception\Attribute\DataProvider;
 use Codeception\Test\Unit;
 use DateInterval;
 use DateTime;
@@ -18,18 +18,20 @@ use TorstenHettstedt\TimekeepingApi\Repositories\WorkingHoursRepository;
 
 class WorkingHoursRepositoryTest extends Unit
 {
-    const EXISTING_DATE     = '2020-01-28';
+    public const string EXISTING_DATE     = '2020-01-28';
-    const EXISTING_INTERVAL = 'PT7H20M';
+    public const string EXISTING_INTERVAL = 'PT7H20M';
-    const NEW_DATE          = '2020-04-01';
+    public const string NEW_DATE          = '2020-04-01';
-    const NEW_INTERVAL      = 'PT7H59M';
+    public const string NEW_INTERVAL      = 'PT7H59M';
-    const RECORDS_COUNT     = 61;
+    public const int    RECORDS_COUNT     = 61;
 
     protected PDO $pdoObject;
 
     protected function _before(): void
     {
         /** @noinspection SpellCheckingInspection */
-        $this->pdoObject = new PDO('pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass');
+        $this->pdoObject = new PDO(
+            'pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass'
+        );
         parent::_before();
     }
 
@@ -40,8 +42,8 @@ class WorkingHoursRepositoryTest extends Unit
     {
         $repository = new WorkingHoursRepository($this->pdoObject);
         $models = $repository->findAll();
-        $this->assertIsArray($models);
+
-        $this->assertContainsOnly(WorkingHours::class, $models);
+        $this->assertContainsOnlyInstancesOf(WorkingHours::class, $models);
         $this->assertCount(self::RECORDS_COUNT, $models);
     }
 
@@ -66,16 +68,15 @@ class WorkingHoursRepositoryTest extends Unit
      * @param string|null $ende
      * @param int         $count
      *
-     * @dataProvider valideFilterParameter
-     *
      * @throws Exception
      */
+    #[DataProvider('valideFilterParameter')]
     public function testFindAllWithValideParameter(?string $start, ?string $ende, int $count): void
     {
         $repository = new WorkingHoursRepository($this->pdoObject);
         $models = $repository->findFiltered($start, $ende);
-        $this->assertIsArray($models);
+
-        $this->assertContainsOnly(WorkingHours::class, $models);
+        $this->assertContainsOnlyInstancesOf(WorkingHours::class, $models);
         $this->assertCount($count, $models);
     }
 
@@ -109,10 +110,9 @@ class WorkingHoursRepositoryTest extends Unit
      * @param string|null $start
      * @param string|null $ende
      *
-     * @dataProvider invalideFilterParameter
-     *
      * @throws Exception
      */
+    #[DataProvider('invalideFilterParameter')]
     public function testFindAllWithInvalideParameter(?string $start, ?string $ende): void
     {
         $repository = new WorkingHoursRepository($this->pdoObject);
@@ -127,7 +127,6 @@ class WorkingHoursRepositoryTest extends Unit
     {
         $repository = new WorkingHoursRepository($this->pdoObject);
         $model = $repository->findByKey(self::EXISTING_DATE);
-        $this->assertInstanceOf(WorkingHours::class, $model);
         $this->assertEquals(new DateTime(self::EXISTING_DATE), $model->getWorkingDay());
         $this->assertEquals(new DateInterval(self::EXISTING_INTERVAL), $model->getWorkingTime());
     }
@@ -160,10 +159,10 @@ class WorkingHoursRepositoryTest extends Unit
         $model = $this->make(WorkingHours::class, [
             'workingDay'   => new DateTime(self::NEW_DATE),
             'workingTime'  => new DateInterval(self::NEW_INTERVAL),
+            'isHomeOffice' => false,
         ]);
         $repository->insert($model);
         $model = $repository->findByKey(self::NEW_DATE);
-        $this->assertInstanceOf(WorkingHours::class, $model);
         $this->assertEquals(new DateTime(self::NEW_DATE), $model->getWorkingDay());
         $this->assertEquals(new DateInterval(self::NEW_INTERVAL), $model->getWorkingTime());
         $this->assertCount(self::RECORDS_COUNT + 1, $repository->findAll());
@@ -178,6 +177,7 @@ class WorkingHoursRepositoryTest extends Unit
         $model = $this->make(WorkingHours::class, [
             'workingDay'   => new DateTime(self::EXISTING_DATE),
             'workingTime'  => new DateInterval(self::NEW_INTERVAL),
+            'isHomeOffice' => false,
         ]);
         $this->expectException(RepositoryRecordAlreadyExistException::class);
         $repository->insert($model);
@@ -205,6 +205,7 @@ class WorkingHoursRepositoryTest extends Unit
         $model = $this->make(WorkingHours::class, [
             'workingDay'   => new DateTime(self::EXISTING_DATE),
             'workingTime'  => new DateInterval(self::EXISTING_INTERVAL),
+            'isHomeOffice' => false,
         ]);
         $repository->delete($model);
         $this->expectException(RepositoryRecordNotFoundException::class);
@@ -221,6 +222,7 @@ class WorkingHoursRepositoryTest extends Unit
         $model = $this->make(WorkingHours::class, [
             'workingDay'   => new DateTime(self::NEW_DATE),
             'workingTime'  => new DateInterval(self::NEW_INTERVAL),
+            'isHomeOffice' => false,
         ]);
         $this->expectException(RepositoryRecordNotFoundException::class);
         $repository->delete($model);
@@ -248,6 +250,7 @@ class WorkingHoursRepositoryTest extends Unit
         $model = $this->make(WorkingHours::class, [
             'workingDay'   => new DateTime(self::EXISTING_DATE),
             'workingTime'  => new DateInterval(self::NEW_INTERVAL),
+            'isHomeOffice' => false,
         ]);
         $repository->update($model);
         $model_db = $repository->findByKey(self::EXISTING_DATE);
@@ -263,6 +266,7 @@ class WorkingHoursRepositoryTest extends Unit
         $model = $this->make(WorkingHours::class, [
             'workingDay'   => new DateTime(self::NEW_DATE),
             'workingTime'  => new DateInterval(self::NEW_INTERVAL),
+            'isHomeOffice' => false,
         ]);
         $this->expectException(RepositoryRecordNotFoundException::class);
         $repository->update($model);

api/tests/unit/Repositories/WorkingHoursViewRepositoryTest.php

@@ -2,10 +2,10 @@
 
 namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Repositories;
 
+use Codeception\Attribute\DataProvider;
 use Codeception\Test\Unit;
 use DateTime;
 use DateTimeZone;
-use Exception;
 use PDO;
 use TorstenHettstedt\TimekeepingApi\Models\WorkingHoursView;
 use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryRecordNotFoundException;
@@ -20,12 +20,14 @@ class WorkingHoursViewRepositoryTest extends Unit
     protected function _before(): void
     {
         /** @noinspection SpellCheckingInspection */
-        $this->pdoObject = new PDO('pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass');
+        $this->pdoObject = new PDO(
+            'pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass'
+        );
         parent::_before();
     }
 
     /**
-     * @return array[]
+     * @return array<array{string, int}>
      */
     public function listObjectProvider(): array
     {
@@ -37,20 +39,37 @@ class WorkingHoursViewRepositoryTest extends Unit
     }
 
     /**
-     * @return array[]
+     * @return array<array{string, string, int, DateTime}>
-     * @throws Exception
      */
     public function existingObjectProvider(): array
     {
         return [
-            [WorkingHoursYearlyViewRepository::class,  '2020',          61, new DateTime('2020-01-01', new DateTimeZone('UCT'))],
+            [
-            [WorkingHoursMonthlyViewRepository::class, '2020 February', 20, new DateTime('2020-02-01', new DateTimeZone('UCT'))],
+                WorkingHoursYearlyViewRepository::class,
-            [WorkingHoursWeeklyViewRepository::class,  '2020#03',        5, new DateTime('2020-01-13', new DateTimeZone('UCT'))],
+                '2020',
+                61,
+                date_create('2020-01-01', new DateTimeZone('UCT')),
+                3,
+            ],
+            [
+                WorkingHoursMonthlyViewRepository::class,
+                '2020 February',
+                20,
+                date_create('2020-02-01', new DateTimeZone('UCT')),
+                1,
+            ],
+            [
+                WorkingHoursWeeklyViewRepository::class,
+                '2020#03',
+                5,
+                date_create('2020-01-13', new DateTimeZone('UCT')),
+                0,
+            ],
         ];
     }
 
     /**
-     * @return array[]
+     * @return array<array{string, string}>
      */
     public function notExistingObjectProvider(): array
     {
@@ -61,49 +80,36 @@ class WorkingHoursViewRepositoryTest extends Unit
         ];
     }
 
-    /**
+    #[DataProvider(('listObjectProvider'))]
-     * @param string $period_class
+    public function testFindAll(string $periodClass, int $countRecords): void
-     * @param int    $count_records
-     *
-     * @dataProvider listObjectProvider
-     */
-    public function testFindAll(string $period_class, int $count_records): void
     {
-        $repository = new $period_class($this->pdoObject);
+        $repository = new $periodClass($this->pdoObject);
         $models = $repository->findAll();
         $this->assertIsArray($models);
-        $this->assertContainsOnly(WorkingHoursView::class, $models);
+        $this->assertContainsOnlyInstancesOf(WorkingHoursView::class, $models);
-        $this->assertCount($count_records, $models);
+        $this->assertCount($countRecords, $models);
     }
 
-    /**
+    #[DataProvider(('existingObjectProvider'))]
-     *
+    public function testExistingFindByKey(
-     * @dataProvider existingObjectProvider
+        string $periodClass,
-     *
+        string $search,
-     * @param string   $period_class
+        int $workingDays,
-     * @param string   $search
+        DateTime $period,
-     * @param int      $workingDays
+        int $homeOfficeDays
-     * @param DateTime $period
+    ): void {
-     */
+        $repository = new $periodClass($this->pdoObject);
-    public function testExistingFindByKey(string $period_class, string $search, int $workingDays, DateTime $period): void
-    {
-        $repository = new $period_class($this->pdoObject);
         $model = $repository->findByKey($search);
         $this->assertInstanceOf(WorkingHoursView::class, $model);
         $this->assertEquals($workingDays, $model->getWorkingDays());
         $this->assertEquals($period->format('Ymd'), $model->getPeriod()->format('Ymd'));
+        $this->assertEquals($homeOfficeDays, $model->getHomeOfficeDays());
     }
 
-    /**
+    #[DataProvider(('notExistingObjectProvider'))]
-     * @param string $period_class
+    public function testNotExistingFindByKey(string $periodClass, string $search): void
-     * @param string $search
-     *
-     * @dataProvider notExistingObjectProvider
-     *
-     */
-    public function testNotExistingFindByKey(string $period_class, string $search): void
     {
-        $repository = new $period_class($this->pdoObject);
+        $repository = new $periodClass($this->pdoObject);
         $this->expectException(RepositoryRecordNotFoundException::class);
         $repository->findByKey($search);
     }

compose.yml

@@ -7,7 +7,7 @@ services:
         environment:
             docker: "true"
         ports:
-      - 8090:80
+            - "8090:80"
         volumes:
             - ./api:/var/www
             - logs:/var/www/logs
@@ -20,13 +20,16 @@ services:
             DATABASES_USER: bruce
             DATABASES_PASS: mypass
         ports:
-      - 8091:80
+            - "8091:80"
         volumes:
             - ./api:/var/www
             - logs:/var/www/logs
     ui:
         build: ./ui/
+        env_file:
+            -   ui/.env
         ports:
-          - 80:80
+            - "8080:3000"
         depends_on:
             - api
+            - test-api

deploy.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 create_css_files() {
-    cd ui/public || exit 2
+    cd ui || exit 2
-    lessc --source-map less/print.less print.css
+    lessc --source-map less/print.less static/print.css
-    lessc --source-map less/global.less global.css
+    lessc --source-map less/global.less static/global.css
     cd ../..
 }
 
@@ -27,6 +27,13 @@ build_ui() {
     cd ..
 }
 
+codeception_install() {
+    pwd
+    cd api/ || exit 2
+    test -e ./tests/unit.suite.yml || ./vendor/bin/codecept build
+    cd ..
+}
+
 test_unit() {
     pwd
     cd api/ || exit 2
@@ -41,7 +48,7 @@ test_api() {
 }
 
 composer_run() {
-    docker-compose up -d
+    docker compose up -d
 }
 
-create_css_files && install_ui_dependence && install_api_dependence && build_ui && test_unit && composer_run && test_api
+create_css_files && install_ui_dependence && install_api_dependence && build_ui && codeception_install && test_unit && composer_run && test_api

resources/sql/postgresql.sql

@@ -4,42 +4,46 @@ create table public."Arbeitszeiten"
 (
     "Datum"       date                  not null,
     "Arbeitszeit" interval(6)           null,
+    "HomeOffice"  boolean default FALSE not null,
     constraint "Arbeitszeiten_pkey" primary key ("Datum")
 );
 
 
 -- # Definition der Ansichten
 -- ## Wöchentlich
-create view "Arbeitszeiten - Woche" ("Woche", "Gesamtarbeitszeit", "Arbeitstage", "Überstunden") as
+create view "Arbeitszeiten - Woche" ("Woche", "Gesamtarbeitszeit", "Arbeitstage", "Überstunden", "Home-Office-Tage") as
-    select
+select to_char(date_trunc('week'::text, "Arbeitszeiten"."Datum"::timestamp with time zone),
-        to_char(date_trunc('week'::text, "Arbeitszeiten"."Datum"::timestamp with time zone),
                'TMYYYY#WW'::text)                                                    as "Woche",
-        sum("Arbeitszeiten"."Arbeitszeit") as "Gesamtarbeitszeit",
+       sum("Arbeitszeiten"."Arbeitszeit")::interval                                  AS "Gesamtarbeitszeit",
-        count("Arbeitszeiten"."Datum")     as "Arbeitstage",
+       count("Arbeitszeiten"."Datum")::bigint                                        AS "Arbeitstage",
-        sum("Arbeitszeiten"."Arbeitszeit") - count("Arbeitszeiten"."Datum") ::double precision * '08:00:00'::interval as "Überstunden"
+       (sum("Arbeitszeiten"."Arbeitszeit") -
+        ((count("Arbeitszeiten"."Datum"))::double precision * '08:00:00'::interval)) AS "Überstunden",
+       (count(*) filter (where "Arbeitszeiten"."HomeOffice"))::int                   as "Home-Office-Tage"
 from "Arbeitszeiten"
 group by (date_trunc('week'::text, "Arbeitszeiten"."Datum"::timestamp with time zone))
 order by (date_trunc('week'::text, "Arbeitszeiten"."Datum"::timestamp with time zone));
 
 -- ## Monatlich
-create view "Arbeitszeiten - Monat" ("Monat", "Gesamtarbeitszeit", "Arbeitstage", "Überstunden") as
+create view "Arbeitszeiten - Monat" ("Monat", "Gesamtarbeitszeit", "Arbeitstage", "Überstunden", "Home-Office-Tage") as
-    select
+select to_char(date_trunc('month'::text, "Arbeitszeiten"."Datum"::timestamp with time zone),
-        to_char(date_trunc('month'::text, "Arbeitszeiten"."Datum"::timestamp with time zone),
                'TMYYYY TMMonth'::text)                                               as "Monat",
-        sum("Arbeitszeiten"."Arbeitszeit") as "Gesamtarbeitszeit",
+       sum("Arbeitszeiten"."Arbeitszeit")::interval                                  AS "Gesamtarbeitszeit",
-        count("Arbeitszeiten"."Datum")     as "Arbeitstage",
+       count("Arbeitszeiten"."Datum")::bigint                                        AS "Arbeitstage",
-        sum("Arbeitszeiten"."Arbeitszeit") - count("Arbeitszeiten"."Datum") ::double precision * '08:00:00'::interval as "Überstunden"
+       (sum("Arbeitszeiten"."Arbeitszeit") -
+        ((count("Arbeitszeiten"."Datum"))::double precision * '08:00:00'::interval)) AS "Überstunden",
+       (count(*) filter (where "Arbeitszeiten"."HomeOffice"))::int                   as "Home-Office-Tage"
 from "Arbeitszeiten"
 group by (date_trunc('month'::text, "Arbeitszeiten"."Datum"::timestamp with time zone))
 order by (date_trunc('month'::text, "Arbeitszeiten"."Datum"::timestamp with time zone));
 
 -- ## Jährlich
-create view "Arbeitszeiten - Jahr"("Jahr", "Gesamtarbeitszeit", "Arbeitstage", "Überstunden") as
+create view "Arbeitszeiten - Jahr"("Jahr", "Gesamtarbeitszeit", "Arbeitstage", "Überstunden", "Home-Office-Tage") as
-    select
+select date_part('year'::text, "Arbeitszeiten"."Datum")::text                        as "Jahr",
-        date_part('year'::text, "Arbeitszeiten"."Datum")::text   as "Jahr",
+       sum("Arbeitszeiten"."Arbeitszeit")::interval                                  AS "Gesamtarbeitszeit",
-        sum("Arbeitszeiten"."Arbeitszeit") as "Gesamtarbeitszeit",
+       count("Arbeitszeiten"."Datum")::bigint                                        AS "Arbeitstage",
-        count("Arbeitszeiten"."Datum")     as "Arbeitstage",
+       (sum("Arbeitszeiten"."Arbeitszeit") -
-        sum("Arbeitszeiten"."Arbeitszeit") - count("Arbeitszeiten"."Datum") ::double precision * '08:00:00'::interval as "Überstunden"
+        ((count("Arbeitszeiten"."Datum"))::double precision * '08:00:00'::interval)) AS "Überstunden",
+       (count(*) filter (where "Arbeitszeiten"."HomeOffice"))::int                   as "Home-Office-Tage"
 from "Arbeitszeiten"
 group by (date_part('year'::text, "Arbeitszeiten"."Datum"))
 order by (date_part('year'::text, "Arbeitszeiten"."Datum"));

ui/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+dist

ui/Dockerfile

@@ -1,3 +1,16 @@
-FROM httpd:2.4
+FROM node:22-alpine AS builder
+WORKDIR /app
+COPY package*.json ./
+RUN npm ci
+COPY . .
+RUN npm run build
+RUN npm prune --production
 
-COPY ./public/ /usr/local/apache2/htdocs/
+FROM node:22-alpine
+WORKDIR /app
+COPY --from=builder /app/build build/
+COPY --from=builder /app/node_modules node_modules/
+COPY package.json .
+EXPOSE 3000
+ENV NODE_ENV=production
+CMD [ "node", "build" ]

ui/less/lesslib/layout.less

@@ -5,48 +5,63 @@
 html {
     body {
         background: @mainColorLight;
+        div {
             > header, > footer {
                 color: @mainColorDark;
                 background: @mainColor;
                 font-family: serif;
+
                 h1 {
                     font-size: 3rem;
                     text-align: center;
                 }
+
                 p {
                     text-indent: inherit;
+
                     &:first-letter {
                         font-size: inherit;
                     }
+
                     font-style: italic;
                 }
             }
+
             > header h1 {
                 margin: 1rem auto;
             }
+
             > footer {
                 color: contrast(@mainColorDark);
             }
+
             & > nav {
                 ul {
                     background: darken(@mainColorLight, 33%, relativ);
+
                     li {
                         font-weight: bold;
+
                         &:not(:first-child) {
                             border-left: @mainColorDark solid thin;
                         }
+
                         a {
                             text-decoration: none;
                             color: @mainColorDark;
                         }
+
                         &:hover {
                             background: lighten(@mainColor, 20%, relativ);
+
                             a {
                                 color: lighten(@mainColor, 66%, relativ);
                             }
                         }
+
                         &.selected, &.selected:hover {
                             background: lighten(@mainColor, 10%, relativ);
+
                             a {
                                 color: lighten(@mainColor, 66%, relativ);
                             }
@@ -56,6 +71,7 @@ html {
             }
         }
     }
+}
 
 main {
     * {
@@ -63,15 +79,19 @@ main {
         border-color: @mainColorDark;
         border-width: medium;
     }
+
     section {
         @sectionMargin: 1rem;
+
         h1, h2 {
             margin: @sectionMargin;
         }
+
         p, ul, ol, dl {
             margin: @sectionMargin;
             text-indent: @sectionMargin * 2;
         }
+
         table {
             thead {
                 tr:last-child {
@@ -79,7 +99,9 @@ main {
                         border-bottom: @mainColor solid thin;
                     }
                 }
-            };
+            }
+        ;
+
             tbody {
                 td.absence-time {
                     color: @redColor;
@@ -87,15 +109,23 @@ main {
                     text-decoration-style: dashed;
                 }
             }
+            tfoot {
+                * {
+                    border: initial;
                 }
+            }
+        }
+
         form {
             @formLabelWidth: 10rem;
             @formItemWidth: 40rem;
+
             nav.menu {
                 width: @formItemWidth + @formLabelWidth + 4rem;
                 border-color: @mainColor;
                 border-bottom-style: solid;
                 margin: 1rem auto;
+
                 span {
                     border-color: @mainColor;
                     border-style: solid solid none;
@@ -103,37 +133,45 @@ main {
                     display: inline-block;
                     font-weight: bolder;
                     margin-right: 1rem;
+
                     &:first-child {
                         margin-left: 1.5rem;
                     }
+
                     &:hover {
                         background-color: darken(@mainColorLight, 10%, relativ);
                     }
+
                     &.active {
                         background-color: darken(@mainColorLight, 20%, relativ);
                     }
                 }
             }
+
             fieldset {
                 width: @formItemWidth + @formLabelWidth + 2rem;
                 margin: 1rem auto;
                 border-style: solid;
                 border-color: @mainColor;
                 padding: @sectionMargin;
+
                 &.tasten {
                     border: none;
                     background-color: @mainColorLight;
                 }
+
                 legend {
                     margin: @sectionMargin;
                     margin-left: @sectionMargin * 2;
                 }
+
                 div {
                     & > label {
                         width: @formLabelWidth;
                         display: inline-block;
                         margin: 0.5rem;
                     }
+
                     input {
                         display: inline-block;
                         width: @formItemWidth;
@@ -145,31 +183,39 @@ main {
                 }
             }
         }
+
         button {
             .button(@mainColor, spin(lighten(@mainColor, 66%, relativ), @subColor));
+
             &.sub-button {
                 .button(lighten(@mainColor, 20%, relativ), spin(@mainColor, @subColor));
             }
         }
+
         footer {
             text-align: right;
             padding: 0;
+
             p {
                 padding: 0.5rem;
                 display: inline-block;
                 margin: inherit;
                 text-indent: inherit;
+
                 &:first-letter {
                     font-size: inherit;
                 }
+
                 background: @mainColorLight;
                 color: @mainColor;
                 font-style: italic;
                 font-size: 85%;
             }
+
             nav li {
                 padding: 0.5rem;
             }
+
             border-bottom-style: solid;
         }
     }

ui/less/lesslib/media_queries.less

@@ -5,7 +5,7 @@
         font-size: 10pt;
     }
     header, footer, main, nav, aside {
-        body > & {
+        body div > & {
             width: 19cm;
             margin: auto;
             .border-box();
@@ -15,7 +15,7 @@
         padding: 0.5rem;
         ;
     }
-    body {
+    body div {
         & > header {
             font-size: 200%;
             font-weight: bolder;
@@ -71,7 +71,7 @@
 
 @media screen and (min-width: 831px) {
     header, footer, main, nav, aside {
-        body > & {
+        body div > & {
             width: @breiteMainBereich;
             margin: auto;
             .border-box();
@@ -80,7 +80,7 @@
     header, footer{
         padding: 0.5rem;
     }
-    body {
+    body div {
         & > header {
             font-size: 200%;
             font-weight: bolder;
@@ -139,7 +139,7 @@
 }
 
 @media screen and (max-width: 830px) {
-    html body {
+    html body div {
         @boxHeight: 5rem;
         & > header {
             height: @boxHeight;
@@ -267,7 +267,7 @@
     }
 }
 @media screen and (max-width: 720px) {
-    html body {
+    html body div {
         @boxHeight: 2.5rem;
         & > header {
             height: @boxHeight;

ui/less/lesslib/print/basics.less

@@ -2,7 +2,7 @@ html {
     font-size: 100%;
 }
 
-body {
+body div {
     color: #000;
     font-size: 1em;
     font-family: OpenSans, "Lucida Grande", "Lucida Sans Unicode", Verdana, Helvetica, Arial, sans-serif;

ui/less/lesslib/print/layout.less

@@ -1,5 +1,5 @@
 html {
-    body {
+    body div {
         > header, > footer {
             background: none;
             font-family: serif;
@@ -59,7 +59,7 @@ main {
                     }
                 }
             }
-            tbody {
+            tbody div {
                 th {
                     font-weight: bold;
                     text-align: center;

ui/package.json

@@ -1,31 +1,38 @@
 {
     "private": true,
     "name": "svelte-demo",
+    "type": "module",
     "scripts": {
-    "build": "rollup -c",
+        "dev": "vite dev",
-    "autobuild": "rollup -c -w",
+        "build": "vite build",
-    "dev": "run-p start:dev autobuild",
+        "preview": "vite preview",
-    "start": "sirv public --single",
+        "prepare": "svelte-kit sync || echo ''",
-    "start:dev": "sirv public --dev --single"
+        "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
+        "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
     },
     "dependencies": {
         "ganalytics": "^3.1.2",
         "navaid": "^1.0.2",
-    "open-iconic": "^1.1.1"
+        "open-iconic": "^1.1.1",
+        "papaparse": "^5.5.3"
     },
     "devDependencies": {
-    "@iconify-icons/oi": "^1.1.0",
+        "@sveltejs/adapter-auto": "^6.0.0",
-    "@iconify/svelte": "^1.0.4",
+        "@sveltejs/kit": "^2.16.0",
-    "@rollup/plugin-commonjs": "^15.0.0",
+        "@sveltejs/vite-plugin-svelte": "^5.0.0",
-    "@rollup/plugin-node-resolve": "^9.0.0",
+        "@sveltejs/adapter-node": "^5.2.12",
-    "@rollup/plugin-replace": "^2.3.0",
+        "svelte": "^5.0.0",
+        "svelte-check": "^4.0.0",
+        "typescript": "^5.0.0",
+        "vite": "^6.2.6",
         "dotenv": "^8.2.0",
-    "npm-run-all": "^4.1.3",
+        "wx-svelte-grid": "^2.1.5",
-    "rollup": "^2.30.0",
+        "@iconify-icons/oi": "^1.1.0",
-    "rollup-plugin-svelte": "^6.0.0",
+        "@iconify/svelte": "^5.0.0"
-    "rollup-plugin-terser": "^7.0.0",
+    },
-    "sirv-cli": "^1.0.8",
+    "exports": {
-    "svelte": "^3.4.4",
+        ".": {
-    "svelte-paginate": "^0.1.0"
+            "svelte": "./puplic/index.js"
+        }
     }
 }

ui/public/index.html

@@ -1,22 +0,0 @@
-<!doctype html>
-<!--suppress HtmlUnknownTarget -->
-<!--suppress JSUnresolvedLibraryURL -->
-<html lang="de">
-<head>
-	<base href="/" />
-	<meta charset="utf8">
-	<meta name="viewport" content="width=device-width">
-
-	<title>Svelte app</title>
-
-    <link rel='icon' type='image/png' href='/favicon.png'>
-	<link rel="stylesheet" href="/global.css" media="screen">
-	<link rel="stylesheet" href="/print.css" media="print">
-	<link rel="stylesheet" href="/bundle.css">
-    <script type="module" src="https://unpkg.com/dimport?module" data-main="/index.js"></script>
-    <script nomodule src="https://unpkg.com/dimport/nomodule" data-main="/index.js"></script>
-</head>
-
-<body>
-</body>
-</html>

ui/rollup.config.js

@@ -1,51 +0,0 @@
-import svelte from 'rollup-plugin-svelte';
-import replace from '@rollup/plugin-replace';
-import resolve from '@rollup/plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
-import { terser } from 'rollup-plugin-terser';
-import {config} from 'dotenv';
-
-const production = !process.env.ROLLUP_WATCH;
-
-export default {
-	input: 'src/index.js',
-	output: {
-		name: 'app',
-		format: 'esm',
-		sourcemap: true,
-		dir: 'public',
-	},
-	preserveEntrySignatures: false,
-	plugins: [
-		svelte({
-			// enable run-time checks when not in production
-			dev: !production,
-			// we'll extract any component CSS out into
-			// a separate file — better for performance
-			css: css => {
-				css.write('bundle.css');
-			}
-		}),
-
-		// If you have external dependencies installed from
-		// npm, you'll most likely need these plugins. In
-		// some cases you'll need additional configuration —
-		// consult the documentation for details:
-		// https://github.com/rollup/rollup-plugin-commonjs
-		resolve(),
-		commonjs(),
-
-		replace({
-			'process.env.NODE_ENV': JSON.stringify(production ? 'production' : 'development'),
-            'env': JSON.stringify({...config().parsed /* attached the .env config*/})
-		}),
-
-		// If we're building for production (npm run build
-		// instead of npm run dev), minify
-		production && terser()
-	],
-
-	watch: {
-		clearScreen: false
-	}
-};

ui/src/app.html

@@ -0,0 +1,23 @@
+<!doctype html>
+<html lang="de">
+    <head>
+        <base href="/"/>
+        <meta charset="utf8">
+        <meta name="viewport" content="width=device-width">
+
+        <title>Svelte app</title>
+
+        <link rel='icon' type='image/png' href='%sveltekit.assets%/favicon.png'>
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+        <meta name="color-scheme" content="dark light"/>
+        %sveltekit.head%
+        <link rel="stylesheet" href="%sveltekit.assets%/global.css" media="screen">
+        <link rel="stylesheet" href="%sveltekit.assets%/print.css" media="print">
+    </head>
+
+    <body>
+        <div style="display: contents">
+            %sveltekit.body%
+        </div>
+    </body>
+</html>

ui/src/components/App.svelte

@@ -1,57 +0,0 @@
-<header>
-    Arbeitszeiten
-</header>
-<Nav {active} />
-<main>
-    <svelte:component this={Route} {params} />
-</main>
-<footer><p>© Torsten Lücke 2021</p></footer>
-
-<script>
-	import Navaid from 'navaid';
-	import { onDestroy } from 'svelte';
-	import Nav from './Nav.svelte';
-
-	let Route, params={}, active;
-	let uri = location.pathname;
-	$: active = uri.split('/').pop() || 'home';
-
-	function run(thunk, obj) {
-		const target = uri;
-
-		thunk.then(m => {
-			if (target !== uri) return;
-
-			params = obj || {};
-
-			if (m.preload) {
-				m.preload({ params }).then(() => {
-					if (target !== uri) return;
-					Route = m.default;
-					window.scrollTo(0, 0);
-				});
-			} else {
-				Route = m.default;
-				window.scrollTo(0, 0);
-			}
-		});
-	}
-
-	function track(obj) {
-		uri = obj.state || obj.uri || location.pathname;
-	}
-
-	addEventListener('replacestate', track);
-	addEventListener('pushstate', track);
-	addEventListener('popstate', track);
-
-	const router = Navaid('/')
-		.on('/', () => run(import('../routes/Home.svelte')))
-		.on('/views/weekly', () => run(import('../routes/WeeklyViews.svelte')))
-		.on('/views/monthly', () => run(import('../routes/MonthlyViews.svelte')))
-		.on('/views/yearly', () => run(import('../routes/YearlyViews.svelte')))
-		.on('/working-hours', () => run(import('../routes/WorkingHours.svelte')))
-		.listen();
-
-	onDestroy(router.unlisten);
-</script>

ui/src/components/Nav.svelte

@@ -1,15 +0,0 @@
-<!--suppress HtmlUnknownTarget -->
-<nav>
-	<ul>
-		<li class="{ isActive('home') }"><a href="/">Home</a></li>
-		<li class="{ isActive('weekly') }"><a href="/views/weekly">Wochenansicht</a></li>
-		<li class="{ isActive('monthly') }"><a href="/views/monthly">Monatsansicht</a></li>
-		<li class="{ isActive('yearly') }"><a href="/views/yearly">Jahresansicht</a></li>
-		<li class="{ isActive('working-hours') }"><a href="/working-hours">Einträge</a></li>
-	</ul>
-</nav>
-
-<script>
-	export let active;
-	$: isActive = str => active === str ? 'selected' : '';
-</script>

ui/src/components/Repositories.svelte

@@ -1,110 +0,0 @@
-<script context="module">
-    const MyFetch = {
-        'post': async (rest_url, request_body) => {
-            return MyFetch._fetch(rest_url, MyFetch._buildRequestOptions(request_body), {})
-        },
-        'put': async (rest_url, http_body) => {
-            return MyFetch._fetch(rest_url, MyFetch._buildRequestOptions(http_body, true), {})
-        },
-        'get': async (rest_url, query_parameters) => {
-            if (query_parameters !== null) {
-                let filter = []
-                for (let parameter in query_parameters) {
-                    filter.push(parameter + '=' + query_parameters[parameter])
-                }
-                if (filter.length > 0) {
-                    rest_url += '?' + filter.join('&')
-                }
-            }
-            return MyFetch._fetch(rest_url, {})
-        },
-        '_fetch': async (rest_url, request_options) => {
-            // noinspection JSUnresolvedVariable
-            let response = await MyFetch._pureFetch(rest_url, request_options).catch(err => {
-                console.error(err)
-                return null
-            })
-            if (!response.ok) {
-                throw new Error('Fail!')
-            }
-            return response.json()
-        },
-        '_buildRequestOptions': (request_body, needPut) => {
-            return {
-                method: (needPut === true) ? 'PUT' : 'POST',
-                mode: 'cors',
-                cache: 'no-cache',
-                credentials: 'omit',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-                body: request_body,
-            }
-        },
-        '_pureFetch': async (rest_url, request_options) => {
-            // noinspection JSUnresolvedVariable
-            return await fetch(env.API_URL + rest_url, request_options)
-        }
-    }
-
-    export const WorkingHoursRepository = {
-        'browse': (startDate = '', endDate = '') => {
-            let filter = {}
-            if (startDate !== '') {
-                filter['start-date'] = startDate
-            }
-            if (endDate !== '') {
-                filter['end-date'] = endDate
-            }
-            return MyFetch.get('/working-hours', filter)
-        },
-
-        'read': date => {
-            return MyFetch.get('/working-hours/' + date)
-        },
-
-        'readOrNew': async date => {
-            let response = await MyFetch._pureFetch('/working-hours/' + date)
-            if (response.status === 404) {
-                return {workingTime: '00:00:00', workingDay: date}
-            } else if (!response.ok) {
-                throw new Error('Fail!')
-            }
-            return response.json()
-        },
-
-        'add': async (record) => {
-            console.debug(record);
-            return MyFetch.post('/working-hours', JSON.stringify(record))
-        },
-
-        'update': async (date, record) => {
-            console.debug(record);
-            return MyFetch.put('/working-hours/' + date, JSON.stringify(record))
-        },
-
-        'addOrUpdate': async (date, record) => {
-            console.debug(record);
-            let request_options = MyFetch._buildRequestOptions(JSON.stringify(record))
-            let response = await MyFetch._pureFetch('/working-hours', request_options)
-            if (response.status === 409) {
-                return WorkingHoursRepository.update(date, record)
-            } else if (!response.ok) {
-                throw new Error('Fail!')
-            }
-            return response.json()
-        }
-    }
-
-    export const WorkingHoursViewsRepository = {
-        'weekly': async () => {
-            return MyFetch.get('/views/working-hours/weekly')
-        },
-        'monthly': async () => {
-            return MyFetch.get('/views/working-hours/monthly')
-        },
-        'yearly': async () => {
-            return MyFetch.get('/views/working-hours/yearly')
-        },
-    }
-</script>

ui/src/components/TimekeepingDate.svelte

@@ -1,15 +0,0 @@
-<script context="module">
-    export class TimekeepingDate extends Date {
-        getDateString() {
-            return this.getFullYear() + "-"
-            + (this.getMonth() + 1).toString().padStart(2, '0') + "-"
-            + this.getDate().toString().padStart(2, '0')
-        }
-
-        getNextDay() {
-            let nextDay = new TimekeepingDate(this);
-            nextDay.setDate(this.getDate() + 1)
-            return nextDay
-        }
-    }
-</script>

ui/src/index.js

@@ -1,5 +0,0 @@
-import App from './components/App.svelte';
-
-new App({
-	target: document.body
-});

ui/src/lib/Models.svelte.js

@@ -0,0 +1,17 @@
+export class PeriodRecord {
+    /**
+     * @param {{ workingDays: Number; totalHours: any; overtime: string; period: string; }} record
+     */
+    constructor(record) {
+        this.workingDays = Number(record.workingDays)
+        this.totalHours = String(record.totalHours)
+        this.period = String(record.period)
+        this.overtime = String('##:##:##')
+        this.isMinus = false
+        const interval = record.overtime.match(/^(-?)(\d\d:\d\d:\d\d)$/)
+        if (interval) {
+            this.overtime = String(interval[2])
+            this.isMinus = String(interval[1]) === '-'
+        }
+    }
+}

ui/src/lib/Repositories.svelte

@@ -0,0 +1,163 @@
+<script module>
+
+    const MyFetch = {
+        /**
+         * @param {String} rest_url
+         * @param {String} request_body
+         */
+        'post': async (rest_url, request_body) => {
+            return MyFetch._fetch(rest_url, MyFetch._buildRequestOptions(request_body, false))
+        },
+        /**
+         * @param {String} rest_url
+         * @param {String} http_body
+         */
+        'put': async (rest_url, http_body) => {
+            return MyFetch._fetch(rest_url, MyFetch._buildRequestOptions(http_body, true))
+        },
+        /**
+         * @param {String} rest_url
+         * @param {Object|null} query_parameters
+         */
+        'get': async (rest_url, query_parameters = null) => {
+            if (query_parameters !== null) {
+                let filter = []
+                for (let parameter in query_parameters) {
+                    filter.push(parameter + '=' + query_parameters[parameter])
+                }
+                if (filter.length > 0) {
+                    rest_url += '?' + filter.join('&')
+                }
+            }
+            return MyFetch._fetch(rest_url, {})
+        },
+        /**
+         * @param {String} rest_url
+         * @param {Object} request_options
+         */
+        '_fetch': async (rest_url, request_options) => {
+            // noinspection JSUnresolvedVariable
+            let response = await MyFetch._pureFetch(rest_url, request_options).catch(err => {
+                console.error(err)
+                return null
+            })
+            if (response === null || !response.ok) {
+                throw new Error('Fail!')
+            }
+            return response.json()
+        },
+        /**
+         *  @param {String} request_body
+         * @param {Boolean} needPut
+         */
+        '_buildRequestOptions': (request_body, needPut) => {
+            return {
+                method: (needPut === true) ? 'PUT' : 'POST',
+                mode: 'cors',
+                cache: 'no-cache',
+                credentials: 'omit',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: request_body,
+            }
+        },
+        /**
+         * @param {String} rest_url
+         * @param {Object} request_options
+         */
+        '_pureFetch': async (rest_url, request_options = {}) => {
+            // noinspection JSUnresolvedVariable
+            return await fetch(rest_url, request_options)
+        }
+    }
+
+    export const WorkingHoursRepository = {
+        /**
+         * @param {String} api_url
+         * @param {String} startDate
+         * @param {String} endDate
+         */
+        'browse': (api_url, startDate = '', endDate = '') => {
+            let filter = {}
+            if (startDate !== '') {
+                filter['start-date'] = startDate
+            }
+            if (endDate !== '') {
+                filter['end-date'] = endDate
+            }
+            return MyFetch.get(api_url + '/working-hours', filter)
+        },
+        /**
+         * @param {String} api_url
+         * @param {String} date
+         */
+        'read': (api_url, date) => {
+            return MyFetch.get(api_url + '/working-hours/' + date)
+        },
+        /**
+         * @param {String} api_url
+         * @param {String} date
+         */
+        'readOrNew': async (api_url, date) => {
+            let response = await MyFetch._pureFetch(api_url + '/working-hours/' + date)
+            if (response.status === 404) {
+                return {workingTime: '00:00:00', workingDay: date}
+            } else if (!response.ok) {
+                throw new Error('Fail!')
+            }
+            return response.json()
+        },
+        /**
+         * @param {String} api_url
+         * @param {Object} record
+         */
+        'add': async (api_url, record) => {
+            return MyFetch.post(api_url + '/working-hours', JSON.stringify(record))
+        },
+        /**
+         * @param {String} api_url
+         * @param {String} date
+         * @param {Object} record
+         */
+        'update': async (api_url, date, record) => {
+            return MyFetch.put(api_url + '/working-hours/' + date, JSON.stringify(record))
+        },
+        /**
+         * @param {String} api_url
+         * @param {String} date
+         * @param {Object} record
+         */
+        'addOrUpdate': async (api_url, date, record) => {
+            let request_options = MyFetch._buildRequestOptions(JSON.stringify(record), false)
+            let response = await MyFetch._pureFetch(api_url + '/working-hours', request_options)
+            if (response.status === 409) {
+                return WorkingHoursRepository.update(api_url, date, record)
+            } else if (!response.ok) {
+                throw new Error('Fail!')
+            }
+            return response.json()
+        }
+    }
+
+    export const WorkingHoursViewsRepository = {
+        /**
+         * @param {String} api_url
+         */
+        'weekly': async api_url => {
+            return MyFetch.get(api_url + '/views/working-hours/weekly', {})
+        },
+        /**
+         * @param {String} api_url
+         */
+        'monthly': async api_url => {
+            return MyFetch.get(api_url + '/views/working-hours/monthly', {})
+        },
+        /**
+         * @param {String} api_url
+         */
+        'yearly': async api_url => {
+            return MyFetch.get(api_url + '/views/working-hours/yearly', {})
+        },
+    }
+</script>

ui/src/lib/Views.svelte

@@ -0,0 +1,63 @@
+<script>
+    import {PeriodRecord} from './Models.svelte.js'
+
+    /**
+     * @type {{ promise: Promise<object>; title: string;}}
+     */
+    let {params} = $props();
+    /** @type PeriodRecord[] **/
+    let records = $state([])
+    let isLoading = $state(true)
+    const init = async () => await params.promise.then(
+        /**
+         * @param {Array<object>} data
+         */
+        data => {
+            records = data.map(row => new PeriodRecord(row))
+            isLoading = false
+        }
+    )
+    init()
+</script>
+
+<svelte:head>
+    <title>{params.title}</title>
+</svelte:head>
+
+<section id="list-records">
+    <header>
+        <h1>{params.title}</h1>
+    </header>
+    <article>
+        {#if isLoading === true}
+            <p>Loading...</p>
+        {:else}
+            <table>
+                <colgroup>
+                    <col/>
+                    <col/>
+                    <col/>
+                    <col/>
+                </colgroup>
+                <thead>
+                <tr>
+                    <th>Zeitraum</th>
+                    <th>Arbeitstage</th>
+                    <th>Arbeitsstunden</th>
+                    <th>Über- / Unterstunden</th>
+                </tr>
+                </thead>
+                <tbody>
+                {#each records as record}
+                    <tr>
+                        <td>{record.period}</td>
+                        <td>{record.workingDays}</td>
+                        <td>{record.totalHours}</td>
+                        <td class="{record.isMinus ? 'absence-time' : ''}">{record.overtime}</td>
+                    </tr>
+                {/each}
+                </tbody>
+            </table>
+        {/if}
+    </article>
+</section>

ui/src/routes/+layout.svelte

@@ -0,0 +1,24 @@
+<script>
+    import { page } from '$app/state';
+    let { children } = $props();
+    /** @param {String} str **/
+    const isActive = str => page.url.pathname === str;
+    /** @param {String} str **/
+    const isSelected = str => isActive(str) ? 'selected' : '';
+</script>
+
+<nav>
+    <ul>
+        <li class="{isSelected('/')}"><a href="/" aria-current={isActive('/')}>Home</a></li>
+        <li class="{isSelected('/views/weekly')}"><a href="/views/weekly" aria-current={isActive('/views/weekly')}>Wochenansicht</a></li>
+        <li class="{isSelected('/views/monthly')}"><a href="/views/monthly" aria-current={isActive('/views/monthly')}>Monatsansicht</a></li>
+        <li class="{isSelected('/views/yearly')}"><a href="/views/yearly" aria-current={isActive('/views/yearly')}>Jahresansicht</a></li>
+        <li class="{isSelected('/working-hours')}"><a href="/working-hours" aria-current={isActive('/working-hours')}>Einträge</a></li>
+    </ul>
+</nav>
+
+<main>
+{@render children()}
+</main>
+
+<footer><p>© Torsten Lücke 2021</p></footer>

ui/src/routes/+page.server.js

@@ -0,0 +1,9 @@
+import {env} from '$env/dynamic/private';
+import {WorkingHoursViewsRepository} from "../lib/Repositories.svelte";
+
+export function load() {
+    return {
+        title: 'Wochenansicht',
+        promise: WorkingHoursViewsRepository.weekly(env.API_URL)
+    };
+}

ui/src/routes/+page.svelte

@@ -0,0 +1,7 @@
+<script>
+    import Views from "$lib/Views.svelte";
+    let { data } = $props();
+</script>
+
+<Views params={data}/>
+

ui/src/routes/Home.svelte

@@ -1,6 +0,0 @@
-<WeeklyViews />
-
-<script>
-    import WeeklyViews from "./WeeklyViews.svelte";
-    export const params = {};
-</script>

ui/src/routes/MonthlyViews.svelte

@@ -1,11 +0,0 @@
-<script>
-    import Views from "./Views.svelte";
-    import {WorkingHoursViewsRepository} from "../components/Repositories.svelte";
-    export let params
-    params = {
-        title: 'Monatsansicht',
-        promise: WorkingHoursViewsRepository.monthly()
-    }
-</script>
-
-<Views {params} />

ui/src/routes/Views.svelte

@@ -1,81 +0,0 @@
-<script>
-    import { paginate, PaginationNav } from 'svelte-paginate'
-
-    export let params = {}
-    let records = []
-    let isLoading = true
-    console.log(params)
-    let currentPage = 1
-    let pageSize = 15
-    $: paginatedItems = paginate({ items: records, pageSize, currentPage })
-    if (!String.prototype.startsWith) {
-        String.prototype.startsWith = function (searchString, position) {
-            position = position || 0
-            return this.indexOf(searchString, position) === position
-        }
-    }
-    $: isNegative = time => time.startsWith('-') ? 'absence-time' : ''
-    $: cutMinusChar = time => time.startsWith('-') ? time.substr(1) : time
-
-    const init = async () => await params.promise.then(data => {
-        records = data
-        isLoading = false
-    })
-    init()
-</script>
-
-<svelte:head>
-    <title>{params.title}</title>
-</svelte:head>
-
-<section id="list-records">
-    <header>
-        <h1>{params.title}</h1>
-    </header>
-    <article>
-        {#if isLoading === true}
-            <p>Loading...</p>
-        {:else}
-            <table>
-                <colgroup>
-                    <col/>
-                    <col/>
-                    <col/>
-                    <col/>
-                </colgroup>
-                <thead>
-                <tr>
-                    <th>Zeitraum</th>
-                    <th>Arbeitstage</th>
-                    <th>Arbeitsstunden</th>
-                    <th>Über- / Unterstunden</th>
-                </tr>
-                </thead>
-                <tbody>
-                {#each paginatedItems as record}
-                    <tr>
-                        <td>{record.period}</td>
-                        <td>{record.workingDays}</td>
-                        <td>{record.totalHours}</td>
-                        <td class="{ isNegative(record.overtime) }">{cutMinusChar(record.overtime)}</td>
-                    </tr>
-                {/each}
-                </tbody>
-                <tfoot>
-                <tr>
-                    <td colspan="4">
-                        <PaginationNav
-                            totalItems="{records.length}"
-                            pageSize="{pageSize}"
-                            currentPage="{currentPage}"
-                            limit="{1}"
-                            showStepOptions="{true}"
-                            on:setPage="{(e) => currentPage = e.detail.page}"
-                        />
-                    </td>
-                </tr>
-                </tfoot>
-            </table>
-        {/if}
-    </article>
-</section>

ui/src/routes/WeeklyViews.svelte

@@ -1,11 +0,0 @@
-<script>
-    import Views from "./Views.svelte";
-    import {WorkingHoursViewsRepository} from "../components/Repositories.svelte";
-    export let params
-    params = {
-        title: 'Wochenansicht',
-        promise: WorkingHoursViewsRepository.weekly()
-    }
-</script>
-
-<Views {params} />

ui/src/routes/WorkingHours.svelte

@@ -1,33 +0,0 @@
-<script>
-    import List from "./WorkingHours/List.svelte";
-    import Formular from "./WorkingHours/Formular.svelte";
-    export const params = {};
-
-    let TITLE = "Bearbeitung Einträge"
-    let activeRecord = null;
-    let currentPage = 1
-</script>
-
-<svelte:head>
-    <title>{TITLE}</title>
-</svelte:head>
-
-{#if activeRecord === null}
-    <section id="list-records">
-        <header>
-            <h1>{TITLE}</h1>
-        </header>
-        <article>
-            <List bind:activeRecord={activeRecord} bind:currentPage/>
-        </article>
-    </section>
-{:else}
-    <section id="edit-record">
-        <header>
-            <h1>{TITLE}</h1>
-        </header>
-        <article>
-            <Formular bind:activeRecord={activeRecord}/>
-        </article>
-    </section>
-{/if}

ui/src/routes/WorkingHours/Formular.svelte

@@ -1,126 +0,0 @@
-<script>
-    import {WorkingHoursRepository} from "../../components/Repositories.svelte"
-    import IconifyIcon from '@iconify/svelte'
-    import checkIcon from '@iconify-icons/oi/check'
-    import xIcon from '@iconify-icons/oi/x'
-    import EditByDay from "./Formular/EditByDay.svelte";
-    import EditByWeek from "./Formular/EditByWeek.svelte";
-    import ImportCsv from "./Formular/ImportCsv.svelte";
-    import {TimekeepingDate} from "../../components/TimekeepingDate.svelte";
-
-    const DAILY_EDIT = 0
-    const WEEKLY_EDIT = 1
-    const CSV_IMPORT = 2
-
-    const Controller = {
-        'saveRecord': () => {
-            activeRecordList.forEach((actualRecord) => {
-                if (actualRecord.workingTime === '00:00:00') {
-                    return
-                }
-                WorkingHoursRepository.addOrUpdate(actualRecord.workingDay, actualRecord);
-            })
-            activeDate = nextDate
-            makeTimekeepingList()
-        },
-        'cancelActiveRecord': () => {
-            activeRecordList = []
-            activeRecord = null
-        }
-    }
-    const WeekController = {
-        'makeTimekeepingList': () => {
-            let actualDay = WeekController.getMondayFromWeek(
-                activeDate === null ? new TimekeepingDate() : new TimekeepingDate(activeDate)
-            )
-            activeRecordList = []
-            activeDate = actualDay.getDateString()
-            for (const daysDiff in [0, 1, 2, 3, 4, 5, 6]) {
-                activeRecordList.push({workingTime: '00:00:00', workingDay: actualDay.getDateString()})
-                actualDay = actualDay.getNextDay()
-            }
-            nextDate = actualDay.getDateString()
-            WorkingHoursRepository.browse(activeRecordList[0].workingDay, activeRecordList[6].workingDay).then(data => {
-                data.forEach(item => {
-                    let actualDay = new TimekeepingDate(item.workingDay)
-                    activeRecordList[actualDay.getDay()-1].workingTime = item.workingTime
-                })
-            })
-        },
-        'getMondayFromWeek': actualDayObject => {
-            if (actualDayObject.getDate() === 0) {
-                actualDayObject.setDate(actualDayObject.getDate() - 7)
-            }
-            if (actualDayObject.getDate() !== 1) {
-                actualDayObject.setDate(actualDayObject.getDate() - (actualDayObject.getDay() - 1))
-            }
-            return actualDayObject
-        }
-    }
-    const DayController = {
-        'makeTimekeepingList': () => {
-            let actualDay = activeDate === null ? new TimekeepingDate() : new TimekeepingDate(activeDate)
-            WorkingHoursRepository.readOrNew(actualDay.getDateString()).then(data => {
-                activeRecordList = [ data ]
-                activeDate = actualDay.getDateString()
-                nextDate = actualDay.getNextDay().getDateString()
-            })
-        }
-    }
-    const CsvController = {
-        'makeTimekeepingList': () => {
-            MenuController.dailyEdit()
-        }
-    }
-    const MenuController = {
-        'dailyEdit': () => {
-            period_of_edit = DAILY_EDIT
-            makeTimekeepingList = DayController.makeTimekeepingList
-            makeTimekeepingList()
-        },
-        'weeklyEdit': () => {
-            period_of_edit = WEEKLY_EDIT
-            makeTimekeepingList = WeekController.makeTimekeepingList
-            makeTimekeepingList()
-        },
-        'csvImport': () => {
-            period_of_edit = CSV_IMPORT
-            activeRecordList = []
-            makeTimekeepingList = CsvController.makeTimekeepingList
-        }
-    }
-
-    let activeDate = null
-    let nextDate = null
-    let activeRecordList = []
-    export let activeRecord = null
-    let period_of_edit
-    let makeTimekeepingList
-
-    MenuController.dailyEdit()
-</script>
-<!--suppress HtmlUnknownTarget -->
-<form action="/working-hours" name="editRecord">
-    <nav class="menu">
-        <span on:click={MenuController.dailyEdit} on:keypress={() => {}} class:active={period_of_edit === DAILY_EDIT}>Täglich</span>
-        <span on:click={MenuController.weeklyEdit} on:keypress={() => {}} class:active={period_of_edit === WEEKLY_EDIT}>Wöchentlich</span>
-        <span on:click={MenuController.csvImport} on:keypress={() => {}} class:active={period_of_edit === CSV_IMPORT}>Import per CSV</span>
-    </nav>
-    {#if period_of_edit === DAILY_EDIT}
-        <EditByDay bind:activeRecordList bind:activeDate bind:makeTimekeepingList/>
-    {/if}
-    {#if period_of_edit === WEEKLY_EDIT}
-        <EditByWeek bind:activeRecordList bind:activeDate bind:makeTimekeepingList/>
-    {/if}
-    {#if period_of_edit === CSV_IMPORT}
-        <ImportCsv bind:activeRecordList bind:makeTimekeepingList/>
-    {/if}
-    <fieldset name="buttons">
-        <button on:click={Controller.saveRecord} type="button">Übernehmen und Weiter
-            <IconifyIcon icon={checkIcon} color="green"/>
-        </button>
-        <button on:click={Controller.cancelActiveRecord} type="button" class="sub-button">Abbrechen
-            <IconifyIcon icon={xIcon}/>
-        </button>
-    </fieldset>
-</form>

ui/src/routes/WorkingHours/Formular/EditByDay.svelte

@@ -1,24 +0,0 @@
-<script>
-    export let activeDate = null
-    export let activeRecordList = []
-    export let makeTimekeepingList = () => {}
-
-    makeTimekeepingList()
-</script>
-
-{#if activeRecordList.length < 1}
-    <p>Loading...</p>
-{:else}
-    <fieldset name="record-data-by-day">
-        <div>
-            <label for="workingDay">Arbeitstag</label>
-            <input bind:value={activeDate} type="date" on:change={makeTimekeepingList}
-                   id="workingDay" required pattern="\d\{4}-[0-1]\d-[0-3]\d\">
-        </div>
-        <div>
-            <label for="workingTime">Arbeitszeit</label>
-            <input bind:value={activeRecordList[0].workingTime} placeholder="Arbeitszeit" type="time"
-                   id="workingTime" required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
-        </div>
-    </fieldset>
-{/if}

ui/src/routes/WorkingHours/Formular/EditByWeek.svelte

@@ -1,62 +0,0 @@
-<script>
-    export let activeDate = null
-    export let activeRecordList = []
-    export let makeTimekeepingList = () => {}
-
-    makeTimekeepingList()
-</script>
-
-<style>
-    tbody.weekend td input, tbody.weekend td {
-        color: red;
-    }
-    input#monday {
-        display: inline;
-        width: auto;
-    }
-</style>
-
-
-{#if activeRecordList.length < 1}
-    <p>Loading...</p>
-{:else}
-    <fieldset name="how-week-is-use">
-        <div>
-            <label for="monday">Woche vom</label>
-            <input bind:value={activeDate} type="date" on:change={makeTimekeepingList}
-                   id="monday" required pattern="\d\{4}-[0-1]\d-[0-3]\d\">
-        </div>
-    </fieldset>
-    <fieldset name="record-data-by-week">
-        <div>
-            <table>
-                <tbody>
-                {#each ['Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag'] as day, index}
-                    <tr>
-                        <td>
-                            {day}
-                        </td>
-                        <td>
-                            <input bind:value={activeRecordList[index].workingTime} placeholder="Arbeitszeit" type="time"
-                                   required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
-                        </td>
-                    </tr>
-                {/each}
-                </tbody>
-                <tbody class="weekend">
-                {#each ['Samstag', 'Sontag'] as day, index}
-                    <tr>
-                        <td>
-                            {day}
-                        </td>
-                        <td>
-                            <input bind:value={activeRecordList[index+5].workingTime} placeholder="Arbeitszeit" type="time"
-                                   required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
-                        </td>
-                    </tr>
-                {/each}
-                </tbody>
-            </table>
-        </div>
-    </fieldset>
-{/if}

ui/src/routes/WorkingHours/Formular/ImportCsv.svelte

@@ -1,96 +0,0 @@
-<script>
-    import Papa from '../../../papaparse.min'
-    import { paginate, PaginationNav } from 'svelte-paginate'
-
-    export let activeRecordList = []
-    let imported_data = []
-    export let currentPage = 1
-    let pageSize = 15
-    $: paginatedItems = paginate({ items: imported_data, pageSize, currentPage })
-
-    let files = null
-
-    const VerarbeiteDateien = () => {
-        for (const file of files) {
-            VerarbeiteCsv(file)
-        }
-    }
-
-    const VerarbeiteCsv = file => {
-        Papa.parse(file, {
-            header: true,
-            skipEmptyLines: true,
-            complete: results => {
-                let cash_work_days = {}
-                results.data.forEach(item => {
-                    // noinspection JSNonASCIINames
-                    let activity = item['Aktivität']
-                    if (activity.trim() === 'Mittagspause') {
-                        return
-                    }
-                    let work_from = new Date(item['Von'])
-                    let work_to = new Date(item['Bis'])
-                    let actual_day = work_from.toISOString().substring(0, 10)
-                    let actual_work_hours = (work_to - work_from) / (1000 * 60 * 60)
-                    cash_work_days[actual_day] ??= 0
-                    cash_work_days[actual_day] += actual_work_hours
-                })
-                for (let day in cash_work_days) {
-                    let hours = cash_work_days[day]
-                    let hours_digits = Math.trunc(hours)
-                    let minutes_digits = Math.round((hours - hours_digits) * 60)
-                    let working_time = String(hours_digits).padStart(2, '0') + ':'
-                        + String(minutes_digits).padStart(2, '0') + ':00'
-                    activeRecordList.push({ workingTime: working_time, workingDay: day })
-                }
-                imported_data = activeRecordList
-            },
-        })
-    }
-</script>
-
-
-<fieldset>
-    <legend>Download-Liste</legend>
-    <div class="zelle">
-        <label for="csv-file">Download der Zeiten von <i>aTimeLogger2</i></label>
-        <input type="file" accept="text/csv" id="csv-file" bind:files/>
-        <button type="button" on:click={VerarbeiteDateien}>Upload</button>
-    </div>
-</fieldset>
-<fieldset name="record-data-for-import">
-    <div>
-        {#if imported_data.length < 1}
-            <p>Loading...</p>
-        {:else}
-            <table>
-                <tbody>
-                {#each imported_data as item}
-                    <tr>
-                        <td>
-                            {item.workingDay}
-                        </td>
-                        <td>
-                            {item.workingTime}
-                        </td>
-                    </tr>
-                {/each}
-                </tbody>
-                <tfoot>
-                <tr>
-                    <td colspan="4">
-                        <PaginationNav
-                            totalItems="{imported_data.length}"
-                            pageSize="{pageSize}"
-                            currentPage="{currentPage}"
-                            limit="{1}"
-                            showStepOptions="{true}"
-                            on:setPage="{(e) => currentPage = e.detail.page}"
-                        />
-                    </td>
-                </tr>
-                </tfoot>
-            </table>
-        {/if}
-    </div>
-</fieldset>

ui/src/routes/WorkingHours/List.svelte

@@ -1,95 +0,0 @@
-<script>
-    import { WorkingHoursRepository } from '../../components/Repositories.svelte'
-    import { TimekeepingDate } from '../../components/TimekeepingDate.svelte'
-    import { paginate, PaginationNav } from 'svelte-paginate'
-    import IconifyIcon from '@iconify/svelte'
-    import wrenchIcon from '@iconify-icons/oi/wrench'
-    import documentIcon from '@iconify-icons/oi/document'
-
-    export let activeRecord = null
-    let isLoading = true
-    let records = []
-    export let currentPage = 1
-    let pageSize = 15
-    $: paginatedItems = paginate({ items: records, pageSize, currentPage })
-
-    const Controller = {
-        'listRecords': () => {
-            Controller.cancelActiveRecord()
-            WorkingHoursRepository.browse().then(data => {
-                Controller.cancelActiveRecord()
-                records = data
-                isLoading = false
-            })
-        },
-        'newRecord': async () => {
-            const actDate = new TimekeepingDate()
-            activeRecord = await WorkingHoursRepository.readOrNew(actDate.getDateString())
-        },
-        'selectActiveRecord': record => WorkingHoursRepository.read(record.workingDay).then(data => {
-            if (data === null) {
-                Controller.listRecords()
-                return
-            }
-            activeRecord = data
-        }),
-        'cancelActiveRecord': () => {
-            activeRecord = null
-        },
-    }
-    Controller.listRecords()
-</script>
-
-<!--suppress HtmlUnknownTarget -->
-<form action="/working-hours">
-    <fieldset>
-        <button on:click={Controller.newRecord} type="button">Neuer Eintrag
-            <IconifyIcon icon={documentIcon}/>
-        </button>
-    </fieldset>
-</form>
-{#if isLoading === true}
-    <p>Loading...</p>
-{:else}
-    <table>
-        <colgroup>
-            <col/>
-            <col/>
-            <col/>
-        </colgroup>
-        <thead>
-        <tr>
-            <th>Datum</th>
-            <th>Arbeitsstunden</th>
-            <th>Aktionen</th>
-        </tr>
-        </thead>
-        <tbody>
-        {#each paginatedItems as record}
-            <tr>
-                <td>{record.workingDay}</td>
-                <td>{record.workingTime}</td>
-                <td>
-                    <button on:click={() => Controller.selectActiveRecord(record)} type="button">Bearbeiten
-                        <IconifyIcon icon={wrenchIcon}/>
-                    </button>
-                </td>
-            </tr>
-        {/each}
-        </tbody>
-        <tfoot>
-        <tr>
-            <td colspan="4">
-                <PaginationNav
-                    totalItems="{records.length}"
-                    pageSize="{pageSize}"
-                    currentPage="{currentPage}"
-                    limit="{1}"
-                    showStepOptions="{true}"
-                    on:setPage="{(e) => currentPage = e.detail.page}"
-                />
-            </td>
-        </tr>
-        </tfoot>
-    </table>
-{/if}

ui/src/routes/YearlyViews.svelte

@@ -1,11 +0,0 @@
-<script>
-    import Views from "./Views.svelte";
-    import {WorkingHoursViewsRepository} from "../components/Repositories.svelte";
-    export let params
-    params = {
-        title: 'Jahresansicht',
-        promise: WorkingHoursViewsRepository.yearly()
-    }
-</script>
-
-<Views {params} />

ui/src/routes/views/monthly/+page.server.js

@@ -0,0 +1,9 @@
+import {env} from '$env/dynamic/private';
+import {WorkingHoursViewsRepository} from "$lib/Repositories.svelte";
+
+export function load() {
+    return {
+        title: 'Monatsansicht',
+        promise: WorkingHoursViewsRepository.monthly(env.API_URL)
+    };
+}

ui/src/routes/views/monthly/+page.svelte

@@ -0,0 +1,7 @@
+<script>
+    import Views from "$lib/Views.svelte";
+    let { data } = $props();
+</script>
+
+<Views params={data}/>
+

ui/src/routes/views/weekly/+page.server.js

@@ -0,0 +1,9 @@
+import {env} from '$env/dynamic/private';
+import {WorkingHoursViewsRepository} from "$lib/Repositories.svelte";
+
+export function load() {
+    return {
+        title: 'Wochenansicht',
+        promise: WorkingHoursViewsRepository.weekly(env.API_URL)
+    };
+}

ui/src/routes/views/weekly/+page.svelte

@@ -0,0 +1,7 @@
+<script>
+    import Views from "$lib/Views.svelte";
+    let { data } = $props();
+</script>
+
+<Views params={data}/>
+

ui/src/routes/views/yearly/+page.server.js

@@ -0,0 +1,9 @@
+import {env} from '$env/dynamic/private';
+import {WorkingHoursViewsRepository} from "$lib/Repositories.svelte";
+
+export function load() {
+    return {
+        title: 'Jahresansicht',
+        promise: WorkingHoursViewsRepository.yearly(env.API_URL)
+    };
+}

ui/src/routes/views/yearly/+page.svelte

@@ -0,0 +1,7 @@
+<script>
+    import Views from "$lib/Views.svelte";
+    let { data } = $props();
+</script>
+
+<Views params={data}/>
+

ui/src/routes/working-hours/+page.server.js

@@ -0,0 +1,81 @@
+import {env} from '$env/dynamic/private';
+import {WorkingHoursRepository} from "$lib/Repositories.svelte";
+
+export function load() {
+    return {
+        promise: WorkingHoursRepository.browse(env.API_URL)
+    };
+}
+
+/** @param {Date} actualDayObject **/
+const getMonday = actualDayObject => {
+    if (actualDayObject.getDate() === 0) {
+        actualDayObject.setDate(actualDayObject.getDate() - 7)
+    }
+    if (actualDayObject.getDate() !== 1) {
+        actualDayObject.setDate(actualDayObject.getDate() - (actualDayObject.getDay() - 1))
+    }
+    return actualDayObject
+}
+
+/** @type {String[]} **/
+const weekday_list = ['Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag', 'Sontag']
+
+/** @param {Date} actualDayObject **/
+const getDateString = actualDayObject => {
+    return actualDayObject.getFullYear() + "-"
+        + (actualDayObject.getMonth() + 1).toString().padStart(2, '0') + "-"
+        + actualDayObject.getDate().toString().padStart(2, '0')
+}
+
+export const actions = {
+    update: async ({ request }) => {
+        const data = await request.formData();
+        const body_data = {
+            workingDay: data.get('workingDay'),
+            workingTime: data.get('workingTime'),
+        }
+        await WorkingHoursRepository.update(env.API_URL, data.get('workingDay'), body_data);
+    },
+    create: async ({ request }) => {
+        const form_data = await request.formData();
+        const body_data = {
+            workingDay: form_data.get('workingDay'),
+            workingTime: form_data.get('workingTime'),
+        }
+        await WorkingHoursRepository.add(env.API_URL, body_data);
+    },
+    "create-by-week": async ({ request }) => {
+        const form_data = await request.formData();
+        // @ts-ignore
+        let actualDayObject = getMonday(new Date(form_data.get('week')))
+        /** @type {Object<String,String>} **/
+        let day_list = {}
+        weekday_list.forEach(day => {
+            day_list[day] = getDateString(actualDayObject)
+            actualDayObject.setDate(actualDayObject.getDate() + 1)
+        })
+        for (const pair of form_data.entries()) {
+            const working_day = day_list[pair[0]] ?? null
+            if (working_day === null) {
+                continue
+            }
+            const body_data = {
+                workingDay: working_day,
+                workingTime: pair[1],
+            }
+            await WorkingHoursRepository.addOrUpdate(env.API_URL, working_day, body_data);
+        }
+    },
+    'import-csv': async ({ request }) => {
+        const form_data = await request.formData();
+        for (const pair of form_data.entries()) {
+            const working_day = pair[0]
+            const body_data = {
+                workingDay: working_day,
+                workingTime: pair[1],
+            }
+            await WorkingHoursRepository.addOrUpdate(env.API_URL, working_day, body_data);
+        }
+    }
+};

ui/src/routes/working-hours/+page.svelte

@@ -0,0 +1,76 @@
+<script>
+    import documentIcon from "@iconify-icons/oi/document.js";
+    import wrenchIcon from "@iconify-icons/oi/wrench.js";
+    import IconifyIcon from "@iconify/svelte";
+    let { data } = $props();
+    const TITLE = "Bearbeitung Einträge"
+    /** @type {{workingDay: String, workingTime: String, }[]|null} **/
+    let records = $state([])
+    const init = async () => await data.promise.then(
+        /**
+         * @param {{workingDay: String, workingTime: String, }[]} data
+         */
+        data => {
+            records = data
+        }
+    )
+    init()
+</script>
+
+<svelte:head>
+    <title>{TITLE}</title>
+</svelte:head>
+
+<section id="list-records">
+    <header>
+        <h1>{TITLE}</h1>
+    </header>
+    <article>
+        <!--suppress HtmlUnknownTarget -->
+        <form action="/working-hours">
+            <fieldset>
+                <legend>Neuer Eintrag</legend>
+                <button formaction="/working-hours/create-by-day" type="submit">per Tag
+                    <IconifyIcon icon={documentIcon}/>
+                </button>
+                <button formaction="/working-hours/create-by-week" type="submit">per Woche
+                    <IconifyIcon icon={documentIcon}/>
+                </button>
+                <button formaction="/working-hours/import-csv" type="submit">Import per CSV
+                    <IconifyIcon icon={documentIcon}/>
+                </button>
+            </fieldset>
+            {#if records === null}
+                <p>Loading...</p>
+            {:else}
+                <table>
+                    <colgroup>
+                        <col/>
+                        <col/>
+                        <col/>
+                    </colgroup>
+                    <thead>
+                    <tr>
+                        <th>Datum</th>
+                        <th>Arbeitsstunden</th>
+                        <th>Aktionen</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {#each records as record}
+                        <tr>
+                            <td>{record.workingDay}</td>
+                            <td>{record.workingTime}</td>
+                            <td>
+                                <button formaction={'/working-hours/' + record.workingDay} type="submit">Bearbeiten
+                                    <IconifyIcon icon={wrenchIcon}/>
+                                </button>
+                            </td>
+                        </tr>
+                    {/each}
+                    </tbody>
+                </table>
+            {/if}
+        </form>
+    </article>
+</section>

ui/src/routes/working-hours/[working_day]/+page.server.js

@@ -0,0 +1,9 @@
+import {env} from '$env/dynamic/private';
+import {WorkingHoursRepository} from "$lib/Repositories.svelte";
+
+export function load({ params }) {
+    return {
+        working_day: params.working_day,
+        promise: WorkingHoursRepository.read(env.API_URL, params.working_day)
+    };
+}

ui/src/routes/working-hours/[working_day]/+page.svelte

@@ -0,0 +1,57 @@
+<script>
+    import IconifyIcon from '@iconify/svelte'
+    import checkIcon from "@iconify-icons/oi/check";
+    import xIcon from "@iconify-icons/oi/x";
+    let { data } = $props();
+    const TITLE = "Bearbeitung eines Eintrags"
+    /** @type {{workingDay: String, workingTime: String, }|null} **/
+    let activeDate = $state(null)
+    const init = async () => await data.promise.then(
+        /**
+         * @param {{workingDay: String, workingTime: String, }} data
+         */
+        data => {
+            activeDate = data
+        }
+    )
+    init()
+</script>
+
+<svelte:head>
+    <title>{TITLE}</title>
+</svelte:head>
+
+
+<section id="edit-record">
+    <header>
+        <h1>{TITLE}</h1>
+    </header>
+    <article>
+        <form action="/working-hours?/update" name="editRecord" method="POST">
+            {#if activeDate === null}
+                <p>Loading...</p>
+            {:else}
+                <fieldset name="record-data-by-day">
+                    <div>
+                        <label for="workingDay">Arbeitstag</label>
+                        <input name="workingDay" type="date" id="workingDay" value="{activeDate.workingDay}" required pattern="\d\{4}-[0-1]\d-[0-3]\d">
+                    </div>
+                    <div>
+                        <label for="workingTime">Arbeitszeit</label>
+                        <input name="workingTime" placeholder="Arbeitszeit" type="time" step="1"
+                               value="{activeDate.workingTime}"
+                               id="workingTime" required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
+                    </div>
+                </fieldset>
+            {/if}
+            <fieldset name="buttons">
+                <button type="submit">Übernehmen und Weiter
+                    <IconifyIcon icon={checkIcon} color="green"/>
+                </button>
+                <button formmethod="GET" type="submit" class="sub-button">Abbrechen
+                    <IconifyIcon icon={xIcon}/>
+                </button>
+            </fieldset>
+        </form>
+    </article>
+</section>

ui/src/routes/working-hours/create-by-day/+page.svelte

@@ -0,0 +1,43 @@
+<script>
+    import IconifyIcon from '@iconify/svelte'
+    import checkIcon from "@iconify-icons/oi/check";
+    import xIcon from "@iconify-icons/oi/x";
+    import {goto} from "$app/navigation";
+
+    const TITLE = "Erstellung eines neuen Eintrags"
+</script>
+
+<svelte:head>
+    <title>{TITLE}</title>
+</svelte:head>
+
+
+<section id="edit-record">
+    <header>
+        <h1>{TITLE}</h1>
+    </header>
+    <article>
+        <form action="/working-hours?/create" name="newRecord" method="POST">
+            <fieldset name="record-data-by-day">
+                <div>
+                    <label for="workingDay">Arbeitstag</label>
+                    <input name="workingDay" type="date" id="workingDay" value="" required
+                           pattern="\d\{4}-[0-1]\d-[0-3]\d">
+                </div>
+                <div>
+                    <label for="workingTime">Arbeitszeit</label>
+                    <input name="workingTime" placeholder="Arbeitszeit" type="time" step="1" value=""
+                           id="workingTime" required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
+                </div>
+            </fieldset>
+            <fieldset name="buttons">
+                <button type="submit">Übernehmen und Weiter
+                    <IconifyIcon icon={checkIcon} color="green"/>
+                </button>
+                <button type="button" class="sub-button" onclick={() => goto('/working-hours')}>Abbrechen
+                    <IconifyIcon icon={xIcon}/>
+                </button>
+            </fieldset>
+        </form>
+    </article>
+</section>

ui/src/routes/working-hours/create-by-week/+page.svelte

@@ -0,0 +1,74 @@
+<script>
+    import IconifyIcon from '@iconify/svelte'
+    import checkIcon from "@iconify-icons/oi/check";
+    import xIcon from "@iconify-icons/oi/x";
+    import {goto} from "$app/navigation";
+    const TITLE = "Erstellung neuer Einträge für eine Woche"
+</script>
+
+<svelte:head>
+    <title>{TITLE}</title>
+</svelte:head>
+
+<style>
+    tbody.weekend td input, tbody.weekend td {
+        color: red;
+    }
+</style>
+
+
+<section id="edit-record">
+    <header>
+        <h1>{TITLE}</h1>
+    </header>
+    <article>
+        <form action="/working-hours?/create-by-week" name="newRecord" method="POST">
+            <fieldset name="how-week-is-use">
+                <div>
+                    <label for="monday">Woche vom</label>
+                    <input name="week" type="date" id="week" required value="">
+                </div>
+            </fieldset>
+            <fieldset name="record-data-by-week">
+                <div>
+                    <table>
+                        <tbody>
+                        {#each ['Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag'] as day}
+                            <tr>
+                                <td>
+                                    {day}
+                                </td>
+                                <td>
+                                    <input name="{day}" value="08:00:00" type="time" step="1"
+                                           required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
+                                </td>
+                            </tr>
+                        {/each}
+                        </tbody>
+                        <tbody class="weekend">
+                        {#each ['Samstag', 'Sontag'] as day}
+                            <tr>
+                                <td>
+                                    {day}
+                                </td>
+                                <td>
+                                    <input name="{day}" value="00:00:00" type="time" step="1"
+                                           required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
+                                </td>
+                            </tr>
+                        {/each}
+                        </tbody>
+                    </table>
+                </div>
+            </fieldset>
+            <fieldset name="buttons">
+                <button type="submit">Übernehmen und Weiter
+                    <IconifyIcon icon={checkIcon} color="green"/>
+                </button>
+                <button type="button" class="sub-button" onclick={() => goto('/working-hours')}>Abbrechen
+                    <IconifyIcon icon={xIcon}/>
+                </button>
+            </fieldset>
+        </form>
+    </article>
+</section>

ui/src/routes/working-hours/import-csv/+page.svelte

@@ -0,0 +1,112 @@
+<script>
+    import IconifyIcon from '@iconify/svelte'
+    import checkIcon from "@iconify-icons/oi/check";
+    import xIcon from "@iconify-icons/oi/x";
+    import {goto} from "$app/navigation";
+    // @ts-ignore
+    import Papa from 'papaparse';
+
+    const TITLE = "Erstellung neuer Einträge für eine Woche"
+
+    /** @type {{ workingTime: String, workingDay: String, }[]} **/
+    let imported_data = $state([])
+
+
+    let files = $state(null)
+
+    const VerarbeiteDateien = () => {
+        for (const file of files ?? []) {
+            VerarbeiteCsv(file)
+        }
+    }
+
+
+    /** @param {File} file **/
+    const VerarbeiteCsv = file => {
+        Papa.parse(file, {
+            header: true,
+            skipEmptyLines: true,
+            // @ts-ignore
+            complete: results => {
+                /** @type {Object<String, Number>} **/
+                let cash_work_days = {}
+                results.data.forEach(
+                    /** @param {Object<String, any>} item **/
+                    item => {
+                        // noinspection JSNonASCIINames
+                        let activity = item['Aktivität']
+                        if (activity.trim() === 'Mittagspause') {
+                            return
+                        }
+                        let work_from = new Date(item['Von'])
+                        let work_to = new Date(item['Bis'])
+                        let actual_day = work_from.toISOString().substring(0, 10)
+                        let actual_work_hours = (work_to.getTime() - work_from.getTime()) / (1000 * 60 * 60)
+                        cash_work_days[actual_day] ??= 0
+                        cash_work_days[actual_day] += actual_work_hours
+                    }
+                )
+                for (let day in cash_work_days) {
+                    let hours = cash_work_days[day]
+                    let hours_digits = Math.trunc(hours)
+                    let minutes_digits = Math.round((hours - hours_digits) * 60)
+                    let working_time = String(hours_digits).padStart(2, '0') + ':'
+                        + String(minutes_digits).padStart(2, '0') + ':00'
+                    imported_data.push({workingTime: working_time, workingDay: day})
+                }
+            },
+        })
+    }
+</script>
+
+<svelte:head>
+    <title>{TITLE}</title>
+</svelte:head>
+
+
+<section id="edit-record">
+    <header>
+        <h1>{TITLE}</h1>
+    </header>
+    <article>
+        <form action="/working-hours?/import-csv" name="newRecord" method="POST">
+            {#if imported_data.length < 1}
+                <fieldset>
+                    <legend>Download-Liste</legend>
+                    <div class="zelle">
+                        <label for="csv-file">Download der Zeiten von <i>aTimeLogger2</i></label>
+                        <input type="file" accept="text/csv" id="csv-file" bind:files/>
+                        <button type="button" onclick={VerarbeiteDateien}>Upload</button>
+                    </div>
+                </fieldset>
+            {:else}
+                <fieldset name="record-data-for-import">
+                    <div>
+                        <table>
+                            <tbody>
+                            {#each imported_data as item}
+                                <tr>
+                                    <td>
+                                        {item.workingDay}
+                                    </td>
+                                    <td>
+                                        <input type="time" readonly name="{item.workingDay}" value="{item.workingTime}">
+                                    </td>
+                                </tr>
+                            {/each}
+                            </tbody>
+                        </table>
+                    </div>
+                </fieldset>
+                <fieldset name="buttons">
+                    <button type="submit">Übernehmen und Weiter
+                        <IconifyIcon icon={checkIcon} color="green"/>
+                    </button>
+                    <button type="button" class="sub-button" onclick={() => goto('/working-hours')}>Abbrechen
+                        <IconifyIcon icon={xIcon}/>
+                    </button>
+                </fieldset>
+            {/if}
+        </form>
+    </article>
+</section>