8 changed files with 407 additions and 249 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,31 +2,13 @@

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

-#### [1.7.0](https://git.odit.services/lfk/frontend/compare/1.6.0...1.7.0)
-
- refactor(pdfgeneration): Switch cards over to new service [`e230984`](https://git.odit.services/lfk/frontend/commit/e23098410c7d0b326cdbbb3a4b63fed10611e252)
- refactor(pdfgeneration): Switch to new document-server api [`878d971`](https://git.odit.services/lfk/frontend/commit/878d9714cbc0a60cfd96bd1faf8af6af46e6fb5e)
- refactor(pdfgeneration): Switched contract generation over to new document-server [`f99b7f4`](https://git.odit.services/lfk/frontend/commit/f99b7f4bb8f166bb966022ddd10689c082d248f0)
- refactor(cards): Switched over to new document-server api [`65ce02e`](https://git.odit.services/lfk/frontend/commit/65ce02e777e6e9b3cfed248de680e5f292b3a639)
- fix(pdfgeneration): Added parent_group [`7f989b2`](https://git.odit.services/lfk/frontend/commit/7f989b206b16e2687d01a38da8e3ea9be0a52ba5)
-
-#### [1.6.0](https://git.odit.services/lfk/frontend/compare/1.5.3...1.6.0)
-
-> 11 December 2024
-
- refactor(orgs): Swtich to new selfservice baseurl [`e2d6fbb`](https://git.odit.services/lfk/frontend/commit/e2d6fbb513dc9fe7ce05855edb4b0b4b5daeb07a)
- chore: bump [`04494d2`](https://git.odit.services/lfk/frontend/commit/04494d2a2a542f25f785f3bb23e49e5eb0691c0a)
-
 #### [1.5.3](https://git.odit.services/lfk/frontend/compare/1.5.2...1.5.3)

-> 26 November 2024
-
 - feat(dx): Yarn support [`fc15c68`](https://git.odit.services/lfk/frontend/commit/fc15c68cba0d1986563eaf63da3a68784a685a9e)
 - feat(about): cleanup ui [`84aa846`](https://git.odit.services/lfk/frontend/commit/84aa846b87186b52a2f8632724d4f2cb70af062b)
 - feat(dashboard): reorder menu items [`e967d8d`](https://git.odit.services/lfk/frontend/commit/e967d8d20c6972b64b0096594a09043553e9c7e5)
 - fix: unexpected/ missing props [`d803f3d`](https://git.odit.services/lfk/frontend/commit/d803f3d4905d6f792b77d17025467ac13c29068b)
 - chore(deps): bump some [`68b4309`](https://git.odit.services/lfk/frontend/commit/68b4309164eac40b6fda969b60a7e238985d49f8)
- 🚀RELEASE v1.5.3 [`477c650`](https://git.odit.services/lfk/frontend/commit/477c650f3f6dd2eadf5f1cc404e8fc9b02a7841b)
 - fix(ci): Switch over to new woodpecker version [`7ba890d`](https://git.odit.services/lfk/frontend/commit/7ba890dfd7ba908ebef0338f6faa5e7d804cb5ef)
 - refactor(ci): Only build licences, don't export [`32b5f54`](https://git.odit.services/lfk/frontend/commit/32b5f5420bf9ff656b713d61b3a0113b9d6cb69f)
 - feat: cleanup random page toasts [`ad4db88`](https://git.odit.services/lfk/frontend/commit/ad4db882f0f4d00a80ae5e0072e09c071c07ffa2)
--- a/index.html
+++ b/index.html
@ -13,7 +13,7 @@

  <body>
    <span style="display: none; visibility: hidden" id="buildinfo"
-      >RELEASE_INFO-1.7.0-RELEASE_INFO</span
+      >RELEASE_INFO-1.5.3-RELEASE_INFO</span
    >
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <script src="/env.js"></script>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@odit/lfk-frontend",
-  "version": "1.7.0",
+  "version": "1.6.0",
  "type": "module",
  "scripts": {
    "i18n-order": "node order.js",
--- a/src/components/cards/AddCardBulkModal.svelte
+++ b/src/components/cards/AddCardBulkModal.svelte
@ -5,11 +5,8 @@
  import { RunnerCardService } from "@odit/lfk-client-js";
  import { createEventDispatcher } from "svelte";
  import toast from "svelte-french-toast";
-  import DocumentServer from "../pdf_generation/DocumentServer";
  export let bulk_modal_open;
  const dispatch = createEventDispatcher();
-  const documentServer = new DocumentServer(config.baseurl_documentserver,config.documentserver_key);
-

  $: card_count = 0;
  $: is_card_count_valid = card_count > 0;
@ -63,7 +60,24 @@
          toast.success($_("created-blanco-cards"));
          toast.loading($_("generating-pdf"));
          dispatch("created", { cards: result });
-          documentServer.generateCards(result, "de")
+          fetch(
+            `${config.baseurl_documentserver}/cards?&download=true&key=${config.documentserver_key}`,
+            {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json",
+              },
+              body: JSON.stringify(result),
+            }
+          )
+            .then((response) => {
+              if (response.status != "200") {
+                toast.dismiss();
+                toast.error($_("pdf-generation-failed"));
+              } else {
+                return response.blob();
+              }
+            })
            .then((blob) => {
              const url = window.URL.createObjectURL(blob);
              let a = document.createElement("a");
--- a/src/components/pdf_generation/DocumentServer.ts
+++ b/src/components/pdf_generation/DocumentServer.ts
@ -1,142 +0,0 @@
-class DocumentServer {
-    baseUrl: string;
-    apiKey: string;
-
-    constructor(baseUrl: string, apiKey: string){
-        this.baseUrl = baseUrl;
-        this.apiKey = apiKey;
-    }
-
-    async generateCards(cards: any[], locale: string) {
-        const generateCards = new Array<any>();
-
-        for (let i = 0; i < cards.length; i++) {
-            const card = {
-                id: cards[i].id,
-                enabled: cards[i].enabled,
-                code: cards[i].code,
-                runner: {
-                    id: cards[i]?.runner?.id,
-                    first_name: cards[i]?.runner?.firstname,
-                    middle_name: cards[i]?.runner?.middlename,
-                    last_name: cards[i]?.runner?.lastname,
-                    group: {
-                        id: cards[i]?.runner?.group.id,
-                        name: cards[i]?.runner?.group.name,
-                        parent_group: {
-                            id: cards[i]?.runner?.group?.parentGroup?.id,
-                            name: cards[i]?.runner?.group?.parentGroup?.name,
-                        }
-                    }
-                }
-            }
-            generateCards.push(card)
-            
-        }
-
-        const response = await fetch(`${this.baseUrl}/v1/pdfs/cards?key=${this.apiKey}`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                locale,
-                cards: generateCards,
-            }),
-        });
-
-        const blob = await response.blob();
-        return blob;
-    }
-    
-    async generateContracts(runners: any[], locale: string) {
-        const generateRunners = new Array<any>();
-
-        for (let i = 0; i < runners.length; i++) {
-            console.log(runners[i])
-            const card = {
-                id: runners[i].id,
-                first_name: runners[i].firstname,
-                middle_name: runners[i].middlename,
-                last_name: runners[i].lastname,
-                group: {
-                    id: runners[i].group.id,
-                    name: runners[i].group.name,
-                    parent_group: {
-                        id: runners[i]?.group?.parentGroup?.id,
-                        name: runners[i]?.group?.parentGroup?.name,
-                    }
-                }
-            }
-            generateRunners.push(card)
-            
-        }
-
-        const response = await fetch(`${this.baseUrl}/v1/pdfs/contracts?key=${this.apiKey}`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                locale,
-                runners: generateRunners,
-            }),
-        });
-
-        const blob = await response.blob();
-        return blob;
-    }
-    
-    async generateCertificates(runners: any[], locale: string) {
-        const generateRunners = new Array<any>();
-
-        for (let i = 0; i < runners.length; i++) {
-            const certificate = {
-                id: runners[i].id,
-                first_name: runners[i].firstname,
-                middle_name: runners[i].middlename,
-                last_name: runners[i].lastname,
-                group: {
-                    id: runners[i].group.id,
-                    name: runners[i].group.name,
-                    parent_group: {
-                        id: runners[i]?.group?.parentGroup?.id,
-                        name: runners[i]?.group?.parentGroup?.name,
-                    }
-                },
-                distance: runners[i].distance,
-                distance_donations: runners[i].distanceDonations.map((distanceDonation: any) =>{
-                    return {
-                            id: distanceDonation.id,
-                            amount: distanceDonation.amount,
-                            amount_per_distance: distanceDonation.amountPerDistance,
-                            donor: {
-                                id: distanceDonation.donor.id,
-                                first_name: distanceDonation.donor.firstname,
-                                middle_name: distanceDonation.donor.middlename,
-                                last_name: distanceDonation.donor.lastname,
-                            }
-                        }
-                }),
-            }
-            generateRunners.push(certificate)
-            
-        }
-
-        const response = await fetch(`${this.baseUrl}/v1/pdfs/certificates?key=${this.apiKey}`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                locale,
-                runners: generateRunners,
-            }),
-        });
-
-        const blob = await response.blob();
-        return blob;
-    }
-}
-
-export default DocumentServer;
--- a/src/components/pdf_generation/GenerateRunnerCards.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCards.svelte
@ -6,11 +6,9 @@
    RunnerTeamService,
  } from "@odit/lfk-client-js";
  import toast from 'svelte-french-toast'
-  import DocumentServer from "./DocumentServer.ts"

  import { init } from "@paralleldrive/cuid2";
  const createId = init({ length: 10, fingerprint: "lfk-frontend" });
-  const documentServer = new DocumentServer(config.baseurl_documentserver,config.documentserver_key);

  export let cards_show = false;
  export let generate_cards = [];
@ -27,18 +25,6 @@
    }
  });

-  function download (blob, fileName){
-    const url = window.URL.createObjectURL(blob);
-    let a = document.createElement("a");
-    a.href = url;
-    a.download = fileName;
-    document.body.appendChild(a);
-    a.click();
-    a.remove();
-    toast.dismiss();
-    toast($_("pdf-successfully-generated"));
-  }
-
  function generateRunnerCards(locale) {
    cards_dropdown_open = false;

@ -55,9 +41,34 @@

  function generateCards(locale) {
    toast.loading($_("generating-pdf"));
-    documentServer.generateCards(generate_cards, locale)
+    fetch(
+      `${config.baseurl_documentserver}/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(generate_cards),
+      }
+    )
+      .then((response) => {
+        if (response.status != "200") {
+          toast.dismiss();
+          toast.error($_("pdf-generation-failed"));
+        } else {
+          return response.blob();
+        }
+      })
      .then((blob) => {
-        download(blob, `${$_("runnercards")}-${locale}-${createId()}.pdf`);
+        const url = window.URL.createObjectURL(blob);
+        let a = document.createElement("a");
+        a.href = url;
+        a.download = `${$_("runnercards")}-${locale}-${createId()}.pdf`;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+        toast.dismiss();
+        toast($_("pdf-successfully-generated"));
      })
      .catch((err) => {
        console.error(err);
@ -77,15 +88,40 @@
      }
      cards.push(card);
    }
-    documentServer.generateCards(cards, locale)
+    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.dismiss();
+          toast.error($_("pdf-generation-failed"));
+        } else {
+          return response.blob();
+        }
+      })
      .then((blob) => {
-        let fileName = `${$_("runnercards")}-${locale}-${createId()}.pdf`;
+        const url = window.URL.createObjectURL(blob);
+        let a = document.createElement("a");
+        a.href = url;
        if (generate_runners.length == 1) {
-          fileName = `${$_("runnercards")}_${generate_runners[0].firstname}_${
+          a.download = `${$_("runnercards")}_${generate_runners[0].firstname}_${
            generate_runners[0].lastname
          }-${locale}-${createId()}.pdf`;
+        } else {
+          a.download = `${$_("runnercards")}-${locale}-${createId()}.pdf`;
        }
-        download(blob, fileName);
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+        toast.dismiss();
+        toast($_("pdf-successfully-generated"));
      })
      .catch((err) => {});
  }
@ -108,11 +144,39 @@
        }
        cards.push(card);
      }
-      documentServer.generateCards(cards, locale)
+      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.dismiss();
+            toast.error($_("pdf-generation-failed"));
+          } else {
+            return response.blob();
+          }
+        })
        .then((blob) => {
-          download(blob, `${$_("runnercards")}_${
+          count++;
+          const url = window.URL.createObjectURL(blob);
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = `${$_("runnercards")}_${
            t.name
-          }-${locale}-${createId()}.pdf`)
+          }-${locale}-${createId()}.pdf`;
+          document.body.appendChild(a);
+          a.click();
+          a.remove();
+          if (count === generate_teams.length) {
+            toast.dismiss();
+            toast.success($_("pdfs-successfully-generated"));
+          }
        })
        .catch((err) => {});
    }
@ -141,11 +205,38 @@
        }
        cards.push(card);
      }
-      await documentServer.generateCards(cards, locale)
+      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.dismiss();
+            toast.error($_("pdf-generation-failed"));
+          } else {
+            return response.blob();
+          }
+        })
        .then((blob) => {
-          download(blob, `${$_("runnercards")}_${
+          const url = window.URL.createObjectURL(blob);
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = `${$_("runnercards")}_${
            o.name
-          }_direct-${locale}-${createId()}.pdf`)
+          }_direct-${locale}-${createId()}.pdf`;
+          document.body.appendChild(a);
+          a.click();
+          a.remove();
+          if (count === o.teams.length && count_orgs === generate_orgs.length) {
+            toast.dismiss();
+            toast.success($_("pdfs-successfully-generated"));
+          }
        })
        .catch((err) => {});
      for (const t of o.teams) {
@ -163,11 +254,41 @@
          }
          cards.push(card);
        }
-        await documentServer.generateCards(cards, locale)
+        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.dismiss();
+              toast.error($_("pdf-generation-failed"));
+            } else {
+              return response.blob();
+            }
+          })
          .then((blob) => {
-            download(blob, `${$_("runnercards")}_${o.name}_${
+            const url = window.URL.createObjectURL(blob);
+            let a = document.createElement("a");
+            a.href = url;
+            a.download = `${$_("runnercards")}_${o.name}_${
              t.name
-            }-${locale}-${createId()}.pdf`)
+            }-${locale}-${createId()}.pdf`;
+            document.body.appendChild(a);
+            a.click();
+            a.remove();
+            if (
+              count === o.teams.length &&
+              count_orgs === generate_orgs.length
+            ) {
+              toast.dismiss();
+              toast($_("pdfs-successfully-generated"));
+            }
          })
          .catch((err) => {});
      }
--- a/src/components/pdf_generation/GenerateRunnerCertificates.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
@ -7,10 +7,7 @@
  } from "@odit/lfk-client-js";
  import { init } from "@paralleldrive/cuid2";
  import toast from "svelte-french-toast";
-  import DocumentServer from "./DocumentServer";
  const createId = init({ length: 10, fingerprint: "lfk-frontend" });
-  const documentServer = new DocumentServer(config.baseurl_documentserver,config.documentserver_key);
-

  export let certificates_show = false;
  export let generate_runners = [];
@ -37,17 +34,6 @@
      generateRunnerCertificates(locale);
    }
  }
-  function download (blob, fileName){
-    const url = window.URL.createObjectURL(blob);
-    let a = document.createElement("a");
-    a.href = url;
-    a.download = fileName;
-    document.body.appendChild(a);
-    a.click();
-    a.remove();
-    toast.dismiss();
-    toast($_("pdf-successfully-generated"));
-  }

  async function generateRunnerCertificates(locale) {
    toast.loading($_("generating-pdf"));
@ -59,15 +45,40 @@
        current_donations.filter((d) => d.runner?.id == runner.id) || [];
      certificateRunners.push(runner);
    }
-    documentServer.generateCertificates(certificateRunners, locale)
+    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.dismiss();
+          toast.error($_("pdf-generation-failed"));
+        } else {
+          return response.blob();
+        }
+      })
      .then((blob) => {
-        let fileName = `${$_("certificates")}-${locale}.pdf`
+        const url = window.URL.createObjectURL(blob);
+        let a = document.createElement("a");
+        a.href = url;
        if (generate_runners.length == 1) {
-          fileName = `${$_("certificates")}_${
+          a.download = `${$_("certificates")}_${
            generate_runners[0].firstname
          }_${generate_runners[0].lastname}-${locale}-${createId()}.pdf`;
+        } else {
+          a.download = `${$_("certificates")}-${locale}.pdf`;
        }
-        download(blob, fileName);
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+        toast.dismiss();
+        toast($_("pdf-successfully-generated"));
      })
      .catch((err) => {});
  }
@ -87,12 +98,39 @@
          current_donations.filter((d) => d.runner?.id == runner.id) || [];
        certificateRunners.push(runner);
      }
-      documentServer.generateCertificates(certificateRunners, locale)
+      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.dismiss();
+            toast.error($_("pdf-generation-failed"));
+          } else {
+            return response.blob();
+          }
+        })
        .then((blob) => {
          count++;
-          download(blob, `${$_("certificates")}_${
+          const url = window.URL.createObjectURL(blob);
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = `${$_("certificates")}_${
            t.name
-          }-${locale}-${createId()}.pdf`)
+          }-${locale}-${createId()}.pdf`;
+          document.body.appendChild(a);
+          a.click();
+          a.remove();
+          if (count === generate_teams.length) {
+            toast.dismiss();
+            toast.success($_("pdfs-successfully-generated"));
+          }
        })
        .catch((err) => {});
    }
@ -118,11 +156,38 @@
          current_donations.filter((d) => d.runner?.id == runner.id) || [];
        certificateRunners.push(runner);
      }
-      await documentServer.generateCertificates(certificateRunners, locale)
+      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.dismiss();
+            toast.error($_("pdf-generation-failed"));
+          } else {
+            return response.blob();
+          }
+        })
        .then((blob) => {
-          download(blob, `${$_("certificates")}_${
+          const url = window.URL.createObjectURL(blob);
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = `${$_("certificates")}_${
            o.name
-          }-${locale}-${createId()}.pdf`)
+          }-${locale}-${createId()}.pdf`;
+          document.body.appendChild(a);
+          a.click();
+          a.remove();
+          if (count === o.teams.length && count_orgs === generate_orgs.length) {
+            toast.dismiss();
+            toast.success($_("pdfs-successfully-generated"));
+          }
        })
        .catch((err) => {});
      for (const t of o.teams) {
@ -136,11 +201,34 @@
            current_donations.filter((d) => d.runner?.id == runner.id) || [];
          certificateRunners.push(runner);
        }
-        await documentServer.generateCertificates(certificateRunners, locale)
+        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.dismiss();
+              toast.error($_("pdf-generation-failed"));
+            } else {
+              return response.blob();
+            }
+          })
          .then((blob) => {
-            download(blob, `${$_("certificates")}_${o.name}_${
+            const url = window.URL.createObjectURL(blob);
+            let a = document.createElement("a");
+            a.href = url;
+            a.download = `${$_("certificates")}_${o.name}_${
              t.name
-            }-${locale}-${createId()}.pdf`)
+            }-${locale}-${createId()}.pdf`;
+            document.body.appendChild(a);
+            a.click();
+            a.remove();
            if (
              count === o.teams.length &&
              count_orgs === generate_orgs.length
--- a/src/components/pdf_generation/GenerateSponsoringContracts.svelte
+++ b/src/components/pdf_generation/GenerateSponsoringContracts.svelte
@ -4,12 +4,10 @@
    RunnerOrganizationService,
    RunnerTeamService,
  } from "@odit/lfk-client-js";
-  import DocumentServer from "./DocumentServer";
+
  import { init } from "@paralleldrive/cuid2";
  import toast from "svelte-french-toast";
  const createId = init({ length: 10, fingerprint: "lfk-frontend" });
-  const documentServer = new DocumentServer(config.baseurl_documentserver,config.documentserver_key);
-

  export let sponsoring_contracts_show = false;
  export let generate_runners = [];
@ -36,17 +34,6 @@
      generateRunnerContracts(locale);
    }
  }
-  function download (blob, fileName){
-    const url = window.URL.createObjectURL(blob);
-    let a = document.createElement("a");
-    a.href = url;
-    a.download = fileName;
-    document.body.appendChild(a);
-    a.click();
-    a.remove();
-    toast.dismiss();
-    toast($_("pdf-successfully-generated"));
-  }

  async function generateTeamContracts(locale) {
    toast.loading($_("generating-pdfs"));
@ -56,11 +43,38 @@
      const runners = await RunnerTeamService.runnerTeamControllerGetRunners(
        t.id
      );
-      documentServer.generateContracts(runners, locale)
+      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.dismiss();
+            toast.error($_("pdf-generation-failed"));
+          } else {
+            return response.blob();
+          }
+        })
        .then((blob) => {
-          download(blob, `${$_("sponsorings")}_${
+          const url = window.URL.createObjectURL(blob);
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = `${$_("sponsorings")}_${
            t.name
-          }-${locale}-${createId()}.pdf`)
+          }-${locale}-${createId()}.pdf`;
+          document.body.appendChild(a);
+          a.click();
+          a.remove();
+          if (count === generate_teams.length) {
+            toast.dismiss();
+            toast.success($_("pdfs-successfully-generated"));
+          }
        })
        .catch((err) => {});
    }
@ -77,11 +91,38 @@
          o.id,
          true
        );
-      await documentServer.generateContracts(runners, locale)
+      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.dismiss();
+            toast.error($_("pdf-generation-failed"));
+          } else {
+            return response.blob();
+          }
+        })
        .then((blob) => {
-          download(blob, `${$_("sponsorings")}_${
+          const url = window.URL.createObjectURL(blob);
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = `${$_("sponsorings")}_${
            o.name
-          }_direct-${locale}-${createId()}.pdf`)
+          }_direct-${locale}-${createId()}.pdf`;
+          document.body.appendChild(a);
+          a.click();
+          a.remove();
+          if (count === o.teams.length && count_orgs === generate_orgs.length) {
+            toast.dismiss();
+            toast.success($_("pdfs-successfully-generated"));
+          }
        })
        .catch((err) => {});
      for (const t of o.teams) {
@ -89,11 +130,41 @@
        let runners = await RunnerTeamService.runnerTeamControllerGetRunners(
          t.id
        );
-        await documentServer.generateContracts(runners, locale)
+        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.dismiss();
+              toast.error($_("pdf-generation-failed"));
+            } else {
+              return response.blob();
+            }
+          })
          .then((blob) => {
-            download(blob, `${$_("sponsorings")}_${o.name}_${
+            const url = window.URL.createObjectURL(blob);
+            let a = document.createElement("a");
+            a.href = url;
+            a.download = `${$_("sponsorings")}_${o.name}_${
              t.name
-            }-${locale}-${createId()}.pdf`)
+            }-${locale}-${createId()}.pdf`;
+            document.body.appendChild(a);
+            a.click();
+            a.remove();
+            if (
+              count === o.teams.length &&
+              count_orgs === generate_orgs.length
+            ) {
+              toast.dismiss();
+              toast($_("pdfs-successfully-generated"));
+            }
          })
          .catch((err) => {});
      }
@ -102,15 +173,39 @@

  function generateRunnerContracts(locale) {
    toast.loading($_("generating-pdf"));
-    documentServer.generateContracts(generate_runners, locale)
+    fetch(
+      `${config.baseurl_documentserver}/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(generate_runners),
+      }
+    )
+      .then((response) => {
+        if (response.status != "200") {
+          toast.dismiss();
+          toast.error($_("pdf-generation-failed"));
+        } else {
+          return response.blob();
+        }
+      })
      .then((blob) => {
-        let fileName = `${$_("sponsorings")}-${locale}-${createId()}.pdf`
+        const url = window.URL.createObjectURL(blob);
+        let a = document.createElement("a");
+        a.href = url;
        if (generate_runners.length == 1) {
-          fileName= `${$_("sponsorings")}_${generate_runners[0].firstname}_${
+          a.download = `${$_("sponsorings")}_${generate_runners[0].firstname}_${
            generate_runners[0].lastname
          }-${locale}-${createId()}.pdf`;
        }
-        download(blob, fileName);
+        a.download = `${$_("sponsorings")}-${locale}-${createId()}.pdf`;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+        toast.dismiss();
+        toast($_("pdf-successfully-generated"));
      })
      .catch((err) => {
        console.error(err);