From b7b7f6a0ae304d24f90a3de3931f53cf08770060 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 22 Apr 2021 16:16:50 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=A7=BENew=20changelog=20file=20versio?= =?UTF-8?q?n=20[CI=20SKIP]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d81afdc..8c6e9a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file. Dates are d #### [v0.5.1](https://git.odit.services/lfk/document-server/compare/v0.5.0...v0.5.1) +- 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) @@ -12,6 +13,7 @@ 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) From bac004d74eb954d1753d4efcdb927822b89fa757 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 4 Jul 2021 13:32:53 +0200 Subject: [PATCH 2/5] wrap distanceDonations.reduce in array length check ref #44 --- src/controllers/PdfController.ts | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/controllers/PdfController.ts b/src/controllers/PdfController.ts index a18bcf5..f6d8a52 100644 --- a/src/controllers/PdfController.ts +++ b/src/controllers/PdfController.ts @@ -97,12 +97,19 @@ export class PdfController { else { runner.group.fullName = `${runner.group.parentGroup.name}/${runner.group.name}`; } - runner.donationPerDistanceTotal = runner.distanceDonations.reduce(function (sum, current) { - return sum + current.amountPerDistance; - }, 0); - runner.donationTotal = runner.distanceDonations.reduce(function (sum, current) { - return sum + current.amount; - }, 0); + runner.donationPerDistanceTotal = 0; + if (runner.distanceDonations.length > 0) { + console.log(typeof runner.distanceDonations); + runner.donationPerDistanceTotal += runner.distanceDonations.reduce(function (sum, current) { + return sum + current.amountPerDistance; + }, 0); + } + 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; From ff0421da2f16a8f79f9987dabea7bdcb4ef88c05 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 4 Jul 2021 11:34:41 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=A7=BENew=20changelog=20file=20versio?= =?UTF-8?q?n=20[CI=20SKIP]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c6e9a4..542ae28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,16 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [v0.5.1](https://git.odit.services/lfk/document-server/compare/v0.5.1...v0.5.1) + +- Merge branch 'bugfix/44-runner-certificates-result-in-a-status-500' into dev [`#44`](https://git.odit.services/lfk/document-server/issues/44) +- wrap distanceDonations.reduce in array length check [`bac004d`](https://git.odit.services/lfk/document-server/commit/bac004d74eb954d1753d4efcdb927822b89fa757) +- 🧾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) From 274c13e358f16207fe8bb5cdc1b9ede0582ecb46 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 4 Jul 2021 13:39:06 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=9A=80Bumped=20version=20to=20v0.5.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eba1026..025141c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@odit/lfk-document-server", - "version": "0.5.1", + "version": "0.5.2", "description": "The document generation server for the LfK! runner system. This generates certificates, sponsoring aggreements and more", "main": "src/app.ts", "scripts": { From 573b9211972a55df0a38742cb6eb789d6fd3717b Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 4 Jul 2021 11:40:08 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=A7=BENew=20changelog=20file=20versio?= =?UTF-8?q?n=20[CI=20SKIP]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 542ae28..0b25c85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,12 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. -#### [v0.5.1](https://git.odit.services/lfk/document-server/compare/v0.5.1...v0.5.1) +#### [v0.5.2](https://git.odit.services/lfk/document-server/compare/v0.5.1...v0.5.2) - Merge branch 'bugfix/44-runner-certificates-result-in-a-status-500' into dev [`#44`](https://git.odit.services/lfk/document-server/issues/44) - wrap distanceDonations.reduce in array length check [`bac004d`](https://git.odit.services/lfk/document-server/commit/bac004d74eb954d1753d4efcdb927822b89fa757) +- 🧾New changelog file version [CI SKIP] [skip ci] [`ff0421d`](https://git.odit.services/lfk/document-server/commit/ff0421da2f16a8f79f9987dabea7bdcb4ef88c05) +- 🚀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)