Merge branch 'feature/36-runner_certificates' of git.odit.services:lfk/document-server into feature/36-runner_certificates

ref #36

.drone.yml

@@ -44,6 +44,7 @@ steps:
       tags:
         - dev
       registry: registry.odit.services
+      mtu: 1000
   - name: run changelog export
     depends_on: ["clone"]
     image: node:latest
@@ -112,6 +113,7 @@ steps:
       tags:
         - latest
       registry: registry.odit.services
+      mtu: 1000
   - name: push merge to repo
     depends_on: ["clone"]
     image: appleboy/drone-git-push
@@ -146,6 +148,7 @@ steps:
       tags:
         - '${DRONE_TAG}'
       registry: registry.odit.services
+      mtu: 1000
 trigger:
   event:
   - tag

CHANGELOG.md

@@ -2,13 +2,56 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [v0.3.3](https://git.odit.services/lfk/document-server/compare/v0.3.3...v0.3.3)
+#### [v0.4.3](https://git.odit.services/lfk/document-server/compare/v0.4.3...v0.4.3)
 
-- Merge pull request 'Configurable sponsoring disclaimer feature/33-disclaimer' (#34) from feature/33-disclaimer into dev [`e9d3574`](https://git.odit.services/lfk/document-server/commit/e9d35745997a9e948509ea67b59f5a7658f9d652)
+#### [v0.4.3](https://git.odit.services/lfk/document-server/compare/v0.4.2...v0.4.3)
+
+> 30 March 2021
+
+- Merge pull request 'Release 0.4.3' (#40) from dev into main [`c8dc998`](https://git.odit.services/lfk/document-server/commit/c8dc998ecdccc7fc4348ecc0db552a3d7bc2eb52)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`289a0d8`](https://git.odit.services/lfk/document-server/commit/289a0d8671575dda911c64f79d24726d3bbee071)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`3df3d26`](https://git.odit.services/lfk/document-server/commit/3df3d26708aab12590cd9c1f697cfdea8017ace4)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`457ea26`](https://git.odit.services/lfk/document-server/commit/457ea26cf8124009084415d12c7a0e31912a3eb1)
+- 🚀Bumped version to v0.4.3 [`c3beb3e`](https://git.odit.services/lfk/document-server/commit/c3beb3e1032492f9a8304c4b099a700ad0d1d2cf)
+- Pipeline mtu fix [`c2d2b66`](https://git.odit.services/lfk/document-server/commit/c2d2b66f2f6fbd30c2027fd3dab393db5219eb44)
+
+#### [v0.4.2](https://git.odit.services/lfk/document-server/compare/v0.4.0...v0.4.2)
+
+> 29 March 2021
+
+- Merge pull request 'Release 0.4.2' (#39) from dev into main [`ce3053c`](https://git.odit.services/lfk/document-server/commit/ce3053c0ba5404ebd8d4cbd5386c454d8cd8c4d2)
+- 🚀Bumped version to v0.4.1 [`d17108f`](https://git.odit.services/lfk/document-server/commit/d17108f4b9f041727afcee5c171d5d8f9a3c677c)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`0ade575`](https://git.odit.services/lfk/document-server/commit/0ade57536e372a62356fe2f329f6cfe04bcfc397)
+- Fixed faulty object mapping [`9584bfe`](https://git.odit.services/lfk/document-server/commit/9584bfed8ba5b8c856b55aa90969874d4d6751ff)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`8bac1fa`](https://git.odit.services/lfk/document-server/commit/8bac1fadd6b4257e5062a1b1673e122c5b535046)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`b8f0d1f`](https://git.odit.services/lfk/document-server/commit/b8f0d1fa60da4e3262623cecf4a78c8a9a322f8c)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`073433f`](https://git.odit.services/lfk/document-server/commit/073433f308f2f8e7ada97dd0b3896fb541e85711)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`a478081`](https://git.odit.services/lfk/document-server/commit/a47808172797e12800c46d17ccf4b458f4a506de)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`6608456`](https://git.odit.services/lfk/document-server/commit/6608456c686e51d3aa16e630ba72c7c29e428b2a)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`0839ff6`](https://git.odit.services/lfk/document-server/commit/0839ff63593cfb9e8339b2b2a86dbe7e2afb5dcb)
+- Now using our own images to build stuff 🚀 [`96886c7`](https://git.odit.services/lfk/document-server/commit/96886c74bc397e1ee793e83e0d01a6bbaa953da3)
+- 🚀Bumped version to v0.4.2 [`1cbe5a1`](https://git.odit.services/lfk/document-server/commit/1cbe5a1614c40fbf23f032be60039ddb1472ca94)
+- Emergency bugfixes 🐞 [`3c42ca3`](https://git.odit.services/lfk/document-server/commit/3c42ca30427174c21e0db6426d8f0d91a1ebc501)
+- Let's try the mtu fix [`c51ec74`](https://git.odit.services/lfk/document-server/commit/c51ec74d30334b156668de4719c77f2e9c6d023f)
+
+#### [v0.4.0](https://git.odit.services/lfk/document-server/compare/v0.3.3...v0.4.0)
+
+> 14 March 2021
+
+- Merge pull request 'Alpha Release 0.4.0' (#38) from dev into main [`8d3cc34`](https://git.odit.services/lfk/document-server/commit/8d3cc34395922a271da1032310da6ec6f7a164f7)
+- Updated ci with new kubernetes secrets 🚀🚀🚀 [`b180e04`](https://git.odit.services/lfk/document-server/commit/b180e0404537404d0564453fde5976f4de672a8b)
 - Updated styleing [`03ed6d5`](https://git.odit.services/lfk/document-server/commit/03ed6d5bc18c5b26edd7b1d698c9de936e008f32)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`b612562`](https://git.odit.services/lfk/document-server/commit/b612562d347f5fafcf4ce94a4508b7c0bb9370c6)
+- 🚀Bumped version to v0.4.0 [`85519bc`](https://git.odit.services/lfk/document-server/commit/85519bc2e4e8906732dc5f99e417014a14bad7d0)
+- Merge pull request 'Configureable contracts amount feature/35-contracts_per_runner' (#37) from feature/35-contracts_per_runner into dev [`ed02306`](https://git.odit.services/lfk/document-server/commit/ed023067386551dc92d60ba63dff8bc4cc44ce00)
 - Added disclaimer to template [`4e1e124`](https://git.odit.services/lfk/document-server/commit/4e1e124d0dc08f96aeb05dd1c975064fe785b80f)
+- Changed ci pipeline type to kubernetes [`677bd86`](https://git.odit.services/lfk/document-server/commit/677bd861335302269baec96a59916475bbdd405f)
+- Added config for amount of contracts per runner [`d01b4a0`](https://git.odit.services/lfk/document-server/commit/d01b4a0b99f3c1aa088b02d766d21bfb6b9e3a29)
+- Added logic for generateing multiple contracts per runner [`d991940`](https://git.odit.services/lfk/document-server/commit/d9919404b5b90151318d20258a273ca6c7640393)
 - MAde disclaimer configurable via env [`5e4d6f4`](https://git.odit.services/lfk/document-server/commit/5e4d6f44dab581483135594432bd8c8d65ba74ef)
 - MAde disclaimer configurable via env [`885765a`](https://git.odit.services/lfk/document-server/commit/885765ac71b6a65c869ee841c383667f4947dcde)
+- Documented the new config var [`31a5950`](https://git.odit.services/lfk/document-server/commit/31a59500fa77f1ad7c54fa297d00c8707ae6db9c)
+- Merge pull request 'Configurable sponsoring disclaimer feature/33-disclaimer' (#34) from feature/33-disclaimer into dev [`e9d3574`](https://git.odit.services/lfk/document-server/commit/e9d35745997a9e948509ea67b59f5a7658f9d652)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`19fbf50`](https://git.odit.services/lfk/document-server/commit/19fbf50f6f6057c5321a999b6551d05db32b5fd8)
 - Added reamde entry for the new env var [`9dd62ce`](https://git.odit.services/lfk/document-server/commit/9dd62cefa94bf3f0bf8e77fd25e7ca1ec4b30e2b)
 

Dockerfile

@@ -1,5 +1,5 @@
 # Typescript Build
-FROM registry.odit.services/mirror/node:14.15.1-alpine3.12
+FROM registry.odit.services/hub/library/node:14.15.1-alpine3.12
 WORKDIR /app
 COPY package.json ./
 RUN npm i -g pnpm
@@ -8,7 +8,7 @@ COPY tsconfig.json ./
 COPY src ./src
 RUN pnpm run build
 # final image
-FROM registry.odit.services/mirror/alpine:3.13.1
+FROM registry.odit.services/hub/library/alpine:3.13.1
 WORKDIR /app
 RUN apk add --no-cache \
       chromium \

docker-compose.yml

@@ -1,9 +1,15 @@
-version: "3"
-services:
-  document_server:
-    build: .
-    ports:
-      - 4010:4010
-    environment:
-      APP_PORT: 4010
-      NODE_ENV: production
+version: "3"
+services:
+  document_server:
+    build: .
+    ports:
+      - 4010:4010
+    environment:
+      APP_PORT: 4010
+      NODE_ENV: production
+      EVENT_NAME: "Lauf für Kaya! 2021"
+      CURRENCY_SYMBOL: "€"
+      API_KEY: RYRccAJ4SKZnZaEci6Nyk9Z6mw3sD94fyKJ74WNzi6hLkxGNyJDrKPkxBmPwvR4f
+      CONTRACTS_PER_RUNNER: 2
+      SPONSORING_RECEIPT_MINIMUM_AMOUNT: 50
+      DISCLAIMER_TEXT: "Rechtsgrundlage unserer Datenverarbeitung aufgrund freiwilliger Einwilligung ist Art. 6 Abs. 1 e), Abs. 3 DSGVO i.V.m. Art. 85 BayEUG. Mit Ihrer Unterschrift willigen Sie in unsere Datennutzung zum Zwecke des Lauf für Kaya! ein. Die Daten für Spendenquittungen"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/lfk-document-server",
-  "version": "0.4.0",
+  "version": "0.4.3",
   "description": "The document generation server for the LfK! runner system. This generates certificates, sponsoring aggreements and more",
   "main": "src/app.ts",
   "scripts": {

src/config.ts

@@ -13,7 +13,7 @@ export const config = {
     sponor_logos: getSponsorLogos(),
     api_key: getApiKey(),
     disclaimer_text: process.env.DISCLAIMER_TEXT || "",
-    contracts_per_runner: process.env.CONTRACTS_PER_RUNNER || 1,
+    contracts_per_runner: parseInt(process.env.CONTRACTS_PER_RUNNER) || 1,
 }
 let errors = 0
 if (typeof config.internal_port !== "number") {

src/controllers/PdfController.ts

@@ -71,7 +71,20 @@ export class PdfController {
     private mapCardGroupNames(cards: RunnerCard[]): RunnerCard[] {
         let response = new Array<RunnerCard>();
         for (let card of cards) {
-            if (!card.runner.group.parentGroup) {
+            if (!card.runner) {
+                card.runner = {
+                    id: 0,
+                    firstname: "Blank",
+                    lastname: "Blank",
+                    distance: 0,
+                    group: {
+                        id: 0,
+                        name: "Blank",
+                        fullName: "Blank"
+                    }
+                }
+            }
+            else if (!card.runner.group.parentGroup) {
                 card.runner.group.fullName = card.runner.group.name;
             }
             else {

src/templates/runner_certificate.html

@@ -0,0 +1,99 @@
+<html>
+
+<head>
+  <meta charset="utf8">
+  <title>Sponsoring contract</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
+  <style>
+    .sheet {
+      margin: 0;
+      overflow: hidden;
+      position: relative;
+      box-sizing: border-box;
+      page-break-after: always;
+      padding: 1.2cm 2cm 1.2cm 2cm;
+      background-image: url("./certficate_background.png");
+      background-repeat: no-repeat;
+      background-size: 11cm;
+      background-position: 5cm 5cm;
+      background-color: rgba(255, 255, 255, 0.7);
+      background-blend-mode: lighten;
+      /* border-style: solid; */
+    }
+
+    body.A4 .sheet {
+      width: 210mm;
+      height: 296mm
+    }
+
+    .certificate-footer {
+      position: absolute;
+      bottom: 0cm;
+    }
+
+    td {
+      border: 1px solid black;
+      font-size: large;
+      font-weight: 600;
+    }
+  </style>
+</head>
+
+<body class="A4 landscape">
+  {{#each runners}}
+  <div class="sheet">
+    <header class="content has-text-centered">
+      <h1 style="font-size: 3cm; font-weight: bold;">Urkunde</h1>
+    </header>
+    <img class="background" style="position: absolute;">
+    <main class="content has-text-centered" style="padding-top: 3cm;">
+      <p style="width: 50%; font-size: 4vw; font-weight: bold; margin-bottom: 0; display: inline;">{{this.firstname}}
+        {{this.middlename}} {{this.lastname}}
+      </p>
+      <p style="font-size: 1cm; margin-bottom: 0;">Hat beim {{../eventname}}</p>
+      <p style="font-size: 2cm; font-weight: bold; margin-bottom: 0;">{{this.distance}}km</p>
+      <p style="font-size: 1cm;">für den guten Zweck zurückgelegt</p>
+    </main>
+    <footer class="certificate-footer">
+      <img src="./certificate_footer.png">
+    </footer>
+  </div>
+  <div class="sheet">
+    <header class="content has-text-centered">
+      <h1 style="font-size: 2.5cm;">Sponsorings</h1>
+    </header>
+    <main>
+      <table style="border: solid; width: 17cm;">
+        <thead>
+          <td class=".td-head">Sponsor:in</td>
+          <td>Betrag/KM</td>
+          <td>Gesamtbetrag</td>
+        </thead>
+        <tbody>
+          {{#each this.distanceDonations}}
+          <tr>
+            <td>{{this.dornor}}</td>
+            <td>{{this.amountPerDistance}}</td>
+            <td>{{this.amount}}]</td>
+          </tr>
+          {{/each}}
+        </tbody>
+        <tfoot>
+          <td>Gesamt</td>
+          <td>0.5€</td>
+          <td>1€</td>
+        </tfoot>
+      </table>
+    </main>
+    <footer class="certificate-footer">
+      <p>
+        Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
+        dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
+        clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+      </p>
+    </footer>
+  </div>
+  {{/each}}
+</body>
+
+</html>