24 Commits
Author SHA1 Message Date
Torstem_JetBrain 616ed6383e Merge branch 'feature-ui/pagination-tabellen'
# Conflicts:
#	ui/src/routes/WorkingHours/Formular.svelte
#	ui/src/routes/WorkingHours/Formular/ImportCsv.svelte
2023-03-05 12:56:36 +01:00
Torstem_JetBrain e187bdeab7 Feature: füge Pagination zum CSV-Import hinzu 2023-02-27 18:37:35 +01:00
Torstem_JetBrain c35b3a86f3 bugfix: erfülle die Voraussetzungen bei klickbaren SPAN-Element 2023-02-27 18:30:22 +01:00
Torstem_JetBrain 4b12eb3897 Feature: ermögliche den Import von CSV-Daten 2023-02-27 18:30:21 +01:00
Torstem_JetBrain 3452aa9999 Refactor: entferne ungenutzte Variable 2023-02-27 18:12:04 +01:00
Torstem_JetBrain 072e99c6fb Feature: füge Pagination zum CSV-Import hinzu 2023-02-27 18:11:36 +01:00
Torstem_JetBrain 608d96ac4e Refactor: kürzere CSV-Datei 2023-02-27 18:00:15 +01:00
Torstem_JetBrain 51b5eb423c Refactor: Nutze Nullish Coalescing Assignment 2023-02-27 18:00:15 +01:00
Torstem_JetBrain 6e9ec73db4 Feature: ermögliche den Import von CSV-Daten 2023-02-27 18:00:15 +01:00
Torstem_JetBrain 1e48a5b608 Bugfix: Füge Vorassetzungen hinzu 2023-02-27 17:58:48 +01:00
TorstenHettstedt dc7d84e35f Merge pull request 'api-feature/import-per-csv' (#25) from api-feature/import-per-csv into master
Reviewed-on: #25
2023-02-27 17:55:32 +01:00
Torstem_JetBrain 5bbcc961e6 Refactor: kürzere CSV-Datei 2023-02-27 17:53:38 +01:00
Torstem_JetBrain 94b22c1d26 Refactor: Nutze Nullish Coalescing Assignment 2023-02-27 17:53:37 +01:00
Torstem_JetBrain 99cee223de Feature: stelle die Pagination-Navigation schön dar 2023-02-25 17:21:47 +01:00
Torstem_JetBrain fbbb563aad Feature: nutze für Tabellen eine Pagination 2023-02-25 13:05:32 +01:00
Torstem_JetBrain d7e99cbf30 bugfix: erfülle die Voraussetzungen bei klickbaren SPAN-Element 2023-02-25 13:04:07 +01:00
Torstem_JetBrain 3e291171a8 Feature: ermögliche den Import von CSV-Daten 2023-02-25 12:12:53 +01:00
Torstem_JetBrain 7ef5c43901 Bugfix: Füge Vorassetzungen hinzu 2023-02-25 12:10:52 +01:00
TorstenHettstedt 9932f33c34 Merge pull request 'feature-ui/eintrag-per-woche' (#23) from feature-ui/eintrag-per-woche into master
Reviewed-on: #23
2022-02-28 16:04:31 +01:00
Torstem_JetBrain 06128f72fc Feature: Der Wechsel der Eintrags-Periode wird durch ein Menu bestimmt 2022-02-25 12:20:13 +01:00
Torstem_JetBrain 18c5c45c26 Fix: Änderungen des Datums müssen verarbeitet werden 2022-02-25 10:59:12 +01:00
Torstem_JetBrain 0a21c6ed35 Feature: Die Einträge werden als Liste bereitgestellt
Dadurch kann auch eine ganze Woche eingetragen werden.
2022-02-24 16:26:00 +01:00
Torstem_JetBrain 47ed408185 Feature: Die Liste der Einträge kann gefiltert werden 2022-02-24 16:24:34 +01:00
Torstem_JetBrain 0813fd637b Fix: Der pure Aufruf darf nicht durch einen *Catch*-Verarbeitung abgebrochen werden 2022-02-24 16:23:49 +01:00
16 changed files with 498 additions and 75 deletions
+1
View File
@@ -6,6 +6,7 @@
.idea/**/workspace.xml .idea/**/workspace.xml
.idea/**/tasks.xml .idea/**/tasks.xml
.idea/**/usage.statistics.xml .idea/**/usage.statistics.xml
.idea/**/markdown.xml
.idea/**/dictionaries .idea/**/dictionaries
.idea/**/shelf .idea/**/shelf
+16 -1
View File
@@ -1,5 +1,20 @@
#!/usr/bin/env bash #!/usr/bin/env bash
create_css_files() {
cd ui/public || exit 2
lessc --source-map less/print.less print.css
lessc --source-map less/global.less global.css
cd ../..
}
install_ui_dependence() {
cd ui/ || exit 2
npm install
cd ..
}
install_api_dependence() { install_api_dependence() {
cd api/ || exit 2 cd api/ || exit 2
composer install composer install
@@ -29,4 +44,4 @@ composer_run() {
docker-compose up -d docker-compose up -d
} }
install_api_dependence && build_ui && test_unit && composer_run && test_api create_css_files && install_ui_dependence && install_api_dependence && build_ui && test_unit && composer_run && test_api
+62
View File
@@ -0,0 +1,62 @@
Aktivität;Dauer;Von;Bis;Kommentar
Arbeit;04:19;2021-07-30 13:01;2021-07-30 17:20;
Mittagspause ;00:45;2021-07-30 12:16;2021-07-30 13:01;
Arbeit;04:22;2021-07-30 07:54;2021-07-30 12:16;
Arbeit;03:25;2021-07-29 13:25;2021-07-29 16:50;
Mittagspause ;01:01;2021-07-29 12:23;2021-07-29 13:25;
Arbeit;04:44;2021-07-29 07:39;2021-07-29 12:23;
Arbeit;04:47;2021-07-28 12:49;2021-07-28 17:37;
Mittagspause ;00:58;2021-07-28 11:51;2021-07-28 12:49;
Arbeit;03:48;2021-07-28 08:02;2021-07-28 11:51;
Arbeit;03:49;2021-07-27 12:34;2021-07-27 16:24;
Mittagspause ;00:47;2021-07-27 11:47;2021-07-27 12:34;
Arbeit;03:20;2021-07-27 08:27;2021-07-27 11:47;
Arbeit;04:47;2021-07-26 12:59;2021-07-26 17:47;
Mittagspause ;00:52;2021-07-26 12:07;2021-07-26 12:59;
Arbeit;03:59;2021-07-26 08:08;2021-07-26 12:07;
Arbeit;05:53;2021-07-23 12:43;2021-07-23 18:37;
Mittagspause ;00:36;2021-07-23 12:07;2021-07-23 12:43;
Arbeit;04:10;2021-07-23 07:57;2021-07-23 12:07;
Arbeit;04:09;2021-07-22 12:54;2021-07-22 17:04;
Mittagspause ;00:42;2021-07-22 12:11;2021-07-22 12:54;
Arbeit;04:16;2021-07-22 07:55;2021-07-22 12:11;
Arbeit;03:11;2021-07-21 13:37;2021-07-21 16:48;
Mittagspause ;01:07;2021-07-21 12:29;2021-07-21 13:37;
Arbeit;04:58;2021-07-21 07:31;2021-07-21 12:29;
Arbeit;01:17;2021-07-20 18:44;2021-07-20 20:02;
Arbeit;03:50;2021-07-20 13:14;2021-07-20 17:04;
Mittagspause ;00:41;2021-07-20 12:32;2021-07-20 13:14;
Arbeit;04:55;2021-07-20 07:37;2021-07-20 12:32;
Arbeit;03:19;2021-07-19 13:12;2021-07-19 16:31;
Mittagspause ;00:52;2021-07-19 12:20;2021-07-19 13:12;
Arbeit;04:28;2021-07-19 07:51;2021-07-19 12:20;
Arbeit;02:48;2021-07-16 12:55;2021-07-16 15:43;
Mittagspause ;00:47;2021-07-16 12:07;2021-07-16 12:55;
Arbeit;04:01;2021-07-16 08:06;2021-07-16 12:07;
Arbeit;03:38;2021-07-15 13:05;2021-07-15 16:43;
Mittagspause ;01:05;2021-07-15 11:59;2021-07-15 13:05;
Arbeit;03:56;2021-07-15 08:02;2021-07-15 11:59;
Arbeit;03:38;2021-07-14 13:07;2021-07-14 16:45;
Mittagspause ;01:00;2021-07-14 12:07;2021-07-14 13:07;
Arbeit;04:00;2021-07-14 08:06;2021-07-14 12:07;
Arbeit;04:22;2021-07-13 12:53;2021-07-13 17:15;
Mittagspause ;01:03;2021-07-13 11:50;2021-07-13 12:53;
Arbeit;03:47;2021-07-13 08:02;2021-07-13 11:50;
Arbeit;03:26;2021-07-12 13:02;2021-07-12 16:28;
Mittagspause ;01:03;2021-07-12 11:58;2021-07-12 13:02;
Arbeit;04:14;2021-07-12 07:44;2021-07-12 11:58;
Arbeit;03:57;2021-07-09 13:09;2021-07-09 17:06;
Mittagspause ;01:06;2021-07-09 12:02;2021-07-09 13:09;
Arbeit;03:57;2021-07-09 08:04;2021-07-09 12:02;
Arbeit;03:17;2021-07-08 13:12;2021-07-08 16:29;
Mittagspause ;01:07;2021-07-08 12:04;2021-07-08 13:12;
Arbeit;04:00;2021-07-08 08:03;2021-07-08 12:04;
Arbeit;03:41;2021-07-07 13:08;2021-07-07 16:49;
Mittagspause ;01:00;2021-07-07 12:07;2021-07-07 13:08;
Arbeit;04:05;2021-07-07 08:02;2021-07-07 12:07;
Arbeit;02:50;2021-07-06 13:05;2021-07-06 15:55;
Mittagspause ;01:05;2021-07-06 11:59;2021-07-06 13:05;
Arbeit;03:49;2021-07-06 08:10;2021-07-06 11:59;
Arbeit;03:32;2021-07-05 13:00;2021-07-05 16:33;
Mittagspause ;00:59;2021-07-05 12:00;2021-07-05 13:00;
Arbeit;03:48;2021-07-05 08:12;2021-07-05 12:00;
1 Aktivität Dauer Von Bis Kommentar
2 Arbeit 04:19 2021-07-30 13:01 2021-07-30 17:20
3 Mittagspause 00:45 2021-07-30 12:16 2021-07-30 13:01
4 Arbeit 04:22 2021-07-30 07:54 2021-07-30 12:16
5 Arbeit 03:25 2021-07-29 13:25 2021-07-29 16:50
6 Mittagspause 01:01 2021-07-29 12:23 2021-07-29 13:25
7 Arbeit 04:44 2021-07-29 07:39 2021-07-29 12:23
8 Arbeit 04:47 2021-07-28 12:49 2021-07-28 17:37
9 Mittagspause 00:58 2021-07-28 11:51 2021-07-28 12:49
10 Arbeit 03:48 2021-07-28 08:02 2021-07-28 11:51
11 Arbeit 03:49 2021-07-27 12:34 2021-07-27 16:24
12 Mittagspause 00:47 2021-07-27 11:47 2021-07-27 12:34
13 Arbeit 03:20 2021-07-27 08:27 2021-07-27 11:47
14 Arbeit 04:47 2021-07-26 12:59 2021-07-26 17:47
15 Mittagspause 00:52 2021-07-26 12:07 2021-07-26 12:59
16 Arbeit 03:59 2021-07-26 08:08 2021-07-26 12:07
17 Arbeit 05:53 2021-07-23 12:43 2021-07-23 18:37
18 Mittagspause 00:36 2021-07-23 12:07 2021-07-23 12:43
19 Arbeit 04:10 2021-07-23 07:57 2021-07-23 12:07
20 Arbeit 04:09 2021-07-22 12:54 2021-07-22 17:04
21 Mittagspause 00:42 2021-07-22 12:11 2021-07-22 12:54
22 Arbeit 04:16 2021-07-22 07:55 2021-07-22 12:11
23 Arbeit 03:11 2021-07-21 13:37 2021-07-21 16:48
24 Mittagspause 01:07 2021-07-21 12:29 2021-07-21 13:37
25 Arbeit 04:58 2021-07-21 07:31 2021-07-21 12:29
26 Arbeit 01:17 2021-07-20 18:44 2021-07-20 20:02
27 Arbeit 03:50 2021-07-20 13:14 2021-07-20 17:04
28 Mittagspause 00:41 2021-07-20 12:32 2021-07-20 13:14
29 Arbeit 04:55 2021-07-20 07:37 2021-07-20 12:32
30 Arbeit 03:19 2021-07-19 13:12 2021-07-19 16:31
31 Mittagspause 00:52 2021-07-19 12:20 2021-07-19 13:12
32 Arbeit 04:28 2021-07-19 07:51 2021-07-19 12:20
33 Arbeit 02:48 2021-07-16 12:55 2021-07-16 15:43
34 Mittagspause 00:47 2021-07-16 12:07 2021-07-16 12:55
35 Arbeit 04:01 2021-07-16 08:06 2021-07-16 12:07
36 Arbeit 03:38 2021-07-15 13:05 2021-07-15 16:43
37 Mittagspause 01:05 2021-07-15 11:59 2021-07-15 13:05
38 Arbeit 03:56 2021-07-15 08:02 2021-07-15 11:59
39 Arbeit 03:38 2021-07-14 13:07 2021-07-14 16:45
40 Mittagspause 01:00 2021-07-14 12:07 2021-07-14 13:07
41 Arbeit 04:00 2021-07-14 08:06 2021-07-14 12:07
42 Arbeit 04:22 2021-07-13 12:53 2021-07-13 17:15
43 Mittagspause 01:03 2021-07-13 11:50 2021-07-13 12:53
44 Arbeit 03:47 2021-07-13 08:02 2021-07-13 11:50
45 Arbeit 03:26 2021-07-12 13:02 2021-07-12 16:28
46 Mittagspause 01:03 2021-07-12 11:58 2021-07-12 13:02
47 Arbeit 04:14 2021-07-12 07:44 2021-07-12 11:58
48 Arbeit 03:57 2021-07-09 13:09 2021-07-09 17:06
49 Mittagspause 01:06 2021-07-09 12:02 2021-07-09 13:09
50 Arbeit 03:57 2021-07-09 08:04 2021-07-09 12:02
51 Arbeit 03:17 2021-07-08 13:12 2021-07-08 16:29
52 Mittagspause 01:07 2021-07-08 12:04 2021-07-08 13:12
53 Arbeit 04:00 2021-07-08 08:03 2021-07-08 12:04
54 Arbeit 03:41 2021-07-07 13:08 2021-07-07 16:49
55 Mittagspause 01:00 2021-07-07 12:07 2021-07-07 13:08
56 Arbeit 04:05 2021-07-07 08:02 2021-07-07 12:07
57 Arbeit 02:50 2021-07-06 13:05 2021-07-06 15:55
58 Mittagspause 01:05 2021-07-06 11:59 2021-07-06 13:05
59 Arbeit 03:49 2021-07-06 08:10 2021-07-06 11:59
60 Arbeit 03:32 2021-07-05 13:00 2021-07-05 16:33
61 Mittagspause 00:59 2021-07-05 12:00 2021-07-05 13:00
62 Arbeit 03:48 2021-07-05 08:12 2021-07-05 12:00
+2 -1
View File
@@ -25,6 +25,7 @@
"rollup-plugin-svelte": "^6.0.0", "rollup-plugin-svelte": "^6.0.0",
"rollup-plugin-terser": "^7.0.0", "rollup-plugin-terser": "^7.0.0",
"sirv-cli": "^1.0.8", "sirv-cli": "^1.0.8",
"svelte": "^3.4.4" "svelte": "^3.4.4",
"svelte-paginate": "^0.1.0"
} }
} }
+25
View File
@@ -74,3 +74,28 @@ section article {
} }
} }
} }
// Einstellungen für die Pagination-Navigation
.pagination-nav {
display: flex;
justify-content: center;
padding-top: 1rem;
.option {
&.number, &.ellipsis {
line-height: 1.25rem;
span {
margin: .25rem .5rem;
}
&.active {
text-decoration: underline solid;
}
}
&.disabled {
svg {
path {
fill: darken(@mainColorLight,40%,relativ);
}
}
}
}
}
+23
View File
@@ -91,6 +91,29 @@ main {
form { form {
@formLabelWidth: 10rem; @formLabelWidth: 10rem;
@formItemWidth: 40rem; @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 { fieldset {
width: @formItemWidth + @formLabelWidth + 2rem; width: @formItemWidth + @formLabelWidth + 2rem;
margin: 1rem auto; margin: 1rem auto;
+14 -7
View File
@@ -20,7 +20,10 @@
}, },
'_fetch': async (rest_url, request_options) => { '_fetch': async (rest_url, request_options) => {
// noinspection JSUnresolvedVariable // 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) { if (!response.ok) {
throw new Error('Fail!') throw new Error('Fail!')
} }
@@ -40,16 +43,20 @@
}, },
'_pureFetch': async (rest_url, request_options) => { '_pureFetch': async (rest_url, request_options) => {
// noinspection JSUnresolvedVariable // noinspection JSUnresolvedVariable
return await fetch(env.API_URL + rest_url, request_options).catch(err => { return await fetch(env.API_URL + rest_url, request_options)
console.error(err)
return null
})
} }
} }
export const WorkingHoursRepository = { export const WorkingHoursRepository = {
'browse': () => { 'browse': (startDate = '', endDate = '') => {
return MyFetch.get('/working-hours') let filter = {}
if (startDate !== '') {
filter['start-date'] = startDate
}
if (endDate !== '') {
filter['end-date'] = endDate
}
return MyFetch.get('/working-hours', filter)
}, },
'read': date => { 'read': date => {
+7
View File
File diff suppressed because one or more lines are too long
+26 -7
View File
@@ -1,16 +1,21 @@
<script> <script>
export let params = {}; import { paginate, PaginationNav } from 'svelte-paginate'
export let params = {}
let records = [] let records = []
let isLoading = true let isLoading = true
console.log(params) console.log(params)
let currentPage = 1
let pageSize = 15
$: paginatedItems = paginate({ items: records, pageSize, currentPage })
if (!String.prototype.startsWith) { if (!String.prototype.startsWith) {
String.prototype.startsWith = function (searchString, position) { String.prototype.startsWith = function (searchString, position) {
position = position || 0; position = position || 0
return this.indexOf(searchString, position) === position; return this.indexOf(searchString, position) === position
};
} }
$: isNegative = time => time.startsWith('-') ? 'absence-time' : ''; }
$: cutMinusChar = time => time.startsWith('-') ? time.substr(1) : time; $: isNegative = time => time.startsWith('-') ? 'absence-time' : ''
$: cutMinusChar = time => time.startsWith('-') ? time.substr(1) : time
const init = async () => await params.promise.then(data => { const init = async () => await params.promise.then(data => {
records = data records = data
@@ -47,7 +52,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{#each records as record} {#each paginatedItems as record}
<tr> <tr>
<td>{record.period}</td> <td>{record.period}</td>
<td>{record.workingDays}</td> <td>{record.workingDays}</td>
@@ -56,6 +61,20 @@
</tr> </tr>
{/each} {/each}
</tbody> </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> </table>
{/if} {/if}
</article> </article>
+2 -1
View File
@@ -5,6 +5,7 @@
let TITLE = "Bearbeitung Einträge" let TITLE = "Bearbeitung Einträge"
let activeRecord = null; let activeRecord = null;
let currentPage = 1
</script> </script>
<svelte:head> <svelte:head>
@@ -17,7 +18,7 @@
<h1>{TITLE}</h1> <h1>{TITLE}</h1>
</header> </header>
<article> <article>
<List bind:activeRecord={activeRecord}/> <List bind:activeRecord={activeRecord} bind:currentPage/>
</article> </article>
</section> </section>
{:else} {:else}
+102 -23
View File
@@ -3,39 +3,118 @@
import IconifyIcon from '@iconify/svelte' import IconifyIcon from '@iconify/svelte'
import checkIcon from '@iconify-icons/oi/check' import checkIcon from '@iconify-icons/oi/check'
import xIcon from '@iconify-icons/oi/x' 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 ImportCsv from "./Formular/ImportCsv.svelte";
import {TimekeepingDate} from "../../components/TimekeepingDate.svelte";
const DAILY_EDIT = 0
const WEEKLY_EDIT = 1
const CSV_IMPORT = 2
export let activeRecord = null
const Controller = { const Controller = {
'saveRecord': () => { 'saveRecord': () => {
WorkingHoursRepository.addOrUpdate(activeRecord.workingDay, activeRecord).then(() => { activeRecordList.forEach((actualRecord) => {
Controller.nextDay() if (actualRecord.workingTime === '00:00:00') {
}); return
}, }
'nextDay': async () => { WorkingHoursRepository.addOrUpdate(actualRecord.workingDay, actualRecord);
let actDate = new TimekeepingDate(activeRecord.workingDay) })
let nextDay = actDate.getNextDay() activeDate = nextDate
activeRecord = await WorkingHoursRepository.readOrNew(nextDay.getDateString()) makeTimekeepingList()
}, },
'cancelActiveRecord': () => { '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 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> </script>
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<form action="/working-hours" name="editRecord"> <form action="/working-hours" name="editRecord">
<fieldset name="record-data"> <nav class="menu">
<div> <span on:click={MenuController.dailyEdit} on:keypress={() => {}} class:active={period_of_edit === DAILY_EDIT}>Täglich</span>
<label for="workingDay">Arbeitstag</label> <span on:click={MenuController.weeklyEdit} on:keypress={() => {}} class:active={period_of_edit === WEEKLY_EDIT}>Wöchentlich</span>
<input bind:value={activeRecord.workingDay} type="date" <span on:click={MenuController.csvImport} on:keypress={() => {}} class:active={period_of_edit === CSV_IMPORT}>Import per CSV</span>
id="workingDay" required pattern="\d\{4}-[0-1]\d-[0-3]\d\"> </nav>
</div> {#if period_of_edit === DAILY_EDIT}
<div> <EditByDay bind:activeRecordList bind:activeDate bind:makeTimekeepingList/>
<label for="workingTime">Arbeitszeit</label> {/if}
<input bind:value={activeRecord.workingTime} placeholder="Arbeitszeit" type="time" {#if period_of_edit === WEEKLY_EDIT}
id="workingTime" required pattern="[0-5]\d:[0-5]\d:[0-5]\d"> <EditByWeek bind:activeRecordList bind:activeDate bind:makeTimekeepingList/>
</div> {/if}
</fieldset> {#if period_of_edit === CSV_IMPORT}
<ImportCsv bind:activeRecordList bind:makeTimekeepingList/>
{/if}
<fieldset name="buttons"> <fieldset name="buttons">
<button on:click={Controller.saveRecord} type="button">Übernehmen und Weiter <button on:click={Controller.saveRecord} type="button">Übernehmen und Weiter
<IconifyIcon icon={checkIcon} color="green"/> <IconifyIcon icon={checkIcon} color="green"/>
@@ -0,0 +1,24 @@
<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}
@@ -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}
@@ -0,0 +1,96 @@
<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>
+30 -12
View File
@@ -1,22 +1,26 @@
<script> <script>
import {WorkingHoursRepository} from "../../components/Repositories.svelte" import { WorkingHoursRepository } from '../../components/Repositories.svelte'
import {TimekeepingDate} from "../../components/TimekeepingDate.svelte" import { TimekeepingDate } from '../../components/TimekeepingDate.svelte'
import { paginate, PaginationNav } from 'svelte-paginate'
export let activeRecord = null
let isLoading = true
let records = []
import IconifyIcon from '@iconify/svelte' import IconifyIcon from '@iconify/svelte'
import wrenchIcon from '@iconify-icons/oi/wrench' import wrenchIcon from '@iconify-icons/oi/wrench'
import documentIcon from '@iconify-icons/oi/document' 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 = { const Controller = {
'listRecords': () => { 'listRecords': () => {
Controller.cancelActiveRecord(); Controller.cancelActiveRecord()
WorkingHoursRepository.browse().then(data => { WorkingHoursRepository.browse().then(data => {
Controller.cancelActiveRecord() Controller.cancelActiveRecord()
records = data records = data
isLoading = false isLoading = false
}); })
}, },
'newRecord': async () => { 'newRecord': async () => {
const actDate = new TimekeepingDate() const actDate = new TimekeepingDate()
@@ -27,11 +31,11 @@
Controller.listRecords() Controller.listRecords()
return return
} }
activeRecord = data; activeRecord = data
}), }),
'cancelActiveRecord': () => { 'cancelActiveRecord': () => {
activeRecord = null; activeRecord = null
} },
} }
Controller.listRecords() Controller.listRecords()
</script> </script>
@@ -61,7 +65,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{#each records as record} {#each paginatedItems as record}
<tr> <tr>
<td>{record.workingDay}</td> <td>{record.workingDay}</td>
<td>{record.workingTime}</td> <td>{record.workingTime}</td>
@@ -73,5 +77,19 @@
</tr> </tr>
{/each} {/each}
</tbody> </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> </table>
{/if} {/if}
@@ -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>