Explain better which vote is removed

This commit is contained in:
ricola 2026-01-20 21:43:11 -06:00
parent 92a512be26
commit ea1cb054f2
2 changed files with 22 additions and 4 deletions

View file

@ -27,3 +27,7 @@ table:has(.mj-cell:hover) .mj-cell {
border-right-width: 2px; border-right-width: 2px;
border-color: var(--bs-body-color); border-color: var(--bs-body-color);
} }
table:has(.mj-cell:hover) .mj-cell-majority {
background-color: white !important;
}

View file

@ -86,6 +86,7 @@
<div class="col text-end"><%= _("Votes for the winning candidate") %></div> <div class="col text-end"><%= _("Votes for the winning candidate") %></div>
</div> </div>
<% n = 0 %> <% n = 0 %>
<% previous = 0 %>
<% c.mj.break_tie(@results.first.mj).each do |a, b| %> <% c.mj.break_tie(@results.first.mj).each do |a, b| %>
<hr> <hr>
<% if n == 0 %> <% if n == 0 %>
@ -94,15 +95,24 @@
</div> </div>
<% end %> <% end %>
<% if n == 1 %> <% if n == 1 %>
<% value = settings.values.select { |e| e[:id] == previous }.first %>
<div class="row"> <div class="row">
<div class="col"><%= _("Removing 1 vote.") %></div> <div class="col">
<%= _("Removing a vote of value: ") %>
<span class="badge bg-<%= value[:id] %>"><%= _(value[:label]) %></span>
</div>
</div> </div>
<% end %> <% end %>
<% if n > 1 %> <% if n > 1 %>
<% value = settings.values.select { |e| e[:id] == previous }.first %>
<div class="row"> <div class="row">
<div class="col"><%= _("Removing %{n} votes.") % { n: n } %></div> <div class="col">
<%= _("Removing another vote of value: ") %>
<span class="badge bg-<%= value[:id] %>"><%= _(value[:label]) %></span>
</div>
</div> </div>
<% end %> <% end %>
<% previous = a.mj %>
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<% (1..a.n).each do |i| %> <% (1..a.n).each do |i| %>
@ -114,9 +124,11 @@
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<% i = 0 %>
<% settings.values.reverse.each do |v| %> <% settings.values.reverse.each do |v| %>
<% (1..a.count[v[:id]]).each do |r| %> <% (1..a.count[v[:id]]).each do |r| %>
<td class="p-0 mj-cell mj-cell-<%= v[:id] %>">&nbsp;</td> <% i = i + 1 %>
<td class="p-0 mj-cell mj-cell-<%= v[:id] %><% if i == a.majority and a.mj == b.mj %> mj-cell-majority<% end %>">&nbsp;</td>
<% end %> <% end %>
<% end %> <% end %>
<td class="p-0 text-center fw-bold"> <td class="p-0 text-center fw-bold">
@ -124,9 +136,11 @@
<% if a.mj > b.mj %>><% end %> <% if a.mj > b.mj %>><% end %>
<% if a.mj == b.mj %>=<% end %> <% if a.mj == b.mj %>=<% end %>
</td> </td>
<% i = 0 %>
<% settings.values.each do |v| %> <% settings.values.each do |v| %>
<% (1..b.count[v[:id]]).each do |r| %> <% (1..b.count[v[:id]]).each do |r| %>
<td class="p-0 mj-cell mj-cell-<%= v[:id] %>">&nbsp;</td> <% i = i + 1 %>
<td class="p-0 mj-cell mj-cell-<%= v[:id] %><% if b.n - i + 1 == b.majority and a.mj == b.mj %> mj-cell-majority<% end %>">&nbsp;</td>
<% end %> <% end %>
<% end %> <% end %>
</tr> </tr>