diff --git a/src/components/ImportRunnerModal.svelte b/src/components/ImportRunnerModal.svelte index a905dcbb..579e42c4 100644 --- a/src/components/ImportRunnerModal.svelte +++ b/src/components/ImportRunnerModal.svelte @@ -1,32 +1,13 @@ {#if import_modal_open} @@ -96,20 +97,88 @@

Runner Import

-
-

- Please provide the required csv/ xlsx file -

-
-
-

{parsedtext}

-
- -
- - - -
+ {#if json_output.length === 0} +
+

+ Please provide the required csv/ xlsx file +

+
+
+ +
+ {/if} + {#if json_output.length > 0} +

Bitte bestätige diese Läufer für den Import

+ +
+ + + + + + + + + + + {#each json_output as runner} + {#if Object.values(runner) + .toString() + .toLowerCase() + .includes(searchvalue)} + + + + + + + {/if} + {/each} + +
+ Vorname + + Middlename + + Lastname + + Team +
+ {runner['Vorname']} + + {runner['Zweitname'] || ''} + + {runner['Nachname']} + + {runner['Team'] || '---'} +
+ +
+ {/if} diff --git a/src/components/Orgs.svelte b/src/components/Orgs.svelte index 4571e8f4..c08f1466 100644 --- a/src/components/Orgs.svelte +++ b/src/components/Orgs.svelte @@ -4,8 +4,9 @@ import AddOrgModal from "./AddOrgModal.svelte"; export let modal_open = false; import OrgOverview from "./OrgOverview.svelte"; - console.log(store.state.jwtinfo.userdetails.permissions); + import ImportRunnerModal from "./ImportRunnerModal.svelte"; let current_organizations = []; + export let import_modal_open = false;
@@ -21,6 +22,16 @@ {$_('create-organization')} {/if} + {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:IMPORT')} + + {/if}

manage runner organizations

@@ -28,4 +39,5 @@ {#if store.state.jwtinfo.userdetails.permissions.includes('ORGANISATION:CREATE')} + {/if} diff --git a/src/components/Runners.svelte b/src/components/Runners.svelte index 5fd33eac..e3297f97 100644 --- a/src/components/Runners.svelte +++ b/src/components/Runners.svelte @@ -2,10 +2,10 @@ import { _ } from "svelte-i18n"; import store from "../store"; import AddRunnerModal from "./AddRunnerModal.svelte"; - import ImportRunnerModal from "./ImportRunnerModal.svelte"; + // import ImportRunnerModal from "./ImportRunnerModal.svelte"; import RunnersOverview from "./RunnersOverview.svelte"; export let modal_open = false; - export let import_modal_open = false; + // export let import_modal_open = false; let current_runners = []; @@ -21,14 +21,14 @@ class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm"> Läufer hinzufügen - + --> {/if}

läuft bei ihnen

@@ -37,5 +37,5 @@ {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:CREATE')} - + {/if}