decidim-accountability 0.20.1 → 0.23.1

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

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/db/migrate/20200827154103_add_commentable_counter_cache_to_results.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddCommentableCounterCacheToResults < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_accountability_results, :comments_count, :integer, null: false, default: 0, index: true
+    Decidim::Accountability::Result.reset_column_information
+    Decidim::Accountability::Result.find_each(&:update_comments_count)
+  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?
@@ -21,7 +22,10 @@ Decidim.register_component(:accountability) do |component|
   end
 
   component.settings(:global) do |settings|
+    settings.attribute :scopes_enabled, type: :boolean, default: true
+    settings.attribute :scope_id, type: :scope
     settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :comments_max_length, type: :integer, required: false
     settings.attribute :intro, type: :text, translated: true, editor: true
     settings.attribute :categories_label, type: :string, translated: true, editor: true
     settings.attribute :subcategories_label, type: :string, translated: true, editor: true
@@ -66,7 +70,9 @@ Decidim.register_component(:accountability) do |component|
         categories_label: Decidim::Faker::Localized.word,
         subcategories_label: Decidim::Faker::Localized.word,
         heading_parent_level_results: Decidim::Faker::Localized.word,
-        heading_leaf_level_results: Decidim::Faker::Localized.word
+        heading_leaf_level_results: Decidim::Faker::Localized.word,
+        scopes_enabled: true,
+        scope_id: participatory_space.scope&.id
       }
     }
 

data/lib/decidim/accountability/engine.rb

@@ -13,7 +13,6 @@ module Decidim
 
       routes do
         resources :results, only: [:index, :show] do
-          resource :result_widget, only: :show, path: "embed"
           resources :versions, only: [:show, :index]
         end
         root to: "results#home"

data/lib/decidim/accountability/test/factories.rb

@@ -17,7 +17,9 @@ FactoryBot.define do
         categories_label: Decidim::Faker::Localized.word,
         subcategories_label: Decidim::Faker::Localized.word,
         heading_parent_level_results: Decidim::Faker::Localized.word,
-        heading_leaf_level_results: Decidim::Faker::Localized.word
+        heading_leaf_level_results: Decidim::Faker::Localized.word,
+        scopes_enabled: true,
+        scope_id: participatory_space.scope&.id
       }
     end
   end

data/lib/decidim/accountability/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.23.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-11-12 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.20.1
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
 - !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.20.1
+        version: 0.23.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.23.1
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -193,19 +199,21 @@ 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
 - app/controllers/decidim/accountability/application_controller.rb
-- app/controllers/decidim/accountability/result_widgets_controller.rb
 - app/controllers/decidim/accountability/results_controller.rb
 - app/controllers/decidim/accountability/versions_controller.rb
 - app/events/decidim/accountability/proposal_linked_event.rb
@@ -213,8 +221,12 @@ files:
 - app/forms/decidim/accountability/admin/result_form.rb
 - app/forms/decidim/accountability/admin/status_form.rb
 - app/forms/decidim/accountability/admin/timeline_entry_form.rb
+- app/helpers/decidim/accountability/admin/application_helper.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,43 +279,77 @@ 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
 - app/views/decidim/participatory_processes/participatory_process_groups/_result.html.erb
 - app/views/decidim/participatory_spaces/_result.html.erb
+- config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
+- config/locales/bg.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
+- config/locales/da.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/eo.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
+- config/locales/et.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/hr.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
 - config/locales/is-IS.yml
+- config/locales/is.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/ja.yml
+- config/locales/ko-KR.yml
+- config/locales/ko.yml
+- config/locales/lt-LT.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
+- config/locales/mt-MT.yml
+- config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/om-ET.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/so-SO.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/vi-VN.yml
+- config/locales/vi.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/migrate/20170425154712_create_accountability_statuses.rb
 - db/migrate/20170426104125_create_accountability_results.rb
 - db/migrate/20170508104902_add_description_and_progress_to_statuses.rb
@@ -307,6 +360,8 @@ 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
+- db/migrate/20200827154103_add_commentable_counter_cache_to_results.rb
 - lib/decidim/accountability.rb
 - lib/decidim/accountability/admin.rb
 - lib/decidim/accountability/admin_engine.rb
@@ -328,14 +383,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Decidim accountability module

data/app/controllers/decidim/accountability/result_widgets_controller.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    class ResultWidgetsController < Decidim::WidgetsController
-      helper_method :model
-
-      private
-
-      def model
-        @model ||= Result.where(component: params[:component_id]).find(params[:result_id])
-      end
-
-      def iframe_url
-        @iframe_url ||= result_result_widget_url(model)
-      end
-    end
-  end
-end