diff --git a/ui/src/components/App.svelte b/ui/src/components/App.svelte index 0852d11..9071f90 100644 --- a/ui/src/components/App.svelte +++ b/ui/src/components/App.svelte @@ -46,36 +46,6 @@ addEventListener('popstate', track); - let w = { - "period": "2020#01", - "workingDays": 20, - "totalHours": "99:00:00", - "overtime": "10:22:00" - }; - let weekly = { - "title" : "Wochenansicht", - "records" : [w, w] - }; - let m = { - "period": "2020-01", - "workingDays": 20, - "totalHours": "99:00:00", - "overtime": "10:22:00" - }; - let monthly = { - "title" : "Monatsansicht", - "records" : [m, m] - }; - let y = { - "period": "2020", - "workingDays": 20, - "totalHours": "99:00:00", - "overtime": "10:22:00" - }; - let yearly = { - "title" : "Jahresansicht", - "records" : [y, y] - }; let r = { "workingDay": "2020-01-15", "workingTime": "09:00:00" @@ -86,10 +56,10 @@ }; const router = Navaid('/') - .on('/', () => run(import('../routes/Home.svelte'), weekly)) - .on('/views/weekly', () => run(import('../routes/Views.svelte'), weekly)) - .on('/views/monthly', () => run(import('../routes/Views.svelte'), monthly)) - .on('/views/yearly', () => run(import('../routes/Views.svelte'), yearly)) + .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'), records)) .listen(); diff --git a/ui/src/routes/Home.svelte b/ui/src/routes/Home.svelte index 8041d2c..4a0fa9d 100644 --- a/ui/src/routes/Home.svelte +++ b/ui/src/routes/Home.svelte @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/ui/src/routes/MonthlyViews.svelte b/ui/src/routes/MonthlyViews.svelte new file mode 100644 index 0000000..fd4166e --- /dev/null +++ b/ui/src/routes/MonthlyViews.svelte @@ -0,0 +1,31 @@ + + + \ No newline at end of file diff --git a/ui/src/routes/Views.svelte b/ui/src/routes/Views.svelte index e61e5e4..8c7ee11 100644 --- a/ui/src/routes/Views.svelte +++ b/ui/src/routes/Views.svelte @@ -1,5 +1,6 @@ @@ -11,25 +12,29 @@

{params.title}

- - - - - - - - - - - {#each params.records as record} + {#if params.isLoading === true} +

Loading...

+ {:else} +
ZeitraumArbeitstageArbeitsstundenÜber- / Unterstunden
+ - - - - + + + + - {/each} - -
{record.period}{record.workingDays}{record.totalHours}{record.overtime}ZeitraumArbeitstageArbeitsstundenÜber- / Unterstunden
+ + + {#each params.records as record} + + {record.period} + {record.workingDays} + {record.totalHours} + {record.overtime} + + {/each} + + + {/if}
\ No newline at end of file diff --git a/ui/src/routes/WeeklyViews.svelte b/ui/src/routes/WeeklyViews.svelte new file mode 100644 index 0000000..34eb07b --- /dev/null +++ b/ui/src/routes/WeeklyViews.svelte @@ -0,0 +1,31 @@ + + + \ No newline at end of file diff --git a/ui/src/routes/YearlyViews.svelte b/ui/src/routes/YearlyViews.svelte new file mode 100644 index 0000000..974b2b1 --- /dev/null +++ b/ui/src/routes/YearlyViews.svelte @@ -0,0 +1,31 @@ + + + \ No newline at end of file