Ende des Tages 26.05.

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

@@ -40,7 +40,7 @@
 				</p>
 			</div>
 		{/if}
-		{#if data.user.admin}
+		<!--{#if data.user.admin}
 			<div class="group relative rounded-lg p-6 text-sm leading-6 hover:bg-gray-50 w-1/4">
 				<div
 					class="flex h-11 w-11 items-center justify-center rounded-lg bg-gray-50 group-hover:bg-white"
@@ -66,7 +66,7 @@
 				</a>
 				<p class="mt-1 text-gray-600">Stelle einen weiteren Tatort für die Anwendung bereit.</p>
 			</div>
-		{/if}
+		{/if}-->
 		{#if data.user.admin}
 			<div class="group relative rounded-lg p-6 text-sm leading-6 hover:bg-gray-50 w-1/4">
 				<div

src/routes/(angemeldet)/list/[vorgang]/+page.svelte

@@ -19,7 +19,7 @@
 	import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
 
 	/** @type {import('./$types').PageData} */
-	/** export let data; */
+	export let data;
 
 	interface ListItem {
 		name: string;

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

@@ -73,8 +73,24 @@
 							<p class="block text-sm leading-6 text-red-900 mt-2">{form.error.description}</p>
 						{/if}
 					</div>
+
+					<label for="code">
+					<span >Zugangscode (optional) </span>
+					</label>
+
+					<div class="mt-2">
+					<div
+					>
+						<input
+							type="text"
+							id="code"
+						/>
+					</div>
+					</div>
+
 				</div>
 			</div>
+
 			<div class="mt-6 flex items-center justify-end gap-x-6">
 				<button type="button" class="text-sm font-semibold leading-6 text-gray-900">Cancel</button>
 				<Button

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 }) => {
@@ -42,6 +45,7 @@ export const actions = {
 		const data = Object.fromEntries(requestData);
 		const vorgang = data.vorgang;
 		const name = data.name;
+		const zugangscode = data.zugangscode;
 		let success = true;
 		let err = {};
 
@@ -57,6 +61,12 @@ export const actions = {
 			success = false;
 		}
 
+		if (isRequiredFieldValid(zugangscode)) err.zugangscode = null;
+		else {
+			err.zugangscode = 'Das Feld Zugangscode darf nicht leer bleiben.';
+			success = false;
+		}
+
 		if (success) return { success };
 
 		return fail(400, err);
@@ -99,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

@@ -14,6 +14,16 @@
 	let open = false;
 	let inProgress = false;
 	let vorgang = '';
+	const code_len = 8;
+	let zugangscode = ''
+	let zugangscode_prev = '';
+
+	$: zugangscode = Math.random().toString(36).slice(2, 2+code_len);
+
+
+	let case_existing = undefined;
+	$: case_existing = false;
+
 	let name = '';
 	/** @type {?string}*/
 	let etag = null;
@@ -29,6 +39,7 @@
 		let data = new FormData();
 		data.append('vorgang', vorgang);
 		data.append('name', name);
+		data.append('zugangscode', zugangscode)
 		const response = await fetch('?/validate', { method: 'POST', body: data });
 		/** @type {import('@sveltejs/kit').ActionResult} */
 		const result = deserialize(await response.text());
@@ -59,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);
@@ -143,6 +155,33 @@
 
 	}
 
+	// return true or false
+	async function case_exists(case_no) {
+		// ping `/(angemeldet)/view` with caseNumber in POST body
+		let url = '/view'
+		let data = new FormData();
+		data.append('caseNumber', case_no);
+		const response = await fetch(url, {
+			method: 'POST',
+			body: data,
+			redirect: 'error'
+			})
+
+		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;
+		}
+
+		case_existing = false;
+	}
+
 </script>
 
 <div class="mx-auto max-w-2xl">
@@ -177,12 +216,18 @@
 									id="vorgang"
 									autocomplete={vorgang}
 									class="block flex-1 border-0 bg-transparent py-1.5 pl-1 text-gray-900 placeholder:text-gray-400 focus:ring-0 sm:text-sm sm:leading-6"
+									on:input={() => case_exists(vorgang)}
 								/>
 							</div>
 						</div>
 						{#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>
@@ -212,6 +257,32 @@
 						{/if}
 					</div>
 
+					<div>
+						<label for="zugangscode" class="block text-sm font-medium leading-6 text-gray-900"
+							><span class="flex"
+								>{#if formErrors?.zugangscode}
+									<span class="inline-block mr-1"><Exclamation /></span>
+								{/if} Zugangscode</span
+							></label
+						>
+						<div class="mt-2">
+							<div
+								class="flex rounded-md shadow-sm ring-1 ring-inset ring-gray-300 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-600"
+							>
+								<input
+									bind:value={zugangscode}
+									type="text"
+									name="zugangscode"
+									id="zugangscode"
+									class="block flex-1 border-0 bg-transparent py-1.5 pl-1 text-gray-900 placeholder:text-gray-400 focus:ring-0 sm:text-sm sm:leading-6"
+								/>
+							</div>
+						</div>
+						{#if formErrors?.code}
+							<p class="block text-sm leading-6 text-red-900 mt-2">{formErrors.code}</p>
+						{/if}
+					</div>
+
 					<div class="col-span-full">
 						<label for="file" class="block text-sm font-medium leading-6 text-gray-900"
 							><span class="flex"

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

@@ -22,6 +22,6 @@ export const actions = {
 				error: { caseNumber: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' }
 			});
 		}
-		throw redirect(303, `/list/${caseNumber}`);
+		redirect(303, `/list/${caseNumber}`);
 	}
 };

src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte

@@ -1,53 +1,43 @@
-<style>
-	model-viewer {
-		height: 100%;
-		width: 100%;
-	}
-
-
-  .model{
-		height: calc(100%-84px)
-	}
-
-</style>
-
 <script>
-	import { preloadCode } from '$app/navigation';
 	import Panel from '$lib/components/ui/Panel.svelte';
 	import { onMount } from 'svelte';
 	import Button from '$lib/components/ui/Button.svelte';
-	import autoprefixer from 'autoprefixer';
-	
+
 	export let data;
 
 	onMount(() => {
 		import('@google/model-viewer');
-		console.log(modelViewer.getAttribute('camera-orbit'), modelViewer.getAttribute('camera-target'), modelViewer.getAttribute('rotation'))
 	});
 
 	let progress = 0;
 	let hideProgressScreen = false;
 
-	let cameraOrbit = '0deg 0deg 0m';
-	let cameraTarget ="0m 0m 0m";
-	let fieldOfView = '0deg';
+	let cameraOrbit = '0deg 0deg 100%';
+	let cameraTarget = '0m 0m 0m';
+	let fieldOfView = '10deg';
 
 	let cameraAzimuth = 0;
 	let cameraPolar = 0;
-	let cameraZoom = 0;
-	let xRotation=0;
-	let yRotation=0;
-	let zRotation=0;
+
+	let frontView = cameraAzimuth === 0 && cameraPolar === 0 ? true : false;
+
+	let topView = cameraAzimuth === 0 && cameraPolar === 90 ? true : false;
+
+	let cameraZoom = 100;
+	let xRotation = 0;
+	let yRotation = 0;
+	let zRotation = 0;
 
 	/**
 	 * @type {any}
 	 */
 	let modelViewer;
 
-
 	$: style = `width: ${progress}%`;
 
-	// @ts-ignore
+	/**
+	 * @param {any} detail
+	 */
 	function onProgress({ detail }) {
 		progress = Math.ceil(detail.totalProgress * 100.0);
 		if (progress == 100) {
@@ -57,177 +47,141 @@
 		} else hideProgressScreen = false;
 	}
 
-
 	function onResetView() {
-		  cameraOrbit = '0deg 0deg 0m';
-		  cameraTarget ="0m 0m 0m"
+		console.log(
+			'show cameraOrbit:',
+			modelViewer.getCameraOrbit(),
+			modelViewer.cameraOrbit,
+			modelViewer.getDimensions()
+		);
+		console.log(
+			'Camera-orbit: ',
+			modelViewer.getAttribute('camera-orbit'),
+			'camera-target: ',
+			modelViewer.getAttribute('camera-target'),
+			'object-rotation: ',
+			modelViewer.getAttribute('rotation')
+		);
 
-		console.log("show cameraOrbit:", modelViewer.getCameraOrbit(), modelViewer.cameraOrbit, modelViewer.getDimensions())
-		console.log("Camera-orbit: ",modelViewer.getAttribute('camera-orbit'), "camera-target: ",modelViewer.getAttribute('camera-target'), "object-rotation: ", modelViewer.getAttribute('rotation'))
-
-		  modelViewer.cameraOrbit = cameraOrbit;
-		  modelViewer.cameraTarget = cameraTarget;
-		  xRotation = yRotation = zRotation = 0;
-		cameraOrbit = '0deg 0deg 0%';
-	 cameraTarget ="0m 0m 0m";
-	fieldOfView = '0deg';
-
-	 cameraAzimuth = 0;
-	 cameraPolar = 0;
-	 cameraZoom = 0;
-	
+		cameraAzimuth = 0;
+		cameraPolar = 0;
+		cameraZoom = 100;
 
+		modelViewer.cameraOrbit = cameraOrbit;
+		modelViewer.cameraTarget = cameraTarget;
+		modelViewer.fieldOfView = fieldOfView;
+		cameraAzimuth = 0;
+		cameraPolar = 0;
+		cameraZoom = 100;
+		fieldOfView = '10deg';
 	}
 
 	/**
-	 * @param {string} newOrbit
+	 * @param {number} azimuth
+	 * @param {number} polar
+	 * @param {number} zoom
 	 */
-	function updateCameraOrbit(newOrbit) {
-		 
-	//    cameraTarget ="0m 0m 0m"
-		console.log("update X",modelViewer.cameraOrbit,"target:", modelViewer.cameraTarget, newOrbit)
-		  modelViewer.cameraOrbit = newOrbit;
-		  modelViewer.cameraTarget = cameraTarget;
-
+	function updateCameraOrbit(azimuth, polar, zoom) {
+		cameraAzimuth = azimuth;
+		cameraPolar = polar;
+		cameraZoom = zoom;
 	}
-
-	function slideCameraOrbit(){
-		modelViewer.cameraOrbit =`${cameraAzimuth}deg ${cameraPolar}deg ${cameraZoom}%`;
-	}
-
-	function slideRotation(){
-		modelViewer.orientation = `${xRotation}deg ${yRotation}deg ${zRotation}deg`
-	}
-
-	const disableMouseWheelZoom = (/** @type {{ preventDefault: () => void; }} */ event) => {
-    event.preventDefault(); // Blockiert das Mausrad-Ereignis
-  };
-
 </script>
 
-<!-- 		<Button
-			on:click={toggleShowOptions}
-			{disabled}
-			type="button"
-			variant="white"
-			fullWidth
-			align="left"
-			class="relative cursor-default justify-start py-2 pl-3 pr-10 text-left"
-		> -->
-
-<div class="h-full model w-full bg-neutral-200  p-4">
-
-			<!-- field-of-view="auto" -->
-		<!--
-				camera-controls
-		model-rotation="0rad 0rad 0rad"
-		
-		camera-target="0m 0m 10m"
-		
-		field-of-view="auto"
-		max-field-of-view="10deg"
-		min-field-of-view="0.1deg"-->
+<div class="h-full model w-full bg-neutral-200 p-4 transition-all delay-250">
 	<model-viewer
 		src={data.url}
 		bind:this={modelViewer}
-	touch-action="pan-y"
-	field-of-view="auto"
-	camera-controls
-	orientation={`${xRotation}deg ${yRotation}deg ${zRotation}deg`}
+		touch-action="pan-y"
+		field-of-view={fieldOfView}
+		min-field-of-view="1deg"
+		max-field-of-view="10deg"
+		camera-controls
+		orientation={`${xRotation}deg ${yRotation}deg ${zRotation}deg`}
 		camera-target="0m 0m 0m"
-		camera-orbit = {`${cameraAzimuth}deg ${cameraPolar}deg ${cameraZoom}`}
+		camera-orbit={`${cameraAzimuth}deg ${cameraPolar}deg ${cameraZoom}%`}
 		on:progress={onProgress}
 	>
-<!--Buttons zum Steuern-->
-	<div class="bg-redx-500 p-4 flex z-10">
-		<div class="flex flex-col">
+		<!--Buttons zum Steuern-->
+		<div
+			class=" p-4 flex z-10 absolute bottom-0"
+			class:opacity-0={!hideProgressScreen}
+			class:hidden={!hideProgressScreen}
+		>
+			<div class="flex flex-col bg-white/50">
 				<!--3 Buttons-->
-				<div>
+				<div class="p-2">
 					<Button
-					on:click={()=>{updateCameraOrbit('0deg 0deg 0%')}}
-					type="button"
-					variant="white"
-					
-					align="left"
-					class="relative cursor-default justify-start py-2 pl-3 pr-10 text-left"
+						on:click={() => {
+							updateCameraOrbit(0, 0, cameraZoom);
+						}}
+						type="button"
+						variant="white"
+						align="left"
+						class="relative cursor-default justify-start py-2 pl-3 pr-10 text-left "
 					>
-					Draufsicht
+						Draufsicht
 					</Button>
 					<Button
-					on:click={()=>{onResetView()}}
-					type="button"
-					variant="white"
-					
-					align="left"
-					class="relative cursor-default justify-start py-2 pl-3 pr-10 text-left"
+						on:click={() => {
+							onResetView();
+						}}
+						type="button"
+						variant="white"
+						align="left"
+						class="relative cursor-default justify-start py-2 pl-3 pr-10 text-left"
 					>
-					Werte zurücksetzen
+						Werte zurücksetzen
 					</Button>
-		
+
 					<Button
-					
-					on:click={()=>{updateCameraOrbit('0deg 90deg 0%')}}
-		
-					type="button"
-					variant="white"
-					
-					align="left"
-					class="relative cursor-default justify-start py-2 pl-3 pr-10 text-left"
+						on:click={() => {
+							updateCameraOrbit(0, 90, cameraZoom);
+						}}
+						type="button"
+						variant="white"
+						align="left"
+						class="relative cursor-default justify-start py-2 pl-3 pr-10 text-left"
 					>
-					Frontansicht
+						Frontansicht
 					</Button>
-				
 				</div>
-				
+
 				<!--Horizontal-->
-				<div>
-							<!-- svelte-ignore a11y_label_has_associated_control -->
-							<label>Horizontal drehen (Azimut):</label>
-							<input 
-							type="range" 
-							min="0" max="360" 
-							bind:value={cameraAzimuth} 
-							 />
-							 <!-- on:input={slideCameraOrbit} -->
+				<div class="p-2">
+					<label for="cazimuth">Horizontal drehen (Azimut):</label>
+					<input id="cazimuth" type="range" min="0" max="360" bind:value={cameraAzimuth} />
+				</div>
+				<!--Vertikal-->
+				<div class="p-2">
+					<label class="  mb-2" for="polarSlider">Vertikal drehen (Polar):</label>
+					<input id="polarSlider" type="range" min="0" max="90" bind:value={cameraPolar} />
 				</div>
-						<!--Vertikal-->
-			<div class="">
-				<label class="  mb-2" for="polarSlider">Vertikal drehen (Polar):</label>
-				<input id="polarSlider"  type="range" min=0 max=90 bind:value={cameraPolar}  /> 
-				<!-- on:input={slideCameraOrbit} class="vertical-slider"-->
-	</div>
 				<!--Zoom/Distanz-->
-				<div>
-					<label for="cZoom">Zoomen</label>
-					<input id="cZoom" type="range"
-					min="0"
-					max="120"
-			
-					 bind:value={cameraZoom} 
-					 on:input={slideCameraOrbit}/>
+				<div class="p-2">
+					<label for="cZoom">Abstand (zoom):</label>
+					<input id="cZoom" type="range" min="0" max="100" bind:value={cameraZoom} />
 				</div>
-		</div>
-			<!--Rotationen-->
-			<div class="flex  mt-2 ml-2">
-				
-			<div class="">
-				<label class="" for="polarSlider">Rotation X:</label>
-				<input id="polarSlider"  type="range" min=0 max=360 bind:value={xRotation}  /> 
-				<!-- on:input={slideCameraOrbit} class="vertical-slider"-->
-	</div>
-	<div class="">
-		<label class="" for="polarSlider">Rotation Y:</label>
-		<input id="polarSlider"  type="range" min=0 max=360 bind:value={yRotation}  /> 
-		<!-- on:input={slideCameraOrbit} class="vertical-slider"-->
-	</div>
-	<div class="">
-		<label class="" for="polarSlider">Rotation Z:</label>
-		<input id="polarSlider"  type="range" min=0 max=360 bind:value={zRotation}  /> 
-		<!-- on:input={slideCameraOrbit} class="vertical-slider"-->
-	</div>
 			</div>
-			
+			<!--Rotationen-->
+			<div class="flex flex-col ml-2 p-4 bg-white/50">
+				Modell rotieren lassen:
+				<br />
+				Modell auf dem Kopf? -> y auf 270°
+				<div class="p-2">
+					<label class="" for="polarSlider">Rotation X:</label>
+					<input id="polarSlider" type="range" min="0" max="360" bind:value={xRotation} />
 				</div>
+				<div class="p-2">
+					<label class="" for="polarSlider">Rotation Y:</label>
+					<input id="polarSlider" type="range" min="0" max="360" bind:value={yRotation} />
+				</div>
+				<div class="p-2">
+					<label class="" for="polarSlider">Rotation Z:</label>
+					<input id="polarSlider" type="range" min="0" max="360" bind:value={zRotation} />
+				</div>
+			</div>
+		</div>
 		<!--Loading-->
 		<div
 			slot="progress-bar"
@@ -238,9 +192,30 @@
 			<Panel class="w-72 bg-gray-50 flex items-center flex-col"
 				><p class="mb-5">Loading {progress}%</p>
 				<div class="h-1 w-full bg-neutral-200 dark:bg-neutral-600">
-					<div class="h-1 bg-blue-500" {style} ></div>
+					<div class="h-1 bg-blue-500" {style}></div>
 				</div></Panel
 			>
 		</div>
 	</model-viewer>
 </div>
+
+<style>
+	model-viewer {
+		height: 100%;
+		width: 100%;
+	}
+
+	/* .vertical-slider {
+		writing-mode: bt-lr; /* Schreibt von unten nach oben (Vertikale Darstellung)
+		transform: rotate(270deg); /* Slider um 270° drehen
+		height: 200px;
+	} */
+
+	.model {
+		height: calc(100%-84px);
+	}
+
+	/* .active-border {
+		border: 2px blue solid;
+	} */
+</style>