Backport changes from vocho-gui

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vocho-term",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -17,8 +17,10 @@
     "eslint": "^5.16.0"
   },
   "dependencies": {
+    "ansi-styles": "^4.0.0",
     "blessed": "git+https://github.com/CreativeCactus/blessed.git",
     "editor-widget": "^1.1.1",
+    "table": "^5.4.0",
     "vocho-lib": "git+https://github.com/tejoesperanto/vocho-lib.git"
   }
 }

src/calc.js

@@ -1,4 +1,6 @@
 const lib = require('vocho-lib');
+const table = require('table').table;
+const style = require('ansi-styles');
 
 const commaSeparatedRegex = /[^\s,]/g;
 
@@ -15,7 +17,7 @@ module.exports = function performElection (electionType, candidatesStr, ballotsS
 	const ballots = ballotsStr
 		.trim()
 		.split(/\r?\n/g)
-		.map(b => b.trim())
+		.map(b => b.replace(/\s/g, ''))
 		.filter(b => b.length)
 		.map(b => {
 			if (b === 'blanka') { b = ''; }
@@ -24,26 +26,76 @@ module.exports = function performElection (electionType, candidatesStr, ballotsS
 
 	global.disableDebug = true;
 	try {
+		let results;
+
 		if (electionType === 'RP') {
-			const results = lib.RankedPairs([...candidates], ballots, ignoredCandidates, tieBreaker);
+			results = lib.RankedPairs([...candidates], ballots, ignoredCandidates, tieBreaker);
+		} else if (electionType === 'STV') {
+			results = lib.STV(places, [...candidates], ballots, ignoredCandidates, tieBreaker);
+		}
+
+		let resultsText = `${results.ballots} balotiloj kalkulitaj, ${results.blankBallots} blanka(j)`;
+
+		if (ignoredCandidates.length) {
+			resultsText += `\n\nIgnorataj kandidatoj: ${ignoredCandidates.join(', ')}`;
+		}
 
-			let resultsStr = `${results.ballots} balotiloj (${results.blankBallots} blanka(j))\n`;
+		if (electionType === 'RP') {
 			if (results.disqualifiedCandidates.length) {
-				resultsStr += `Neelektitaj laŭ §2.6: ${results.disqualifiedCandidates.join(', ')}\n`;
+				resultsText += `\n\nNeelektitaj laŭ §2.6: ${results.disqualifiedCandidates.join(', ')}\n`;
+			}
+
+			const comparedPairsTableData = [[]];
+			for (let th of [ 'Paro', 'Gajnanto', 'Diferenco' ]) {
+				comparedPairsTableData[0].push(`${style.bold.open}${th}${style.bold.close}`);
+			}
+
+			for (let [pairName, pair] of results.rankedPairs) {
+				const cand1 = pairName[0];
+				const cand2 = pairName[1];
+
+				comparedPairsTableData.push([
+					`${cand1} (${pair[cand1]}) kontraŭ ${cand2} (${pair[cand2]})`,
+					pair['winner'],
+					Math.abs(pair['diff'])
+				]);
 			}
-			resultsStr += `Venkinto: ${results.winner}`;
-			return resultsStr;
 
+			resultsText += '\n\nKomparitaj paroj:\n' + table(comparedPairsTableData);
+
+			const graphTableData = [[]];
+			for (let th of [ 'De', 'Al' ]) {
+				graphTableData[0].push(`${style.bold.open}${th}${style.bold.close}`);
+			}
+
+			for (let [from, to] of Object.entries(results.graph)) {
+				graphTableData.push([
+					from, to.join(', ')
+				]);
+			}
+
+			resultsText += '\n\nGrafeo:\n' + table(graphTableData);
+
+			resultsText += `\n\nVenkinto: ${results.winner}`;
 		} else if (electionType === 'STV') {
-			const results = lib.STV(places, [...candidates], ballots, ignoredCandidates, tieBreaker);
-
-			const resultsStr =
-`${results.ballots} balotiloj (${results.blankBallots} blanka(j))
-Venkintoj (laŭ ordo de elektiĝo): ${results.winners.join(', ')}`;
-			return resultsStr;
-		} else {
-			throw new Error(`Nekonata voĉdonsistemo ${electionType}`);
+			resultsText += `\nElektiĝkvoto: ${results.quota.toFixed(3)}`;
+
+			for (let i = 0; i < results.rounds.length; i++) {
+				const round = results.rounds[i];
+
+				resultsText += `\n\n${style.bold.open}Vico ${i + 1}${style.bold.close}`;
+
+				if (round.elected.length) {
+					resultsText += `\nElektitaj: ${round.elected.join(', ')}`;
+				} else if (round.eliminated) {
+					resultsText += '\nMalelektita: ' + round.eliminated;
+				}
+			}
+
+			resultsText += '\n\nVenkintoj (laŭ ordo de elektiĝo):\n' + results.winners.join(', ');
 		}
+
+		return resultsText;
 	} catch (e) {
 		if (!e || !('type' in e)) { throw e; }
 		switch (e.type) {

src/main-box.js

@@ -140,6 +140,7 @@ module.exports = function setUpMainBox (mainBox, prompt) {
 		width: '50%',
 		border: 'line',
 		scrollable: true,
+		mouse: true,
 		content: defaultResultsValue
 	});
 
@@ -237,9 +238,9 @@ module.exports = function setUpMainBox (mainBox, prompt) {
 				prompt.setLabel('Necesas egalecrompanto!');
 				let promptText = 'La egalecrompanto mem enskribu sian balotilon ĉi-sube.';
 				if (currentElectionType === 'RP') {
-					promptText += '\nEkz. A=B>C>D=E';
+					promptText += '\nEkz. A>B>D>C';
 				} else if (currentElectionType === 'STV') {
-					promptText += '\nEkz. ABCDEF';
+					promptText += '\nEkz. ABCD';
 				}
 				promptText += '\nValidaj kandidatoj:\n' + e.candidates.join(', ') + '\n';