decidim-accountability 0.9.3 → 0.10.0

data/config/locales/pt.yml

@@ -9,9 +9,10 @@ pt:
         end_date: Data final
         progress: Progresso
         project_ids: Projetos incluídos
-        proposal_ids: Propostas incluídas
+        proposals: Propostas incluídas
         start_date: Data de início
         title: Título
+        updated_at: Atualizado em
       status:
         description: Descrição
         key: Chave
@@ -49,11 +50,17 @@ pt:
           edit:
             title: Editar resultado
             update: Atualizar resultado
+          form:
+            add_proposal: Adicionar proposta
           index:
             title: Resultados
           new:
             create: Criar resultado
             title: Novo resultado
+          proposals:
+            close: Fechar
+            current_selection: Seleção atual
+            select: Selecione
           update:
             invalid: Ocorreu um problema ao atualizar este resultado
             success: Resultado atualizado com sucesso
@@ -94,6 +101,10 @@ pt:
           update:
             invalid: Ocorreu um problema ao atualizar esta entrada
             success: Entrada atualizada com sucesso
+      admin_log:
+        result:
+          create: "%{user_name} resultado criado %{resource_name} em %{space_name}"
+          update: "%{user_name} resultado atualizado %{resource_name} em %{space_name}"
       models:
         result:
           fields:
@@ -156,6 +167,13 @@ pt:
           changes_at_title: Alterações em "%{title}"
         version:
           version_index: Versão %{index}
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'A proposta "%{proposal_title}" foi incluída em um resultado. Você pode vê-lo a partir desta página:'
+          email_outro: Você recebeu esta notificação porque está seguindo "%{proposal_title}". Você pode parar de receber notificações após o link anterior.
+          email_subject: Uma atualização para %{proposal_title}
+          notification_title: A proposta <a href="%{proposal_path}">%{proposal_title}</a> foi incluída no resultado <a href="%{resource_path}">%{resource_title}</a>.
     features:
       accountability:
         name: Prestação de contas
@@ -163,12 +181,21 @@ pt:
           global:
             categories_label: Nome para "Categorias"
             comments_enabled: Comentários ativados
+            display_progress_enabled: Mostrar progresso
             heading_leaf_level_results: Nome para "Projetos"
             heading_parent_level_results: Nome para "Resultados"
             intro: Introdução
             subcategories_label: Nome para "Subcategorias"
           step:
             comments_blocked: Comentários bloqueados
+    participatory_processes:
+      participatory_process_groups:
+        highlighted_results:
+          results: Resultados
+    participatory_spaces:
+      highlighted_results:
+        results: Resultados
+        see_all_results: Ver todos os resultados
     resource_links:
       included_projects:
         result_projects: Projetos incluídos neste resultado

data/config/locales/ru.yml

@@ -9,7 +9,6 @@ ru:
         end_date: Дата завершения
         progress: Продвижение
         project_ids: Включенные проекты
-        proposal_ids: Включенные предложения
         start_date: Дата начала
         title: Название
       status:

data/config/locales/sv.yml

@@ -9,9 +9,10 @@ sv:
         end_date: Slutdatum
         progress: Framsteg
         project_ids: Inkluderade projekt
-        proposal_ids: Ingår förslag
+        proposals: Ingår förslag
         start_date: Start datum
         title: Titel
+        updated_at: Uppdaterad på
       status:
         description: Beskrivning
         key: Nyckel
@@ -49,11 +50,17 @@ sv:
           edit:
             title: Ändra resultat
             update: Uppdateringsresultat
+          form:
+            add_proposal: Lägg till förslag
           index:
             title: Resultat
           new:
             create: Skapa resultat
             title: Nytt resultat
+          proposals:
+            close: Stänga
+            current_selection: Aktuellt urval
+            select: Välj
           update:
             invalid: Det har varit ett problem att uppdatera resultatet
             success: Resultatet uppdaterades med framgång
@@ -94,6 +101,10 @@ sv:
           update:
             invalid: Det har varit ett problem att uppdatera den här posten
             success: Inmatning uppdaterad
+      admin_log:
+        result:
+          create: "%{user_name} skapat resultat %{resource_name} i %{space_name}"
+          update: "%{user_name} uppdaterat resultat %{resource_name} i %{space_name}"
       models:
         result:
           fields:
@@ -156,6 +167,13 @@ sv:
           changes_at_title: Ändringar vid "%{title}"
         version:
           version_index: Version %{index}
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'Förslaget "%{proposal_title}" har inkluderats i ett resultat. Du kan se den från den här sidan:'
+          email_outro: Du har fått den här meddelandet eftersom du följer "%{proposal_title}". Du kan sluta ta emot meddelanden efter föregående länk.
+          email_subject: En uppdatering till %{proposal_title}
+          notification_title: Förslaget <a href="%{proposal_path}">%{proposal_title}</a> har inkluderats i <a href="%{resource_path}">%{resource_title}</a> resultat.
     features:
       accountability:
         name: Ansvarighet
@@ -163,12 +181,21 @@ sv:
           global:
             categories_label: Namn för "kategorier"
             comments_enabled: Kommentarer aktiverade
+            display_progress_enabled: Visningsframsteg
             heading_leaf_level_results: Namn på "Projekt"
             heading_parent_level_results: Namn på "Resultat"
             intro: Intro
             subcategories_label: Namn på "Underkategorier"
           step:
             comments_blocked: Kommentarer blockerad
+    participatory_processes:
+      participatory_process_groups:
+        highlighted_results:
+          results: Resultat
+    participatory_spaces:
+      highlighted_results:
+        results: Resultat
+        see_all_results: Se alla resultat
     resource_links:
       included_projects:
         result_projects: Projekt som ingår i detta resultat

data/config/locales/uk.yml

@@ -9,9 +9,9 @@ uk:
         end_date: Дата закінчення
         progress: Перебіг
         project_ids: Включені проекти
-        proposal_ids: Включені пропозиції
         start_date: Дата початку
-        title: Назва
+        title: Заголовок
+        updated_at: 'Оновлено:'
       status:
         description: Опис
         key: Ключ
@@ -101,7 +101,7 @@ uk:
             progress: Перебіг
             start_date: Дата початку
             status: Стан
-            title: Назва
+            title: Заголовок
         status:
           fields:
             description: Опис

data/lib/decidim/accountability/admin_engine.rb

@@ -14,6 +14,9 @@ module Decidim
         resources :statuses
         resources :results, except: [:show] do
           resources :timeline_entries, except: [:show]
+          member do
+            get :proposals
+          end
         end
         root to: "results#index"
       end

data/lib/decidim/accountability/engine.rb

@@ -22,6 +22,40 @@ module Decidim
       initializer "decidim_accountability.assets" do |app|
         app.config.assets.precompile += %w(decidim_accountability_manifest.js)
       end
+
+      initializer "decidim_accountability.view_hooks" do
+        Decidim.view_hooks.register(:participatory_space_highlighted_elements, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
+          published_features = Decidim::Feature.where(participatory_space: view_context.current_participatory_space).published
+          results = Decidim::Accountability::Result.where(feature: published_features).order_randomly(rand * 2 - 1).limit(4)
+
+          next unless results.any?
+
+          view_context.extend Decidim::Accountability::ApplicationHelper
+          view_context.render(
+            partial: "decidim/participatory_spaces/highlighted_results",
+            locals: {
+              results: results
+            }
+          )
+        end
+
+        if defined? Decidim::ParticipatoryProcesses
+          Decidim::ParticipatoryProcesses.view_hooks.register(:process_group_highlighted_elements, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
+            published_features = Decidim::Feature.where(participatory_space: view_context.participatory_processes).published
+            results = Decidim::Accountability::Result.where(feature: published_features).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
     end
   end
 end

data/lib/decidim/accountability/feature.rb

@@ -24,6 +24,7 @@ Decidim.register_feature(:accountability) do |feature|
     settings.attribute :subcategories_label, type: :string, translated: true, editor: true
     settings.attribute :heading_parent_level_results, type: :string, translated: true, editor: true
     settings.attribute :heading_leaf_level_results, type: :string, translated: true, editor: true
+    settings.attribute :display_progress_enabled, type: :boolean, default: true
   end
 
   feature.register_stat :results_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, _start_at, _end_at|

data/lib/decidim/accountability/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-27 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.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -74,98 +74,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -181,7 +181,7 @@ files:
 - app/assets/config/decidim_accountability_manifest.js
 - app/assets/images/decidim/accountability/icon.svg
 - app/assets/javascripts/decidim/accountability/accountability.js.es6
-- app/assets/javascripts/decidim/accountability/admin/accountability_admin.js
+- app/assets/javascripts/decidim/accountability/admin/accountability_admin.js.es6
 - app/assets/javascripts/decidim/accountability/version_diff.js.es6
 - app/assets/stylesheets/decidim/accountability/_accountability.scss
 - app/assets/stylesheets/decidim/accountability/accountability/_cards.scss
@@ -203,6 +203,7 @@ files:
 - 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
 - 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
@@ -212,11 +213,13 @@ files:
 - app/models/decidim/accountability/result.rb
 - app/models/decidim/accountability/status.rb
 - app/models/decidim/accountability/timeline_entry.rb
+- app/presenters/decidim/accountability/admin_log/result_presenter.rb
 - app/services/decidim/accountability/diff_renderer.rb
 - app/services/decidim/accountability/result_search.rb
 - app/services/decidim/accountability/result_stats_calculator.rb
 - app/services/decidim/accountability/results_calculator.rb
 - 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
@@ -250,6 +253,10 @@ files:
 - 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/_highlighted_results.html.erb
+- app/views/decidim/participatory_spaces/_result.html.erb
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -301,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim accountability module