Update vocho-lib, bump patch version to 1.5.0, port changes from voch…

…o-gui 1.3.0
tejoesperanto · Aug 15, 2019 · 3292299 · 3292299
1 parent 28b0985
commit 3292299
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vocho-term",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/calc.js b/src/calc.js
@@ -42,7 +42,8 @@ module.exports = function performElection (electionType, candidatesStr, ballotsS
 
 		if (electionType === 'RP') {
 			if (results.disqualifiedCandidates.length) {
-				resultsText += `\n\nNeelektitaj laŭ §2.6: ${results.disqualifiedCandidates.join(', ')}\n`;
+				const disc_cands = results.disqualifiedCandidates.map(c => `${c} (${results.candStats[c].mentions} mencioj)`);
+				resultsText += `\n\nNeelektitaj laŭ §2.6: ${disc_cands.join(', ')}\n`;
 			}
 
 			const comparedPairsTableData = [[]];