decidim-forms 0.27.2 → 0.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e399e7c1e3e8618dfd75491617038ecf10b4d06e3f53b61b343aa7888403996
-  data.tar.gz: 785293c3df843039cf86005b3c64ff1d5777adf54c2b4e63bf883fa5d4d36ce0
+  metadata.gz: fe0eacc810fb380764e96c7474000294dad78a56ff8fbba63da37ddad92da57a
+  data.tar.gz: d9d90aaf1e88deff5c8ad71fa685448a2a6e3ad0e73663c88a1e3567087b66b0
 SHA512:
-  metadata.gz: 731c4df584b70bd2b4f83211e69b4f562ef1aaa2a706afe4856f87fa5bdb3ea2bc061f51b037341d4722c87051151ee55b27a94666514da901856563e4e55d72
-  data.tar.gz: 21e2b2207bfa79f08bf40b0372bf67d987c09919faf0f7bb17d585835f0b65f6402500fc48e469cfa223b2fab0270955c1de3902f54b1360cb8d5fc875a28423
+  metadata.gz: 74a496c438077dfc2404b9c832db751d43c166e8eb2ce6089b0c98c173d0fa615e34346a631bcbc2d1f1a48ac58a96de460bde7e23030c700751bb2ab5a458bb
+  data.tar.gz: 419adf2d45fb56a6e359015fda1bfc47d291c17295f5cab43c4780f3aad0e2d0c045c645a04972e20d9849d9a44f4bf36e94a45a956a4ac04a61c11430c34984

data/app/forms/decidim/forms/answer_form.rb

@@ -18,7 +18,7 @@ module Decidim
       validates :selected_choices, presence: true, if: :mandatory_choices?
 
       validate :max_choices, if: -> { question.max_choices }
-      validate :all_choices, if: -> { question.question_type == "sorting" }
+      validate :all_choices, if: -> { question.sorting? && question.mandatory? }
       validate :min_choices, if: -> { question.matrix? && question.mandatory? }
       validate :documents_present, if: -> { question.question_type == "files" && question.mandatory? }
       validate :max_characters, if: -> { question.max_characters.positive? }
@@ -59,7 +59,22 @@ module Decidim
       end
 
       def display_conditions_fulfilled?
-        question.display_conditions.all? do |condition|
+        return optional_conditions_fulfilled? unless question.display_conditions.where(mandatory: true).any?
+
+        mandatory_conditions_fulfilled?
+      end
+
+      def mandatory_conditions_fulfilled?
+        question.display_conditions.where(mandatory: true).all? do |condition|
+          answer = context.responses&.find { |r| r.question_id&.to_i == condition.condition_question.id }
+          condition.fulfilled?(answer)
+        end
+      end
+
+      def optional_conditions_fulfilled?
+        return true unless question.display_conditions.where(mandatory: false).any?
+
+        question.display_conditions.where(mandatory: false).any? do |condition|
           answer = context.responses&.find { |r| r.question_id&.to_i == condition.condition_question.id }
           condition.fulfilled?(answer)
         end

data/app/forms/decidim/forms/questionnaire_form.rb

@@ -4,6 +4,8 @@ module Decidim
   module Forms
     # This class holds a Form to answer a questionnaire from Decidim's public page.
     class QuestionnaireForm < Decidim::Form
+      include ActiveModel::Validations::Callbacks
+
       # as questionnaire uses "answers" for the database relationships is
       # important not to use the same word here to avoid querying all the entries, resulting in a high performance penalty
       attribute :responses, Array[AnswerForm]
@@ -12,6 +14,8 @@ module Decidim
 
       attribute :tos_agreement, Boolean
 
+      before_validation :before_validation
+
       validates :tos_agreement, allow_nil: false, acceptance: true
       validate :session_token_in_context
 

data/app/models/decidim/forms/question.rb

@@ -70,6 +70,10 @@ module Decidim
         mandatory? && !multiple_choice? && !has_attachments?
       end
 
+      def sorting?
+        question_type == "sorting"
+      end
+
       def mandatory_choices?
         mandatory? && multiple_choice? && !has_attachments?
       end

data/app/views/decidim/forms/admin/questionnaires/_form.html.erb

@@ -31,7 +31,7 @@
       <%= form.translated :editor, :description, toolbar: :full, lines: 30, label: t("models.components.description", scope: "decidim.forms.admin") %>
     </div>
     <div class="row column">
-      <%= form.translated :editor, :tos, toolbar: :full, lines: 10, label: t("models.components.tos", scope: "decidim.forms.admin") %>
+      <%= form.translated :editor, :tos, toolbar: :content, lines: 10, label: t("models.components.tos", scope: "decidim.forms.admin") %>
     </div>
   </div>
 </div>

data/app/views/decidim/forms/questionnaires/_answer.html.erb

@@ -7,7 +7,7 @@
   <%= label_tag field_id, translated_attribute(answer.question.body), class: "questionnaire-title_and_description" %>
   <% if translated_attribute(answer.question.description).present? %>
     <div class="help-title_and_description ">
-      <%= decidim_sanitize_editor translated_attribute(answer.question.description) %>
+      <%= decidim_sanitize_editor_admin translated_attribute(answer.question.description) %>
     </div>
   <% end %>
   <%= render partial: "decidim/forms/questionnaires/answers/#{answer.question.question_type}", locals: { answer: answer, answer_form: answer_form, answer_idx: answer_idx, field_id: field_id, disabled: disabled } %>
@@ -22,7 +22,7 @@
 
   <% if translated_attribute(answer.question.description).present? %>
     <div class="help-text">
-      <%= decidim_sanitize_editor translated_attribute(answer.question.description) %>
+      <%= decidim_sanitize_editor_admin translated_attribute(answer.question.description) %>
     </div>
   <% end %>
 

data/app/views/decidim/forms/questionnaires/show.html.erb

@@ -11,7 +11,7 @@
   <h2 class="section-heading"><%= translated_attribute questionnaire.title %></h2>
   <div class="row">
     <div class="columns large-<%= columns %> medium-centered lead">
-      <%= decidim_sanitize_editor translated_attribute questionnaire.description %>
+      <%= decidim_sanitize_editor_admin translated_attribute questionnaire.description %>
     </div>
   </div>
 </div>

data/config/locales/eu.yml

@@ -98,18 +98,18 @@ eu:
             add_matrix_row: Gehitu errenkada
             any: Edozein
             collapse: Bildu
-            description: deskribapena
-            down: Down
+            description: Deskribapena
+            down: Behera
             expand: Zabaldu
             question: Galdera
             remove: Kendu
-            statement: adierazpena
-            up: up
+            statement: Adierazpena
+            up: Gora
           separator:
-            down: Jaitsi
+            down: Behera
             remove: Kendu
             separator: Bereizlea
-            up: Igo
+            up: Gora
           title_and_description:
             collapse: Tolestu
             description: Deskribapena
@@ -124,7 +124,7 @@ eu:
             success: Galdetegia zuzen gorde da.
       admin_log:
         questionnaire:
-          update: "%{user_name} -k%{resource_name} galdetegia eguneratu du"
+          update: "%{user_name} erabiltzaileak %{resource_name} galdetegia eguneratu du"
       errors:
         answer:
           body: Testua ezin da hutsik egon
@@ -141,21 +141,21 @@ eu:
         multiple_option: Hainbat aukera
         short_answer: Erantzun laburra
         single_option: Aukera bakarra
-        sorting: Lazcoz
+        sorting: Sailkaketa
         title_and_description: Izenburua eta deskribapena
       questionnaire_answer_presenter:
         download_attachment: Deskargatu eranskina
       questionnaires:
         answer:
-          invalid: Akatsik egon da galdeketa erantzutean.
+          invalid: Akatsen bat gertatu da galdeketa erantzutean.
           max_choices_alert: Aukera gehiegi daude hautatuta
-          success: Galdesortaz erantzun ona.
+          success: Formularioak ondo erantzun du.
         question:
           max_choices: 'Gehienezko aukerak: %{n}'
         show:
           answer_questionnaire:
             anonymous_user_message: <a href="%{sign_in_link}">Hasi saioa zure kontuarekin</a> edo <a href="%{sign_up_link}">saioa hasi</a> galdetegiari erantzuteko.
-            title: Erantzun galdetegia
+            title: Erantzun formularioari
           current_step: '%{step} urratsa'
           of_total_steps: '%{total_steps} etik'
           questionnaire_answered:

data/config/locales/fa-IR.yml

@@ -0,0 +1 @@
+fa:

data/config/locales/kaa.yml

@@ -0,0 +1 @@
+kaa:

data/config/locales/zh-TW.yml

@@ -1 +1,192 @@
+---
 zh-TW:
+  activemodel:
+    attributes:
+      answer:
+        body: 回答
+        choices: 選項
+        selected_choices: 已選擇的選項
+      question:
+        max_choices: 選擇的最大數量
+        question_type: 類別
+      questionnaire_question:
+        mandatory: 必填的
+        max_characters: 字元限制（如果不需要限制，請設為0）
+    errors:
+      models:
+        answer:
+          attributes:
+            add_documents:
+              needs_to_be_reattached: 需要重新附加
+            body:
+              too_long: 太長
+            choices:
+              missing: 尚未完成
+              too_many: 太多了
+        questionnaire:
+          request_invalid: 處理請求時發生錯誤，請再試一次
+  decidim:
+    forms:
+      admin:
+        models:
+          components:
+            description: 說明
+            tos: 服務條款
+        questionnaires:
+          actions:
+            back: 返回問題
+            show: 顯示回應
+          answer_option:
+            answer_option: 答案選項：
+            free_text: 免費文字
+            remove: 移除
+            statement: 聲明
+          answers:
+            actions:
+              back: 返回回覆
+              export: 匯出
+              show: 顯示答案
+            empty: 目前尚未回答
+            export:
+              answer:
+                title: '回應 #%{number}'
+            export_response:
+              title: 調查問卷使用者回答_%{token}
+            index:
+              title: "%{total} 個回應總數"
+            show:
+              title: '回答#%{number}'
+          display_condition:
+            answer_option: 答案選項
+            condition_question: 問題
+            condition_type: 條件
+            condition_types:
+              answered: 已回答
+              equal: 等於
+              match: 包含文字
+              not_answered: 未回答
+              not_equal: 不等於
+            condition_value: 包含文字
+            display_condition: 顯示條件
+            mandatory: 這個條件必須始終滿足，無論其他條件的狀態如何。
+            remove: 移除
+            save_warning: 在配置顯示條件之前，請記得保存表單。
+            select_answer_option: 選擇答案選項
+            select_condition_question: 選取一個問題
+            select_condition_type: 選擇一個條件類型
+          edit:
+            save: 儲存
+            title: 編輯問卷內容
+          form:
+            add_question: 新增問題
+            add_separator: 新增分隔線
+            add_title_and_description: 新增標題與描述
+            already_answered_warning: 已有使用者回答此表單，因此您無法修改問題。
+            collapse: 收起所有問題
+            expand: 展開所有問題
+            preview: 預覽
+            title: 編輯問卷表單%{questionnaire_for}
+            unpublished_warning: 此表單尚未發佈。您可以修改其問題，但這樣做將刪除目前的回答。
+          matrix_row:
+            matrix_row: 列
+            remove: 移除
+            statement: 聲明
+          question:
+            add_answer_option: 新增答案選項
+            add_display_condition: 新增顯示條件
+            add_display_condition_info: 請先儲存表單再設定顯示條件
+            add_matrix_row: 新增列
+            any: 任何
+            collapse: 收回
+            description: 說明
+            down: 向下
+            expand: 展開
+            question: 問題
+            remove: 移除
+            statement: 聲明
+            up: 往上
+          separator:
+            down: 向下
+            remove: 移除
+            separator: 分隔線
+            up: 往上
+          title_and_description:
+            collapse: 收回
+            description: 說明
+            down: 向下
+            expand: 展開
+            remove: 移除
+            title: 標題
+            title_and_description: 標題和描述
+            up: 往上
+          update:
+            invalid: 儲存表單時發生問題。
+            success: 表單已成功儲存。
+      admin_log:
+        questionnaire:
+          update: "%{user_name} 更新了 %{resource_name} 問卷模板"
+      errors:
+        answer:
+          body: 內容不能為空
+      images:
+        dimensions: "%{width} x %{height} 像素"
+        processors:
+          resize_and_pad: 圖片將被調整大小並填充至 %{dimensions}。
+          resize_to_fit: 此圖片將被調整大小以符合 %{dimensions}。
+      question_types:
+        files: 檔案
+        long_answer: 長回答
+        matrix_multiple: 矩陣（多重選項）
+        matrix_single: 矩陣（單一選項）
+        multiple_option: 多選
+        short_answer: 簡答
+        single_option: 單選
+        sorting: 排序中
+        title_and_description: 標題和描述
+      questionnaire_answer_presenter:
+        download_attachment: 下載附件
+      questionnaires:
+        answer:
+          invalid: 回答表單時出現問題
+          max_choices_alert: 選擇的項目太多了
+          success: 表單已成功回答
+        question:
+          max_choices: '最多選擇數量： %{n}'
+        show:
+          answer_questionnaire:
+            anonymous_user_message: <a href="%{sign_in_link}">使用現有帳號登入</a> 或 <a href="%{sign_up_link}">註冊新帳戶</a> 以回答此表單。
+            title: 回答表單 
+          current_step: 步驟%{step}
+          of_total_steps: 的%{total_steps}
+          questionnaire_answered:
+            body: 您已經回答過此表格。
+            title: 已經回答
+          questionnaire_closed:
+            body: 該表格已關閉，無法回答。
+            title: 表單已關閉
+          questionnaire_for_private_users:
+            body: 此表單僅適用於私人使用者
+            title: 表單已關閉
+          questionnaire_js_disabled:
+            body: 此表單的某些功能將被禁用。為了改善您的體驗，請在您的瀏覽器中啟用JavaScript。
+            title: JavaScript已停用
+          questionnaire_not_published:
+            body: 此表單尚未發佈。
+          tos_agreement: 透過參與，您同意其服務條款
+      step_navigation:
+        show:
+          are_you_sure: 此操作無法撤消，您將無法編輯您的答案。您確定嗎？
+          back: 返回
+          continue: 繼續
+          submit: 提交
+      user_answers_serializer:
+        body: 回答
+        completion: 完成
+        created_at: 回答時間
+        id: 回答 ID
+        ip_hash: IP Hash
+        question: 問題
+        registered: 已註冊
+        session_token: 使用者識別碼
+        unregistered: 未註冊
+        user_status: 用戶狀態

data/lib/decidim/forms/test/shared_examples/has_questionnaire.rb

@@ -538,12 +538,13 @@ shared_examples_for "has questionnaire" do
       end
     end
 
-    context "when question type is sorting" do
+    context "when question type is sorting and mandatory" do
       let!(:question) do
         create(
           :questionnaire_question,
           questionnaire: questionnaire,
           question_type: "sorting",
+          mandatory: true,
           options: [
             { "body" => { "en" => "chocolate" } },
             { "body" => { "en" => "like" } },

data/lib/decidim/forms/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.27.2"
+      "0.27.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.27.2
+  version: 0.27.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.27.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.27.3
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.27.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.27.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.27.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.27.3
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -209,6 +209,7 @@ files:
 - config/locales/et-EE.yml
 - config/locales/et.yml
 - config/locales/eu.yml
+- config/locales/fa-IR.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
@@ -227,6 +228,7 @@ files:
 - config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/ka-GE.yml
+- config/locales/kaa.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
@@ -317,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim forms