decidim-elections 0.24.2 → 0.25.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8414925366e44915c932575b8021181033962a05403e4bc9140e7aa1b9a0d48c
-  data.tar.gz: 9ea5df1b262ba477ddaed6aefea7aff40f7fb0781fc8719e8dd03e8317dd5942
+  metadata.gz: 15eb8c4bc2f68a806729435bfbf2d39a65b35220392f2718f21d8663e9fe8cb3
+  data.tar.gz: 16a2fa22e2f97e5d249c924c97dcd257b4455c006fd9fc97aa30de2932a39666
 SHA512:
-  metadata.gz: 6f8610f4681ce2e0611ab7ce9301cecae6b1f785cc6a08674e1a20dcbb0477c37daf0ca810f26471c1a62edd05093d87248372c18f96e5aa0c4ec1447e5cb17a
-  data.tar.gz: b6eab3b1a88887dd69f599db58c02633c5b8028504ec1f32e080c959e71933e33a22fc04c3ade35afd9ba9e1da0a4847e25c6b41b206a162cf3b4cf9403e5f30
+  metadata.gz: a08061c7f416115d575fd0ee75831acf799e90a193fb21de45f800ab5a62d2634a3c44cd4761c04f701b776a8894c5bfd2157b80766ee5ee666fd835bc23cc8e
+  data.tar.gz: 9a84bfc7b67ef860d0825cf37144e4c141cedc93a82deebd19a5632e1f19b0947dc94d1a73e923c33cd6234c4eaa35af73c8c95464637d4c2cb4a87ec8079d8c

data/README.md

@@ -24,6 +24,19 @@ And then execute:
 bundle
 ```
 
+## Configuration
+
+### Scheduled tasks
+
+For the Elections module to function as expected, there are some background tasks that should be scheduled to be executed regularly. Alternatively you could use `whenever` gem or the scheduled jobs of your hosting provider.
+
+You can configure it with `crontab -e`, for instance if you've created your Decidim application on /home/user/decidim_application:
+```
+# Remove census export files
+0 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim_votings_census:delete_census_access_codes_export
+```
+
+
 ## Contributing
 
 See [Decidim](https://github.com/decidim/decidim).

data/app/cells/decidim/elections/election_m/tags.erb

@@ -0,0 +1,3 @@
+<div class="card__callout">
+  <%= cell "decidim/elections/remaining_time_callout", model %>
+</div>

data/app/cells/decidim/elections/election_m_cell.rb

@@ -80,13 +80,6 @@ module Decidim
         model.end_time.to_date
       end
 
-      def questions_count_status
-        content_tag(
-          :strong,
-          t("decidim.elections.election_m.questions", count: model.questions.count)
-        )
-      end
-
       def footer_button_text
         if model.ongoing?
           t("decidim.elections.election_m.footer.vote")
@@ -96,7 +89,7 @@ module Decidim
       end
 
       def statuses
-        [:questions_count]
+        []
       end
     end
   end

data/app/cells/decidim/elections/election_preview/show.erb

@@ -0,0 +1,28 @@
+<div class="row">
+  <div class="columns large-8">
+    <h2 class="section-heading"><%= t("decidim.elections.elections.preview.title") %></h2>
+
+    <p><%= t("decidim.elections.elections.preview.description") %></p>
+
+    <ul class="accordion mb-m evote__preview"
+      data-accordion
+      data-multi-expand="true"
+      data-allow-all-closed="true">
+      <% model.questions.each do |question| %>
+        <li class="accordion-item evote__preview-question <%= " is-active" if model.questions.one? %>" data-accordion-item>
+          <a href="#" class="accordion-title flex--sbc"><%= translated_attribute(question.title) %></a>
+
+          <div class="accordion-content" data-tab-content>
+            <strong><%= t("decidim.elections.elections.preview.available_answers") %></strong>
+
+            <ul>
+              <% question.answers.each do |answer| %>
+                <li><%= translated_attribute(answer.title) %></li>
+              <% end %>
+            </ul>
+          </div>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/cells/decidim/elections/election_preview_cell.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    # This cell renders the questions preview
+    # for a given instance of an Election
+    class ElectionPreviewCell < Decidim::ViewModel
+      def show
+        render unless model.finished?
+      end
+    end
+  end
+end

data/app/cells/decidim/elections/election_results/blank_votes.erb

@@ -0,0 +1,7 @@
+<div class="evote__preview-result">
+  <h3 class="evote__preview-option">
+    <%= t("decidim.elections.votes.new.nota_option") %>
+  </h3>
+
+  <%= render view: :progress_bar, locals: { results_percentage: question.blank_votes_percentage, results_total: question.blank_votes } %>
+</div>

data/app/cells/decidim/elections/election_results/progress_bar.erb

@@ -0,0 +1,16 @@
+<div class="progress__bar">
+  <div class="evote__preview-bar">
+    <div class="progress progress__bar__bar" role="progressbar" tabindex="0" aria-valuenow="<%= results_percentage %>%" aria-valuemin="0" aria-valuetext="<%= results_percentage %>% percent" aria-valuemax="100">
+      <div class="progress-meter progress__bar__bar--complete" style="width: <%= results_percentage %>%"></div>
+      <div class="progress__bar__bar--incomplete" style="width:calc(100% - <%= results_percentage %>%);"></div>
+    </div>
+
+    <div class="evote__preview-perc">
+      <%= t("decidim.elections.elections.results.percentage", count: results_percentage) %>
+    </div>
+  </div>
+
+  <div class="evote__preview-label">
+    <%= t("decidim.elections.elections.results.votes", count: results_total) %>
+  </div>
+</div>

data/app/cells/decidim/elections/election_results/show.erb

@@ -0,0 +1,40 @@
+<div class="row">
+  <div class="columns large-8">
+    <h2 class="section-heading"><%= t("decidim.elections.elections.results.title") %></h2>
+
+    <p><%= t("decidim.elections.elections.results.description") %></p>
+
+    <ul class="accordion mb-m evote__preview"
+      data-accordion
+      data-multi-expand="true"
+      data-allow-all-closed="true">
+      <% model.questions.each_with_index do |question, i| %>
+        <li class="accordion-item evote__preview-question <%= " is-active" if i == 0 %>" data-accordion-item>
+          <a href="#" class="accordion-title flex--sbc"><%= translated_attribute(question.title) %></a>
+
+          <div class="accordion-content" data-tab-content>
+            <% question.answers.each do |answer| %>
+              <div class="evote__preview-result">
+                <h3 class="evote__preview-option">
+                  <%= translated_attribute(answer.title) %>
+
+                  <% if answer.selected? %>
+                    <span class="label label--small label--highlight">
+                      <%= t("decidim.elections.elections.results.selected") %>
+                    </span>
+                  <% end %>
+                </h3>
+
+                <%= render view: :progress_bar, locals: { results_percentage: answer.results_percentage, results_total: answer.results_total } %>
+              </div>
+            <% end %>
+
+            <% if question.results.blank_answers.any? %>
+              <%= render view: :blank_votes, locals: { question: question } %>
+            <% end %>
+          </div>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/cells/decidim/elections/election_results_cell.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    # This cell renders the results
+    # for a given instance of an Election
+    class ElectionResultsCell < Decidim::ViewModel
+      def show
+        render if model.results_published?
+      end
+    end
+  end
+end

data/app/cells/decidim/elections/election_vote_cta/show.erb

@@ -0,0 +1,35 @@
+<% if model.ongoing? && already_voted? %>
+  <%= cell("decidim/announcement", callout_text) %>
+<% end %>
+
+<div>
+  <% if model.ongoing? %>
+    <% if vote_flow.login_path(new_election_vote_path) %>
+      <%= link_to vote_flow.login_path(new_election_vote_path), class: "button button--sc" do %>
+        <%= vote_action_button_text %>
+      <% end %>
+    <% else %>
+      <%= action_authorized_link_to :vote, new_election_vote_path, resource: model, class: "button button--sc" do %>
+        <%= vote_action_button_text %>
+      <% end %>
+    <% end %>
+  <% elsif !model.finished? %>
+    <span class="button button--sc disabled"><%= t("action_button.vote", scope: "decidim.elections.elections.show") %></span>
+  <% end %>
+
+  <% if preview_mode? && can_preview? %>
+    <%= link_to new_election_vote_path, class: "button button--sc" do %>
+      <%= t("preview", scope: "decidim.elections.elections.show") %>
+    <% end %>
+  <% end %>
+</div>
+
+<div class="text-sm">
+<% if model.started? %>
+  <%= t("verify.already_voted", scope: "decidim.elections.elections.show") %>
+
+  <%= link_to t("verify.verify_here", scope: "decidim.elections.elections.show"), election_vote_verify_path %>
+<% else %>
+  <span class="disabled"><%= t("verify.will_verify", scope: "decidim.elections.elections.show") %></span>
+<% end %>
+</div>

data/app/cells/decidim/elections/election_vote_cta_cell.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    # This cell renders the results
+    # for a given instance of an Election
+    class ElectionVoteCtaCell < Decidim::ViewModel
+      delegate :current_user,
+               :current_participatory_space,
+               :preview_mode?,
+               :can_preview?,
+               :vote_flow,
+               to: :controller
+
+      private
+
+      def last_vote
+        @last_vote ||= Decidim::Elections::Votes::LastVoteForVoter.for(model, vote_flow.voter_id) if vote_flow.has_voter?
+      end
+
+      def new_election_vote_path
+        engine_router.new_election_vote_path(
+          "#{key_participatory_space_slug}": current_participatory_space.slug,
+          component_id: current_component.id,
+          election_id: model.id
+        )
+      end
+
+      def vote_action_button_text
+        if !already_voted?
+          t("action_button.vote", scope: "decidim.elections.elections.show")
+        elsif last_vote_accepted?
+          t("action_button.change_vote", scope: "decidim.elections.elections.show")
+        else
+          t("action_button.vote_again", scope: "decidim.elections.elections.show")
+        end
+      end
+
+      def election_vote_verify_path
+        engine_router.election_vote_verify_path(
+          "#{key_participatory_space_slug}": current_participatory_space.slug,
+          component_id: current_component.id,
+          election_id: model.id,
+          vote_id: "_"
+        )
+      end
+
+      def callout_text
+        if last_vote_pending?
+          t("callout.pending_vote", scope: "decidim.elections.elections.show")
+        elsif last_vote_accepted?
+          t("callout.already_voted", scope: "decidim.elections.elections.show")
+        else
+          t("callout.vote_rejected", scope: "decidim.elections.elections.show")
+        end
+      end
+
+      def already_voted?
+        last_vote.present?
+      end
+
+      def last_vote_pending?
+        !!last_vote&.pending?
+      end
+
+      def last_vote_accepted?
+        !!last_vote&.accepted?
+      end
+
+      def current_component
+        model.component
+      end
+
+      def key_participatory_space_slug
+        "#{current_participatory_space.underscored_name}_slug".to_sym
+      end
+
+      def engine_router
+        @engine_router ||= EngineRouter.main_proxy(current_component || model)
+      end
+    end
+  end
+end

data/app/cells/decidim/elections/remaining_time_callout/show.erb

@@ -0,0 +1,5 @@
+<% if needs_to_show_remaining_time? %>
+  <div class="callout secondary">
+    <%= remaining_time %>
+  </div>
+<% end %>

data/app/cells/decidim/elections/remaining_time_callout_cell.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    class RemainingTimeCalloutCell < Decidim::ViewModel
+      helper_method :needs_to_show_remaining_time?, :remaining_time
+
+      private
+
+      def needs_to_show_remaining_time?
+        model.ongoing? && model.end_time < 12.hours.from_now
+      end
+
+      def remaining_time
+        minutes_to_end = ((model.end_time - Time.current) / 60).floor
+        t("remaining_time", count: remaining_hours(minutes_to_end), minutes: remaining_minutes(minutes_to_end), scope: "decidim.elections.election_m.footer")
+      end
+
+      def remaining_hours(minutes_to_end)
+        minutes_to_end / 60
+      end
+
+      def remaining_minutes(minutes_to_end)
+        minutes_to_end % 60
+      end
+    end
+  end
+end

data/app/cells/decidim/elections/voting_step_navigation/show.erb

@@ -4,7 +4,7 @@
       <a></a>
     <% else %>
       <%= link_to(
-        icon("chevron-left", class: "icon", role: "img") + " " + t("decidim.elections.votes.voting_step.back"),
+        icon("chevron-left", class: "icon", role: "img", "aria-hidden": true) + " " + t("decidim.elections.votes.voting_step.back"),
         "#",
         class: "focus__back",
         data: {

data/app/cells/decidim/elections/voting_step_navigation_cell.rb

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def button_continue_text
-        "#{t("decidim.elections.votes.voting_step.continue")}  #{icon("chevron-right", class: "icon", role: "img")}"
+        "#{t("decidim.elections.votes.voting_step.continue")}  #{icon("chevron-right", class: "icon", role: "img", "aria-hidden": true)}"
       end
 
       def previous_step_dom_id

data/app/cells/decidim/votings/content_blocks/highlighted_votings/show.erb

@@ -8,7 +8,7 @@
           <div class="column">
             <%= link_to decidim_votings.voting_path(voting), class: "card card--voting card--mini" do %>
               <div aria-hidden="true" class="card__image-top"
-                style="background-image:url(<%= voting.banner_image.url %>)"></div>
+                style="background-image:url(<%= voting.attached_uploader(:banner_image).path %>)"></div>
               <div class="card__content">
                 <span class="card__title card__link"><%= translated_attribute voting.title %></span>
               </div>

data/app/cells/decidim/votings/content_blocks/landing_page/attachments_and_folders_cell.rb

@@ -5,8 +5,15 @@ module Decidim
     module ContentBlocks
       module LandingPage
         class AttachmentsAndFoldersCell < Decidim::ViewModel
+          include Cell::ViewModel::Partial
+          include Decidim::IconHelper
+          include ActiveSupport::NumberHelper
+          include Decidim::AttachmentsHelper
+
+          delegate :current_participatory_space, to: :controller
+
           def show
-            content_tag(:div, "AttachmentsAndFoldersCell")
+            attachments_for(current_participatory_space)
           end
         end
       end

data/app/cells/decidim/votings/content_blocks/landing_page/description/show.erb

@@ -0,0 +1,25 @@
+<div class="row section voting-description-cell">
+  <div class="columns">
+    <% if introductory_image.attached? %>
+      <div id="introductory-image" class="columns medium-4 mediumlarge-5">
+        <img src="<%= introductory_image.path %>" alt="">
+      </div>
+    <% end %>
+    <div class="columns medium-8 mediumlarge-7 content">
+      <div><%= description_text %></div>
+    </div>
+    <div class="content-height-toggler show-more">
+      <button class="button button--muted tiny">
+        <span class="button-text show-more-content">
+          <%= button_show_more_text %>
+        </span>
+
+        <span class="button-text show-less-content hide">
+          <%= button_show_less_text %>
+        </span>
+      </button>
+    </div>
+  </div>
+</div>
+
+<%= javascript_pack_tag "decidim_votings_voting_description_cell" %>

data/app/cells/decidim/votings/content_blocks/landing_page/description_cell.rb

@@ -5,8 +5,26 @@ module Decidim
     module ContentBlocks
       module LandingPage
         class DescriptionCell < Decidim::ViewModel
-          def show
-            content_tag(:div, "VotingDescriptionCell")
+          include Decidim::SanitizeHelper
+
+          delegate :current_participatory_space, to: :controller
+
+          private
+
+          def introductory_image
+            current_participatory_space.attached_uploader(:introductory_image)
+          end
+
+          def description_text
+            decidim_sanitize(translated_attribute(current_participatory_space.description))
+          end
+
+          def button_show_more_text
+            t(:show_more, scope: "decidim.votings.content_blocks.landing_page.description")
+          end
+
+          def button_show_less_text
+            t(:show_less, scope: "decidim.votings.content_blocks.landing_page.description")
           end
         end
       end