diff --git a/src/routes/(angemeldet)/upload/+page.server.js b/src/routes/(angemeldet)/upload/+page.server.js index 73bedd5..dffbea1 100644 --- a/src/routes/(angemeldet)/upload/+page.server.js +++ b/src/routes/(angemeldet)/upload/+page.server.js @@ -22,6 +22,7 @@ export const actions = { const vorgang = data.get('vorgang'); const name = data.get('name'); const type = data.get('type'); + const code = data.get('zugangscode'); const fileName = data.get('fileName'); let objectName = `${vorgang}/${name}`; @@ -35,6 +36,8 @@ export const actions = { const url = await client.presignedPutObject('tatort', objectName); + // enter code + return { url }; }, validate: async ({ request }) => { @@ -106,5 +109,8 @@ export const actions = { return { etag, error }; //await writeFile(filePath, Buffer.from(await data.file.arrayBuffer())); + }, + get_code: async ({ request }) => { + console.log('TO-DO'); } }; diff --git a/src/routes/(angemeldet)/upload/+page.svelte b/src/routes/(angemeldet)/upload/+page.svelte index aebb703..edd6a2d 100644 --- a/src/routes/(angemeldet)/upload/+page.svelte +++ b/src/routes/(angemeldet)/upload/+page.svelte @@ -15,7 +15,12 @@ let inProgress = false; let vorgang = ''; const code_len = 8; - let zugangscode = Math.random().toString(36).slice(2, 2+code_len); + let zugangscode = '' + let zugangscode_prev = ''; + + $: zugangscode = Math.random().toString(36).slice(2, 2+code_len); + + let case_existing = undefined; $: case_existing = false; @@ -65,6 +70,7 @@ let data = new FormData(); data.append('vorgang', vorgang); data.append('name', name); + data.append('zugangscode', zugangscode) if (files?.length === 1) { data.append('type', files[0].type); data.append('fileName', files[0].name); @@ -164,8 +170,10 @@ const res_json = await response.json(); const status = res_json.status; - + // aktualisiere Zugangscode mit if (status == 303) { + // TO-DO: check existing code + console.log(`+ existiert`) case_existing = true; return; @@ -215,9 +223,9 @@ {#if formErrors?.vorgang}

{formErrors.vorgang}

{/if} - {#if case_existing} + {#if case_existing && (vorgang.length > 0) } Datei wird zum existierenden Vorgang hinzugefügt. - {:else} + {:else if (vorgang.length > 0) } Neuer Vorgang wird angelegt. {/if}