Merge branch 'f03_user-management' into f03_temp_Chico-lokal

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');
 	}
 };

src/routes/(angemeldet)/upload/+page.svelte

@@ -20,6 +20,8 @@
 		.toString(36)
 		.slice(2, 2 + code_len);
 	let case_existing = undefined;
+	$: case_existing = false;
+
 	let name = '';
 	/** @type {?string}*/
 	let etag = null;
@@ -66,6 +68,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);
@@ -207,6 +210,11 @@
 						{#if formErrors?.vorgang}
 							<p class="block text-sm leading-6 text-red-900 mt-2">{formErrors.vorgang}</p>
 						{/if}
+						{#if case_existing && vorgang.length > 0}
+							<span>Datei wird zum existierenden Vorgang hinzugefügt.</span>
+						{:else if vorgang.length > 0}
+							<span>Neuer Vorgang wird angelegt.</span>
+						{/if}
 					</div>
 
 					<div>

src/routes/(angemeldet)/view/+page.server.js

@@ -5,11 +5,9 @@ import { fail, redirect } from '@sveltejs/kit';
 export const actions = {
 	default: async ({ request }) => {
 		const data = await request.formData();
-		console.log(`--- ${Object.keys(data)}`)
 		const caseNumber = data.get('caseNumber');
 
 		if (!caseNumber) {
-			console.log('^^^ here')
 			return fail(400, {
 				success: false,
 				caseNumber,
@@ -17,20 +15,13 @@ export const actions = {
 			});
 		}
 
-		let res = (await caseNumberOccupied(caseNumber))
-		console.log(`gibt es? ${res} + ${caseNumber}`)
 		if (!(await caseNumberOccupied(caseNumber))) {
-			console.log('^^^ there')
 			return fail(400, {
 				success: false,
 				caseNumber,
 				error: { caseNumber: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' }
 			});
 		}
-		else {
+		redirect(303, `/list/${caseNumber}`);
-			throw redirect(303, `/list/${caseNumber}`);
-			console.log(`---blabla ${caseNumber}`)
-		}
-
 	}
 };