decidim-consultations 0.20.0 → 0.23.1.rc1

data/app/types/decidim/consultations/consultation_type.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    # This type represents a consultation.
+    ConsultationType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ParticipatorySpaceInterface }
+      ]
+
+      name "Consultation"
+      description "A consultation"
+
+      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this consultation"
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this consultation"
+      field :slug, !types.String, "Slug of this consultation"
+      field :createdAt, !Decidim::Core::DateTimeType, "The time this consultation was created", property: :created_at
+      field :updatedAt, !Decidim::Core::DateTimeType, "The time this consultation was updated", property: :updated_at
+      field :publishedAt, !Decidim::Core::DateTimeType, "The time this consultation was published", property: :published_at
+
+      field :introductoryVideoUrl, types.String, "The introductory video url for this consultation", property: :introductory_video_url
+      field :introductoryImage, types.String, "The introductory image for this consultation", property: :introductory_image
+      field :bannerImage, types.String, "The banner image for this consultation", property: :banner_image
+      field :highlightedScope, Decidim::Core::ScopeApiType, "This is the highlighted scope of this consultation", property: :highlighted_scope
+      field :startVotingDate, Decidim::Core::DateType, "Start date of the voting for this consultation", property: :start_voting_date
+      field :endVotingDate, Decidim::Core::DateType, "End date of the voting for this consultation", property: :end_voting_date
+      field :resultsPublishedAt, Decidim::Core::DateType, "Date when the results have been published", property: :results_published_at
+
+      field :questions, types[Decidim::Consultations::ConsultationQuestionType], ""
+    end
+  end
+end

data/app/views/decidim/consultations/admin/consultations/index.html.erb

@@ -1,4 +1,4 @@
-<div class="card" id="consultations">
+<div class="card with-overflow" id="consultations">
   <div class="card-divider">
     <h2 class="card-title">
       <%= t "decidim.admin.titles.consultations" %>
@@ -6,13 +6,14 @@
                   ["new", "consultation"], class: "button tiny button--title" if allowed_to? :create, :consultation %>
     </h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
             <th><%= t("models.consultation.fields.title", scope: "decidim.admin") %></th>
-            <th><%= t("models.consultation.fields.created_at", scope: "decidim.admin") %></th>
+            <th><%= sort_link(query, :created_at, t("models.consultation.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
             <th class="table-list__actions">
               <%= t("models.consultation.fields.published", scope: "decidim.admin") %>
             </th>

data/app/views/decidim/consultations/consultations/_consultation_card.html.erb

@@ -1,12 +1,12 @@
 <div class="column">
-  <article class="card card--process">
+  <div class="card card--process">
     <%= link_to consultation_path(consultation), class: "card__link" do %>
       <div class="card__image-top"
            style="background-image:url(<%= consultation.banner_image.url %>)"></div>
     <% end %>
     <div class="card__content">
       <%= link_to consultation_path(consultation), class: "card__link" do %>
-        <h4 class="card__title"><%= translated_attribute consultation.title %></h4>
+        <span class="card__title"><%= translated_attribute consultation.title %></span>
       <% end %>
       <p class="card__desc">
         <%= decidim_sanitize html_truncate(translated_attribute(consultation.subtitle), length: 630, separator: "...") %>
@@ -20,5 +20,5 @@
         <% end %>
       </div>
     </div>
-  </article>
+  </div>
 </div>

data/app/views/decidim/consultations/consultations/_consultation_details.html.erb

@@ -1,6 +1,6 @@
 <div class="row section" id="consultation-details">
   <div class="columns medium-6 large-5 large-push-1">
-    <p class="lead"><%= decidim_sanitize translated_attribute consultation.description %></p>
+    <p class="lead"><%= decidim_sanitize translated_attribute(consultation.description), strip_tags: true %></p>
   </div>
   <div class="columns medium-6 large-5 large-pull-1">
     <% if consultation.introductory_video_url.blank? %>
@@ -9,7 +9,7 @@
       </div>
     <% else %>
       <div class="embed-container">
-        <iframe src="<%= consultation.introductory_video_url %>" frameborder=0 allowfullscreen>
+        <iframe src="<%= consultation.introductory_video_url %>" allowfullscreen>
         </iframe>
       </div>
     <% end %>

data/app/views/decidim/consultations/consultations/_filters.html.erb

@@ -1,3 +1,5 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "consultations" } %>
+
 <%= filter_form_for filter do |form| %>
   <div class="filters__section">
     <div class="filters__search">
@@ -5,10 +7,12 @@
         <%= form.search_field :search_text,
                               label: false,
                               class: "input-group-field",
-                              placeholder: t("consultations.filters.search", scope: "decidim") %>
+                              placeholder: t("consultations.filters.search", scope: "decidim"),
+                              title: t("consultations.filters.search", scope: "decidim"),
+                              data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t("consultations.filters.search", scope: "decidim") %>
+          <button type="submit" class="button" aria-controls="consultations">
+            <%= icon "magnifying-glass", aria_label: t("consultations.filters.search", scope: "decidim"), role: "img" %>
           </button>
         </div>
       </div>
@@ -19,7 +23,8 @@
                                     options_for_state_filter,
                                     :first,
                                     :last,
-                                    legend_title: t("consultations.filters.state", scope: "decidim") %>
+                                    { legend_title: t("consultations.filters.state", scope: "decidim") },
+                                    "aria-controls": "consultations" %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

data/app/views/decidim/consultations/consultations/_question.html.erb

@@ -1,4 +1,4 @@
-<article class="card consultations-card">
+<div class="card consultations-card">
   <div class="row collapse card--process__row">
     <div class="columns mediumlarge-8 large-9 card--process__column">
       <div class="card__content">
@@ -35,4 +35,4 @@
       </div>
     </div>
   </div>
-</article>
+</div>

data/app/views/decidim/consultations/consultations/index.html.erb

@@ -11,9 +11,9 @@ edit_link(
   <div class="row columns">
     <div class="title-action">
       <div class="row collapse">
-        <h2 id="consultations-count" class="title-action__title section-heading">
+        <h1 id="consultations-count" class="title-action__title section-heading">
           <%= render partial: "count", locals: { count: consultations.count } %>
-        </h2>
+        </h1>
       </div>
     </div>
   </div>
@@ -32,4 +32,4 @@ edit_link(
 <% end %>
 
 <%= javascript_include_tag "decidim/filters" %>
-<%= javascript_include_tag "decidim/orders" %>
+<%= javascript_include_tag "decidim/results_listing" %>

data/app/views/decidim/consultations/questions/_vote_button.html.erb

@@ -8,88 +8,91 @@
   </div>
 </div>
 
-<div class="row column question-vote-cabin">
-  <div class="columns mediumlarge-4 show-for-mediumlarge previous-question">
-    <%= display_next_previous_button(:previous, "float-left") %>
-  </div>
-  <div class="columns mediumlarge-4">
-    <% if question.consultation.upcoming? %>
-      <div class="card__button 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>
-    <% elsif question.consultation.finished? && signed_in? && question.voted_by?(current_user) %>
-      <%= button_to decidim_consultations.question_question_votes_path(question),
-                  method: :delete,
-                  remote: true,
-                  data: { disable: true },
-                  class: "card__button button expanded success disabled",
-                  id: "unvote_button" do %>
-        <div class="vote-button-caption">
-          <%= t("questions.vote_button.already_voted", scope: "decidim") %>
+<%# Check if controller has questions_helper %>
+<% if defined? display_next_previous_button %>
+  <div class="row column question-vote-cabin">
+    <div class="columns mediumlarge-4 show-for-mediumlarge previous-question">
+      <%= display_next_previous_button(:previous, "float-left") %>
+    </div>
+    <div class="columns mediumlarge-4">
+      <% if question.consultation.upcoming? %>
+        <div class="card__button 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>
-      <% end %>
-    <% elsif signed_in? && question.consultation.active? %>
-      <% if allowed_to? :unvote, :question, question: question %>
+      <% elsif question.consultation.finished? && signed_in? && question.voted_by?(current_user) %>
         <%= button_to decidim_consultations.question_question_votes_path(question),
-                      method: :delete,
-                      remote: true,
-                      data: { disable: true },
-                      class: "card__button button expanded success",
-                      id: "unvote_button" do %>
-          <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") %>">
+                    method: :delete,
+                    remote: true,
+                    data: { disable: true },
+                    class: "card__button button expanded success disabled",
+                    id: "unvote_button" do %>
+          <div class="vote-button-caption">
             <%= t("questions.vote_button.already_voted", scope: "decidim") %>
           </div>
         <% end %>
-      <% elsif allowed_to? :vote, :question, question: question %>
-        <% if question.multiple? %>
-          <%= link_to decidim_consultations.question_question_multiple_votes_path(question),
-                      class: "card__button button expanded",
-                      id: "multivote_button" do %>
-            <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+      <% elsif signed_in? && question.consultation.active? %>
+        <% if allowed_to? :unvote, :question, question: question %>
+          <%= button_to decidim_consultations.question_question_votes_path(question),
+                        method: :delete,
+                        remote: true,
+                        data: { disable: true },
+                        class: "card__button button expanded success",
+                        id: "unvote_button" do %>
+            <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, :question, question: question %>
+          <% if question.multiple? %>
+            <%= link_to decidim_consultations.question_question_multiple_votes_path(question),
+                        class: "card__button button expanded",
+                        id: "multivote_button" do %>
+              <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+            <% end %>
+          <% else %>
+            <%= link_to "#", class: "card__button button expanded", id: "vote_button" do %>
+              <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+            <% end %>
           <% end %>
         <% else %>
-          <%= link_to "#", class: "card__button button expanded", id: "vote_button" do %>
-            <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+          <%= authorized_vote_modal_button(question, remote: true, class: "button expanded light button--sc") do %>
+            <%= t("questions.vote_button.verification_required", scope: "decidim") %>
           <% 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") %>
+      <% elsif question.consultation.active? %>
+        <%= logged_button_to decidim_consultations.question_question_votes_path(question),
+                             class: "card__button button expanded",
+                             data: { disable: true },
+                             id: "vote_button" do %>
+          <div class="vote-button-caption">
+            <%= t("questions.vote_button.vote", scope: "decidim") %>
+          </div>
         <% end %>
       <% end %>
-    <% elsif question.consultation.active? %>
-      <%= logged_button_to decidim_consultations.question_question_votes_path(question),
-                           class: "card__button button expanded",
-                           data: { disable: true },
-                           id: "vote_button" do %>
-        <div class="vote-button-caption">
-          <%= t("questions.vote_button.vote", scope: "decidim") %>
-        </div>
-      <% end %>
-    <% end %>
-  </div>
-  <div class="columns mediumlarge-4 show-for-mediumlarge next-question">
-    <%= display_next_previous_button(:next, "float-right") %>
+    </div>
+    <div class="columns mediumlarge-4 show-for-mediumlarge next-question">
+      <%= display_next_previous_button(:next, "float-right") %>
+    </div>
   </div>
-</div>
 
-<div class="row column section hide-for-mediumlarge">
-  <div class="small-buttons">
-    <div class="columns small-6 previous-question">
-      <%= display_next_previous_button(:previous, "expanded") %>
-    </div>
-    <div class="columns small-6 next-question">
-      <%= display_next_previous_button(:next, "expanded") %>
+  <div class="row column section hide-for-mediumlarge">
+    <div class="small-buttons">
+      <div class="columns small-6 previous-question">
+        <%= display_next_previous_button(:previous, "expanded") %>
+      </div>
+      <div class="columns small-6 next-question">
+        <%= display_next_previous_button(:next, "expanded") %>
+      </div>
     </div>
   </div>
-</div>
+<% end %>
 
 <%= render partial: "decidim/consultations/questions/vote_modal", locals: { question: question } %>
 <%= render partial: "decidim/consultations/questions/vote_modal_confirm", locals: { question: question } %>

data/app/views/decidim/consultations/questions/_vote_modal.html.erb

@@ -3,7 +3,7 @@
     <h3 class="reveal__title">
       <%= t "questions.vote_modal.title", scope: "decidim" %>
     </h3>
-    <button class="close-button" data-close aria-label="Close modal" type="button">
+    <button class="close-button" data-close aria-label="<%= t "questions.vote_modal.close_modal", scope: "decidim" %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>

data/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb

@@ -3,7 +3,7 @@
     <h3 class="reveal__title">
       <%= t "questions.vote_modal_confirm.title", scope: "decidim" %>
     </h3>
-    <button class="close-button" data-close aria-label="Close modal" type="button">
+    <button class="close-button" data-close aria-label="<%= t("questions.vote_modal_confirm.close_modal", scope: "decidim") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>

data/app/views/decidim/consultations/questions/show.html.erb

@@ -5,7 +5,7 @@
         <%= decidim_sanitize translated_attribute current_question.question_context %>
 
         <div class="show-more">
-          <button class="button button--muted small"><%= t "read_more", scope: "decidim.questions.show" %></button>
+          <button class="button hollow small"><%= t "read_more", scope: "decidim.questions.show" %></button>
         </div>
 
         <div class="hide show-more-panel">
@@ -13,12 +13,12 @@
 
           <div class="section">
             <h2 class=section-heading><%= t "question.what_is_decided", scope: "activemodel.attributes" %></h2>
-            <p><%= decidim_sanitize translated_attribute current_question.what_is_decided %></p>
+            <p><%= decidim_sanitize translated_attribute(current_question.what_is_decided), strip_tags: true %></p>
           </div>
 
           <div class="section">
             <h2 class=section-heading><%= t "question.question_context", scope: "activemodel.attributes" %></h2>
-            <p><%= decidim_sanitize translated_attribute current_question.question_context %></p>
+            <p><%= decidim_sanitize translated_attribute(current_question.question_context), strip_tags: true %></p>
           </div>
         </div>
       </div>
@@ -36,7 +36,7 @@
 <%= content_for :question_header_details do %>
   <div id="question-header-details" class="row consultations-home-intro">
     <div class="columns medium-5">
-      <img src="<%= current_question.hero_image&.url %>">
+      <%= image_tag current_question.hero_image&.url, alt: t("question.hero_image", scope: "activemodel.attributes") if current_question.hero_image&.url %>
     </div>
 
     <div class="columns medium-5">

data/app/views/layouts/decidim/_question_components.html.erb

@@ -2,15 +2,15 @@
   <div class="process-nav consultations-nav">
     <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
       <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(".unfold"), role: "img" %>
-      <div class="process-nav__link">
+      <span class="process-nav__link">
         <% if self.try(:current_component) %>
           <%= component_icon(current_component) %>
           <%= translated_attribute(current_component.name) %>
         <% else %>
-          <%= external_icon "decidim/pages/icon.svg" %>
+          <%= external_icon "decidim/pages/icon.svg", role: "img", "aria-hidden": true %>
           <%= t ".question_menu_item" %>
         <% end %>
-      </div>
+      </span>
     </button>
 
     <%

data/app/views/layouts/decidim/_question_header.html.erb

@@ -10,7 +10,7 @@
           </h1>
           <%= link_to decidim_consultations.consultations_path, class: "consultations-header__link" do %>
             <%= t ".back_to_consultation" %>
-            <%= icon "media-play" %>
+            <%= icon "media-play", role: "img", "aria-hidden": true %>
           <% end %>
         </div>
       </div>

data/app/views/layouts/decidim/consultation.html.erb

@@ -1,6 +1,7 @@
 <%= render "layouts/decidim/application" do %>
   <div class="wrapper">
     <%= render partial: "layouts/decidim/consultation_header" %>
+    <%= cell "decidim/translation_bar", current_organization %>
     <%= yield %>
   </div>
   <% if content_for? :expanded %>

data/config/locales/am-ET.yml

@@ -0,0 +1 @@
+am:

data/config/locales/ar.yml

@@ -19,6 +19,7 @@ ar:
         hashtag: رابطة هاشتاق
         hero_image: الصورة الرئيسية
         i_frame_url: عنوان URL لنظام التصويت الخارجي
+        instructions: تعليمات إضافية خاصة بالتصويت
         max_votes: الحد الأقصى لعدد الأصوات
         min_votes: الحد الأدنى لعدد الأصوات
         origin_scope: نطاق
@@ -31,14 +32,21 @@ ar:
         scope: منطقة البلدية
         slug: سبيكة العنوان الشبكي
         subtitle: عنوان فرعي
-        title: عنوان
         vote: نظام التصويت الخارجي
         what_is_decided: ما الذي تقرر
+      response:
+        decidim_consultations_response_group_id: الفريق
     errors:
       vote:
         decidim_consultations_response_id:
           not_found: الرد غير موجود.
   activerecord:
+    errors:
+      models:
+        decidim/consultations/vote:
+          attributes:
+            question:
+              invalid_num_votes: عدد الأصوات غير صالح
     models:
       decidim/consultation:
         zero: المشاورات
@@ -71,9 +79,11 @@ ar:
   decidim:
     admin:
       actions:
+        back_to_responses: العودة إلى الأجوبة
         new_consultation: استشارة جديدة
         new_question: سؤال جديد
         new_response: استجابة جديدة
+        new_response_group: فريق جديد
         publish_results: نشر النتائج
         unpublish_results: نتائج غير منشورة
       consultation_publications:
@@ -119,6 +129,7 @@ ar:
           results: النتائج
         questions_submenu:
           components: المكونات
+          configuration: الإعدادا
           consultation: تشاور
           info: معلومات
           responses: استجابات
@@ -150,6 +161,7 @@ ar:
         response:
           fields:
             created_at: أنشئت في
+            response_group: الفريق
             title: عنوان
           name:
             zero: استجابات
@@ -158,6 +170,9 @@ ar:
             few: استجابات
             many: استجابات
             other: استجابات
+      question_configuration:
+        form:
+          title: الإعداد المتقدّم
       question_publications:
         create:
           error: حدثت مشكلة في نشر هذا السؤال.
@@ -184,6 +199,16 @@ ar:
         update:
           error: حدثت مشكلة أثناء تحديث هذا السؤال.
           success: تم تحديث السؤال بنجاح.
+      response_groups:
+        edit:
+          update: تحديث
+        form:
+          title: معلومات عامة
+        new:
+          create: إنشاء
+        update:
+          error: وقعت هناك مشكلة عند تحديث هذه الإجابة.
+          success: تم تحديث الإجابة بنجاح.
       responses:
         create:
           error: كانت هناك مشكلة في إنشاء استجابة جديدة.
@@ -276,7 +301,10 @@ ar:
           other: يصوت من
       question_multiple_votes:
         results_rules:
+          title: خيارات عديدة متاحة مسموحة للإجابة على هذا السؤال
           total_participants: لقد شارك مجموع يقدّر بـ %{count} أشخاص في التصويت.
+          vote_limit:
+            description: يمكن للمشارِكين التصويت على %{limit} خيارات كأقصى حد.
         voting_rules:
           title: 'التصويت خاضع للقواعد التالية:'
           vote_limit: