decidim-action_delegator 0.7.1 → 0.8.1

data/app/queries/decidim/action_delegator/type_and_weight.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class TypeAndWeight < Rectify::Query
+    class TypeAndWeight < Decidim::Query
       def initialize(consultation)
         @consultation = consultation
       end
@@ -19,7 +19,7 @@ module Decidim
       # Returns the published questions' responses of the given consultation as an ActiveRecord
       # Relation. Note this enables us to the chain it with other AR Relation objects.
       def published_questions_responses
-        PublishedResponses.new(consultation).query
+        Responses.new(consultation).query
       end
     end
   end

data/app/queries/decidim/action_delegator/voted_with_ponderations.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class VotedWithPonderations < Rectify::Query
+    class VotedWithPonderations < Decidim::Query
       def initialize(relation)
         @relation = relation
       end

data/app/views/decidim/action_delegator/admin/consultations/_ongoing_consultation_warning.html.erb

@@ -0,0 +1,3 @@
+<% if Decidim::ActionDelegator.admin_preview_results && !consultation.finished? %>
+  <div class="callout warning"><%= t "ongoing_consultation", scope: "decidim.action_delegator.admin.consultations.results" %></div>
+<% end %>

data/app/views/decidim/action_delegator/admin/consultations/results.html.erb

@@ -19,6 +19,9 @@
     </h2>
   </div>
   <div class="card-section">
+
+    <%= render "ongoing_consultation_warning", consultation: current_consultation %>
+
     <table class="table-list">
       <% questions.each do |question| %>
         <% unless question.external_voting %>

data/app/views/decidim/action_delegator/admin/consultations/weighted_results.html.erb

@@ -24,6 +24,9 @@
     </h2>
   </div>
   <div class="card-section">
+
+    <%= render "ongoing_consultation_warning", consultation: current_consultation %>
+
     <table id="results" class="table-list">
       <% questions.each do |question| %>
         <% unless question.external_voting %>

data/app/views/decidim/action_delegator/admin/delegations/new.html.erb

@@ -1,33 +1,31 @@
 <div class="card">
-  <div class="card-section">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
-        <%= link_to t("title", scope: "decidim.action_delegator.admin.delegations.index"), decidim_admin_action_delegator.setting_delegations_path(current_setting) %> &gt;
-        <%= t ".title" %>
-      </h2>
-    </div>
-
-    <div class="card-section">
-    <%= decidim_form_for @form, url: { action: "create" }, html: { class: "form new_delegation" } do |f| %>
-      <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_member") } %>
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
+      <%= link_to t("title", scope: "decidim.action_delegator.admin.delegations.index"), decidim_admin_action_delegator.setting_delegations_path(current_setting) %> &gt;
+      <%= t ".title" %>
+    </h2>
+  </div>
 
-      <div class="row column">
-        <%= f.autocomplete_select(:granter_id, @form.granter,  { multiple: false, label: t(".granter") }, prompt_options) do |user|
-          { value: user.id, label: "#{user.name} (@#{user.nickname})" }
-        end %>
-      </div>
-      <div class="row column">
-        <%= f.autocomplete_select(:grantee_id, @form.grantee,  { multiple: false, label: t(".grantee") }, prompt_options) do |user|
-          { value: user.id, label: "#{user.name} (@#{user.nickname})" }
-        end %>
-      </div>
+  <div class="card-section">
+  <%= decidim_form_for @form, url: { action: "create" }, html: { class: "form new_delegation" } do |f| %>
+    <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_member") } %>
 
-      <div class="button--double form-general-submit">
-        <%= f.submit t(".save") %>
-      </div>
-    <% end %>
+    <div class="row column">
+      <%= f.autocomplete_select(:granter_id, @form.granter,  { multiple: false, label: t(".granter") }, prompt_options) do |user|
+        { value: user.id, label: "#{user.name} (@#{user.nickname})" }
+      end %>
+    </div>
+    <div class="row column">
+      <%= f.autocomplete_select(:grantee_id, @form.grantee,  { multiple: false, label: t(".grantee") }, prompt_options) do |user|
+        { value: user.id, label: "#{user.name} (@#{user.nickname})" }
+      end %>
+    </div>
 
+    <div class="button--double form-general-submit">
+      <%= f.submit t(".save") %>
     </div>
+  <% end %>
+
   </div>
 </div>

data/app/views/decidim/action_delegator/admin/manage_delegations/new.html.erb

@@ -1,25 +1,30 @@
-<%= form_tag(setting_manage_delegations_path, multipart: true, class: "form new_import") do %>
-  <%= hidden_field_tag :setting_id, current_setting.id %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= t(".title") %>
-      </h2>
-    </div>
-  </div>
-  <p><%= t(".upload_instructions") %></p>
-  <p><%= t(".required_fields") %></p>
-  <p><%= t(".title_example") %></p>
-  <pre class="code-block">
-    from,to
-    user_1@example.org,user_2@example.org
-    user_3@example.org,user_4@example.org
-    ...</pre>
-  <div class="row column">
-    <%= file_field_tag :csv_file %>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
+      <%= link_to t("title", scope: "decidim.action_delegator.admin.delegations.index"), decidim_admin_action_delegator.setting_delegations_path(current_setting) %> &gt;
+      <%= t ".title" %>
+    </h2>
   </div>
 
-  <div class="button--double form-general-submit">
-    <%= submit_tag t(".import"), class: "button" %>
+  <div class="card-section">
+    <%= form_tag(setting_manage_delegations_path, multipart: true, class: "form new_import") do %>
+      <%= hidden_field_tag :setting_id, current_setting.id %>
+      <p><%= t(".upload_instructions") %></p>
+      <p><%= t(".required_fields") %></p>
+      <p><%= t(".title_example") %></p>
+      <pre class="code-block">
+        from,to
+        user_1@example.org,user_2@example.org
+        user_3@example.org,user_4@example.org
+        ...</pre>
+      <div class="row column">
+        <%= file_field_tag :csv_file %>
+      </div>
+
+      <div class="button--double form-general-submit">
+        <%= submit_tag t(".import"), class: "button" %>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/action_delegator/admin/manage_participants/new.html.erb

@@ -3,7 +3,9 @@
   <div class="card">
     <div class="card-divider">
       <h2 class="card-title">
-        <%= t(".title") %>
+        <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
+        <%= link_to t("title", scope: "decidim.action_delegator.admin.participants.index"), decidim_admin_action_delegator.setting_participants_path(current_setting) %> &gt;
+        <%= t ".title" %>
       </h2>
     </div>
   </div>

data/app/views/decidim/action_delegator/admin/participants/edit.html.erb

@@ -1,21 +1,19 @@
 <div class="card">
-  <div class="card-section">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
-        <%= link_to t("title", scope: "decidim.action_delegator.admin.participants.index"), decidim_admin_action_delegator.setting_participants_path(current_setting) %> &gt;
-        <%= t ".title" %>
-      </h2>
-    </div>
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
+      <%= link_to t("title", scope: "decidim.action_delegator.admin.participants.index"), decidim_admin_action_delegator.setting_participants_path(current_setting) %> &gt;
+      <%= t ".title" %>
+    </h2>
+  </div>
 
-    <div class="card-section">
-      <%= decidim_form_for @form, url: { action: "update" }, html: { class: "form edit_ponderation" } do |f| %>
-        <%= render partial: "form", object: f %>
+  <div class="card-section">
+    <%= decidim_form_for @form, url: { action: "update" }, html: { class: "form edit_ponderation" } do |f| %>
+      <%= render partial: "form", object: f %>
 
-        <div class="button--double form-general-submit">
-          <%= f.submit t(".save") %>
-        </div>
-      <% end %>
-    </div>
+      <div class="button--double form-general-submit">
+        <%= f.submit t(".save") %>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/decidim/action_delegator/admin/participants/new.html.erb

@@ -1,21 +1,19 @@
 <div class="card">
-  <div class="card-section">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
-        <%= link_to t("title", scope: "decidim.action_delegator.admin.participants.index"), decidim_admin_action_delegator.setting_participants_path(current_setting) %> &gt;
-        <%= t ".title" %>
-      </h2>
-    </div>
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
+      <%= link_to t("title", scope: "decidim.action_delegator.admin.participants.index"), decidim_admin_action_delegator.setting_participants_path(current_setting) %> &gt;
+      <%= t ".title" %>
+    </h2>
+  </div>
 
-    <div class="card-section">
-      <%= decidim_form_for @form, url: { action: "create" }, html: { class: "form new_participant" } do |f| %>
-        <%= render partial: "form", object: f %>
+  <div class="card-section">
+    <%= decidim_form_for @form, url: { action: "create" }, html: { class: "form new_participant" } do |f| %>
+      <%= render partial: "form", object: f %>
 
-        <div class="button--double form-general-submit">
-          <%= f.submit t(".save") %>
-        </div>
-      <% end %>
-    </div>
+      <div class="button--double form-general-submit">
+        <%= f.submit t(".save") %>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/decidim/action_delegator/admin/ponderations/edit.html.erb

@@ -1,21 +1,19 @@
 <div class="card">
-  <div class="card-section">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
-        <%= link_to t("title", scope: "decidim.action_delegator.admin.ponderations.index"), decidim_admin_action_delegator.setting_ponderations_path(current_setting) %> &gt;
-        <%= t ".title" %>
-      </h2>
-    </div>
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
+      <%= link_to t("title", scope: "decidim.action_delegator.admin.ponderations.index"), decidim_admin_action_delegator.setting_ponderations_path(current_setting) %> &gt;
+      <%= t ".title" %>
+    </h2>
+  </div>
 
-    <div class="card-section">
-      <%= decidim_form_for @form, url: { action: "update" }, html: { class: "form edit_ponderation" } do |f| %>
-        <%= render partial: "form", object: f %>
+  <div class="card-section">
+    <%= decidim_form_for @form, url: { action: "update" }, html: { class: "form edit_ponderation" } do |f| %>
+      <%= render partial: "form", object: f %>
 
-        <div class="button--double form-general-submit">
-          <%= f.submit t(".save") %>
-        </div>
-      <% end %>
-    </div>
+      <div class="button--double form-general-submit">
+        <%= f.submit t(".save") %>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/decidim/action_delegator/admin/ponderations/new.html.erb

@@ -1,21 +1,19 @@
 <div class="card">
-  <div class="card-section">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
-        <%= link_to t("title", scope: "decidim.action_delegator.admin.ponderations.index"), decidim_admin_action_delegator.setting_ponderations_path(current_setting) %> &gt;
-        <%= t ".title" %>
-      </h2>
-    </div>
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to translated_attribute(current_setting.title), decidim_admin_action_delegator.settings_path %> &gt;
+      <%= link_to t("title", scope: "decidim.action_delegator.admin.ponderations.index"), decidim_admin_action_delegator.setting_ponderations_path(current_setting) %> &gt;
+      <%= t ".title" %>
+    </h2>
+  </div>
 
-    <div class="card-section">
-      <%= decidim_form_for @form, url: { action: "create" }, html: { class: "form new_ponderation" } do |f| %>
-        <%= render partial: "form", object: f %>
+  <div class="card-section">
+    <%= decidim_form_for @form, url: { action: "create" }, html: { class: "form new_ponderation" } do |f| %>
+      <%= render partial: "form", object: f %>
 
-        <div class="button--double form-general-submit">
-          <%= f.submit t(".save") %>
-        </div>
-      <% end %>
-    </div>
+      <div class="button--double form-general-submit">
+        <%= f.submit t(".save") %>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/decidim/action_delegator/consultations/questions/_delegations_modal.html.erb

@@ -32,5 +32,3 @@
     </div>
   </div>
 </div>
-
-<%= javascript_pack_tag "decidim_action_delegator_questions" %>

data/app/views/decidim/consultations/question_votes/update_vote_button.js.erb

@@ -1,9 +1,6 @@
 (function () {
   'use strict';
 
-  $("#delegations-modal").foundation("close");
-  $("#delegations-modal").remove();
-
   $('#question-vote-modal').foundation("close");
   $('#question-vote-confirm-modal').foundation("close");
   $('#question-vote-modal, #question-vote-confirm-modal').remove()
@@ -21,12 +18,65 @@
     $('#confirm-vote-form').removeClass('hide');
   <% end %>
 
-  const delegationsButton = $("#delegations-button"),
-        delegationDialog = $("#delegations-modal");
+  // Replicate the behaviour of vote_dialog.js as it has a bug when changed via ajax
+  var button = $("#vote_button"),
+    buttonChange = $("#question-vote-confirm-modal-button-change"),
+    responseButtons = $(".response-title"),
+    voteConfirmDialog = $("#question-vote-confirm-modal"),
+    voteDialog = $("#question-vote-modal");
+
+  if (voteDialog.length && button.length) {
+    button.click(function () {
+      voteDialog.foundation("open");
+    });
+  }
+
+  if (voteDialog.length && responseButtons.length && voteConfirmDialog.length) {
+    responseButtons.click(function () {
+      $("#question-vote-confirm-modal-question-title").text($(this).text());
+      $("#decidim_consultations_response_id").val($(this).data("response-id"));
+
+      voteDialog.foundation("close");
+      voteConfirmDialog.foundation("open");
+    });
+  }
+
+  if (buttonChange.length && voteDialog.length && voteConfirmDialog.length) {
+    buttonChange.click(function() {
+      voteConfirmDialog.foundation("close");
+      voteDialog.foundation("open");
+    });
+  }
+
+  //lets do the same for delegations
+  var delegationsButton = $("#delegations-button"),
+    delegationCallouts = $(".delegation-callout"),
+    delegationCalloutsMessage = $(".delegation-callout-message"),
+    delegationVoteButtons = $(".delegation-vote-button"),
+    delegationUnVoteButtons = $(".delegation_unvote_button"),
+    delegationField = $("#decidim_consultations_delegation_id"),
+    delegationDialog = $("#delegations-modal");
 
   delegationDialog.foundation();
 
   delegationsButton.click(function () {
     delegationDialog.foundation("open");
   });
+
+  delegationVoteButtons.click((evt) => {
+    delegationDialog.foundation("close");
+    voteDialog.foundation("open");
+    delegationField.val($(evt.currentTarget).data("delegation-id"));
+    delegationCalloutsMessage.text($(evt.currentTarget).data("delegation-granter-name"));
+    delegationCallouts.removeClass("is-hidden");
+  });
+
+  delegationUnVoteButtons.click((evt) => {
+    delegationDialog.foundation("close");
+    delegationCallouts.addClass("is-hidden");
+  });
+
+  button.click(() => {
+    delegationCallouts.addClass("is-hidden");
+  });
 }());

data/config/locales/en.yml

@@ -33,6 +33,8 @@ en:
       admin:
         consultations:
           results:
+            ongoing_consultation: This consultations is still ongoing. Be aware that
+              results may change as more people vote.
             title: Results by answer, membership type and weight
           weighted_results:
             title: Results by answer summing membership weights
@@ -373,6 +375,8 @@ en:
                 reach out if it's not correct.
               send_code: Send verification code
               title: Authorize with Corporate Governance Verifier
+          not_active: The Corporate Governance Verifier cannot be granted at this
+            time as there are no active voting spaces.
     admin:
       actions:
         invite: Send invitation

data/lib/decidim/action_delegator/admin_engine.rb

@@ -41,9 +41,23 @@ module Decidim
         root to: "delegations#index"
       end
 
+      # marks the main "Users" menu in the admin always active when we are in the action_delegator admin space
+      initializer "decidim_admin_action_delegator.main_menu" do
+        Decidim.menu :admin_menu do |menu|
+          if (item = menu.items.find { |it| it.identifier == :impersonatable_users })
+            item.active.first << "decidim/action_delegator/admin/settings"
+            item.active.first << "decidim/action_delegator/admin/ponderations"
+            item.active.first << "decidim/action_delegator/admin/participants"
+            item.active.first << "decidim/action_delegator/admin/manage_participants"
+            item.active.first << "decidim/action_delegator/admin/delegations"
+            item.active.first << "decidim/action_delegator/admin/manage_delegations"
+          end
+        end
+      end
+
       initializer "decidim_admin_action_delegator.admin_user_menu" do
         Decidim.menu :admin_user_menu do |menu|
-          menu.add_item :users,
+          menu.add_item :action_delegator,
                         I18n.t("menu.delegations", scope: "decidim.action_delegator.admin"), decidim_admin_action_delegator.settings_path,
                         active: is_active_link?(decidim_admin_action_delegator.settings_path),
                         if: allowed_to?(:index, :impersonatable_user)

data/lib/decidim/action_delegator/engine.rb

@@ -23,6 +23,7 @@ module Decidim
 
       config.to_prepare do
         # override votes questions
+        Decidim::Consultations::Question.include(Decidim::ActionDelegator::Consultations::QuestionOverride)
         Decidim::Consultations::VoteQuestion.include(Decidim::ActionDelegator::Consultations::VoteQuestionOverride)
         Decidim::Consultations::MultipleVoteQuestion.include(Decidim::ActionDelegator::Consultations::MultipleVoteQuestionOverride)
         Decidim::Consultations::VoteForm.include(Decidim::ActionDelegator::Consultations::VoteFormOverride)
@@ -33,6 +34,7 @@ module Decidim
 
       initializer "decidim_action_delegator.overrides", after: "decidim.action_controller" do
         config.to_prepare do
+          Decidim::Devise::SessionsController.include(Decidim::ActionDelegator::Devise::SessionsControllerOverride)
           Decidim::Consultations::QuestionVotesController.include(Decidim::ActionDelegator::Consultations::QuestionVotesControllerOverride)
           Decidim::Consultations::QuestionsController.include(Decidim::ActionDelegator::Consultations::QuestionsControllerOverride)
           Decidim::Consultations::ConsultationsController.include(Decidim::ActionDelegator::Consultations::ConsultationsControllerOverride)

data/lib/decidim/action_delegator/verifications/delegations_authorizer.rb

@@ -71,9 +71,7 @@ module Decidim
         end
 
         def consultation
-          @consultation ||= begin
-            component.participatory_space if component&.participatory_space.is_a?(Decidim::Consultation)
-          end
+          @consultation ||= (component.participatory_space if component&.participatory_space.is_a?(Decidim::Consultation))
         end
 
         def manifest

data/lib/decidim/action_delegator/version.rb

@@ -3,8 +3,8 @@
 module Decidim
   # This holds the decidim-action_delegator version.
   module ActionDelegator
-    VERSION = "0.7.1"
-    DECIDIM_VERSION = "0.26.5"
-    COMPAT_DECIDIM_VERSION = [">= 0.26.0", "< 0.27"].freeze
+    VERSION = "0.8.1"
+    DECIDIM_VERSION = "0.27.4"
+    COMPAT_DECIDIM_VERSION = [">= 0.27.0", "< 0.28"].freeze
   end
 end

data/lib/decidim/action_delegator.rb

@@ -12,7 +12,7 @@ module Decidim
     include ActiveSupport::Configurable
 
     # this is the SmsGateway provided by this module
-    # Note that it will be ignored if you provide your own SmsGateway in Decidm.sms_gateway_service
+    # Note that it will be ignored if you provide your own SmsGateway in Decidim.sms_gateway_service
     config_accessor :sms_gateway_service do
       "Decidim::ActionDelegator::SmsGateway"
     end
@@ -29,6 +29,12 @@ module Decidim
       true
     end
 
+    # If true, tries to automatically authorize users when they log in with the "Corporate Governance Verifier"
+    # Note that this is only possible when the verifier is configured to use only the email (if SMS is required, the user will have to do the standard verification process)
+    config_accessor :authorize_on_login do
+      true
+    end
+
     # used for comparing phone numbers from a census list and the ones introduced by the user
     # the phone number will be normalized before comparing it so, for instance,
     # if you have a census list with  +34 666 666 666 and the user introduces 0034666666666 or 666666666, they will be considered the same
@@ -48,6 +54,17 @@ module Decidim
     config_accessor :remove_consultation_deprecation_warning do
       true
     end
+
+    # In a consultation the highlighted questions are duplicated in the list of regular questions
+    # this maintains the highlighted questions in the highlighted list and removes them from the regular list
+    config_accessor :remove_duplicated_highlighted_questions do
+      true
+    end
+
+    # If true, admins can view the result of a consultation even if the consultation is ongoing
+    config_accessor :admin_preview_results do
+      true
+    end
   end
 end