decidim-challenges 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a50880ee76fe860f2551089e3478a19a2e5fd10f66300ee9757e524229520b
-  data.tar.gz: d97dea95bafc5e2f636d4132bc2e713926bdaebfd3b162a4a1b1f7a7a92b0f59
+  metadata.gz: 46bea652eb21f13814310b3f2010678bf606a89eb0b6f643d52b7618ada9b22f
+  data.tar.gz: 0b54f8699e24dbdb5960300a36fad5d42e0c5a52dfa67d4302a4fc2395a58623
 SHA512:
-  metadata.gz: 8364f538505a00b5cc84cacf596fbcd60e453b82e89b1738377ccfd3cd91e8ad1e22c12ad9096e143e607a8d909212f61759e0bf90ec09254e06ef211514343e
-  data.tar.gz: 2e41616461a1ab68ea77ac5e7b8e78a4e096b6dc80b4c832d16f312f8c727e1c0c91d05c9ad72bf354127e30585ed6768b1410b16343ad6c5a2fbc02f5d1fbfa
+  metadata.gz: d5aeda521250172c335e590e38a3375ce529c2553db76348dd291829fd42ef8cd6dd5d5d19a67a7b15c20906c6e50315e652a9ab12e4b5e86ab45df30abb21a7
+  data.tar.gz: 62661ef946f28d42006ebb6d1a29f296955bbed4672aaf07295bf0b92e9b0dd6ebd1200e9dc26721eb27cae04819f0a5a1055b2dcace77ff0be28877f4dd7b56

data/app/commands/decidim/challenges/survey_challenge.rb

@@ -41,7 +41,7 @@ module Decidim
       def answer_questionnaire
         return unless questionnaire?
 
-        Decidim::Forms::AnswerQuestionnaire.call(survey_form, user, challenge.questionnaire) do
+        Decidim::Forms::AnswerQuestionnaire.call(survey_form, challenge.questionnaire) do
           on(:invalid) do
             raise ActiveRecord::Rollback
           end

data/app/controllers/decidim/solutions/admin/solutions_controller.rb

@@ -7,6 +7,7 @@ module Decidim
       #
       class SolutionsController < Decidim::Solutions::Admin::ApplicationController
         include Decidim::ApplicationHelper
+        include Decidim::Admin::Filterable
 
         helper Challenges::ApplicationHelper
         helper Decidim::PaginateHelper
@@ -100,6 +101,10 @@ module Decidim
         def form_presenter
           @form_presenter ||= present(@form, presenter_class: Decidim::Solutions::SolutionPresenter)
         end
+
+        def base_query
+          collection.order(created_at: :desc)
+        end
       end
     end
   end

data/app/forms/decidim/solutions/solutions_form.rb

@@ -32,7 +32,7 @@ module Decidim
         self.description = translated_attribute(model.description)
 
         self.documents = model.attachments
-        return unless model.categorization
+        nil unless model.categorization
       end
 
       # Finds the Challenge from the given decidim_challenges_challenge_id

data/app/models/decidim/challenges/challenge.rb

@@ -25,7 +25,7 @@ module Decidim
       has_many :surveys, class_name: "Decidim::Challenges::Survey", foreign_key: "decidim_challenge_id", dependent: :destroy
 
       VALID_STATES = [:proposal, :execution, :finished].freeze
-      enum state: VALID_STATES
+      enum :state, VALID_STATES
 
       has_many :problems,
                class_name: "Decidim::Problems::Problem",

data/app/models/decidim/problems/problem.rb

@@ -16,7 +16,7 @@ module Decidim
       include Decidim::Randomable
 
       VALID_STATES = [:proposal, :execution, :finished].freeze
-      enum state: VALID_STATES
+      enum :state, VALID_STATES
 
       component_manifest_name "problems"
 

data/app/serializers/decidim/solutions/solution_serializer.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Solutions
+    class SolutionSerializer < Decidim::Exporters::Serializer
+      include Decidim::ApplicationHelper
+      include Decidim::ResourceHelper
+      include Decidim::TranslationsHelper
+      include HtmlToPlainText
+      include ActionView::Helpers::SanitizeHelper
+
+      def serialize
+        {
+          title_label => localized(resource.title),
+          description_label => sanitized_description,
+          status_label => resource&.project_status,
+          challenge_label => translated_challenge_title,
+          url_label => resource&.project_url,
+          created_at_label => resource.created_at,
+          published_at_label => resource&.published_at,
+        }
+      end
+
+      private
+
+      def localized(value)
+        if value.is_a?(Hash)
+          value[I18n.locale.to_s] || ""
+        else
+          value.to_s
+        end
+      end
+
+      def sanitize(text)
+        ActionController::Base.helpers.strip_tags(text)
+      end
+
+      def title_label
+        I18n.t("export.title", scope: "decidim.solutions.admin.exports").to_s
+      end
+
+      def description_label
+        I18n.t("export.description", scope: "decidim.solutions.admin.exports").to_s
+      end
+
+      def status_label
+        I18n.t("export.status", scope: "decidim.solutions.admin.exports").to_s
+      end
+
+      def challenge_label
+        I18n.t("export.challenge", scope: "decidim.solutions.admin.exports").to_s
+      end
+
+      def url_label
+        I18n.t("export.url", scope: "decidim.solutions.admin.exports").to_s
+      end
+
+      def created_at_label
+        I18n.t("export.created_at", scope: "decidim.solutions.admin.exports").to_s
+      end
+
+      def published_at_label
+        I18n.t("export.published_at", scope: "decidim.solutions.admin.exports").to_s
+      end
+
+      def translated_challenge_title
+        resource&.challenge&.title.present? ? resource&.challenge&.title&.[](I18n.locale.to_s) : ""
+      end
+
+      def sanitized_description
+        sanitize(localized(resource.description))
+      end
+    end
+  end
+end

data/app/views/decidim/challenges/admin/challenges/edit.html.erb

@@ -11,7 +11,7 @@
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
-      
+
           <% if challenge.published? %>
             <%= link_to t("actions.unpublish", scope: "decidim.challenges.admin"), challenge_publish_path(challenge), method: :delete, class: "button button__sm button__secondary" %>
           <% else %>

data/app/views/decidim/problems/admin/problems/edit.html.erb

@@ -11,7 +11,7 @@
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
-      
+
           <% if problem.published? %>
             <%= link_to t("actions.unpublish", scope: "decidim.problems.admin"), problem_publish_path(problem), method: :delete, class: "button button__sm button__secondary" %>
           <% else %>

data/app/views/decidim/problems/problems/_sidebar_data.html.erb

@@ -36,14 +36,14 @@
     <% if @problem.decidim_sectorial_scope_id.present? %>
       <div class="text-sm flex flex-col items-center gap-1">
         <p class="uppercase text-xs"><%= t("decidim_sectorial_scope_id", scope: "activemodel.attributes.problem") %></p>
-        <p class="uppercase mb-4"><%= translated_attribute current_organization.scopes.find_by(id: @problem.decidim_sectorial_scope_id).name  %></p>
+        <p class="uppercase mb-4"><%= translated_attribute current_organization.scopes.find_by(id: @problem.decidim_sectorial_scope_id).name %></p>
       </div>
     <% end %>
 
     <% if @problem.decidim_technological_scope_id.present? %>
       <div class="text-sm flex flex-col items-center gap-1">
         <p class="uppercase text-xs"><%= t("decidim_sectorial_scope_id", scope: "activemodel.attributes.problem") %></p>
-        <p class="uppercase mb-4"><%= translated_attribute current_organization.scopes.find_by(id: @problem.decidim_technological_scope_id).name  %></p>
+        <p class="uppercase mb-4"><%= translated_attribute current_organization.scopes.find_by(id: @problem.decidim_technological_scope_id).name %></p>
       </div>
     <% end %>
   </div>

data/app/views/decidim/problems/problems/show.html.erb

@@ -35,4 +35,3 @@
     <%= render partial: "sidebar_data" %>
   <% end %>
 <% end %>
-

data/app/views/decidim/sdgs/sdgs/index.html.erb

@@ -25,11 +25,11 @@
         </div>
       </div>
     </div>
-    
+
     <div id="ods-container">
       <%= render partial: "ods" %>
     </div>
-    
+
     <div id="objective-container">
       <%= render partial: "objectives" %>
     </div>

data/app/views/decidim/sdgs/sdgs_filter/_modal.html.erb

@@ -15,7 +15,7 @@
           idx+= 1
           idx_str= idx.to_s.rjust(2, "0") %>
           <div class="sdg-cell" data-value="<%= sdg_code %>">
-          <%= image_pack_tag "media/images/ods-#{idx_str}.svg", alt: "Logo SDG #{idx_str}"%>
+          <%= image_pack_tag "media/images/ods-#{idx_str}.svg", alt: "Logo SDG #{idx_str}" %>
             <div class="text">
               <p><%= "#{idx_str}. #{t_sdg(sdg_code)}" %></p>
             </div>
@@ -28,8 +28,5 @@
         <a class="button button__sm md:button__lg button__secondary" data-close="" role="button"><%= t(".close") %></a>
       </div>
     </div>
-  
   </div>
 </div>
-
-

data/app/views/decidim/solutions/admin/solutions/_form.html.erb

@@ -56,7 +56,7 @@
       <%= form.hidden_field :decidim_challenges_challenge_id, value: @form.try(:challenge) ? @form.try(:challenge).id : '' %>
     <% else %>
       <%= form.hidden_field :decidim_problems_problem_id, value: @form.try(:problem) ? @form.try(:problem).id : '' %>
-      <div class="card-section"">
+      <div class="card-section">
         <div class="row column">
           <%= form.select :decidim_challenges_challenge_id,
                             @form.select_challenge_collection,

data/app/views/decidim/solutions/admin/solutions/edit.html.erb

@@ -11,7 +11,7 @@
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
-      
+
           <% if solution.published? %>
             <%= link_to t("actions.unpublish", scope: "decidim.solutions.admin"), solution_publish_path(solution), method: :delete, class: "button button__sm button__secondary" %>
           <% else %>

data/app/views/decidim/solutions/admin/solutions/index.html.erb

@@ -7,6 +7,7 @@
         <span id="js-selected-solutions-count" class="component-counter component-counter--inline" title="<%= t("decidim.solutions.admin.titles.solutions_list") %>"></span>
       </div>
       <div class="flex items-center gap-x-4">
+        <%= export_dropdowns(query) %>
         <% if allowed_to? :create, :solution %>
             <%= link_to t("actions.new_solution", scope: "decidim.solutions.admin"),
             new_solution_path,

data/app/views/decidim/solutions/admin/solutions/show.html.erb

@@ -42,7 +42,7 @@
           <div class="row column">
             <span class="component__show-description"><%= t ".description" %></span>
             <p class="component__show-text">
-              <%= decidim_sanitize_editor_admin translated_attribute solution.description  %>
+              <%= decidim_sanitize_editor_admin translated_attribute solution.description %>
             </p>
           </div>
         </div>
@@ -111,4 +111,3 @@
     <% end %>
   </div>
 </div>
-

data/app/views/decidim/solutions/solutions/_sidebar_data.html.erb

@@ -14,7 +14,7 @@
             <p class="uppercase mb-4"><%= t(@solution.challenge.state, scope: "decidim.challenges.states") %></p>
           <% else %>
             <p class="uppercase mb-4"><%= t(@solution.project_status, scope: "decidim.solutions.solutions.form.project_statuses") %></p>
-          <% end %>  
+          <% end %>
         </div>
       <% end %>
     </div>
@@ -77,7 +77,7 @@
       </div>
     <% end %>
   </div>
-  
+
   <% if has_problem? %>
     <% if @solution.problem.challenge.sdg_code %>
       <div class="text-sm flex flex-col items-center gap-1">

data/app/views/decidim/solutions/solutions/show.html.erb

@@ -14,7 +14,7 @@
     <% if has_problem? %>
       <h3 class="h4">
         <span class="title"><%= t("problem", scope: "activemodel.attributes.solution") %></span>:
-        <%= link_to translated_attribute(@solution.problem.title), Decidim::ResourceLocatorPresenter.new(@solution.problem).path %><br />
+        <%= link_to translated_attribute(@solution.problem.title), Decidim::ResourceLocatorPresenter.new(@solution.problem).path %><br>
         <span class="title"><%= t("challenge", scope: "activemodel.attributes.problem") %></span>:
         <%= link_to translated_attribute(@solution.problem.challenge.title), Decidim::ResourceLocatorPresenter.new(@solution.problem.challenge).path %></strong>
       </h3>

data/config/locales/ca.yml

@@ -1133,6 +1133,17 @@ ca:
           publish: Publicar
           unpublish: Despublicar
           view: Veure solució
+        exports:
+          solutions: "Solucions"
+          export:
+            author: "Autor"
+            title: "Títol"
+            description: "Descripció"
+            status: "Estat"
+            challenge: "Repte associat"
+            url: "Enllaç"
+            created_at: "Data de creació"
+            published_at: "Publicada"
         solution_publications:
           create:
             error: Hi ha hagut un problema publicant aquesta solució

data/config/locales/en.yml

@@ -1135,6 +1135,17 @@ en:
           publish: Publish
           unpublish: Unpublish
           view: View solution
+        exports:
+          solutions: "Solutions"
+          export:
+            author: "Author"
+            title: "Title"
+            description: "Description"
+            status: "Status"
+            challenge: "Associated challenge"
+            url: "Link"
+            created_at: "Creation date"
+            published_at: "Published"
         solution_publications:
           create:
             error: There's been a problem publising this solution

data/config/locales/es.yml

@@ -1140,6 +1140,17 @@ es:
           publish: Publicar
           unpublish: Despublicar
           view: Ver solución
+        exports:
+          solutions: "Soluciones"
+          export:
+            author: "Autor"
+            title: "Título"
+            description: "Descripción"
+            status: "Estado"
+            challenge: "Reto asociado"
+            url: "Enlace"
+            created_at: "Fecha de creación"
+            published_at: "Publicada"
         solution_publications:
           create:
             error: Ha habido un problema publicando esta solución

data/lib/decidim/challenges/version.rb

@@ -4,11 +4,11 @@ module Decidim
   # This holds the decidim-meetings version.
   module Challenges
     def self.version
-      "0.5.1"
+      "0.7.0"
     end
 
     def self.decidim_version
-      "~> 0.27"
+      "~> 0.29"
     end
   end
 end

data/lib/decidim/solutions/component.rb

@@ -49,4 +49,14 @@ Decidim.register_component(:solutions) do |component|
   # component.seeds do |participatory_space|
   #   # Add some seeds for this component
   # end
+
+  component.exports :solutions do |exports|
+    exports.collection do |component_instance|
+      Decidim::Solutions::Solution.where(component: component_instance)
+    end
+
+    exports.include_in_open_data = true
+
+    exports.serializer Decidim::Solutions::SolutionSerializer
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-challenges
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Oliver Valls
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,42 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-- !ruby/object:Gem::Dependency
-  name: decidim
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
-- !ruby/object:Gem::Dependency
-  name: decidim-dev
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.29'
 description: Articulates the collective action of diverse actors in order to address
   shared challenges and the problems that derive from them across the territory.
 email:
@@ -198,6 +170,7 @@ files:
 - app/presenters/decidim/solutions/solution_presenter.rb
 - app/serializers/decidim/challenges/download_your_data_survey_serializer.rb
 - app/serializers/decidim/challenges/survey_serializer.rb
+- app/serializers/decidim/solutions/solution_serializer.rb
 - app/types/decidim/challenges/challenge_type.rb
 - app/types/decidim/challenges/challenges_type.rb
 - app/types/decidim/problems/problem_type.rb
@@ -302,14 +275,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.1
+      version: 3.2.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A decidim challenges module