decidim-action_delegator 0.7.2 → 0.8.2

data/app/packs/src/decidim/action_delegator/questions.js

@@ -4,6 +4,7 @@ $(() => {
       delegationCalloutsMessage = $(".delegation-callout-message"),
       delegationDialog = $("#delegations-modal"),
       delegationField = $("#decidim_consultations_delegation_id"),
+      delegationUnVoteButtons = $(".delegation_unvote_button"),
       delegationVoteButtons = $(".delegation-vote-button"),
       delegationsButton = $("#delegations-button"),
       voteButton = $("#vote_button"),
@@ -21,6 +22,11 @@ $(() => {
     delegationCallouts.removeClass("is-hidden");
   });
 
+  delegationUnVoteButtons.click(() => {
+    delegationDialog.foundation("close");
+    delegationCallouts.addClass("is-hidden");
+  });
+
   voteButton.click(() => {
     delegationCallouts.addClass("is-hidden");
   });

data/app/packs/src/decidim/action_delegator/summary.js

@@ -0,0 +1,24 @@
+$(() => {
+  const $usersAnswers = $("#user-answers-summary");
+  const path = $usersAnswers.data("summaryPath");
+  let $button = $("#consultations-questions-summary-button");
+  let $modal = $("#consultations-questions-summary-modal");
+  const $div = $(".question-vote-cabin").parent();
+  const openModal = (evt) => {
+    evt.preventDefault();
+    $modal.foundation("open");    
+  };
+
+  $button.on("click", openModal);
+
+  $div.bind("DOMSubtreeModified", function() {
+    // console.log("tree changed", path);
+    $usersAnswers.load(path, () => {
+      $button = $usersAnswers.find("#consultations-questions-summary-button");
+      $modal = $usersAnswers.find("#consultations-questions-summary-modal");
+      // console.log("usersanswer loaded")
+      $usersAnswers.foundation();
+      $button.on("click", openModal);
+    });
+  });
+});

data/app/packs/stylesheets/decidim/action_delegator/questions.scss

@@ -11,7 +11,7 @@
 
 .question-vote-cabin {
   .delegations-notice {
-    a {
+    button {
       color: var(--secondary);
       font-weight: 600;
       background: transparent;

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

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class ConsultationDelegations < Rectify::Query
+    class ConsultationDelegations < Decidim::Query
       def self.for(consultation)
         new(consultation).query
       end

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

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

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

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

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

@@ -5,7 +5,7 @@ module Decidim
     # This query object replaces the ActiveRecord association we would have between the Vote and
     # Delegation models. Unfortunately we can't use custom foreign keys on both ends of the
     # association so this aims to replace `delegation.votes`.
-    class DelegationVotes < Rectify::Query
+    class DelegationVotes < Decidim::Query
       def query
         Delegation.joins(
           delegations.join(votes).on(vote_author_eq_granter).join_sources

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

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

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

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

data/app/queries/decidim/action_delegator/{published_responses.rb → responses.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class PublishedResponses < Rectify::Query
+    class Responses < Decidim::Query
       def initialize(consultation)
         @consultation = consultation
       end
@@ -12,7 +12,6 @@ module Decidim
       def query
         Decidim::Consultations::Response
           .joins(question: :consultation)
-          .merge(Consultation.finished)
           .where(decidim_consultations_questions: { decidim_consultation_id: consultation.id })
           .where.not(decidim_consultations_questions: { published_at: nil })
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module ActionDelegator
     # Returns total votes of each response by memberships' type and weight.
-    class ResponsesByMembership < Rectify::Query
+    class ResponsesByMembership < Decidim::Query
       DEFAULT_METADATA = I18n.t("decidim.admin.consultations.results.default_metadata")
 
       def initialize(relation)

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

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

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

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

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

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class SumOfWeights < Rectify::Query
+    class SumOfWeights < Decidim::Query
       def initialize(consultation)
         @consultation = consultation
       end
@@ -17,7 +17,7 @@ module Decidim
 
       def published_questions_responses
         VotedWithPonderations.new(
-          PublishedResponses.new(consultation).query
+          Responses.new(consultation).query
         ).query
       end
     end

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/services/decidim/action_delegator/delegations_csv_importer.rb

@@ -23,7 +23,7 @@ module Decidim
           grantee_email: row["to"].to_s.strip.downcase
         }
 
-        @form = form(Decidim::ActionDelegator::Admin::DelegationForm).from_params(params, setting: @current_setting)
+        @form = form(Decidim::ActionDelegator::Admin::DelegationForm).from_params(params, setting: @current_setting, current_organization: @current_setting.organization)
 
         {
           granter_id: @form.granter&.id,
@@ -31,8 +31,8 @@ module Decidim
         }
       end
 
-      def delegation_exists?(params)
-        @delegation = Delegation.find_by(granter_id: params[:granter_id], grantee_id: params[:grantee_id])
+      def delegation_exists?(_params)
+        @delegation = Delegation.find_by(granter: @form.granter, grantee: @form.grantee)
 
         @delegation.present?
       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/_link_with_results.html.erb

@@ -0,0 +1,11 @@
+<%= link_to decidim_consultations.question_path(question), class: "button expanded button--sc" do %>
+  <%= t "consultations.question.view_results", scope: "decidim" %>
+  <% if question.most_weighted_voted_response.present? %>
+    <span class="button__info"><%= translated_attribute question.most_weighted_voted_response.title %></span>
+    <span class="button__info">
+      <%= question.most_weighted_voted_response.votes_count %>
+      <%= t "consultations.question.votes_out_of", scope: "decidim", count: question.most_weighted_voted_response.votes_count %>
+      <%= question.total_weighted_votes %>
+    </span>
+  <% end %>
+<% end %>

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/action_delegator/consultations/questions/_link_to_delegations.html.erb

@@ -1,11 +1,15 @@
 <% if Decidim::ActionDelegator::Delegation.granted_to?(current_user, question.consultation) %>
   <% if has_any_delegate_vote?(question) %>
-    <div class="delegations-notice flex--cc">
-      <%= link_to t("action_delegator.delegations.has_delegations", scope: "decidim"), "#", id: "delegations-button" %>
+    <div class="delegations-notice flex--cc" style="margin-top:1rem;">
+      <button id="delegations-button" class="card__button hollow button small expanded text-white">
+        <%= t("action_delegator.delegations.has_delegations", scope: "decidim") %>
+      </button>
     </div>
   <% else %>
-    <div class="delegations-notice flex--cc">
-      <%= link_to t("action_delegator.delegations.link", scope: "decidim"), "#", id: "delegations-button" %>
-    </div>
+    <div class="delegations-notice flex--cc" style="margin-top:1rem; width: 100%;">
+      <button id="delegations-button" class="card__button button small expanded secondary hollow">
+        <%= t("action_delegator.delegations.link", scope: "decidim") %>
+      </button>
+     </div>
   <% end %>
 <% end %>

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

@@ -0,0 +1,8 @@
+<% question.responses_sorted_by_weighted_votes[question.id].each do |response| %>
+  <div class=card--list__item>
+    <div class="card--list__text"><%= translated_attribute response.title %></div>
+    <div class="card--list__data">
+      <span class="card--list__data__number"><%= response.votes_count %></span>
+    </div>
+  </div>
+<% end %>