From 9810cdb615e9c4b5c7acf931f5b90c8837a39261 Mon Sep 17 00:00:00 2001
From: ricola <ricola@poivron.org>
Date: Sun, 6 Apr 2025 17:04:31 -0600
Subject: [PATCH] Configure rating scale as class instance variable of
 MajorityJudgment

---
 mj.rb                       | 10 ++++++++--
 views/votes_show_closed.erb |  4 ++--
 views/votes_show_open.erb   | 16 +++++++---------
 vote.rb                     |  8 ++++++++
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/mj.rb b/mj.rb
index 7f44aec..5cfa284 100644
--- a/mj.rb
+++ b/mj.rb
@@ -1,8 +1,14 @@
 class MajorityJudgment
 
+  @values = nil
+
   include Comparable
   attr_reader :ratings, :count, :n, :majority
 
+  class << self
+    attr_accessor :values
+  end
+
   def initialize(arg)
     if arg.is_a?(Array)
       @ratings = arg
@@ -22,7 +28,7 @@ class MajorityJudgment
 
   def mj
     s = 0
-    (1..7).to_a.reverse.each do |r|
+    (1..self.class.values.length).to_a.reverse.each do |r|
       s = s + @count[r] if @count[r]
       return r if s >= @majority
     end
@@ -31,7 +37,7 @@ class MajorityJudgment
 
   def proponents(rating = self.mj)
     p = 0
-    (rating+1..7).to_a.reverse.each do |r|
+    (rating+1..self.class.values.length).to_a.reverse.each do |r|
       p = p + @count[r] if @count[r]
     end
     return p
diff --git a/views/votes_show_closed.erb b/views/votes_show_closed.erb
index 7eaa696..a90d288 100644
--- a/views/votes_show_closed.erb
+++ b/views/votes_show_closed.erb
@@ -16,7 +16,7 @@
     <td><%= user.email %></td>
     <% @vote.candidates.each do |candidate| %>
     <% if rating = @vote.ratings.find { |rating| rating.user == user and rating.candidate == candidate } %>
-    <td><%= rating.value %></td>
+    <td><%= settings.values.select { |e| e[:id] == rating.value }.first[:label] %></td>
     <% end %>
     <% end %>
   </tr>
@@ -27,7 +27,7 @@
 
 <ol>
   <% @vote.candidates.sort { |a, b| a.mj <=> b.mj }.reverse.each do |candidate| %>
-  <li><%= candidate.name %>: <%= candidate.mj.mj %></li>
+  <li><%= candidate.name %>: <%= settings.values.select { |e| e[:id] == candidate.mj.mj }.first[:label] %></li>
   <% end %>
 </ol>
 
diff --git a/views/votes_show_open.erb b/views/votes_show_open.erb
index eed4a5b..b9d8943 100644
--- a/views/votes_show_open.erb
+++ b/views/votes_show_open.erb
@@ -8,21 +8,19 @@
 
 <form action="/votes/<%= @vote.secure_id %>/ratings" method="post">
 <ul>
-<% @vote.candidates.each do |candidate| %>
+  <% @vote.candidates.each do |candidate| %>
+  <% rating = @vote.ratings.find { |rating| rating.user == current_user and rating.candidate == candidate } %>
+  <% value = rating ? rating.value : 0 %>
   <li>
     <p><%= candidate.name %></p>
     <p><%= candidate.description %></p>
     <ol>
-      <input type="radio" name="<%= candidate.id %>" id="<%= candidate.id %>-7" value="7" <% if @vote.ratings.find { |rating| rating.user == current_user and rating.candidate == candidate and rating.value == 7 } %>checked<% end %>><label for="<%= candidate.id %>-7">Excellent</label>
-      <input type="radio" name="<%= candidate.id %>" id="<%= candidate.id %>-6" value="6" <% if @vote.ratings.find { |rating| rating.user == current_user and rating.candidate == candidate and rating.value == 6 } %>checked<% end %>><label for="<%= candidate.id %>-6">Very good</label>
-      <input type="radio" name="<%= candidate.id %>" id="<%= candidate.id %>-5" value="5" <% if @vote.ratings.find { |rating| rating.user == current_user and rating.candidate == candidate and rating.value == 5 } %>checked<% end %>><label for="<%= candidate.id %>-5">Good</label>
-      <input type="radio" name="<%= candidate.id %>" id="<%= candidate.id %>-4" value="4" <% if @vote.ratings.find { |rating| rating.user == current_user and rating.candidate == candidate and rating.value == 4 } %>checked<% end %>><label for="<%= candidate.id %>-4">Mediocre</label>
-      <input type="radio" name="<%= candidate.id %>" id="<%= candidate.id %>-3" value="3" <% if @vote.ratings.find { |rating| rating.user == current_user and rating.candidate == candidate and rating.value == 3 } %>checked<% end %>><label for="<%= candidate.id %>-3">Bad</label>
-      <input type="radio" name="<%= candidate.id %>" id="<%= candidate.id %>-2" value="2" <% if @vote.ratings.find { |rating| rating.user == current_user and rating.candidate == candidate and rating.value == 2 } %>checked<% end %>><label for="<%= candidate.id %>-2">Very bad</label>
-      <input type="radio" name="<%= candidate.id %>" id="<%= candidate.id %>-1" value="1" <% if @vote.ratings.find { |rating| rating.user == current_user and rating.candidate == candidate and rating.value == 1 } %>checked<% end %>><label for="<%= candidate.id %>-1">Awful</label>
+      <% settings.values.reverse.each do |v| %>
+      <input type="radio" name="<%= candidate.id %>" id="<%= candidate.id %>-<%= v[:id] %>" value="<%= v[:id] %>" <% if value == v[:id] %>checked<% end %>><label for="<%= candidate.id %>-<%= v[:id] %>"><%= v[:label] %></label>
+      <% end %>
     </ol>
   </li>
-<% end %>
+  <% end %>
 </ul>
 <button type="submit">Save ratings</button>
 </form>
diff --git a/vote.rb b/vote.rb
index 0c53d72..4031bd6 100644
--- a/vote.rb
+++ b/vote.rb
@@ -51,6 +51,14 @@ def verify_password(password, hash)
 end
 
 enable :sessions
+set :values, [ { :id => 1, :label => "Awful" },
+               { :id => 2, :label => "Very bad" },
+               { :id => 3, :label => "Bad" },
+               { :id => 4, :label => "Mediocre" },
+               { :id => 5, :label => "Good" },
+               { :id => 6, :label => "Very good" },
+               { :id => 7, :label => "Excellent" } ]
+MajorityJudgment.values = settings.values
 
 get '/' do
   redirect '/login' unless current_user