diff --git a/src/routes/(angemeldet)/+page.svelte b/src/routes/(angemeldet)/+page.svelte index 89dd1fa..6287a40 100644 --- a/src/routes/(angemeldet)/+page.svelte +++ b/src/routes/(angemeldet)/+page.svelte @@ -42,18 +42,6 @@

Fügen Sie einem Tatort Bilder hinzu.

{/if} -
-
- -
- - Ansicht - - -

Schau Dir einen Tatort in der 3D Ansicht an.

-
diff --git a/src/routes/(angemeldet)/list/+page.server.ts b/src/routes/(angemeldet)/list/+page.server.ts index 5187d43..2053a67 100644 --- a/src/routes/(angemeldet)/list/+page.server.ts +++ b/src/routes/(angemeldet)/list/+page.server.ts @@ -2,7 +2,7 @@ import { getVorgaenge } from '$lib/server/vorgangService'; import type { PageServerLoad } from '../../(token-based)/view/$types'; export const load: PageServerLoad = async () => { - const vorgangList = await getVorgaenge(); + const vorgangList = getVorgaenge(); return { vorgangList diff --git a/src/routes/(angemeldet)/tatorte/+page.server.ts b/src/routes/(angemeldet)/tatorte/+page.server.ts deleted file mode 100644 index 568cf7d..0000000 --- a/src/routes/(angemeldet)/tatorte/+page.server.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { client } from '$lib/minio'; -import { fail } from '@sveltejs/kit'; - -import vorgangNumberOccupied from '$lib/helper/vorgangNumberOccupied.js'; - -/** @type {import('./$types').Actions} */ -export const actions = { - default: async ({ request }: {request: Request}) => { - const data = await request.formData(); - const vorgangNumber = data.get('vorgangNumber'); - const description = data.get('description'); - - if (!vorgangNumber) { - return fail(400, { - vorgangNumber, - description, - error: { vorgangNumber: 'Es muss eine Vorgangsnummer vorhanden sein.' } - }); - } - - if (await vorgangNumberOccupied(`${vorgangNumber}`)) { - return fail(400, { - vorgangNumber, - description, - error: { vorgangNumber: 'Die Vorgangsnummer wurde im System bereits angelegt.' } - }); - } - - const config = `${JSON.stringify({ vorgangNumber, description, version: 1 })}\n`; - - await client.putObject('tatort', `${vorgangNumber}/config.json`, config, undefined, { - 'Content-Type': 'application/json' - }); - - return { success: true }; - } -}; diff --git a/src/routes/(angemeldet)/tatorte/+page.svelte b/src/routes/(angemeldet)/tatorte/+page.svelte deleted file mode 100644 index 3449b4e..0000000 --- a/src/routes/(angemeldet)/tatorte/+page.svelte +++ /dev/null @@ -1,115 +0,0 @@ - - -
-
-

Neuer Vorgang

-
- -
-
-
-

- This information will be displayed publicly so be careful what you share. -

- -
-
- -
-
- -
-
- {#if form?.error?.vorgangNumber} -

{form.error.vorgangNumber}

- {/if} -
- -
- -
- -
- {#if form?.error} -

{form.description}

- {/if} -
- - - -
-
- -
-
- -
-
- -
- - -
-
-
- - vorgang anlegen - {#if form?.success} - Vorgang erfolgreich angelegt - {:else} - Fehler beim Upload - {/if} - - - -
diff --git a/src/routes/(angemeldet)/upload/+page.server.ts b/src/routes/(angemeldet)/upload/+page.server.ts index 7045e3b..b10cad8 100644 --- a/src/routes/(angemeldet)/upload/+page.server.ts +++ b/src/routes/(angemeldet)/upload/+page.server.ts @@ -17,11 +17,11 @@ const isRequiredFieldValid = (value: unknown) => { export const actions = { url: async ({ request }: { request: Request }) => { const data = await request.formData(); - const vorgangName = data.get('vorgang'); - const crimeName = data.get('name'); - const type = data.get('type'); - const vorgangPIN = data.get('vorgangPIN'); - const fileName = data.get('fileName'); + const vorgangName: string | null = data.get('vorgang') as string; + const crimeName: string | null = data.get('name') as string; + const type: string | null = data.get('type') as string; + const vorgangPIN: string | null = data.get('vorgangPIN') as string; + const fileName: string | null = data.get('fileName') as string; const vorgangExists = vorgangNameExists(vorgangName); let vorgangToken; diff --git a/src/routes/(token-based)/list/[vorgang]/+page.svelte b/src/routes/(token-based)/list/[vorgang]/+page.svelte index 25e56f1..e9bd25f 100644 --- a/src/routes/(token-based)/list/[vorgang]/+page.svelte +++ b/src/routes/(token-based)/list/[vorgang]/+page.svelte @@ -59,8 +59,8 @@ return; } - async function handle_input(ev: KeyboardEvent, i: number) { - let item = crimesList[i]; + async function handleEditFieldInput(ev: KeyboardEvent, listItemIndex: number) { + let item = crimesList[listItemIndex]; if (ev.key == 'Escape') { let text_field_id = `label__${item.name}`; @@ -93,7 +93,7 @@ ev.preventDefault(); // construct PUT URL - const url = $page.url; + const url = $page.url.pathname.split('?')[0]; let data_obj: { new_name: string; old_name: string } = { new_name: '', old_name: '' }; data_obj['new_name'] = new_name; @@ -129,13 +129,22 @@ } } - async function setClipboard(text) { - const type = "text/plain"; - const clipboardItemData = { - [type]: text, - }; - const clipboardItem = new ClipboardItem(clipboardItemData); - await navigator.clipboard.write([clipboardItem]); + function constructMailToLink() { + const subject = "Link zum Tatvorgang"; + const link = $page.url.toString().split('?')[0]; + const body = `Hallo, + +hier ist der Link zum Tatvorgang: +${link} + +Der Zugangs-PIN wird zur Sicherheit über einen zweiten Kommunikationskanal übermittelt. + +Mit freundlichen Grüßen, +`; + + const mailtoLink = `mailto:?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`; + + return mailtoLink; } @@ -144,12 +153,12 @@

Vorgang {vorgang.name}

{#if data?.user?.admin} Zugangs-PIN: {vorgang.pin} - + {/if}