decidim-forms 0.26.2 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c05c5c0a4333cc4dbefaa5e8d37fa861059a6881d5d47d075fd618e7f7169826
-  data.tar.gz: f46c7ea6704161d57385dd589360b78fe3763057e532640004cbb539aee5c0e4
+  metadata.gz: ac2a4967f65889f20e67fcfea32386f57484e8eb0f61172f335b690e4298ab4b
+  data.tar.gz: e971f03e20bd78cf6e246869133eaea933edb61bee15ef48d12ca0aae082e1c4
 SHA512:
-  metadata.gz: fb39a317c541eca9a1d3ed286b8b3873a79bc7f748a37ae4a20a693e19900b473b6e83f46ec82d07c3d5d5b603143d5d46327addfd19d99f014f163f8a741775
-  data.tar.gz: 593ac4089260f909886fa7b05de438d2da561a4d5801742044c79a7c2ee5343c1c59df55282c8fd18af036ce272fc04329c3ef9bb04699de5cf5182dd361ed36
+  metadata.gz: 3b9fb3129e380b1aeeb0b801296518256b0be19b46799b69031f588dfeac69f2c7e3bd69aa91306a34826f005f85158bc6a0f433589b209399b88ccab60d240c
+  data.tar.gz: 68d5bab8bd439145111c49c9a4f8d39a4d99b97acf34bec6e4b072f83691e92ab29e23645fed2cf5c4b08e5caf7fc271f9522b2686076d1f74d2479ca56b2565

data/app/commands/decidim/forms/answer_questionnaire.rb

@@ -43,7 +43,7 @@ module Decidim
       # of this problem.
       def reset_form_attachments
         @form.responses.each do |answer|
-          answer.errors.add(:add_documents, :needs_to_be_reattached) if answer.has_attachments?
+          answer.errors.add(:add_documents, :needs_to_be_reattached) if answer.has_attachments? || answer.has_error_in_attachments?
         end
       end
 
@@ -51,7 +51,7 @@ module Decidim
         @main_form = @form
         @errors = nil
 
-        Answer.transaction do
+        Answer.transaction(requires_new: true) do
           form.responses_by_step.flatten.select(&:display_conditions_fulfilled?).each do |form_answer|
             answer = Answer.new(
               user: @current_user,

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

@@ -69,6 +69,10 @@ module Decidim
         question.has_attachments? && errors[:add_documents].empty? && add_documents.present?
       end
 
+      def has_error_in_attachments?
+        errors[:add_documents].present?
+      end
+
       private
 
       def mandatory_body?

data/app/packs/src/decidim/forms/admin/forms.js

@@ -11,6 +11,7 @@ import createSortList from "src/decidim/admin/sort_list.component"
 import createDynamicFields from "src/decidim/admin/dynamic_fields.component"
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 import createQuillEditor from "src/decidim/editor"
+import initLanguageChangeSelect from "src/decidim/admin/choose_language"
 
 export default function createEditableForm() {
   const wrapperSelector = ".questionnaire-questions";
@@ -392,6 +393,8 @@ export default function createEditableForm() {
 
       autoLabelByPosition.run();
       autoButtonsByPosition.run();
+
+      initLanguageChangeSelect($field.find("select.language-change").toArray());
     },
     onRemoveField: ($field) => {
       autoLabelByPosition.run();

data/app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb

@@ -46,11 +46,14 @@ module Decidim
           # rubocop:disable Style/StringConcatenation
           # Interpolating strings that are `html_safe` is problematic with Rails.
           content_tag :li do
-            link_to(translated_attribute(attachment.title), attachment.url) +
-              " " +
-              content_tag(:small) do
+            link_to(attachment.url, target: "_blank", rel: "noopener noreferrer") do
+              content_tag(:span) do
+                translated_attribute(attachment.title).presence ||
+                  I18n.t("download_attachment", scope: "decidim.forms.questionnaire_answer_presenter")
+              end + " " + content_tag(:small) do
                 "#{attachment.file_type} #{number_to_human_size(attachment.file_size)}"
               end
+            end
           end
           # rubocop:enable Style/StringConcatenation
         end

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

@@ -5,7 +5,7 @@
 
 <% columns = allow_answers? && visitor_can_answer? && @form.responses.map(&:question).any?(&:matrix?) ? 9 : 6 %>
 
-<%= render partial: "decidim/shared/component_announcement" %>
+<%= render partial: "decidim/shared/component_announcement" if current_component.manifest_name == "surveys" %>
 
 <div class="row columns">
   <h2 class="section-heading"><%= translated_attribute questionnaire.title %></h2>

data/config/locales/ca.yml

@@ -142,6 +142,8 @@ ca:
         single_option: Opció única
         sorting: Ordenació
         title_and_description: Títol i descripció
+      questionnaire_answer_presenter:
+        download_attachment: Descarregar l'arxiu adjunt
       questionnaires:
         answer:
           invalid: S'han produït un error en respondre el formulari.

data/config/locales/cs.yml

@@ -142,6 +142,8 @@ cs:
         single_option: Jedna možnost
         sorting: Třídění
         title_and_description: Název a popis
+      questionnaire_answer_presenter:
+        download_attachment: Stáhnout přílohu
       questionnaires:
         answer:
           invalid: Při odpovědi na dotazník došlo k chybám.

data/config/locales/en.yml

@@ -143,6 +143,8 @@ en:
         single_option: Single option
         sorting: Sorting
         title_and_description: Title and description
+      questionnaire_answer_presenter:
+        download_attachment: Download attachment
       questionnaires:
         answer:
           invalid: There was a problem answering the form.

data/config/locales/es-MX.yml

@@ -142,6 +142,8 @@ es-MX:
         single_option: Opción única
         sorting: Ordenación
         title_and_description: Titulo y descripción
+      questionnaire_answer_presenter:
+        download_attachment: Descargar el archivo adjunto
       questionnaires:
         answer:
           invalid: Ha habido errores al responder al cuestionario.

data/config/locales/es-PY.yml

@@ -142,6 +142,8 @@ es-PY:
         single_option: Opción única
         sorting: Ordenación
         title_and_description: Titulo y descripción
+      questionnaire_answer_presenter:
+        download_attachment: Descargar el archivo adjunto
       questionnaires:
         answer:
           invalid: Ha habido errores al responder al cuestionario.

data/config/locales/es.yml

@@ -142,6 +142,8 @@ es:
         single_option: Opción única
         sorting: Ordenación
         title_and_description: Titulo y descripción
+      questionnaire_answer_presenter:
+        download_attachment: Descargar el archivo adjunto
       questionnaires:
         answer:
           invalid: Se ha producido un error al responder el formulario.

data/config/locales/fi-plain.yml

@@ -142,6 +142,8 @@ fi-pl:
         single_option: Yksi vaihtoehto
         sorting: Järjestäminen
         title_and_description: Otsikko ja kuvaus
+      questionnaire_answer_presenter:
+        download_attachment: Lataa liite
       questionnaires:
         answer:
           invalid: Kyselylomakkeeseen vastatessa tapahtui virheitä.

data/config/locales/fi.yml

@@ -142,6 +142,8 @@ fi:
         single_option: Yksi vaihtoehto
         sorting: Järjestäminen
         title_and_description: Otsikko ja kuvaus
+      questionnaire_answer_presenter:
+        download_attachment: Lataa liite
       questionnaires:
         answer:
           invalid: Kyselylomakkeeseen vastaaminen epäonnistui.

data/config/locales/fr-CA.yml

@@ -142,6 +142,8 @@ fr-CA:
         single_option: Option unique
         sorting: Tri
         title_and_description: Titre et description
+      questionnaire_answer_presenter:
+        download_attachment: Télécharger la pièce jointe
       questionnaires:
         answer:
           invalid: Il y a eu des erreurs en répondant au questionnaire.

data/config/locales/fr.yml

@@ -142,6 +142,8 @@ fr:
         single_option: Option unique
         sorting: Tri
         title_and_description: Titre et description
+      questionnaire_answer_presenter:
+        download_attachment: Télécharger la pièce jointe
       questionnaires:
         answer:
           invalid: Il y a eu des erreurs en répondant au questionnaire.

data/config/locales/gn-PY.yml

@@ -0,0 +1 @@
+gn:

data/config/locales/ja.yml

@@ -142,6 +142,8 @@ ja:
         single_option: 単一オプション
         sorting: 並び替え
         title_and_description: タイトルと説明
+      questionnaire_answer_presenter:
+        download_attachment: 添付ファイルをダウンロード
       questionnaires:
         answer:
           invalid: フォームの回答に問題がありました。

data/config/locales/lo-LA.yml

@@ -0,0 +1 @@
+lo:

data/config/locales/lt.yml

@@ -1 +1,189 @@
 lt:
+  activemodel:
+    attributes:
+      answer:
+        body: Atsakymas
+        choices: Pasirinkimai
+        selected_choices: Pasirinkti pasirinkimai
+      question:
+        max_choices: Maksimalus pasirinkimų skaičius
+        question_type: Tipas
+      questionnaire_question:
+        mandatory: Privaloma
+        max_characters: Simbolių limitas (palikti 0 jei limito nėra)
+    errors:
+      models:
+        answer:
+          attributes:
+            add_documents:
+              needs_to_be_reattached: Reikia pridėti iš naujo
+            body:
+              too_long: per ilgas
+            choices:
+              missing: nepilnas - trūksta elementų
+              too_many: per daug
+        questionnaire:
+          request_invalid: Tvarkant prašymą įvyko klaida. Bandykite dar kartą
+  decidim:
+    forms:
+      admin:
+        models:
+          components:
+            description: Aprašymas
+            tos: Paslaugų teikimo sąlygos
+        questionnaires:
+          actions:
+            back: Grįžti į klausimus
+            show: Rodyti atsakymus
+          answer_option:
+            answer_option: Atsakymo variantas
+            free_text: Laisva forma
+            remove: Pašalinti
+            statement: Pareiškimas
+          answers:
+            actions:
+              back: Grįžti į atsakymus
+              export: Eksportuoti
+              show: Rodyti atsakymus
+            empty: Atsakymų dar nėra
+            export:
+              answer:
+                title: 'Atsakymas #%{number}'
+            export_response:
+              title: apklausa_naudotoju_atsakymai_%{token}
+            index:
+              title: "%{total} iš viso atsakymų"
+            show:
+              title: 'Atsakymas #%{number}'
+          display_condition:
+            answer_option: Atsakymo variantas
+            condition_question: Klausimas
+            condition_type: Sąlyga
+            condition_types:
+              answered: Atsakyta
+              equal: Lygu
+              match: Įskaitant tekstą
+              not_answered: Neatsakyta
+              not_equal: Nelygu
+            condition_value: Įskaitytas tekstas
+            display_condition: Rodymo sąlyga
+            mandatory: Ši sąlyga turi būti patenkinta visada, neatsižvelgiant į kitų sąlygų statusą
+            remove: Pašalinti
+            save_warning: Prieš konfigūruodami rodymo sąlygas, nepamirškite išsaugoti formos
+            select_answer_option: Pasirinkite atsakymo variantą
+            select_condition_question: Pasirinkite klausimą
+            select_condition_type: Pasirinkti sąlygos tipą
+          edit:
+            save: Išsaugoti
+            title: Redaguoti klausimyną
+          form:
+            add_question: Pridėti klausimą
+            add_separator: Pridėti skyriklį
+            add_title_and_description: Pridėti pavadinimą ir aprašymą
+            already_answered_warning: Kai kurie naudotojai jau atsakė į formos klausimus, todėl jos klausimų keisti nebegalite.
+            collapse: Suskleisti visus klausimus
+            expand: Išskleisti visus klausimus
+            preview: Peržiūra
+            title: Taisyti %{questionnaire_for} formą
+            unpublished_warning: Forma nepaskelbta. Galite keisti klausimus, tačiau tai darydami pašalinsite esamus atsakymus.
+          matrix_row:
+            matrix_row: Eilutė
+            remove: Pašalinti
+            statement: Pareiškimas
+          question:
+            add_answer_option: Pridėti atsakymo variantą
+            add_display_condition: Pridėti rodymo sąlygą
+            add_display_condition_info: Išsaugokite formą, kad galėtumėt konfiguruoti rodymo sąlygas
+            add_matrix_row: Pridėti eilutę
+            any: Bet koks
+            collapse: Suskleisti
+            description: Aprašymas
+            down: Žemyn
+            expand: Išplėsti
+            question: Klausimas
+            remove: Pašalinti
+            statement: Pareiškimas
+            up: Į viršų
+          separator:
+            down: Žemyn
+            remove: Pašalinti
+            separator: Skirtukas
+            up: Į viršų
+          title_and_description:
+            collapse: Suskleisti
+            description: Aprašymas
+            down: Žemyn
+            expand: Išplėsti
+            remove: Pašalinti
+            title: Pavadinimas
+            title_and_description: Pavadinimas ir aprašymas
+            up: Aukštyn
+          update:
+            invalid: Išsaugant šią formą iškilo problema.
+            success: Forma sėkmingai išsaugota.
+      errors:
+        answer:
+          body: Pagrindinė dalis negali būti tuščia
+      files:
+        extension_allowlist: 'Priimtini formatai:'
+      images:
+        dimensions: "%{width} x %{height} px"
+        dimensions_info: 'Šis vaizdas bus:'
+        processors:
+          resize_and_pad: Pakeisto dydžio ir užpildytas iki
+          resize_to_fit: Pakeistas dydis, kad tilptų
+      question_types:
+        files: Dokumentai
+        long_answer: Ilgas atsakymas
+        matrix_multiple: Matrica (su keliais variantais)
+        matrix_single: Matrica (vienas variantas)
+        multiple_option: Keli variantai
+        short_answer: Trumpas atsakymas
+        single_option: Vienas variantas
+        sorting: Rūšiavimas
+        title_and_description: Pavadinimas ir aprašymas
+      questionnaires:
+        answer:
+          invalid: Atsakant į šią formą iškilo problema.
+          max_choices_alert: Per daug pasirinktų variantų
+          success: Į formos klausimus atsakyta.
+        question:
+          max_choices: 'Didžiausias pasirinkčių skaičius: %{n}'
+        show:
+          answer_questionnaire:
+            anonymous_user_message: <a href="%{sign_in_link}">Prisijunkite su savo paskyra</a> arba <a href="%{sign_up_link}">užsiregistruokite</a> norėdami užpildyti formą.
+            title: Atsakyti į formos klausimus
+          current_step: Žingsnis %{step}
+          of_total_steps: iš%{total_steps}
+          questionnaire_answered:
+            body: Jau atsakėte iš šios formos klausimus.
+            title: Jau atsakyta
+          questionnaire_closed:
+            body: Forma uždaryta ir į ją atsakyti negalima.
+            title: Forma uždaryta
+          questionnaire_for_private_users:
+            body: Forma pateikiama tik privatiems naudotojams
+            title: Forma uždaryta
+          questionnaire_js_disabled:
+            body: Kai kurie šios formos funkcionalumai bus neaktyvūs. Kad pagerintumėte naudojimo patirtį, naršyklėje įjunkite „JavaScript“.
+            title: '„JavaScript“ išjungta'
+          questionnaire_not_published:
+            body: Ši forma dar nepaskelbta.
+          tos_agreement: Dalyvaudami sutinkate su paslaugos teikimo sąlygomis
+      step_navigation:
+        show:
+          are_you_sure: Šio veiksmo atšaukti negalima ir savo atsakymų keisti negalėsite. Ar esate įsitikinę?
+          back: Atgal
+          continue: Tęsti
+          submit: Pateikti
+      user_answers_serializer:
+        body: Atsakymas
+        completion: Užbaigimas
+        created_at: Atsakyta
+        id: Atsakymo ID
+        ip_hash: IP adreso "hash" kodas
+        question: Klausimas
+        registered: Užregistruota
+        session_token: Naudotojo identifikatorius
+        unregistered: Neregistruoti
+        user_status: Naudotojo būsena

data/config/locales/oc-FR.yml

@@ -0,0 +1 @@
+oc:

data/config/locales/pl.yml

@@ -7,10 +7,10 @@ pl:
         selected_choices: Wybrane opcje
       question:
         max_choices: Maksymalna liczba opcji do wyboru
-        question_type: Typ
+        question_type: Typ odpowiedzi
       questionnaire_question:
-        mandatory: Obowiązkowy
-        max_characters: Limit znaków (zostaw 0 jeśli nie chcesz ustawiać limitu)
+        mandatory: Odpowiedź wymagana
+        max_characters: Limit znaków (zostaw 0, jeśli nie chcesz ustawiać limitu)
     errors:
       models:
         answer:
@@ -37,7 +37,7 @@ pl:
             show: Pokaż odpowiedzi
           answer_option:
             answer_option: Opcja odpowiedzi
-            free_text: Dowolny tekst
+            free_text: Możliwość wpisania dowolnego tekstu
             remove: Usuń
             statement: Komunikat
           answers:
@@ -131,6 +131,7 @@ pl:
         short_answer: Krótka odpowiedź
         single_option: Jedna opcja
         sorting: Sortowanie
+        title_and_description: Tytuł i opis
       questionnaires:
         answer:
           invalid: Podczas wypełniania formularza wystąpiły błędy.

data/config/locales/ro-RO.yml

@@ -142,6 +142,8 @@ ro:
         single_option: Opțiune unică
         sorting: Sortare
         title_and_description: Titlu și descriere
+      questionnaire_answer_presenter:
+        download_attachment: Descărcare atașament
       questionnaires:
         answer:
           invalid: A apărut o problemă la completarea chestionarului.

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

@@ -10,8 +10,11 @@ shared_examples_for "manage questionnaire answers" do
   let!(:second) do
     create :questionnaire_question, questionnaire: questionnaire, position: 2, question_type: "single_option"
   end
+  let!(:third) do
+    create :questionnaire_question, questionnaire: questionnaire, position: 3, question_type: "files"
+  end
   let(:questions) do
-    [first, second]
+    [first, second, third]
   end
 
   context "when there are no answers" do
@@ -25,6 +28,7 @@ shared_examples_for "manage questionnaire answers" do
     let!(:answer1) { create :answer, questionnaire: questionnaire, question: first }
     let!(:answer2) { create :answer, body: "second answer", questionnaire: questionnaire, question: first }
     let!(:answer3) { create :answer, questionnaire: questionnaire, question: second }
+    let!(:file_answer) { create :answer, :with_attachments, questionnaire: questionnaire, question: third, body: nil, user: answer3.user, session_token: answer3.session_token }
 
     it "shows the answer admin link" do
       visit questionnaire_edit_path
@@ -45,7 +49,7 @@ shared_examples_for "manage questionnaire answers" do
       end
 
       it "shows the percentage" do
-        expect(page).to have_content("50%")
+        expect(page).to have_content("33%")
       end
 
       it "has a detail link" do
@@ -121,6 +125,25 @@ shared_examples_for "manage questionnaire answers" do
         expect(page).not_to have_link("Next ›")
         expect(page).to have_link("‹ Prev")
       end
+
+      it "third answer has download link for the attachments" do
+        click_link answer3.session_token, match: :first
+        expect(page).to have_content(translated(file_answer.attachments.first.title))
+        expect(page).to have_content(translated(file_answer.attachments.second.title))
+      end
+
+      context "when the file answer does not have a title for the attachment" do
+        let!(:file_answer) { create :answer, questionnaire: questionnaire, question: third, body: nil, user: answer3.user, session_token: answer3.session_token }
+
+        before do
+          create :attachment, :with_image, attached_to: file_answer, title: {}, description: {}
+        end
+
+        it "third answer has download link for the attachments" do
+          click_link answer3.session_token, match: :first
+          expect(page).to have_content("Download attachment")
+        end
+      end
     end
   end
 end

data/lib/decidim/forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-11-15 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.26.2
+        version: 0.26.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.4
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.4
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -216,6 +216,7 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -228,6 +229,7 @@ files:
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
+- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -235,6 +237,7 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml