Translate email subject

- Replace chart with table
- Analyze tiebreak
- Merge all info in a single list of cards

Closes #25
Closes #13

Gemfile

@@ -10,6 +10,5 @@ gem 'base64', '0.1.1'
 gem 'forwardable', '1.3.2'
 gem 'bcrypt'
 gem 'gettext'
-gem 'chartkick'
 gem 'mail'
 gem 'redcarpet'

Gemfile.lock

@@ -23,7 +23,6 @@ GEM
     bcrypt (3.1.20)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
-    chartkick (5.1.4)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
     date (3.4.1)
@@ -108,7 +107,6 @@ PLATFORMS
 DEPENDENCIES
   base64 (= 0.1.1)
   bcrypt
-  chartkick
   forwardable (= 1.3.2)
   gettext
   mail

mj.rb

@@ -13,6 +13,9 @@ class MajorityJudgment
     if arg.is_a?(Array)
       @ratings = arg
       @count = { }
+      self.class.values.each do |v|
+        @count[v[:id]] = 0
+      end
       @n = 0
       ratings.each do |r|
         @count.has_key?(r) ? @count[r] = @count[r] + 1 : @count[r] = 1
@@ -62,6 +65,23 @@ class MajorityJudgment
     return MajorityJudgment.new(counta) <=> MajorityJudgment.new(countb)
   end
 
+  def break_tie(other)
+    rounds = [ ]
+    s = MajorityJudgment.new(self.count.dup)
+    o = MajorityJudgment.new(other.count.dup)
+    rounds << [s, o]
+    while s.mj == o.mj and not s.mj == 0
+      new_s_count = s.count.dup
+      new_o_count = o.count.dup
+      new_s_count[s.mj] = new_s_count[s.mj] - 1
+      new_o_count[o.mj] = new_o_count[o.mj] - 1
+      s = MajorityJudgment.new(new_s_count)
+      o = MajorityJudgment.new(new_o_count)
+      rounds << [s, o]
+    end
+    return rounds
+  end
+
   def to_s
     puts "#{@count}: {M=>#{self.mj}, P=>#{self.proponents}, O=>#{self.opponents}}"
   end

po/ca/vedia.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-12-04 17:25-0600\n"
+"POT-Creation-Date: 2026-01-13 20:00-0600\n"
 "PO-Revision-Date: 2025-03-29 20:41-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,16 +41,20 @@ msgstr "Bé"
 msgid "Very good"
 msgstr "Molt bé"
 
-#: ../vedia.rb:125
+#: ../vedia.rb:143
 msgid "Incorrect email or password."
 msgstr "Correu o contrasenya incorrecte."
 
-#: ../vedia.rb:147
+#: ../vedia.rb:170
 msgid "Reset your password"
 msgstr "Reiniciar contrasenya"
 
+#: ../vedia.rb:582
+msgid "Results of the vote: %{t}"
+msgstr "Resultats de la votació: %{t}"
+
 #: ../views/admin.erb:1 ../views/admin_users.erb:1 ../views/admin_votes.erb:1
-#: ../views/layout.erb:35
+#: ../views/layout.erb:30
 msgid "Admin"
 msgstr "Admin"
 
@@ -58,7 +62,7 @@ msgstr "Admin"
 msgid "Users"
 msgstr "Usuàries"
 
-#: ../views/admin.erb:13 ../views/layout.erb:31 ../views/votes.erb:1
+#: ../views/admin.erb:13 ../views/layout.erb:26 ../views/votes.erb:1
 msgid "Votes"
 msgstr "Votacions"
 
@@ -110,7 +114,7 @@ msgid "No vote organized."
 msgstr "Cap votació organitzada."
 
 #: ../views/admin_users.erb:30 ../views/admin_votes.erb:38
-#: ../views/votes_show_closed.erb:89
+#: ../views/votes_show_closed.erb:144
 msgid "Ratings"
 msgstr "Valoracions"
 
@@ -147,8 +151,8 @@ msgid "State: %{state}"
 msgstr "Estat: %{state}"
 
 #: ../views/admin_votes.erb:19 ../views/votes_edit.erb:90
-#: ../views/votes_show_closed.erb:123 ../views/votes_show_draft.erb:29
+#: ../views/votes_show_closed.erb:178 ../views/votes_show_draft.erb:29
-#: ../views/votes_show_open.erb:79
+#: ../views/votes_show_open.erb:88
 msgid "Organizers"
 msgstr "Organitzadores"
 
@@ -162,7 +166,7 @@ msgstr "Suprimir la votació"
 
 #: ../views/candidates_edit.erb:1
 msgid "Edit candidate"
-msgstr "Edita la opció"
+msgstr "Edita l'opció"
 
 #: ../views/candidates_edit.erb:6 ../views/votes_edit.erb:48
 msgid "Enter a name."
@@ -183,40 +187,48 @@ msgid ""
 "You can use <a href=\"https://www.markdownguide.org/basic-syntax/\">Markdown</a>"
 "."
 msgstr ""
-"Pots fer servir <a href=\"https://www.markdownguide.org/basic-syntax/\">Markdown</a>."
+"Pots fer servir <a href=\"https://www.markdownguide.org/basic-syntax/\">Markdown"
+"</a>."
 
 #: ../views/candidates_edit.erb:21 ../views/votes_edit_description.erb:21
 msgid "Save"
 msgstr "Guardar"
 
-#: ../views/layout.erb:40
+#: ../views/layout.erb:35
 msgid "Logout"
 msgstr "Desconnexió"
 
-#: ../views/login.erb:1 ../views/login.erb:16
+#: ../views/login.erb:1 ../views/login.erb:21
+#: ../views/votes_show_unauthenticated.erb:16
 msgid "Login"
 msgstr "Connexió"
 
-#: ../views/login.erb:9 ../views/reset.erb:5 ../views/reset_change.erb:13
+#: ../views/login.erb:6 ../views/reset.erb:1 ../views/reset.erb:16
-#: ../views/signup.erb:24 ../views/votes_edit.erb:102
-#: ../views/votes_show_closed.erb:137 ../views/votes_show_open.erb:95
-msgid "Email"
-msgstr "Correu"
-
-#: ../views/login.erb:13 ../views/reset_change.erb:17 ../views/signup.erb:28
-msgid "Password"
-msgstr "Contrasenya"
-
-#: ../views/login.erb:18 ../views/signup.erb:1 ../views/signup.erb:31
-msgid "Create account"
-msgstr "Crear un compte"
-
-#: ../views/login.erb:19 ../views/reset.erb:1 ../views/reset.erb:8
 #: ../views/reset_change.erb:1 ../views/reset_change.erb:20
 #: ../views/reset_invalid.erb:1 ../views/reset_sent.erb:1
 msgid "Reset password"
 msgstr "Reiniciar contrasenya"
 
+#: ../views/login.erb:12 ../views/reset.erb:13 ../views/reset_change.erb:13
+#: ../views/signup.erb:24 ../views/votes_edit.erb:102
+#: ../views/votes_show_closed.erb:192 ../views/votes_show_open.erb:104
+#: ../views/votes_show_unauthenticated.erb:9
+msgid "Email"
+msgstr "Correu"
+
+#: ../views/login.erb:16 ../views/reset_change.erb:17 ../views/signup.erb:28
+#: ../views/votes_show_unauthenticated.erb:13
+msgid "Password"
+msgstr "Contrasenya"
+
+#: ../views/login.erb:23 ../views/signup.erb:1 ../views/signup.erb:32
+msgid "Create account"
+msgstr "Crear un compte"
+
+#: ../views/reset.erb:6
+msgid "Enter an email address."
+msgstr "Entra una direcció de correu."
+
 #: ../views/reset_change.erb:6 ../views/signup.erb:17
 msgid "Enter a password."
 msgstr "Entra una contrasenya."
@@ -253,12 +265,20 @@ msgstr "El correu no és una direcció de correu vàlida."
 msgid "An account already exists for %{email}."
 msgstr "Un compte ja existeix pel correu %{email}."
 
-#: ../views/votes.erb:18 ../views/votes_edit.erb:6
+#: ../views/votes.erb:18 ../views/votes_show_open.erb:7
+msgid "Voted"
+msgstr "Votat"
+
+#: ../views/votes.erb:20 ../views/votes_show_open.erb:9
+msgid "Not voted"
+msgstr "Sense votar"
+
+#: ../views/votes.erb:23 ../views/votes_edit.erb:6
 #: ../views/votes_show_closed.erb:7
 msgid "Organizer"
 msgstr "Organitzadora"
 
-#: ../views/votes.erb:28 ../views/votes_new.erb:21
+#: ../views/votes.erb:33 ../views/votes_new.erb:21
 msgid "Create new vote"
 msgstr "Crear una nova votació"
 
@@ -275,8 +295,7 @@ msgid "Edit"
 msgstr "Editar"
 
 #: ../views/votes_edit.erb:20 ../views/votes_open.erb:36
-#: ../views/votes_show_closed.erb:22 ../views/votes_show_draft.erb:16
+#: ../views/votes_show_draft.erb:16 ../views/votes_show_open.erb:24
-#: ../views/votes_show_open.erb:19
 msgid "Candidates"
 msgstr "Opcions"
 
@@ -301,8 +320,8 @@ msgid "Open vote to participants"
 msgstr "Obrir la votació als votants"
 
 #: ../views/votes_edit.erb:98 ../views/votes_edit.erb:105
-#: ../views/votes_show_closed.erb:133 ../views/votes_show_closed.erb:140
+#: ../views/votes_show_closed.erb:188 ../views/votes_show_closed.erb:195
-#: ../views/votes_show_open.erb:91 ../views/votes_show_open.erb:98
+#: ../views/votes_show_open.erb:100 ../views/votes_show_open.erb:107
 msgid "Add organizer"
 msgstr "Afegeix organitzadora"
 
@@ -344,62 +363,108 @@ msgstr "Cancel·lar"
 msgid "Closed on %{date}"
 msgstr "Tancada el %{date}"
 
-#: ../views/votes_show_closed.erb:35
+#: ../views/votes_show_closed.erb:24
 msgid "Results"
 msgstr "Resultats"
 
-#: ../views/votes_show_closed.erb:39
+#: ../views/votes_show_closed.erb:28
 msgid "No results are available because nobody voted on this vote."
 msgstr "No hi ha cap resultat perquè ningú va votar en aquesta votació."
 
-#: ../views/votes_show_closed.erb:46
+#: ../views/votes_show_closed.erb:41
-msgid "Rank"
+msgid "Winning candidate"
-msgstr "Rang"
+msgstr "Opció guanyadora"
 
-#: ../views/votes_show_closed.erb:47
+#: ../views/votes_show_closed.erb:43
-msgid "Candidate"
+msgid ""
-msgstr "Opció"
+"The winning candidate is the candidate with the highest median vote (↓), calle"
+"d <a href='https://en.wikipedia.org/wiki/Majority_judgment'><i>majority judgme"
+"nt</i></a>."
+msgstr ""
+"L'opció guanyadora és l'opció amb la mediana de vots més alta (↓), anomenada <"
+"a href='https://en.wikipedia.org/wiki/Majority_judgment'><i>judici majoritari<"
+"/i></a>."
 
-#: ../views/votes_show_closed.erb:48
+#: ../views/votes_show_closed.erb:67
-msgid "Majority Judgment"
+msgid "See description"
-msgstr "Judici majoritari"
+msgstr "Veure descripció"
 
-#: ../views/votes_show_closed.erb:49
+#: ../views/votes_show_closed.erb:71
-msgid "Proponents"
+msgid "Analyze tiebreak"
-msgstr "Defensores"
+msgstr "Analitzar desempat"
 
-#: ../views/votes_show_closed.erb:50
+#: ../views/votes_show_closed.erb:81
-msgid "Opponents"
+msgid "This candidate and the winning candidate have the same majority judgment."
-msgstr "Detractores"
+msgstr "Aquesta opció i l'opció guanyadora tenen el mateix judici majoritari."
 
-#: ../views/votes_show_closed.erb:94
+#: ../views/votes_show_closed.erb:83
+msgid ""
+"To break the tie, we remove the vote that corresponds to the majority judgment"
+" one-by-one until one candidate has a better majority judgment than the other."
+msgstr ""
+"Pel desempat, treiem el vot que correspon al judici majoritari un per un fins "
+"que alguna opció tingui un millor judici majoritari que l'altre."
+
+#: ../views/votes_show_closed.erb:85
+msgid "Votes for this candidate"
+msgstr "Vots per aquesta opció"
+
+#: ../views/votes_show_closed.erb:86
+msgid "Votes for the winning candidate"
+msgstr "Vots per l'opció guanyadora"
+
+#: ../views/votes_show_closed.erb:93
+msgid "Without removing any vote."
+msgstr "Sense treure cap vot."
+
+#: ../views/votes_show_closed.erb:98
+msgid "Removing 1 vote."
+msgstr "Treient 1 vot."
+
+#: ../views/votes_show_closed.erb:103
+msgid "Removing %{n} votes."
+msgstr "Treient %{n} vots."
+
+#: ../views/votes_show_closed.erb:149
 msgid "Participant"
 msgstr "Votant"
 
-#: ../views/votes_show_closed.erb:118
+#: ../views/votes_show_closed.erb:173
 msgid "Reopen voting period"
 msgstr "Reobrir el període de votació"
 
-#: ../views/votes_show_open.erb:8
+#: ../views/votes_show_open.erb:13
 msgid "Closes on %{date}"
 msgstr "Tanca el %{date}"
 
-#: ../views/votes_show_open.erb:24
+#: ../views/votes_show_open.erb:29
 msgid "Missing rating for candidate <i>%{name}</i>."
 msgstr "Falta una valoració per l'opció <i>%{name}</i>."
 
-#: ../views/votes_show_open.erb:54
+#: ../views/votes_show_open.erb:35
+msgid "Thank you for voting!"
+msgstr "Gràcies per votar!"
+
+#: ../views/votes_show_open.erb:63
 msgid "Vote"
 msgstr "Votar"
 
-#: ../views/votes_show_open.erb:57
+#: ../views/votes_show_open.erb:66
 msgid "Participants"
 msgstr "Votants"
 
-#: ../views/votes_show_open.erb:68
+#: ../views/votes_show_open.erb:77
 msgid "Change back to draft vote"
 msgstr "Tornar a l'esborrany de votació"
 
-#: ../views/votes_show_open.erb:72
+#: ../views/votes_show_open.erb:81
 msgid "Close votes and show results"
 msgstr "Tancar la votació i veure els resultats"
+
+#: ../views/votes_show_unauthenticated.erb:5
+msgid "You need to log in to see the details of this vote."
+msgstr "T'has de connectar per veure el detall d'aquesta votació."
+
+#: ../views/votes_show_unknown.erb:2
+msgid "Vote not found..."
+msgstr "Votació no encontrada..."

po/vedia.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-12-04 17:25-0600\n"
+"POT-Creation-Date: 2026-01-13 20:00-0600\n"
-"PO-Revision-Date: 2025-12-04 17:25-0600\n"
+"PO-Revision-Date: 2026-01-13 20:00-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -42,16 +42,20 @@ msgstr ""
 msgid "Very good"
 msgstr ""
 
-#: ../vedia.rb:125
+#: ../vedia.rb:143
 msgid "Incorrect email or password."
 msgstr ""
 
-#: ../vedia.rb:147
+#: ../vedia.rb:170
 msgid "Reset your password"
 msgstr ""
 
+#: ../vedia.rb:582
+msgid "Results of the vote: %{t}"
+msgstr ""
+
 #: ../views/admin.erb:1 ../views/admin_users.erb:1 ../views/admin_votes.erb:1
-#: ../views/layout.erb:35
+#: ../views/layout.erb:30
 msgid "Admin"
 msgstr ""
 
@@ -59,7 +63,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: ../views/admin.erb:13 ../views/layout.erb:31 ../views/votes.erb:1
+#: ../views/admin.erb:13 ../views/layout.erb:26 ../views/votes.erb:1
 msgid "Votes"
 msgstr ""
 
@@ -111,7 +115,7 @@ msgid "No vote organized."
 msgstr ""
 
 #: ../views/admin_users.erb:30 ../views/admin_votes.erb:38
-#: ../views/votes_show_closed.erb:89
+#: ../views/votes_show_closed.erb:144
 msgid "Ratings"
 msgstr ""
 
@@ -148,8 +152,8 @@ msgid "State: %{state}"
 msgstr ""
 
 #: ../views/admin_votes.erb:19 ../views/votes_edit.erb:90
-#: ../views/votes_show_closed.erb:123 ../views/votes_show_draft.erb:29
+#: ../views/votes_show_closed.erb:178 ../views/votes_show_draft.erb:29
-#: ../views/votes_show_open.erb:79
+#: ../views/votes_show_open.erb:88
 msgid "Organizers"
 msgstr ""
 
@@ -189,34 +193,41 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: ../views/layout.erb:40
+#: ../views/layout.erb:35
 msgid "Logout"
 msgstr ""
 
-#: ../views/login.erb:1 ../views/login.erb:16
+#: ../views/login.erb:1 ../views/login.erb:21
+#: ../views/votes_show_unauthenticated.erb:16
 msgid "Login"
 msgstr ""
 
-#: ../views/login.erb:9 ../views/reset.erb:5 ../views/reset_change.erb:13
+#: ../views/login.erb:6 ../views/reset.erb:1 ../views/reset.erb:16
-#: ../views/signup.erb:24 ../views/votes_edit.erb:102
-#: ../views/votes_show_closed.erb:137 ../views/votes_show_open.erb:95
-msgid "Email"
-msgstr ""
-
-#: ../views/login.erb:13 ../views/reset_change.erb:17 ../views/signup.erb:28
-msgid "Password"
-msgstr ""
-
-#: ../views/login.erb:18 ../views/signup.erb:1 ../views/signup.erb:31
-msgid "Create account"
-msgstr ""
-
-#: ../views/login.erb:19 ../views/reset.erb:1 ../views/reset.erb:8
 #: ../views/reset_change.erb:1 ../views/reset_change.erb:20
 #: ../views/reset_invalid.erb:1 ../views/reset_sent.erb:1
 msgid "Reset password"
 msgstr ""
 
+#: ../views/login.erb:12 ../views/reset.erb:13 ../views/reset_change.erb:13
+#: ../views/signup.erb:24 ../views/votes_edit.erb:102
+#: ../views/votes_show_closed.erb:192 ../views/votes_show_open.erb:104
+#: ../views/votes_show_unauthenticated.erb:9
+msgid "Email"
+msgstr ""
+
+#: ../views/login.erb:16 ../views/reset_change.erb:17 ../views/signup.erb:28
+#: ../views/votes_show_unauthenticated.erb:13
+msgid "Password"
+msgstr ""
+
+#: ../views/login.erb:23 ../views/signup.erb:1 ../views/signup.erb:32
+msgid "Create account"
+msgstr ""
+
+#: ../views/reset.erb:6
+msgid "Enter an email address."
+msgstr ""
+
 #: ../views/reset_change.erb:6 ../views/signup.erb:17
 msgid "Enter a password."
 msgstr ""
@@ -251,12 +262,20 @@ msgstr ""
 msgid "An account already exists for %{email}."
 msgstr ""
 
-#: ../views/votes.erb:18 ../views/votes_edit.erb:6
+#: ../views/votes.erb:18 ../views/votes_show_open.erb:7
+msgid "Voted"
+msgstr ""
+
+#: ../views/votes.erb:20 ../views/votes_show_open.erb:9
+msgid "Not voted"
+msgstr ""
+
+#: ../views/votes.erb:23 ../views/votes_edit.erb:6
 #: ../views/votes_show_closed.erb:7
 msgid "Organizer"
 msgstr ""
 
-#: ../views/votes.erb:28 ../views/votes_new.erb:21
+#: ../views/votes.erb:33 ../views/votes_new.erb:21
 msgid "Create new vote"
 msgstr ""
 
@@ -273,8 +292,7 @@ msgid "Edit"
 msgstr ""
 
 #: ../views/votes_edit.erb:20 ../views/votes_open.erb:36
-#: ../views/votes_show_closed.erb:22 ../views/votes_show_draft.erb:16
+#: ../views/votes_show_draft.erb:16 ../views/votes_show_open.erb:24
-#: ../views/votes_show_open.erb:19
 msgid "Candidates"
 msgstr ""
 
@@ -299,8 +317,8 @@ msgid "Open vote to participants"
 msgstr ""
 
 #: ../views/votes_edit.erb:98 ../views/votes_edit.erb:105
-#: ../views/votes_show_closed.erb:133 ../views/votes_show_closed.erb:140
+#: ../views/votes_show_closed.erb:188 ../views/votes_show_closed.erb:195
-#: ../views/votes_show_open.erb:91 ../views/votes_show_open.erb:98
+#: ../views/votes_show_open.erb:100 ../views/votes_show_open.erb:107
 msgid "Add organizer"
 msgstr ""
 
@@ -340,62 +358,103 @@ msgstr ""
 msgid "Closed on %{date}"
 msgstr ""
 
-#: ../views/votes_show_closed.erb:35
+#: ../views/votes_show_closed.erb:24
 msgid "Results"
 msgstr ""
 
-#: ../views/votes_show_closed.erb:39
+#: ../views/votes_show_closed.erb:28
 msgid "No results are available because nobody voted on this vote."
 msgstr ""
 
-#: ../views/votes_show_closed.erb:46
+#: ../views/votes_show_closed.erb:41
-msgid "Rank"
+msgid "Winning candidate"
 msgstr ""
 
-#: ../views/votes_show_closed.erb:47
+#: ../views/votes_show_closed.erb:43
-msgid "Candidate"
+msgid ""
+"The winning candidate is the candidate with the highest median vote (↓), calle"
+"d <a href='https://en.wikipedia.org/wiki/Majority_judgment'><i>majority judgme"
+"nt</i></a>."
 msgstr ""
 
-#: ../views/votes_show_closed.erb:48
+#: ../views/votes_show_closed.erb:67
-msgid "Majority Judgment"
+msgid "See description"
 msgstr ""
 
-#: ../views/votes_show_closed.erb:49
+#: ../views/votes_show_closed.erb:71
-msgid "Proponents"
+msgid "Analyze tiebreak"
 msgstr ""
 
-#: ../views/votes_show_closed.erb:50
+#: ../views/votes_show_closed.erb:81
-msgid "Opponents"
+msgid "This candidate and the winning candidate have the same majority judgment."
 msgstr ""
 
-#: ../views/votes_show_closed.erb:94
+#: ../views/votes_show_closed.erb:83
+msgid ""
+"To break the tie, we remove the vote that corresponds to the majority judgment"
+" one-by-one until one candidate has a better majority judgment than the other."
+msgstr ""
+
+#: ../views/votes_show_closed.erb:85
+msgid "Votes for this candidate"
+msgstr ""
+
+#: ../views/votes_show_closed.erb:86
+msgid "Votes for the winning candidate"
+msgstr ""
+
+#: ../views/votes_show_closed.erb:93
+msgid "Without removing any vote."
+msgstr ""
+
+#: ../views/votes_show_closed.erb:98
+msgid "Removing 1 vote."
+msgstr ""
+
+#: ../views/votes_show_closed.erb:103
+msgid "Removing %{n} votes."
+msgstr ""
+
+#: ../views/votes_show_closed.erb:149
 msgid "Participant"
 msgstr ""
 
-#: ../views/votes_show_closed.erb:118
+#: ../views/votes_show_closed.erb:173
 msgid "Reopen voting period"
 msgstr ""
 
-#: ../views/votes_show_open.erb:8
+#: ../views/votes_show_open.erb:13
 msgid "Closes on %{date}"
 msgstr ""
 
-#: ../views/votes_show_open.erb:24
+#: ../views/votes_show_open.erb:29
 msgid "Missing rating for candidate <i>%{name}</i>."
 msgstr ""
 
-#: ../views/votes_show_open.erb:54
+#: ../views/votes_show_open.erb:35
+msgid "Thank you for voting!"
+msgstr ""
+
+#: ../views/votes_show_open.erb:63
 msgid "Vote"
 msgstr ""
 
-#: ../views/votes_show_open.erb:57
+#: ../views/votes_show_open.erb:66
 msgid "Participants"
 msgstr ""
 
-#: ../views/votes_show_open.erb:68
+#: ../views/votes_show_open.erb:77
 msgid "Change back to draft vote"
 msgstr ""
 
-#: ../views/votes_show_open.erb:72
+#: ../views/votes_show_open.erb:81
 msgid "Close votes and show results"
 msgstr ""
+
+#: ../views/votes_show_unauthenticated.erb:5
+msgid "You need to log in to see the details of this vote."
+msgstr ""
+
+#: ../views/votes_show_unknown.erb:2
+msgid "Vote not found..."
+msgstr ""

vedia.rb

@@ -9,7 +9,6 @@ require 'sinatra/activerecord'
 require 'bcrypt'
 require 'gettext'
 require 'securerandom'
-require 'chartkick'
 require 'mail'
 require 'ostruct'
 require 'tzinfo'
@@ -580,7 +579,7 @@ def close_expired_votes
       mail = Mail.new
       mail.from = settings.admin_email
       mail.to = user.email
-      mail.subject = _("Results of the vote: #{vote.title}")
+      mail.subject = _("Results of the vote: %{t}") % { t: vote.title }
       template = ERB.new(File.read("views/votes_close_email.erb"))
       mail.body = template.result(binding)
       mail.deliver
@@ -593,6 +592,8 @@ helpers do
     if session[:user_id]
       User.find(session[:user_id])
     elsif settings.spoof_admin
+      session.clear
+      session[:timezone] = 'UTC'
       User.find(1)
     else
       nil

views/layout.erb

@@ -9,8 +9,7 @@
     <% else %>
       <title>Vedia</title>
     <% end %>
-    <script src="/chartkick.js"></script>
+    <script src="/bootstrap.js"></script>
-    <script src="/Chart.bundle.js"></script>
     <link rel="stylesheet" href="/bootstrap.css">
     <link rel="stylesheet" href="/bootstrap-icons.css">
     <link rel="stylesheet" href="/style.css">

views/style.erb

@@ -17,4 +17,8 @@
     background-color: <%= v[:color] %>;
   }
 
+  .mj-cell-<%= v[:id] %> {
+    background-color: <%= v[:color] %> !important;
+  }
+
 <% end %>

views/votes_show_closed.erb

@@ -19,17 +19,6 @@
   </div>
 </div>
 
-<h2 class="mb-4"><%= _("Candidates") %></h2>
-
-<% @vote.candidates.each do |candidate| %>
-  <div class="card mb-4">
-    <div class="card-body">
-      <h3 class="mb-3"><%= candidate.name %></h3>
-      <%= markdown(candidate.description) %>
-    </div>
-  </div>
-<% end %>
-
 <div class="mb-5"></div>
 
 <h2 class="mb-4"><%= _("Results") %></h2>
@@ -40,55 +29,121 @@
 
 <% else %>
 
-<table class="table mb-4">
+<% r = 0 %>
-  <tr>
+<% @results = @vote.candidates.sort { |a, b| a.mj <=> b.mj }.reverse %>
-    <th></th>
+<% @results.each do |c| %>
-    <th><%= _("Rank") %></th>
+  <% r = r + 1 %>
-    <th><%= _("Candidate") %></th>
+  <div class="card mb-4">
-    <th><%= _("Majority Judgment") %></th>
+    <div class="card-body">
-    <th><%= _("Proponents") %></th>
+      <% if r == 1 %>
-    <th><%= _("Opponents") %></th>
+        <p class="fs-5">
-  </tr>
+          <i class="bi bi-trophy-fill"></i>
-  <% i = 0 %>
+          <%= _("Winning candidate") %>
-  <% @vote.candidates.sort { |a, b| a.mj <=> b.mj }.reverse.each do |candidate| %>
+        </p>
-  <% i = i + 1 %>
+        <p><%= _("The winning candidate is the candidate with the highest median vote (↓), called <a href='https://en.wikipedia.org/wiki/Majority_judgment'><i>majority judgment</i></a>.") %></p>
-  <% if i == 1 %>
-    <tr class="table-success">
-      <td><i class="bi bi-trophy-fill"></i></td>
-      <td><%= i %></i></td>
-  <% else %>
-    <tr>
-      <td></td>
-      <td><%= i %></td>
       <% end %>
-    <td><%= candidate.name %></td>
+      <p class="fs-5">
-    <% value = settings.values.select { |e| e[:id] == candidate.mj.mj }.first %>
+        <%= "##{r}" %>
-    <td class="h5"><span class="badge bg-<%= value[:id] %>"><%= _(value[:label]) %></span></td>
+        <% value = settings.values.select { |e| e[:id] == c.mj.mj }.first %>
-    <td><%= candidate.mj.proponents %></td>
+        <span class="badge bg-<%= value[:id] %>"><%= _(value[:label]) %></span>
-    <td><%= candidate.mj.opponents %></td>
+      </p>
-  </tr>
+      <h3><%= c.name %></h3>
+      <table class="table table-borderless">
+        <tr>
+          <% (1..c.mj.n).each do |i| %>
+            <td class="text-center <% unless i == c.mj.majority %>opacity-0<% end %>">↓</td>
           <% end %>
-</table>
+        </tr>
-
+        <tr>
-<%
+          <% settings.values.reverse.each do |v| %>
-data = []
+            <% (1..c.mj.count[v[:id]]).each do |r| %>
-colors = []
+              <td class="mj-cell-<%= v[:id] %>">&nbsp;</td>
-settings.values.reverse.each do |v|
+            <% end %>
-  d = { name: _(v[:label]), data: [] }
+          <% end %>
-  @vote.candidates.sort { |a, b| a.mj <=> b.mj }.reverse.each do |c|
+        </tr>
-    d[:data] << [c.name, c.mj.count[v[:id]]]
+      </table>
-  end
+      <p class="d-inline-flex gap-3">
-  data << d
+        <a class="btn btn-outline-primary" data-bs-toggle="collapse" href="#description-<%= r %>" role="button" aria-expanded="false" aria-controls="description-<%= r %>">
-  colors << v[:color]
+          <%= _("See description") %>
-end
+        </a>
-%>
+        <% if r > 1 and c.mj.mj == @results.first.mj.mj %>
-<%= bar_chart data, colors: colors, stacked: true, legend: 'bottom' %>
+          <a class="btn btn-primary" data-bs-toggle="collapse" href="#tiebreak-<%= r %>" role="button" aria-expanded="false" aria-controls="tiebreak-<%= r %>">
+            <%= _("Analyze tiebreak") %>
+          </a>
+        <% end %>
+      </p>
+      <div class="collapse" id="description-<%= r %>">
+        <%= markdown(c.description) %>
+      </div>
+      <% if r > 1 and c.mj.mj == @results.first.mj.mj %>
+        <div class="collapse" id="tiebreak-<%= r %>">
+          <p>
+            <%= _("This candidate and the winning candidate have the same majority judgment.") %>
+          </p>
+          <p><%= _("To break the tie, we remove the vote that corresponds to the majority judgment one-by-one until one candidate has a better majority judgment than the other.") %></p>
+          <div class="row fw-bold">
+            <div class="col"><%= _("Votes for this candidate") %></div>
+            <div class="col text-end"><%= _("Votes for the winning candidate") %></div>
+          </div>
+          <% n = 0 %>
+          <% c.mj.break_tie(@results.first.mj).each do |a, b| %>
+              <hr>
+            <% if n == 0 %>
+              <div class="row">
+                <div class="col"><%= _("Without removing any vote.") %></div>
+              </div>
+            <% end %>
+            <% if n == 1 %>
+              <div class="row">
+                <div class="col"><%= _("Removing 1 vote.") %></div>
+              </div>
+            <% end %>
+            <% if n > 1 %>
+              <div class="row">
+                <div class="col"><%= _("Removing %{n} votes.") % { n: n } %></div>
+              </div>
+            <% end %>
+            <table class="table table-borderless">
+              <tr>
+                <% (1..a.n).each do |i| %>
+                  <td class="text-center <% unless i == a.majority %>opacity-0<% end %>">↓</td>
+                <% end %>
+                <th class="w-100"></th>
+                <% (1..b.n).each do |i| %>
+                  <td class="text-center <% unless b.n - i + 1 == b.majority %>opacity-0<% end %>">↓</td>
+                <% end %>
+              </tr>
+              <tr>
+                <% settings.values.reverse.each do |v| %>
+                  <% (1..a.count[v[:id]]).each do |r| %>
+                    <td class="mj-cell-<%= v[:id] %>">&nbsp;</td>
+                  <% end %>
+                <% end %>
+                <td class="text-center fw-bold">
+                  <% if a.mj < b.mj %><<% end %>
+                  <% if a.mj > b.mj %>><% end %>
+                  <% if a.mj == b.mj %>=<% end %>
+                </td>
+                <% settings.values.each do |v| %>
+                  <% (1..b.count[v[:id]]).each do |r| %>
+                    <td class="mj-cell-<%= v[:id] %>">&nbsp;</td>
+                  <% end %>
+                <% end %>
+              </tr>
+            </table>
+            <% n = n + 1 %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>
 
 <div class="mb-5"></div>
 
-<h2 class="mb-4"><%= _("Ratings") %></h2>
+<h2 class="mb-4"><%= _("Ratings") + " (#{@vote.ratings.collect { |rating| rating.user }.uniq.count})" %></h2>
 
-<table class="table table-striped mb-5">
+<table class="table table-striped w-auto mb-5">
   <thead>
     <tr>
       <th><%= _("Participant") %></th>

views/votes_show_open.erb

@@ -32,7 +32,7 @@
 <% end %>
 
 <% if @voted %>
-  <p class="alert alert-success mb-4"><%= _("Gràcies per votar!") %></p>
+  <p class="alert alert-success mb-4"><%= _("Thank you for voting!") %></p>
 <% end %>
 
 <form action="/votes/<%= @vote.secure_id %>/ratings" method="post" class="mb-5">