src/components/orgs/OrgDetail.svelte

@@ -12,7 +12,6 @@
   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 =
@@ -35,7 +34,6 @@
   $: 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) =>
@@ -178,7 +176,6 @@
           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={() => {
@@ -189,7 +186,7 @@
             {$_('import-runners')}
           </button>
         {/if}
-        {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:DELETE')}
+        {#if store.state.jwtinfo.userdetails.permissions.includes('USER:DELETE')}
           {#if delete_triggered}
             <button
               on:click={deleteOrganization}

src/components/orgs/OrgOverview.svelte

@@ -9,15 +9,11 @@
   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.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
-  );
   export let current_organizations = [];
 
   const promise = RunnerOrganizationService.runnerOrganizationControllerGetAll().then(
@@ -59,9 +55,6 @@
         <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')}-${locale}.pdf`;
+                a.download = "Runnercards.pdf";
                 document.body.appendChild(a);
                 a.click();
                 a.remove();
@@ -127,12 +127,7 @@
                 const url = window.URL.createObjectURL(blob);
                 let a = document.createElement("a");
                 a.href = url;
-                if(generate_runners.length == 1){
+                a.download = "Runnercards.pdf";
-                    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();
@@ -196,7 +191,7 @@
                     const url = window.URL.createObjectURL(blob);
                     let a = document.createElement("a");
                     a.href = url;
-                    a.download = `${$_('runnercards')}_${t.name}-${locale}.pdf`;
+                    a.download = "Sponsorings_" + t.name + ".pdf";
                     document.body.appendChild(a);
                     a.click();
                     a.remove();
@@ -263,7 +258,7 @@
                     const url = window.URL.createObjectURL(blob);
                     let a = document.createElement("a");
                     a.href = url;
-                    a.download = `${$_('runnercards')}_${o.name}-${locale}.pdf`;
+                    a.download = "Sponsorings_" + o.name + ".pdf";
                     document.body.appendChild(a);
                     a.click();
                     a.remove();

src/components/pdf_generation/GenerateRunnerCertificates.svelte

@@ -1,277 +0,0 @@
-<script>
-    import { _ } from "svelte-i18n";
-    import {
-        DonationService,
-        RunnerTeamService,
-        RunnerOrganizationService
-    } from "@odit/lfk-client-js";
-    import Toastify from "toastify-js";
-    export let certificates_show = false;
-    export let generate_runners = [];
-    export let generate_orgs = [];
-    export let generate_teams = [];
-    $: certificates_dropdown_open = false;
-    document.addEventListener("click", function (e) {
-        if (
-            e.target.parentNode?.parentNode?.id != "certificates:dropdown" &&
-            e.target.parentNode?.parentNode?.id != "certificates:dropdown:menu"
-        ) {
-            certificates_dropdown_open = false;
-        }
-    });
-
-    function generateCertificates(locale) {
-        certificates_dropdown_open = false;
-
-        if (generate_orgs.length > 0) {
-            generateOrgCertificates(locale);
-        } else if (generate_teams.length > 0) {
-            generateTeamCertificates(locale);
-        } else {
-            generateRunnerCertificates(locale);
-        }
-    }
-
-    async function generateRunnerCertificates(locale) {
-        const toast = Toastify({
-            text: $_("generating-pdf"),
-            duration: -1,
-        }).showToast();
-        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}`,
-            {
-                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;
-                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();
-                toast.hideToast();
-                Toastify({
-                    text: $_("pdf-successfully-generated"),
-                    duration: 3500,
-                    backgroundColor:
-                        "linear-gradient(to right, #00b09b, #96c93d)",
-                }).showToast();
-            })
-            .catch((err) => {});
-    }
-
-    async function generateTeamCertificates(locale) {
-        const toast = Toastify({
-            text: $_("generating-pdfs"),
-            duration: -1,
-        }).showToast();
-        let count = 0;
-        const current_donations = await DonationService.donationControllerGetAll();
-        for (const t of generate_teams) {
-            const 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);
-            }
-            fetch(
-                `${config.baseurl}/documents/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) => {
-                    count++;
-                    const url = window.URL.createObjectURL(blob);
-                    let a = document.createElement("a");
-                    a.href = url;
-                    a.download = `${$_('certificates')}_${t.name}-${locale}.pdf`;
-                    document.body.appendChild(a);
-                    a.click();
-                    a.remove();
-                    if (count === generate_teams.length) {
-                        toast.hideToast();
-                        Toastify({
-                            text: $_("pdfs-successfully-generated"),
-                            duration: 3500,
-                            backgroundColor:
-                                "linear-gradient(to right, #00b09b, #96c93d)",
-                        }).showToast();
-                    }
-                })
-                .catch((err) => {});
-        }
-    }
-
-    async function generateOrgCertificates(locale) {
-        const toast = Toastify({
-            text: $_("generating-pdf"),
-            duration: -1,
-        }).showToast();
-        let count = 0;
-        const current_donations = await DonationService.donationControllerGetAll();
-        for (const o of generate_orgs) {
-            const runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
-                o.id
-            );
-            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}`,
-                {
-                    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) => {
-                    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) => {});
-        }
-    }
-</script>
-
-{#if certificates_show}
-    <div id="certificates:dropdown" class="relative inline-block">
-        <div>
-            <button
-                on:click={() => {
-                    certificates_dropdown_open = !certificates_dropdown_open;
-                }}
-                type="button"
-                class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-gray-600 text-base font-medium text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500 sm:ml-3 sm:w-auto sm:text-sm inline-flex"
-                id="options-menu"
-                aria-haspopup="true"
-                aria-expanded="true">
-                {$_('generate-runner-certificates')}
-                <svg
-                    xmlns="http://www.w3.org/2000/svg"
-                    width="24"
-                    height="24"
-                    viewBox="0 0 24 24"
-                    class="-mr-1 ml-2 h-5 w-5"><path
-                        fill="none"
-                        d="M0 0h24v24H0z" />
-                    <path
-                        fill="currentColor"
-                        d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z" /></svg>
-            </button>
-        </div>
-        {#if certificates_dropdown_open}
-            <div
-                class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5"
-                id="certificates:dropdown:menu">
-                <div
-                    class="py-1"
-                    role="menu"
-                    aria-orientation="vertical"
-                    aria-labelledby="options-menu">
-                    <span
-                        class="block w-full text-left px-4 py-2 text-sm text-gray-700">{$_('select-language')}</span>
-                    <button
-                        on:click={() => {
-                            generateCertificates('de');
-                        }}
-                        type="submit"
-                        class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900"
-                        role="menuitem">
-                        {$_('german')}
-                    </button>
-                    <button
-                        on:click={() => {
-                            generateCertificates('en');
-                        }}
-                        type="submit"
-                        class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900"
-                        role="menuitem">
-                        {$_('english')}
-                    </button>
-                </div>
-            </div>
-        {/if}
-    </div>
-{/if}

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}-${locale}.pdf`;
+                    a.download = "Sponsorings_" + t.name + ".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}-${locale}.pdf`;
+                    a.download = "Sponsorings_" + o.name + ".pdf";
                     document.body.appendChild(a);
                     a.click();
                     a.remove();
@@ -174,10 +174,7 @@
                 const url = window.URL.createObjectURL(blob);
                 let a = document.createElement("a");
                 a.href = url;
-                if(generate_runners.length == 1){
+                a.download = "Sponsoring.pdf";
-                    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/RunnerDetail.svelte

@@ -2,7 +2,6 @@
   import { getLocaleFromNavigator, _ } from "svelte-i18n";
   import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
   import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
-  import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
   import store from "../../store";
   import {
     RunnerService,
@@ -37,7 +36,6 @@
     editable.group != null;
   $: sponsoring_contracts_show = true;
   $: cards_show = true;
-  $: certificates_show = true;
   $: generate_runners = [original_data_pdf];
   runner_promise.then((data) => {
     data_loaded = true;
@@ -160,10 +158,7 @@
             bind:sponsoring_contracts_show
             bind:generate_runners />
           <GenerateRunnerCards
-            bind:cards_show
+            bind:sponsoring_contracts_show
-            bind:generate_runners />
-          <GenerateRunnerCertificates
-            bind:certificates_show
             bind:generate_runners />
           {#if !delete_triggered}
             <button

src/components/runners/RunnersOverview.svelte

@@ -10,7 +10,6 @@
   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";
   $: searchvalue = "";
   $: active_deletes = [];
   export let current_runners = [];
@@ -28,9 +27,6 @@
   $: cards_show = current_runners.some(
     (r) => r.is_selected === true
   );
-  $: certificates_show = current_runners.some(
-    (r) => r.is_selected === true
-  );
   $: generate_runners = current_runners.filter((r) => r.is_selected === true);
   $: teams = [];
   $: orgs = [];
@@ -96,9 +92,6 @@
         <GenerateRunnerCards
           bind:cards_show
           bind:generate_runners />
-        <GenerateRunnerCertificates
-          bind:certificates_show
-          bind:generate_runners />
       </div>
       <div
         class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">

src/components/teams/TeamDetail.svelte

@@ -14,7 +14,6 @@
   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] = [
     {},
     {},
@@ -31,7 +30,6 @@
   $: data_changed = JSON.stringify(teamdata) === JSON.stringify(original);
   $: sponsoring_contracts_show = true;
   $: cards_show = true;
-  $: certificates_show = true;
   $: generate_teams = [original];
   $: group = {};
   $: contact = {};
@@ -124,9 +122,6 @@
         <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,7 +9,6 @@
   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(
@@ -18,9 +17,6 @@
   $: 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;
@@ -65,9 +61,6 @@
         <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,7 +50,6 @@
     "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",
@@ -192,12 +191,10 @@
     "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",
@@ -324,7 +321,6 @@
     "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 ...",
@@ -354,7 +350,6 @@
     "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",

src/locales/en.json

@@ -50,7 +50,6 @@
     "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",
@@ -192,8 +191,6 @@
     "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",
@@ -324,7 +321,6 @@
     "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...",
@@ -354,7 +350,6 @@
     "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",