decidim 0.2.0 → 0.3.0

data/decidim-results/spec/features/process_admin_manages_results_spec.rb

@@ -3,13 +3,10 @@
 require "spec_helper"
 
 describe "Process admin manages results", type: :feature do
-  include_context "admin"
-  let(:user) { process_admin }
-  it_behaves_like "manage results"
+  let(:manifest_name) { "results" }
+  let!(:result) { create :result, scope: scope, feature: current_feature }
+
+  include_context "feature process admin"
 
-  before do
-    switch_to_host(organization.host)
-    login_as user, scope: :user
-    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
-  end
+  it_behaves_like "manage results"
 end

data/decidim-results/spec/shared/manage_results_examples.rb

@@ -10,7 +10,7 @@ RSpec.shared_examples "manage results" do
     within ".edit_result" do
       fill_in_i18n(
         :result_title,
-        "#title-tabs",
+        "#result-title-tabs",
         en: "My new title",
         es: "Mi nuevo título",
         ca: "El meu nou títol"
@@ -47,14 +47,14 @@ RSpec.shared_examples "manage results" do
     within ".new_result" do
       fill_in_i18n(
         :result_title,
-        "#title-tabs",
+        "#result-title-tabs",
         en: "My result",
         es: "Mi result",
         ca: "El meu result"
       )
       fill_in_i18n_editor(
         :result_description,
-        "#description-tabs",
+        "#result-description-tabs",
         en: "A longer description",
         es: "Descripción más larga",
         ca: "Descripció més llarga"

data/decidim-results/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
+ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
+
 require "decidim/dev/test/base_spec_helper"

data/decidim-surveys/README.md

@@ -0,0 +1,24 @@
+# Decidim::Surveys
+
+The Surveys module adds one of the main features of Decidim: allows admins to contribute to a participatory process by creating surveys. Users can participate in the surveys answering their questions from the public page.
+
+## Usage
+Surveys will be available as a Feature for a Participatory Process.
+
+## Installation
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'decidim-surveys'
+```
+
+And then execute:
+```bash
+$ bundle
+```
+
+## Contributing
+See [Decidim](https://github.com/decidim/decidim).
+
+## License
+See [Decidim](https://github.com/decidim/decidim).

data/decidim-surveys/Rakefile

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "decidim/dev/common_rake"

data/decidim-surveys/app/assets/config/admin/decidim_surveys_manifest.js

@@ -0,0 +1 @@
+//= link decidim/surveys/admin/surveys.js

data/decidim-surveys/app/assets/images/decidim/surveys/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02"><path d="M373,545.54a18,18,0,1,1,18-18A18,18,0,0,1,373,545.54Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,373,511.53Z" transform="translate(-354.99 -509.53)"/><path d="M377.73,536.41h-9.46a1,1,0,1,1,0-2h9.46A1,1,0,0,1,377.73,536.41Z" transform="translate(-354.99 -509.53)"/><path d="M375,525.54h-6.73a1,1,0,1,1,0-2H375A1,1,0,1,1,375,525.54Z" transform="translate(-354.99 -509.53)"/><path d="M375,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,375,535.41Z" transform="translate(-354.99 -509.53)"/><path d="M373,523a3,3,0,1,1,3-3A3,3,0,0,1,373,523Zm0-4a1,1,0,1,0,1,1A1,1,0,0,0,373,519Z" transform="translate(-354.99 -509.53)"/><path d="M371,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,371,535.41Z" transform="translate(-354.99 -509.53)"/></svg>

data/decidim-surveys/app/assets/javascripts/decidim/surveys/admin/auto_label_by_position.component.js.es6

@@ -0,0 +1,33 @@
+((exports) => {
+  class AutoLabelByPositionComponent {
+    constructor(options = {}) {
+      this.listSelector = options.listSelector;
+      this.labelSelector = options.labelSelector;
+      this.onPositionComputed = options.onPositionComputed;
+
+      this.run();
+    }
+
+    run() {
+      const $list = $(this.listSelector);
+
+      $list.each((idx, el) => {
+        const $label = $(el).find(this.labelSelector);
+        const labelContent = $label.html();
+
+        if (labelContent.match(/#(\d+)/)) {
+          $label.html(labelContent.replace(/#(\d+)/, `#${idx + 1}`));
+        } else {
+          $label.html(`${labelContent} #${idx + 1}`);
+        }
+
+        if (this.onPositionComputed) {
+          this.onPositionComputed(el, idx);
+        }
+      });
+    }
+  }
+
+  exports.DecidimAdmin = exports.DecidimAdmin || {};
+  exports.DecidimAdmin.AutoLabelByPositionComponent = AutoLabelByPositionComponent;
+})(window);

data/decidim-surveys/app/assets/javascripts/decidim/surveys/admin/dynamic_fields.component.js.es6

@@ -0,0 +1,95 @@
+((exports) => {
+  class DynamicFieldsComponent {
+    constructor(options = {}) {
+      this.templateId = options.templateId;
+      this.wrapperSelector = options.wrapperSelector;
+      this.containerSelector = options.containerSelector;
+      this.fieldSelector = options.fieldSelector;
+      this.addFieldButtonSelector = options.addFieldButtonSelector;
+      this.removeFieldButtonSelector = options.removeFieldButtonSelector;
+      this.onAddField = options.onAddField;
+      this.onRemoveField = options.onRemoveField;
+      this.tabsPrefix = options.tabsPrefix;
+      this._compileTemplate();
+      this._bindEvents();
+    }
+
+    _compileTemplate() {
+      $.template(this.templateId, $(`#${this.templateId}`).html());
+    }
+
+    _bindEvents() {
+      $(this.wrapperSelector).on('click', this.addFieldButtonSelector, (event) =>
+        this._bindSafeEvent(event, () => this._addField())
+      );
+
+      $(this.wrapperSelector).on('click', this.removeFieldButtonSelector, (event) =>
+        this._bindSafeEvent(event, (target) => this._removeField(target))
+      );
+    }
+
+    _bindSafeEvent(event, cb) {
+      event.preventDefault();
+      event.stopPropagation();
+
+      try {
+        return cb(event.target);
+      } catch (error) {
+        console.error(error); // eslint-disable-line no-console
+        return error;
+      }
+    }
+
+    _addField() {
+      const $container = $(this.wrapperSelector).find(this.containerSelector);
+      const uid = this._getUID();
+      const tabsId = `${this.tabsPrefix}-${uid}`;
+
+      const $newField = $.tmpl(this.templateId, { tabsId });
+
+      $newField.attr('id', `${tabsId}-field`);
+      $newField.find('[disabled]').attr('disabled', false);
+      $newField.find('ul.tabs').attr('data-tabs', true);
+
+      $newField.appendTo($container);
+      $newField.foundation();
+
+      if (this.onAddField) {
+        this.onAddField($newField);
+      }
+    }
+
+    _removeField(target) {
+      const $target = $(target);
+      const $removedField = $target.parents(this.fieldSelector);
+      const idInput = $removedField.find('input').filter((idx, input) => input.name.match(/id/));
+
+      if (idInput.length > 0) {
+        const deletedInput = $removedField.find('input').filter((idx, input) => input.name.match(/delete/));
+
+        if (deletedInput.length > 0) {
+          $(deletedInput[0]).val(true);
+        }
+
+        $removedField.addClass('hidden');
+        $removedField.hide();
+      } else {
+        $removedField.remove();
+      }
+
+      if (this.onRemoveField) {
+        this.onRemoveField($removedField);
+      }
+    }
+
+    _getUID() {
+      return `${new Date().getTime()}-${Math.floor(Math.random() * 1000000)}`;
+    }
+  }
+
+  exports.DecidimAdmin = exports.DecidimAdmin || {};
+  exports.DecidimAdmin.DynamicFieldsComponent = DynamicFieldsComponent;
+  exports.DecidimAdmin.createDynamicFields = (options) => {
+    return new DynamicFieldsComponent(options);
+  };
+})(window);

data/decidim-surveys/app/assets/javascripts/decidim/surveys/admin/surveys.js.es6

@@ -0,0 +1,85 @@
+// = require jquery-tmpl
+// = require ./auto_label_by_position.component
+// = require ./dynamic_fields.component
+
+((exports) => {
+  const { AutoLabelByPositionComponent, createDynamicFields, createSortList } = exports.DecidimAdmin;
+
+  const wrapperSelector = '.survey-questions';
+  const fieldSelector = '.survey-question';
+  const questionTypeSelector = '[name="survey[questions][][question_type]"]';
+  const answerOptionsWrapperSelector = '.survey-question-answer-options';
+
+  const autoLabelByPosition = new AutoLabelByPositionComponent({
+    listSelector: '.survey-question:not(.hidden)',
+    labelSelector: '.card-title span:first',
+    onPositionComputed: (el, idx) => {
+      $(el).find('input[name="survey[questions][][position]"]').val(idx);
+    }
+  });
+
+  const createSortableList = () => {
+    createSortList('.survey-questions-list:not(.published)', {
+      handle: '.question-divider',
+      placeholder: '<div style="border-style: dashed; border-color: #000"></div>',
+      forcePlaceholderSize: true,
+      onSortUpdate: () => { autoLabelByPosition.run() }
+    });
+  };
+
+  const createDynamicFieldsForAnswerOptions = (fieldId) => {
+    createDynamicFields({
+      templateId: `survey-question-answer-option-tmpl`,
+      tabsPrefix: `survey-question-answer-option`,
+      wrapperSelector: `#${fieldId} ${answerOptionsWrapperSelector}`,
+      containerSelector: `.survey-question-answer-options-list`,
+      fieldSelector: `.survey-question-answer-option`,
+      addFieldButtonSelector: `.add-answer-option`,
+      removeFieldButtonSelector: `.remove-answer-option`
+    });
+  };
+
+  const setAnswerOptionsWrapperVisibility = ($target) => {
+    const $answerOptionsWrapper = $target.parents(fieldSelector).find(answerOptionsWrapperSelector);
+    const value = $target.val();
+
+    $answerOptionsWrapper.hide();
+
+    if (value === 'single_option' || value === 'multiple_option') {
+      $answerOptionsWrapper.show();
+    }
+  };
+
+  createDynamicFields({
+    templateId: 'survey-question-tmpl',
+    tabsPrefix: 'survey-question',
+    wrapperSelector: wrapperSelector,
+    containerSelector: '.survey-questions-list',
+    fieldSelector: fieldSelector,
+    addFieldButtonSelector: '.add-question',
+    removeFieldButtonSelector: '.remove-question',
+    onAddField: ($field) => {
+      const fieldId = $field.attr('id');
+
+      createSortableList();
+      autoLabelByPosition.run();
+      createDynamicFieldsForAnswerOptions(fieldId);
+      setAnswerOptionsWrapperVisibility($field.find(questionTypeSelector));
+    },
+    onRemoveField: () => {
+      autoLabelByPosition.run();
+    }
+  });
+
+  createSortableList();
+
+  $(fieldSelector).each((idx, el) => {
+    createDynamicFieldsForAnswerOptions($(el).attr('id'));
+    setAnswerOptionsWrapperVisibility($(el).find(questionTypeSelector));
+  });
+
+  $(wrapperSelector).on('change', questionTypeSelector, (ev) => {
+    const $target = $(ev.target);
+    setAnswerOptionsWrapperVisibility($target);
+  });
+})(window);

data/decidim-surveys/app/assets/stylesheets/decidim/surveys/surveys.scss

@@ -0,0 +1,9 @@
+form.answer-survey {
+  .radio-button-collection, .check-box-collection {
+    margin: 0 0 1rem;
+  }
+
+  .tos-agreement-help-text {
+    margin: 0.2rem 0 0;
+  }
+}

data/decidim-surveys/app/commands/decidim/surveys/admin/update_survey.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    module Admin
+      # This command is executed when the user changes a Survey from the admin
+      # panel.
+      class UpdateSurvey < Rectify::Command
+        # Initializes a UpdateSurvey Command.
+        #
+        # form - The form from which to get the data.
+        # survey - The current instance of the survey to be updated.
+        def initialize(form, survey)
+          @form = form
+          @survey = survey
+        end
+
+        # Updates the survey if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if @form.invalid?
+
+          Survey.transaction do
+            update_survey_questions if @survey.questions_editable?
+            update_survey
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        def update_survey_questions
+          @form.questions.each do |form_question|
+            question_attributes = {
+              body: form_question.body,
+              position: form_question.position,
+              mandatory: form_question.mandatory,
+              question_type: form_question.question_type,
+              answer_options: form_question.answer_options.map { |answer| { "body" => answer.body } }
+            }
+
+            if form_question.id.present?
+              question = @survey.questions.where(id: form_question.id).first
+              if form_question.deleted?
+                question.destroy!
+              else
+                question.update_attributes!(question_attributes)
+              end
+            else
+              @survey.questions.create!(question_attributes)
+            end
+          end
+        end
+
+        def update_survey
+          @survey.update_attributes!(title: @form.title,
+                                     description: @form.description,
+                                     tos: @form.tos)
+        end
+      end
+    end
+  end
+end

data/decidim-surveys/app/commands/decidim/surveys/answer_survey.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    # This command is executed when the user answers a Survey.
+    class AnswerSurvey < Rectify::Command
+      # Initializes a AnswerSurvey Command.
+      #
+      # form - The form from which to get the data.
+      # survey - The current instance of the survey to be answered.
+      def initialize(form, current_user, survey)
+        @form = form
+        @current_user = current_user
+        @survey = survey
+      end
+
+      # Answers a survey if it is valid
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if @form.invalid?
+
+        answer_survey
+        broadcast(:ok)
+      end
+
+      private
+
+      def answer_survey
+        SurveyAnswer.transaction do
+          @form.answers.each do |form_answer|
+            SurveyAnswer.create!(
+              user: @current_user,
+              survey: @survey,
+              question: form_answer.question,
+              body: form_answer.body
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/decidim-surveys/app/commands/decidim/surveys/create_survey.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    # Command that gets called whenever a feature's survey has to be created. It
+    # usually happens as a callback when the feature itself is created.
+    class CreateSurvey < Rectify::Command
+      def initialize(feature)
+        @feature = feature
+      end
+
+      def call
+        @survey = Survey.new(feature: @feature)
+
+        @survey.save ? broadcast(:ok) : broadcast(:invalid)
+      end
+    end
+  end
+end