From 88041b8133000ea65bc6979a3ec347bcfb51e6d9 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 25 Mar 2025 15:25:04 +0100 Subject: [PATCH] V1 --- src/lib/server/database.ts | 15 ++ src/lib/server/docstore.ts | 34 +++ src/lib/util.ts | 48 ++++- src/routes/+layout.svelte | 70 +++++-- src/routes/+page.server.ts | 89 +++++++- src/routes/+page.svelte | 290 +++++++++++++++++++------- src/routes/dokumente/+page.server.ts | 10 +- src/routes/dokumente/+page.svelte | 119 ++++++++++- src/routes/dokumente/expander.svelte | 62 ++++++ src/routes/record_input_row.svelte | 25 ++- src/routes/schaetzung/+page.server.ts | 47 ++++- src/routes/schaetzung/+page.svelte | 277 +++++++++++++++++------- static/global.css | 2 +- 13 files changed, 884 insertions(+), 204 deletions(-) create mode 100644 src/routes/dokumente/expander.svelte diff --git a/src/lib/server/database.ts b/src/lib/server/database.ts index 5414120..1417e59 100644 --- a/src/lib/server/database.ts +++ b/src/lib/server/database.ts @@ -123,6 +123,9 @@ const ENTRY_DATABASE_ADD_ENTRY: string = const ENTRY_DATABASE_EDIT_ENTRY: string = "UPDATE records SET date = $date, start = $start, end = $end, comment = $comment WHERE id = $id;"; +const ENTRY_DATABASE_REMOVE_ENTRY: string = + "DELETE FROM records WHERE id = $id;"; + const ESTIMATES_DATABASE_GET_ALL: string = "SELECT * FROM estimates ORDER BY year DESC, quarter DESC;" @@ -228,6 +231,17 @@ export class User { return res.changes > 1; } + remove_entry(id: number): boolean { + if (isNaN(id)) { + return false; + } + + const query = this._database.query(ENTRY_DATABASE_REMOVE_ENTRY); + const res = query.run({ id: id }); + + return res.changes > 1; + } + get_estimates(): Array { const query = this._database.query(ESTIMATES_DATABASE_GET_ALL); const res = query.all(); @@ -256,6 +270,7 @@ export class User { const query = this._database.query(ESTIMATES_DATABASE_INSERT); const res = query.run({ year: year, quarter: quarter, estimate_0: estimate_0, estimate_1: estimate_1, estimate_2: estimate_2 }); + console.log(res) return res.changes > 1; } diff --git a/src/lib/server/docstore.ts b/src/lib/server/docstore.ts index 63a9754..c76379c 100644 --- a/src/lib/server/docstore.ts +++ b/src/lib/server/docstore.ts @@ -81,6 +81,40 @@ export async function getAllFiles(user: User) { return files; } +export async function getRecordFiles(user: User) { + const path = `${DOCUMENTS_PATH}/user-${user.id}/${RECORDS_FOLD}`; + + let file_names = await fs.readdir(path).catch((err) => { console.log(err); return [] }); + + let files = await Promise.all(file_names.map(async (v) => { + return { + identifier: v.replace(/^Stundenliste-/, "").replace(/\.pdf$/, ""), + filename: v, + path: `${RECORDS_FOLD}/${v}`, + cdate: (await fs.stat(`${path}/${v}`)).ctime, + } + })) + + return files; +} + +export async function getEstimateFiles(user: User) { + const path = `${DOCUMENTS_PATH}/user-${user.id}/${ESTIMATES_FOLD}`; + + let file_names = await fs.readdir(path).catch((err) => { console.log(err); return [] }); + + let files = await Promise.all(file_names.map(async (v) => { + return { + identifier: v.match(/\d.Quartal_\d\d\d\d/)[0].replace(/.Quartal_/, ".").split(".").reverse().join("-"), + filename: v, + path: `${ESTIMATES_FOLD}/${v}`, + cdate: (await fs.stat(`${path}/${v}`)).ctime, + } + })) + + return files; +} + export async function getFile(user: User, filename: string) { const path = `${DOCUMENTS_PATH}/user-${user.id}`; diff --git a/src/lib/util.ts b/src/lib/util.ts index c27d2c1..6d82ed6 100644 --- a/src/lib/util.ts +++ b/src/lib/util.ts @@ -2,6 +2,16 @@ export const MONTHS: string[] = [ "Jänner", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember" ]; export const WEEKDAYS: string[] = [ "Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag" ]; + +/* + * Converts a string containing a decimal number to number. + * If a non numeric (0-9) character is encountered returns NaN. + * + * @param str: string to be converted + * @returns the converted string or NaN if failed + * + */ + export function toInt(str: string): number { if (str.length === 0) { return NaN; @@ -10,8 +20,8 @@ export function toInt(str: string): number { let value = 0; for (let i = 0; i < str.length; ++i) { let c = str.charAt(i); - let n = Number(c); - if (isNaN(n)) { + let n = c.charCodeAt(0) - "0".charCodeAt(0); + if (isNaN(n) || n < 0 || n > 9) { return NaN; } value = value*10 + n; @@ -20,6 +30,15 @@ export function toInt(str: string): number { return value; } +/* + * Converts a string containing a decimal floating point number to number. + * If a invalid character is encountered returns NaN. + * Only one decimal separator may be present and may be one of "." or ",". + * + * @param str: string to convert to a number + * @returns the floating point number or NaN if failed + * + */ export function toFloat(str: string): number { if (str.length === 0) { return NaN; @@ -31,11 +50,12 @@ export function toFloat(str: string): number { let i = 0; for (i = 0; i < str.length; ++i) { let c = str.charAt(i); + console.log("c", c) if (c === ',' || c === '.') { break; } - let n = Number(c); - if (isNaN(n)) { + let n = c.charCodeAt(0) - "0".charCodeAt(0); + if (isNaN(n) || n < 0 || n > 9) { return NaN; } value = value * 10 + n; @@ -44,8 +64,8 @@ export function toFloat(str: string): number { let dec = 1; for (++i; i < str.length; ++i, ++dec) { let c = str.charAt(i); - let n = Number(c); - if (isNaN(n)) { + let n = c.charCodeAt(0) - "0".charCodeAt(0); + if (isNaN(n) || n < 0 || n > 9) { return NaN; } value += n / Math.pow(10, dec); @@ -54,15 +74,25 @@ export function toFloat(str: string): number { return value; } -export function padInt(num: number, upper: number, float: number = 0, pad_char: string = '0') { +export function padInt(num: number, upper: number, float: number = 0, pad_char: string = '0', add_plus_if_pos: boolean = false, show_dec_point_if_round: boolean = true, pad_char_back: string = "\u2007") { + if (num == null) { + return padInt(0, upper, float, pad_char, add_plus_if_pos, show_dec_point_if_round, pad_char_back) + } if (num >= 0) { + if (add_plus_if_pos) { + return "+" + padInt(num, upper, float, pad_char, false, show_dec_point_if_round, pad_char_back); + } if (float != 0) { - return num.toFixed(float).padStart(upper + 1 + float, pad_char) + if (show_dec_point_if_round || num.toFixed(float).search(".*\.0+") == -1) { + return num.toFixed(float).padStart(upper + 1 + float, pad_char) + } else { + return (num.toFixed(0) + pad_char_back.repeat(1 + float)).padStart(upper + 1 + float, pad_char); + } } else { return num.toFixed(float).padStart(upper, pad_char); } } else { - return "-" + padInt(-1 * num, upper, float); + return "-" + padInt(-1 * num, upper, float, pad_char, false, show_dec_point_if_round, pad_char_back); } } diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index a537654..43d4083 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -2,43 +2,77 @@ let { children } = $props(); -
+{#snippet nav(classlist: string)} +
+

Navigation

+{/snippet} +
+{@render nav("navpos nav")} +{@render nav("navpseudo nav")} + +
{@render children()} +
+ +
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index 2441ce9..f71e98e 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -1,13 +1,60 @@ -import type { SQLiteError } from "bun:sqlite" +import type { PageServerLoad, Actions } from "./$types"; +import type { SQLiteError } from "bun:sqlite"; + +import type { RecordEntry, EstimatesEntry } from "$lib/db_types"; import { fail, redirect } from '@sveltejs/kit'; -import { toInt, parseDate, isTimeValidHHMM } from "$lib/util" +import { MONTHS, toInt, parseDate, isTimeValidHHMM, month_of } from "$lib/util" import { get_user, User } from "$lib/server/database"; +import { getRecordFiles } from "$lib/server/docstore"; + +export const load: PageServerLoad = async ({ locals }) => { + let records: { entry: RecordEntry, parsedDate: Date } = locals.user.get_entries().map((v) => ({ entry: v, parsedDate: parseDate(v.date) })); + let estimates: EstimatesEntry = locals.user.get_estimates() + let documents = (await getRecordFiles(locals.user)).map((v) => { return { year: toInt(v.identifier.substring(0, 4)), month: toInt(v.identifier.substring(5, 7)), file: v }; }); + + let records_grouped = Map.groupBy(records, (v) => { return v.parsedDate.getFullYear() } ); + + records_grouped.forEach((value, key, map) => { + let m = Map.groupBy(value, (v) => v.parsedDate.getMonth()); + // remove parsed date + m.forEach((value, key, map) => { + map.set(key, value.map((v) => v.entry)); + }); + map.set(key, m); + }); + + let estimates_grouped = Map.groupBy(estimates, (v) => { return v.year }); + estimates_grouped.forEach((value, key, map) => { + let arr = value.map((v) => [ + { key: ((v.quarter - 1) * 3 + 2), value: v["estimate_2"] }, + { key: ((v.quarter - 1) * 3 + 1), value: v["estimate_1"] }, + { key: ((v.quarter - 1) * 3 + 0), value: v["estimate_0"] }, + ]).flat(); + + let m = Map.groupBy(arr, (e) => e.key); + m.forEach((value, key, map) => { + map.set(key, value[0].value); + }) + map.set(key, m); + }) + + let documents_grouped = Map.groupBy(documents, (v) => v.year ); + documents_grouped.forEach((value, key, map) => { + let m = Map.groupBy(value, (v) => v.month); + m.forEach((value, key, map) => { + map.set(key, value.map((v) => v.file)[0]); + }) + map.set(key, m); + }) + + console.log(documents_grouped) -export async function load({ locals }) { return { - records: locals.user.get_entries() + records: records_grouped, + estimates: estimates_grouped, + documents: documents_grouped }; } @@ -140,6 +187,8 @@ export const actions = { return fail(400, { edit_entry: return_obj }); } + id = toInt(id); + let current = locals.user.get_entry(id); if (!current) { @@ -167,4 +216,34 @@ export const actions = { redirect(303, '/'); return { success: true }; }, -} + remove_entry: async ({ locals, request })=> { + const data = await request.formData(); + + let id = data.get("id"); + + if (id == null) { + return fail(400, { id: id }); + } + + id = toInt(id); + if (isNaN(id)) { + return fail(400, { id: id }); + } + + let res = false; + + try { + res = locals.user.remove_entry(id); + } catch (e) { + if (!(e instanceof SQLiteError)) { + throw e; + } + } + + if (!res) { + return fail(500, { }); + } + + return { success: true } + } +} satisfies Actions; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index b85990c..b9b1d02 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,16 +1,20 @@ -
validateForm(e, new_state)} use:enhance>
validateForm(e, edit_state)} use:enhance>
+
+ +

Stundenliste

- - + + + + + + + + + + + + - - - - - + + + + + + + - + + - - - - -{#each data.records as entry} - {#if editing?.id != entry.id } - - - - - - - - + + + + + + - {:else} - - - -
{ - event.preventDefault(); - setEditing(null); - }} - > - - - - {/if} -{/each} + +{#each data.estimates as estimates_pair} + {@const year = estimates_pair[0] } + {@const mmonths = estimates_pair[1] } + {@const yentries = data.records.get(year)} + + {#each mmonths as month_pair, mindex} + {@const month = month_pair[0] } + {@const estimate = month_pair[1] } + {@const entries = yentries.get(month) ?? [ null ] } + + {#each entries as entry, eindex} + {@const record_sum = entries.reduce((acc, val) => acc + (val != null ? calculateDuration(val.start, val.end) : 0), 0)} + + + {#if mindex == 0 && eindex == 0} + + {/if} + {#if eindex == 0} + + {/if} + {#if entry == null} + + {:else if editing?.id != entry.id } + + + + + + + + {:else} + + + +
{ + event.preventDefault(); + setEditing(null); + }} + > + + + + + + {/if} + {#if eindex == 0} + {@const document = data?.documents?.get(year)?.get(month)} + + + {/if} + + {/each} + {#if entries.length > 0 && entries.length < 4} + {#each { length: 4 - entries.length }, i } + + {/each} + {/if} + + {/each} + +{/each} {#if data.records === undefined || data.records.length === 0} @@ -198,28 +299,71 @@ table { margin: auto; border-collapse: collapse; - border: 1px solid; } -table caption { - font-size: 25px; - font-weight: bold; +tbody > :global(tr) { + border-top: 1px solid black; + border-bottom: 1px solid black; } -tbody > tr:nth-child(odd) { - background: gray; +tbody > :global(tr:has(> td.year):has(td.month)) { + border-top: 3px double black; +} +tbody > :global(tr:has(> td.month)) { + border-top: 1.5px solid black; } -tbody > tr:nth-child(even) { - background: lightgray; +tbody .year { + vertical-align: middle; + writing-mode: sideways-lr; + text-orientation: mixed; } -tbody > tr > td:last-of-type { +tbody .month { + vertical-align: middle; + writing-mode: sideways-lr; + text-orientation: mixed; +} + +.start, .end, .duration { + text-align: right; +} + +tbody .action { display: inline-flex; } +tbody .stats { + min-height: fit-content; + vertical-align: middle; +} + +tbody .stats table tr { + border: none; +} +tbody .stats table .diff { + border-top: 1px solid black; +} +tbody .stats table tr td:first-of-type { + text-align: right; +} +tbody .stats table tr td:last-of-type { + text-align: right; + white-space: nowrap; +} + +.doc_action * { + width: 100%; +} + +tbody tr td { + vertical-align: text-bottom; + padding-left: 10px; + padding-right: 10px; +} + tfoot > tr { - border-top: 1px solid black; + border-top: 1px solid red; } .td-no-elements { diff --git a/src/routes/dokumente/+page.server.ts b/src/routes/dokumente/+page.server.ts index 311edcb..3041c22 100644 --- a/src/routes/dokumente/+page.server.ts +++ b/src/routes/dokumente/+page.server.ts @@ -1,13 +1,15 @@ import type { PageServerLoad, Actions } from "./$types"; -import { fail } from "@sveltejs/kit" +import { fail, redirect } from "@sveltejs/kit" import { toInt } from "$lib/util" -import { getAllFiles, generateEstimatePDF, generateRecordPDF } from "$lib/server/docstore"; +import { getAllFiles, getRecordFiles, getEstimateFiles, generateEstimatePDF, generateRecordPDF } from "$lib/server/docstore"; export const load: PageServerLoad = async ({ locals }) => { return { - documents: await getAllFiles(locals.user) + documents: await getAllFiles(locals.user), + records: await getRecordFiles(locals.user), + estimates: await getEstimateFiles(locals.user) } } @@ -47,7 +49,9 @@ export const actions = { console.log(e); return fail(403, { success: false, message: e.toString(), year: year, month: month }); } + + redirect(303, "dokumente") return { success: true }; } diff --git a/src/routes/dokumente/+page.svelte b/src/routes/dokumente/+page.svelte index b03f370..2996f12 100644 --- a/src/routes/dokumente/+page.svelte +++ b/src/routes/dokumente/+page.svelte @@ -5,14 +5,91 @@ import { isoToLocalDate, padInt } from "$lib/util"; + import Expander from "./expander.svelte"; + let { data, form } : PageProps = $props(); + $inspect(data); +

Dokumente

-
+
+ +{#snippet table(first_cell_name: string, rows)} +
Stundenliste
DatumWochentagBeginnEndeDauerDatumWochentagBeginnEndeDauer AnmerkungActionsActions
{entry.date}{weekday_of(parseDate(entry.date))}{entry.start}{entry.end}{calculateDuration(entry.start, entry.end).toFixed(2)}{entry.comment ?? ""} -
{ - event.preventDefault(); - setEditing(entry); - }} - > - -
-
acc + ((val?.length ?? 0) < 4 ? 4 : val.length), 0) + 4 * (mmonths.size - yentries.size)}>{year}{MONTHS[month]}{entry.date}{weekday_of(parseDate(entry.date))}{entry.start}{entry.end}{padInt(calculateDuration(entry.start, entry.end), 2, 2, '\u2007;')}{entry.comment ?? ""} +
{ + event.preventDefault(); + setEditing(entry); + }} + > + +
+ 		+ + + + + + + + + + + + + + + + + + + + + + +
Ist{padInt(record_sum, 1, 2, "0", false, false)}
Soll{padInt(estimate, 1, 2, "0", false, false)}
Differenz{padInt(record_sum - estimate, 3, 2, "\u2007", true, false)}
+ {#if document == null} +
+ + + +
+ {:else} +
+ + + +
+ {/if} +
+
#
+ + + + + + + + + + {#each rows as file} + + + + + + + {/each} + +
{first_cell_name}DateinameErstellt amAktion
{file.identifier}{file.filename}{isoToLocalDate(file.cdate.toISOString())}
um {padInt(file.cdate.getHours(), 2)}:{padInt(file.cdate.getMinutes(), 2)}:{padInt(file.cdate.getSeconds(), 2)}		 + + + +
+ +{/snippet} + +
+ + {@render table("Monat", data.records)} + + +
+ + + {@render table("Quartal", data.estimates)} + + +
+ + + + + + + + + + + + + + {#each data.history as file} + + + + + + + + {/each} + + +
TypDatumDateinameErstellt amAktion
{file.type}{file.identifier}{file.filename}{isoToLocalDate(file.cdate.toISOString())}
um {padInt(file.cdate.getHours(), 2)}:{padInt(file.cdate.getMinutes(), 2)}:{padInt(file.cdate.getSeconds(), 2)}
+ +
+ +
+ + +
diff --git a/src/routes/dokumente/expander.svelte b/src/routes/dokumente/expander.svelte new file mode 100644 index 0000000..9dbe506 --- /dev/null +++ b/src/routes/dokumente/expander.svelte @@ -0,0 +1,62 @@ + + + + + + + diff --git a/src/routes/record_input_row.svelte b/src/routes/record_input_row.svelte index cc74867..1c9e5f9 100644 --- a/src/routes/record_input_row.svelte +++ b/src/routes/record_input_row.svelte @@ -62,17 +62,15 @@ return weekday_of(date); }) let inDuration: string = $state(""); - updateDuration(); - - - function updateDuration() { + + $effect(() => { + states; if ((states?.start?.valid && states?.end?.valid) && (states?.start?.value != null && states?.end?.value != null)) { let duration = calculateDuration(states.start.value, states.end.value); inDuration = isNaN(duration) ? "" : duration.toFixed(2); } - } - + }) function validateDate(element: HTMLInputElement) { @@ -498,7 +496,10 @@ - + { states.start.valid = validateTime(startInput); states.start.value = startInput.value; - updateDuration(); } } disabled={!enabled} @@ -570,7 +570,6 @@ (_) => { states.end.valid = validateTime(endInput); states.end.value = endInput.value; - updateDuration(); } } disabled={!enabled} @@ -590,11 +589,11 @@ disabled={!enabled}> - + {@render children?.()} - + diff --git a/static/global.css b/static/global.css index 97bdd0a..285cd51 100644 --- a/static/global.css +++ b/static/global.css @@ -1,6 +1,6 @@ body { - background: #BBBBBB; + background: #FFFFFF; } /*body * {