decidim-accountability 0.8.4 → 0.9.0

data/app/commands/decidim/accountability/admin/update_result.rb

@@ -25,6 +25,7 @@ module Decidim
             update_result
             link_proposals
             link_meetings
+            link_projects
           end
 
           broadcast(:ok)
@@ -54,6 +55,10 @@ module Decidim
           @proposals ||= result.sibling_scope(:proposals).where(id: form.proposal_ids)
         end
 
+        def projects
+          @projects ||= result.sibling_scope(:projects).where(id: form.project_ids)
+        end
+
         def meeting_ids
           @meeting_ids ||= proposals.flat_map do |proposal|
             proposal.linked_resources(:meetings, "proposals_from_meeting").pluck(:id)
@@ -68,6 +73,10 @@ module Decidim
           result.link_resources(proposals, "included_proposals")
         end
 
+        def link_projects
+          result.link_resources(projects, "included_projects")
+        end
+
         def link_meetings
           result.link_resources(meetings, "meetings_through_proposals")
         end

data/app/forms/decidim/accountability/admin/result_form.rb

@@ -14,6 +14,7 @@ module Decidim
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
         attribute :proposal_ids, Array[Integer]
+        attribute :project_ids, Array[Integer]
         attribute :start_date, Date
         attribute :end_date, Date
         attribute :progress, Float
@@ -25,37 +26,52 @@ module Decidim
 
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
+        validate { errors.add(:decidim_scope_id, :invalid) if current_participatory_space&.scope && !current_participatory_space&.scope&.ancestor_of?(scope) }
 
         validates :parent, presence: true, if: ->(form) { form.parent_id.present? }
         validates :status, presence: true, if: ->(form) { form.decidim_accountability_status_id.present? }
 
+        delegate :categories, to: :current_feature
+
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
+          self.project_ids = model.linked_resources(:projects, "included_projects").pluck(:id)
           self.decidim_category_id = model.category.try(:id)
         end
 
         def proposals
-          @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, context.current_feature)&.order(title: :asc)&.pluck(:title, :id)
+          @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, current_feature)&.order(title: :asc)&.pluck(:title, :id)
         end
 
-        def organization_scopes
-          current_organization.scopes
+        def projects
+          @projects ||= Decidim.find_resource_manifest(:projects).try(:resource_scope, current_feature)&.order(title: :asc)
+                               &.select(:title, :id)&.map { |a| [a.title[I18n.locale.to_s], a.id] }
         end
 
+        # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
+        #
+        # Returns a Decidim::Scope
         def scope
-          @scope ||= organization_scopes.where(id: decidim_scope_id).first
+          @scope ||= @decidim_scope_id ? current_feature.scopes.find_by(id: @decidim_scope_id) : current_participatory_space&.scope
+        end
+
+        # Scope identifier
+        #
+        # Returns the scope identifier related to the result
+        def decidim_scope_id
+          @decidim_scope_id || scope&.id
         end
 
         def category
-          @category ||= context.current_feature.categories.where(id: decidim_category_id).first
+          @category ||= categories.find_by(id: decidim_category_id)
         end
 
         def parent
-          @parent ||= Decidim::Accountability::Result.where(feature: current_feature, id: parent_id).first
+          @parent ||= Decidim::Accountability::Result.find_by(feature: current_feature, id: parent_id)
         end
 
         def status
-          @status ||= Decidim::Accountability::Status.where(feature: current_feature, id: decidim_accountability_status_id).first
+          @status ||= Decidim::Accountability::Status.find_by(feature: current_feature, id: decidim_accountability_status_id)
         end
       end
     end

data/app/helpers/decidim/accountability/breadcrumb_helper.rb

@@ -18,9 +18,7 @@ module Decidim
       end
 
       def category
-        if params[:filter] && params[:filter][:category_id].present?
-          current_participatory_space.categories.find(params[:filter][:category_id])
-        end
+        current_participatory_space.categories.find(params[:filter][:category_id]) if params[:filter] && params[:filter][:category_id].present?
       end
     end
   end

data/app/services/decidim/accountability/result_search.rb

@@ -13,7 +13,14 @@ module Decidim
       #          methods. (Default {})
       #          * feature - A Decidim::Feature to get the results from.
       #          * organization - A Decidim::Organization object.
+      #          * parent_id - The parent ID of the result. The value is forced to false to force
+      #                        the filter execution when the value is nil
+      #          * deep_search - Whether to perform the search on all children levels or just the
+      #                          first one. True by default.
       def initialize(options = {})
+        options = options.dup
+        options[:deep_search] = true if options[:deep_search].nil?
+        options[:parent_id] = "root" if options[:parent_id].nil?
         super(Result.all, options)
       end
 
@@ -24,8 +31,24 @@ module Decidim
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
       end
 
+      # Handle parent_id filter
+      def search_parent_id
+        parent_id = options[:parent_id]
+        parent_id = nil if parent_id == "root"
+
+        if options[:deep_search]
+          query.where(parent_id: [parent_id] + children_ids(parent_id))
+        else
+          query.where(parent_id: parent_id)
+        end
+      end
+
       private
 
+      def children_ids(parent_id)
+        Result.where(parent_id: parent_id).pluck(:id)
+      end
+
       # Internal: builds the needed query to search for a text in the organization's
       # available locales. Note that it is intended to be used as follows:
       #

data/app/services/decidim/accountability/results_calculator.rb

@@ -11,15 +11,10 @@ module Decidim
         @category_id = category_id
       end
 
-      def progress
-        results.average(:progress)
-      end
+      delegate :count, to: :results
 
-      def count
-        # if there are children return the total number of children results
-        # if not return the count of results (they are leafs)
-        children = results.sum(:children_count)
-        children.positive? ? children : results.count
+      def progress
+        results.average("COALESCE(progress, 0)")
       end
 
       private
@@ -27,7 +22,12 @@ module Decidim
       attr_reader :feature, :scope_id, :category_id
 
       def results
-        @results ||= ResultSearch.new(feature: feature, scope_id: scope_id, category_id: category_id, parent_id: nil).results
+        @results ||= ResultSearch.new(
+          feature: feature,
+          scope_id: scope_id,
+          category_id: category_id,
+          deep_search: false
+        ).results
       end
     end
   end

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

@@ -22,7 +22,7 @@
 
       <% if current_participatory_space.has_subscopes? %>
         <div class="row column">
-          <%= form.scopes_select :decidim_scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
+          <%= scopes_picker_field form, :decidim_scope_id %>
         </div>
       <% end %>
 
@@ -62,5 +62,15 @@
       <% end %>
     </div>
 
+    <div class="row column">
+      <% if @form.projects %>
+        <%= form.select :project_ids,
+                        @form.projects,
+                        {},
+                        { multiple: true, class: "chosen-select" }
+        %>
+      <% end %>
+    </div>
+
   </div>
 </div>

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

@@ -6,7 +6,7 @@
       <div class="button--title">
         <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")), new_result_path(parent_id: parent_result), class: 'button tiny button--simple' if can? :manage, current_feature %>
         <%= render partial: "decidim/accountability/admin/shared/subnav" unless parent_result %>
-        <%= render partial: "decidim/accountability/admin/shared/extra" %>
+        <%= export_dropdown %>
       </div>
     </h2>
   </div>

data/app/views/decidim/accountability/results/_nav_breadcrumb.html.erb

@@ -5,7 +5,7 @@
   <% if category.present? && category.parent.present? %>
     <span class="breadcrumb--separator">></span>
     <div>
-      <%= link_to translated_attribute(category.parent.name), results_path(filter: { category_id: category.parent_id }) %>
+      <%= link_to translated_attribute(category.parent.name), results_path(filter: { category_id: category.parent_id, scope_id: current_scope }) %>
       <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.parent_id) %></span>
     </div>
   <% end %>
@@ -13,7 +13,7 @@
   <% if category.present? %>
     <span class="breadcrumb--separator">></span>
     <div>
-      <%= link_to translated_attribute(category.name), results_path(filter: { category_id: category.id }) %>
+      <%= link_to translated_attribute(category.name), results_path(filter: { category_id: category.id, scope_id: current_scope }) %>
       <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.id) %></span>
     </div>
   <% end %>
@@ -21,7 +21,7 @@
   <% if result && result.parent.present? %>
     <span class="breadcrumb--separator">></span>
     <div>
-      <%= link_to translated_attribute(result.parent.title), result_path(result.parent) %>
+      <%= link_to translated_attribute(result.parent.title), result_path(result.parent, filter: { scope_id: current_scope }) %>
       <span class="percentage"><%= display_percentage result.parent.progress %></span>
     </div>
   <% end %>

data/app/views/decidim/accountability/results/_scope_filters.html.erb

@@ -4,7 +4,6 @@
 
     <ul class="tags tags--action">
       <li <%= active_class_if_current(nil) %>><%= link_to t("results.filters.all", scope: "decidim.accountability"), url_for(filter: { category_id: category.try(:id) }) %></li>
-      <li <%= active_class_if_current("global") %>><%= link_to t("results.filters.global", scope: "decidim.accountability"), url_for(filter: { scope_id: "global", category_id: category.try(:id) }) %></li>
 
       <% current_participatory_space.subscopes.each do |scope| %>
         <li <%= active_class_if_current(scope.id) %>><%= link_to translated_attribute(scope.name), url_for(filter: { scope_id: scope.id, category_id: category.try(:id) }) %></li>

data/app/views/decidim/accountability/results/_show_parent.html.erb

@@ -15,7 +15,6 @@
           <%= render partial: "decidim/shared/tags", locals: { resource: result, tags_class_extra: "tags--result" } %>
         </div>
       </div>
-
       <%= render partial: "stats_box" %>
     </div>
 

data/app/views/decidim/accountability/results/_stats.html.erb

@@ -1,9 +1,13 @@
 <div class="small-12 columns section">
   <div class="row">
-    <div class="small-12 medium-9 columns section">
+    <div class="small-12 medium-9 columns">
       <%= linked_resources_for result, :proposals, "included_proposals" %>
     </div>
 
+    <div class="small-12 medium-9 columns">
+      <%= linked_resources_for result, :projects, "included_projects" %>
+    </div>
+
     <div class="small-12 medium-9 columns end">
       <%= linked_resources_for result, :meetings, "meetings_through_proposals" %>
     </div>

data/config/locales/ca.yml

@@ -1,4 +1,3 @@
----
 ca:
   activemodel:
     attributes:
@@ -9,6 +8,7 @@ ca:
         description: Descripció
         end_date: Fi
         progress: Progrés
+        project_ids: Projectes inclosos
         proposal_ids: Propostes incloses
         start_date: Inici
         title: Títol
@@ -119,7 +119,6 @@ ca:
             other: "%{count} resultats"
         filters:
           all: Tots
-          global: Global
           scopes: Àmbits
         home:
           categories_label: Categories
@@ -171,5 +170,7 @@ ca:
           step:
             comments_blocked: Comentaris bloquejats
     resource_links:
+      included_projects:
+        result_projects: Projectes inclosos en aquest resultat
       included_proposals:
         result_proposals: Propostes incloses en aquest resultat

data/config/locales/en.yml

@@ -9,6 +9,7 @@ en:
         description: Description
         end_date: End date
         progress: Progress
+        project_ids: Included projects
         proposal_ids: Included proposals
         start_date: Start date
         title: Title
@@ -119,7 +120,6 @@ en:
             other: "%{count} results"
         filters:
           all: All
-          global: Global
           scopes: Scopes
         home:
           categories_label: Categories
@@ -171,5 +171,7 @@ en:
           step:
             comments_blocked: Comments blocked
     resource_links:
+      included_projects:
+        result_projects: Projects included in this result
       included_proposals:
         result_proposals: Proposals included in this result

data/config/locales/es.yml

@@ -1,4 +1,3 @@
----
 es:
   activemodel:
     attributes:
@@ -9,6 +8,7 @@ es:
         description: Descripción
         end_date: Fin
         progress: Progreso
+        project_ids: Proyectos incluidos
         proposal_ids: Propuestas incluidas
         start_date: Inicio
         title: Título
@@ -23,7 +23,7 @@ es:
   decidim:
     accountability:
       actions:
-        confirm_destroy: "¿Está seguro de que quiere eliminar este %{name}?"
+        confirm_destroy: '¿Está seguro de que quiere eliminar este %{name}?'
         destroy: Borrar
         edit: Editar
         new: Nuevo/a %{name}
@@ -119,7 +119,6 @@ es:
             other: "%{count} resultados"
         filters:
           all: Todos
-          global: Global
           scopes: Ámbitos
         home:
           categories_label: Categorías
@@ -171,5 +170,7 @@ es:
           step:
             comments_blocked: Comentarios bloqueados
     resource_links:
+      included_projects:
+        result_projects: Proyectos incluidos en este resultado
       included_proposals:
         result_proposals: Propuestas incluidas en este resultado

data/config/locales/eu.yml

@@ -8,6 +8,7 @@ eu:
         description: Deskribapena
         end_date: Bukaera-data
         progress: ' Aurrerapena '
+        project_ids: Proiektu barne
         proposal_ids: Sartutako proposamenak
         start_date: Hasiera-data
         title: Izenburua
@@ -118,7 +119,6 @@ eu:
             other: "%{count} emaitza"
         filters:
           all: Guztiak
-          global: Global
           scopes: Esparruak
         home:
           categories_label: Kategoriak
@@ -170,5 +170,7 @@ eu:
           step:
             comments_blocked: Iruzkinak blokeatuta
     resource_links:
+      included_projects:
+        result_projects: Emaitza honetan sartutako proiektuak
       included_proposals:
         result_proposals: Emaitza honetan jasotako proposamenak

data/config/locales/fi.yml

@@ -2,18 +2,19 @@ fi:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: status
+        decidim_accountability_status_id: tila
         decidim_category_id: Aihepiiri
         decidim_scope_id: Konteksti
         description: Kuvaus
         end_date: Päättymisaika
         progress: Edistyminen
+        project_ids: Liitetyt projektit
         proposal_ids: Sisällytetyt ehdotukset
         start_date: Aloitusaika
         title: Otsikko
       status:
         description: Kuvaus
-        key: avain
+        key: Tunniste
         name: Nimi
         progress: Edistyminen
       timeline_entry:
@@ -27,7 +28,7 @@ fi:
         edit: Muokkaa
         new: Uusi %{name}
         preview: Esikatsele
-        timeline_entries: Projektin kehitys
+        timeline_entries: Projektin edistyminen
         title: Toiminnot
       admin:
         exports:
@@ -36,7 +37,7 @@ fi:
           result:
             name: Tulos
           status:
-            name: Status
+            name: Tila
           timeline_entry:
             name: Aikajanan merkintä
         results:
@@ -58,53 +59,53 @@ fi:
             success: Tulos päivitetty onnistuneesti
         shared:
           subnav:
-            statuses: tilat
+            statuses: Tilat
         statuses:
           create:
-            invalid: Ongelma tämän tilan luomisessa
-            success: Tila onnistuneesti luotu
+            invalid: Tilan luomisessa tapahtui virhe
+            success: Tila luotu onnistuneesti
           destroy:
-            success: Tilan poistaminen onnistui
+            success: Tilan poistettu onnistuneesti
           edit:
             title: Muokkaa tilaa
-            update: Päivitä status
+            update: Päivitä tila
           index:
-            title: tilat
+            title: Tilat
           new:
             create: Luo tila
             title: Uusi tila
           update:
-            invalid: On ollut ongelma tämän tilan päivittämisessä
+            invalid: Tilan päivittämisessä tapahtui virhe
             success: Tilan päivitys onnistui
         timeline_entries:
           create:
-            invalid: On tullut ongelma tämän merkinnän luomisesta
-            success: Entry onnistuneesti luotu
+            invalid: Merkinnän luomisessa tapahtui virhe
+            success: Merkintä luotu onnistuneesti
           destroy:
-            success: Merkintä poistettiin onnistuneesti
+            success: Merkintä poistettu onnistuneesti
           edit:
             title: Muokkaa merkintää
             update: Päivitä merkintä
           index:
-            title: Projekti aikajanalla merkinnät
+            title: Projektin aikajanan merkinnät
           new:
             create: Luo merkintä
             title: Uusi merkintä
           update:
-            invalid: On tapahtunut ongelma, joka päivitti tämän merkinnän
-            success: Ilmoituksen päivitys onnistui
+            invalid: Merkinnän päivityksessä tapahtui virhe
+            success: Merkinnän päivitys onnistui
       models:
         result:
           fields:
             end_date: Päättymisaika
             progress: Edistyminen
             start_date: Aloitusaika
-            status: Status
+            status: Tila
             title: Otsikko
         status:
           fields:
             description: Kuvaus
-            key: avain
+            key: Tunniste
             name: Nimi
             progress: Edistyminen
         timeline_entry:
@@ -118,15 +119,14 @@ fi:
             other: "%{count} tulosta"
         filters:
           all: Kaikki
-          global: maailmanlaajuinen
           scopes: Konteksti
         home:
           categories_label: Aihepiirit
-          subcategories_label: alaluokat
+          subcategories_label: Ala-aihepiiri
         home_header:
-          global_status: Globaalin toteutuksen tila
+          global_status: Yleisen toteutuksen tila
         nav_breadcrumb:
-          global: Maailmanlaajuinen toteutus
+          global: Yleinen toteutus
         search:
           search: Hae toimintoja
         show:
@@ -134,26 +134,26 @@ fi:
             attendees: Osallistujat
             back_to_result: Palaa tulokseen
             comments: Kommentit
-            contributions: Kontribuutiot
+            contributions: Osallistumiset
             last_edited_by: Viimeksi muokannut
             last_updated_at: Päivitetty viimeksi
             meetings: Tapaamiset
-            number_of_versions: versiot
+            number_of_versions: Versiot
             proposals: Ehdotukset
             show_all_versions: Näytä kaikki versiot
-            version_author: Versio kirjoittaja
-            version_created_at: Versio luotu osoitteessa
-            version_number: Versiomäärä
+            version_author: Versio luoja
+            version_created_at: Version luontihetki
+            version_number: Version numero
             version_number_out_of_total: "%{current_version} / %{total_count}"
             votes: Kannatukset
         timeline:
           title: Projektin kehitys
       versions:
         index:
-          changes_at_title: Muutokset osoitteessa "%{title}"
-          title: versiot
+          changes_at_title: Muutokset kohteessa "%{title}"
+          title: Versiot
         show:
-          changes_at_title: Muutokset osoitteessa "%{title}"
+          changes_at_title: Muutokset kohteessa "%{title}"
         version:
           version_index: Versio %{index}
     features:
@@ -161,14 +161,16 @@ fi:
         name: Tulokset
         settings:
           global:
-            categories_label: Nimi "Luokat"
+            categories_label: Nimi kohteelle "Luokat"
             comments_enabled: Kommentointi sallittu
-            heading_leaf_level_results: Nimi "Projektit"
-            heading_parent_level_results: Nimi "Tulokset"
-            intro: intro
-            subcategories_label: Nimi "Alaluokat"
+            heading_leaf_level_results: Nimi kohteelle "Projektit"
+            heading_parent_level_results: Nimi kohteelle "Tulokset"
+            intro: Esittelyteksti
+            subcategories_label: Nimi kohteelle "Ala-aihepiirit"
           step:
             comments_blocked: Kommentointi estetty
     resource_links:
+      included_projects:
+        result_projects: Tähän tulokseen liittyvät hankkeet
       included_proposals:
-        result_proposals: Projektit, jotka sisältyvät tähän tulokseen
+        result_proposals: Tähän tulokseen liittyvät ehdotukset