decidim-accountability 0.23.0 → 0.24.0.rc1

data/config/locales/uk.yml

@@ -183,10 +183,6 @@ uk:
           email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{proposal_title}". Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
           email_subject: Оновлення до %{proposal_title}
           notification_title: Пропозиція <a href="%{proposal_path}">%{proposal_title}</a> була включена до підсумку <a href="%{resource_path}">%{resource_title}</a>.
-    participatory_processes:
-      participatory_process_groups:
-        highlighted_results:
-          results: Підсумки
     resource_links:
       included_projects:
         result_project: Проекти, включені до цих підсумків

data/config/locales/zh-CN.yml

@@ -209,10 +209,6 @@ zh-CN:
         description: 生成的结果数
         object: 结果
         title: 成果
-    participatory_processes:
-      participatory_process_groups:
-        highlighted_results:
-          results: 成果
     participatory_spaces:
       highlighted_results:
         see_all: 查看所有结果 (%{count})

data/lib/decidim/accountability.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/accountability/admin"
+require "decidim/accountability/api"
 require "decidim/accountability/engine"
 require "decidim/accountability/admin_engine"
 require "decidim/accountability/component"

data/lib/decidim/accountability/admin_engine.rb

@@ -16,6 +16,8 @@ module Decidim
         resources :results, except: [:show] do
           get :proposals_picker, on: :collection
 
+          resources :attachment_collections
+          resources :attachments
           resources :timeline_entries, except: [:show]
         end
         get :import_results, to: "import_results#new"

data/lib/decidim/accountability/api.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    autoload :AccountabilityType, "decidim/api/accountability_type"
+    autoload :ResultType, "decidim/api/result_type"
+    autoload :StatusType, "decidim/api/status_type"
+    autoload :TimelineEntryType, "decidim/api/timeline_entry_type"
+  end
+end

data/lib/decidim/accountability/component.rb

@@ -54,6 +54,18 @@ Decidim.register_component(:accountability) do |component|
     exports.serializer Decidim::Accountability::ResultSerializer
   end
 
+  component.exports :result_comments do |exports|
+    exports.collection do |component_instance|
+      Decidim::Comments::Export.comments_for_resource(
+        Decidim::Accountability::Result, component_instance
+      )
+    end
+
+    exports.include_in_open_data = true
+
+    exports.serializer Decidim::Comments::CommentSerializer
+  end
+
   component.seeds do |participatory_space|
     admin_user = Decidim::User.find_by(
       organization: participatory_space.organization,
@@ -66,7 +78,7 @@ Decidim.register_component(:accountability) do |component|
       published_at: Time.current,
       participatory_space: participatory_space,
       settings: {
-        intro: Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) },
+        intro: Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(word_count: 4) },
         categories_label: Decidim::Faker::Localized.word,
         subcategories_label: Decidim::Faker::Localized.word,
         heading_parent_level_results: Decidim::Faker::Localized.word,
@@ -94,9 +106,9 @@ Decidim.register_component(:accountability) do |component|
 
       2.times do
         categories << Decidim::Category.create!(
-          name: Decidim::Faker::Localized.sentence(5),
+          name: Decidim::Faker::Localized.sentence(word_count: 5),
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(3)
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
           parent: parent_category,
           participatory_space: participatory_space
@@ -111,9 +123,9 @@ Decidim.register_component(:accountability) do |component|
             component: component,
             scope: participatory_space.organization.scopes.sample,
             category: category,
-            title: Decidim::Faker::Localized.sentence(2),
+            title: Decidim::Faker::Localized.sentence(word_count: 2),
             description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(3)
+              Decidim::Faker::Localized.paragraph(sentence_count: 3)
             end
           },
           visibility: "all"
@@ -132,9 +144,9 @@ Decidim.register_component(:accountability) do |component|
               end_date: Time.zone.today + 10,
               status: Decidim::Accountability::Status.all.sample,
               progress: rand(1..100),
-              title: Decidim::Faker::Localized.sentence(2),
+              title: Decidim::Faker::Localized.sentence(word_count: 2),
               description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-                Decidim::Faker::Localized.paragraph(3)
+                Decidim::Faker::Localized.paragraph(sentence_count: 3)
               end
             },
             visibility: "all"
@@ -143,7 +155,7 @@ Decidim.register_component(:accountability) do |component|
           rand(0..5).times do |i|
             child_result.timeline_entries.create!(
               entry_date: child_result.start_date + i.days,
-              description: Decidim::Faker::Localized.sentence(2)
+              description: Decidim::Faker::Localized.sentence(word_count: 2)
             )
           end
 

data/lib/decidim/accountability/engine.rb

@@ -26,23 +26,6 @@ module Decidim
         Decidim.view_hooks.register(:participatory_space_highlighted_elements, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
           view_context.cell("decidim/accountability/highlighted_results", view_context.current_participatory_space)
         end
-
-        if defined? Decidim::ParticipatoryProcesses
-          Decidim::ParticipatoryProcesses.view_hooks.register(:process_group_highlighted_elements, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
-            published_components = Decidim::Component.where(participatory_space: view_context.participatory_processes).published
-            results = Decidim::Accountability::Result.where(component: published_components).order_randomly(rand * 2 - 1).limit(4)
-
-            next unless results.any?
-
-            view_context.extend Decidim::Accountability::ApplicationHelper
-            view_context.render(
-              partial: "decidim/participatory_processes/participatory_process_groups/highlighted_results",
-              locals: {
-                results: results
-              }
-            )
-          end
-        end
       end
 
       initializer "decidim_accountability.add_cells_view_paths" do

data/lib/decidim/accountability/version.rb

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

data/lib/decidim/api/accountability_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    class AccountabilityType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
+
+      graphql_name "Accountability"
+      description "An accountability component of a participatory space."
+
+      field :results, Decidim::Accountability::ResultType.connection_type, null: true, connection: true
+
+      def results
+        Result.where(component: object).includes(:component)
+      end
+
+      field :result, Decidim::Accountability::ResultType, null: true do
+        argument :id, ID, required: true
+      end
+
+      def result(**args)
+        Result.where(component: object).find_by(id: args[:id])
+      end
+    end
+  end
+end

data/lib/decidim/api/result_type.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    class ResultType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
+      implements Decidim::Core::CategorizableInterface
+      implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::ScopableInterface
+
+      description "A result"
+
+      field :id, GraphQL::Types::ID, "The internal ID for this result", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this result", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this result", null: true
+      field :reference, GraphQL::Types::String, "The reference for this result", null: true
+      field :start_date, Decidim::Core::DateType, "The start date for this result", null: true
+      field :end_date, Decidim::Core::DateType, "The end date for this result", null: true
+      field :progress, GraphQL::Types::Float, "The progress for this result", null: true
+      field :created_at, Decidim::Core::DateTimeType, "When this result was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "When this result was updated", null: true
+      field :children_count, GraphQL::Types::Int, "The number of children results", null: true
+      field :weight, GraphQL::Types::Int, "The order of this result", null: false
+      field :external_id, GraphQL::Types::String, "The external ID for this result", null: true
+
+      field :children, [Decidim::Accountability::ResultType, { null: true }], "The childrens results", null: true
+      field :parent, Decidim::Accountability::ResultType, "The parent result", null: true
+      field :status, Decidim::Accountability::StatusType, "The status for this result", null: true
+      field :timeline_entries, [Decidim::Accountability::TimelineEntryType, { null: true }], "The timeline entries for this result", null: true
+    end
+  end
+end

data/lib/decidim/api/status_type.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    class StatusType < Decidim::Api::Types::BaseObject
+      description "A status"
+
+      field :id, GraphQL::Types::ID, "The internal ID for this status", null: false
+      field :key, GraphQL::Types::String, "The key for this status", null: true
+      field :name, Decidim::Core::TranslatedFieldType, "The name for this status", null: true
+      field :created_at, Decidim::Core::DateType, "When this status was created", null: true
+      field :updated_at, Decidim::Core::DateType, "When this status was updated", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this status", null: true
+      field :progress, GraphQL::Types::Int, "The progress for this status", null: true
+
+      field :results, [Decidim::Accountability::ResultType, { null: true }], "The results for this status", null: true
+    end
+  end
+end

data/lib/decidim/api/timeline_entry_type.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    class TimelineEntryType < Decidim::Api::Types::BaseObject
+      description "A Timeline Entry"
+
+      field :id, GraphQL::Types::ID, "The internal ID for this timeline entry", null: false
+      field :entry_date, Decidim::Core::DateType, "The entry date for this timeline entry", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this timeline entry", null: true
+      field :created_at, Decidim::Core::DateTimeType, "When this timeline entry was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "When this timeline entry was updated", null: true
+
+      field :result, Decidim::Accountability::ResultType, "The result for this timeline entry", null: true
+    end
+  end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -80,98 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -194,11 +194,19 @@ files:
 - app/assets/stylesheets/decidim/accountability/accountability/_categories.scss
 - app/assets/stylesheets/decidim/accountability/accountability/_lines_breadcrumb.scss
 - app/assets/stylesheets/decidim/accountability/accountability/_results.scss
+- app/cells/decidim/accountability/content_blocks/highlighted_results/elements.erb
+- app/cells/decidim/accountability/content_blocks/highlighted_results/heading.erb
+- app/cells/decidim/accountability/content_blocks/highlighted_results_cell.rb
 - app/cells/decidim/accountability/highlighted_results/show.erb
 - app/cells/decidim/accountability/highlighted_results_cell.rb
 - 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/cells/decidim/accountability/result_cell.rb
+- app/cells/decidim/accountability/result_m/data.erb
+- app/cells/decidim/accountability/result_m/footer.erb
+- app/cells/decidim/accountability/result_m/tags.erb
+- app/cells/decidim/accountability/result_m_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
@@ -208,7 +216,10 @@ files:
 - 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/concerns/decidim/accountability/admin/filterable.rb
 - app/controllers/decidim/accountability/admin/application_controller.rb
+- app/controllers/decidim/accountability/admin/attachment_collections_controller.rb
+- app/controllers/decidim/accountability/admin/attachments_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
@@ -222,6 +233,7 @@ files:
 - 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/admin/filterable_helper.rb
 - app/helpers/decidim/accountability/application_helper.rb
 - app/helpers/decidim/accountability/breadcrumb_helper.rb
 - app/jobs/application_job.rb
@@ -241,10 +253,6 @@ files:
 - 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/edit.html.erb
@@ -281,8 +289,6 @@ files:
 - app/views/decidim/accountability/results/show.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
@@ -337,12 +343,14 @@ files:
 - config/locales/pt.yml
 - config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/si-LK.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/sw-KE.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -365,17 +373,22 @@ files:
 - lib/decidim/accountability.rb
 - lib/decidim/accountability/admin.rb
 - lib/decidim/accountability/admin_engine.rb
+- lib/decidim/accountability/api.rb
 - lib/decidim/accountability/component.rb
 - lib/decidim/accountability/engine.rb
 - lib/decidim/accountability/result_serializer.rb
 - lib/decidim/accountability/test/factories.rb
 - lib/decidim/accountability/version.rb
+- lib/decidim/api/accountability_type.rb
+- lib/decidim/api/result_type.rb
+- lib/decidim/api/status_type.rb
+- lib/decidim/api/timeline_entry_type.rb
 - vendor/assets/javascripts/diff.js
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -383,15 +396,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Decidim accountability module
 test_files: []