🚀RELEASE v0.13.0

Merge pull request 'Better org pdf generation feature/130-org_doc_splitting' (#131 ) from feature/130-org_doc_splitting into dev
Reviewed-on: #131
2021-04-11 21:08:58 +02:00 · 2021-04-11 19:07:53 +00:00 · 2021-04-11 21:00:33 +02:00 · 2021-04-11 20:54:38 +02:00 · 2021-04-11 20:53:58 +02:00 · 2021-04-11 20:48:20 +02:00
13 changed files with 528 additions and 255 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,60 @@

 All notable changes to this project will be documented in this file. Dates are displayed in UTC.

+#### [0.13.0](https://git.odit.services/lfk/frontend/compare/0.12.5...0.13.0)
+
+- Merge pull request 'Better org pdf generation feature/130-org_doc_splitting' (#131) from feature/130-org_doc_splitting into dev [`861f1f2`](https://git.odit.services/lfk/frontend/commit/861f1f221653283e7586aa2c67b205337fd44398)
+- Org card generation now runs in sequence [`fef14b6`](https://git.odit.services/lfk/frontend/commit/fef14b6e4fb47ad92da61de91fedce96aea26b2c)
+- Org certificate generation now runs in sequence [`509b22b`](https://git.odit.services/lfk/frontend/commit/509b22bea0dd3e4446e6ecc37d27644e9bf2ad50)
+- Org contract generation now runs in sequence [`01d2a7e`](https://git.odit.services/lfk/frontend/commit/01d2a7e6aa709b3f2d71575f705fc962e97e2742)
+- Emergency document server url change [`5476808`](https://git.odit.services/lfk/frontend/commit/5476808683a919bc34dbaea1f1ed276d49750096)
+- Fixed const -&gt; let [`7447b2f`](https://git.odit.services/lfk/frontend/commit/7447b2f4c134a585905db6733093eab13e6f7c47)
+- Hotfix: Org * generation🐞 [`ac586fe`](https://git.odit.services/lfk/frontend/commit/ac586fec5abd324d590ba99cdfe8ddddefbf95e6)
+
+#### [0.12.5](https://git.odit.services/lfk/frontend/compare/0.12.4...0.12.5)
+
+> 8 April 2021
+
+- 🚀RELEASE v0.12.5 [`331d737`](https://git.odit.services/lfk/frontend/commit/331d737796c82454b1c19fa1840ccc20e36d2626)
+- Merge pull request 'Added runner team's parentorg name to runenr overciew' (#129) from feature/128-runner_orgs into dev [`ef81b8a`](https://git.odit.services/lfk/frontend/commit/ef81b8adf9bef685a55936d7544bf645c0d6ecbe)
+- Switched to html entity [`8a7d635`](https://git.odit.services/lfk/frontend/commit/8a7d635cef2d465e70c84e1f7a7b90b98a8dbab1)
+- Added runner team's parentorg name to runenr overciew [`4c259c1`](https://git.odit.services/lfk/frontend/commit/4c259c1eef2b0166ce6a8493d0c9e9d5ede11146)
+
+#### [0.12.4](https://git.odit.services/lfk/frontend/compare/0.12.3...0.12.4)
+
+> 8 April 2021
+
+- 🚀RELEASE v0.12.4 [`5b4ede5`](https://git.odit.services/lfk/frontend/commit/5b4ede5e2f6a26b475a7a4b430a4146d21fb9671)
+- 🚑 [HOTFIX] - drop "svelte-infinite-loading" [`d0ab3dd`](https://git.odit.services/lfk/frontend/commit/d0ab3dda78bbad2cea18a2491056530897d56607)
+
+#### [0.12.3](https://git.odit.services/lfk/frontend/compare/0.12.2...0.12.3)
+
+> 8 April 2021
+
+- Merge pull request 'fix' (#126) from bugfix/125-mobile into dev [`#125`](https://git.odit.services/lfk/frontend/issues/125)
+- almost fixed... [`495a6b2`](https://git.odit.services/lfk/frontend/commit/495a6b22bd8036593f390bdb862d325524cefbcc)
+- 🐞 bugfix for svelte x tailwind class names [`b6b07cf`](https://git.odit.services/lfk/frontend/commit/b6b07cf30cc6533bd5dbfec1f813c16fde85634d)
+- fix [`0acaffb`](https://git.odit.services/lfk/frontend/commit/0acaffbdfa359e52654a5afe2788aa59fe6f9036)
+- 🚀RELEASE v0.12.3 [`d9cf51b`](https://git.odit.services/lfk/frontend/commit/d9cf51b4bbc2136594a03c5d0eeb8cb3f3440b2a)
+- custom css fix for collapsed_navigation [`ffbc243`](https://git.odit.services/lfk/frontend/commit/ffbc243194c7faeb4fe61c12711a1c441c3994ef)
+- new license file version [CI SKIP] [`aa17f24`](https://git.odit.services/lfk/frontend/commit/aa17f242209f7e7cecff774ace7a35b581adec1f)
+
+#### [0.12.2](https://git.odit.services/lfk/frontend/compare/0.12.1...0.12.2)
+
+> 7 April 2021
+
+- 🚀RELEASE v0.12.2 [`6043bc4`](https://git.odit.services/lfk/frontend/commit/6043bc45174d51ab110b0ed10a8679d96127ab87)
+- Merge pull request 'feature/110-virtual_list' (#124) from feature/110-virtual_list into dev [`e6ed066`](https://git.odit.services/lfk/frontend/commit/e6ed066e3ffabba6519f94d801d21a27819d0492)
+- wip on virtuallist [`6304116`](https://git.odit.services/lfk/frontend/commit/6304116edb7f5e3c7b67c15e0b1740d34c513155)
+- fixed height table [`4cad86c`](https://git.odit.services/lfk/frontend/commit/4cad86cf852468428d77103d052c6974b17c34c3)
+- pre-merge fixes [`37970d2`](https://git.odit.services/lfk/frontend/commit/37970d2be6b6502701914e41e5bfe2c418438480)
+- updated virtual scroll list [`1376788`](https://git.odit.services/lfk/frontend/commit/1376788016e767f006661f8c9e6747781f2dce55)
+
 #### [0.12.1](https://git.odit.services/lfk/frontend/compare/0.12.0...0.12.1)

+> 6 April 2021
+
+- 🚀RELEASE v0.12.1 [`834ff8f`](https://git.odit.services/lfk/frontend/commit/834ff8fa63178f36dcacf931c128ba67a3e7bd1b)
 - Merge pull request 'ImportRunnerModal Cancel Button feature/122-import_cancel' (#123) from feature/112-import_cancel into dev [`1f428a5`](https://git.odit.services/lfk/frontend/commit/1f428a535e3ae619cbf8db51d04255aac8dd8614)
 - Added cancel button for the first stage of runner import [`0c40966`](https://git.odit.services/lfk/frontend/commit/0c409669700d3a8096cc04716154b0fdca458fe5)
 - Escape now triggers foll modal close (including reset) instead of just hiding th modal [`9da071f`](https://git.odit.services/lfk/frontend/commit/9da071fe9ba067160334682bf00163e3630fe919)
--- a/index.html
+++ b/index.html
@@ -13,7 +13,7 @@
 </head>

 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.12.1-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.13.0-RELEASE_INFO</span>
  <noscript>You need to enable JavaScript to run this app.</noscript>
  <script src="/env.js"></script>
  <script type="module" src="/src/main.js"></script>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.12.1",
+	"version": "0.13.0",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev": "vite",
@@ -13,7 +13,7 @@
 		"check-password-strength": "2.0.2",
 		"@odit/lfk-client-js": "0.10.1",
 		"@odit/license-exporter": "0.0.11",
-		"@sveltejs/vite-plugin-svelte": "1.0.0-next.5",
+		"@sveltejs/vite-plugin-svelte": "1.0.0-next.6",
 		"@types/html-minifier": "4.0.0",
 		"auto-changelog": "2.2.1",
 		"autoprefixer": "10.2.5",
@@ -28,12 +28,12 @@
 		"svelte-i18n": "3.3.9",
 		"svelte-preprocess": "4.7.0",
 		"svelte-select": "3.17.0",
-		"tailwindcss": "2.0.4",
+		"tailwindcss": "2.1.1",
 		"tinro": "0.6.1",
 		"toastify-js": "1.10.0",
 		"validator": "13.5.2",
 		"vite": "2.1.5",
-		"vite-plugin-windicss": "0.12.2",
+		"vite-plugin-windicss": "0.12.5",
 		"xlsx": "0.16.9"
 	},
 	"release-it": {
--- a/public/env.sample.js
+++ b/public/env.sample.js
@@ -1,5 +1,6 @@
 const config = {
 	baseurl: 'http://localhost:4010',
+	baseurl_documentserver: 'http://localhost:4010/documents',
 	documentserver_key: 'NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe',
 	// optional
 	default_username: 'demo',
--- a/public/licenses.json
+++ b/public/licenses.json
--- a/src/components/cards/AddCardBulkModal.svelte
+++ b/src/components/cards/AddCardBulkModal.svelte
@@ -77,7 +77,7 @@
            duration: -1,
          }).showToast();
          fetch(
-            `${config.baseurl}/documents/cards?&download=true&key=${config.documentserver_key}`,
+            `${config.baseurl_documentserver}/cards?&download=true&key=${config.documentserver_key}`,
            {
              method: "POST",
              headers: {
--- a/src/components/cards/CardsOverview.svelte
+++ b/src/components/cards/CardsOverview.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { getLocaleFromNavigator, json, _ } from "svelte-i18n";
+  import { _ } from "svelte-i18n";
  import { RunnerCardService } from "@odit/lfk-client-js";
  import store from "../../store";
  import Toastify from "toastify-js";
@@ -11,11 +11,21 @@
  export let editable = {};
  export let original_data = {};
  export let current_cards = [];
+  $: filtered_cards = current_cards.filter(function (c) {
+    if (
+      c.code.toLowerCase().includes(searchvalue_lowercase) ||
+      c.runner?.firstname.toLowerCase().includes(searchvalue_lowercase) ||
+      c.runner?.middlename.toLowerCase().includes(searchvalue_lowercase) ||
+      c.runner?.lastname.toLowerCase().includes(searchvalue_lowercase) ||
+      should_display_based_on_id(c.id)
+    ) {
+      return true;
+    }
+  });
  $: searchvalue = "";
+  $: searchvalue_lowercase = searchvalue.toLowerCase();
  $: active_deletes = [];
-  $: cards_show = current_cards.some(
-    (r) => r.is_selected === true
-  );
+  $: cards_show = current_cards.some((r) => r.is_selected === true);
  $: generate_cards = current_cards.filter((r) => r.is_selected === true);
  const cards_promise = RunnerCardService.runnerCardControllerGetAll().then(
    (val) => {
@@ -46,8 +56,38 @@
    original_data = Object.assign(original_data, card);
    edit_modal_open = true;
  }
+// -----------------
+  let scrollTop = 0;
+  $: rendered = filtered_cards;
+  let innerHeight = 0;
+  let ele;
+  $: updateSlice(scrollTop);
+  $: innerHeight = `${filtered_cards.length * 25}px`;
+  $: if (ele) updateSlice();
+  function updateSlice() {
+    const height = ele ? parseInt(ele.clientHeight) : 100;
+    const init = scrollTop / 25;
+    const end = Math.ceil((scrollTop + height) / 25);
+    rendered = filtered_cards.slice(init, end + 15);
+  }
+  function updateScroll($event) {
+    scrollTop = $event.target.scrollTop;
+  }
 </script>

+<style>
+  table tbody {
+  display: block;
+  overflow-y: scroll;
+}
+
+table thead, table tbody tr {
+  display: table;
+  width: 100%;
+  table-layout: fixed;
+}
+</style>
+
 {#if store.state.jwtinfo.userdetails.permissions.includes('CARD:UPDATE')}
  <CardDetailModal
    bind:current_cards
@@ -121,8 +161,12 @@
              </th>
            </tr>
          </thead>
-          <tbody class="divide-y divide-gray-200">
-            {#each current_cards as card}
+          <tbody class="divide-y divide-gray-200 virtual-wrapper"
+  on:scroll={updateScroll}
+  style="height: 70vh; width:100%"
+  bind:this={ele}
+          >
+    {#each filtered_cards as card, index}
    {#if card.code
      .toLowerCase()
      .includes(
--- a/src/components/dashboard/Dashboard.svelte
+++ b/src/components/dashboard/Dashboard.svelte
@@ -12,11 +12,21 @@
  }
 </script>

+<style>
+  .collapsed_navigation {
+    transform: translateX(-100%);
+  }
+  @media (min-width: 768px) {
+    .collapsed_navigation {
+      transform: translateX(0px);
+    }
+  }
+</style>
+
 <section class="min-h-screen bg-gray-50">
-  <nav
-    class:-translate-x-full={!navOpen}
-    class:translate-x-0={navOpen}
-    class="select-none fixed top-0 left-0 z-20 h-full pb-10 overflow-x-hidden overflow-y-auto transition origin-left transform border-r w-60 md:translate-x-0 bg-gray-50">
+  <div
+    class:collapsed_navigation={!navOpen}
+    class="select-none fixed top-0 left-0 z-20 h-full pb-10 overflow-x-hidden overflow-y-auto transition origin-left transform border-r w-60 bg-gray-50">
    <a href="/" class="flex items-center px-4 py-5">
      <img src="/lfk-logo.png" alt="Logo" class="h-10" />
      <h3 class="text-lg">Lauf für Kaya! Admin</h3>
@@ -297,14 +307,15 @@
        <span>{$_('logout')}</span>
      </span>
    </nav>
-  </nav>
+  </div>
  <div class="ml-0 transition md:ml-60">
    <header
+      class="flex items-center justify-between w-full px-4 bg-white border-b h-14 md:hidden">
+      <button
        on:click={() => {
          navOpen = true;
        }}
-      class="flex items-center justify-between w-full px-4 bg-white border-b h-14 md:hidden">
-      <button class="block btn btn-light md:hidden">
+        class="block btn btn-light md:hidden">
        <span class="sr-only">Menu</span><svg
          class="w-4 h-4"
          xmlns="http://www.w3.org/2000/svg"
@@ -318,10 +329,13 @@
      <NoComponentLoaded />
    </slot>
  </div>
+  {#if navOpen === true}
    <div
      on:click={() => {
        navOpen = false;
+        console.log({ navOpen });
      }}
      class:hidden={!navOpen}
      class="fixed inset-0 z-10 w-screen h-screen bg-black bg-opacity-25 md:hidden" />
+  {/if}
 </section>
--- a/src/components/orgs/OrgOverview.svelte
+++ b/src/components/orgs/OrgOverview.svelte
@@ -14,7 +14,7 @@
  $: active_deletes = [];
  $: sponsoring_contracts_show = current_organizations.some((r) => r.is_selected === true);
  $: cards_show = current_organizations.some((r) => r.is_selected === true);
-  $: generate_orgs = current_organizations.some((r) => r.is_selected === true);
+  $: generate_orgs = current_organizations.filter((r) => r.is_selected === true);
  $: certificates_show = current_organizations.some(
    (r) => r.is_selected === true
  );
--- a/src/components/pdf_generation/GenerateRunnerCards.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCards.svelte
@@ -41,7 +41,7 @@
            duration: -1,
        }).showToast();
        fetch(
-            `${config.baseurl}/documents/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
+            `${config.baseurl_documentserver}/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
            {
                method: "POST",
                headers: {
@@ -101,7 +101,7 @@
            cards.push(card);
        }
        fetch(
-            `${config.baseurl}/documents/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
+            `${config.baseurl_documentserver}/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
            {
                method: "POST",
                headers: {
@@ -169,7 +169,7 @@
                cards.push(card);
            }
            fetch(
-                `${config.baseurl}/documents/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
+                `${config.baseurl_documentserver}/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
                {
                    method: "POST",
                    headers: {
@@ -216,15 +216,16 @@

    async function generateOrgCards(locale) {
        const toast = Toastify({
-            text: $_("generating-pdf"),
+            text: $_("generating-pdfs"),
            duration: -1,
        }).showToast();
-        let count = 0;
        const current_cards = await RunnerCardService.runnerCardControllerGetAll();
+        let count = 0;
+        let count_orgs =0;
        for (const o of generate_orgs) {
-            const runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
-                o.id
-            );
+            count_orgs++;
+            let count = 0;
+            let runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(o.id, true)
            let cards = [];
            for (let runner of runners) {
                let card = current_cards.find((c) => c.runner?.id == runner.id);
@@ -235,8 +236,8 @@
                }
                cards.push(card);
            }
-            fetch(
-                `${config.baseurl}/documents/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
+            await fetch(
+                `${config.baseurl_documentserver}/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
                {
                    method: "POST",
                    headers: {
@@ -259,15 +260,72 @@
                }
            })
            .then((blob) => {
-                    count++;
                const url = window.URL.createObjectURL(blob);
                let a = document.createElement("a");
                a.href = url;
-                    a.download = `${$_('runnercards')}_${o.name}-${locale}.pdf`;
+                a.download = `${$_('runnercards')}_${o.name}_direct-${locale}.pdf`;
                document.body.appendChild(a);
                a.click();
                a.remove();
-                    if (count === generate_orgs.length) {
+                if (count === o.teams.length && count_orgs === generate_orgs.length) {
+                    toast.hideToast();
+                    console.log("here")
+                    Toastify({
+                        text: $_("pdfs-successfully-generated"),
+                        duration: 3500,
+                        backgroundColor:
+                        "linear-gradient(to right, #00b09b, #96c93d)",
+                    }).showToast();
+                }
+            })
+            .catch((err) => {});
+            for await (const t of o.teams) {
+                count++;
+                let runners = await RunnerTeamService.runnerTeamControllerGetRunners(
+                    t.id
+                );
+            let cards = [];
+            for (let runner of runners) {
+                let card = current_cards.find((c) => c.runner?.id == runner.id);
+                if (!card) {
+                    card = await RunnerCardService.runnerCardControllerPost({
+                        runner: runner.id,
+                    });
+                }
+                cards.push(card);
+            }
+            await fetch(
+                `${config.baseurl_documentserver}/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
+                {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    body: JSON.stringify(cards),
+                }
+            )
+            .then((response) => {
+                if (response.status != "200") {
+                    toast.hideToast();
+                    Toastify({
+                        text: $_("pdf-generation-failed"),
+                        duration: 3500,
+                        backgroundColor:
+                            "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
+                    }).showToast();
+                } else {
+                    return response.blob();
+                }
+            })
+            .then((blob) => {
+                const url = window.URL.createObjectURL(blob);
+                let a = document.createElement("a");
+                a.href = url;
+                a.download = `${$_('runnercards')}_${o.name}_${t.name}-${locale}.pdf`;
+                document.body.appendChild(a);
+                a.click();
+                a.remove();
+                if (count === o.teams.length && count_orgs === generate_orgs.length) {
                    toast.hideToast();
                    Toastify({
                        text: $_("pdfs-successfully-generated"),
@@ -280,6 +338,7 @@
            .catch((err) => {});
            }
        }
+    }
 </script>

 {#if cards_show}
--- a/src/components/pdf_generation/GenerateRunnerCertificates.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
@@ -37,14 +37,14 @@
            text: $_("generating-pdf"),
            duration: -1,
        }).showToast();
-        const current_donations = await DonationService.donationControllerGetAll();
+        const current_donations = (await DonationService.donationControllerGetAll()) || [];
        let certificateRunners = [];
        for (let runner of generate_runners) {
            runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || [];
            certificateRunners.push(runner);
        }
        fetch(
-            `${config.baseurl}/documents/certificates?locale=${locale}&download=true&key=${config.documentserver_key}`,
+            `${config.baseurl_documentserver}/certificates?locale=${locale}&download=true&key=${config.documentserver_key}`,
            {
                method: "POST",
                headers: {
@@ -96,7 +96,7 @@
            duration: -1,
        }).showToast();
        let count = 0;
-        const current_donations = await DonationService.donationControllerGetAll();
+        const current_donations = (await DonationService.donationControllerGetAll()) || [];
        for (const t of generate_teams) {
            const runners = await RunnerTeamService.runnerTeamControllerGetRunners(
                t.id
@@ -107,7 +107,7 @@
                certificateRunners.push(runner);
            }
            fetch(
-                `${config.baseurl}/documents/certificates?locale=${locale}&download=true&key=${config.documentserver_key}`,
+                `${config.baseurl_documentserver}/certificates?locale=${locale}&download=true&key=${config.documentserver_key}`,
                {
                    method: "POST",
                    headers: {
@@ -154,22 +154,23 @@

    async function generateOrgCertificates(locale) {
        const toast = Toastify({
-            text: $_("generating-pdf"),
+            text: $_("generating-pdfs"),
            duration: -1,
        }).showToast();
+        const current_donations = (await DonationService.donationControllerGetAll()) || [];
        let count = 0;
-        const current_donations = await DonationService.donationControllerGetAll();
+        let count_orgs =0;
        for (const o of generate_orgs) {
-            const runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
-                o.id
-            );
+            count_orgs++;
+            let count = 0;
+            let runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(o.id, true)
            let certificateRunners = [];
            for (let runner of runners) {
                runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || [];
                certificateRunners.push(runner);
            }
-            fetch(
-                `${config.baseurl}/documents/certificates?locale=${locale}&download=true&key=${config.documentserver_key}`,
+            await fetch(
+                `${config.baseurl_documentserver}/certificates?locale=${locale}&download=true&key=${config.documentserver_key}`,
                {
                    method: "POST",
                    headers: {
@@ -192,15 +193,67 @@
                }
            })
            .then((blob) => {
-                    count++;
                const url = window.URL.createObjectURL(blob);
                let a = document.createElement("a");
                a.href = url;
-                    a.download = `${$_('certificates')}_${o.name}-${locale}.pdf`;
+                a.download = `${$_('certificates')}_${o.name}_direct-${locale}.pdf`;
                document.body.appendChild(a);
                a.click();
                a.remove();
-                    if (count === generate_orgs.length) {
+                if (count === o.teams.length && count_orgs === generate_orgs.length) {
+                    toast.hideToast();
+                    console.log("here")
+                    Toastify({
+                        text: $_("pdfs-successfully-generated"),
+                        duration: 3500,
+                        backgroundColor:
+                        "linear-gradient(to right, #00b09b, #96c93d)",
+                    }).showToast();
+                }
+            })
+            .catch((err) => {});
+            for await (const t of o.teams) {
+                count++;
+                let runners = await RunnerTeamService.runnerTeamControllerGetRunners(
+                    t.id
+                );
+                let certificateRunners = [];
+            for (let runner of runners) {
+                runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || [];
+                certificateRunners.push(runner);
+            }
+            await fetch(
+                `${config.baseurl_documentserver}/certificates?locale=${locale}&download=true&key=${config.documentserver_key}`,
+                {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    body: JSON.stringify(certificateRunners),
+                }
+            )
+            .then((response) => {
+                if (response.status != "200") {
+                    toast.hideToast();
+                    Toastify({
+                        text: $_("pdf-generation-failed"),
+                        duration: 3500,
+                        backgroundColor:
+                            "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
+                    }).showToast();
+                } else {
+                    return response.blob();
+                }
+            })
+            .then((blob) => {
+                const url = window.URL.createObjectURL(blob);
+                let a = document.createElement("a");
+                a.href = url;
+                a.download = `${$_('certificates')}_${o.name}_${t.name}-${locale}.pdf`;
+                document.body.appendChild(a);
+                a.click();
+                a.remove();
+                if (count === o.teams.length && count_orgs === generate_orgs.length) {
                    toast.hideToast();
                    Toastify({
                        text: $_("pdfs-successfully-generated"),
@@ -213,6 +266,7 @@
            .catch((err) => {});
            }
        }
+    }
 </script>

 {#if certificates_show}
--- a/src/components/pdf_generation/GenerateSponsoringContracts.svelte
+++ b/src/components/pdf_generation/GenerateSponsoringContracts.svelte
@@ -43,7 +43,7 @@
                t.id
            );
            fetch(
-                `${config.baseurl}/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+                `${config.baseurl_documentserver}/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
                {
                    method: "POST",
                    headers: {
@@ -92,12 +92,13 @@
            text: $_("generating-pdf"),
            duration: -1,
        }).showToast();
+        let count_orgs =0;
        for (const o of generate_orgs) {
-            const runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
-                o.id
-            );
-            fetch(
-                `${config.baseurl}/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+            count_orgs++;
+            let count = 0;
+            let runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(o.id, true)
+            await fetch(
+                `${config.baseurl_documentserver}/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
                {
                    method: "POST",
                    headers: {
@@ -120,15 +121,62 @@
                }
            })
            .then((blob) => {
-                    count++;
                const url = window.URL.createObjectURL(blob);
                let a = document.createElement("a");
                a.href = url;
-                    a.download = `${$_('sponsorings')}_${o.name}-${locale}.pdf`;
+                a.download = `${$_('sponsorings')}_${o.name}_direct-${locale}.pdf`;
                document.body.appendChild(a);
                a.click();
                a.remove();
-                    if (count === generate_orgs.length) {
+                if (count === o.teams.length && count_orgs === generate_orgs.length) {
+                    toast.hideToast();
+                    console.log("here")
+                    Toastify({
+                        text: $_("pdfs-successfully-generated"),
+                        duration: 3500,
+                        backgroundColor:
+                        "linear-gradient(to right, #00b09b, #96c93d)",
+                    }).showToast();
+                }
+            })
+            .catch((err) => {});
+            for await (const t of o.teams) {
+                count++;
+                let runners = await RunnerTeamService.runnerTeamControllerGetRunners(
+                    t.id
+                );
+            await fetch(
+                `${config.baseurl_documentserver}/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+                {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    body: JSON.stringify(runners),
+                }
+            )
+            .then((response) => {
+                if (response.status != "200") {
+                    toast.hideToast();
+                    Toastify({
+                        text: $_("pdf-generation-failed"),
+                        duration: 3500,
+                        backgroundColor:
+                            "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
+                    }).showToast();
+                } else {
+                    return response.blob();
+                }
+            })
+            .then((blob) => {
+                const url = window.URL.createObjectURL(blob);
+                let a = document.createElement("a");
+                a.href = url;
+                a.download = `${$_('sponsorings')}_${o.name}_${t.name}-${locale}.pdf`;
+                document.body.appendChild(a);
+                a.click();
+                a.remove();
+                if (count === o.teams.length && count_orgs === generate_orgs.length) {
                    toast.hideToast();
                    Toastify({
                        text: $_("pdfs-successfully-generated"),
@@ -141,6 +189,7 @@
            .catch((err) => {});
            }
        }
+    }

    function generateRunnerContracts(locale) {
        const toast = Toastify({
@@ -148,7 +197,7 @@
            duration: -1,
        }).showToast();
        fetch(
-            `${config.baseurl}/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+            `${config.baseurl_documentserver}/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
            {
                method: "POST",
                headers: {
--- a/src/components/runners/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -197,7 +197,7 @@
                      {#if runner.group.responseType === 'RUNNERTEAM'}
                        <a
                          href="../teams/{runner.group.id}"
-                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{runner.group.name}</a>
+                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{runner.group.parentGroup.name} &gt; {runner.group.name}</a>
                      {/if}
                      {#if runner.group.responseType === 'RUNNERORGANIZATION'}
                        <a
Author	SHA1	Message	Date
Nicolai Ort	467808abef	🚀RELEASE v0.13.0 Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-11 21:08:58 +02:00
Nicolai Ort	861f1f2216	Merge pull request 'Better org pdf generation feature/130-org_doc_splitting' (#131 ) from feature/130-org_doc_splitting into dev Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #131	2021-04-11 19:07:53 +00:00
Nicolai Ort	509b22bea0	Org certificate generation now runs in sequence ref #130	2021-04-11 21:00:33 +02:00
Nicolai Ort	7447b2f4c1	Fixed const -> let ref #130	2021-04-11 20:54:38 +02:00
Nicolai Ort	fef14b6e4f	Org card generation now runs in sequence ref #130	2021-04-11 20:53:58 +02:00
Nicolai Ort	01d2a7e6aa	Org contract generation now runs in sequence ref #130	2021-04-11 20:48:20 +02:00
Nicolai Ort	ac586fec5a	Hotfix: Org * generation🐞 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-11 20:17:34 +02:00
Nicolai Ort	5476808683	Emergency document server url change All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-11 20:10:08 +02:00
Nicolai Ort	331d737796	🚀RELEASE v0.12.5 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-08 19:30:20 +02:00
Nicolai Ort	ef81b8adf9	Merge pull request 'Added runner team's parentorg name to runenr overciew' (#129 ) from feature/128-runner_orgs into dev All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #129	2021-04-08 17:29:27 +00:00
Nicolai Ort	8a7d635cef	Switched to html entity ref #128	2021-04-08 18:00:47 +02:00
Nicolai Ort	4c259c1eef	Added runner team's parentorg name to runenr overciew ref #128	2021-04-08 17:58:49 +02:00
Philipp Dormann	5b4ede5e2f	🚀RELEASE v0.12.4 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-08 17:34:32 +02:00
Philipp Dormann	d0ab3dda78	🚑 [HOTFIX] - drop "svelte-infinite-loading" Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-08 17:34:04 +02:00
Philipp Dormann	d9cf51b4bb	🚀RELEASE v0.12.3 Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-08 17:30:23 +02:00
Philipp Dormann	aa17f24220	new license file version [CI SKIP]	2021-04-08 15:28:50 +00:00
Philipp Dormann	cf60edf7d4	Merge pull request 'fix' (#126 ) from bugfix/125-mobile into dev Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #126 close #125	2021-04-08 15:27:22 +00:00
Philipp Dormann	ffbc243194	custom css fix for collapsed_navigation ref #125	2021-04-07 21:44:29 +02:00
Philipp Dormann	b6b07cf30c	🐞 bugfix for svelte x tailwind class names ref #125	2021-04-07 21:35:01 +02:00
Philipp Dormann	495a6b22bd	almost fixed...	2021-04-07 21:28:21 +02:00
Philipp Dormann	0acaffbdfa	fix ref #125	2021-04-07 20:25:04 +02:00
Nicolai Ort	6043bc4517	🚀RELEASE v0.12.2 Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-07 20:11:21 +02:00
Nicolai Ort	e6ed066e3f	Merge pull request 'feature/110-virtual_list' (#124 ) from feature/110-virtual_list into dev Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #124	2021-04-07 18:10:02 +00:00
Nicolai Ort	ee4e8655b8	Merge branch 'dev' into feature/110-virtual_list	2021-04-07 20:09:35 +02:00
Philipp Dormann	37970d2be6	pre-merge fixes ref #110	2021-04-07 18:59:46 +02:00
Philipp Dormann	1376788016	updated virtual scroll list	2021-04-07 18:38:52 +02:00
Philipp Dormann	4cad86cf85	fixed height table	2021-04-07 18:19:58 +02:00
Philipp Dormann	6304116edb	wip on virtuallist	2021-04-06 22:16:24 +02:00