From c3a1953cc95bd491831acd3161fe52c988d18323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20L=C3=BCcke?= <privat@torsten-hettstedt.de>
Date: Wed, 15 Dec 2021 18:50:32 +0100
Subject: [PATCH] =?UTF-8?q?Refactor:=20Anzeige=20der=20verschiedenen=20Zei?=
 =?UTF-8?q?tr=C3=A4ume=20verbessern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/routes/MonthlyViews.svelte | 14 ++------------
 ui/src/routes/Views.svelte        | 14 +++++++++++---
 ui/src/routes/WeeklyViews.svelte  | 14 ++------------
 ui/src/routes/YearlyViews.svelte  | 14 ++------------
 4 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/ui/src/routes/MonthlyViews.svelte b/ui/src/routes/MonthlyViews.svelte
index 3818a8c..b2ac1f2 100644
--- a/ui/src/routes/MonthlyViews.svelte
+++ b/ui/src/routes/MonthlyViews.svelte
@@ -1,21 +1,11 @@
 <script>
     import Views from "./Views.svelte";
     import {WorkingHoursViewsRepository} from "../components/Repositories.svelte";
-    export let params;
+    export let params
     params = {
         title: 'Monatsansicht',
-        records: [],
-        isLoading: true
+        promise: WorkingHoursViewsRepository.monthly()
     }
-    const View = {
-        'browse': () => {
-            WorkingHoursViewsRepository.monthly().then(data => {
-                params.records = data;
-                params.isLoading = false;
-            })
-        }
-    };
-    View.browse();
 </script>
 
 <Views {params} />
\ No newline at end of file
diff --git a/ui/src/routes/Views.svelte b/ui/src/routes/Views.svelte
index 0a665a2..70c5086 100644
--- a/ui/src/routes/Views.svelte
+++ b/ui/src/routes/Views.svelte
@@ -1,5 +1,7 @@
 <script>
-    export let params;
+    export let params = {};
+    let records = []
+    let isLoading = true
     console.log(params)
     if (!String.prototype.startsWith) {
         String.prototype.startsWith = function(searchString, position) {
@@ -9,6 +11,12 @@
     }
     $: 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>
@@ -20,7 +28,7 @@
         <h1>{params.title}</h1>
     </header>
     <article>
-        {#if params.isLoading === true}
+        {#if isLoading === true}
             <p>Loading...</p>
         {:else}
             <table>
@@ -39,7 +47,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                {#each params.records as record}
+                {#each records as record}
                     <tr>
                         <td>{record.period}</td>
                         <td>{record.workingDays}</td>
diff --git a/ui/src/routes/WeeklyViews.svelte b/ui/src/routes/WeeklyViews.svelte
index 7483dd5..6700321 100644
--- a/ui/src/routes/WeeklyViews.svelte
+++ b/ui/src/routes/WeeklyViews.svelte
@@ -1,21 +1,11 @@
 <script>
     import Views from "./Views.svelte";
     import {WorkingHoursViewsRepository} from "../components/Repositories.svelte";
-    export let params;
+    export let params
     params = {
         title: 'Wochenansicht',
-        records: [],
-        isLoading: true
+        promise: WorkingHoursViewsRepository.weekly()
     }
-    const View = {
-        'browse': () => {
-            WorkingHoursViewsRepository.weekly().then(data => {
-                params.records = data;
-                params.isLoading = false;
-            })
-        }
-    };
-    View.browse();
 </script>
 
 <Views {params} />
\ No newline at end of file
diff --git a/ui/src/routes/YearlyViews.svelte b/ui/src/routes/YearlyViews.svelte
index 376a1ae..f3ea452 100644
--- a/ui/src/routes/YearlyViews.svelte
+++ b/ui/src/routes/YearlyViews.svelte
@@ -1,21 +1,11 @@
 <script>
     import Views from "./Views.svelte";
     import {WorkingHoursViewsRepository} from "../components/Repositories.svelte";
-    export let params;
+    export let params
     params = {
         title: 'Jahresansicht',
-        records: [],
-        isLoading: true
+        promise: WorkingHoursViewsRepository.yearly()
     }
-    const View = {
-        'browse': () => {
-            WorkingHoursViewsRepository.yearly().then(data => {
-                params.records = data;
-                params.isLoading = false;
-            })
-        }
-    };
-    View.browse();
 </script>
 
 <Views {params} />
\ No newline at end of file