decidim-accountability 0.19.0 → 0.22.0

data/config/locales/uk.yml

@@ -59,17 +59,11 @@ uk:
           edit:
             title: Редагувати підсумки
             update: Оновити підсумки
-          form:
-            add_proposal: Додати пропозицію
           index:
             title: Підсумки
           new:
             create: Створити підсумки
             title: Додати підсумки
-          proposals:
-            close: Закрити
-            current_selection: Поточний вибір
-            select: Оберіть
           update:
             invalid: При спробі оновити ці підсумки сталася помилка
             success: Підсумки успішно оновлено
@@ -158,30 +152,16 @@ uk:
         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: Звітність

data/db/migrate/20200320105903_index_foreign_keys_in_decidim_accountability_results.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimAccountabilityResults < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_accountability_results, :external_id
+  end
+end

data/lib/decidim/accountability/admin_engine.rb

@@ -14,11 +14,12 @@ module Decidim
       routes do
         resources :statuses
         resources :results, except: [:show] do
+          get :proposals_picker, on: :collection
+
           resources :timeline_entries, except: [:show]
-          collection do
-            get :proposals
-          end
         end
+        get :import_results, to: "import_results#new"
+        post :import_results, to: "import_results#create"
         root to: "results#index"
       end
 

data/lib/decidim/accountability/component.rb

@@ -8,6 +8,7 @@ Decidim.register_component(:accountability) do |component|
   component.icon = "decidim/accountability/icon.svg"
   component.stylesheet = "decidim/accountability/accountability"
   component.permissions_class_name = "Decidim::Accountability::Permissions"
+  component.query_type = "Decidim::Accountability::AccountabilityType"
 
   component.on(:before_destroy) do |instance|
     raise StandardError, "Can't remove this component" if Decidim::Accountability::Result.where(component: instance).any?
@@ -17,6 +18,7 @@ Decidim.register_component(:accountability) do |component|
     resource.model_class_name = "Decidim::Accountability::Result"
     resource.template = "decidim/accountability/results/linked_results"
     resource.card = "decidim/accountability/result"
+    resource.searchable = false
   end
 
   component.settings(:global) do |settings|

data/lib/decidim/accountability/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.19.0"
+      "0.22.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,42 +18,48 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: searchlight
   requirement: !ruby/object:Gem::Requirement
@@ -74,98 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -193,14 +199,17 @@ files:
 - app/cells/decidim/accountability/highlighted_results_for_component/show.erb
 - app/cells/decidim/accountability/highlighted_results_for_component_cell.rb
 - app/cells/decidim/accountability/result_activity_cell.rb
+- app/commands/decidim/accountability/admin/create_imported_result.rb
 - app/commands/decidim/accountability/admin/create_result.rb
 - app/commands/decidim/accountability/admin/create_status.rb
 - app/commands/decidim/accountability/admin/create_timeline_entry.rb
 - app/commands/decidim/accountability/admin/destroy_result.rb
+- app/commands/decidim/accountability/admin/update_imported_result.rb
 - app/commands/decidim/accountability/admin/update_result.rb
 - app/commands/decidim/accountability/admin/update_status.rb
 - app/commands/decidim/accountability/admin/update_timeline_entry.rb
 - app/controllers/decidim/accountability/admin/application_controller.rb
+- app/controllers/decidim/accountability/admin/import_results_controller.rb
 - app/controllers/decidim/accountability/admin/results_controller.rb
 - app/controllers/decidim/accountability/admin/statuses_controller.rb
 - app/controllers/decidim/accountability/admin/timeline_entries_controller.rb
@@ -215,6 +224,9 @@ files:
 - app/forms/decidim/accountability/admin/timeline_entry_form.rb
 - app/helpers/decidim/accountability/application_helper.rb
 - app/helpers/decidim/accountability/breadcrumb_helper.rb
+- app/jobs/application_job.rb
+- app/jobs/decidim/accountability/admin/import_results_csv_job.rb
+- app/mailers/decidim/accountability/import_mailer.rb
 - app/models/decidim/accountability/application_record.rb
 - app/models/decidim/accountability/result.rb
 - app/models/decidim/accountability/status.rb
@@ -228,11 +240,17 @@ files:
 - app/services/decidim/accountability/result_search.rb
 - app/services/decidim/accountability/result_stats_calculator.rb
 - app/services/decidim/accountability/results_calculator.rb
+- app/services/decidim/accountability/results_csv_importer.rb
+- app/types/decidim/accountability/accountability_type.rb
+- app/types/decidim/accountability/result_type.rb
+- app/types/decidim/accountability/status_type.rb
+- app/types/decidim/accountability/timeline_entry_type.rb
+- app/views/decidim/accountability/admin/import_results/new.html.erb
 - app/views/decidim/accountability/admin/results/_form.html.erb
-- app/views/decidim/accountability/admin/results/_proposals.html.erb
 - app/views/decidim/accountability/admin/results/edit.html.erb
 - app/views/decidim/accountability/admin/results/index.html.erb
 - app/views/decidim/accountability/admin/results/new.html.erb
+- app/views/decidim/accountability/admin/results/proposals_picker.html.erb
 - app/views/decidim/accountability/admin/shared/_subnav.html.erb
 - app/views/decidim/accountability/admin/statuses/_form.html.erb
 - app/views/decidim/accountability/admin/statuses/edit.html.erb
@@ -242,6 +260,7 @@ files:
 - app/views/decidim/accountability/admin/timeline_entries/edit.html.erb
 - app/views/decidim/accountability/admin/timeline_entries/index.html.erb
 - app/views/decidim/accountability/admin/timeline_entries/new.html.erb
+- app/views/decidim/accountability/import_mailer/import.html.erb
 - app/views/decidim/accountability/result_widgets/show.html.erb
 - app/views/decidim/accountability/results/_home_categories.html.erb
 - app/views/decidim/accountability/results/_home_header.html.erb
@@ -260,7 +279,6 @@ files:
 - app/views/decidim/accountability/results/index.html.erb
 - app/views/decidim/accountability/results/index.js.erb
 - app/views/decidim/accountability/results/show.html.erb
-- app/views/decidim/accountability/versions/_version.html.erb
 - app/views/decidim/accountability/versions/index.html.erb
 - app/views/decidim/accountability/versions/show.html.erb
 - app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_results.html.erb
@@ -268,30 +286,48 @@ files:
 - app/views/decidim/participatory_spaces/_result.html.erb
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
 - config/locales/de.yml
+- config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
+- config/locales/is-IS.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/lt-LT.yml
+- config/locales/lv-LV.yml
+- config/locales/mt-MT.yml
 - config/locales/nl.yml
 - config/locales/no.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -305,6 +341,7 @@ files:
 - db/migrate/20180305133145_rename_features_to_components_at_accountability.rb
 - db/migrate/20180508170210_add_weight_to_results.rb
 - db/migrate/20180508170647_add_external_id_to_results.rb
+- db/migrate/20200320105903_index_foreign_keys_in_decidim_accountability_results.rb
 - lib/decidim/accountability.rb
 - lib/decidim/accountability/admin.rb
 - lib/decidim/accountability/admin_engine.rb
@@ -333,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Decidim accountability module

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

@@ -1,12 +0,0 @@
-<div class="picker-header">
-  <h1><%= t(".current_selection") %></h1>
-</div>
-<div class="picker-content">
-  <input type="text" name="proposal-search" id="data_picker-autocomplete">
-</div>
-<div class="picker-footer">
-  <div class="buttons button--double">
-    <a id="proposal-picker-choose" class="button mute" href="<%= proposals_results_path(current_component, format: :json) %>" data-picker-value="" data-picker-text="" data-picker-choose><%= t(".select") %></a>
-    <a class="button clear" data-close=""><%= t(".close") %></a>
-  </div>
-</div>

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

@@ -1,20 +0,0 @@
-<div class="card--list__item">
-  <div class="card--list__text">
-    <div>
-      <%= link_to result_version_path(result, index + 1) do %>
-        <h6 class="card--list__heading heading6">
-          <%= t(".version_index", index: index + 1) %>
-        </h6>
-      <% end %>
-      <div class="author-data">
-        <%= render_resource_editor(version) %>
-        <%= l version.created_at, format: :decidim_short %>
-      </div>
-    </div>
-  </div>
-  <div class="card--list__data">
-    <%= link_to result_version_path(result, index + 1), class: "card--list__data__icon" do %>
-      <%= icon "chevron-right" %>
-    <% end %>
-  </div>
-</div>