Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/priority voting visualization #76

Merged
merged 7 commits into from
Dec 19, 2023
Merged

Feature/priority voting visualization #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8adccb
feat: priority voting visualization (not working properly)
MartaInes Dec 18, 2023
2907406
feat(booth): Now priority voting work as expected
pabpercab1 Dec 18, 2023
c140563
Merge branch 'develop' into feature/priority-voting-visualization
pabpercab1 Dec 18, 2023
47e4331
Merge branch 'develop' into feature/priority-voting-visualization
AntonioRodriguezRuiz Dec 19, 2023
c83bb7b
Merge branch 'develop' into feature/priority-voting-visualization
AntonioRodriguezRuiz Dec 19, 2023
a6e3530
fix: dropdown style
MartaInes Dec 19, 2023
b256090
fix: same priority can not be assign to two diferrent options
MartaInes Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion decide/booth/static/booth/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,4 +252,14 @@ textarea {

.input-group i {
font-size: 1.5em;
}
}

.select {
padding: 6px;
margin-right: 5px;
margin-bottom: 5px;
border-radius: 0.25em;
box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
color: var(--input-text);
font-family: var(--fuente2);
}
56 changes: 46 additions & 10 deletions decide/booth/templates/booth/booth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,34 @@
<div class="card-voting" v-if="!signup">
<h1 class="voting-title">[[ voting.name ]]</h1>
<h2 class="voting-desc">[[ voting.question.desc ]]</h2>
<form v-for="opt in voting.question.options" :key="opt.number">
<form>
<div class="form-options">
<input type="radio" v-model="selected" v-if="questionType == 'S' || questionType == 'B'"
:id="'q' + opt.number"
name="question"
:value="opt.number">
<input type="checkbox" v-model="selected" v-if="questionType == 'M'"
:id="'q' + opt.number"
name="question"
:value="opt.number">
[[ opt.option ]]
<div v-if="questionType == 'S' || questionType == 'B' || questionType == 'M'" v-for="opt in voting.question.options" :key="opt.number">
<input type="radio" v-model="selected" v-if="questionType == 'S' || questionType == 'B'"
:id="'q' + opt.number"
name="question"
:value="opt.number">
<input type="checkbox" v-model="selected" v-if="questionType == 'M'"
:id="'q' + opt.number"
name="question"
:value="opt.number">

[[ opt.option ]]
</div>
<div v-if="questionType == 'P'">
<br>
<p> Remember that 1 is the highest priority and [[voting.question.options.length]] is the lowest priority</p>
<br>
<div v-for="(opt, index) in voting.question.options">
<select class="select" v-model="selected[index]">
<option v-for="opt in voting.question.options">
[[ opt.number ]]
</option>
</select> [[opt.option]]
<div>Selected priority of [[ selected[index] ]] for [[opt.option]]</div>
<br>
</div>
</div>
</div>
</form>
<button class="btn btn-vote mt-3" v-on:click="decideSend">
Expand Down Expand Up @@ -255,6 +272,25 @@ <h2 class="voting-desc">[[ voting.question.desc ]]</h2>
token: this.token
}
}
else if (this.questionType === 'P') {
var selectedOptions = this.voting.question.options.map((opt, index) => [opt.number, this.selected[index]]);
var vote = []
var priorities = selectedOptions.map((opt) => opt[1]);
var prioritiesSet = new Set(priorities);
if (priorities.length > prioritiesSet.size){
return
}
for (i=0; i < selectedOptions.length; i++){
var v = this.decideEncrypt(selectedOptions[i][0].toString())
vote.push({a: v.alpha.toString(), b: v.beta.toString(), p: selectedOptions[i][1].toString()})
}
var data = {
vote: vote,
voting: this.voting.id,
voter: this.user.id,
token: this.token
}
}

this.postData("{% url "gateway" "store" "/" %}", data)
.then(data => {
Expand Down