src/components/pdf_generation/GenerateRunnerCards.svelte

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

src/components/pdf_generation/GenerateSponsoringContracts.svelte

@@ -142,7 +142,7 @@
             .catch((err) => {});
             for await (const t of o.teams) {
                 count++;
-                let runners = await RunnerTeamService.runnerTeamControllerGetRunners(
+                const runners = await RunnerTeamService.runnerTeamControllerGetRunners(
                     t.id
                 );
             await fetch(