RunasSudo/Eos
1
Fork 0
Code Issues Pull Requests Activity

Use drop-down boxes for preferential voting #8

Browse Source
This commit is contained in:
Yingtong Li 2018-01-08 14:05:13 +08:00
parent dc69062910
commit e6d37b73f8
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eosweb/core/static/css/main.css
View File

@ -1,6 +1,6 @@
/* /*
Eos - Verifiable elections Eos - Verifiable elections
Copyright © 2017 RunasSudo (Yingtong Li) Copyright © 2017-18 RunasSudo (Yingtong Li)
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as published by
@ -118,12 +118,15 @@ time[title] {
padding: 0.5em 0 0.5em 0.5em; padding: 0.5em 0 0.5em 0.5em;
} }
.ticket-choices .number, .ticket-choices .content { .ticket-choices .number {
padding: 0;
}
.ticket-choices .content {
padding: 0 0 0 0.5em; padding: 0 0 0 0.5em;
} }
.preferential-choice .number { .preferential-choice .number {
width: 2em;
text-align: center; text-align: center;
} }

37
eosweb/core/static/nunjucks/question/preferential/selections_make.html
View File

@ -1,6 +1,6 @@
{# {#
Eos - Verifiable elections Eos - Verifiable elections
Copyright © 2017 RunasSudo (Yingtong Li) Copyright © 2017-18 RunasSudo (Yingtong Li)
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as published by
@ -46,7 +46,14 @@
{% macro printchoice(choice, ticket=None) %} {% macro printchoice(choice, ticket=None) %}
<div class="preferential-choice" data-choiceno="{{ flat_choices.indexOf(choice) }}"> <div class="preferential-choice" data-choiceno="{{ flat_choices.indexOf(choice) }}">
<div class="number"></div> <div class="number">
<select>
<option selected></option>
{% for i in range(flat_choices|length) %}
<option>{{ i + 1 }}</option>
{% endfor %}
</select>
</div>
<div class="content"> <div class="content">
<div class="candidate-name">{{ choice.name }}</div> <div class="candidate-name">{{ choice.name }}</div>
{% if choice.party %} {% if choice.party %}
@ -70,7 +77,14 @@
{% if choice.choices %} {% if choice.choices %}
{# Ticket #} {# Ticket #}
<div class="preferential-choice ticket"> <div class="preferential-choice ticket">
<div class="number"></div> <div class="number">
<select>
<option selected></option>
{% for i in range(flat_choices|length) %}
<option>{{ i + 1 }}</option>
{% endfor %}
</select>
</div>
<div class="content"> <div class="content">
<div class="party-name">{{ choice.name }}</div> <div class="party-name">{{ choice.name }}</div>
<div class="ticket-choices"> <div class="ticket-choices">
@ -93,18 +107,20 @@
function choicesChanged() { function choicesChanged() {
// Recalculate numbers // Recalculate numbers
$(".preferential-choices .preferential-choice .number").each(function(i, el) { $(".preferential-choices .preferential-choice .number select").each(function(i, el) {
$(el).text(""); $(el).val("");
}); });
var selectedChoices = $("#question-choices-selected .dragarea > .preferential-choice > .number"); var selectedChoices = $("#question-choices-selected .dragarea > .preferential-choice > .number select");
selectedChoices.each(function(i, el) { selectedChoices.each(function(i, el) {
$(el).text(i + 1); $(el).val(i + 1);
}); });
var selectedCandidates = $("#question-choices-selected .preferential-choice:not(.ticket) .number"); var selectedCandidates = $("#question-choices-selected .preferential-choice:not(.ticket) .number select");
if (selectedCandidates.length >= election.questions.__getitem__(booth.questionNum).max_choices) { if (selectedCandidates.length >= election.questions.__getitem__(booth.questionNum).max_choices) {
// Prevent making any more selections // Prevent making any more selections
allowAdding = false; allowAdding = false;
$("#question-choices-remaining .preferential-choice .number select").prop("disabled", true);
if (selectedCandidates.length > election.questions.__getitem__(booth.questionNum).max_choices) { if (selectedCandidates.length > election.questions.__getitem__(booth.questionNum).max_choices) {
// Prevent progression // Prevent progression
$(".primary.button").addClass("disabled"); $(".primary.button").addClass("disabled");
@ -115,9 +131,12 @@
} }
} else { } else {
allowAdding = true; allowAdding = true;
$("#question-choices-remaining .preferential-choice .number select").prop("disabled", false);
$(".primary.button").removeClass("disabled");
$("#message-max-choices").addClass("hidden"); $("#message-max-choices").addClass("hidden");
$("#message-too-many-choices").addClass("hidden"); $("#message-too-many-choices").addClass("hidden");
$(".primary.button").removeClass("disabled");
} }
} }