🚀RELEASE v1.7.0

CHANGELOG.md

@@ -2,13 +2,31 @@
 
 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)

index.html

@@ -13,7 +13,7 @@
 
   <body>
     <span style="display: none; visibility: hidden" id="buildinfo"
-      >RELEASE_INFO-1.5.3-RELEASE_INFO</span
+      >RELEASE_INFO-1.7.0-RELEASE_INFO</span
     >
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <script src="/env.js"></script>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/lfk-frontend",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "type": "module",
   "scripts": {
     "i18n-order": "node order.js",

src/components/cards/AddCardBulkModal.svelte

@@ -5,8 +5,11 @@
   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;
@@ -60,24 +63,7 @@
           toast.success($_("created-blanco-cards"));
           toast.loading($_("generating-pdf"));
           dispatch("created", { cards: result });
-          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();
-              }
-            })
+          documentServer.generateCards(result, "de")
             .then((blob) => {
               const url = window.URL.createObjectURL(blob);
               let a = document.createElement("a");

src/components/pdf_generation/DocumentServer.ts

@@ -16,13 +16,17 @@ class DocumentServer {
                 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,
+                    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,
+                        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,
+                        }
                     }
                 }
             }
@@ -58,6 +62,10 @@ class DocumentServer {
                 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)
@@ -78,6 +86,57 @@ class DocumentServer {
         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;

src/components/pdf_generation/GenerateRunnerCertificates.svelte

@@ -7,7 +7,10 @@
   } 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 = [];
@@ -34,6 +37,17 @@
       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"));
@@ -45,40 +59,15 @@
         current_donations.filter((d) => d.runner?.id == runner.id) || [];
       certificateRunners.push(runner);
     }
-    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();
-        }
-      })
+    documentServer.generateCertificates(certificateRunners, locale)
       .then((blob) => {
-        const url = window.URL.createObjectURL(blob);
-        let a = document.createElement("a");
-        a.href = url;
+        let fileName = `${$_("certificates")}-${locale}.pdf`
         if (generate_runners.length == 1) {
-          a.download = `${$_("certificates")}_${
+          fileName = `${$_("certificates")}_${
             generate_runners[0].firstname
           }_${generate_runners[0].lastname}-${locale}-${createId()}.pdf`;
-        } else {
-          a.download = `${$_("certificates")}-${locale}.pdf`;
         }
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
-        toast.dismiss();
-        toast($_("pdf-successfully-generated"));
+        download(blob, fileName);
       })
       .catch((err) => {});
   }
@@ -98,39 +87,12 @@
           current_donations.filter((d) => d.runner?.id == runner.id) || [];
         certificateRunners.push(runner);
       }
-      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();
-          }
-        })
+      documentServer.generateCertificates(certificateRunners, locale)
         .then((blob) => {
           count++;
-          const url = window.URL.createObjectURL(blob);
-          let a = document.createElement("a");
-          a.href = url;
-          a.download = `${$_("certificates")}_${
+          download(blob, `${$_("certificates")}_${
             t.name
-          }-${locale}-${createId()}.pdf`;
-          document.body.appendChild(a);
-          a.click();
-          a.remove();
-          if (count === generate_teams.length) {
-            toast.dismiss();
-            toast.success($_("pdfs-successfully-generated"));
-          }
+          }-${locale}-${createId()}.pdf`)
         })
         .catch((err) => {});
     }
@@ -156,38 +118,11 @@
           current_donations.filter((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.dismiss();
-            toast.error($_("pdf-generation-failed"));
-          } else {
-            return response.blob();
-          }
-        })
+      await documentServer.generateCertificates(certificateRunners, locale)
         .then((blob) => {
-          const url = window.URL.createObjectURL(blob);
-          let a = document.createElement("a");
-          a.href = url;
-          a.download = `${$_("certificates")}_${
+          download(blob, `${$_("certificates")}_${
             o.name
-          }-${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"));
-          }
+          }-${locale}-${createId()}.pdf`)
         })
         .catch((err) => {});
       for (const t of o.teams) {
@@ -201,34 +136,11 @@
             current_donations.filter((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.dismiss();
-              toast.error($_("pdf-generation-failed"));
-            } else {
-              return response.blob();
-            }
-          })
+        await documentServer.generateCertificates(certificateRunners, locale)
           .then((blob) => {
-            const url = window.URL.createObjectURL(blob);
-            let a = document.createElement("a");
-            a.href = url;
-            a.download = `${$_("certificates")}_${o.name}_${
+            download(blob, `${$_("certificates")}_${o.name}_${
               t.name
-            }-${locale}-${createId()}.pdf`;
-            document.body.appendChild(a);
-            a.click();
-            a.remove();
+            }-${locale}-${createId()}.pdf`)
             if (
               count === o.teams.length &&
               count_orgs === generate_orgs.length