Merge pull request 'added donor receipt list download to DonorsOverview' (#134 ) from feature/132-export-donors-receipt-list into dev

Reviewed-on: #134 close #132
Switched to selfhosted images
2021-04-14 17:26:10 +00:00 · 2021-04-14 19:24:06 +02:00 · 2021-04-14 19:23:26 +02:00 · 2021-04-14 19:23:07 +02:00 · 2021-04-14 18:58:57 +02:00 · 2021-04-14 18:57:14 +02:00
19 changed files with 593 additions and 262 deletions
@@ -27,7 +27,7 @@ name: build:dev
 steps:
  - name: run full license export
    depends_on: ["clone"]
-    image: node:alpine
+    image: registry.odit.services/hub/library/node:alpine
    commands:
      - yarn
      - yarn licenses:export
@@ -2,9 +2,77 @@

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

+#### [0.13.1](https://git.odit.services/lfk/frontend/compare/0.13.0...0.13.1)
+
+- For await fix [`a24d292`](https://git.odit.services/lfk/frontend/commit/a24d2923c6e6da90d610c05183d29d47eaf2ed30)
+
+#### [0.13.0](https://git.odit.services/lfk/frontend/compare/0.12.5...0.13.0)
+
+> 11 April 2021
+
+- 🚀RELEASE v0.13.0 [`467808a`](https://git.odit.services/lfk/frontend/commit/467808abefe127dac66a2837fcce3197dddb140f)
+- 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)
+
 #### [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)
@@ -13,7 +13,7 @@
 </head>

 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.12.0-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.13.1-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>
@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.12.0",
+	"version": "0.13.1",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev": "vite",
@@ -11,9 +11,9 @@
 	"license": "CC-BY-NC-SA-4.0",
 	"devDependencies": {
 		"check-password-strength": "2.0.2",
-		"@odit/lfk-client-js": "0.10.1",
+		"@odit/lfk-client-js": "0.11.0",
 		"@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",
@@ -21,19 +21,19 @@
 		"gridjs": "3.4.0",
 		"html-minifier": "4.0.0",
 		"localforage": "1.9.0",
-		"marked": "2.0.1",
-		"release-it": "14.5.1",
+		"marked": "2.0.3",
+		"release-it": "14.6.1",
 		"svelte": "3.37.0",
 		"svelte-focus-trap": "1.2.0",
 		"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.14.0",
 		"xlsx": "0.16.9"
 	},
 	"release-it": {
@@ -1,5 +1,6 @@
 const config = {
 	baseurl: 'http://localhost:4010',
+	baseurl_documentserver: 'http://localhost:4010/documents',
 	documentserver_key: 'NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe',
 	// optional
 	default_username: 'demo',
@@ -1 +1 @@
-[{"author":"deanilvincent","repo":{"type":"git","url":"https://github.com/deanilvincent/check-password-strength"},"description":"A NPM Password strength checker based from Javascript RegExp. Check passphrase if it's \"Weak\", \"Medium\" or \"Strong\"","name":"check-password-strength","license":"MIT","version":"2.0.2","licensetext":"MIT License\r\n\r\nCopyright (c) 2020 Mark Deanil Vicente\r\n\r\nPermission is hereby granted, free of charge, to any person obtaining a copy\r\nof this software and associated documentation files (the \"Software\"), to deal\r\nin the Software without restriction, including without limitation the rights\r\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r\ncopies of the Software, and to permit persons to whom the Software is\r\nfurnished to do so, subject to the following conditions:\r\n\r\nThe above copyright notice and this permission notice shall be included in all\r\ncopies or substantial portions of the Software.\r\n\r\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r\nSOFTWARE.\r\n"},{"author":"ODIT.Services","repo":{"type":"git","url":"git+https://git.odit.services/lfk/lfk-client-js"},"description":"A lib to interact with https://git.odit.services/lfk/backend. Use this version for native JS applications.","name":"@odit/lfk-client-js","license":"CC-BY-NC-SA-4.0","version":"0.10.1","licensetext":"Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Creative\r\nCommons Corporation (\"Creative Commons\") is not a law firm and does not provide\r\nlegal services or legal advice. Distribution of Creative Commons public licenses\r\ndoes not create a lawyer-client or other relationship. Creative Commons makes\r\nits licenses and related information available on an \"as-is\" basis. Creative\r\nCommons gives no warranties regarding its licenses, any material licensed\r\nunder their terms and conditions, or any related information. Creative Commons\r\ndisclaims all liability for damages resulting from their use to the fullest\r\nextent possible.\r\n\r\nUsing Creative Commons Public Licenses\r\n\r\nCreative Commons public licenses provide a standard set of terms and conditions\r\nthat creators and other rights holders may use to share original works of\r\nauthorship and other material subject to copyright and certain other rights\r\nspecified in the public license below. The following considerations are for\r\ninformational purposes only, are not exhaustive, and do not form part of our\r\nlicenses.\r\n\r\nConsiderations for licensors: Our public licenses are intended for use by\r\nthose authorized to give the public permission to use material in ways otherwise\r\nrestricted by copyright and certain other rights. Our licenses are irrevocable.\r\nLicensors should read and understand the terms and conditions of the license\r\nthey choose before applying it. Licensors should also secure all rights necessary\r\nbefore applying our licenses so that the public can reuse the material as\r\nexpected. Licensors should clearly mark any material not subject to the license.\r\nThis includes other CC-licensed material, or material used under an exception\r\nor limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors\r\n\r\nConsiderations for the public: By using one of our public licenses, a licensor\r\ngrants the public permission to use the licensed material under specified\r\nterms and conditions. If the licensor's permission is not necessary for any\r\nreason–for example, because of any applicable exception or limitation to copyright–then\r\nthat use is not regulated by the license. Our licenses grant only permissions\r\nunder copyright and certain other rights that a licensor has authority to\r\ngrant. Use of the licensed material may still be restricted for other reasons,\r\nincluding because others have copyright or other rights in the material. A\r\nlicensor may make special requests, such as asking that all changes be marked\r\nor described. Although not required by our licenses, you are encouraged to\r\nrespect those requests where reasonable. More considerations for the public\r\n: wiki.creativecommons.org/Considerations_for_licensees\r\n\r\nCreative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public\r\nLicense\r\n\r\nBy exercising the Licensed Rights (defined below), You accept and agree to\r\nbe bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike\r\n4.0 International Public License (\"Public License\"). ToLine truncated
+[{"author":"deanilvincent","repo":{"type":"git","url":"https://github.com/deanilvincent/check-password-strength"},"description":"A NPM Password strength checker based from Javascript RegExp. Check passphrase if it's \"Weak\", \"Medium\" or \"Strong\"","name":"check-password-strength","license":"MIT","version":"2.0.2","licensetext":"MIT License\r\n\r\nCopyright (c) 2020 Mark Deanil Vicente\r\n\r\nPermission is hereby granted, free of charge, to any person obtaining a copy\r\nof this software and associated documentation files (the \"Software\"), to deal\r\nin the Software without restriction, including without limitation the rights\r\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r\ncopies of the Software, and to permit persons to whom the Software is\r\nfurnished to do so, subject to the following conditions:\r\n\r\nThe above copyright notice and this permission notice shall be included in all\r\ncopies or substantial portions of the Software.\r\n\r\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r\nSOFTWARE.\r\n"},{"author":"ODIT.Services","repo":{"type":"git","url":"git+https://git.odit.services/lfk/lfk-client-js"},"description":"A lib to interact with https://git.odit.services/lfk/backend. Use this version for native JS applications.","name":"@odit/lfk-client-js","license":"CC-BY-NC-SA-4.0","version":"0.10.1","licensetext":"Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Creative\r\nCommons Corporation (\"Creative Commons\") is not a law firm and does not provide\r\nlegal services or legal advice. Distribution of Creative Commons public licenses\r\ndoes not create a lawyer-client or other relationship. Creative Commons makes\r\nits licenses and related information available on an \"as-is\" basis. Creative\r\nCommons gives no warranties regarding its licenses, any material licensed\r\nunder their terms and conditions, or any related information. Creative Commons\r\ndisclaims all liability for damages resulting from their use to the fullest\r\nextent possible.\r\n\r\nUsing Creative Commons Public Licenses\r\n\r\nCreative Commons public licenses provide a standard set of terms and conditions\r\nthat creators and other rights holders may use to share original works of\r\nauthorship and other material subject to copyright and certain other rights\r\nspecified in the public license below. The following considerations are for\r\ninformational purposes only, are not exhaustive, and do not form part of our\r\nlicenses.\r\n\r\nConsiderations for licensors: Our public licenses are intended for use by\r\nthose authorized to give the public permission to use material in ways otherwise\r\nrestricted by copyright and certain other rights. Our licenses are irrevocable.\r\nLicensors should read and understand the terms and conditions of the license\r\nthey choose before applying it. Licensors should also secure all rights necessary\r\nbefore applying our licenses so that the public can reuse the material as\r\nexpected. Licensors should clearly mark any material not subject to the license.\r\nThis includes other CC-licensed material, or material used under an exception\r\nor limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors\r\n\r\nConsiderations for the public: By using one of our public licenses, a licensor\r\ngrants the public permission to use the licensed material under specified\r\nterms and conditions. If the licensor's permission is not necessary for any\r\nreason–for example, because of any applicable exception or limitation to copyright–then\r\nthat use is not regulated by the license. Our licenses grant only permissions\r\nunder copyright and certain other rights that a licensor has authority to\r\ngrant. Use of the licensed material may still be restricted for other reasons,\r\nincluding because others have copyright or other rights in the material. A\r\nlicensor may make special requests, such as asking that all changes be marked\r\nor described. Although not required by our licenses, you are encouraged to\r\nrespect those requests where reasonable. More considerations for the public\r\n: wiki.creativecommons.org/Considerations_for_licensees\r\n\r\nCreative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public\r\nLicense\r\n\r\nBy exercising the Licensed Rights (defined below), You accept and agree to\r\nbe bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike\r\n4.0 International Public License (\"Public License\"). ToLine truncated
@@ -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: {
@@ -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,107 +161,111 @@
              </th>
            </tr>
          </thead>
-          <tbody class="divide-y divide-gray-200">
-            {#each current_cards as card}
-              {#if card.code
-                .toLowerCase()
-                .includes(
-                  searchvalue.toLowerCase()
-                ) || card.runner?.firstname
-                  .toLowerCase()
-                  .includes(
-                    searchvalue.toLowerCase()
-                  ) || card.runner?.middlename
-                  .toLowerCase()
-                  .includes(
-                    searchvalue.toLowerCase()
-                  ) || card.runner?.lastname
-                  .toLowerCase()
-                  .includes(
-                    searchvalue.toLowerCase()
-                  ) || should_display_based_on_id(card.id)}
-                <tr data-rowid="card_{card.id}">
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    <input
-                      bind:checked={card.is_selected}
-                      type="checkbox"
-                      class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
-                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="flex items-center">{card.code}</div>
-                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="flex items-center">
-                      {#if card.runner}
-                        <a
-                          href="../runners/{card.runner.id}"
-                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{card.runner.firstname}
-                          {card.runner.middlename || ''}
-                          {card.runner.lastname}</a>
-                      {:else}{$_('non-blanko')}{/if}
-                    </div>
-                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="flex items-center">
-                      {#if card.enabled}
-                        <span
-                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800">{$_('enabled')}</span>
-                      {:else}
-                        <span
-                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800">{$_('disabled')}</span>
-                      {/if}
-                    </div>
-                  </td>
+          <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(
+        searchvalue.toLowerCase()
+      ) || card.runner?.firstname
+        .toLowerCase()
+        .includes(
+          searchvalue.toLowerCase()
+        ) || card.runner?.middlename
+        .toLowerCase()
+        .includes(
+          searchvalue.toLowerCase()
+        ) || card.runner?.lastname
+        .toLowerCase()
+        .includes(
+          searchvalue.toLowerCase()
+        ) || should_display_based_on_id(card.id)}
+      <tr data-rowid="card_{card.id}">
+        <td class="px-6 py-4 whitespace-nowrap">
+          <input
+            bind:checked={card.is_selected}
+            type="checkbox"
+            class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
+        </td>
+        <td class="px-6 py-4 whitespace-nowrap">
+          <div class="flex items-center">{card.code}</div>
+        </td>
+        <td class="px-6 py-4 whitespace-nowrap">
+          <div class="flex items-center">
+            {#if card.runner}
+              <a
+                href="../runners/{card.runner.id}"
+                class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{card.runner.firstname}
+                {card.runner.middlename || ''}
+                {card.runner.lastname}</a>
+            {:else}{$_('non-blanko')}{/if}
+          </div>
+        </td>
+        <td class="px-6 py-4 whitespace-nowrap">
+          <div class="flex items-center">
+            {#if card.enabled}
+              <span
+                class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800">{$_('enabled')}</span>
+            {:else}
+              <span
+                class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800">{$_('disabled')}</span>
+            {/if}
+          </div>
+        </td>

-                  {#if active_deletes[card.id] === true}
-                    <td
-                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
-                      <button
-                        on:click={() => {
-                          active_deletes[card.id] = false;
-                        }}
-                        tabindex="0"
-                        class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">{$_('cancel-delete')}</button>
-                      <button
-                        on:click={() => {
-                          RunnerCardService.runnerCardControllerRemove(card.id, false).then(
-                            (resp) => {
-                              current_cards = current_cards.filter(
-                                (obj) => obj.id !== card.id
-                              );
-                              Toastify({
-                                text: $_('card-deleted'),
-                                duration: 500,
-                                backgroundColor:
-                                  'linear-gradient(to right, #00b09b, #96c93d)',
-                              }).showToast();
-                            }
-                          );
-                        }}
-                        tabindex="0"
-                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')}</button>
-                    </td>
-                  {:else}
-                    <td
-                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
-                      <button
-                        on:click={() => {
-                          open_edit_modal(card);
-                        }}
-                        class="text-indigo-600 hover:text-indigo-900">{$_('details')}</button>
-                      {#if store.state.jwtinfo.userdetails.permissions.includes('CARD:DELETE')}
-                        <button
-                          on:click={() => {
-                            active_deletes[card.id] = true;
-                          }}
-                          tabindex="0"
-                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')}</button>
-                      {/if}
-                    </td>
-                  {/if}
-                </tr>
-              {/if}
-            {/each}
+        {#if active_deletes[card.id] === true}
+          <td
+            class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+            <button
+              on:click={() => {
+                active_deletes[card.id] = false;
+              }}
+              tabindex="0"
+              class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">{$_('cancel-delete')}</button>
+            <button
+              on:click={() => {
+                RunnerCardService.runnerCardControllerRemove(card.id, false).then(
+                  (resp) => {
+                    current_cards = current_cards.filter(
+                      (obj) => obj.id !== card.id
+                    );
+                    Toastify({
+                      text: $_('card-deleted'),
+                      duration: 500,
+                      backgroundColor:
+                        'linear-gradient(to right, #00b09b, #96c93d)',
+                    }).showToast();
+                  }
+                );
+              }}
+              tabindex="0"
+              class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')}</button>
+          </td>
+        {:else}
+          <td
+            class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+            <button
+              on:click={() => {
+                open_edit_modal(card);
+              }}
+              class="text-indigo-600 hover:text-indigo-900">{$_('details')}</button>
+            {#if store.state.jwtinfo.userdetails.permissions.includes('CARD:DELETE')}
+              <button
+                on:click={() => {
+                  active_deletes[card.id] = true;
+                }}
+                tabindex="0"
+                class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')}</button>
+            {/if}
+          </td>
+        {/if}
+      </tr>
+    {/if}
+    {/each}
          </tbody>
        </table>
      </div>
@@ -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
-      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">
+      <button
+        on:click={() => {
+          navOpen = true;
+        }}
+        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>
-  <div
-    on:click={() => {
-      navOpen = false;
-    }}
-    class:hidden={!navOpen}
-    class="fixed inset-0 z-10 w-screen h-screen bg-black bg-opacity-25 md:hidden" />
+  {#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>
@@ -20,6 +20,31 @@
        {$_('add-donor')}
      </button>
    {/if}
+    {#if store.state.jwtinfo.userdetails.permissions.includes('DONOR:GET')}
+      <button
+        on:click={() => {
+          const data = (current_donors.filter(d=>d.receiptNeeded===true)).map(function (d) {
+            d.address.address2=d.address.address2===""?"":" "+d.address.address2;
+            const address=`${d.address.address1}${d.address.address2}, ${d.address.postalcode} ${d.address.city}, ${d.address.country}`;
+            return [d.firstname,d.middlename,d.lastname,d.paidDonationAmount,address];
+          })
+          let csv = `${$_('csv_import__firstname')};${$_('csv_import__middlename')};${$_('csv_import__lastname')};${$_('total_donation_amount_in_eur')};${$_('address')}\n`;
+    data.forEach(function(row) {
+            csv += row.join(';');
+            csv += "\n";
+    });
+    let hiddenElement = document.createElement('a');
+    hiddenElement.href = 'data:text/csv;charset=utf-8,' + encodeURI(csv);
+    hiddenElement.target = '_blank';
+    hiddenElement.download = `${$_('filename_sponsoringquittungsliste')}.csv`;
+    hiddenElement.click();
+    hiddenElement.remove();
+        }}
+        type="button"
+        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">
+        {$_('sponsoring-quittungs-liste_herunterladen')}
+      </button>
+    {/if}
  </span>
  <DonorsOverview bind:current_donors />
 </section>
@@ -1,5 +1,5 @@
 <script>
-  import { getLocaleFromNavigator, _ } from "svelte-i18n";
+  import { _ } from "svelte-i18n";
  import { DonationService, DonorService } from "@odit/lfk-client-js";
  import store from "../../store";
  import DonorsEmptyState from "./DonorsEmptyState.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
  );
@@ -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: {
@@ -245,39 +246,97 @@
                    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) => {
-                    count++;
-                    const url = window.URL.createObjectURL(blob);
-                    let a = document.createElement("a");
-                    a.href = url;
-                    a.download = `${$_('runnercards')}_${o.name}-${locale}.pdf`;
-                    document.body.appendChild(a);
-                    a.click();
-                    a.remove();
-                    if (count === generate_orgs.length) {
-                        toast.hideToast();
-                        Toastify({
-                            text: $_("pdfs-successfully-generated"),
-                            duration: 3500,
-                            backgroundColor:
-                                "linear-gradient(to right, #00b09b, #96c93d)",
-                        }).showToast();
-                    }
-                })
-                .catch((err) => {});
+            .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}_direct-${locale}.pdf`;
+                document.body.appendChild(a);
+                a.click();
+                a.remove();
+                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 (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"),
+                        duration: 3500,
+                        backgroundColor:
+                            "linear-gradient(to right, #00b09b, #96c93d)",
+                    }).showToast();
+                }
+            })
+            .catch((err) => {});
+            }
        }
    }
 </script>
@@ -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: {
@@ -178,39 +179,92 @@
                    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) => {
-                    count++;
-                    const url = window.URL.createObjectURL(blob);
-                    let a = document.createElement("a");
-                    a.href = url;
-                    a.download = `${$_('certificates')}_${o.name}-${locale}.pdf`;
-                    document.body.appendChild(a);
-                    a.click();
-                    a.remove();
-                    if (count === generate_orgs.length) {
-                        toast.hideToast();
-                        Toastify({
-                            text: $_("pdfs-successfully-generated"),
-                            duration: 3500,
-                            backgroundColor:
-                                "linear-gradient(to right, #00b09b, #96c93d)",
-                        }).showToast();
-                    }
-                })
-                .catch((err) => {});
+            .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}_direct-${locale}.pdf`;
+                document.body.appendChild(a);
+                a.click();
+                a.remove();
+                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 (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"),
+                        duration: 3500,
+                        backgroundColor:
+                            "linear-gradient(to right, #00b09b, #96c93d)",
+                    }).showToast();
+                }
+            })
+            .catch((err) => {});
+            }
        }
    }
 </script>
@@ -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: {
@@ -106,39 +107,87 @@
                    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) => {
-                    count++;
-                    const url = window.URL.createObjectURL(blob);
-                    let a = document.createElement("a");
-                    a.href = url;
-                    a.download = `${$_('sponsorings')}_${o.name}-${locale}.pdf`;
-                    document.body.appendChild(a);
-                    a.click();
-                    a.remove();
-                    if (count === generate_orgs.length) {
-                        toast.hideToast();
-                        Toastify({
-                            text: $_("pdfs-successfully-generated"),
-                            duration: 3500,
-                            backgroundColor:
-                                "linear-gradient(to right, #00b09b, #96c93d)",
-                        }).showToast();
-                    }
-                })
-                .catch((err) => {});
+            .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}_direct-${locale}.pdf`;
+                document.body.appendChild(a);
+                a.click();
+                a.remove();
+                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 (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"),
+                        duration: 3500,
+                        backgroundColor:
+                            "linear-gradient(to right, #00b09b, #96c93d)",
+                    }).showToast();
+                }
+            })
+            .catch((err) => {});
+            }
        }
    }

@@ -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: {
@@ -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'}
@@ -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
@@ -183,6 +183,7 @@
    "everything-concerning-your-profile": "Alles zu deinem Profil",
    "everything-is-more-fun-together": "Im Team macht's mehr Spaß 🏃‍♂️🏃‍♀️🏃‍♂️",
    "faq": "FAQ",
+    "filename_sponsoringquittungsliste": "SponsoringQuittungsListe",
    "filter-by-organization-team": "Filtern nach Organisation / Team",
    "first-name": "Vorname",
    "first-name-is-required": "Vorname muss angegeben werden",
@@ -354,6 +355,7 @@
    "settings": "Einstellungen",
    "settings-for-your-profile": "Die Einstellungen deines Accounts",
    "something-about-the-group": "Infos zur Gruppe",
+    "sponsoring-quittungs-liste_herunterladen": "Sponsoring-Quittungs-Liste herunterladen",
    "sponsorings": "Sponsoringerklaerungen",
    "stats-are-being-loaded": "Die Statistiken werden geladen...",
    "status": "Status",
@@ -386,6 +388,7 @@
    "total-donation-amount": "Gesamtbetrag",
    "total-donations": "Spendensumme",
    "total-scans": "gesamte Scans",
+    "total_donation_amount_in_eur": "Gesamtbetrag in €",
    "track": "Track",
    "track-added": "Track hinzugefügt",
    "track-data-is-being-loaded": "Trackdaten werden geladen",
@@ -395,6 +398,7 @@
    "track-name": "Trackname",
    "track-name-must-not-be-empty": "Der Name muss angegeben werden",
    "tracks": "Tracks",
+    "update-card": "Karte aktualisieren",
    "update-password": "Passwort ändern",
    "updated-contact": "Kontakt aktualisiert!",
    "updated-donor": "Sponsor:in wurde aktualisiert",
@@ -6,7 +6,7 @@
    "active": "Active",
    "add-card": "Add Card",
    "add-donation": "Add donation",
-    "add-donor": "add donor",
+    "add-donor": "Add donor",
    "add-scan": "Add scan",
    "add-the-first-scanstation": "Add your first scanstation.",
    "add-user-group": "Add User Group",
@@ -183,6 +183,7 @@
    "everything-concerning-your-profile": "Everything concerning your profile",
    "everything-is-more-fun-together": "everything is more fun together 🏃‍♂️🏃‍♀️🏃‍♂️",
    "faq": "FAQ",
+    "filename_sponsoringquittungsliste": "DonorReceiptList",
    "filter-by-organization-team": "Filter by Organization/ Team",
    "first-name": "First name",
    "first-name-is-required": "First Name is required",
@@ -354,6 +355,7 @@
    "settings": "Settings",
    "settings-for-your-profile": "Settings for your profile",
    "something-about-the-group": "Something about the group...",
+    "sponsoring-quittungs-liste_herunterladen": "Download donor receipt list",
    "sponsorings": "Sponsorings",
    "stats-are-being-loaded": "stats are being loaded...",
    "status": "Status",
@@ -386,6 +388,7 @@
    "total-donation-amount": "total donation amount",
    "total-donations": "total donations",
    "total-scans": "total scans",
+    "total_donation_amount_in_eur": "Total donation amount in €",
    "track": "Track",
    "track-added": "Track added",
    "track-data-is-being-loaded": "Track data is being loaded",
Author	SHA1	Message	Date
philipp	e11296071a	Merge pull request 'added donor receipt list download to DonorsOverview' (#134 ) from feature/132-export-donors-receipt-list into dev continuous-integration/drone/push Build is passing Details Reviewed-on: #134 close #132	2021-04-14 17:26:10 +00:00
niggl	112eb29f93	Switched to selfhosted images ref #132	2021-04-14 19:24:06 +02:00
niggl	c6c97516b3	Sorted translations 🌎 ref #132	2021-04-14 19:23:26 +02:00
niggl	03676b2894	Fixed typos in translations ref #132	2021-04-14 19:23:07 +02:00
philipp	9ca57fac2e	⏫ bump @odit/lfk-client-js@0.11.0 ref #132	2021-04-14 18:58:57 +02:00
philipp	18f151c1fb	⏫ general version bump ref #132	2021-04-14 18:57:14 +02:00
philipp	e90e56d8b2	replace donationAmount with paidDonationAmount ref #132	2021-04-14 18:54:05 +02:00
philipp	d241ca5698	added donor receipt list download to DonorsOverview ref #132	2021-04-14 18:43:51 +02:00
niggl	b512cf8667	🚀RELEASE v0.13.1 continuous-integration/drone/push Build is passing Details	2021-04-11 21:14:03 +02:00
niggl	a24d2923c6	For await fix continuous-integration/drone/push Build is failing Details	2021-04-11 21:13:44 +02:00
niggl	467808abef	🚀RELEASE v0.13.0 continuous-integration/drone/push Build is failing Details	2021-04-11 21:08:58 +02:00
niggl	861f1f2216	Merge pull request 'Better org pdf generation feature/130-org_doc_splitting' (#131 ) from feature/130-org_doc_splitting into dev continuous-integration/drone/push Build is failing Details Reviewed-on: #131	2021-04-11 19:07:53 +00:00
niggl	509b22bea0	Org certificate generation now runs in sequence ref #130	2021-04-11 21:00:33 +02:00
niggl	7447b2f4c1	Fixed const -> let ref #130	2021-04-11 20:54:38 +02:00
niggl	fef14b6e4f	Org card generation now runs in sequence ref #130	2021-04-11 20:53:58 +02:00
niggl	01d2a7e6aa	Org contract generation now runs in sequence ref #130	2021-04-11 20:48:20 +02:00
niggl	ac586fec5a	Hotfix: Org * generation🐞 continuous-integration/drone/push Build is passing Details	2021-04-11 20:17:34 +02:00
niggl	5476808683	Emergency document server url change continuous-integration/drone/push Build is passing Details	2021-04-11 20:10:08 +02:00
niggl	331d737796	🚀RELEASE v0.12.5 continuous-integration/drone/push Build is passing Details	2021-04-08 19:30:20 +02:00
niggl	ef81b8adf9	Merge pull request 'Added runner team's parentorg name to runenr overciew' (#129 ) from feature/128-runner_orgs into dev continuous-integration/drone/push Build is passing Details Reviewed-on: #129	2021-04-08 17:29:27 +00:00
niggl	8a7d635cef	Switched to html entity ref #128	2021-04-08 18:00:47 +02:00
niggl	4c259c1eef	Added runner team's parentorg name to runenr overciew ref #128	2021-04-08 17:58:49 +02:00
philipp	5b4ede5e2f	🚀RELEASE v0.12.4 continuous-integration/drone/push Build is passing Details	2021-04-08 17:34:32 +02:00
philipp	d0ab3dda78	🚑 [HOTFIX] - drop "svelte-infinite-loading" continuous-integration/drone/push Build is failing Details	2021-04-08 17:34:04 +02:00
philipp	d9cf51b4bb	🚀RELEASE v0.12.3 continuous-integration/drone/push Build is failing Details	2021-04-08 17:30:23 +02:00
philipp	aa17f24220	new license file version [CI SKIP]	2021-04-08 15:28:50 +00:00
philipp	cf60edf7d4	Merge pull request 'fix' (#126 ) from bugfix/125-mobile into dev continuous-integration/drone/push Build is failing Details Reviewed-on: #126 close #125	2021-04-08 15:27:22 +00:00
philipp	ffbc243194	custom css fix for collapsed_navigation ref #125	2021-04-07 21:44:29 +02:00
philipp	b6b07cf30c	🐞 bugfix for svelte x tailwind class names ref #125	2021-04-07 21:35:01 +02:00
philipp	495a6b22bd	almost fixed...	2021-04-07 21:28:21 +02:00
philipp	0acaffbdfa	fix ref #125	2021-04-07 20:25:04 +02:00
niggl	6043bc4517	🚀RELEASE v0.12.2 continuous-integration/drone/push Build is failing Details	2021-04-07 20:11:21 +02:00
niggl	e6ed066e3f	Merge pull request 'feature/110-virtual_list' (#124 ) from feature/110-virtual_list into dev continuous-integration/drone/push Build is failing Details Reviewed-on: #124	2021-04-07 18:10:02 +00:00
niggl	ee4e8655b8	Merge branch 'dev' into feature/110-virtual_list	2021-04-07 20:09:35 +02:00
philipp	37970d2be6	pre-merge fixes ref #110	2021-04-07 18:59:46 +02:00
philipp	1376788016	updated virtual scroll list	2021-04-07 18:38:52 +02:00
philipp	4cad86cf85	fixed height table	2021-04-07 18:19:58 +02:00
philipp	6304116edb	wip on virtuallist	2021-04-06 22:16:24 +02:00
niggl	834ff8fa63	🚀RELEASE v0.12.1 continuous-integration/drone/push Build is passing Details	2021-04-06 16:47:37 +02:00
niggl	1f428a535e	Merge pull request 'ImportRunnerModal Cancel Button feature/122-import_cancel' (#123 ) from feature/112-import_cancel into dev continuous-integration/drone/push Build is passing Details Reviewed-on: #123	2021-04-06 14:42:37 +00:00
niggl	0c40966970	Added cancel button for the first stage of runner import ref #112	2021-04-05 16:23:24 +02:00
niggl	9da071fe9b	Escape now triggers foll modal close (including reset) instead of just hiding th modal ref #112	2021-04-05 16:14:43 +02:00