From 89507fb916a02db6af4426bf63a160c9b6f9f0b4 Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Tue, 26 Jan 2021 04:11:44 +1100
Subject: [PATCH] BLT editor: Tweak workflow

Start on candidate entry screen
Go to candidate entry screen when loading file
---
 html/blt/index.html | 12 +++++++-----
 html/blt/index.js   | 17 ++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/html/blt/index.html b/html/blt/index.html
index f0c5a33..1b8f6a1 100644
--- a/html/blt/index.html
+++ b/html/blt/index.html
@@ -34,7 +34,7 @@
 			<a href="https://yingtongli.me/blog/2020/12/24/pyrcv2.html">Information and instructions</a>
 		</div>
 		
-		<div id="bltMain">
+		<div id="bltMain" style="display: none;">
 			<select id="selBallots" size="20" onchange="changeBallot()">
 				<option value="new" selected>-- New Ballot --</option>
 			</select>
@@ -44,15 +44,17 @@
 					Ballot value: <input id="txtBallotValue" type="number" value="1" min="1" style="width: 3em;">
 				</div>
 				<table id="tblBallot"></table>
-				<button onclick="clickSave()">Save and advance to next ballot</button>
+				<button onclick="clickSave()">Save and advance to next ballot (Enter)</button>
 			</div>
 		</div>
 		
-		<div id="divEditCandidates" style="display: none;">
+		<div id="divEditCandidates">
 			<div>Enter the candidates' names, one per line:</div>
-			<div><textarea id="txtCandidates"></textarea></div>
+			<div><textarea id="txtCandidates">Candidate 1
+Candidate 2
+Candidate 3</textarea></div>
 			<div><button onclick="clickSaveCandidates()">Save candidates</button></div>
-			<div>Warning: Adding, removing or reordering candidates once ballots have been input may result in unexpected behaviour.</div>
+			<div><b>Warning:</b> Adding, removing or reordering candidates once ballots have been input may result in unexpected behaviour.</div>
 		</div>
 		
 		<script src="../bundle.js?v=GITVERSION"></script>
diff --git a/html/blt/index.js b/html/blt/index.js
index 90ddf42..b13991e 100644
--- a/html/blt/index.js
+++ b/html/blt/index.js
@@ -16,7 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-let candidates = ['Candidate 1', 'Candidate 2', 'Candidate 3'];
+let candidates = [];
 let ballots = [];
 
 let inpFile = document.getElementById('inpFile');
@@ -160,9 +160,13 @@ async function changeInpFile() {
 			}
 		}
 		
+		// Go to ballot entry screen
+		document.getElementById('bltMain').style.display = '';
+		document.getElementById('divEditCandidates').style.display = 'none';
+		
 		// Update ballot entry
 		initBallot();
-			
+		
 		// Update ballot list
 		selBallots.innerHTML = '<option value="new" selected>-- New Ballot --</option>';
 		selBallots.value = 'new';
@@ -247,7 +251,7 @@ function clickExportBLT() {
 
 function clickEditCandidates() {
 	document.getElementById('bltMain').style.display = 'none';
-	document.getElementById('divEditCandidates').style.display = 'block';
+	document.getElementById('divEditCandidates').style.display = '';
 	document.getElementById('txtCandidates').value = candidates.join('\n');
 }
 
@@ -263,11 +267,6 @@ function clickSaveCandidates() {
 	initBallot();
 	changeBallot();
 	
-	document.getElementById('bltMain').style.display = 'flex';
+	document.getElementById('bltMain').style.display = '';
 	document.getElementById('divEditCandidates').style.display = 'none';
 }
-
-// Init tasks
-
-initBallot();
-changeBallot();