Merge branch 'f03_user-management' into f03_temp_Chico-lokal
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
|
||||
import shortenFileSize from '$lib/helper/shortenFileSize.js';
|
||||
import Exclamation from '$lib/icons/Exclamation.svelte';
|
||||
import FileRect from '$lib/icons/File-rect.svelte';
|
||||
|
||||
export let form;
|
||||
|
||||
@@ -15,12 +16,9 @@
|
||||
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 zugangscode = Math.random()
|
||||
.toString(36)
|
||||
.slice(2, 2 + code_len);
|
||||
let case_existing = undefined;
|
||||
$: case_existing = false;
|
||||
|
||||
@@ -39,7 +37,7 @@
|
||||
let data = new FormData();
|
||||
data.append('vorgang', vorgang);
|
||||
data.append('name', name);
|
||||
data.append('zugangscode', zugangscode)
|
||||
data.append('zugangscode', zugangscode);
|
||||
const response = await fetch('?/validate', { method: 'POST', body: data });
|
||||
/** @type {import('@sveltejs/kit').ActionResult} */
|
||||
const result = deserialize(await response.text());
|
||||
@@ -70,7 +68,7 @@
|
||||
let data = new FormData();
|
||||
data.append('vorgang', vorgang);
|
||||
data.append('name', name);
|
||||
data.append('zugangscode', zugangscode)
|
||||
data.append('zugangscode', zugangscode);
|
||||
if (files?.length === 1) {
|
||||
data.append('type', files[0].type);
|
||||
data.append('fileName', files[0].name);
|
||||
@@ -119,69 +117,58 @@
|
||||
function swap_endian(val) {
|
||||
// from https://www.geeksforgeeks.org/bit-manipulation-swap-endianness-of-a-number/
|
||||
|
||||
let leftmost_byte = (val & eval(0x000000FF)) >> 0;
|
||||
let left_middle_byte = (val & eval(0x0000FF00)) >> 8;
|
||||
let right_middle_byte = (val & eval(0x00FF0000)) >> 16;
|
||||
let rightmost_byte = (val & eval(0xFF000000)) >> 24;
|
||||
let leftmost_byte = (val & eval(0x000000ff)) >> 0;
|
||||
let left_middle_byte = (val & eval(0x0000ff00)) >> 8;
|
||||
let right_middle_byte = (val & eval(0x00ff0000)) >> 16;
|
||||
let rightmost_byte = (val & eval(0xff000000)) >> 24;
|
||||
|
||||
leftmost_byte <<= 24;
|
||||
left_middle_byte <<= 16;
|
||||
right_middle_byte <<= 8;
|
||||
rightmost_byte <<= 0;
|
||||
|
||||
let res = (leftmost_byte | left_middle_byte | right_middle_byte | rightmost_byte)
|
||||
let res = leftmost_byte | left_middle_byte | right_middle_byte | rightmost_byte;
|
||||
|
||||
return res
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
async function check_valid_glb_file() {
|
||||
// GLD Header, magic value 0x46546C67, identifies data as binary glTF, 4 bytes
|
||||
// little endian!
|
||||
const GLD_MAGIC = 0x46546C67;
|
||||
const GLD_MAGIC = 0x46546c67;
|
||||
|
||||
// big endian!
|
||||
let file = files[0];
|
||||
let file_header = file.slice(0, 4)
|
||||
let header_bytes = await file_header.bytes()
|
||||
let file_header = file.slice(0, 4);
|
||||
let header_bytes = await file_header.bytes();
|
||||
let file_header_hex = '0x' + header_bytes.toHex().toString();
|
||||
|
||||
|
||||
if (GLD_MAGIC == swap_endian(file_header_hex)) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// return true or false
|
||||
async function case_exists(case_no) {
|
||||
console.log('--- fired');
|
||||
// ping `/(angemeldet)/view` with caseNumber in POST body
|
||||
let url = '/view'
|
||||
let url = '/view';
|
||||
let data = new FormData();
|
||||
data.append('caseNumber', case_no);
|
||||
const response = await fetch(url, {
|
||||
method: 'POST',
|
||||
body: data,
|
||||
redirect: 'error'
|
||||
})
|
||||
const response = await fetch(url, { method: 'POST', body: data });
|
||||
|
||||
const res_json = await response.json();
|
||||
const status = res_json.status;
|
||||
const code = response.status;
|
||||
|
||||
// aktualisiere Zugangscode mit
|
||||
if (status == 303) {
|
||||
// TO-DO: check existing code
|
||||
console.log(`+++ ${response.redirected}`);
|
||||
|
||||
console.log(`+ existiert`)
|
||||
case_existing = true;
|
||||
return;
|
||||
if (code == 303) {
|
||||
return true;
|
||||
}
|
||||
|
||||
case_existing = false;
|
||||
return false;
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<div class="mx-auto max-w-2xl">
|
||||
@@ -223,9 +210,9 @@
|
||||
{#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) }
|
||||
{#if case_existing && vorgang.length > 0}
|
||||
<span>Datei wird zum existierenden Vorgang hinzugefügt.</span>
|
||||
{:else if (vorgang.length > 0) }
|
||||
{:else if vorgang.length > 0}
|
||||
<span>Neuer Vorgang wird angelegt.</span>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -295,18 +282,7 @@
|
||||
class="mt-2 flex justify-center rounded-lg border border-dashed border-gray-900/25 px-6 py-10"
|
||||
>
|
||||
<div class="text-center">
|
||||
<svg
|
||||
class="mx-auto h-12 w-12 text-gray-300"
|
||||
viewBox="0 0 24 24"
|
||||
fill="currentColor"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
fill-rule="evenodd"
|
||||
d="M1.5 6a2.25 2.25 0 012.25-2.25h16.5A2.25 2.25 0 0122.5 6v12a2.25 2.25 0 01-2.25 2.25H3.75A2.25 2.25 0 011.5 18V6zM3 16.06V18c0 .414.336.75.75.75h16.5A.75.75 0 0021 18v-1.94l-2.69-2.689a1.5 1.5 0 00-2.12 0l-.88.879.97.97a.75.75 0 11-1.06 1.06l-5.16-5.159a1.5 1.5 0 00-2.12 0L3 16.061zm10.125-7.81a1.125 1.125 0 112.25 0 1.125 1.125 0 01-2.25 0z"
|
||||
clip-rule="evenodd"
|
||||
/>
|
||||
</svg>
|
||||
<FileRect />
|
||||
<div class="mt-4 flex text-sm leading-6 text-gray-600">
|
||||
<label
|
||||
for="file"
|
||||
|
||||
Reference in New Issue
Block a user