From fef14b6e4fb47ad92da61de91fedce96aea26b2c Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sun, 11 Apr 2021 20:53:58 +0200 Subject: [PATCH] Org card generation now runs in sequence ref #130 --- .../pdf_generation/GenerateRunnerCards.svelte | 137 +++++++++++++----- 1 file changed, 98 insertions(+), 39 deletions(-) diff --git a/src/components/pdf_generation/GenerateRunnerCards.svelte b/src/components/pdf_generation/GenerateRunnerCards.svelte index d55b8d46..8195653c 100644 --- a/src/components/pdf_generation/GenerateRunnerCards.svelte +++ b/src/components/pdf_generation/GenerateRunnerCards.svelte @@ -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,7 +236,7 @@ } cards.push(card); } - fetch( + await fetch( `${config.baseurl_documentserver}/cards?locale=${locale}&download=true&key=${config.documentserver_key}`, { method: "POST", @@ -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 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) => {}); + } } }