8 Commits

Author SHA1 Message Date
b966d19792 Ende des Tages 26.05. 2025-05-26 13:55:19 +02:00
def4e22226 initila check if vorgang exists 2025-05-23 11:24:57 +02:00
b44187b010 remove admin user output 2025-05-23 10:22:05 +02:00
bebd226c80 fixed fluechtigkeitsfehler 2025-05-22 14:16:44 +02:00
4adea19981 temp 22.05 2025-05-22 14:13:53 +02:00
6b7188350f temporär zum Testen 2025-05-22 10:22:45 +02:00
20c74d49d9 Merge branch 'development' into f03_user-management 2025-05-21 10:21:51 +02:00
8bc7fad146 fix two style element 2025-05-16 10:40:50 +02:00
6 changed files with 88 additions and 17 deletions

View File

@@ -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

View File

@@ -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;

View File

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

View File

@@ -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"

View File

@@ -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}`);
}
};

View File

@@ -1,16 +1,3 @@
<style>
model-viewer {
height: 100%;
width: 100%;
}
.model{
height: calc(100%-84px)
}
</style>
<script>
import Panel from '$lib/components/ui/Panel.svelte';
import { onMount } from 'svelte';