🚀RELEASE v0.13.0

Merge pull request 'Better org pdf generation feature/130-org_doc_splitting' (#131 ) from feature/130-org_doc_splitting into dev
Reviewed-on: #131
2021-04-11 21:08:58 +02:00 · 2021-04-11 19:07:53 +00:00 · 2021-04-11 21:00:33 +02:00 · 2021-04-11 20:54:38 +02:00 · 2021-04-11 20:53:58 +02:00 · 2021-04-11 20:48:20 +02:00
9 changed files with 307 additions and 131 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,8 +2,21 @@
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 #### [0.13.0](https://git.odit.services/lfk/frontend/compare/0.12.5...0.13.0)
 - 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)
--- a/index.html
+++ b/index.html
@ -13,7 +13,7 @@
 </head>
 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.12.5-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.13.0-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>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.12.5",
+	"version": "0.13.0",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev": "vite",
--- a/public/env.sample.js
+++ b/public/env.sample.js
@ -1,5 +1,6 @@
 const config = {
 	baseurl: 'http://localhost:4010',
 	baseurl_documentserver: 'http://localhost:4010/documents',
 	documentserver_key: 'NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe',
 	// optional
 	default_username: 'demo',
--- a/src/components/cards/AddCardBulkModal.svelte
+++ b/src/components/cards/AddCardBulkModal.svelte
@ -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: {
--- a/src/components/orgs/OrgOverview.svelte
+++ b/src/components/orgs/OrgOverview.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
  );
--- a/src/components/pdf_generation/GenerateRunnerCards.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCards.svelte
@ -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(
+            count_orgs++;
-                o.id
+            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(
+            await 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: {
@ -259,15 +260,72 @@
                }
            })
            .then((blob) => {
                    count++;
                const url = window.URL.createObjectURL(blob);
                let a = document.createElement("a");
                a.href = url;
-                    a.download = `${$_('runnercards')}_${o.name}-${locale}.pdf`;
+                a.download = `${$_('runnercards')}_${o.name}_direct-${locale}.pdf`;
                document.body.appendChild(a);
                a.click();
                a.remove();
-                    if (count === generate_orgs.length) {
+                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"),
@ -280,6 +338,7 @@
            .catch((err) => {});
            }
        }
    }
 </script>
 {#if cards_show}
--- a/src/components/pdf_generation/GenerateRunnerCertificates.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
@ -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(
+            count_orgs++;
-                o.id
+            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(
+            await 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: {
@ -192,15 +193,67 @@
                }
            })
            .then((blob) => {
                    count++;
                const url = window.URL.createObjectURL(blob);
                let a = document.createElement("a");
                a.href = url;
-                    a.download = `${$_('certificates')}_${o.name}-${locale}.pdf`;
+                a.download = `${$_('certificates')}_${o.name}_direct-${locale}.pdf`;
                document.body.appendChild(a);
                a.click();
                a.remove();
-                    if (count === generate_orgs.length) {
+                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 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"),
@ -213,6 +266,7 @@
            .catch((err) => {});
            }
        }
    }
 </script>
 {#if certificates_show}
--- a/src/components/pdf_generation/GenerateSponsoringContracts.svelte
+++ b/src/components/pdf_generation/GenerateSponsoringContracts.svelte
@ -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(
+            count_orgs++;
-                o.id
+            let count = 0;
-            );
+            let runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(o.id, true)
-            fetch(
+            await 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: {
@ -120,15 +121,62 @@
                }
            })
            .then((blob) => {
                    count++;
                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}_direct-${locale}.pdf`;
                document.body.appendChild(a);
                a.click();
                a.remove();
-                    if (count === generate_orgs.length) {
+                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
                );
            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"),
@ -141,6 +189,7 @@
            .catch((err) => {});
            }
        }
    }
    function generateRunnerContracts(locale) {
        const toast = Toastify({
@ -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: {
Author	SHA1	Message	Date
Nicolai Ort	467808abef	🚀RELEASE v0.13.0 Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-11 21:08:58 +02:00
Nicolai Ort	861f1f2216	Merge pull request 'Better org pdf generation feature/130-org_doc_splitting' (#131 ) from feature/130-org_doc_splitting into dev Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #131	2021-04-11 19:07:53 +00:00
Nicolai Ort	509b22bea0	Org certificate generation now runs in sequence ref #130	2021-04-11 21:00:33 +02:00
Nicolai Ort	7447b2f4c1	Fixed const -> let ref #130	2021-04-11 20:54:38 +02:00
Nicolai Ort	fef14b6e4f	Org card generation now runs in sequence ref #130	2021-04-11 20:53:58 +02:00
Nicolai Ort	01d2a7e6aa	Org contract generation now runs in sequence ref #130	2021-04-11 20:48:20 +02:00
Nicolai Ort	ac586fec5a	Hotfix: Org * generation🐞 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-11 20:17:34 +02:00
Nicolai Ort	5476808683	Emergency document server url change All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-11 20:10:08 +02:00