🚀RELEASE v0.12.5

Reviewed-on: #129

CHANGELOG.md

@@ -2,15 +2,124 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.12.5](https://git.odit.services/lfk/frontend/compare/0.12.4...0.12.5)
+
+- 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)
+
+#### [0.12.0](https://git.odit.services/lfk/frontend/compare/0.11.0...0.12.0)
+
+> 5 April 2021
+
+- Merge pull request 'feature/108_vite_migration' (#118) from feature/108_vite_migration into dev [`#108`](https://git.odit.services/lfk/frontend/issues/108)
+- 🚀RELEASE v0.12.0 [`892a04f`](https://git.odit.services/lfk/frontend/commit/892a04f28930481715eb486b1ef4efeb98a6e999)
+- Fixed package version [`27cc972`](https://git.odit.services/lfk/frontend/commit/27cc9727f1d02d186c3ccadb06e5b4b1b1d6202d)
+- Merge pull request 'Implmented certificate generation feature/119-Certificate_generation' (#120) from feature/119-Certificate_generation into dev [`f0738d4`](https://git.odit.services/lfk/frontend/commit/f0738d451b02e4a298b5f9cb8ab0be16aed10a38)
+- The PFS Prefixes now get translated via i18n [`bfacfec`](https://git.odit.services/lfk/frontend/commit/bfacfec76511cae3015f52698fdcbd80a7a15981)
+- Sorted translations 🌍 [`9e6a8da`](https://git.odit.services/lfk/frontend/commit/9e6a8daf2c394cf17da532382ec7d049a0f89577)
+- added missing/ wrong translations + formatting! [`7c86a5e`](https://git.odit.services/lfk/frontend/commit/7c86a5eeb370a43451d180a09a501066b023b9a0)
+- Added i18n [`17f6f4e`](https://git.odit.services/lfk/frontend/commit/17f6f4e616bf57424ee12ad53b939429c02a0171)
+- Added basic certificate generation component [`af63ce6`](https://git.odit.services/lfk/frontend/commit/af63ce67ae7d8f8a70706c3bd6755197908996ff)
+- basic ViteJS migration [`ae79e9f`](https://git.odit.services/lfk/frontend/commit/ae79e9fea1963e977ef468e8e56f87d68916fadd)
+- Implemented generation for orgs [`2e3ac15`](https://git.odit.services/lfk/frontend/commit/2e3ac154be0bf0776cd00f7d510f41ec676ae690)
+- Implemented generation for teams [`2472640`](https://git.odit.services/lfk/frontend/commit/2472640755e3e41259a44127a875d00517a25842)
+- updated default entrypoint [`95c8fde`](https://git.odit.services/lfk/frontend/commit/95c8fde72fca5cd5a644d51a33dc88e0b59fce92)
+- ⏫📍 version bump + pin [`b065b4f`](https://git.odit.services/lfk/frontend/commit/b065b4ff218d07952fa45989e6e2ee7df13e07c1)
+- 🧹 reorder + fix package [`12433f7`](https://git.odit.services/lfk/frontend/commit/12433f7c236906fe2b29848a0acaa6be1724da56)
+- 🔨 re-added VS Code devcontainer config [`9318709`](https://git.odit.services/lfk/frontend/commit/93187099d32c506329b1437642aae985f2850689)
+- 🐳 new Dockerfiles [`0f32968`](https://git.odit.services/lfk/frontend/commit/0f32968fae8b55a13d387918211983d0e61f85ab)
+- 📃 added readme [`aa24b1d`](https://git.odit.services/lfk/frontend/commit/aa24b1dce5d6d73c8f42fc57f81b692350bf9665)
+- Copy-paste fix [`f47d5e3`](https://git.odit.services/lfk/frontend/commit/f47d5e347d97ee127fa0380620138a9672665cd5)
+- 🔨🔥 alpine based devcontainer with working yarn PnP [`777304f`](https://git.odit.services/lfk/frontend/commit/777304f2593df36f4e89d2ba7680add183ff062f)
+- Copy-paste fix [`7488a8b`](https://git.odit.services/lfk/frontend/commit/7488a8b597a148c309e1b4499d277fed7f3bf9f4)
+- You can now generate certificates from the runner overview [`bb9b779`](https://git.odit.services/lfk/frontend/commit/bb9b779cee909ab85ef52f13be0a917f1c0a9e62)
+- Cleaned up generation strings and added the schem for single runner generations for cards [`9c867e1`](https://git.odit.services/lfk/frontend/commit/9c867e106edd68784e6d19743519c1952a0f0bc7)
+- Changed the basic nameing generation for runenr certificate files [`d65d379`](https://git.odit.services/lfk/frontend/commit/d65d3793de869bcd6733a1bbdac378d0bc1128b3)
+- ⏫ version bumps [`d7fecfb`](https://git.odit.services/lfk/frontend/commit/d7fecfbd0bc01f1cd44dea3c3837e0cc44afab12)
+- Cleaned up generation strings and added the schem for single runner generations for sponsoring contracts [`22b09d1`](https://git.odit.services/lfk/frontend/commit/22b09d16d0acc2883e3448dad95ed0f4ea7c6aeb)
+- Certificate generation from org overview [`3177c6e`](https://git.odit.services/lfk/frontend/commit/3177c6eaa31636ed4546f4797775a0f0a930f5d1)
+- certificate pdf names now include their locale [`304f28a`](https://git.odit.services/lfk/frontend/commit/304f28a3c10bc4745aa5b7c80d7ba0e651540706)
+- Runnercard pdfs now include their locale [`3638d87`](https://git.odit.services/lfk/frontend/commit/3638d87bd2ff83618eefda5af18ba19e38e3c2eb)
+- 🐞 fix await for esNext [`a922776`](https://git.odit.services/lfk/frontend/commit/a9227768de29305b51d10c8a6e4fa1d39b7d998f)
+- Certificate generation from team overview [`18ec100`](https://git.odit.services/lfk/frontend/commit/18ec100c33a1fbab526187e769dbae54d9db0867)
+- Added certificate generation from runner overview and detail [`7b685d6`](https://git.odit.services/lfk/frontend/commit/7b685d6cad97d2f7f48c4b19bfc128e1355b70c4)
+- package cleanup [`6be2ee6`](https://git.odit.services/lfk/frontend/commit/6be2ee626addaf5113b4b4821bd99a276bf4f329)
+- sponsoring pdf names now include their locale [`0bae5bf`](https://git.odit.services/lfk/frontend/commit/0bae5bf32b8687057dca50cde21022ea8c3abee8)
+- ✨ update licenses.json [`e99e9e0`](https://git.odit.services/lfk/frontend/commit/e99e9e07089520d5a48021e10d2af7739656641a)
+- added windicss settings for VSCode [`008027d`](https://git.odit.services/lfk/frontend/commit/008027db0e2736a9bb9defd67178ab3fe580de04)
+- Certificate generation from team detail [`acd2f05`](https://git.odit.services/lfk/frontend/commit/acd2f0519d62e55dad8e9c3c41e77b6967212502)
+- ⚡💾 prevent env.js from being cached [`c5d1553`](https://git.odit.services/lfk/frontend/commit/c5d155396a92dfee6d592fb24a936ab521215f6d)
+- for await fix - ViteJS [`aec5e34`](https://git.odit.services/lfk/frontend/commit/aec5e3473e687415fbfd69c550d9b012e1b1be43)
+- Certificate generation from org detail [`e6ffc37`](https://git.odit.services/lfk/frontend/commit/e6ffc371e1ca2d4451e7dd4a3ca3c05564edb5fb)
+- 🧹 drop unused dependencies [`ce50fa2`](https://git.odit.services/lfk/frontend/commit/ce50fa2a62f8ff98e8be9c66432caeebb3952019)
+- 🐞 fix NGINX config [`5352410`](https://git.odit.services/lfk/frontend/commit/5352410d0c76fd14575d7beafc6a83f028062efe)
+- Fixed wrong permissiong getting checked [`b97a928`](https://git.odit.services/lfk/frontend/commit/b97a92860d71eb0384170e245a67fa3ea3fd8e85)
+- new license file version [CI SKIP] [`5cc4871`](https://git.odit.services/lfk/frontend/commit/5cc4871ec4be9f0af07738f6e3d44bdbe31cd25a)
+- ⏫ bump @odit/lfk-client-js@0.10.1 [`8b74d6d`](https://git.odit.services/lfk/frontend/commit/8b74d6d759c8481f012c201e2ea0d12b29ddef90)
+- 🔨 dev container open ⚡ [`ceb2146`](https://git.odit.services/lfk/frontend/commit/ceb2146c1b08bbe9250e4db7846e06bd89526c21)
+- ⏫ version bump: vite-plugin-windicss@0.12.2 [`8d006d8`](https://git.odit.services/lfk/frontend/commit/8d006d8c74d71c43a9031d58f5a8c7fc55ed95fc)
+- 🚚 move @svitejs/vite-plugin-svelte to @sveltejs/vite-plugin-svelte [`44b53da`](https://git.odit.services/lfk/frontend/commit/44b53da34516b00671b3e5060ba831e409ac3dd5)
+- ⏫ upgrade vite-plugin-windicss@0.12.1 [`ab45fc1`](https://git.odit.services/lfk/frontend/commit/ab45fc144eaf14f63d86ee53c1db4eefd88f9c7f)
+- 🐞 fix main.js linking [`467404b`](https://git.odit.services/lfk/frontend/commit/467404bfc87f3c08c5e227f194d71eea7cc48921)
+- 🐞 fix vite config for production system [`10a011d`](https://git.odit.services/lfk/frontend/commit/10a011d8426e475105ff5d2d5cf4adca2ef7625c)
+- fix dev script [`eb3ede9`](https://git.odit.services/lfk/frontend/commit/eb3ede9593e2e527df3e3a2f81c8e179bb555f51)
+- ⏫ bump vite to 2.1.3 [`0cd3e93`](https://git.odit.services/lfk/frontend/commit/0cd3e937d852eeabe43eb6298bfabe20834240b2)
+- Removed useless console.log [`d23dbaa`](https://git.odit.services/lfk/frontend/commit/d23dbaaf695a60fe5ebbc9945646a16b5fc45a16)
+- Removed useless console log [`48cfc15`](https://git.odit.services/lfk/frontend/commit/48cfc15cfb09096db1bd5ddbe9138b1a604d581f)
+
 #### [0.11.0](https://git.odit.services/lfk/frontend/compare/0.10.0...0.11.0)
 
-- Merge pull request 'Generate and print bulk blank cards feature/116-download_blanc_cards' (#117) from feature/116-download_blanc_cards into dev [`25d8b86`](https://git.odit.services/lfk/frontend/commit/25d8b86efd89c442d1bf308a8743134820acfd1f)
+> 30 March 2021
+
 - Added button (including translations [`0614c76`](https://git.odit.services/lfk/frontend/commit/0614c76e924b18b512bab59933a26fec07cf483d)
 - Added button (including translations [`97e338f`](https://git.odit.services/lfk/frontend/commit/97e338f9d4f388596d550990457254c7fa1a3492)
 - Sorted translations [`89bb9c2`](https://git.odit.services/lfk/frontend/commit/89bb9c215e356e0940678f5cabd9e38bc203040e)
 - Added function for generating cards with pdf [`c8d6390`](https://git.odit.services/lfk/frontend/commit/c8d639024a5f2f72d6e30d2ce990b08bd71a5471)
+- 🚀RELEASE v0.11.0 [`f8ccf4f`](https://git.odit.services/lfk/frontend/commit/f8ccf4f5d8f68ecee31430029889b8ab1ecec682)
 - Fixed button styling [`08cb079`](https://git.odit.services/lfk/frontend/commit/08cb079e9798392e26515d559af2637e74deea97)
 - Now returning cards on creation with pdf [`1d999d4`](https://git.odit.services/lfk/frontend/commit/1d999d4910acb5efa21b3f9922cdb359babff404)
+- new license file version [CI SKIP] [`8f8b998`](https://git.odit.services/lfk/frontend/commit/8f8b9988ad94ee9f3729a3fe6fdb4c558828d892)
+- Merge pull request 'Generate and print bulk blank cards feature/116-download_blanc_cards' (#117) from feature/116-download_blanc_cards into dev [`25d8b86`](https://git.odit.services/lfk/frontend/commit/25d8b86efd89c442d1bf308a8743134820acfd1f)
 - Added comment [`636f018`](https://git.odit.services/lfk/frontend/commit/636f018daa33b99468a257bfc33477e1e644d081)
 - Bumped lfk client js version [`2d18686`](https://git.odit.services/lfk/frontend/commit/2d18686ce782a434ca7bd34c07c36a35b9497273)
 - Bumped lfk-client-js [`7dfaa75`](https://git.odit.services/lfk/frontend/commit/7dfaa7579a22b13194fcdd1c02b4437958261472)

index.html

@@ -13,7 +13,7 @@
 </head>
 
 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.8.4-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.12.5-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>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.8.4",
+	"version": "0.12.5",
 	"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": {

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(
+  $: cards_show = current_cards.some((r) => r.is_selected === true);
-    (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">
+          <tbody class="divide-y divide-gray-200 virtual-wrapper"
-            {#each current_cards as card}
+  on:scroll={updateScroll}
+  style="height: 70vh; width:100%"
+  bind:this={ele}
+          >
+    {#each filtered_cards as card, index}
     {#if card.code
       .toLowerCase()
       .includes(

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
+  <div
-    class:-translate-x-full={!navOpen}
+    class:collapsed_navigation={!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 bg-gray-50">
-    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">
     <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">
+        class="block btn btn-light md:hidden">
-      <button 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>

src/components/orgs/OrgDetail.svelte

@@ -12,6 +12,7 @@
   import Select from "svelte-select";
   import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
   import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
+  import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
   import { tick } from "svelte";
   $: delete_triggered = false;
   $: address_valid_or_none =
@@ -34,6 +35,7 @@
   $: iscityvalid = editable.address?.city?.trim().length !== 0;
   $: sponsoring_contracts_show = true;
   $: cards_show = true;
+  $: certificates_show = true;
   $: generate_orgs = [original_object];
   $: registrationLink = `${config.baseurl}/selfservice/register/${editable.registrationKey}`;
   const getContactLabel = (option) =>
@@ -176,6 +178,7 @@
           bind:sponsoring_contracts_show
           bind:generate_orgs />
         <GenerateRunnerCards bind:cards_show bind:generate_orgs />
+        <GenerateRunnerCertificates bind:certificates_show bind:generate_orgs />
         {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:IMPORT')}
           <button
             on:click={() => {
@@ -186,7 +189,7 @@
             {$_('import-runners')}
           </button>
         {/if}
-        {#if store.state.jwtinfo.userdetails.permissions.includes('USER:DELETE')}
+        {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:DELETE')}
           {#if delete_triggered}
             <button
               on:click={deleteOrganization}

src/components/orgs/OrgOverview.svelte

@@ -9,11 +9,15 @@
   import Toastify from "toastify-js";
   import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
   import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
+  import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
   $: searchvalue = "";
   $: 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.filter((r) => r.is_selected === true);
+  $: generate_orgs = current_organizations.some((r) => r.is_selected === true);
+  $: certificates_show = current_organizations.some(
+    (r) => r.is_selected === true
+  );
   export let current_organizations = [];
 
   const promise = RunnerOrganizationService.runnerOrganizationControllerGetAll().then(
@@ -55,6 +59,9 @@
         <GenerateRunnerCards
             bind:cards_show
             bind:generate_orgs />
+        <GenerateRunnerCertificates
+            bind:certificates_show
+            bind:generate_orgs />
       </div>
       <div
         class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">

src/components/pdf_generation/GenerateRunnerCards.svelte

@@ -67,7 +67,7 @@
                 const url = window.URL.createObjectURL(blob);
                 let a = document.createElement("a");
                 a.href = url;
-                a.download = "Runnercards.pdf";
+                a.download = `${$_('runnercards')}-${locale}.pdf`;
                 document.body.appendChild(a);
                 a.click();
                 a.remove();
@@ -127,7 +127,12 @@
                 const url = window.URL.createObjectURL(blob);
                 let a = document.createElement("a");
                 a.href = url;
-                a.download = "Runnercards.pdf";
+                if(generate_runners.length == 1){
+                    a.download = `${$_('runnercards')}_${generate_runners[0].firstname}_${generate_runners[0].lastname}-${locale}.pdf`;
+                }
+                else{
+                    a.download = `Runnercards-${locale}.pdf`;
+                }
                 document.body.appendChild(a);
                 a.click();
                 a.remove();
@@ -191,7 +196,7 @@
                     const url = window.URL.createObjectURL(blob);
                     let a = document.createElement("a");
                     a.href = url;
-                    a.download = "Sponsorings_" + t.name + ".pdf";
+                    a.download = `${$_('runnercards')}_${t.name}-${locale}.pdf`;
                     document.body.appendChild(a);
                     a.click();
                     a.remove();
@@ -258,7 +263,7 @@
                     const url = window.URL.createObjectURL(blob);
                     let a = document.createElement("a");
                     a.href = url;
-                    a.download = "Sponsorings_" + o.name + ".pdf";
+                    a.download = `${$_('runnercards')}_${o.name}-${locale}.pdf`;
                     document.body.appendChild(a);
                     a.click();
                     a.remove();

src/components/pdf_generation/GenerateRunnerCertificates.svelte

@@ -70,7 +70,12 @@
                 const url = window.URL.createObjectURL(blob);
                 let a = document.createElement("a");
                 a.href = url;
-                a.download = "Certificates.pdf";
+                if(generate_runners.length == 1){
+                    a.download = `${$_('certificates')}_${generate_runners[0].firstname}_${generate_runners[0].lastname}-${locale}.pdf`;
+                }
+                else{
+                    a.download = `${$_('certificates')}-${locale}.pdf`;
+                }
                 document.body.appendChild(a);
                 a.click();
                 a.remove();
@@ -101,7 +106,6 @@
                 runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || [];
                 certificateRunners.push(runner);
             }
-            console.log(certificateRunners)
             fetch(
                 `${config.baseurl}/documents/certificates?locale=${locale}&download=true&key=${config.documentserver_key}`,
                 {
@@ -130,7 +134,7 @@
                     const url = window.URL.createObjectURL(blob);
                     let a = document.createElement("a");
                     a.href = url;
-                    a.download = "Certificates_" + t.name + ".pdf";
+                    a.download = `${$_('certificates')}_${t.name}-${locale}.pdf`;
                     document.body.appendChild(a);
                     a.click();
                     a.remove();
@@ -192,7 +196,7 @@
                     const url = window.URL.createObjectURL(blob);
                     let a = document.createElement("a");
                     a.href = url;
-                    a.download = "Certificates_" + o.name + ".pdf";
+                    a.download = `${$_('certificates')}_${o.name}-${locale}.pdf`;
                     document.body.appendChild(a);
                     a.click();
                     a.remove();

src/components/pdf_generation/GenerateSponsoringContracts.svelte

@@ -69,7 +69,7 @@
                     const url = window.URL.createObjectURL(blob);
                     let a = document.createElement("a");
                     a.href = url;
-                    a.download = "Sponsorings_" + t.name + ".pdf";
+                    a.download = `${$_('sponsorings')}_${t.name}-${locale}.pdf`;
                     document.body.appendChild(a);
                     a.click();
                     a.remove();
@@ -124,7 +124,7 @@
                     const url = window.URL.createObjectURL(blob);
                     let a = document.createElement("a");
                     a.href = url;
-                    a.download = "Sponsorings_" + o.name + ".pdf";
+                    a.download = `${$_('sponsorings')}_${o.name}-${locale}.pdf`;
                     document.body.appendChild(a);
                     a.click();
                     a.remove();
@@ -174,7 +174,10 @@
                 const url = window.URL.createObjectURL(blob);
                 let a = document.createElement("a");
                 a.href = url;
-                a.download = "Sponsoring.pdf";
+                if(generate_runners.length == 1){
+                    a.download = `${$_('sponsorings')}_${generate_runners[0].firstname}_${generate_runners[0].lastname}-${locale}.pdf`;
+                }
+                a.download = `${$_('sponsorings')}-${locale}.pdf`;
                 document.body.appendChild(a);
                 a.click();
                 a.remove();

src/components/runners/ImportRunnerModal.svelte

@@ -34,7 +34,7 @@
     document.onkeydown = (e) => {
       e = e || window.event;
       if (e.key === "Escape") {
-        import_modal_open = false;
+        cancelModal();
       }
       if (e.keyCode === 13) {
         //
@@ -281,6 +281,16 @@
                   bind:files
                   type="file" />
               </div>
+              <div class="overflow-hidden relative mt-4 mb-4">
+                <button
+                  on:click={() => {
+                    cancelModal();
+                  }}
+                  type="button"
+                  class="w-full rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 md:ml-40 mr-0 sm:ml-0 sm:w-auto sm:text-sm">
+                  {$_('cancel')}
+                </button>
+              </div>
             {/if}
             {#if json_output.length > 0}
               {#if opened_from === 'OrgOverview'}

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

src/components/teams/TeamDetail.svelte

@@ -14,6 +14,7 @@
   import Teams from "./Teams.svelte";
   import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
   import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
+  import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
   let [teamdata, original, delete_team, orgs, contacts, modal_open] = [
     {},
     {},
@@ -30,6 +31,7 @@
   $: data_changed = JSON.stringify(teamdata) === JSON.stringify(original);
   $: sponsoring_contracts_show = true;
   $: cards_show = true;
+  $: certificates_show = true;
   $: generate_teams = [original];
   $: group = {};
   $: contact = {};
@@ -122,6 +124,9 @@
         <GenerateRunnerCards
           bind:cards_show
           bind:generate_teams />
+        <GenerateRunnerCertificates
+          bind:certificates_show
+          bind:generate_teams />
         {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:IMPORT')}
           <button
             on:click={() => {

src/components/teams/TeamsOverview.svelte

@@ -9,6 +9,7 @@
   import { clickOutside } from "../base/outsideclick";
   import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
   import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
+  import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
   $: searchvalue = "";
   $: active_deletes = [];
   $: sponsoring_contracts_show = current_teams.some(
@@ -17,6 +18,9 @@
   $: cards_show = current_teams.some(
     (r) => r.is_selected === true
   );
+  $: certificates_show = current_teams.some(
+    (r) => r.is_selected === true
+  );
   $: generate_teams = current_teams.filter((r) => r.is_selected === true);
   export let current_teams = [];
   let modal_open = false;
@@ -61,6 +65,9 @@
         <GenerateRunnerCards
           bind:cards_show
           bind:generate_teams />
+        <GenerateRunnerCertificates
+          bind:certificates_show
+          bind:generate_teams />
       </div>
       <div
         class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">

src/locales/de.json

@@ -50,6 +50,7 @@
     "card-deleted": "Karte gelöscht",
     "card-updated": "Karte aktualisiert",
     "cards": "Läuferkarten",
+    "certificates": "Urkunden",
     "change-your-password-here": "Hier kannst du dein Passwort ändern",
     "changing-your-password": "Passwort wird geändert",
     "city": "Stadt",
@@ -191,10 +192,12 @@
     "geerbte": "geerbte",
     "general-stats": "Allgemeine Statistiken",
     "general_promise_error": "😢 Ein unbekannter Fehler ist aufgetreten",
+    "generate-runner-certificate": "Urkunde generieren",
+    "generate-runner-certificates": "Urkunden generieren",
     "generate-runnercards": "Läuferkarten generieren",
     "generate-sponsoring-contract": "Sponsoringvertrag generieren",
     "generate-sponsoring-contracts": "Sponsoringverträge generieren",
-  "generating-pdf": "Pdf wird generiert...",
+    "generating-pdf": "PDF wird generiert...",
     "generating-pdfs": "PDFs werden generiert...",
     "generic-ui-logic-error": "Etwas ist in der Benutzeroberfläche schiefgelaufen.",
     "german": "Deutsch",
@@ -321,6 +324,7 @@
     "runner-import": "Läufer:innen Import",
     "runner-is-being-added": "Läufer:in wird hinzugefügt...",
     "runner-updated": "Läufer:in aktualisiert!",
+    "runnercards": "Laeuferkarten",
     "runnerimport_verify_runners_org": "Bitte die Läufer:innen für den Import in die Organisation \"{org_name}\" bestätigen",
     "runners": "Läufer",
     "runners-are-being-imported": "Läufer:innen werden importiert ...",
@@ -350,6 +354,7 @@
     "settings": "Einstellungen",
     "settings-for-your-profile": "Die Einstellungen deines Accounts",
     "something-about-the-group": "Infos zur Gruppe",
+    "sponsorings": "Sponsoringerklaerungen",
     "stats-are-being-loaded": "Die Statistiken werden geladen...",
     "status": "Status",
     "stuff-that-could-harm-your-profile": "Einstellungen, die deinem Profil nachhaltig schaden können",
@@ -423,6 +428,5 @@
     "you-have-to-provide-an-organization": "Du musst eine Organisation angeben",
     "you-have-to-save-your-changes-to-generate-a-link": "Du musst deine Änderungen speichern, um einen Link zu generieren.",
     "you-must-create-at-least-one-card-or-cancel": "Du musst mindestens eine Blankokarte erstellen (oder abbrechen).",
-  "zip-postal-code": "Postleitzahl",
+    "zip-postal-code": "Postleitzahl"
-  "generate-runner-certificates": "Urkunden generieren"
 }

src/locales/en.json

@@ -50,6 +50,7 @@
     "card-deleted": "Card deleted",
     "card-updated": "Card updated",
     "cards": "Cards",
+    "certificates": "Certificates",
     "change-your-password-here": "Change your password here",
     "changing-your-password": "Changing your password",
     "city": "City",
@@ -191,6 +192,8 @@
     "geerbte": "inherited",
     "general-stats": "General Stats",
     "general_promise_error": "😢 Error",
+    "generate-runner-certificate": "Generate runner certificate",
+    "generate-runner-certificates": "Generate runner certificates",
     "generate-runnercards": "Generate Runnercards",
     "generate-sponsoring-contract": "generate sponsoring contract",
     "generate-sponsoring-contracts": "generate sponsoring contracts",
@@ -321,6 +324,7 @@
     "runner-import": "Runner Import",
     "runner-is-being-added": "Runner is being added...",
     "runner-updated": "Runner updated!",
+    "runnercards": "Runnercards",
     "runnerimport_verify_runners_org": "Please confirm these runners for import into the organization \"{org_name}\"",
     "runners": "Runners",
     "runners-are-being-imported": "Runners are being imported...",
@@ -350,6 +354,7 @@
     "settings": "Settings",
     "settings-for-your-profile": "Settings for your profile",
     "something-about-the-group": "Something about the group...",
+    "sponsorings": "Sponsorings",
     "stats-are-being-loaded": "stats are being loaded...",
     "status": "Status",
     "stuff-that-could-harm-your-profile": "Stuff that could harm your profile",
@@ -424,6 +429,5 @@
     "you-have-to-provide-an-organization": "You have to provide an organization",
     "you-have-to-save-your-changes-to-generate-a-link": "You have to save your changes to generate a link.",
     "you-must-create-at-least-one-card-or-cancel": "You must create at least one card (or cancel).",
-  "zip-postal-code": "ZIP/ postal code",
+    "zip-postal-code": "ZIP/ postal code"
-  "generate-runner-certificates": "Generate runner certificates"
 }