decidim-consultations 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc706fdf5d89c2cd17fbb386c30fee7853848187352cf1474e1c89331d252043
-  data.tar.gz: 99a45a9787dc797826602401ec211a76a3fb388196ce2a7306000a83b8416bc6
+  metadata.gz: 0e211d930720567fda60e8679412d8b5242242f3e4910268c5621a5cb15843b7
+  data.tar.gz: 9f90cf27d78ae903ff0558b2351dc3f746ef4f30a2b70fdc0f1bc56a024bb6f1
 SHA512:
-  metadata.gz: e13562d482ad263b61e25a6db96c98d20def973cf41a26140fc656b912787693e4a3ebbd10b8e641f7ad4239315aaf571b1f225b543cfb2b7becbdedf32c2fb7
-  data.tar.gz: f7861c99459950fa1d7ca9c3c8a6d2b6d2ec529640bd65cc1c7774dcb8fd405cbd44493687edc6e9e5d455c0f502b5ca31d92ee0088f290cac831a9b83aed1e1
+  metadata.gz: 12c499d436225a6c0824558b793fc8807277d9b38b71f2e0a40d5567effa7d3b2fc175576fc5a4aa8414010ec48becd108bc08a29847929df6766462e35597fe
+  data.tar.gz: b1b4e4ca6e93212b39cf72b01a90be8746586b38db8c5d3068ab6e0b763b036b5a8740be792e4d7f81004a05488595d9177662257c6c4584b222bcbf445aed44

data/app/assets/config/decidim_consultations_manifest.css

@@ -1,4 +1,3 @@
 /*
- *= link decidim/consultations/social_share.css.scss
  *= link decidim/consultations/highlighted-content-banner.css.scss
  */

data/app/assets/config/decidim_consultations_manifest.js

@@ -1,5 +1,5 @@
 //= link_directory ../images/decidim/consultations
-//= link decidim/consultations/social_share.js
 //= link decidim/consultations/utils.js
+//= link decidim/consultations/utils_multiple.js
 //= link decidim/consultations/vote_dialog.js
 //= link decidim/consultations/show_more.js

data/app/assets/javascripts/decidim/consultations/utils_multiple.js

@@ -0,0 +1,21 @@
+/* eslint-disable no-invalid-this, no-undefined */
+
+$(document).ready(function () {
+  let $remainingVotesCount = $("#remaining-votes-count");
+  $('form .multiple_votes_form input[type="checkbox"]').on("change", function(event) {
+    let max = parseInt($remainingVotesCount.text(), 10);
+    if ($(this).is(":checked")) {
+      max -= 1;
+    }
+    else {
+      max += 1;
+    }
+    if (max < 0) {
+      $(this).attr("checked", false);
+      event.preventDefault();
+    }
+    else {
+      $remainingVotesCount.text(max);
+    }
+  });
+});

data/app/assets/javascripts/decidim/consultations/vote_dialog.js

@@ -30,7 +30,20 @@ $(document).ready(function () {
     });
   }
 
+  $("#confirm-vote-form").on("ajax:beforeSend", function() {
+    $("#confirm-vote-form-loader,#confirm-vote-form").toggleClass("hide");
+  });
+
   $("#confirm-vote-form").on("ajax:success", function() {
     voteConfirmDialog.foundation("close");
   });
+
+  $("#confirm-vote-form").on("ajax:error", function(event) {
+    const error = event && event.detail && event.detail[0].error;
+    $("#vote-result-callout").addClass("alert").removeClass("hide warning");
+    $("#vote-result-callout .callout-title").text($("#vote-result-callout").data("title-ko"));
+    $("#vote-result-callout .callout-message").text(error || $("#vote-result-callout").data("message-ko"));
+    $("#confirm-vote-form-loader,#confirm-vote-form").toggleClass("hide");
+    voteConfirmDialog.foundation("close");
+  });
 });

data/app/cells/decidim/consultations/consultation_m/data.erb

@@ -6,14 +6,14 @@
     <li class="card-data__item">
       <div class="card-data__item--centerblock">
         <strong><%= t("activemodel.attributes.consultation.start_voting_date") %></strong>
-        <br />
+        <br>
         <%= start_date ? l(start_date, format: :decidim_short) : t("decidim.consultations.show.unspecified") %>
       </div>
     </li>
     <li class="card-data__item">
       <div class="card-data__item--centerblock">
         <strong><%= t("activemodel.attributes.consultation.end_voting_date") %></strong>
-        <br />
+        <br>
         <%= end_date ? l(end_date, format: :decidim_short) : t("decidim.consultations.show.unspecified") %>
       </div>
     </li>

data/app/cells/decidim/consultations/content_blocks/highlighted_consultations_cell.rb

@@ -32,6 +32,7 @@ module Decidim
         def voting_ends_text_for(consultation)
           remaining_days = (consultation.end_voting_date - Time.zone.today).to_i
           return I18n.t("voting_ends_today", scope: i18n_scope) if remaining_days.zero?
+
           I18n.t("voting_ends_in", scope: i18n_scope, count: remaining_days)
         end
       end

data/app/commands/decidim/consultations/admin/create_consultation.rb

@@ -21,6 +21,7 @@ module Decidim
         # Returns nothing.
         def call
           return broadcast(:invalid) if form.invalid?
+
           consultation = create_consultation
 
           if consultation.persisted?
@@ -52,6 +53,7 @@ module Decidim
           )
 
           return consultation unless consultation.valid?
+
           consultation.save
           consultation
         end

data/app/commands/decidim/consultations/admin/create_question.rb

@@ -20,6 +20,7 @@ module Decidim
         # Returns nothing.
         def call
           return broadcast(:invalid) if form.invalid?
+
           question = create_question
 
           if question.persisted?
@@ -59,6 +60,7 @@ module Decidim
           )
 
           return question unless question.valid?
+
           question.save
           question
         end

data/app/commands/decidim/consultations/admin/create_response.rb

@@ -20,6 +20,7 @@ module Decidim
         # Returns nothing.
         def call
           return broadcast(:invalid) if form.invalid?
+
           broadcast(:ok, create_response)
         end
 

data/app/commands/decidim/consultations/admin/update_consultation.rb

@@ -23,6 +23,7 @@ module Decidim
         # Returns nothing.
         def call
           return broadcast(:invalid) if form.invalid?
+
           update_consultation
 
           if consultation.valid?

data/app/commands/decidim/consultations/admin/update_question.rb

@@ -23,6 +23,7 @@ module Decidim
         # Returns nothing.
         def call
           return broadcast(:invalid) if form.invalid?
+
           update_question
 
           if question.valid?

data/app/commands/decidim/consultations/admin/update_question_configuration.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    module Admin
+      # A command that configures how many and how much questions can be voted.
+      class UpdateQuestionConfiguration < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # question - the Question to update
+        # form - A form object with the params.
+        def initialize(question, form)
+          @question = question
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          # We don't have other question fields in this forms so any additional
+          # validation error will be just shown in a flash message
+          begin
+            update_question!
+            broadcast(:ok, question)
+          rescue StandardError => e
+            broadcast(:invalid, question, e.message)
+          end
+        end
+
+        private
+
+        attr_reader :form, :question
+
+        def update_question!
+          question.assign_attributes(attributes)
+          question.save!
+        end
+
+        def attributes
+          {
+            max_votes: form.max_votes,
+            min_votes: form.min_votes,
+            instructions: form.instructions
+          }
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/consultations/admin/update_response.rb

@@ -22,6 +22,7 @@ module Decidim
         # Returns nothing.
         def call
           return broadcast(:invalid) if form.invalid?
+
           update_response
           broadcast(:ok, response)
         end

data/app/commands/decidim/consultations/multiple_vote_question.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    # A command with all the business logic when a user votes a multivote question.
+    class MultipleVoteQuestion < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form   - A Decidim::Consultations::MultiVoteForm object.
+      # current_user - The current user.
+      def initialize(form, current_user)
+        @form = form
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the vote.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid, form, form.errors[:responses].first) if form.invalid?
+
+        ActiveRecord::Base.transaction do
+          form.vote_forms.each do |form|
+            create_vote! form
+          end
+          broadcast(:ok, form)
+        rescue StandardError => e
+          broadcast(:invalid, form, e.message)
+        end
+      end
+
+      private
+
+      attr_reader :form
+
+      def create_vote!(vote_form)
+        @form.context.current_question.votes.create!(
+          author: @current_user,
+          response: vote_form.response
+        )
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/consultations/admin/question_admin.rb

@@ -24,6 +24,7 @@ module Decidim
 
           def current_participatory_space
             return current_consultation if params.has_key? :consultation_slug
+
             current_question
           end
 

data/app/controllers/concerns/decidim/consultations/needs_question.rb

@@ -7,8 +7,8 @@ module Decidim
     module NeedsQuestion
       def self.enhance_controller(instance_or_module)
         instance_or_module.class_eval do
-          helper_method :current_question, :previous_question, :next_question, :current_consultation, :current_participatory_space, :stats,
-                        :sorted_results
+          helper_method :current_question, :previous_question, :next_question, :previous_published_question, :next_published_question,
+                        :current_consultation, :current_participatory_space, :stats, :sorted_results
 
           helper Decidim::WidgetUrlsHelper
         end
@@ -55,6 +55,20 @@ module Decidim
           current_consultation_questions.at(current_question_index + 1)
         end
 
+        # same as next_question but for published questions only
+        def next_published_question
+          return nil if current_published_question_index + 1 >= current_consultation_published_questions.size
+
+          current_consultation_published_questions.at(current_published_question_index + 1)
+        end
+
+        # same as previous_question but for published questions only
+        def previous_published_question
+          return nil if (current_published_question_index - 1).negative?
+
+          current_consultation_published_questions.at(current_published_question_index - 1)
+        end
+
         # Public: Finds the current Consultation given this controller's
         # context.
         #
@@ -89,9 +103,17 @@ module Decidim
           @current_consultation_questions ||= current_question.consultation.questions.to_a
         end
 
+        def current_consultation_published_questions
+          @current_consultation_published_questions ||= current_question.consultation.questions.published.to_a
+        end
+
         def current_question_index
           current_consultation_questions.find_index(current_question)
         end
+
+        def current_published_question_index
+          current_consultation_published_questions.find_index(current_question)
+        end
       end
     end
   end

data/app/controllers/concerns/decidim/consultations/orderable.rb

@@ -9,29 +9,15 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        helper_method :order, :available_orders, :random_seed
+        include Decidim::Orderable
 
         private
 
-        # Gets how the proposals should be ordered based on the choice
-        # made by the user.
-        def order
-          @order ||= detect_order(params[:order]) || default_order
-        end
-
-        def detect_order(candidate)
-          available_orders.detect { |order| order == candidate }
-        end
-
         # Available orders based on enabled settings
         def available_orders
           %w(random recent)
         end
 
-        def default_order
-          "random"
-        end
-
         def reorder(consultations)
           case order
           when "recent"
@@ -40,12 +26,6 @@ module Decidim
             consultations.order_randomly(random_seed)
           end
         end
-
-        # Returns: A random float number between -1 and 1 to be used as a
-        # random seed at the database.
-        def random_seed
-          @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))
-        end
       end
     end
   end

data/app/controllers/decidim/consultations/admin/consultations_controller.rb

@@ -44,7 +44,7 @@ module Decidim
           render layout: "decidim/admin/consultation"
         end
 
-        # PUT /admin/initiatives/:id
+        # PUT /admin/consultations/:slug
         def update
           enforce_permission_to :update, :consultation, consultation: current_consultation
 
@@ -64,6 +64,12 @@ module Decidim
           end
         end
 
+        # GET /admin/consultations/:slug/results
+        def results
+          enforce_permission_to :read, :consultation, consultation: current_consultation
+          render layout: "decidim/admin/consultation"
+        end
+
         private
 
         def current_consultation

data/app/controllers/decidim/consultations/admin/question_configuration_controller.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    module Admin
+      class QuestionConfigurationController < Decidim::Consultations::Admin::ApplicationController
+        include QuestionAdmin
+
+        before_action :check_external_voting
+
+        def edit
+          enforce_permission_to :configure, :question, question: current_question
+          @form = question_form.from_model(current_question, current_consultation: current_consultation)
+          render layout: "decidim/admin/question"
+        end
+
+        def update
+          enforce_permission_to :configure, :question, question: current_question
+
+          @form = question_form
+                  .from_params(params, question_id: current_question.id, current_consultation: current_consultation)
+
+          UpdateQuestionConfiguration.call(current_question, @form) do
+            on(:ok) do |question|
+              flash[:notice] = I18n.t("questions.update.success", scope: "decidim.admin")
+              redirect_to edit_question_configuration_path(question)
+            end
+
+            on(:invalid) do |_question, error|
+              flash[:error] = I18n.t("questions.update.error", scope: "decidim.admin")
+              flash[:error] << " (#{error})" if error
+              render :edit, layout: "decidim/admin/question"
+            end
+          end
+        end
+
+        private
+
+        def question_form
+          form(QuestionConfigurationForm)
+        end
+
+        # This is checked here (and not in permissions) to warn the user
+        # specifically about disabling external voting before using multivote questions
+        def check_external_voting
+          return unless current_question.external_voting
+
+          flash[:alert] = I18n.t("question_configuration.disable_external_voting", scope: "decidim.admin")
+          redirect_to edit_question_path(current_question)
+        end
+      end
+    end
+  end
+end