decidim-accountability 0.23.6 → 0.24.0.rc1

data/config/locales/ru.yml

@@ -195,10 +195,6 @@ ru:
         description: Количество сгенерированных результатов
         object: результаты
         title: Результаты
-    participatory_processes:
-      participatory_process_groups:
-        highlighted_results:
-          results: Итоги
     resource_links:
       included_projects:
         result_project: Проекты, включенные в эти итоги

data/config/locales/si-LK.yml

@@ -15,6 +15,9 @@ si:
         models:
           status:
             name: තත්වය
+      content_blocks:
+        highlighted_results:
+          dates: දින
       import_mailer:
         import:
           errors: දෝෂ

data/config/locales/sk.yml

@@ -122,6 +122,11 @@ sk:
         value_types:
           parent_presenter:
             not_found: 'Nadradený záznam nebol nájdený v databáze(ID: %{id})'
+      content_blocks:
+        highlighted_results:
+          dates: Dátumy
+          results: Výsledky
+          unspecified: Nešpecifikované
       import_mailer:
         import:
           errors: Chyby
@@ -149,6 +154,8 @@ sk:
           fields:
             description: Popis
             entry_date: Dátum
+      result_m:
+        view: Zobraziť
       results:
         count:
           results_count:
@@ -212,10 +219,6 @@ sk:
         description: Počet vytvorených výsledkov
         object: výsledky
         title: Výsledky
-    participatory_processes:
-      participatory_process_groups:
-        highlighted_results:
-          results: Výsledky
     resource_links:
       included_projects:
         result_project: Projekty, zahrnutý vo výsledku

data/config/locales/sl.yml

@@ -121,10 +121,6 @@ sl:
         description: Število ustvarjenih rezultatov
         object: rezultati
         title: Rezultati
-    participatory_processes:
-      participatory_process_groups:
-        highlighted_results:
-          results: Rezultati
     resource_links:
       included_proposals:
         result_proposal: Predlogi, vključeni v rezultat

data/config/locales/sr-CS.yml

@@ -194,10 +194,6 @@ sr:
         description: Broj generisanih rezultata
         object: rezultati
         title: Rezultati
-    participatory_processes:
-      participatory_process_groups:
-        highlighted_results:
-          results: Rezultati
     resource_links:
       included_projects:
         result_project: Projekti koji su deo ovog rezultata

data/config/locales/sv.yml

@@ -7,7 +7,7 @@ sv:
         decidim_scope_id: Omfattning
         description: Beskrivning
         end_date: Slutdatum
-        progress: Genomförande
+        progress: Behandling
         project_ids: Projekt som omfattas
         proposals: Förslag som omfattas
         start_date: Startdatum
@@ -17,7 +17,7 @@ sv:
         description: Beskrivning
         key: Nyckel
         name: Namn
-        progress: Genomförande
+        progress: Behandling
       timeline_entry:
         description: Beskrivning
         entry_date: Datum
@@ -32,6 +32,8 @@ sv:
   decidim:
     accountability:
       actions:
+        attachment_collections: Mappar
+        attachments: Bifogade filer
         confirm_destroy: Vill du radera detta %{name}?
         destroy: Radera
         edit: Redigera
@@ -42,6 +44,7 @@ sv:
         title: Åtgärder
       admin:
         exports:
+          result_comments: Kommentarer
           results: Resultat
         import_results:
           new:
@@ -121,6 +124,11 @@ sv:
         value_types:
           parent_presenter:
             not_found: 'Föräldraposten hittades inte i databasen (ID: %{id})'
+      content_blocks:
+        highlighted_results:
+          dates: Datum
+          results: Resultat
+          unspecified: Ej angivet
       import_mailer:
         import:
           errors: Fel
@@ -133,8 +141,12 @@ sv:
       models:
         result:
           fields:
+            category: Kategori
+            created_at: Skapad
             end_date: Slutdatum
-            progress: Genomförande
+            id: ID
+            progress: Behandling
+            scope: Omfång
             start_date: Startdatum
             status: Status
             title: Titel
@@ -148,6 +160,9 @@ sv:
           fields:
             description: Beskrivning
             entry_date: Datum
+      result_m:
+        executed: Utfört
+        view: Visa
       results:
         count:
           results_count:
@@ -178,6 +193,15 @@ sv:
             votes: Stöd
         timeline:
           title: Projektutveckling
+    admin:
+      filters:
+        results:
+          category_id_eq:
+            label: Kategori
+          scope_id_eq:
+            label: Omfång
+          status_id_eq:
+            label: Status
     components:
       accountability:
         name: Ansvarsskyldighet
@@ -212,10 +236,6 @@ sv:
         description: Antal genererade resultat
         object: resultat
         title: Resultat
-    participatory_processes:
-      participatory_process_groups:
-        highlighted_results:
-          results: Resultat
     participatory_spaces:
       highlighted_results:
         see_all: Se alla resultat (%{count})

data/config/locales/tr-TR.yml

@@ -42,6 +42,7 @@ tr:
         title: Eylemler
       admin:
         exports:
+          result_comments: Yorumlar
           results: Sonuçlar
         import_results:
           new:
@@ -121,6 +122,11 @@ tr:
         value_types:
           parent_presenter:
             not_found: 'Üst veritabanında bulunamadı (ID: %{id})'
+      content_blocks:
+        highlighted_results:
+          dates: Tarih
+          results: Sonuç
+          unspecified: Belirtilmemiş
       import_mailer:
         import:
           errors: Hatalar
@@ -133,8 +139,12 @@ tr:
       models:
         result:
           fields:
+            category: Kategori
+            created_at: Oluşturuldu
             end_date: Bitiş tarihi
+            id: ID
             progress: İlerleme
+            scope: Kapsam
             start_date: Başlangıç tarihi
             status: durum
             title: Başlık
@@ -148,6 +158,9 @@ tr:
           fields:
             description: Açıklama
             entry_date: tarih
+      result_m:
+        executed: Yürütüldü
+        view: Görünüm
       results:
         count:
           results_count:
@@ -178,6 +191,15 @@ tr:
             votes: Destekler
         timeline:
           title: Proje gelişimi
+    admin:
+      filters:
+        results:
+          category_id_eq:
+            label: Kategori
+          scope_id_eq:
+            label: Kapsam
+          status_id_eq:
+            label: Durum
     components:
       accountability:
         name: Sorumluluk
@@ -212,10 +234,6 @@ tr:
         description: Üretilen sonuç sayısı
         object: sonuçlar
         title: Sonuçlar
-    participatory_processes:
-      participatory_process_groups:
-        highlighted_results:
-          results: Sonuçlar
     participatory_spaces:
       highlighted_results:
         see_all: Tüm sonuçları gör (%{count})

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.6"
+      "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