decidim-action_delegator 0.6.0 → 0.7.0

data/app/views/decidim/action_delegator/admin/settings/_participants_email_check.html.erb

@@ -0,0 +1,7 @@
+<% total_missing_emails = setting&.participants.where(email: "").count %>
+<% i18n_scope = "decidim.action_delegator.admin.settings.setting_checks" %>
+<% if Decidim::ActionDelegator.allow_to_invite_users && total_missing_emails.positive? %>
+  <div class="callout warning text-left">
+    <p><%= t("#{i18n_scope}.missing_emails", count: pluralize(total_missing_emails, t("#{i18n_scope}.participant"))) %></p>
+  </div>
+<% end %>

data/app/views/decidim/action_delegator/admin/settings/_participants_sync_check.html.erb

@@ -0,0 +1,11 @@
+<% missing_sync =  missing_decidim_users(setting&.participants) %>
+<% if setting.participants.any? && missing_sync.present? %>
+<div class="callout alert text-left">
+  <ul class="happy-faces">
+    <li class="unhappy">
+      <%= t("users_need_sync_html", scope: "decidim.action_delegator.admin.settings.setting_checks", count: missing_sync.count) %><br>
+      <%= link_to t("click_to_fix", scope: "decidim.action_delegator.admin.settings.setting_checks"), decidim_admin_action_delegator.sync_setting_permissions_path(setting), method: :post %>
+    </li>
+  </ul>
+</div>
+<% end %>

data/app/views/decidim/action_delegator/admin/settings/_setting_checks.html.erb

@@ -0,0 +1,81 @@
+<% missing_questions =  missing_verifications_for(setting&.consultation&.questions, "vote") %>
+<% missing_registered =  missing_registered_users(setting&.participants) %>
+<% total_missing_authorizations =  total_missing_authorizations(setting&.participants) %>
+<% status_err = (missing_questions.present? || missing_registered.present? || setting.participants.blank? || total_missing_authorizations.positive?)
+  if setting&.consultation&.questions&.count == missing_questions.count
+    status_err = false
+  end %>
+
+<%= render "decidim/action_delegator/admin/settings/participants_sync_check", setting: setting %>
+
+<div class="callout <%= status_err ? "warning" : "success" %> text-left">
+
+  <ul class="happy-faces">
+    <% if setting.consultation %>
+      <% if missing_questions.present? %>
+        <li class="<%= status_err ? "unhappy" : "warning" %>">
+          <%= t(".consultation_questions_missing_verifier_html", count: missing_questions.count) %><br>
+          <%= link_to t(".click_to_fix"), decidim_admin_action_delegator.setting_permissions_path(setting), method: :post %>
+        </li>
+      <% else %>
+        <li class="happy"><%= t(".consultation_questions_all_verified_html") %></li>
+      <% end %>
+    <% end %>
+
+    <% if setting.participants.any? %>
+      <% if missing_registered.present? %>
+        <li class="warning"><%= t(".missing_registered_users_html", count: missing_registered.count) %></li>
+      <% else %>
+        <li class="happy"><%= t(".all_users_registered_html") %></li>
+      <% end %>
+      <% if total_missing_authorizations.positive? %>
+        <li class="<%= status_err ? "unhappy" : "warning" %>"><%= t(".missing_authorizations_html", count: total_missing_authorizations) %></li>
+      <% else %>
+        <li class="happy"><%= t(".all_users_authorized_html") %></li>
+      <% end %>
+    <% else %>
+      <li class="warning"><%= t(".no_participants_html") %></li>
+    <% end %>
+
+    <% unless setting.ponderations.any? %>
+      <li class="warning"><%= t(".no_ponderations_html") %></li>
+    <% end %>
+
+    <% unless setting.delegations.any? %>
+      <li class="warning"><%= t(".no_delegations_html") %></li>
+    <% end %>
+  </ul>
+ </div>
+<style>
+  ul.happy-faces {
+    list-style: none;
+    margin-left: 0;
+    padding-left: 1em;
+    text-indent: -1.5em;
+  }
+  li.warning:before {
+    content: '🧐 ';
+    color: red;
+  }
+  li.unhappy:before {
+    content: '⚠️ ';
+    color: red;
+  }
+  li.happy:before {
+    content: '👌 ';
+    color: green;
+  }
+  ul.happy-faces a {
+    text-decoration: underline;
+    position: relative;
+    margin-left: 1.4em;
+  }
+  ul.happy-faces a:before {
+    content: '👉';
+    padding-right: 5px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    line-height: 1.4;
+  }
+</style>

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

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

data/app/views/decidim/action_delegator/admin/settings/index.html.erb

@@ -6,34 +6,54 @@
     </h2>
   </div>
   <div class="card-section">
+    <p class="help-text"><%= t ".description_html" %></p>
+    <%= render "check_verifier" %>
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
             <th><%= t(".consultation") %></th>
             <th><%= t(".max_grants") %></th>
+            <th><%= t(".authorization_method") %></th>
             <th><%= t(".delegations") %></th>
+            <th><%= t(".ponderations") %></th>
+            <th><%= t(".census") %></th>
             <th><%= t(".created_at") %></th>
+            <th><%= t(".state") %></th>
             <th>&nbsp;</th>
           </tr>
         </thead>
         <tbody>
-          <% @settings.each do |setting| %>
+          <% settings.each do |setting| %>
             <tr data-setting-id="<%= setting.id %>">
-              <td><%= link_to translated_attribute(setting.consultation.title), decidim_admin_action_delegator.setting_delegations_path(setting) %></td>
+              <td><%= link_to translated_attribute(setting.title), decidim_consultations.consultation_path(setting.consultation), target: :blank %></td>
               <td><%= setting.max_grants %></td>
+              <td class="text-<%= setting.phone_required? ? (setting.verify_with_both? ? "success" : "secondary") : "warning" %>"><%= t setting.authorization_method, scope: "decidim.action_delegator.admin.settings.authorization_method" %></td>
               <td><%= setting.delegations.count %></td>
+              <td><%= setting.ponderations.count %></td>
+              <td><%= setting.participants.count %></td>
               <td><%= l setting.created_at, format: :short %></td>
+              <td class="text-<%= setting.ongoing? ? "warning" : (setting.editable? ? "success" : "alert") %>"><%= t setting.state, scope: "decidim.action_delegator.admin.settings.state" %></td>
 
               <td class="table-list__actions">
-                <%= icon_link_to "people", decidim_admin_action_delegator.setting_delegations_path(setting), t("actions.manage", scope: "decidim.admin"), class: "action-icon--edit" %>
-                <%= icon_link_to "circle-x", decidim_admin_action_delegator.setting_path(setting), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-                <%= icon_link_to "eye", decidim_consultations.consultation_path(setting.consultation), t("actions.preview", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <%= icon_link_to "pencil", decidim_admin_action_delegator.edit_setting_path(setting), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <%= icon_link_to "grid-two-up", decidim_admin_action_delegator.setting_ponderations_path(setting), t(".actions.ponderate"), class: "action-icon--edit" %>
+                <%= icon_link_to "people", decidim_admin_action_delegator.setting_participants_path(setting), t(".actions.census"), class: "action-icon--edit" %>
+                <%= icon_link_to "loop", decidim_admin_action_delegator.setting_delegations_path(setting), t(".actions.delegations"), class: "action-icon--edit" %>
+                <%= icon_link_to "circle-x", decidim_admin_action_delegator.setting_path(setting), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } if setting.destroyable? %>
               </td>
             </tr>
+            <% if setting.editable? %>
+            <tr>
+              <td colspan="9">
+                <%= render "setting_checks", setting: setting %>
+              </td>
+            </tr>
+            <% end %>
           <% end %>
         </tbody>
       </table>
     </div>
+    <%= decidim_paginate settings %>
   </div>
 </div>

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

@@ -1,30 +1,18 @@
-<h2 class="card-title process-title-summary">
-  <%= t ".title" %>
-</h2>
-
-<%= form_for @setting, url: { action: "create" }, html: { class: "form new_setting" } do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".form.title" %></h2>
-    </div>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to t("title", scope: "decidim.action_delegator.admin.settings.index"), decidim_admin_action_delegator.settings_path %> &gt;
+      <%= t ".title" %>
+    </h2>
+  </div>
 
-    <div class="card-section">
-      <div class="row column">
-        <%= f.select :decidim_consultation_id,
-                     options_from_collection_for_select(
-                       consultations_for_select,
-                       :id,
-                       :translated_title
-                     ) %>
-      </div>
+  <div class="card-section">
+    <%= form_for @form, url: { action: "create" }, html: { class: "form new_setting" } do |f| %>
+      <%= render partial: "form", object: f %>
 
-      <div class="row column">
-        <%= f.number_field :max_grants, min: 1, autofocus: true %>
+      <div class="button--double form-general-submit">
+        <%= f.submit t(".save") %>
       </div>
-    </div>
-  </div>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".save") %>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/action_delegator/consultations/_link_to_question.html.erb

@@ -0,0 +1,11 @@
+<% if signed_in? && Decidim::ActionDelegator::Delegation.granted_to?(current_user, question.consultation) %>
+  <% if has_any_delegate_vote?(question) %>
+    <div class="delegations-notice">
+      <%= link_to t("action_delegator.delegations.has_delegations", scope: "decidim"), decidim_consultations.question_path(question) %>
+    </div>
+  <% else %>
+    <div class="delegations-notice">
+      <%= link_to t("action_delegator.delegations.link", scope: "decidim"), decidim_consultations.question_path(question) %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,36 @@
+<div class="reveal" data-reveal id="delegations-modal">
+  <div class="reveal__header">
+    <h3 class="reveal__title">
+      <%= t "action_delegator.delegations_modal.title", scope: "decidim" %>
+    </h3>
+    <button class="close-button" data-close aria-label="Close modal" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <p><%= t "action_delegator.delegations_modal.contextual_help", scope: "decidim" %></p>
+  <div class="card card--secondary">
+    <div class="card__content">
+
+      <% signed_in? && Decidim::ActionDelegator::GranteeDelegations.for(question.consultation, current_user).each do |delegation| %>
+        <div class="row">
+          <div class="columns medium-5 medium-offset-1">
+            <%= delegation.granter.name %>
+          </div>
+          <div class="columns medium-5 medium-offset-1">
+            <%# Copied from decidim-consultation's _vote_button.html.erb %>
+            <% if question.consultation.upcoming? %>
+              <%= render "decidim/action_delegator/consultations/questions/vote_delegated_upcoming", question: question %>
+            <% elsif question.consultation.finished? && question.voted_by?(delegation.granter) %>
+              <%= render "decidim/action_delegator/consultations/questions/vote_delegated_finished", question: question %>
+            <% elsif question.consultation.active? %>
+              <%= render "decidim/action_delegator/consultations/questions/vote_delegated_active", question: question, delegation: delegation %>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<%= javascript_pack_tag "decidim_action_delegator_questions" %>

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

@@ -0,0 +1,11 @@
+<% 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>
+  <% else %>
+    <div class="delegations-notice flex--cc">
+      <%= link_to t("action_delegator.delegations.link", scope: "decidim"), "#", id: "delegations-button" %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,32 @@
+<% if allowed_to? :unvote_delegation, :question, { question: question, delegation: delegation }, [Decidim::ActionDelegator::Permissions, Decidim::Admin::Permissions, Decidim::Permissions] %>
+  <%= button_to decidim_consultations.question_question_votes_path(question),
+                method: :delete,
+                remote: true,
+                data: { disable: true },
+                class: "button expanded success delegation_unvote_button" do %>
+                <%= hidden_field_tag "decidim_consultations_delegation_id", delegation.id, id: "decidim_consultations_delegation_id_delete_#{delegation.id}" %>
+    <div class="vote-button-caption"
+         data-original="<%= t("questions.vote_button.already_voted", scope: "decidim") %>"
+         data-replace="<%= t("questions.vote_button.already_voted_hover", scope: "decidim") %>">
+      <%= t("questions.vote_button.already_voted", scope: "decidim") %>
+    </div>
+  <% end %>
+<% elsif allowed_to? :vote_delegation, :question, { question: question, delegation: delegation }, [Decidim::ActionDelegator::Permissions, Decidim::Admin::Permissions, Decidim::Permissions] %>
+  <% if question.multiple? %>
+    <%= link_to decidim_consultations.question_question_multiple_votes_path(question, delegation: delegation.id),
+                class: "button expanded",
+                id: "multivote_button" do %>
+      <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+    <% end %>
+  <% else %>
+    <%# This link is slightly modified from _vote_button to add stuff needed by delegations %>
+    <%= link_to "#", class: "button expanded delegation-vote-button", data: { "delegation-id" => delegation.id, "delegation-granter-name" => delegation.granter.name } do %>
+      <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+    <% end %>
+
+  <% end %>
+<% else %>
+  <%= authorized_vote_modal_button(question, remote: true, class: "button expanded light button--sc") do %>
+    <%= t("questions.vote_button.verification_required", scope: "decidim") %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,9 @@
+<%= button_to decidim_consultations.question_question_votes_path(question),
+            method: :delete,
+            remote: true,
+            data: { disable: true },
+            class: "button expanded success disabled delegation_unvote_button" do %>
+  <div class="vote-button-caption">
+    <%= t("questions.vote_button.already_voted", scope: "decidim") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,8 @@
+<div class="button expanded disabled">
+  <div class="vote-button-caption"><%= t("questions.vote_button.vote", scope: "decidim") %></div>
+  <div>
+    <%= t "questions.vote_button.starting_from",
+          scope: "decidim",
+          date: l(question.start_voting_date) %>
+  </div>
+</div>

data/app/views/decidim/action_delegator/import_mailer/import.html.erb

@@ -0,0 +1,11 @@
+<p class="email-greeting"><%= t(".greeting", name: @user.name) %></p>
+<p><%= t(".result", rows_count: @import_summary[:imported_rows], total_rows_count: @import_summary[:total_rows]).html_safe %></p>
+<% if @import_summary[:skipped_rows].present? %>
+  <p><%= t(".skipped_rows", skipped_rows: @import_summary[:skipped_rows].count).html_safe %></p>
+<% end %>
+<% if @import_summary[:error_rows].present? %>
+  <p><%= t(".errors_title", errors_count: @import_summary[:error_rows].size).html_safe %></p>
+<% end %>
+<% if @import_summary[:error_rows].present? || @import_summary[:skipped_rows].present? %>
+  <%= t(".instructions").html_safe %>
+<% end %>

data/app/views/decidim/{verifications/sms/authorizations/new.html.erb → action_delegator/verifications/delegations_verifier/authorizations/edit.html.erb}

@@ -10,23 +10,28 @@
       <div class="columns large-6 medium-centered">
         <div class="card">
           <div class="card__content">
-            <%= decidim_form_for(@form, url: authorization_path(redirect_url: redirect_url)) do |form| %>
+            <%= decidim_form_for(@form, url: authorization_path(redirect_url: redirect_url), method: :put) do |form| %>
               <%= form_required_explanation %>
 
               <div class="field">
-                <%= form.text_field :mobile_phone_number, readonly: true %>
-              </div>
-
-              <div class="callout announcement mb-sm warning cell-announcement">
-                <p><%= t("decidim.action_delegator.authorizations.new.phone_warning") %></p>
+                <%= form.text_field :verification_code %>
               </div>
 
               <div class="actions">
-                <%= form.submit t(".send"), class: "button expanded", "data-disable-with" => "#{t('.send')}...", disabled: @form.mobile_phone_number.blank? %>
+                <%= form.submit t(".send"), class: "button expanded", "data-disable-with" => "#{t('.send')}..." %>
               </div>
             <% end %>
           </div>
         </div>
+
+        <div class="card">
+          <div class="card__content">
+            <div class="field">
+              <p><%= t(".resend") %></p>
+              <%= link_to t(".destroy"), decidim_delegations_verifier.authorization_path, method: :delete, data: { confirm: t(".confirm_destroy") } %>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>

data/app/views/decidim/action_delegator/verifications/delegations_verifier/authorizations/new.html.erb

@@ -0,0 +1,49 @@
+<div class="wrapper">
+  <div class="row collapse">
+    <div class="row collapse">
+      <div class="columns large-8 large-centered text-center page-title">
+        <h1><%= t(".title") %></h1>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="columns large-6 medium-centered">
+        <div class="card">
+          <div class="card__content">
+            <%= decidim_form_for(@form, url: authorization_path(redirect_url: redirect_url)) do |form| %>
+              <%= form_required_explanation %>
+
+              <% if setting&.email_required? %>
+                <% unless @form.participant.present? %>
+                  <div class="callout announcement mb-sm alert cell-announcement">
+                    <p><%= t(".not_in_census") %></p>
+                  </div>
+                <% end %>
+                <div class="field">
+                  <%= form.text_field :email, readonly: true %>
+                </div>
+              <% end %>
+
+              <% if setting&.phone_required? %>
+                <div class="field">
+                  <%= form.text_field :phone, readonly: setting&.verify_with_both? %>
+                </div>
+                <% if setting&.verify_with_both? %>
+                  <div class="callout announcement mb-sm warning cell-announcement">
+                    <p><%= t(".phone_warning") %></p>
+                  </div>
+                <% end %>
+              <% end %>
+
+              <p><%= t(".participate_in", consultations: "<b>#{translated_attribute(@form.setting.title)}</b>").html_safe %></p>
+
+              <div class="actions">
+                <%= form.submit t(setting&.phone_required? ? ".send_code": ".authorize"), class: "button expanded", "data-disable-with" => "#{t('.send_code')}...", disabled: (setting&.email_required? && (!@form.participant || (@form.phone.blank? && setting&.verify_with_both?))) %>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/config/assets.rb

@@ -19,9 +19,7 @@ Decidim::Webpacker.register_path("#{base_path}/app/packs")
 # SCSS files within the entrypoints, they become available for inclusion using
 # `stylesheet_pack_tag`.
 Decidim::Webpacker.register_entrypoints(
-  decidim_action_delegator_questions: "#{base_path}/app/packs/entrypoints/decidim_action_delegator_questions.js",
-  decidim_action_delegator_questions_js: "#{base_path}/app/packs/entrypoints/decidim_action_delegator_questions_js.js",
-  decidim_action_delegator_admin_action_delegator_js: "#{base_path}/app/packs/entrypoints/decidim_action_delegator_admin_action_delegator_js.js"
+  decidim_action_delegator_questions: "#{base_path}/app/packs/entrypoints/decidim_action_delegator_questions.js"
 )
 
 # If you want to import some extra SCSS files in the Decidim main SCSS file

data/config/i18n-tasks.yml

@@ -3,6 +3,14 @@
 base_locale: en
 locales: [en]
 
+data:
+  external:
+    - "<%= %x[bundle info decidim-core --path].chomp %>/config/locales/%{locale}.yml"
+    - "<%= %x[bundle info decidim-admin --path].chomp %>/config/locales/%{locale}.yml"
+    - "<%= %x[bundle info decidim-participatory_processes --path].chomp %>/config/locales/%{locale}.yml"
+    - "<%= %x[bundle info decidim-consultations --path].chomp %>/config/locales/%{locale}.yml"
+    - "<%= %x[bundle info decidim-verifications --path].chomp %>/config/locales/%{locale}.yml"
+
 ignore_unused:
   - "decidim.components.action_delegator.name"