RunasSudo
/
pyRCV2
Archived
1
Fork 0
Code Issues Pull Requests Activity

Ditto

This commit is contained in:
RunasSudo 2021-01-05 21:07:40 +11:00
parent a0913c2d33
commit 4dd5ec41f9
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
3 changed files with 134 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
html/index.html
View File

@ -44,7 +44,8 @@
</div> </div>
<div id="divAdvancedOptions" class="menudiv" style="display: none;"> <div id="divAdvancedOptions" class="menudiv" style="display: none;">
<label class="padafter"> <div class="col-6">
<label>
Numbers: Numbers:
<select id="selNumbers"> <select id="selNumbers">
<option value="native">Native</option> <option value="native">Native</option>
@ -56,7 +57,17 @@
Decimal places (if Numbers = Fixed): Decimal places (if Numbers = Fixed):
<input type="number" id="txtDP" value="5" style="width: 3em;"> <input type="number" id="txtDP" value="5" style="width: 3em;">
</label> </label>
<br> </div>
<label class="col-3">
<input type="checkbox" id="chkBulkElection" checked>
Bulk election
</label>
<label class="col-3">
<input type="checkbox" id="chkBulkExclusion">
Bulk exclusion
</label>
<!-- Row -->
<div class="col-6">
<label> <label>
Quota: Quota:
<select id="selQuotaCriterion"> <select id="selQuotaCriterion">
@ -72,60 +83,21 @@
<option value="hare_exact">Hare (exact)</option> <option value="hare_exact">Hare (exact)</option>
</select> </select>
</label> </label>
<label class="padafter"> <label>
<select id="selQuotaMode"> <select id="selQuotaMode">
<option value="static" selected>Static quota</option> <option value="static" selected>Static quota</option>
<option value="progressive">Progressive quota</option> <option value="progressive">Progressive quota</option>
<option value="ers97">Static with ERS97 rules</option> <option value="ers97">Static with ERS97 rules</option>
</select> </select>
</label> </label>
<label class="padafter"> </div>
<input type="checkbox" id="chkBulkElection" checked> <label class="col-6">
Bulk election
</label>
<label class="padafter">
<input type="checkbox" id="chkBulkExclusion">
Bulk exclusion
</label>
<label class="padafter">
<input type="checkbox" id="chkDeferSurpluses"> <input type="checkbox" id="chkDeferSurpluses">
Defer surpluses Defer surpluses
</label> </label>
<br> <!-- Row -->
<div class="col-6">
<label> <label>
<input type="checkbox" id="chkRoundQuota" checked>
Round quota to
</label>
<label class="padafter">
<input type="number" id="txtRoundQuota" value="0" min="0" style="width: 3em;">
d.p.
</label>
<label>
<input type="checkbox" id="chkRoundVotes">
Round votes to
</label>
<label class="padafter">
<input type="number" id="txtRoundVotes" value="0" min="0" style="width: 3em;">
d.p.
</label>
<label>
<input type="checkbox" id="chkRoundTVs">
Round transfer values to
</label>
<label class="padafter">
<input type="number" id="txtRoundTVs" value="0" min="0" style="width: 3em;">
d.p.
</label>
<label>
<input type="checkbox" id="chkRoundWeights">
Round ballot weights to
</label>
<label>
<input type="number" id="txtRoundWeights" value="0" min="0" style="width: 3em;">
d.p.
</label>
<br>
<label class="padafter">
Surplus order: Surplus order:
<select id="selSurplus"> <select id="selSurplus">
<option value="size" selected>By size</option> <option value="size" selected>By size</option>
@ -141,13 +113,35 @@
<option value="wright">Wright STV</option> <option value="wright">Wright STV</option>
</select> </select>
</label> </label>
<label class="padafter"> <label>
<select id="selPapers"> <select id="selPapers">
<option value="both" selected>Include non-transferable papers</option> <option value="both" selected>Include non-transferable papers</option>
<option value="transferable">Use transferable papers only</option> <option value="transferable">Use transferable papers only</option>
</select> </select>
</label> </label>
</div>
<div class="col-3">
<label> <label>
<input type="checkbox" id="chkRoundQuota" checked>
Round quota to
</label>
<label>
<input type="number" id="txtRoundQuota" value="0" min="0" style="width: 3em;">
d.p.
</label>
</div>
<div class="col-3">
<label>
<input type="checkbox" id="chkRoundVotes">
Round votes to
</label>
<label>
<input type="number" id="txtRoundVotes" value="0" min="0" style="width: 3em;">
d.p.
</label>
</div>
<!-- Row -->
<label class="col-6">
Exclusion: Exclusion:
<select id="selExclusion"> <select id="selExclusion">
<option value="one_round" selected>Exclude in one round</option> <option value="one_round" selected>Exclude in one round</option>
@ -157,8 +151,29 @@
<option value="wright">Wright method (re-iterate)</option> <option value="wright">Wright method (re-iterate)</option>
</select> </select>
</label> </label>
<br> <div class="col-3">
<label class="padafter"> <label>
<input type="checkbox" id="chkRoundTVs">
Round transfer values to
</label>
<label>
<input type="number" id="txtRoundTVs" value="0" min="0" style="width: 3em;">
d.p.
</label>
</div>
<div class="col-3">
<label>
<input type="checkbox" id="chkRoundWeights">
Round ballot weights to
</label>
<label>
<input type="number" id="txtRoundWeights" value="0" min="0" style="width: 3em;">
d.p.
</label>
</div>
<!-- Row -->
<div class="col-6">
<label>
Ties: Ties:
<select id="selTies"> <select id="selTies">
<option value="backwards_random" selected>Backwards then random</option> <option value="backwards_random" selected>Backwards then random</option>
@ -172,6 +187,7 @@
<input type="text" id="txtSeed" value=""> <input type="text" id="txtSeed" value="">
</label> </label>
</div> </div>
</div>
<table id="result"></table> <table id="result"></table>

2
html/index.js
View File

@ -18,7 +18,7 @@
function clickAdvancedOptions() { function clickAdvancedOptions() {
if (document.getElementById('divAdvancedOptions').style.display === 'none') { if (document.getElementById('divAdvancedOptions').style.display === 'none') {
document.getElementById('divAdvancedOptions').style.display = 'block'; document.getElementById('divAdvancedOptions').style.display = 'grid';
document.getElementById('btnAdvancedOptions').innerHTML = 'Hide advanced options'; document.getElementById('btnAdvancedOptions').innerHTML = 'Hide advanced options';
} else { } else {
document.getElementById('divAdvancedOptions').style.display = 'none'; document.getElementById('divAdvancedOptions').style.display = 'none';

11
html/main.css
View File

@ -33,6 +33,14 @@ body {
padding-bottom: 0.5em; padding-bottom: 0.5em;
} }
#divAdvancedOptions {
display: grid;
grid-template-columns: repeat(12, 1fr);
}
.col-3 { grid-column-end: span 3; }
.col-6 { grid-column-end: span 6; }
/* Count table */ /* Count table */
table { table {
@ -145,6 +153,3 @@ select:focus, input:focus {
label { label {
white-space: nowrap; white-space: nowrap;
} }
label.padafter {
margin-right: 1.5em;
}