From d8adccb295587dae670b2d3f650713ea1573d450 Mon Sep 17 00:00:00 2001
From: MartaInes <margondia22@alum.us.es>
Date: Mon, 18 Dec 2023 21:09:16 +0100
Subject: [PATCH 1/4] feat: priority voting visualization (not working
 properly)

---
 decide/booth/templates/booth/booth.html | 40 ++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/decide/booth/templates/booth/booth.html b/decide/booth/templates/booth/booth.html
index eb3355106..98d100b05 100644
--- a/decide/booth/templates/booth/booth.html
+++ b/decide/booth/templates/booth/booth.html
@@ -84,15 +84,26 @@ <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">
                     <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">
+                        <div v-if="questionType == 'S' || questionType == 'B' || questionType == 'M'">
+                            <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'">
+                            <select v-model="selected" >
+                                <option v-for="opt in voting.question.options">
+                                    [[ opt.number ]]
+                                </option>
+                            </select>
                             [[ opt.option ]]
+                        </div>
                     </div>
                 </form>
                 <button class="btn btn-vote mt-3" v-on:click="decideSend">
@@ -255,6 +266,19 @@ <h2 class="voting-desc">[[ voting.question.desc ]]</h2>
                             token: this.token
                         }
                     }
+                    else if (this.questionType === 'P') {
+                        var vote = []
+                        for (i=0; i < selected.length; i++){
+                            var v = this.decideEncrypt(selected[i][0].toString())
+                            vote.push({a: v.alpha.toString(), b: v.beta.toString(), p: selected[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 => {

From 290740625fd376bdb8e9f796eab43ea5e760b2b0 Mon Sep 17 00:00:00 2001
From: pabpercab1 <pabpercab1@alum.us.es>
Date: Mon, 18 Dec 2023 22:45:31 +0100
Subject: [PATCH 2/4] feat(booth): Now priority voting work as expected

---
 decide/booth/templates/booth/booth.html | 27 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/decide/booth/templates/booth/booth.html b/decide/booth/templates/booth/booth.html
index 98d100b05..f1e9bfbb8 100644
--- a/decide/booth/templates/booth/booth.html
+++ b/decide/booth/templates/booth/booth.html
@@ -82,9 +82,9 @@
             <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">
-                        <div v-if="questionType == 'S' || questionType == 'B' || questionType == 'M'">
+                        <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"
@@ -97,12 +97,18 @@ <h2 class="voting-desc">[[ voting.question.desc ]]</h2>
                                 [[ opt.option ]]
                         </div>
                         <div v-if="questionType == 'P'">
-                            <select v-model="selected" >
-                                <option v-for="opt in voting.question.options">
+                            <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 v-model="selected[index]">
+                                  <option v-for="opt in voting.question.options">
                                     [[ opt.number ]]
-                                </option>
-                            </select>
-                            [[ opt.option ]]
+                                  </option>
+                                </select> [[opt.option]]
+                                <div>Selected priority of [[ selected[index] ]] for [[opt.option]]</div>
+                                <br>
+                              </div>
                         </div>
                     </div>
                 </form>
@@ -267,10 +273,11 @@ <h2 class="voting-desc">[[ voting.question.desc ]]</h2>
                         }
                     }
                     else if (this.questionType === 'P') {
+                        var selectedOptions = this.voting.question.options.map((opt, index) => [opt.number, this.selected[index]]);
                         var vote = []
-                        for (i=0; i < selected.length; i++){
-                            var v = this.decideEncrypt(selected[i][0].toString())
-                            vote.push({a: v.alpha.toString(), b: v.beta.toString(), p: selected[i][1].toString()})
+                        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,

From a6e3530853ef530b60182b207ad1ff7486e37db2 Mon Sep 17 00:00:00 2001
From: MartaInes <73229109+MartaInes@users.noreply.github.com>
Date: Tue, 19 Dec 2023 17:22:13 +0100
Subject: [PATCH 3/4] fix: dropdown style

---
 decide/booth/static/booth/style.css | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/decide/booth/static/booth/style.css b/decide/booth/static/booth/style.css
index 8ed9264f7..6237e22ca 100644
--- a/decide/booth/static/booth/style.css
+++ b/decide/booth/static/booth/style.css
@@ -252,4 +252,14 @@ textarea {
 
 .input-group i {
     font-size: 1.5em;
-}
\ No newline at end of file
+}
+
+.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);
+  }

From b256090d819775b1896d48d697f22fd46a3f17fa Mon Sep 17 00:00:00 2001
From: MartaInes <73229109+MartaInes@users.noreply.github.com>
Date: Tue, 19 Dec 2023 17:32:33 +0100
Subject: [PATCH 4/4] fix: same priority can not be assign to two diferrent
 options

---
 decide/booth/templates/booth/booth.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/decide/booth/templates/booth/booth.html b/decide/booth/templates/booth/booth.html
index f1e9bfbb8..91a23fa10 100644
--- a/decide/booth/templates/booth/booth.html
+++ b/decide/booth/templates/booth/booth.html
@@ -101,7 +101,7 @@ <h2 class="voting-desc">[[ voting.question.desc ]]</h2>
                             <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 v-model="selected[index]">
+                                <select class="select" v-model="selected[index]">
                                   <option v-for="opt in voting.question.options">
                                     [[ opt.number ]]
                                   </option>
@@ -275,6 +275,11 @@ <h2 class="voting-desc">[[ voting.question.desc ]]</h2>
                     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()})