decidim-surveys 0.28.4 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50f4087ca29b97b5724267c979543314276bb20849f41dba8fe134518de5b08d
-  data.tar.gz: 0f465313580a6d47955ae2b7c3dec6d5d09c4138e6cdec441ee4b6596d1e9efb
+  metadata.gz: 5bdae9a39be6faded76b89b6c294c13ae2666b4cdd6e2b9763e556a059a68f25
+  data.tar.gz: 4bfab3b57c171e2ba3014a2def14ef6e46b0c3a5b41a31f6633d6701b070a1d9
 SHA512:
-  metadata.gz: fcf278153d37a174bde9307690711c8d3370c9557da2c8b1e2a0db78852f768b7e2d50d67543b47cae4a8af9df369f309a7c666b916a5c8e8f75ae75fe78cd21
-  data.tar.gz: 60216260d4623a494982a75d014aefbb9aa6f8fc78d0e0e89a6e5abd5458a71f69fceaa15f673d924f4a08401cf220f7383afb4fba6fe9e3fcf92ec5fc1186e5
+  metadata.gz: d0c9754f2bfd02c879f608fe6595f5cd750c32cd99d3a46b3ef4b3d7e766e72e962949e1cda8efa387683ab7940ba8f2d667bd894b217bd8afb3dafda8ae657a
+  data.tar.gz: 81ce1b448e4207e8e864dab2418596834e1e84e73efbf1ddfab2f0be5048d8cf31d1a154223f1bf647c8e95fdbc96052e212f54d64a24888868792cf7dd3a9ad

data/app/views/decidim/surveys/survey_confirmation_mailer/confirmation.html.erb

@@ -1,3 +1,3 @@
-<p class="confimation-survey-answers">
+<p class="confirmation-survey-answers">
   <%= t(".body", questionnaire_title: @questionnaire_title, participatory_space: @participatory_space_title) %>
 </p>

data/app/views/decidim/surveys/surveys/no_permission.html.erb

@@ -1,7 +1,7 @@
 <div class="row">
-  <div class="columns large-6 medium-centered">
+  <div class="columns large-6">
     <div class="card">
-      <div class="card__content">
+      <div>
         <%= cell "decidim/authorization_modal", authorizations %>
       </div>
     </div>

data/config/locales/fi.yml

@@ -41,7 +41,7 @@ fi:
           email_subject: Kysely on päättynyt kohteessa %{participatory_space_title}
           notification_title: Kysely <a href="%{resource_path}">%{resource_title}</a> kohteessa <a href="%{participatory_space_url}">%{participatory_space_title}</a> on päättynyt.
         survey_opened:
-          email_intro: 'Kysely %{resource_title} kohteessa %{participatory_space_title} on nyt auki. Voit osallistua siihen sivulta:'
+          email_intro: 'Kysely %{resource_title} kohteessa %{participatory_space_title} on nyt auki. Voit osallistua siihen tällä sivulla:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta %{participatory_space_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
           email_subject: Uusi kysely kohteessa %{participatory_space_title}
           notification_title: Kysely <a href="%{resource_path}">%{resource_title}</a> kohteessa <a href="%{participatory_space_url}">%{participatory_space_title}</a> on nyt auki.

data/config/locales/sv.yml

@@ -3,7 +3,7 @@ sv:
   activemodel:
     models:
       decidim/surveys/closed_survey_event: Enkäten avslutades
-      decidim/surveys/opened_survey_event: Enkäten startade
+      decidim/surveys/opened_survey_event: Enkäten startades
   activerecord:
     models:
       decidim/surveys/survey:
@@ -22,16 +22,16 @@ sv:
           global:
             announcement: Meddelande
             clean_after_publish: Ta bort svar vid publicering av enkäten
-            ends_at: Öppet för svar till
-            ends_at_help: Lämna tomt för att inte ha något slutdatum
-            scope_id: Indelning
-            scopes_enabled: Aktivera indelningar
-            starts_at: Öppet för svar från
-            starts_at_help: Lämna tomt för att inte ha något startdatum
+            ends_at: Svar accepterade tills
+            ends_at_help: Lämna tomt för inget slutdatum
+            scope_id: Omfång
+            scopes_enabled: Omfång aktiverade
+            starts_at: Svar accepterade från
+            starts_at_help: Lämna tomt för inget startdatum
           step:
             allow_answers: Tillåt svar
             allow_unregistered: Tillåt ej registrerade användare att besvara enkäten
-            allow_unregistered_help: Om aktiv kommer ingen inloggning att krävas för att besvara enkäten. Detta kan leda till dålig eller opålitlig data och det kommer att vara mer sårbart för automatiserade attacker. Använd med försiktighet! Tänk på att en deltagare kunde svara på samma enkät flera gånger, genom att använda olika webbläsare eller "privat surfning" i sin webbläsare.
+            allow_unregistered_help: Om valt krävs det ingen inloggning för att besvara enkäten. Detta kan leda till dåliga eller opålitliga data och det kommer att vara mer sårbart för automatiserade attacker. Använd med försiktighet! Det blir också möjligt för en deltagare att besvara enkäten flera gånger igenom att använda olika webbläsare eller surfa privat.
             announcement: Meddelande
     events:
       surveys:
@@ -54,24 +54,13 @@ sv:
       answers_count: Svar
     surveys:
       admin:
-        component:
-          actions:
-            answers_alert: Om du publicerar komponenten kommer alla resultat att tas bort.
         exports:
           survey_user_answers: Svar från enkätdeltagarna
         surveys:
           update:
             invalid: Det gick inte att spara enkäten.
             success: Enkäten har sparats.
-      last_activity:
-        new_survey: 'Ny enkät:'
-      survey_confirmation_mailer:
-        confirmation:
-          body: Du har besvarat enkäten %{questionnaire_title} för %{participatory_space}
-          subject: Svarsbekräftelse för formuläret %{questionnaire_title}
-        export_name: Enkätsvar
       surveys:
         answer:
           invalid: Det gick inte att besvara enkäten.
-          spam_detected: Det gick inte att svara på formuläret. Kanske har du varit för snabb, kan du försöka igen?
           success: Enkäten har besvarats.

data/decidim-surveys.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-surveys"
   s.summary = "Decidim surveys module"

data/lib/decidim/surveys/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-surveys version.
   module Surveys
     def self.version
-      "0.28.4"
+      "0.29.0.rc1"
     end
   end
 end

data/lib/tasks/surveys/upgrade/decidim_surveys_upgrade_tasks.rake

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+namespace :decidim_surveys do
+  namespace :upgrade do
+    desc "Migrates data from decidim_surveys tables to decidim_forms tables"
+    task migrate_data_to_decidim_forms: :environment do
+      class Answer < ApplicationRecord
+        self.table_name = :decidim_surveys_survey_answers
+      end
+
+      class AnswerChoice < ApplicationRecord
+        self.table_name = :decidim_surveys_survey_answer_choices
+      end
+
+      class AnswerOption < ApplicationRecord
+        self.table_name = :decidim_surveys_survey_answer_options
+      end
+
+      class Question < ApplicationRecord
+        self.table_name = :decidim_surveys_survey_questions
+      end
+
+      unless [Answer, AnswerChoice, AnswerOption, Question].all? { |model| ActiveRecord::Base.connection.table_exists? model.table_name }
+        puts "ERROR: There are not all the necessary surveys tables. Have you already migrated the data?"
+        next
+      end
+
+      ActiveRecord::Base.transaction do
+        Decidim::Surveys::Survey.find_each do |survey|
+          puts "Migrating survey #{survey.id}..."
+
+          questionnaire = Decidim::Forms::Questionnaire.create!(
+            questionnaire_for: survey,
+            title: survey.title,
+            description: survey.description,
+            tos: survey.tos,
+            published_at: survey.published_at,
+            created_at: survey.created_at,
+            updated_at: survey.updated_at
+          )
+
+          Question.where(decidim_survey_id: survey.id).find_each do |survey_question|
+            puts "Migrating question #{survey_question.id}..."
+
+            question = Decidim::Forms::Question.create!(
+              questionnaire:,
+              position: survey_question.position,
+              question_type: survey_question.question_type,
+              mandatory: survey_question.mandatory,
+              body: survey_question.body,
+              description: survey_question.description,
+              max_choices: survey_question.max_choices,
+              created_at: survey_question.created_at,
+              updated_at: survey_question.updated_at
+            )
+
+            # A hash with the old answer_option id as key, and the new form answer option as value
+            answer_option_mapping = {}
+
+            AnswerOption.where(decidim_survey_question_id: survey_question.id).find_each do |survey_answer_option|
+              answer_option_mapping[survey_answer_option.id] = Decidim::Forms::AnswerOption.create!(
+                question:,
+                body: survey_answer_option.body,
+                free_text: survey_answer_option.free_text
+              )
+            end
+
+            Answer.where(decidim_survey_id: survey.id, decidim_survey_question_id: survey_question.id).find_each do |survey_answer|
+              answer = Decidim::Forms::Answer.new(
+                questionnaire:,
+                question:,
+                decidim_user_id: survey_answer.decidim_user_id,
+                body: survey_answer.body,
+                created_at: survey_answer.created_at,
+                updated_at: survey_answer.updated_at
+              )
+
+              AnswerChoice.where(decidim_survey_answer_id: survey_answer.id).find_each do |survey_answer_choice|
+                answer.choices.build(
+                  answer_option: answer_option_mapping[survey_answer_choice.decidim_survey_answer_option_id],
+                  body: survey_answer_choice.body,
+                  custom_body: survey_answer_choice.custom_body,
+                  position: survey_answer_choice.position
+                )
+              end
+
+              answer.save!
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.28.4
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,84 +18,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 description: A surveys component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -246,7 +246,7 @@ files:
 - lib/decidim/surveys/seeds.rb
 - lib/decidim/surveys/test/factories.rb
 - lib/decidim/surveys/version.rb
-- lib/tasks/decidim_surveys_tasks.rake
+- lib/tasks/surveys/upgrade/decidim_surveys_upgrade_tasks.rake
 homepage: https://decidim.org
 licenses:
 - AGPL-3.0
@@ -264,14 +264,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim surveys module

data/lib/tasks/decidim_surveys_tasks.rake

@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-namespace :decidim_surveys do
-  desc "Migrate data from decidim_surveys tables to decidim_forms tables"
-  task migrate_data_to_decidim_forms: :environment do
-    class Answer < ApplicationRecord
-      self.table_name = :decidim_surveys_survey_answers
-    end
-
-    class AnswerChoice < ApplicationRecord
-      self.table_name = :decidim_surveys_survey_answer_choices
-    end
-
-    class AnswerOption < ApplicationRecord
-      self.table_name = :decidim_surveys_survey_answer_options
-    end
-
-    class Question < ApplicationRecord
-      self.table_name = :decidim_surveys_survey_questions
-    end
-
-    unless [Answer, AnswerChoice, AnswerOption, Question].all? { |model| ActiveRecord::Base.connection.table_exists? model.table_name }
-      puts "ERROR: There are not all the necessary surveys tables. Have you already migrated the data?"
-      next
-    end
-
-    ActiveRecord::Base.transaction do
-      Decidim::Surveys::Survey.find_each do |survey|
-        puts "Migrating survey #{survey.id}..."
-
-        questionnaire = Decidim::Forms::Questionnaire.create!(
-          questionnaire_for: survey,
-          title: survey.title,
-          description: survey.description,
-          tos: survey.tos,
-          published_at: survey.published_at,
-          created_at: survey.created_at,
-          updated_at: survey.updated_at
-        )
-
-        Question.where(decidim_survey_id: survey.id).find_each do |survey_question|
-          puts "Migrating question #{survey_question.id}..."
-
-          question = Decidim::Forms::Question.create!(
-            questionnaire:,
-            position: survey_question.position,
-            question_type: survey_question.question_type,
-            mandatory: survey_question.mandatory,
-            body: survey_question.body,
-            description: survey_question.description,
-            max_choices: survey_question.max_choices,
-            created_at: survey_question.created_at,
-            updated_at: survey_question.updated_at
-          )
-
-          # A hash with the old answer_option id as key, and the new form answer option as value
-          answer_option_mapping = {}
-
-          AnswerOption.where(decidim_survey_question_id: survey_question.id).find_each do |survey_answer_option|
-            answer_option_mapping[survey_answer_option.id] = Decidim::Forms::AnswerOption.create!(
-              question:,
-              body: survey_answer_option.body,
-              free_text: survey_answer_option.free_text
-            )
-          end
-
-          Answer.where(decidim_survey_id: survey.id, decidim_survey_question_id: survey_question.id).find_each do |survey_answer|
-            answer = Decidim::Forms::Answer.new(
-              questionnaire:,
-              question:,
-              decidim_user_id: survey_answer.decidim_user_id,
-              body: survey_answer.body,
-              created_at: survey_answer.created_at,
-              updated_at: survey_answer.updated_at
-            )
-
-            AnswerChoice.where(decidim_survey_answer_id: survey_answer.id).find_each do |survey_answer_choice|
-              answer.choices.build(
-                answer_option: answer_option_mapping[survey_answer_choice.decidim_survey_answer_option_id],
-                body: survey_answer_choice.body,
-                custom_body: survey_answer_choice.custom_body,
-                position: survey_answer_choice.position
-              )
-            end
-
-            answer.save!
-          end
-        end
-      end
-    end
-  end
-end