From c6985087a8b51d6e1d8fb71b1eb8a659b8ed34e6 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 30 Jan 2021 17:05:19 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20layout=20for=20Import=20from=20Runn?= =?UTF-8?q?erOverview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #15 --- src/components/ImportRunnerModal.svelte | 36 ++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/src/components/ImportRunnerModal.svelte b/src/components/ImportRunnerModal.svelte index 6fa5f316..70336769 100644 --- a/src/components/ImportRunnerModal.svelte +++ b/src/components/ImportRunnerModal.svelte @@ -5,7 +5,11 @@ import { clickOutside } from "./outsideclick"; import { focusTrap } from "svelte-focus-trap"; import Toastify from "toastify-js"; - import { ImportService } from "@odit/lfk-client-js"; + import { + ImportService, + RunnerTeamService, + RunnerOrganizationService, + } from "@odit/lfk-client-js"; import { createEventDispatcher } from "svelte"; export let opened_from; export let passed_org; @@ -29,6 +33,14 @@ } }; })(); + let orgs = []; + RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => { + orgs = val; + }); + let teams = []; + RunnerTeamService.runnerTeamControllerGetAll().then((val) => { + teams = val; + }); let selected_org; let files; let recent_processed = true; @@ -192,6 +204,24 @@

{$_('bitte-bestaetige-diese-laeufer-fuer-den-import')}

{/if} + {#if opened_from === 'RunnerOverview'} +

Group

+ + {/if} {#if opened_from === 'OrgDetail'}

{$_('runnerimport_verify_runners_org', { @@ -225,7 +255,7 @@ class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"> {$_('csv_import__lastname')} - {#if opened_from !== 'TeamDetail'} + {#if opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview'} @@ -250,7 +280,7 @@ {runner[`${$_('csv_import__lastname')}`]} - {#if opened_from !== 'TeamDetail'} + {#if opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview'} {runner[`${$_('csv_import__team')}`] || runner[`${$_('csv_import__class')}`] || '---'}