Remove Poll Final Recounts, replace with Total Results

.gitignore

@@ -32,6 +32,3 @@
 
 public/sitemap.xml
 public/system/
-
-#Netbeans projects files
-/nbproject

.rubocop_todo.yml

@@ -283,7 +283,6 @@ Lint/ParenthesesAsGroupedExpression:
 # Cop supports --auto-correct.
 Lint/StringConversionInInterpolation:
   Exclude:
-    - 'app/models/poll/final_recount.rb'
     - 'app/models/poll/null_result.rb'
     - 'app/models/poll/partial_result.rb'
     - 'app/models/poll/white_result.rb'

.travis.yml

@@ -8,6 +8,7 @@ before_script:
   - "for i in config/*.example; do cp \"$i\" \"${i/.example}\"; done"
   - bundle exec rake db:setup
 script:
+  - "bundle exec rake assets:precompile RAILS_ENV=test"
   - "bundle exec rake knapsack:rspec"
 env:
   global:

app/assets/stylesheets/participation.scss

@@ -395,8 +395,8 @@
     }
   }
 
-  &.tags,
-  &.geozone {
+  .tags,
+  .geozone {
 
     li {
       margin-bottom: 0;
@@ -478,6 +478,7 @@
 
   .tags {
     display: block;
+    margin-bottom: 0;
 
     a {
       margin-right: rem-calc(6);
@@ -610,6 +611,14 @@
   }
 }
 
+.show-actions-menu {
+
+  [class^="icon-"] {
+    display: inline-block;
+    vertical-align: middle;
+  }
+}
+
 // 04. List participation
 // ----------------------
 

app/controllers/admin/poll/booth_assignments_controller.rb

@@ -15,7 +15,7 @@ def search_booths
   end
 
   def show
-    @booth_assignment = @poll.booth_assignments.includes(:final_recounts, :voters,
+    @booth_assignment = @poll.booth_assignments.includes(:total_results, :voters,
                                                          officer_assignments: [officer: [:user]]).find(params[:id])
     @voters_by_date = @booth_assignment.voters.group_by {|v| v.created_at.to_date}
   end

app/controllers/admin/poll/officer_assignments_controller.rb

@@ -18,7 +18,7 @@ def by_officer
     @officer = ::Poll::Officer.includes(:user).find(officer_assignment_params[:officer_id])
     @officer_assignments = ::Poll::OfficerAssignment.
                            joins(:booth_assignment).
-                           includes(:final_recounts, booth_assignment: :booth).
+                           includes(:total_results, booth_assignment: :booth).
                            where("officer_id = ? AND poll_booth_assignments.poll_id = ?", @officer.id, @poll.id).
                            order(:date)
   end

app/controllers/admin/poll/recounts_controller.rb

@@ -3,7 +3,7 @@ class Admin::Poll::RecountsController < Admin::BaseController
 
   def index
     @booth_assignments = @poll.booth_assignments.
-                              includes(:booth, :final_recounts, :voters).
+                              includes(:booth, :total_results, :voters).
                               order("poll_booths.name").
                               page(params[:page]).per(50)
   end

app/controllers/documents_controller.rb

@@ -48,6 +48,7 @@ def destroy
   def destroy_upload
     @document = Document.new(cached_attachment: params[:path])
     @document.set_attachment_from_cached_attachment
+    @document.cached_attachment = nil
     @document.documentable = @documentable
 
     if @document.attachment.destroy

app/helpers/communities_helper.rb

@@ -12,7 +12,7 @@ def community_description(community)
     community.from_proposal? ? t("community.show.description.proposal") : t("community.show.description.investment")
   end
 
-  def is_author?(community, participant)
+  def author?(community, participant)
     if community.from_proposal?
       community.proposal.author_id == participant.id
     else

app/helpers/documentables_helper.rb

@@ -9,7 +9,7 @@ def max_documents_allowed(documentable)
   end
 
   def max_file_size(documentable)
-    bytesToMeg(documentable.class.max_file_size)
+    bytes_to_mega(documentable.class.max_file_size)
   end
 
   def accepted_content_types(documentable)
@@ -38,4 +38,4 @@ def max_documents_allowed?(documentable)
     documentable.documents.count >= documentable.class.max_documents_allowed
   end
 
-end
+end

app/helpers/documents_helper.rb

@@ -8,7 +8,7 @@ def errors_on_attachment(document)
     document.errors[:attachment].join(', ') if document.errors.key?(:attachment)
   end
 
-  def bytesToMeg(bytes)
+  def bytes_to_mega(bytes)
     bytes / Numeric::MEGABYTE
   end
 

app/helpers/officing_helper.rb

@@ -1,13 +1,5 @@
 module OfficingHelper
 
-  def officer_assignments_select_options(officer_assignments)
-    options = []
-    officer_assignments.each do |oa|
-      options << ["#{oa.booth_assignment.booth.name}: #{l(oa.date.to_date, format: :long)}", oa.id]
-    end
-    options_for_select(options)
-  end
-
   def booths_for_officer_select_options(officer_assignments)
     options = []
     officer_assignments.each do |oa|
@@ -17,10 +9,6 @@ def booths_for_officer_select_options(officer_assignments)
     options_for_select(options, params[:oa])
   end
 
-  def system_recount_to_compare_with_final_recount(final_recount)
-    final_recount.booth_assignment.voters.select {|v| v.created_at.to_date == final_recount.date}.size
-  end
-
   def answer_result_value(question_id, answer_index)
     return nil if params.blank?
     return nil if params[:questions].blank?

app/helpers/poll_recounts_helper.rb

@@ -1,7 +1,7 @@
 module PollRecountsHelper
 
-  def booth_assignment_sum_final_recounts(ba)
-    ba.final_recounts.any? ? ba.final_recounts.to_a.sum(&:count) : nil
+  def total_recounts_by_booth(booth_assignment)
+    booth_assignment.total_results.any? ? booth_assignment.total_results.to_a.sum(&:amount) : nil
   end
 
 end

app/helpers/polls_helper.rb

@@ -28,11 +28,6 @@ def poll_dates_select_options(poll)
     options_for_select(options, params[:d])
   end
 
-  def poll_final_recount_option(poll)
-    final_date = poll.ends_at.to_date + 1.day
-    options_for_select([[I18n.t("polls.final_date"), l(final_date)]])
-  end
-
   def poll_booths_select_options(poll)
     options = []
     poll.booths.each do |booth|
@@ -46,4 +41,4 @@ def booth_name_with_location(booth)
     booth.name + location
   end
 
-end
+end

app/helpers/proposals_helper.rb

@@ -32,4 +32,16 @@ def retire_proposals_options
     Proposal::RETIRE_OPTIONS.collect { |option| [ t("proposals.retire_options.#{option}"), option ] }
   end
 
+  def can_create_document?(document, proposal)
+    can?(:create, document) && proposal.documents.size < Proposal.max_documents_allowed
+  end
+
+  def author_of_proposal?(proposal)
+    author_of?(proposal, current_user)
+  end
+
+  def current_editable?(proposal)
+    current_user && proposal.editable_by?(current_user)
+  end
+
 end

app/models/poll/booth_assignment.rb

@@ -4,7 +4,6 @@ class BoothAssignment < ActiveRecord::Base
     belongs_to :poll
 
     has_many :officer_assignments, class_name: "Poll::OfficerAssignment", dependent: :destroy
-    has_many :final_recounts, class_name: "Poll::FinalRecount", dependent: :destroy
     has_many :officers, through: :officer_assignments
     has_many :voters
     has_many :partial_results

app/models/poll/officer_assignment.rb

@@ -2,8 +2,10 @@ class Poll
   class OfficerAssignment < ActiveRecord::Base
     belongs_to :officer
     belongs_to :booth_assignment
-    has_many :final_recounts
     has_many :partial_results
+    has_many :white_results
+    has_many :null_results
+    has_many :total_results
     has_many :voters
 
     validates :officer_id, presence: true

app/models/poll/shift.rb

@@ -26,4 +26,4 @@ def persist_data
     end
 
   end
- end
+end

app/views/admin/poll/booth_assignments/show.html.erb

@@ -49,18 +49,18 @@
       <thead>
         <tr>
           <th><%= t("admin.poll_booth_assignments.show.date") %></th>
-          <th class="text-center"><%= t("admin.poll_booth_assignments.show.count_final") %></th>
+          <th class="text-center"><%= t("admin.poll_booth_assignments.show.total_recount") %></th>
           <th class="text-center"><%= t("admin.poll_booth_assignments.show.count_by_system") %></th>
         </tr>
       </thead>
       <tbody>
       <% (@poll.starts_at.to_date..@poll.ends_at.to_date).each do |voting_date| %>
-        <% final_recount = final_recount_for_date(@booth_assignment.final_recounts, voting_date) %>
+        <% total_recount = @booth_assignment.total_results.where(date: voting_date).first %>
         <% system_count = @voters_by_date[voting_date].present? ? @voters_by_date[voting_date].size : 0 %>
         <tr id="recounting_<%= voting_date.strftime('%Y%m%d') %>">
           <td><%= l voting_date %></td>
-          <% if final_recount.present? %>
-            <td class="text-center <%= 'count-error' if final_recount.count != system_count %>" title="<%= final_recount.officer_assignment.officer.name %>"><%= final_recount.count %></td>
+          <% if total_recount.present? %>
+            <td class="text-center <%= 'count-error' if total_recount.amount != system_count %>" title="<%= total_recount.officer_assignment.officer.name %>"><%= total_recount.amount %></td>
           <% else %>
             <td class="text-center" title=""> - </td>
           <% end %>

app/views/admin/poll/officer_assignments/by_officer.html.erb

@@ -27,27 +27,24 @@
       <% end %>
     </tbody>
   </table>
-<% end %>
 
-<% final_officer_assignments = @officer_assignments.select{|oa| oa.final == true} %>
-<% if final_officer_assignments.any? %>
-  <h3><%= t("admin.poll_officer_assignments.by_officer.final_recounts") %></h3>
-  <table id="final_recount_list" class="fixed">
+  <h3><%= t("admin.poll_officer_assignments.by_officer.total_recounts") %></h3>
+  <table id="total_recount_list" class="fixed">
     <thead>
       <tr>
         <th><%= t("admin.poll_officer_assignments.by_officer.date") %></th>
         <th><%= t("admin.poll_officer_assignments.by_officer.booth") %></th>
-        <th class="text-right"><%= t("admin.poll_officer_assignments.by_officer.final_recount") %></th>
+        <th class="text-right"><%= t("admin.poll_officer_assignments.by_officer.total_recount") %></th>
       </tr>
     </thead>
     <tbody>
-      <% final_officer_assignments.each do |officer_assignment| %>
-          <tr id="final_recount_<%= officer_assignment.date.to_date.strftime('%Y%m%d') %>">
+      <% @officer_assignments.each do |officer_assignment| %>
+          <tr id="total_recount_<%= officer_assignment.date.to_date.strftime('%Y%m%d') %>">
             <td><%= l(officer_assignment.date.to_date) %></td>
             <td><%= booth_name_with_location(officer_assignment.booth_assignment.booth) %></td>
             <td class="text-right">
-              <% if officer_assignment.final_recounts.any? %>
-                <%= officer_assignment.final_recounts.to_a.sum(&:count) %>
+              <% if officer_assignment.total_results.any? %>
+                <%= officer_assignment.total_results.to_a.sum(&:amount) %>
               <% else %>
                 <span>-</span>
               <% end %>

app/views/admin/poll/recounts/index.html.erb

@@ -12,22 +12,22 @@
     <table class="fixed margin">
       <thead>
         <th><%= t("admin.recounts.index.table_booth_name") %></th>
-        <th class="text-center"><%= t("admin.recounts.index.table_final_recount") %></th>
+        <th class="text-center"><%= t("admin.recounts.index.table_total_recount") %></th>
         <th class="text-center"><%= t("admin.recounts.index.table_system_count") %></th>
       </thead>
       <tbody>
         <% @booth_assignments.each do |booth_assignment| %>
-          <% final_recount = booth_assignment_sum_final_recounts(booth_assignment) %>
+          <% total_recounts = total_recounts_by_booth(booth_assignment) %>
           <% system_count = booth_assignment.voters.size %>
           <tr id="<%= dom_id(booth_assignment) %>_recounts" class="booth_recounts">
             <td>
               <strong>
                 <%= link_to booth_assignment.booth.name, admin_poll_booth_assignment_path(@poll, booth_assignment, anchor: 'tab-recounts') %>
               </strong>
             </td>
-            <td class="text-center <%= 'count-error' if final_recount.to_i != system_count %>">
-              <% if final_recount.present? %>
-                <strong><%= final_recount %></strong>
+            <td class="text-center <%= 'count-error' if total_recounts.to_i != system_count %>">
+              <% if total_recounts.present? %>
+                <strong><%= total_recounts %></strong>
               <% else %>
                 <span>-</span>
               <% end %>

app/views/communities/_participant.html.erb

@@ -9,7 +9,7 @@
         <%= link_to participant.name, user_path(participant)%>
       </span>
 
-      <% if is_author?(@community, participant) %>
+      <% if author?(@community, participant) %>
         &nbsp;&bull;&nbsp;
         <span class="label round is-author">
             <%= t("comments.comment.author") %>

app/views/officing/_menu.html.erb

@@ -8,10 +8,10 @@
       <% end %>
     </li>
 
-    <li <%= "class=active" if ["final_recounts", "results"].include?(controller_name) || (controller_name == "polls" && action_name == "final") %>>
+    <li <%= "class=active" if ["results"].include?(controller_name) || (controller_name == "polls" && action_name == "final") %>>
       <%= link_to final_officing_polls_path do %>
         <span class="icon-user"></span>
-        <%= t("officing.menu.final_recounts") %>
+        <%= t("officing.menu.total_recounts") %>
       <% end %>
     </li>
   </ul>