decidim-accountability 0.20.0 → 0.23.1.rc1

data/app/types/decidim/accountability/result_type.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    ResultType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ComponentInterface },
+        -> { Decidim::Core::CategorizableInterface },
+        -> { Decidim::Comments::CommentableInterface },
+        -> { Decidim::Core::ScopableInterface }
+      ]
+
+      name "Result"
+      description "A result"
+
+      field :id, !types.ID, "The internal ID for this result"
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this result"
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this result"
+      field :reference, types.String, "The reference for this result"
+      field :startDate, Decidim::Core::DateType, "The start date for this result", property: :start_date
+      field :endDate, Decidim::Core::DateType, "The end date for this result", property: :end_date
+      field :progress, types.Float, "The progress for this result"
+      field :createdAt, Decidim::Core::DateTimeType, "When this result was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "When this result was updated", property: :updated_at
+      field :childrenCount, types.Int, "The number of children results", property: :children_count
+      field :weight, !types.Int, "The order of this result"
+      field :externalId, types.String, "The external ID for this result", property: :external_id
+
+      field :children, types[Decidim::Accountability::ResultType], "The childrens results"
+      field :parent, Decidim::Accountability::ResultType, "The parent result"
+      field :status, Decidim::Accountability::StatusType, "The status for this result"
+      field :timelineEntries, types[Decidim::Accountability::TimelineEntryType], "The timeline entries for this result", property: :timeline_entries
+    end
+  end
+end

data/app/types/decidim/accountability/status_type.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    StatusType = GraphQL::ObjectType.define do
+      name "Status"
+      description "A status"
+
+      field :id, !types.ID, "The internal ID for this status"
+      field :key, types.String, "The key for this status"
+      field :name, Decidim::Core::TranslatedFieldType, "The name for this status"
+      field :createdAt, Decidim::Core::DateType, "When this status was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateType, "When this status was updated", property: :updated_at
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this status"
+      field :progress, types.Int, "The progress for this status"
+
+      field :results, types[Decidim::Accountability::ResultType], "The results for this status"
+    end
+  end
+end

data/app/types/decidim/accountability/timeline_entry_type.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    TimelineEntryType = GraphQL::ObjectType.define do
+      name "TimelineEntry"
+      description "A Timeline Entry"
+
+      field :id, !types.ID, "The internal ID for this timeline entry"
+      field :entryDate, Decidim::Core::DateType, "The entry date for this timeline entry", property: :entry_date
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this timeline entry"
+      field :createdAt, Decidim::Core::DateTimeType, "When this timeline entry was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "When this timeline entry was updated", property: :updated_at
+
+      field :result, Decidim::Accountability::ResultType, "The result for this timeline entry"
+    end
+  end
+end

data/app/views/decidim/accountability/admin/import_results/new.html.erb

@@ -0,0 +1,22 @@
+<%= form_tag(import_results_path, multipart: true, class: "form new_import") do %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title">
+        <%= t(".title") %>
+      </h2>
+    </div>
+
+    <div class="card-section">
+      <div class="row column">
+        <%= file_field_tag :csv_file %>
+      </div>
+    </div>
+  </div>
+
+  <div class="button--double form-general-submit">
+    <%= submit_tag t(".import"), class: "button" %>
+  </div>
+  <div class="import-process-info">
+    <%= t(".info", link_new_status: new_status_path, link_new_result: new_result_path, link_export_csv: link_to(t(".link"), exports_path(@current_component, id: "results", format: "CSV"), method: :post)).try("html_safe") %>
+  </div>
+<% end %>

data/app/views/decidim/accountability/admin/results/_form.html.erb

@@ -20,9 +20,9 @@
 
     <% else %>
 
-      <% if current_participatory_space.has_subscopes? %>
+      <% if current_component.has_subscopes? %>
         <div class="row column">
-          <%= scopes_picker_field form, :decidim_scope_id %>
+          <%= scopes_picker_field form, :decidim_scope_id, root: current_component.scope %>
         </div>
       <% end %>
 
@@ -53,11 +53,7 @@
     </div>
 
     <div class="row column">
-      <% if @form.proposals %>
-        <% picker_options = { id: "decidim_accountability_proposals", class: "picker-multiple", name: "result[proposal_ids]", multiple: true }
-        prompt_params= { url: proposals_results_path(current_component, format: :html), text: t(".add_proposal") } %>
-        <%= form.data_picker(:proposals, picker_options, prompt_params) {|item| { url:proposals_results_path(current_component, format: :json), text: "##{item.id}- #{present(item).title}" }} %>
-      <% end %>
+      <%= proposals_picker(form, :proposals, proposals_picker_results_path) %>
     </div>
 
     <div class="row column">

data/app/views/decidim/accountability/admin/results/index.html.erb

@@ -7,6 +7,7 @@
         <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")), new_result_path(parent_id: parent_result), class: "button tiny button--simple" if allowed_to? :create, :result %>
         <%= render partial: "decidim/accountability/admin/shared/subnav" unless parent_result %>
         <%= export_dropdown %>
+        <%= link_to t("actions.import_csv", scope: "decidim.accountability"), import_results_path, class: "button tiny button--simple" if allowed_to? :create, :result %>
       </div>
     </h2>
   </div>
@@ -17,6 +18,7 @@
         <thead>
           <tr>
             <th><%= t("models.result.fields.title", scope: "decidim.accountability") %></th>
+            <%= th_resource_scope_label %>
             <th class="actions"><%= t("actions.title", scope: "decidim.accountability") %></th>
           </tr>
         </thead>
@@ -26,6 +28,7 @@
               <td>
                 <%= link_to translated_attribute(result.title), results_path(parent_id: result.id) %><br>
               </td>
+              <%= td_resource_scope_for(result.scope) %>
               <td class="table-list__actions">
                 <%= icon_link_to "eye", resource_locator(result).path, t("actions.preview", scope: "decidim.accountability"), class: "action-icon--preview", target: :blank %>
 

data/app/views/decidim/accountability/admin/results/proposals_picker.html.erb

@@ -0,0 +1 @@
+<%= cell "decidim/proposals/proposals_picker", current_component %>

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

@@ -0,0 +1,25 @@
+<% if @errors.empty? %>
+  <p><%= t(".success") %></p>
+<% else %>
+  <p><%= t(".errors_present") %>:</p>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t(".row_number") %></th>
+        <th><%= t(".errors") %></th>
+      </tr>
+    </thead>
+    <% @errors.each do |error| %>
+      <tr>
+        <td><%= error.first %></td>
+        <td>
+          <ul>
+            <% error.last.each do |error_message| %>
+              <li><%= error_message %></li>
+            <% end %>
+          </ul>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>

data/app/views/decidim/accountability/results/_linked_results.html.erb

@@ -1,7 +1,7 @@
 <div class="card card--action card--list">
   <% resources.each do |result| %>
     <div class="card--list__item">
-      <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
+      <%= icon "actions", class: "card--list__icon", role: "img", "aria-hidden": true, remove_icon_class: true %>
       <%= link_to resource_locator(result).path, class: "card--list__text card__link card__link--block" do %>
         <h5 class="card--list__heading">
           <%= translated_attribute(result.title) %>

data/app/views/decidim/accountability/results/_results_leaf.html.erb

@@ -1,7 +1,7 @@
 <div class="title-action">
-  <h2 id="results-count" class="title-action__title section-heading">
+  <h3 id="results-count" class="title-action__title section-heading">
     <%= heading_leaf_level_results(total_count) %>
-  </h2>
+  </h3>
 </div>
 
 <div class="row">
@@ -9,12 +9,12 @@
     <div class="card card--action card--list">
       <% results.each do |result| %>
         <div class="card--list__item">
-          <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
+          <%= icon "actions", class: "card--list__icon", role: "img", "aria-hidden": true, remove_icon_class: true %>
 
           <%= link_to result_path(result), class: "card--list__text card__link card__link--block" do %>
-            <h5 class="card--list__heading">
+            <h4 class="card--list__heading">
               <%= translated_attribute(result.title) %>
-            </h5>
+            </h4>
 
             <div class="text-small card--meta">
               <% if result.start_date %>

data/app/views/decidim/accountability/results/_results_parent.html.erb

@@ -12,9 +12,9 @@
           <%= icon "proposals", class: "card--list__icon", remove_icon_class: true %>
 
           <%= link_to result, class: "card--list__text card__link card__link--block" do %>
-            <h5 class="card--list__heading">
+            <h3 class="card--list__heading">
               <%= translated_attribute result.title %>
-            </h5>
+            </h3>
 
             <span class="text-small"><%= heading_leaf_level_results(result.children.count) %></span>
           <% end %>

data/app/views/decidim/accountability/results/_scope_filters.html.erb

@@ -1,17 +1,30 @@
 <div class="scope-filters section">
-  <% if current_participatory_space.has_subscopes? %>
+  <% if current_component.has_subscopes? %>
     <div><%= t("results.filters.scopes", scope: "decidim.accountability") %></div>
 
     <ul class="tags tags--action">
-      <li <%= active_class_if_current(nil) %>><%= link_to t("results.filters.all", scope: "decidim.accountability"), url_for(filter: { category_id: category.try(:id) }) %></li>
+      <li <%= active_class_if_current(nil) %>>
+          <%= link_to url_for(filter: { category_id: category.try(:id) }) do %>
+            <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 2) %></span>
+            <%= t("results.filters.all", scope: "decidim.accountability") %>
+          <% end %>
+      </li>
 
       <% if current_participatory_space.scope %>
         <li <%= active_class_if_current(current_participatory_space.scope.id) %>>
-          <%= link_to translated_attribute(current_participatory_space.scope.name), url_for(filter: { scope_id: current_participatory_space.scope.id, category_id: category.try(:id) }) %>
+          <%= link_to url_for(filter: { scope_id: current_participatory_space.scope.id, category_id: category.try(:id) }) do %>
+            <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 1) %></span>
+            <%= translated_attribute(current_participatory_space.scope.name) %>
+          <% end %>
         </li>
       <% end %>
       <% current_participatory_space.subscopes.each do |scope| %>
-        <li <%= active_class_if_current(scope.id) %>><%= link_to translated_attribute(scope.name), url_for(filter: { scope_id: scope.id, category_id: category.try(:id) }) %></li>
+        <li <%= active_class_if_current(scope.id) %>>
+          <%= link_to url_for(filter: { scope_id: scope.id, category_id: category.try(:id) }) do %>
+            <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 1) %></span>
+            <%= translated_attribute(scope.name) %>
+          <% end %>
+        </li>
       <% end %>
     </ul>
   <% end %>

data/app/views/decidim/accountability/results/_search.html.erb

@@ -1,10 +1,10 @@
 <%= form_tag results_path, method: :get do %>
   <div class="filters__search">
     <div class="input-group">
-      <%= search_field_tag "filter[search_text]", nil, label: false, class: "input-group-field", placeholder: t(".search"), value: "" %>
+      <%= search_field_tag "filter[search_text]", nil, class: "input-group-field", placeholder: t(".search"), value: "", title:  t(".search") %>
       <div class="input-group-button">
-        <button type="submit" class="button button--muted">
-          <%= icon "magnifying-glass", aria_label: t(".search") %>
+        <button type="submit" class="button">
+          <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
         </button>
       </div>
     </div>

data/app/views/decidim/accountability/results/_stats_box.html.erb

@@ -20,10 +20,17 @@
       <div class="definition-data">
         <% if result.versions.any? %>
           <div class="definition-data__item versions_count">
-            <span class="definition-data__title"><%= t("results.show.stats.version_number", scope: "decidim.accountability") %></span>
-            <%= result.versions.count %>
-            <div class="pr-s pl-s">
-              <%= link_to t("results.show.stats.show_all_versions", scope: "decidim.accountability"), result_versions_path(result), class: "button button--sc hollow secondary small expanded" %>
+            <div>
+              <%= resource_version_number(result.versions_count, "text-large") %>
+              <small class="text-medium">
+                <%= resource_version_of(result.versions_count) %>
+              </small>
+            </div>
+
+            <div>
+              <span class="text-medium">
+                <%= link_to_other_resource_versions(result_versions_path(result)) %>
+              </span>
             </div>
           </div>
           <% if result.last_editor.present? %>
@@ -69,5 +76,4 @@
 
   <%= resource_reference(result) %>
   <%= render partial: "decidim/shared/share_modal" %>
-  <%= embed_modal_for result_result_widget_url(result, format: :js) %>
 </div>

data/app/views/decidim/accountability/results/_timeline.html.erb

@@ -12,9 +12,9 @@
               <span class="timeline__date text-small">
                 <%= timeline_entry.entry_date %>
               </span>
-              <h6 class="timeline__title">
+              <h4 class="timeline__title">
                 <%= translated_attribute timeline_entry.description %>
-              </h6>
+              </h4>
             </div>
           </div>
         </li>

data/app/views/decidim/accountability/versions/index.html.erb

@@ -1,30 +1,12 @@
 <div class="row accountability">
   <div class="small-12 columns">
-    <%= render partial: "decidim/accountability/results/nav_breadcrumb", locals: { category: result.parent.try(:category) || result.try(:category) } %>
+    <%= render partial: "decidim/accountability/results/nav_breadcrumb", locals: { category: versioned_resource.parent.try(:category) || versioned_resource.try(:category) } %>
   </div>
-  <div class="small-12 columns">
-    <h2 class="heading2"><%= t(".changes_at_title", title: translated_attribute(result.title)) %></h2>
-    <h3 class="section-heading"><%= t(".title") %></h3>
-    <div class="row">
-      <div class="mediumlarge-8 columns">
-        <div class="section">
-          <div class="card card--list">
-            <% result.versions.each_with_index do |version, index| %>
-              <%= render partial: "version", locals: { version: version, index: index } %>
-            <% end %>
-          </div>
-        </div>
-      </div>
 
-      <div class="columns section mediumlarge-4 large-3">
-        <div class="card extra definition-data">
-          <div class="definition-data__item versions_count">
-            <span class="definition-data__title"><%= t("results.show.stats.number_of_versions", scope: "decidim.accountability") %></span>
-            <%= result.versions.count %>
-            <%= link_to t("results.show.stats.back_to_result", scope: "decidim.accountability"), result_path(result), class: "button button--sc hollow secondary small expanded" %>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <%= cell(
+    "decidim/versions_list",
+    versioned_resource,
+    version_path: proc { |version_index| url_for(action: :show, id: version_index) },
+    i18n_scope: "decidim.accountability.results.show.stats"
+  ) %>
 </div>

data/app/views/decidim/accountability/versions/show.html.erb

@@ -2,37 +2,15 @@
 <%= javascript_include_tag "decidim/accountability/accountability" %>
 <div class="row accountability">
   <div class="small-12 columns">
-    <%= render partial: "decidim/accountability/results/nav_breadcrumb", locals: { category: result.parent.try(:category) || result.try(:category) } %>
+    <%= render partial: "decidim/accountability/results/nav_breadcrumb", locals: { category: versioned_resource.parent.try(:category) || versioned_resource.try(:category) } %>
   </div>
-  <div class="small-12 columns">
-    <h2 class="heading2"><%= t(".changes_at_title", title: translated_attribute(result.title)) %></h2>
-    <div class="row">
-      <div class="mediumlarge-8 columns">
-        <div class="section">
-          <%= cell("decidim/diff", current_version) %>
-        </div>
-      </div>
 
-      <div class="columns section mediumlarge-4 large-3">
-        <div class="card extra definition-data">
-          <div class="definition-data__item versions_count">
-            <span class="definition-data__title"><%= t("results.show.stats.version_number", scope: "decidim.accountability") %></span>
-            <%= t("results.show.stats.version_number_out_of_total", scope: "decidim.accountability", current_version: params[:id], total_count: result.versions_count) %>
-            <%= link_to t("results.show.stats.show_all_versions", scope: "decidim.accountability"), result_versions_path(result), class: "button button--sc hollow secondary small expanded" %>
-            <%= link_to t("results.show.stats.back_to_result", scope: "decidim.accountability"), result_path(result), class: "button button--sc hollow secondary small expanded" %>
-          </div>
-          <% if current_version.whodunnit.present? %>
-            <div class="definition-data__item last_revision_by">
-              <span class="definition-data__title"><%= t("results.show.stats.version_author", scope: "decidim.accountability") %></span>
-              <%= render_resource_editor(current_version) %>
-            </div>
-          <% end %>
-          <div class="definition-data__item versions_count">
-            <span class="definition-data__title"><%= t("results.show.stats.version_created_at", scope: "decidim.accountability") %></span>
-            <%= l current_version.created_at, format: :decidim_short %>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <%= cell(
+    "decidim/version",
+    current_version,
+    index: params[:id],
+    versioned_resource: versioned_resource,
+    versions_path: proc { url_for(action: :index) },
+    i18n_scope: "decidim.accountability.results.show.stats"
+  ) %>
 </div>

data/app/views/decidim/participatory_spaces/_result.html.erb

@@ -1,10 +1,10 @@
 <div class="card--list__item">
-  <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
+  <%= icon "actions", class: "card--list__icon", role: "img", "aria-hidden": true, remove_icon_class: true %>
 
   <%= link_to resource_locator(result).path, class: "card--list__text card__link card__link--block" do %>
-      <h5 class="card--list__heading">
+      <h4 class="card--list__heading heading6">
         <%= translated_attribute(result.title) %>
-      </h5>
+      </h4>
 
       <div class="text-small card--meta">
         <% if result.start_date %>

data/config/locales/am-ET.yml

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

data/config/locales/ar.yml

@@ -62,17 +62,11 @@ ar:
           edit:
             title: تحرير النتيجة
             update: تحديث النتيجة
-          form:
-            add_proposal: إضافة اقتراح
           index:
             title: النتائج
           new:
             create: إنشاء نتيجة
             title: نتيجة جديدة
-          proposals:
-            close: قريب
-            current_selection: الإختيار الحالي
-            select: تحديد
           update:
             invalid: حدثت مشكلة أثناء تحديث هذه النتيجة
             success: تم تحديث النتيجة بنجاح
@@ -165,30 +159,16 @@ ar:
         show:
           stats:
             attendees: الحاضرين
-            back_to_result: العودة إلى النتيجة
+            back_to_resource: العودة إلى النتيجة
             comments: تعليقات
             contributions: مساهمات
             last_edited_by: التعديل الأخير تم بواسطة
             last_updated_at: آخر تحديث في
             meetings: اجتماعات
-            number_of_versions: إصدارات
             proposals: اقتراحات
-            show_all_versions: عرض جميع الإصدارات
-            version_author: مؤلف الإصدار
-            version_created_at: تم إنشاء الإصدار في
-            version_number: رقم الإصدار
-            version_number_out_of_total: "%{current_version} من %{total_count}"
             votes: الدعم
         timeline:
           title: تطور المشروع
-      versions:
-        index:
-          changes_at_title: التغييرات في "%{title}"
-          title: إصدارات
-        show:
-          changes_at_title: التغييرات في "%{title}"
-        version:
-          version_index: الإصدار %{index}
     components:
       accountability:
         name: المسائلة
@@ -224,9 +204,6 @@ ar:
       participatory_process_groups:
         highlighted_results:
           results: النتائج
-    participatory_spaces:
-      highlighted_results:
-        see_all: شاهد الكل (%{count})
     resource_links:
       included_projects:
         result_project: المشاريع المدرجة في هذه النتيجة