.drone.yml

@@ -33,23 +33,53 @@ steps:
       - git clone $DRONE_REMOTE_URL .
       - git checkout dev
   - name: build dev
-    depends_on: ["clone"]
+    image: plugins/docker
-    image: registry.odit.services/library/drone-kaniko
+    depends_on: [clone]
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      build_args:
+      repo: registry.odit.services/lfk/document-server
-        - NPM_REGISTRY_DOMAIN:
-          from_secret: npmjs_domain
-        - NPM_REGISTRY_TOKEN:
-          from_secret: npmjs_token
-      repo: lfk/document-server
       tags:
         - dev
-      cache: true
       registry: registry.odit.services
+      mtu: 1000
+  - name: run changelog export
+    depends_on: ["clone"]
+    image: node:latest
+    commands:
+      - npx auto-changelog --commit-limit false -p -u --hide-credit
+  - name: push new changelog to repo
+    depends_on: ["run changelog export"]
+    image: appleboy/drone-git-push
+    settings:
+      branch: dev
+      commit: true
+      commit_message: 🧾New changelog file version [CI SKIP] [skip ci]
+      author_email: bot@odit.services
+      remote: git@git.odit.services:lfk/document-server.git
+      ssh_key:
+        from_secret: git_ssh
+  - name: run full license export
+    depends_on: ["clone"]
+    image: node:14.15.1-alpine3.12
+    commands:
+      - yarn
+      - yarn licenses:export
+  - name: push new licenses file to repo
+    depends_on: ["run full license export"]
+    image: appleboy/drone-git-push
+    settings:
+      branch: dev
+      commit: true
+      commit_message: 📖New license file version [CI SKIP] [skip ci]
+      author_email: bot@odit.services
+      remote: git@git.odit.services:lfk/document-server.git
+      skip_verify: true
+      ssh_key:
+        from_secret: git_ssh
+
 trigger:
   branch:
     - dev
@@ -69,24 +99,30 @@ steps:
     commands:
       - git clone $DRONE_REMOTE_URL .
       - git checkout dev
-  - name: build dev
+      - git merge main
+      - git checkout main
+  - name: build latest
     depends_on: ["clone"]
-    image: registry.odit.services/library/drone-kaniko
+    image: plugins/docker
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      build_args:
+      repo: registry.odit.services/lfk/document-server
-        - NPM_REGISTRY_DOMAIN:
-          from_secret: npmjs_domain
-        - NPM_REGISTRY_TOKEN:
-          from_secret: npmjs_token
-      repo: lfk/document-server
       tags:
         - latest
-      cache: true
       registry: registry.odit.services
+      mtu: 1000
+  - name: push merge to repo
+    depends_on: ["clone"]
+    image: appleboy/drone-git-push
+    settings:
+      branch: dev
+      commit: false
+      remote: git@git.odit.services:lfk/document-server.git
+      ssh_key:
+        from_secret: git_ssh
 
 trigger:
   branch:
@@ -101,23 +137,18 @@ name: build:tags
 
 steps:
   - name: build $DRONE_TAG
-    depends_on: ["clone"]
+    image: plugins/docker
-    image: registry.odit.services/library/drone-kaniko
+    depends_on: [clone]
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      build_args:
+      repo: registry.odit.services/lfk/document-server
-        - NPM_REGISTRY_DOMAIN:
-          from_secret: npmjs_domain
-        - NPM_REGISTRY_TOKEN:
-          from_secret: npmjs_token
-      repo: lfk/document-server
       tags:
-        - "${DRONE_TAG}"
+        - '${DRONE_TAG}'
-      cache: true
       registry: registry.odit.services
+      mtu: 1000
 trigger:
   event:
   - tag

CHANGELOG.md

@@ -2,47 +2,8 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [v0.6.0](https://git.odit.services/lfk/document-server/compare/v0.5.1...v0.6.0)
-
-- Merge branch 'bugfix/44-runner-certificates-result-in-a-status-500' into dev [`#44`](https://git.odit.services/lfk/document-server/issues/44)
-- Lockfile [`b47b2f8`](https://git.odit.services/lfk/document-server/commit/b47b2f804f5419bff6f0cddbc1dbc12d29afd935)
-- Fixed Locale comma format [`2a33226`](https://git.odit.services/lfk/document-server/commit/2a3322612d473bd9002cf8d6f9807f9dc7d687da)
-- Added autochangelog [`d064b51`](https://git.odit.services/lfk/document-server/commit/d064b51e1b3e00d9c49b1e983bd75def6d8512be)
-- Moved drone to kaniko [`744f567`](https://git.odit.services/lfk/document-server/commit/744f567b7cc7fcbe916143bb98f1dd784fe794da)
-- Updated translation due to customer request [`517e8a0`](https://git.odit.services/lfk/document-server/commit/517e8a081970b9ce4f6f225a7f9b5b54cca1258e)
-- Bumped docker images [`05e0c63`](https://git.odit.services/lfk/document-server/commit/05e0c639319a2a635bbcf0f5f6bd08d6a46dce74)
-- wrap distanceDonations.reduce in array length check [`bac004d`](https://git.odit.services/lfk/document-server/commit/bac004d74eb954d1753d4efcdb927822b89fa757)
-- Nerf [`7dbce9e`](https://git.odit.services/lfk/document-server/commit/7dbce9e87046567de1ea46deaea427a5353057b3)
-- Version pin [`6add09c`](https://git.odit.services/lfk/document-server/commit/6add09c7df6872b6922f6624ee89b4a04ad6fc0a)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`300b8fd`](https://git.odit.services/lfk/document-server/commit/300b8fd01a0b601935c3658b195759dd19041c5f)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`ff0421d`](https://git.odit.services/lfk/document-server/commit/ff0421da2f16a8f79f9987dabea7bdcb4ef88c05)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`fcbcec8`](https://git.odit.services/lfk/document-server/commit/fcbcec85c531d774be1337f179dae2aa1d5f3839)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`b78534e`](https://git.odit.services/lfk/document-server/commit/b78534e1b0165522ff0ee1dfd110d8ba78f183d8)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`5e92b9a`](https://git.odit.services/lfk/document-server/commit/5e92b9a48fcbb8ab6a179c53f180a7a6bd743ae7)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`dca2829`](https://git.odit.services/lfk/document-server/commit/dca2829323f3a19247455df99498633605d09603)
-- Fixed decimal separator in docker [`c9cb03e`](https://git.odit.services/lfk/document-server/commit/c9cb03ea95acccd6cdc8b86c747c787938840d07)
-- Fix for runner donation array [`72303b1`](https://git.odit.services/lfk/document-server/commit/72303b11052276ad15373887f9e04183841f56f4)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`573b921`](https://git.odit.services/lfk/document-server/commit/573b9211972a55df0a38742cb6eb789d6fd3717b)
-- Added image [`5f4fc74`](https://git.odit.services/lfk/document-server/commit/5f4fc74cd9ff6764d209d49822020cda70b3514e)
-- 🚀Bumped version to v0.6.0 [`72ed249`](https://git.odit.services/lfk/document-server/commit/72ed2495f6feb90643d3c9d7fa943a2703533331)
-- Changed default kilometer formatting to min 2 decimals, max 3 [`3af4b52`](https://git.odit.services/lfk/document-server/commit/3af4b521d302e3aab558d20f1fccca57ea61fff3)
-- Merge pull request 'Fixed decimal separator' (#47) from dev into main [`57a84c2`](https://git.odit.services/lfk/document-server/commit/57a84c256a978f583508bdf772499466a73b4a22)
-- 🚀Bumped version to v0.5.4 [`4b5a862`](https://git.odit.services/lfk/document-server/commit/4b5a86282d0618a0c5b00fc796efe77db2103356)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`c7f5754`](https://git.odit.services/lfk/document-server/commit/c7f57548f316e1bb6635bd56bd269d80ac1e220f)
-- Merge pull request 'Hotfixes' (#46) from dev into main [`8d00307`](https://git.odit.services/lfk/document-server/commit/8d003071704b5a6d7b0d70aff2f9cb05c3660b78)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`f846572`](https://git.odit.services/lfk/document-server/commit/f8465721cddfb55d51eb30d29d74ef63d825b5ac)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`451b7fb`](https://git.odit.services/lfk/document-server/commit/451b7fbe0543991e8a203e38daa350a954ae0e11)
-- 🚀Bumped version to v0.5.3 [`01e1323`](https://git.odit.services/lfk/document-server/commit/01e1323555fe67f6f0ce3c18163e475035bd1cdd)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`4b4d66a`](https://git.odit.services/lfk/document-server/commit/4b4d66ae784150f7e1cc491a3fc5d84c93273aee)
-- Merge pull request 'v0.5.2: hotfix TypeError in Runner Certificate generation' (#45) from dev into main [`c935950`](https://git.odit.services/lfk/document-server/commit/c935950eb052bce71185fc74c750ec77f081e7df)
-- 🚀Bumped version to v0.5.2 [`274c13e`](https://git.odit.services/lfk/document-server/commit/274c13e358f16207fe8bb5cdc1b9ede0582ecb46)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`b7b7f6a`](https://git.odit.services/lfk/document-server/commit/b7b7f6a0ae304d24f90a3de3931f53cf08770060)
-
 #### [v0.5.1](https://git.odit.services/lfk/document-server/compare/v0.5.0...v0.5.1)
 
-> 22 April 2021
-
-- Merge pull request 'Release 0.5.1' (#43) from dev into main [`11efdeb`](https://git.odit.services/lfk/document-server/commit/11efdebacf076ecfe0e10cdcda37ac07464901ce)
 - Quick callstack fix🛠 [`76418f6`](https://git.odit.services/lfk/document-server/commit/76418f65e1e111e83838f0d42c541ae6a8063a09)
 - Fixed barcode generation for runenrcard pdfs🐞 [`f78037c`](https://git.odit.services/lfk/document-server/commit/f78037c0f15162d5b98986edf20d263961f43e69)
 - Updated docker-compose example🐳 [`a4c8dad`](https://git.odit.services/lfk/document-server/commit/a4c8dade23e448d4d4caefe304a6cd9195c873a4)
@@ -51,7 +12,6 @@ All notable changes to this project will be documented in this file. Dates are d
 - 🧾New changelog file version [CI SKIP] [skip ci] [`2ee4c06`](https://git.odit.services/lfk/document-server/commit/2ee4c060557a44db1974a015412288f7942ebe72)
 - more typo fixes [`981bae4`](https://git.odit.services/lfk/document-server/commit/981bae4786a2fa12a1355122e8c5a1e95e29cf32)
 - You can now configure the card's code format distinct from the others [`ac9be79`](https://git.odit.services/lfk/document-server/commit/ac9be793bd598771174f5313ef8288240306ba5c)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`0f2d6f5`](https://git.odit.services/lfk/document-server/commit/0f2d6f58d6a8a8888263778cf1a14c73b28e774e)
 - 🚀Bumped version to v0.5.1 [`22fb3ed`](https://git.odit.services/lfk/document-server/commit/22fb3edd7836ba4ca35e6b208ab6f6620da60f4a)
 - Emoji+Chinese fixes🌍 [`b6fc069`](https://git.odit.services/lfk/document-server/commit/b6fc069042dc9c5d7ec97f2660568e8e105780b9)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`cc4a2b4`](https://git.odit.services/lfk/document-server/commit/cc4a2b4ab4c2cb9976797f93e8348607fb88ea7d)

Dockerfile

@@ -1,5 +1,5 @@
 # Typescript Build
-FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16
+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/hub/library/alpine:3.16
+FROM registry.odit.services/hub/library/alpine:3.13.1
 WORKDIR /app
 RUN apk add --no-cache \
       chromium \

docker-compose.yml

@@ -1,7 +1,6 @@
 version: "3"
 services:
   document_server:
-    # image: registry.odit.services/lfk/beamershow:0.1.3
     build: .
     ports:
       - 4010:4010

licenses.md

@@ -848,35 +848,6 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     SOFTWARE
  
 
-# auto-changelog
-**Author**: Pete Cook <pete@cookpete.com> (https://github.com/cookpete)
-**Repo**: https://github.com/CookPete/auto-changelog
-**License**: MIT
-**Description**: Command line tool for generating a changelog from git tags and commit history
-## License Text
-The MIT License
-
-Copyright (c) 2017 Pete Cook https://cookpete.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
- 
-
 # cp-cli
 **Author**: ?
 **Repo**: https://github.com/screendriver/cp-cli

package.json

@@ -1,13 +1,12 @@
 {
   "name": "@odit/lfk-document-server",
-  "version": "0.6.0",
+  "version": "0.5.1",
   "description": "The document generation server for the LfK! runner system. This generates certificates, sponsoring aggreements and more",
   "main": "src/app.ts",
   "scripts": {
     "dev": "nodemon src/app.ts",
     "build": "rimraf ./dist && tsc && cp-cli ./src/templates ./dist/templates && cp-cli ./src/locales ./dist/locales",
     "licenses:export": "license-exporter --markdown",
-    "changelog:export": "auto-changelog --commit-limit false -p -u --hide-credit",
     "release": "release-it --only-version",
     "translations:sort": "node sort_translations.js"
   },
@@ -66,11 +65,10 @@
     "@types/express": "4.17.11",
     "@types/node": "14.14.22",
     "@types/puppeteer": "5.4.3",
-    "auto-changelog": "^2.4.0",
     "cp-cli": "2.0.0",
     "faker": "5.3.1",
     "nodemon": "2.0.7",
-    "release-it": "14.2.2",
+    "release-it": "^14.2.2",
     "rimraf": "3.0.2",
     "start-server-and-test": "1.12.0",
     "ts-node": "9.1.1",
@@ -82,16 +80,11 @@
       "requireCleanWorkingDir": false,
       "commitMessage": "🚀Bumped version to v${version}",
       "requireBranch": "dev",
-      "push": true,
+      "push": false,
-      "tag": true,
+      "tag": false
-      "tagName": "v${version}",
-      "tagAnnotation": "v${version}"
     },
     "npm": {
       "publish": false
-    },
-    "hooks": {
-      "after:bump": "npm run changelog:export && npm run licenses:export && git add CHANGELOG.md && git add licenses.md"
     }
   }
 }

src/PdfCreator.ts

@@ -101,13 +101,13 @@ export class PdfCreator {
         await Handlebars.registerHelper('--format_kilometers',
             function (str) {
                 let meters = parseInt(str);
-                return ((meters / 1000).toLocaleString("en-EN", { minimumFractionDigits: 2, maximumFractionDigits: 3 }).replace(".", ","));
+                return ((meters / 1000).toFixed(3).toString())
             }
         );
         await Handlebars.registerHelper('--format_currency',
             function (str) {
                 let meters = parseInt(str);
-                return ((meters / 100).toLocaleString("en-EN", { minimumFractionDigits: 2, maximumFractionDigits: 2 }).replace(".", ","));
+                return ((meters / 100).toFixed(2).toString())
             }
         );
         this.browser = await puppeteer.launch({ headless: true, args: minimal_args });

src/controllers/PdfController.ts

@@ -97,21 +97,12 @@ export class PdfController {
             else {
                 runner.group.fullName = `${runner.group.parentGroup.name}/${runner.group.name}`;
             }
-            runner.donationPerDistanceTotal = 0;
+            runner.donationPerDistanceTotal = runner.distanceDonations.reduce(function (sum, current) {
-            if (!Array.isArray(runner.distanceDonations)){
-                runner.distanceDonations = [].concat(runner.distanceDonations)
-            }
-            if (runner.distanceDonations.length > 0) {
-                runner.donationPerDistanceTotal += runner.distanceDonations.reduce(function (sum, current) {
                 return sum + current.amountPerDistance;
             }, 0);
-            }
+            runner.donationTotal = runner.distanceDonations.reduce(function (sum, current) {
-            runner.donationTotal = 0;
-            if (runner.distanceDonations.length > 0) {
-                runner.donationTotal += runner.distanceDonations.reduce(function (sum, current) {
                 return sum + current.amount;
             }, 0);
-            }
             response.push(runner)
         }
         return response;

src/locales/de.json

@@ -4,11 +4,11 @@
     "city": "Stadt",
     "date": "Datum",
     "firstname": "Vorname",
-    "fuer-den-guten-zweck-zurueckgelegt": "für den guten Zweck zurückgelegt.",
+    "fuer-den-guten-zweck-zurueckgelegt": "für den guten Zweck zurückgelegt",
     "gesamt": "Gesamt",
     "gesamtbetrag": "Gesamtbetrag",
     "group": "Team/ Klasse",
-    "hat-beim-eventname": "hat beim {{eventname}}",
+    "hat-beim-eventname": "Hat beim {{eventname}}",
     "house_number": "Hausnummer",
     "id": "ID",
     "lastname": "Nachname",