From f3ff303b9362cdd12a127652dacbd29ee76d3a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Tue, 14 Dec 2021 12:28:58 +0100
Subject: [PATCH 01/19] refactor: REST-API-Abfrage ist in eigenes Modul
 ausgelagert worden

---
 ui/src/components/Repositories.svelte |  71 +++++++++++++++
 ui/src/routes/WorkingHours.svelte     | 119 ++++----------------------
 2 files changed, 90 insertions(+), 100 deletions(-)
 create mode 100644 ui/src/components/Repositories.svelte

diff --git a/ui/src/components/Repositories.svelte b/ui/src/components/Repositories.svelte
new file mode 100644
index 0000000..190dc03
--- /dev/null
+++ b/ui/src/components/Repositories.svelte
@@ -0,0 +1,71 @@
+<script context="module">
+    const MyFetch = {
+        'post': async (rest_url, request_body) => {
+            return MyFetch._fetch(rest_url, {
+                method: 'POST',
+                mode: 'cors',
+                cache: 'no-cache',
+                credentials: 'omit',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: request_body,
+            }, {})
+        },
+        'put': async (rest_url, http_body) => {
+            return MyFetch._fetch(rest_url, {
+                method: 'PUT',
+                mode: 'cors',
+                cache: 'no-cache',
+                credentials: 'omit',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: http_body,
+            }, {})
+        },
+        '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 fetch(env.API_URL + rest_url, request_options).catch(err => {
+                console.error(err)
+                return null
+            })
+            if (!response.ok) {
+                throw new Error('Fail!')
+            }
+            return response.json()
+        }
+    }
+
+    export class WorkingHoursRepository {
+        static 'browse'() {
+            return MyFetch.get('/working-hours')
+        }
+
+        static 'read'(date) {
+            return MyFetch.get('/working-hours/' + date)
+        }
+
+        static async 'add'(record) {
+            console.debug(record);
+            return MyFetch.post('/working-hours', JSON.stringify(record))
+        }
+
+        static async 'update'(date, record) {
+            console.debug(record);
+            return MyFetch.post('/working-hours/' + date, JSON.stringify(record))
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/ui/src/routes/WorkingHours.svelte b/ui/src/routes/WorkingHours.svelte
index 15b7682..1820117 100644
--- a/ui/src/routes/WorkingHours.svelte
+++ b/ui/src/routes/WorkingHours.svelte
@@ -7,122 +7,41 @@
     import xIcon from '@iconify-icons/oi/x';
     import documentIcon from '@iconify-icons/oi/document';
     let activeRecord = null;
-    let newRecord = false;
     params = {
         title: 'Einträge',
         records: [],
         isLoading: true
     }
-    const Records = {
-        'browse': () => {
-            // noinspection JSUnresolvedVariable
-            fetch(env.API_URL + '/working-hours')
-                .then(res => {
-                    if (!res.ok) {
-                        throw new Error('Fail!');
-                    }
-                    return res.json();
-                })
-                .then(data => {
-                    Controller.cancelActiveRecord();
-                    params.records = data;
-                    params.isLoading = false;
-                })
-                .catch(err => {
-                    params.isLoading = false;
-                    console.log(err);
-                });
-        },
-        'read': date => {
-            // noinspection JSUnresolvedVariable
-            fetch(env.API_URL + '/working-hours/' + date)
-                .then(res => {
-                    if (!res.ok) {
-                        throw new Error('Fail!');
-                    }
-                    return res.json();
-                })
-                .then(data => {
-                    activeRecord = data;
-                    if (date === null) {
-                        Controller.listRecords();
-                    }
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        'add': async record => {
-            console.log(record);
-            // noinspection JSUnresolvedVariable
-            await fetch(env.API_URL + '/working-hours', {
-                method: 'POST',
-                mode: 'cors',
-                cache: 'no-cache',
-                credentials: 'omit',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(record)
-            })
-                .then(res => {
-                    if (!res.ok) {
-                        throw new Error('Fail!');
-                    }
-                })
-                .then(() => {
-                    Controller.listRecords();
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        'update': async (date, record) => {
-            console.log(record);
-            // noinspection JSUnresolvedVariable
-            await fetch(env.API_URL + '/working-hours/' + date, {
-                method: 'PUT',
-                mode: 'cors',
-                cache: 'no-cache',
-                credentials: 'omit',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(record)
-            })
-                .then(res => {
-                    if (!res.ok) {
-                        throw new Error('Fail!');
-                    }
-                })
-                .then(() => {
-                    Controller.listRecords();
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        }
-    };
     const Controller = {
         'listRecords': () => {
-            Controller.cancelActiveRecord();
-            Records.browse();
+            WorkingHoursRepository.browse().then(data => {
+                activeRecord = null;
+                params.records = data;
+                params.isLoading = false;
+            })
         },
         'newRecord': () => {
-            activeRecord = {workingTime: '00:00:00'};
-            newRecord = true;
+            activeRecord = {workingTime: '00:00:00', workingDay: null};
         },
         'saveRecord': () => {
-            if (newRecord === true) {
-                Records.add(activeRecord);
+            if (activeRecord.workingDay === null) {
+                WorkingHoursRepository.add(activeRecord).then(() => {
+                    Controller.listRecords()
+                });
             } else {
-                Records.update(activeRecord.workingDay, activeRecord);
+                WorkingHoursRepository.update(activeRecord.workingDay, activeRecord).then(() => {
+                    Controller.listRecords()
+                })
             }
         },
-        'selectActiveRecord': record => Records.read(record.workingDay),
+        'selectActiveRecord': record => WorkingHoursRepository.read(record.workingDay).then(data => {
+            activeRecord = data;
+            if (activeRecord === null) {
+                Controller.listRecords()
+            }
+        }),
         'cancelActiveRecord': () => {
             activeRecord = null;
-            newRecord = false;
         }
     };
     const initSite = () => {

From fafc2a0ad5a799c7653771d1a78c92b766c1fdea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Tue, 14 Dec 2021 12:32:22 +0100
Subject: [PATCH 02/19] refactor: Eintrag-Feldset ist in eigenen Modul besser
 aufgehoben
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Eine Erweiterung auf weitere Möglichkeiten lassen sich so besser umsetzen.
---
 ui/src/routes/WorkingHours.svelte           | 140 +++++++++-----------
 ui/src/routes/working-hours/NewByDay.svelte |  17 +++
 2 files changed, 80 insertions(+), 77 deletions(-)
 create mode 100644 ui/src/routes/working-hours/NewByDay.svelte

diff --git a/ui/src/routes/WorkingHours.svelte b/ui/src/routes/WorkingHours.svelte
index 1820117..27c8b97 100644
--- a/ui/src/routes/WorkingHours.svelte
+++ b/ui/src/routes/WorkingHours.svelte
@@ -1,11 +1,13 @@
 <script>
     export let params;
-    let title = "Bearbeitung Einträge"
+    const TITLE = "Bearbeitung Einträge";
     import IconifyIcon from '@iconify/svelte';
     import wrenchIcon from '@iconify-icons/oi/wrench';
     import checkIcon from '@iconify-icons/oi/check';
     import xIcon from '@iconify-icons/oi/x';
     import documentIcon from '@iconify-icons/oi/document';
+    import {WorkingHoursRepository} from '../components/Repositories.svelte'
+    import NewByDay from "./working-hours/NewByDay.svelte";
     let activeRecord = null;
     params = {
         title: 'Einträge',
@@ -51,85 +53,69 @@
 </script>
 
 <svelte:head>
-    <title>{title}</title>
+    <title>{TITLE}</title>
 </svelte:head>
 
-{#if activeRecord === null}
-    <section id="list-records">
-        <header>
-            <h1>{title}</h1>
-        </header>
-        <article>
-            {#if params.isLoading === true}
-                <p>Loading...</p>
-            {:else}
-                <!--suppress HtmlUnknownTarget -->
-                <form action="/working-hours">
-                    <fieldset>
-                        <button on:click={Controller.newRecord} type="button">Neuer Eintrag
-                            <IconifyIcon icon={documentIcon}/>
-                        </button>
-                    </fieldset>
-                </form>
-                <table>
-                    <colgroup>
-                        <col />
-                        <col />
-                        <col />
-                    </colgroup>
-                    <thead>
-                    <tr>
-                        <th>Datum</th>
-                        <th>Arbeitsstunden</th>
-                        <th>Aktionen</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {#each params.records 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>
-                </table>
-            {/if}
-        </article>
-    </section>
-{:else}
-    <section id="edit-record">
-        <header>
-            <h1>{title}</h1>
-        </header>
-        <article>
+<section id="list-records">
+    <header>
+        <h1>{TITLE}</h1>
+    </header>
+    {#if activeRecord === null}
+    <article>
+        {#if params.isLoading === true}
+            <p>Loading...</p>
+        {:else}
             <!--suppress HtmlUnknownTarget -->
-            <form action="/working-hours" name="editRecord">
-                <fieldset name="record-data">
-                    <div>
-                        <label for="workingDay">Arbeitstag</label>
-                        <input bind:value={activeRecord.workingDay} type="date"
-                               id="workingDay" required pattern="\d\{4}-[0-1]\d-[0-3]\d\">
-                    </div>
-                    <div>
-                        <label for="workingTime">Arbeitszeit</label>
-                        <input bind:value={activeRecord.workingTime} placeholder="Arbeitszeit" type="time"
-                               id="workingTime" required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
-                    </div>
-                </fieldset>
-                <fieldset name="buttons">
-                    <button on:click={Controller.saveRecord} type="button">Übernehmen
-                        <IconifyIcon icon={checkIcon} color="green"/>
-                    </button>
-                    <button on:click={Controller.cancelActiveRecord} type="button" class="sub-button">Abbrechen
-                        <IconifyIcon icon={xIcon}/>
+            <form action="/working-hours">
+                <fieldset>
+                    <button on:click={Controller.newRecord} type="button">Neuer Eintrag
+                        <IconifyIcon icon={documentIcon}/>
                     </button>
                 </fieldset>
             </form>
-        </article>
-    </section>
-{/if}
+            <table>
+                <colgroup>
+                    <col />
+                    <col />
+                    <col />
+                </colgroup>
+                <thead>
+                <tr>
+                    <th>Datum</th>
+                    <th>Arbeitsstunden</th>
+                    <th>Aktionen</th>
+                </tr>
+                </thead>
+                <tbody>
+                {#each params.records 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>
+            </table>
+        {/if}
+    </article>
+    {:else}
+    <article>
+        <!--suppress HtmlUnknownTarget -->
+        <form action="/working-hours" name="editRecord">
+            <NewByDay activeRecord="{activeRecord}"/>
+            <fieldset name="buttons">
+                <button on:click={Controller.saveRecord} type="button">Übernehmen
+                    <IconifyIcon icon={checkIcon} color="green"/>
+                </button>
+                <button on:click={Controller.cancelActiveRecord} type="button" class="sub-button">Abbrechen
+                    <IconifyIcon icon={xIcon}/>
+                </button>
+            </fieldset>
+        </form>
+    </article>
+    {/if}
+</section>
diff --git a/ui/src/routes/working-hours/NewByDay.svelte b/ui/src/routes/working-hours/NewByDay.svelte
new file mode 100644
index 0000000..79e721e
--- /dev/null
+++ b/ui/src/routes/working-hours/NewByDay.svelte
@@ -0,0 +1,17 @@
+<script>
+    export let activeRecord
+</script>
+
+
+<fieldset name="record-data">
+    <div>
+        <label for="workingDay">Arbeitstag</label>
+        <input bind:value={activeRecord.workingDay} type="date"
+               id="workingDay" required pattern="\d\{4}-[0-1]\d-[0-3]\d\">
+    </div>
+    <div>
+        <label for="workingTime">Arbeitszeit</label>
+        <input bind:value={activeRecord.workingTime} placeholder="Arbeitszeit" type="time"
+               id="workingTime" required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
+    </div>
+</fieldset>
\ No newline at end of file

From d13fce569b7c5fa869a904f02f0e3b4d8424d22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Tue, 14 Dec 2021 12:49:52 +0100
Subject: [PATCH 03/19] fix: Richtige Methode nutzen

---
 ui/src/components/Repositories.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/Repositories.svelte b/ui/src/components/Repositories.svelte
index 190dc03..d898730 100644
--- a/ui/src/components/Repositories.svelte
+++ b/ui/src/components/Repositories.svelte
@@ -65,7 +65,7 @@
 
         static async 'update'(date, record) {
             console.debug(record);
-            return MyFetch.post('/working-hours/' + date, JSON.stringify(record))
+            return MyFetch.put('/working-hours/' + date, JSON.stringify(record))
         }
     }
 </script>
\ No newline at end of file

From b46f5634c82a0ea89c4a946b9cce883486202d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Wed, 12 Jan 2022 13:20:50 +0100
Subject: [PATCH 04/19] Bugfix: Warnung abschalten

---
 ui/src/routes/Home.svelte         | 5 +++--
 ui/src/routes/WorkingHours.svelte | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/src/routes/Home.svelte b/ui/src/routes/Home.svelte
index 4a0fa9d..1d66b11 100644
--- a/ui/src/routes/Home.svelte
+++ b/ui/src/routes/Home.svelte
@@ -1,5 +1,6 @@
-<Views />
+<WeeklyViews />
 
 <script>
-    import Views from "./WeeklyViews.svelte";
+    import WeeklyViews from "./WeeklyViews.svelte";
+    export const params = {};
 </script>
\ No newline at end of file
diff --git a/ui/src/routes/WorkingHours.svelte b/ui/src/routes/WorkingHours.svelte
index 16ef696..b4f7871 100644
--- a/ui/src/routes/WorkingHours.svelte
+++ b/ui/src/routes/WorkingHours.svelte
@@ -1,7 +1,7 @@
 <script>
     import List from "./WorkingHours/List.svelte";
     import Formular from "./WorkingHours/Formular.svelte";
-    export let params = {};
+    export const params = {};
 
     let TITLE = "Bearbeitung Einträge"
     let activeRecord = null;

From 13554d09e0e6de560c402fe9ad46bcbddaebf74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Wed, 12 Jan 2022 13:22:28 +0100
Subject: [PATCH 05/19] =?UTF-8?q?Feature:=20Darstellung=20der=20w=C3=B6che?=
 =?UTF-8?q?ntlichen=20Eintragung=20bestimmen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/salt/add-update-record.puml           | 7 ++++---
 resources/salt/add-update-records-for-week.puml | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/resources/salt/add-update-record.puml b/resources/salt/add-update-record.puml
index 9928f80..0401c79 100644
--- a/resources/salt/add-update-record.puml
+++ b/resources/salt/add-update-record.puml
@@ -3,9 +3,10 @@
 
 salt
 {
-    Datum   |"Datum <&calendar>"
-    Uhrzeit | "Uhrzeit <&clock>"
-    [Übernehmen <&plus>]
+    {/ <b>Täglich | Wöchentlich }
+    Datum   |"0000-00-00 <&calendar>"
+    Uhrzeit | "00:00:00 <&clock>"
+    [Übernehmen und weiter <&plus>]
     [Abbrechen <&action-undo>]
 }
 @enduml
\ No newline at end of file
diff --git a/resources/salt/add-update-records-for-week.puml b/resources/salt/add-update-records-for-week.puml
index d1829db..dfcafc5 100644
--- a/resources/salt/add-update-records-for-week.puml
+++ b/resources/salt/add-update-records-for-week.puml
@@ -3,7 +3,9 @@
 
 salt
 {
-    Woche vom <&calendar> bis zum <&calendar>
+    {/ Täglich | <b>Wöchentlich }
+    Woche vom
+    "0000-00-00 <&calendar>"
     [<&chevron-left> Woche zurück] | [Woche vor <&chevron-right>]
     {!
                    Montag     |            "00:00:00 <&clock>"
@@ -14,7 +16,7 @@ salt
         <color:red>Samstag    | "<color:red>00:00:00 <&clock>"
         <color:red>Sontag     | "<color:red>00:00:00 <&clock>"
     }
-    [Übernehmen <&plus>]
+    [Übernehmen und weiter <&plus>]
     [Abbrechen <&action-undo>]
 }
 @enduml
\ No newline at end of file

From 1ebf57ac3bef91f8e1b63f0ef8519a4b5ec8b7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Thu, 27 Jan 2022 15:12:24 +0100
Subject: [PATCH 06/19] Docu: Vorgehensweise bestimmen

---
 resources/uml/Speichere-mehere-Daten.puml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 resources/uml/Speichere-mehere-Daten.puml

diff --git a/resources/uml/Speichere-mehere-Daten.puml b/resources/uml/Speichere-mehere-Daten.puml
new file mode 100644
index 0000000..fb3b4af
--- /dev/null
+++ b/resources/uml/Speichere-mehere-Daten.puml
@@ -0,0 +1,15 @@
+@startuml
+'https://plantuml.com/activity-diagram-beta
+|UI|
+:Bestimme //Startdatum//;
+:Bestimme //Enddatum//;
+:Erstelle //Liste der Wochentage//;
+|REST|
+start
+:Rufe API auf;
+|UI|
+:Zeige //Liste der Wochentage// an;
+:Verarbeite Informationen der Rest-API;
+stop
+
+@enduml
\ No newline at end of file

From 90c6ef0c53f37fadc935a5113b26ffa4b951a19d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Tue, 1 Feb 2022 15:50:09 +0100
Subject: [PATCH 07/19] Docu: Filter bestimmen

---
 api/html/openapi.json | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/api/html/openapi.json b/api/html/openapi.json
index f371e8b..a45afac 100644
--- a/api/html/openapi.json
+++ b/api/html/openapi.json
@@ -18,6 +18,15 @@
         "tags": [
           "Eintragungen Arbeitszeiten"
         ],
+        "description": "Liefert eine Liste der Einträge. Kann gefiltert werden und dadurch eine leere Liste zurückgeben",
+        "parameters": [
+            {
+                "$ref": "#/components/parameters/start-date"
+            },
+            {
+                "$ref": "#/components/parameters/end-date"
+            }
+        ],
         "responses": {
           "200": {
             "$ref": "#/components/responses/ListEntities"
@@ -259,6 +268,26 @@
           "type": "string",
           "format": "date"
         }
+      },
+      "start-date" : {
+        "description": "Filtert Liste ab Datum",
+        "name": "start-date",
+        "in" : "query",
+        "required": false,
+        "schema": {
+          "type": "string",
+          "format": "date"
+        }
+      },
+      "end-date" : {
+        "description": "Filtert Liste bis Datum",
+        "name": "end-date",
+        "in" : "query",
+        "required": false,
+        "schema": {
+          "type": "string",
+          "format": "date"
+        }
       }
     },
     "responses": {

From d4ddd4f32c6bdd197ae192ab6753e860d6c1f7d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Tue, 1 Feb 2022 15:50:49 +0100
Subject: [PATCH 08/19] Test: Filter laut *OpenAPI* testen

---
 .../WorkingHours/BrowseWorkingHoursCest.php   | 43 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/api/tests/api/WorkingHours/BrowseWorkingHoursCest.php b/api/tests/api/WorkingHours/BrowseWorkingHoursCest.php
index 65a5d1b..823495f 100644
--- a/api/tests/api/WorkingHours/BrowseWorkingHoursCest.php
+++ b/api/tests/api/WorkingHours/BrowseWorkingHoursCest.php
@@ -3,6 +3,7 @@
 namespace TorstenHettstedt\TimekeepingApi\Tests\Api\WorkingHours;
 
 use ApiTester;
+use Codeception\Example;
 use Codeception\Util\HttpCode;
 use Helper\Api;
 
@@ -20,16 +21,54 @@ class BrowseWorkingHoursCest
         $I->seeHttpHeader('Access-Control-Max-Age');
     }
 
+    public function validWorkingHoursFilterProvider(): array
+    {
+        return [
+            [[null]],
+            [['start-date' => '2020-01-01', 'end-date' => '2020-01-08']],
+            [['start-date' => '2020-01-01', 'end-date' => '2020-04-30']],
+            [['start-date' => '2020-04-01', 'end-date' => '2020-04-30']],
+        ];
+    }
+
     /**
      * @param ApiTester $I
+     * @param Example   $example
+     *                          
+     * @dataProvider validWorkingHoursFilterProvider
      */
-    public function browseWorkingHours(ApiTester $I): void
+    public function browseWorkingHours(ApiTester $I, Example $example): void
     {
         $I->haveHttpHeader('Origin', Api::TEST_ORIGIN);
-        $I->sendGet('/working-hours');
+        $I->sendGet('/working-hours', $example[0]);
         $I->seeResponseCodeIs(HttpCode::OK);
         $I->canSeeHttpHeader('Access-Control-Allow-Origin', Api::TEST_ORIGIN);
         $I->seeResponseIsJson();
         $I->seeResponseMatchesJsonType(Api::WORKING_HOURS_JSON_FORMAT);
     }
+
+    public function invalidWorkingHoursFilterProvider(): array
+    {
+        return [
+            ['2020-11-31'],
+            ['2020-11'],
+            ['2020'],
+        ];
+    }
+
+    /**
+     * @param ApiTester $I
+     * @param Example   $example
+     *
+     * @dataProvider invalidWorkingHoursFilterProvider
+     */
+    public function browseWorkingHoursWithWrongFilterDate(ApiTester $I, Example $example): void
+    {
+        $I->haveHttpHeader('Origin', Api::TEST_ORIGIN);
+        $I->sendGet('/working-hours', ['start-date' => $example[0]]);
+        $I->seeResponseCodeIs(HttpCode::BAD_REQUEST);
+        $I->canSeeHttpHeader('Access-Control-Allow-Origin', Api::TEST_ORIGIN);
+        $I->seeResponseIsJson();
+        $I->seeResponseMatchesJsonType(Api::ERROR_JSON_FORMAT);
+    }
 }

From 1fc54f4b89320d11ddd8a7cce30cd1d2696ba2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Wed, 2 Feb 2022 14:33:19 +0100
Subject: [PATCH 09/19] =?UTF-8?q?Core:=20F=C3=BCge=20ben=C3=B6tigte=20Erwe?=
 =?UTF-8?q?iterungen=20hinzu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/composer.json b/api/composer.json
index ef94ac7..d4a5b86 100644
--- a/api/composer.json
+++ b/api/composer.json
@@ -21,7 +21,8 @@
         "slim/psr7": "^1.3",
         "php-di/slim-bridge": "^3.1.0",
         "jetbrains/phpstorm-attributes": "^1.0.0",
-        "myclabs/php-enum": "^1.8.0"
+        "myclabs/php-enum": "^1.8.0",
+        "ext-pdo": "*"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12.80",

From bcc6448fa183de162545a789f6d64ced772eb452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Wed, 2 Feb 2022 14:34:29 +0100
Subject: [PATCH 10/19] =?UTF-8?q?Test:=20Erzeuge=20die=20Tests=20f=C3=BCr?=
 =?UTF-8?q?=20die=20gefilterte=20Abfragen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RepositoryBadWhereDataException.php       |  10 +
 .../Controller/WorkingHoursControllerTest.php | 222 ++++++++++++++++--
 .../WorkingHoursRepositoryTest.php            |  81 ++++++-
 3 files changed, 290 insertions(+), 23 deletions(-)
 create mode 100644 api/src/Repositories/RepositoryBadWhereDataException.php

diff --git a/api/src/Repositories/RepositoryBadWhereDataException.php b/api/src/Repositories/RepositoryBadWhereDataException.php
new file mode 100644
index 0000000..620452b
--- /dev/null
+++ b/api/src/Repositories/RepositoryBadWhereDataException.php
@@ -0,0 +1,10 @@
+<?php
+
+
+namespace TorstenHettstedt\TimekeepingApi\Repositories;
+
+
+class RepositoryBadWhereDataException extends RepositoryException
+{
+
+}
\ No newline at end of file
diff --git a/api/tests/unit/Controller/WorkingHoursControllerTest.php b/api/tests/unit/Controller/WorkingHoursControllerTest.php
index 0615cc1..5be7a23 100644
--- a/api/tests/unit/Controller/WorkingHoursControllerTest.php
+++ b/api/tests/unit/Controller/WorkingHoursControllerTest.php
@@ -2,6 +2,7 @@
 
 namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Controller;
 
+use Codeception\Example;
 use Codeception\Test\Unit;
 use Exception;
 use PDO;
@@ -25,8 +26,8 @@ class WorkingHoursControllerTest extends Unit
     const NEW_INTERVAL      = '07:59:00';
 
     protected ContainerInterface $container;
-    protected Request $request;
-    protected Response $response;
+    protected Request            $request;
+    protected Response           $response;
 
     /**
      * @throws Exception
@@ -37,16 +38,16 @@ class WorkingHoursControllerTest extends Unit
         /** @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')
+            '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,
-                ]
+            'getParsedBody' => [
+                'workingDay'  => self::EXISTING_DATE,
+                'workingTime' => self::EXISTING_INTERVAL,
+            ],
         ]);
         $this->response = $this->makeEmpty(Response::class, [
-            'getBody' => $this->makeEmpty(StreamInterface::class, [
+            'getBody'    => $this->makeEmpty(StreamInterface::class, [
                 'write' => function (mixed $data) {
                     $this->assertIsString($data);
                     $this->assertJson($data);
@@ -65,23 +66,202 @@ class WorkingHoursControllerTest extends Unit
     public function testConstructWithNonDatabase(): void
     {
         $this->container = $this->makeEmpty(ContainerInterface::class, [
-            'has' => false
+            'has' => false,
         ]);
         $this->expectException(NotDatabasesException::class);
         new WorkingHoursController($this->container);
     }
 
     /**
+     * @return array<int, array<int, array<string, string>>>
+     */
+    public function valideFilterDataProvider(): array
+    {
+        return [
+            [
+                [],
+            ],
+            [
+                [
+                    'start-date' => '2020-03-01',
+                    'end-date'   => '2020-03-31',
+                ],
+            ],
+            [
+                [
+                    'start-date' => '2020-03-01',
+                ],
+            ],
+            [
+                [
+                    'end-date' => '2020-03-31',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @param array<string, string> $queryParams
+     *
+     * @dataProvider valideFilterDataProvider
+     *
+     * @throws HttpInternalServerErrorException
      * @throws NotDatabasesException
      * @throws Exception
      */
-    public function testBrowse(): void
+    public function testBrowseWithValideParameter(array $queryParams): void
     {
+        $this->request = $this->makeEmpty(Request::class, [
+            'getQueryParams' => $queryParams,
+        ]);
         $controller = new WorkingHoursController($this->container);
         $response = $controller->browse($this->request, $this->response, []);
         $this->assertInstanceOf(Response::class, $response);
     }
 
+    /**
+     * @return array<int, array<int, array<string, string|null>>>
+     */
+    public function invalideFilterDataProvider(): array
+    {
+        return [
+            [
+                [
+                    'start-data' => null,
+                    'end-data'   => null,
+                ],
+            ],
+            [
+                [
+                    'start-data' => null,
+                ],
+            ],
+            [
+                [
+                    'end-data' => null,
+                ],
+            ],
+            [
+                [
+                    'start-data' => '2020-03-01',
+                    'end-data'   => null,
+                ],
+            ],
+            [
+                [
+                    'start-data' => null,
+                    'end-data'   => '2020-03-31',
+                ],
+            ],
+            //
+            [
+                [
+                    'start-data' => '2020-03-00',
+                    'end-data'   => '2020-04-31',
+                ],
+            ],
+            [
+                [
+                    'start-data' => '2020-03-00',
+                ],
+            ],
+            [
+                [
+                    'end-data' => '2020-04-31',
+                ],
+            ],
+            [
+                [
+                    'start-data' => '2020-03-01',
+                    'end-data'   => '2020-04-31',
+                ],
+            ],
+            [
+                [
+                    'start-data' => '2020-03-00',
+                    'end-data'   => '2020-03-31',
+                ],
+            ],
+            //
+            [
+                [
+                    'start-data' => '2020-03',
+                    'end-data'   => '2020-03',
+                ],
+            ],
+            [
+                [
+                    'start-data' => '2020-03',
+                ],
+            ],
+            [
+                [
+                    'end-data' => '2020-03',
+                ],
+            ],
+            [
+                [
+                    'start-data' => '2020-03-01',
+                    'end-data'   => '2020-03',
+                ],
+            ],
+            [
+                [
+                    'start-data' => '2020-03',
+                    'end-data'   => '2020-03-31',
+                ],
+            ],
+            //
+            [
+                [
+                    'start-data' => '2020',
+                    'end-data'   => '2020',
+                ],
+            ],
+            [
+                [
+                    'start-data' => '2020',
+                ],
+            ],
+            [
+                [
+                    'end-data' => '2020',
+                ],
+            ],
+            [
+                [
+                    'start-data' => '2020-03-01',
+                    'end-data'   => '2020',
+                ],
+            ],
+            [
+                [
+                    'start-data' => '2020',
+                    'end-data'   => '2020-03-31',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @param array<string, string> $queryParams
+     *
+     * @dataProvider invalideFilterDataProvider
+     *
+     * @throws HttpInternalServerErrorException
+     * @throws NotDatabasesException
+     * @throws Exception
+     */
+    public function testBrowseWithInvalideParameter(array $queryParams): void
+    {
+        $this->request = $this->makeEmpty(Request::class, [
+            'getQueryParams' => $queryParams,
+        ]);
+        $controller = new WorkingHoursController($this->container);
+        $this->expectException(HttpBadRequestException::class);
+        $controller->browse($this->request, $this->response, []);
+    }
+
     /**
      * @throws NotDatabasesException
      * @throws HttpBadRequestException
@@ -91,7 +271,7 @@ class WorkingHoursControllerTest extends Unit
     {
         $controller = new WorkingHoursController($this->container);
         $response = $controller->update($this->request, $this->response, [
-            'id' => self::EXISTING_DATE
+            'id' => self::EXISTING_DATE,
         ]);
         $this->assertInstanceOf(Response::class, $response);
     }
@@ -106,23 +286,23 @@ class WorkingHoursControllerTest extends Unit
         $controller = new WorkingHoursController($this->container);
         $this->expectException(HttpNotFoundException::class);
         $controller->update($this->request, $this->response, [
-            'id' => self::NEW_DATE
+            'id' => self::NEW_DATE,
         ]);
     }
 
     /**
      * @return string[][]
      */
-    public function invalidDataProvider(): array
+    public function invalidCreatDataProvider(): array
     {
         return [
             [
                 self::NEW_DATE,
-                '07:59'
+                '07:59',
             ],
             [
                 '2020-13-33',
-                self::NEW_INTERVAL
+                self::NEW_INTERVAL,
             ],
         ];
     }
@@ -131,7 +311,7 @@ class WorkingHoursControllerTest extends Unit
      * @param string $date
      * @param string $time
      *
-     * @dataProvider invalidDataProvider
+     * @dataProvider invalidCreatDataProvider
      *
      * @throws HttpBadRequestException
      * @throws HttpConflictRequestException
@@ -145,7 +325,7 @@ class WorkingHoursControllerTest extends Unit
             'getParsedBody' => [
                 'workingDay'  => $date,
                 'workingTime' => $time,
-            ]
+            ],
         ]);
         $controller = new WorkingHoursController($this->container);
         $this->expectException(HttpBadRequestException::class);
@@ -165,7 +345,7 @@ class WorkingHoursControllerTest extends Unit
             'getParsedBody' => [
                 'workingDay'  => self::NEW_DATE,
                 'workingTime' => self::NEW_INTERVAL,
-            ]
+            ],
         ]);
         $controller = new WorkingHoursController($this->container);
         $response = $controller->creat($this->request, $this->response, []);
@@ -185,7 +365,7 @@ class WorkingHoursControllerTest extends Unit
             'getParsedBody' => [
                 'workingDay'  => self::EXISTING_DATE,
                 'workingTime' => self::EXISTING_INTERVAL,
-            ]
+            ],
         ]);
         $controller = new WorkingHoursController($this->container);
         $this->expectException(HttpConflictRequestException::class);
@@ -201,7 +381,7 @@ class WorkingHoursControllerTest extends Unit
     {
         $controller = new WorkingHoursController($this->container);
         $response = $controller->read($this->request, $this->response, [
-            'id' => self::EXISTING_DATE
+            'id' => self::EXISTING_DATE,
         ]);
         $this->assertInstanceOf(Response::class, $response);
     }
@@ -216,7 +396,7 @@ class WorkingHoursControllerTest extends Unit
         $controller = new WorkingHoursController($this->container);
         $this->expectException(HttpNotFoundException::class);
         $controller->read($this->request, $this->response, [
-            'id' => self::NEW_DATE
+            'id' => self::NEW_DATE,
         ]);
     }
 }
diff --git a/api/tests/unit/Repositories/WorkingHoursRepositoryTest.php b/api/tests/unit/Repositories/WorkingHoursRepositoryTest.php
index 5561505..7080ee9 100644
--- a/api/tests/unit/Repositories/WorkingHoursRepositoryTest.php
+++ b/api/tests/unit/Repositories/WorkingHoursRepositoryTest.php
@@ -2,6 +2,7 @@
 
 namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Repositories;
 
+use Codeception\Example;
 use Codeception\Test\Unit;
 use DateInterval;
 use DateTime;
@@ -10,6 +11,7 @@ use InvalidArgumentException;
 use PDO;
 use TorstenHettstedt\TimekeepingApi\Models\ModelInterface;
 use TorstenHettstedt\TimekeepingApi\Models\WorkingHours;
+use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryBadWhereDataException;
 use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryRecordAlreadyExistException;
 use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryRecordNotFoundException;
 use TorstenHettstedt\TimekeepingApi\Repositories\WorkingHoursRepository;
@@ -22,7 +24,7 @@ class WorkingHoursRepositoryTest extends Unit
     const NEW_INTERVAL      = 'PT7H59M';
     const RECORDS_COUNT     = 61;
 
-    protected PDO          $pdoObject;
+    protected PDO $pdoObject;
 
     protected function _before(): void
     {
@@ -34,7 +36,7 @@ class WorkingHoursRepositoryTest extends Unit
     /**
      * @throws Exception
      */
-    public function testFindAll(): void
+    public function testFindAllWithBlankParameter(): void
     {
         $repository = new WorkingHoursRepository($this->pdoObject);
         $models = $repository->findAll();
@@ -43,6 +45,81 @@ class WorkingHoursRepositoryTest extends Unit
         $this->assertCount(self::RECORDS_COUNT, $models);
     }
 
+    /**
+     * @return array<int, array<int|string|null>>
+     */
+    public function valideFilterParameter(): array
+    {
+        return [
+            [null,         null,         61,],
+            ['2020-04-01', null,          0,],
+            ['2020-04-01', '2020-04-30',  0,],
+            [null,         '2020-04-30', 61,],
+            ['2020-03-01', null,         22,],
+            ['2020-03-01', '2020-03-31', 22,],
+            ['2020-03-01', '2020-03-07',  5,],
+        ];
+    }
+
+    /**
+     * @param string|null $start
+     * @param string|null $ende
+     * @param int         $count
+     *
+     * @dataProvider valideFilterParameter
+     *
+     * @throws Exception
+     */
+    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->assertCount($count, $models);
+    }
+
+    /**
+     * @return array<int, array<int|string|null>>
+     */
+    public function invalideFilterParameter(): array
+    {
+        return [
+            ['2020-04-31',null],
+            [null,        '2020-04-31'],
+            ['2020-04-00','2020-04-31'],
+            ['2020-04-01','2020-04-31'],
+            ['2020-04-00','2020-04-30'],
+            //
+            ['2020-04',   null],
+            [null,        '2020-04'],
+            ['2020-04',   '2020-04'],
+            ['2020-04-01','2020-04'],
+            ['2020-04',   '2020-04-30'],
+            //
+            ['2020',      null],
+            [null,        '2020'],
+            ['2020',      '2020'],
+            ['2020-04-01','2020'],
+            ['2020',      '2020-04-30'],
+        ];
+    }
+
+    /**
+     * @param string|null $start
+     * @param string|null $ende
+     *
+     * @dataProvider invalideFilterParameter
+     *
+     * @throws Exception
+     */
+    public function testFindAllWithInvalideParameter(?string $start, ?string $ende): void
+    {
+        $repository = new WorkingHoursRepository($this->pdoObject);
+        $this->expectException(RepositoryBadWhereDataException::class);
+        $repository->findFiltered($start, $ende);
+    }
+
     /**
      * @throws RepositoryRecordNotFoundException
      */

From 084abbf42c9a14bf2030ed8c11954317f1f7d862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Wed, 2 Feb 2022 22:36:58 +0100
Subject: [PATCH 11/19] =?UTF-8?q?Feature:=20Methode=20zum=20Filtern=20der?=
 =?UTF-8?q?=20Eintr=C3=A4ge=20einbauen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Repositories/WorkingHoursRepository.php   | 57 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/api/src/Repositories/WorkingHoursRepository.php b/api/src/Repositories/WorkingHoursRepository.php
index f210037..82c81d1 100644
--- a/api/src/Repositories/WorkingHoursRepository.php
+++ b/api/src/Repositories/WorkingHoursRepository.php
@@ -10,6 +10,7 @@ use Exception;
 use InvalidArgumentException;
 use PDO;
 use PDOException;
+use PDOStatement;
 use TorstenHettstedt\TimekeepingApi\Models\ModelInterface;
 use TorstenHettstedt\TimekeepingApi\Models\WorkingHours;
 
@@ -42,10 +43,33 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
      * @throws PDOException
      */
     public function findAll(): array
+    {
+        return $this->findFiltered(null, null);
+    }
+
+    /**
+     *
+     * Gibt alle vorhandenen Einträge zurück
+     *
+     * @param string|null $start
+     * @param string|null $end
+     *
+     * @return WorkingHours[]
+     * @throws Exception
+     */
+    public function findFiltered(?string $start, ?string $end): array
     {
         $models = [];
-        $stmt = $this->database->prepare('select "Datum" as "workingDay", "Arbeitszeit" as "workingTime" from public."Arbeitszeiten" order by "Datum"');
-        $stmt->execute();
+        $stmt = $this->buildFindFilteredStatement($start, $end);
+        try {
+            $stmt->execute();
+        } catch (PDOException $exception) {
+            if ($exception->getCode() === '22007' || $exception->getCode() === '22008') {
+                throw new RepositoryBadWhereDataException($exception);
+            }
+            throw $exception;
+        }
+
         while ($row = $stmt->fetch()) {
             $model = new WorkingHours();
             $model
@@ -56,6 +80,35 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
         return $models;
     }
 
+    protected function buildFilterString(?string $start, ?string $end): string
+    {
+        if (is_string($start) && is_string($end)) {
+            return 'where "Datum" >= :start AND "Datum" <= :end ';
+        }
+        if (is_string($start)) {
+            return 'where "Datum" >= :start ';
+        }
+        if (is_string($end)) {
+            return 'where "Datum" <= :end ';
+        }
+        return '';
+    }
+
+    protected function buildFindFilteredStatement(?string $start, ?string $end): ?PDOStatement
+    {
+        $query = 'select "Datum" as "workingDay", "Arbeitszeit" as "workingTime" from public."Arbeitszeiten" ';
+        $query .= $this->buildFilterString($start, $end);
+        $query .= 'order by "Datum"';
+        $stmt = $this->database->prepare($query);
+        if (is_string($start)) {
+            $stmt->bindParam(':start', $start);
+        }
+        if (is_string($end)) {
+            $stmt->bindParam(':end', $end);
+        }
+        return $stmt ?? null;
+    }
+
     /**
      * Gibt den Eintrag zurück, der durch die ID
      *

From 4da284a0a64bf0fd3b2a6ffcccd620a259cfd5fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Wed, 2 Feb 2022 23:20:28 +0100
Subject: [PATCH 12/19] Test-Fix: vorgeschriebenen Query-Namen benutzen

---
 .../Controller/WorkingHoursControllerTest.php | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/api/tests/unit/Controller/WorkingHoursControllerTest.php b/api/tests/unit/Controller/WorkingHoursControllerTest.php
index 5be7a23..40d67e3 100644
--- a/api/tests/unit/Controller/WorkingHoursControllerTest.php
+++ b/api/tests/unit/Controller/WorkingHoursControllerTest.php
@@ -127,117 +127,117 @@ class WorkingHoursControllerTest extends Unit
         return [
             [
                 [
-                    'start-data' => null,
-                    'end-data'   => null,
+                    'start-date' => '',
+                    'end-date'   => '',
                 ],
             ],
             [
                 [
-                    'start-data' => null,
+                    'start-date' => '',
                 ],
             ],
             [
                 [
-                    'end-data' => null,
+                    'end-date' => '',
                 ],
             ],
             [
                 [
-                    'start-data' => '2020-03-01',
-                    'end-data'   => null,
+                    'start-date' => '2020-03-01',
+                    'end-date'   => '',
                 ],
             ],
             [
                 [
-                    'start-data' => null,
-                    'end-data'   => '2020-03-31',
+                    'start-date' => '',
+                    'end-date'   => '2020-03-31',
                 ],
             ],
             //
             [
                 [
-                    'start-data' => '2020-03-00',
-                    'end-data'   => '2020-04-31',
+                    'start-date' => '2020-03-00',
+                    'end-date'   => '2020-04-31',
                 ],
             ],
             [
                 [
-                    'start-data' => '2020-03-00',
+                    'start-date' => '2020-03-00',
                 ],
             ],
             [
                 [
-                    'end-data' => '2020-04-31',
+                    'end-date' => '2020-04-31',
                 ],
             ],
             [
                 [
-                    'start-data' => '2020-03-01',
-                    'end-data'   => '2020-04-31',
+                    'start-date' => '2020-03-01',
+                    'end-date'   => '2020-04-31',
                 ],
             ],
             [
                 [
-                    'start-data' => '2020-03-00',
-                    'end-data'   => '2020-03-31',
+                    'start-date' => '2020-03-00',
+                    'end-date'   => '2020-03-31',
                 ],
             ],
             //
             [
                 [
-                    'start-data' => '2020-03',
-                    'end-data'   => '2020-03',
+                    'start-date' => '2020-03',
+                    'end-date'   => '2020-03',
                 ],
             ],
             [
                 [
-                    'start-data' => '2020-03',
+                    'start-date' => '2020-03',
                 ],
             ],
             [
                 [
-                    'end-data' => '2020-03',
+                    'end-date' => '2020-03',
                 ],
             ],
             [
                 [
-                    'start-data' => '2020-03-01',
-                    'end-data'   => '2020-03',
+                    'start-date' => '2020-03-01',
+                    'end-date'   => '2020-03',
                 ],
             ],
             [
                 [
-                    'start-data' => '2020-03',
-                    'end-data'   => '2020-03-31',
+                    'start-date' => '2020-03',
+                    'end-date'   => '2020-03-31',
                 ],
             ],
             //
             [
                 [
-                    'start-data' => '2020',
-                    'end-data'   => '2020',
+                    'start-date' => '2020',
+                    'end-date'   => '2020',
                 ],
             ],
             [
                 [
-                    'start-data' => '2020',
+                    'start-date' => '2020',
                 ],
             ],
             [
                 [
-                    'end-data' => '2020',
+                    'end-date' => '2020',
                 ],
             ],
             [
                 [
-                    'start-data' => '2020-03-01',
-                    'end-data'   => '2020',
+                    'start-date' => '2020-03-01',
+                    'end-date'   => '2020',
                 ],
             ],
             [
                 [
-                    'start-data' => '2020',
-                    'end-data'   => '2020-03-31',
+                    'start-date' => '2020',
+                    'end-date'   => '2020-03-31',
                 ],
             ],
         ];

From 3bd3e6837ae55b767d4cb394c70007890b8544a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Wed, 2 Feb 2022 23:21:38 +0100
Subject: [PATCH 13/19] =?UTF-8?q?Feature:=20Methode=20zum=20Filtern=20der?=
 =?UTF-8?q?=20Eintr=C3=A4ge=20per=20Query=20in=20den=20*Controller*=20einb?=
 =?UTF-8?q?auen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/src/Controller/WorkingHoursController.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/api/src/Controller/WorkingHoursController.php b/api/src/Controller/WorkingHoursController.php
index 16cb385..be291db 100644
--- a/api/src/Controller/WorkingHoursController.php
+++ b/api/src/Controller/WorkingHoursController.php
@@ -12,6 +12,7 @@ use Slim\Exception\HttpNotFoundException;
 use Slim\Psr7\Request;
 use Slim\Psr7\Response;
 use TorstenHettstedt\TimekeepingApi\Models\WorkingHours;
+use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryBadWhereDataException;
 use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryRecordAlreadyExistException;
 use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryRecordNotFoundException;
 use TorstenHettstedt\TimekeepingApi\Repositories\WorkingHoursRepository;
@@ -50,13 +51,20 @@ class WorkingHoursController extends AbstractController
      * @return Response
      *
      * @throws HttpInternalServerErrorException
+     * @throws HttpBadRequestException
      * @noinspection PhpUnusedParameterInspection
      */
     public function browse(Request $request, Response $response, array $args): Response
     {
         $repository = new WorkingHoursRepository($this->databases);
+        $queryParams = $request->getQueryParams();
         try {
-            return $this->printResponse($response, $repository->findAll(), StatusCodeInterface::STATUS_OK);
+            return $this->printResponse($response, $repository->findFiltered(
+                $queryParams['start-date'] ?? null,
+                $queryParams['end-date'] ?? null
+            ), 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);
         }

From 094b50d33d5ba4b1cfdafb705c118d8820961a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Wed, 2 Feb 2022 23:39:25 +0100
Subject: [PATCH 14/19] =?UTF-8?q?Fix-Test:=20Pr=C3=BCfung=20auf=20eine=20l?=
 =?UTF-8?q?eere=20Liste=20muss=20ausgelagert=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/WorkingHours/BrowseWorkingHoursCest.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/api/tests/api/WorkingHours/BrowseWorkingHoursCest.php b/api/tests/api/WorkingHours/BrowseWorkingHoursCest.php
index 823495f..bd193e5 100644
--- a/api/tests/api/WorkingHours/BrowseWorkingHoursCest.php
+++ b/api/tests/api/WorkingHours/BrowseWorkingHoursCest.php
@@ -21,13 +21,28 @@ class BrowseWorkingHoursCest
         $I->seeHttpHeader('Access-Control-Max-Age');
     }
 
+    /**
+     * @param ApiTester $I
+     *
+     * @dataProvider validWorkingHoursFilterProvider
+     */
+    public function browseEmptyWorkingHours(ApiTester $I): void
+    {
+        $I->haveHttpHeader('Origin', Api::TEST_ORIGIN);
+        $I->sendGet('/working-hours', ['start-date' => '2020-04-01', 'end-date' => '2020-04-30']);
+        $I->seeResponseCodeIs(HttpCode::OK);
+        $I->canSeeHttpHeader('Access-Control-Allow-Origin', Api::TEST_ORIGIN);
+        $I->seeResponseIsJson();
+        $I->seeResponseEquals('[]');
+    }
+
     public function validWorkingHoursFilterProvider(): array
     {
         return [
             [[null]],
             [['start-date' => '2020-01-01', 'end-date' => '2020-01-08']],
             [['start-date' => '2020-01-01', 'end-date' => '2020-04-30']],
-            [['start-date' => '2020-04-01', 'end-date' => '2020-04-30']],
+            [['start-date' => '2020-03-01', 'end-date' => '2020-03-07']],
         ];
     }
 

From 0813fd637b34ea4545eec458a1c73a769f015d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Thu, 24 Feb 2022 16:23:49 +0100
Subject: [PATCH 15/19] Fix: Der pure Aufruf darf nicht durch einen
 *Catch*-Verarbeitung abgebrochen werden

---
 ui/src/components/Repositories.svelte | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/Repositories.svelte b/ui/src/components/Repositories.svelte
index edb7440..8f395a3 100644
--- a/ui/src/components/Repositories.svelte
+++ b/ui/src/components/Repositories.svelte
@@ -20,7 +20,10 @@
         },
         '_fetch': async (rest_url, request_options) => {
             // noinspection JSUnresolvedVariable
-            let response = await MyFetch._pureFetch(rest_url, request_options)
+            let response = await MyFetch._pureFetch(rest_url, request_options).catch(err => {
+                console.error(err)
+                return null
+            })
             if (!response.ok) {
                 throw new Error('Fail!')
             }
@@ -40,10 +43,7 @@
         },
         '_pureFetch': async (rest_url, request_options) => {
             // noinspection JSUnresolvedVariable
-            return await fetch(env.API_URL + rest_url, request_options).catch(err => {
-                console.error(err)
-                return null
-            })
+            return await fetch(env.API_URL + rest_url, request_options)
         }
     }
 

From 47ed40818581162fbaffb5cd223c86df6c537ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Thu, 24 Feb 2022 16:24:34 +0100
Subject: [PATCH 16/19] =?UTF-8?q?Feature:=20Die=20Liste=20der=20Eintr?=
 =?UTF-8?q?=C3=A4ge=20kann=20gefiltert=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/Repositories.svelte | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/Repositories.svelte b/ui/src/components/Repositories.svelte
index 8f395a3..15361bd 100644
--- a/ui/src/components/Repositories.svelte
+++ b/ui/src/components/Repositories.svelte
@@ -48,8 +48,15 @@
     }
 
     export const WorkingHoursRepository = {
-        'browse': () => {
-            return MyFetch.get('/working-hours')
+        '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 => {

From 0a21c6ed356d63660a47f7bc46597c8f5127fc8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Thu, 24 Feb 2022 16:26:00 +0100
Subject: [PATCH 17/19] =?UTF-8?q?Feature:=20Die=20Eintr=C3=A4ge=20werden?=
 =?UTF-8?q?=20als=20Liste=20bereitgestellt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Dadurch kann auch eine ganze Woche eingetragen werden.
---
 .../WorkingHours/Formular/EditByDay.svelte    | 23 +++++++
 .../WorkingHours/Formular/EditByWeek.svelte   | 62 +++++++++++++++++++
 ui/src/routes/working-hours/NewByDay.svelte   | 17 -----
 3 files changed, 85 insertions(+), 17 deletions(-)
 create mode 100644 ui/src/routes/WorkingHours/Formular/EditByDay.svelte
 create mode 100644 ui/src/routes/WorkingHours/Formular/EditByWeek.svelte
 delete mode 100644 ui/src/routes/working-hours/NewByDay.svelte

diff --git a/ui/src/routes/WorkingHours/Formular/EditByDay.svelte b/ui/src/routes/WorkingHours/Formular/EditByDay.svelte
new file mode 100644
index 0000000..c366758
--- /dev/null
+++ b/ui/src/routes/WorkingHours/Formular/EditByDay.svelte
@@ -0,0 +1,23 @@
+<script>
+    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={activeRecordList[0].workingDay} type="date"
+                   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}
\ No newline at end of file
diff --git a/ui/src/routes/WorkingHours/Formular/EditByWeek.svelte b/ui/src/routes/WorkingHours/Formular/EditByWeek.svelte
new file mode 100644
index 0000000..3cd9e8b
--- /dev/null
+++ b/ui/src/routes/WorkingHours/Formular/EditByWeek.svelte
@@ -0,0 +1,62 @@
+<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}
\ No newline at end of file
diff --git a/ui/src/routes/working-hours/NewByDay.svelte b/ui/src/routes/working-hours/NewByDay.svelte
deleted file mode 100644
index 79e721e..0000000
--- a/ui/src/routes/working-hours/NewByDay.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<script>
-    export let activeRecord
-</script>
-
-
-<fieldset name="record-data">
-    <div>
-        <label for="workingDay">Arbeitstag</label>
-        <input bind:value={activeRecord.workingDay} type="date"
-               id="workingDay" required pattern="\d\{4}-[0-1]\d-[0-3]\d\">
-    </div>
-    <div>
-        <label for="workingTime">Arbeitszeit</label>
-        <input bind:value={activeRecord.workingTime} placeholder="Arbeitszeit" type="time"
-               id="workingTime" required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
-    </div>
-</fieldset>
\ No newline at end of file

From 18c5c45c26a516e9b180e78dd9ff7df37b2b4ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Fri, 25 Feb 2022 10:59:12 +0100
Subject: [PATCH 18/19] =?UTF-8?q?Fix:=20=C3=84nderungen=20des=20Datums=20m?=
 =?UTF-8?q?=C3=BCssen=20verarbeitet=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/routes/WorkingHours/Formular/EditByDay.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/src/routes/WorkingHours/Formular/EditByDay.svelte b/ui/src/routes/WorkingHours/Formular/EditByDay.svelte
index c366758..3099bea 100644
--- a/ui/src/routes/WorkingHours/Formular/EditByDay.svelte
+++ b/ui/src/routes/WorkingHours/Formular/EditByDay.svelte
@@ -1,4 +1,5 @@
 <script>
+    export let activeDate = null
     export let activeRecordList = []
     export let makeTimekeepingList = () => {}
 
@@ -11,7 +12,7 @@
     <fieldset name="record-data-by-day">
         <div>
             <label for="workingDay">Arbeitstag</label>
-            <input bind:value={activeRecordList[0].workingDay} type="date"
+            <input bind:value={activeDate} type="date" on:change={makeTimekeepingList}
                    id="workingDay" required pattern="\d\{4}-[0-1]\d-[0-3]\d\">
         </div>
         <div>

From 06128f72fcd99fd5260b9e3ae20a28143da8d9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Fri, 25 Feb 2022 12:20:13 +0100
Subject: [PATCH 19/19] Feature: Der Wechsel der Eintrags-Periode wird durch
 ein Menu bestimmt

---
 ui/public/less/lesslib/layout.less         |  23 +++++
 ui/src/routes/WorkingHours/Formular.svelte | 109 ++++++++++++++++-----
 2 files changed, 109 insertions(+), 23 deletions(-)

diff --git a/ui/public/less/lesslib/layout.less b/ui/public/less/lesslib/layout.less
index ab1e143..d0bd78a 100644
--- a/ui/public/less/lesslib/layout.less
+++ b/ui/public/less/lesslib/layout.less
@@ -91,6 +91,29 @@ main {
         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;
+                    padding: 0.5rem;
+                    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;
diff --git a/ui/src/routes/WorkingHours/Formular.svelte b/ui/src/routes/WorkingHours/Formular.svelte
index cd78af2..a775e12 100644
--- a/ui/src/routes/WorkingHours/Formular.svelte
+++ b/ui/src/routes/WorkingHours/Formular.svelte
@@ -3,39 +3,102 @@
     import IconifyIcon from '@iconify/svelte'
     import checkIcon from '@iconify-icons/oi/check'
     import xIcon from '@iconify-icons/oi/x'
-    import {TimekeepingDate} from "../../components/TimekeepingDate.svelte"
+    import EditByDay from "./Formular/EditByDay.svelte";
+    import EditByWeek from "./Formular/EditByWeek.svelte";
+    import {TimekeepingDate} from "../../components/TimekeepingDate.svelte";
+
+    const DAILY_EDIT = 0
+    const WEEKLY_EDIT = 1
 
-    export let activeRecord = null
     const Controller = {
         'saveRecord': () => {
-            WorkingHoursRepository.addOrUpdate(activeRecord.workingDay, activeRecord).then(() => {
-                Controller.nextDay()
-            });
-        },
-        'nextDay': async () => {
-            let actDate = new TimekeepingDate(activeRecord.workingDay)
-            let nextDay = actDate.getNextDay()
-            activeRecord = await WorkingHoursRepository.readOrNew(nextDay.getDateString())
+            activeRecordList.forEach((actualRecord) => {
+                if (actualRecord.workingTime === '00:00:00') {
+                    return
+                }
+                WorkingHoursRepository.addOrUpdate(actualRecord.workingDay, actualRecord);
+            })
+            activeDate = nextDate
+            makeTimekeepingList()
         },
         'cancelActiveRecord': () => {
-            activeRecord = null;
+            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 MenuController = {
+        'dailyEdit': () => {
+            period_of_edit = DAILY_EDIT
+            makeTimekeepingList = DayController.makeTimekeepingList
+            makeTimekeepingList()
+        },
+        'weeklyEdit': () => {
+            period_of_edit = WEEKLY_EDIT
+            makeTimekeepingList = WeekController.makeTimekeepingList
+            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">
-    <fieldset name="record-data">
-        <div>
-            <label for="workingDay">Arbeitstag</label>
-            <input bind:value={activeRecord.workingDay} type="date"
-                   id="workingDay" required pattern="\d\{4}-[0-1]\d-[0-3]\d\">
-        </div>
-        <div>
-            <label for="workingTime">Arbeitszeit</label>
-            <input bind:value={activeRecord.workingTime} placeholder="Arbeitszeit" type="time"
-                   id="workingTime" required pattern="[0-5]\d:[0-5]\d:[0-5]\d">
-        </div>
-    </fieldset>
+    <nav class="menu">
+        <span on:click={MenuController.dailyEdit} class:active={period_of_edit === DAILY_EDIT}>Täglich</span>
+        <span on:click={MenuController.weeklyEdit} class:active={period_of_edit === WEEKLY_EDIT}>Wöchentlich</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}
     <fieldset name="buttons">
         <button on:click={Controller.saveRecord} type="button">Übernehmen und Weiter
             <IconifyIcon icon={checkIcon} color="green"/>