decidim-surveys 0.10.1 → 0.11.0.pre1

data/config/locales/ru.yml

@@ -7,10 +7,6 @@ ru:
         mandatory: Обязательно
         question_type: Тип
   decidim:
-    features:
-      surveys:
-        actions:
-          answer: Ответить
     surveys:
       admin:
         exports:
@@ -22,7 +18,6 @@ ru:
         surveys:
           answer_option:
             answer_option: Вариант ответа
-            remove_answer_option: Удалить вариант ответа
             statement: Высказывание
           edit:
             save: Сохранить
@@ -33,7 +28,6 @@ ru:
           question:
             add_answer_option: Добавить вариант ответа
             question: Вопрос
-            remove_question: Удалить вопрос
             statement: Высказывание
           update:
             invalid: При сохранении опроса произошли ошибки.

data/config/locales/sv.yml

@@ -5,8 +5,27 @@ sv:
         body: Svar
       survey_question:
         mandatory: Obligatorisk
+        max_choices: Max antal val
         question_type: Typ
+    errors:
+      models:
+        survey_answer:
+          attributes:
+            choices:
+              missing: är inte fullständiga
+              too_many: är för många
   decidim:
+    components:
+      surveys:
+        actions:
+          answer: Svara
+        name: Undersökning
+        settings:
+          global:
+            announcement: Meddelande
+          step:
+            allow_answers: Tillåta svar
+            announcement: Meddelande
     events:
       surveys:
         survey_closed:
@@ -19,17 +38,10 @@ sv:
           email_outro: Du har fått den här meddelandet eftersom du följer %{participatory_space_title}. Du kan sluta ta emot meddelanden efter föregående länk.
           email_subject: En ny undersökning i %{participatory_space_title}
           notification_title: Undersökningen <a href="%{resource_path}">%{resource_title}</a> i <a href="%{participatory_space_url}">%{participatory_space_title}</a> är nu öppen.
-    features:
-      surveys:
-        actions:
-          answer: Svar
-        name: Undersökning
-        settings:
-          global:
-            announcement: Meddelande
-          step:
-            allow_answers: Tillåta svar
-            announcement: Meddelande
+    forms:
+      errors:
+        survey_answer:
+          body: Kroppen kan inte vara tomt
     surveys:
       admin:
         exports:
@@ -41,7 +53,8 @@ sv:
         surveys:
           answer_option:
             answer_option: Svaralternativ
-            remove_answer_option: Ta bort svaralternativet
+            free_text: Fri text
+            remove: Avlägsna
             statement: Påstående
           edit:
             save: Spara
@@ -51,9 +64,13 @@ sv:
             already_answered_warning: Undersökningen är redan besvarad av vissa användare så att du inte kan ändra sina frågor.
           question:
             add_answer_option: Lägg till svaralternativ
+            any: Några
+            description: Beskrivning
+            down: Ner
             question: Fråga
-            remove_question: Ta bort fråga
+            remove: Avlägsna
             statement: Påstående
+            up: Upp
           update:
             invalid: Det har varit fel när du sparat undersökningen.
             success: Undersökningen sparades framgångsrikt.
@@ -62,10 +79,13 @@ sv:
         multiple_option: Flera alternativ
         short_answer: Kort svar
         single_option: Enkelt alternativ
+        sorting: Sortering
       surveys:
         answer:
           invalid: Det har förekommit fel vid besvarandet av undersökningen.
           success: Undersökningen svarades framgångsrikt.
+        question:
+          max_choices: 'Max val: %{n}'
         show:
           answer_survey:
             anonymous_user_message: <a href="%{sign_in_link}"> Logga in med ditt konto</a> eller <a href="%{sign_up_link}">sign up</a> för att svara på enkäten.

data/config/locales/uk.yml

@@ -7,10 +7,6 @@ uk:
         mandatory: Обов’язкове поле
         question_type: Різновид
   decidim:
-    features:
-      surveys:
-        actions:
-          answer: Відповісти
     surveys:
       admin:
         exports:
@@ -22,7 +18,6 @@ uk:
         surveys:
           answer_option:
             answer_option: Варіант відповіді
-            remove_answer_option: Вилучити варіант відповіді
             statement: Висловлювання
           edit:
             save: Зберегти
@@ -33,7 +28,6 @@ uk:
           question:
             add_answer_option: Додати варіант відповіді
             question: Питання
-            remove_question: Видалити питання
             statement: Висловлювання
           update:
             invalid: При збереженні цього опитування сталися помилки.

data/db/migrate/20180305133837_rename_features_to_components_at_surveys.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RenameFeaturesToComponentsAtSurveys < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :decidim_surveys_surveys, :decidim_feature_id, :decidim_component_id
+
+    if index_name_exists?(:decidim_surveys_surveys, "index_decidim_surveys_surveys_on_decidim_feature_id")
+      rename_index :decidim_surveys_surveys, "index_decidim_surveys_surveys_on_decidim_feature_id", "index_decidim_surveys_surveys_on_decidim_component_id"
+    end
+  end
+end

data/db/migrate/20180314225829_add_max_choices_to_survey_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddMaxChoicesToSurveyQuestions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_surveys_survey_questions, :max_choices, :integer
+  end
+end

data/db/migrate/20180321141024_add_description_to_decidim_survey_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDescriptionToDecidimSurveyQuestions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_surveys_survey_questions, :description, :jsonb
+  end
+end

data/db/migrate/20180405014929_add_choices_to_decidim_survey_answers.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class AddChoicesToDecidimSurveyAnswers < ActiveRecord::Migration[5.1]
+  class SurveyAnswer < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_answers
+  end
+
+  class SurveyQuestion < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_questions
+  end
+
+  def up
+    add_column :decidim_surveys_survey_answers, :text_body, :text
+    add_column :decidim_surveys_survey_answers, :choices, :jsonb, default: []
+
+    SurveyAnswer.find_each do |answer|
+      question = SurveyQuestion.find_by(id: answer.decidim_survey_question_id)
+
+      if %w(single_option multiple_option).include?(question.question_type)
+        answer.update!(choices: answer.body)
+      else
+        answer.update!(text_body: answer.body.first)
+      end
+    end
+
+    remove_column :decidim_surveys_survey_answers, :body
+    rename_column :decidim_surveys_survey_answers, :text_body, :body
+  end
+
+  def down
+    add_column :decidim_surveys_survey_answers, :jsonb_body, :jsonb, default: []
+
+    SurveyAnswer.find_each do |answer|
+      question = SurveyQuestion.find_by(id: answer.decidim_survey_question_id)
+
+      if %w(single_option multiple_option).include?(question.question_type)
+        answer.update!(jsonb_body: answer.choices)
+      else
+        answer.update!(jsonb_body: [answer.body])
+      end
+    end
+
+    remove_column :decidim_surveys_survey_answers, :choices
+
+    remove_column :decidim_surveys_survey_answers, :body
+    rename_column :decidim_surveys_survey_answers, :jsonb_body, :body
+  end
+end

data/db/migrate/20180405015012_create_decidim_survey_answer_options.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class CreateDecidimSurveyAnswerOptions < ActiveRecord::Migration[5.1]
+  class SurveyQuestion < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_questions
+  end
+
+  class SurveyAnswerOption < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_answer_options
+  end
+
+  def up
+    create_table :decidim_surveys_survey_answer_options do |t|
+      t.references :decidim_survey_question, index: { name: "index_decidim_surveys_answer_options_question_id" }
+      t.jsonb :body
+    end
+
+    SurveyQuestion.find_each do |question|
+      question.answer_options.each do |answer_option|
+        SurveyAnswerOption.create!(
+          decidim_survey_question_id: question.id,
+          body: answer_option["body"]
+        )
+      end
+    end
+
+    remove_column :decidim_surveys_survey_questions, :answer_options
+  end
+
+  def down
+    add_column :decidim_surveys_survey_questions, :answer_options, :jsonb, default: []
+
+    SurveyAnswerOption.find_each do |answer_option|
+      question = SurveyQuestion.find(answer_option.decidim_survey_question_id)
+
+      question.answer_options << { "body" => answer_option.body }
+
+      question.save!
+    end
+
+    drop_table :decidim_surveys_survey_answer_options
+  end
+end

data/db/migrate/20180405015147_create_decidim_survey_answer_choices.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class CreateDecidimSurveyAnswerChoices < ActiveRecord::Migration[5.1]
+  class SurveyAnswer < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_answers
+  end
+
+  class SurveyAnswerChoice < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_answer_choices
+  end
+
+  class SurveyQuestion < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_questions
+  end
+
+  class SurveyAnswerOption < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_answer_options
+  end
+
+  def up
+    create_table :decidim_surveys_survey_answer_choices do |t|
+      t.references :decidim_survey_answer, index: { name: "index_decidim_surveys_answer_choices_answer_id" }
+      t.references :decidim_survey_answer_option, index: { name: "index_decidim_surveys_answer_choices_answer_option_id" }
+      t.jsonb :body
+    end
+
+    SurveyAnswer.find_each do |answer|
+      question = SurveyQuestion.find_by(id: answer.decidim_survey_question_id)
+
+      answer.choices.each do |answer_choice|
+        answer_options = SurveyAnswerOption.where(decidim_survey_question_id: question.id)
+
+        answer_option = answer_options.find do |option|
+          option.body.values.include?(answer_choice)
+        end
+
+        SurveyAnswerChoice.create!(
+          decidim_survey_answer_id: answer.id,
+          decidim_survey_answer_option_id: answer_option.id,
+          body: answer_choice
+        )
+      end
+    end
+
+    remove_column :decidim_surveys_survey_answers, :choices
+  end
+
+  def down
+    add_column :decidim_surveys_survey_answers, :choices, :jsonb, default: []
+
+    SurveyAnswerChoice.find_each do |answer_choice|
+      answer = SurveyAnswer.find_by(id: answer_choice.decidim_survey_answer_id)
+
+      answer.choices << answer_choice.body
+
+      answer.save!
+    end
+
+    drop_table :decidim_surveys_survey_answer_choices
+  end
+end

data/db/migrate/20180405015258_add_free_text_to_survey_answer_options.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddFreeTextToSurveyAnswerOptions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_surveys_survey_answer_options, :free_text, :boolean
+  end
+end

data/db/migrate/20180405015314_add_custom_body_to_survey_answer_choices.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCustomBodyToSurveyAnswerChoices < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_surveys_survey_answer_choices, :custom_body, :text
+  end
+end

data/db/migrate/20180406201818_add_position_to_decidim_survey_answer_choices.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPositionToDecidimSurveyAnswerChoices < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_surveys_survey_answer_choices, :position, :integer
+  end
+end

data/lib/decidim/surveys.rb

@@ -3,7 +3,7 @@
 require "decidim/surveys/admin"
 require "decidim/surveys/engine"
 require "decidim/surveys/admin_engine"
-require "decidim/surveys/feature"
+require "decidim/surveys/component"
 
 module Decidim
   # This namespace holds the logic of the `Surveys` component. This component

data/lib/decidim/surveys/admin_engine.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "jquery-tmpl-rails"
-
 module Decidim
   module Surveys
     # This is the engine that runs on the public interface of `Surveys`.

data/lib/decidim/surveys/{feature.rb → component.rb}

@@ -1,32 +1,32 @@
 # frozen_string_literal: true
 
-require "decidim/features/namer"
+require "decidim/components/namer"
 
-Decidim.register_feature(:surveys) do |feature|
-  feature.engine = Decidim::Surveys::Engine
-  feature.admin_engine = Decidim::Surveys::AdminEngine
-  feature.icon = "decidim/surveys/icon.svg"
-  feature.stylesheet = "decidim/surveys/surveys"
+Decidim.register_component(:surveys) do |component|
+  component.engine = Decidim::Surveys::Engine
+  component.admin_engine = Decidim::Surveys::AdminEngine
+  component.icon = "decidim/surveys/icon.svg"
+  component.stylesheet = "decidim/surveys/surveys"
 
-  feature.on(:create) do |instance|
+  component.on(:create) do |instance|
     Decidim::Surveys::CreateSurvey.call(instance) do
       on(:invalid) { raise "Can't create survey" }
     end
   end
 
-  feature.on(:before_destroy) do |instance|
-    raise "Can't destroy this feature when there are surveys" if Decidim::Surveys::Survey.where(feature: instance).any?
+  component.on(:before_destroy) do |instance|
+    raise "Can't destroy this component when there are surveys" if Decidim::Surveys::Survey.where(component: instance).any?
   end
 
-  feature.register_stat :surveys_count do |features, start_at, end_at|
-    surveys = Decidim::Surveys::Survey.where(feature: features)
+  component.register_stat :surveys_count do |components, start_at, end_at|
+    surveys = Decidim::Surveys::Survey.where(component: components)
     surveys = surveys.where("created_at >= ?", start_at) if start_at.present?
     surveys = surveys.where("created_at <= ?", end_at) if end_at.present?
     surveys.count
   end
 
-  feature.register_stat :answers_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |features, start_at, end_at|
-    surveys = Decidim::Surveys::Survey.where(feature: features)
+  component.register_stat :answers_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
+    surveys = Decidim::Surveys::Survey.where(component: components)
     answers = Decidim::Surveys::SurveyAnswer.where(survey: surveys)
     answers = answers.where("created_at >= ?", start_at) if start_at.present?
     answers = answers.where("created_at <= ?", end_at) if end_at.present?
@@ -34,46 +34,46 @@ Decidim.register_feature(:surveys) do |feature|
   end
 
   # These actions permissions can be configured in the admin panel
-  feature.actions = %w(answer)
+  component.actions = %w(answer)
 
-  feature.settings(:global) do |settings|
+  component.settings(:global) do |settings|
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
-  feature.settings(:step) do |settings|
+  component.settings(:step) do |settings|
     settings.attribute :allow_answers, type: :boolean, default: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
-  # feature.register_resource do |resource|
+  # component.register_resource do |resource|
   #   # Register a optional resource that can be references from other resources.
   #   resource.model_class_name = "Decidim::Surveys::SomeResource"
   #   resource.template = "decidim/surveys/some_resources/linked_some_resources"
   # end
 
-  # feature.register_stat :some_stat do |context, start_at, end_at|
+  # component.register_stat :some_stat do |context, start_at, end_at|
   #   # Register some stat number to the application
   # end
 
-  feature.exports :survey_user_answers do |exports|
+  component.exports :survey_user_answers do |exports|
     exports.collection do |f|
-      survey = Decidim::Surveys::Survey.where(feature: f).first
+      survey = Decidim::Surveys::Survey.find_by(component: f)
       Decidim::Surveys::SurveyUserAnswers.for(survey)
     end
 
     exports.serializer Decidim::Surveys::SurveyUserAnswersSerializer
   end
 
-  feature.seeds do |participatory_space|
-    feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :surveys).i18n_name,
+  component.seeds do |participatory_space|
+    component = Decidim::Component.create!(
+      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :surveys).i18n_name,
       manifest_name: :surveys,
       published_at: Time.current,
       participatory_space: participatory_space
     )
 
     survey = Decidim::Surveys::Survey.create!(
-      feature: feature,
+      component: component,
       title: Decidim::Faker::Localized.paragraph,
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(3)
@@ -83,12 +83,24 @@ Decidim.register_feature(:surveys) do |feature|
       end
     )
 
-    2.times do
+    %w(short_answer long_answer).each do |text_question_type|
       Decidim::Surveys::SurveyQuestion.create!(
         survey: survey,
         body: Decidim::Faker::Localized.paragraph,
-        question_type: "short_answer"
+        question_type: text_question_type
       )
     end
+
+    %w(single_option multiple_option).each do |multiple_choice_question_type|
+      question = Decidim::Surveys::SurveyQuestion.create!(
+        survey: survey,
+        body: Decidim::Faker::Localized.paragraph,
+        question_type: multiple_choice_question_type
+      )
+
+      3.times do
+        question.answer_options.create!(body: Decidim::Faker::Localized.sentence)
+      end
+    end
   end
 end