decidim-forms 0.30.2 → 0.30.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a8b24f27a5fe27e2a6ebf4799b2f59683f3da639198b0e7a346c60dcd28561
-  data.tar.gz: 7c4caea9fc78e3515c2d2f95bb31db886e96a091f51f248d2939eaf03ecb2b6b
+  metadata.gz: 8a8424bb2f5cacd9868f1538d0cdc057fcdc584376ade7d96feedc3d6f786d82
+  data.tar.gz: ed7905ca76911d9f7f64356fa8c769c84d2f2d55e5f759dbe31c2ae53dafefcc
 SHA512:
-  metadata.gz: 5c3946e36ebcc2261912001d51c32363e77fda1a3949d3d0c12ec5c794fa75211b958ded800bc860ffdefab777ec96d89f964e1f1e7bc294af4afc1ca0953cbb
-  data.tar.gz: 70eef05c6c7bb3cb7000f1659db5c6249962754a0add45ccd7f6f1dcf88e583b8852c0e2b77ebd7131c2ef365ededf5fb8e8182a91acfdd41c5e69466a804f78
+  metadata.gz: f2a0e85dca3cc59b4cae82c57be4a322fdf6f6105dcdeb7ba8d423f6d6bc79bb2ad87ba792f1568ea30510fb226c74a664a38674c6b2dc1a42691e58553ccefe
+  data.tar.gz: d7db5fad7db1ec5d1e10276822d1b1c3b609db8d7065f03e7550c1842e4adb6d40641d972196d6f3d920b15aa5efc4c59fd285823ff79c3f4a14c2304a1042de

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

@@ -35,10 +35,31 @@ $(() => {
     }
   });
 
-  document.querySelectorAll(".js-sortable-check-box-collection").forEach((el) => new DragonDrop(el, {
-    handle: false,
-    item: ".js-collection-input"
-  }));
+  document.querySelectorAll(".js-sortable-check-box-collection").forEach((el) =>  {
+
+    /**
+    * Due to a bug reported in https://github.com/decidim/decidim/issues/15191
+    * we have to listen to the `drag` event and prevent the scrolling
+    * and enabling it back again after it.
+    */
+
+    let preventScroll = function(event) {
+      event.preventDefault();
+    }
+
+    el.addEventListener("touchmove", (event) => {
+      preventScroll(event);
+    }, { passive: false });
+
+    el.addEventListener("touchend", () => {
+      el.removeEventListener("touchmove", preventScroll)
+    });
+
+    return new DragonDrop(el, {
+      handle: false,
+      item: ".js-collection-input"
+    });
+  });
 
   $(".answer-questionnaire .question[data-conditioned='true']").each((idx, el) => {
     createDisplayConditions({

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

@@ -23,17 +23,7 @@
           </button>
 
           <% if editable %>
-            <button class="button button__sm button__transparent-secondary small alert move-up-question button--title">
-              <%= icon("arrow-up-line") %>
-              <%= t(".up") %>
-            </button>
-
-            <button class="button button__sm button__transparent-secondary small alert move-down-question button--title">
-              <%= icon("arrow-down-line") %>
-              <%= t(".down") %>
-            </button>
-
-            <button class="button button__sm button__transparent-secondary small alert remove-question button--title">
+            <button class="button button__xs button__transparent-secondary small alert remove-question button--title">
               <%= icon("delete-bin-line") %>
               <%= t(".remove") %>
             </button>

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

@@ -39,7 +39,7 @@
     <%= cell("decidim/announcement", t(".already_answered_warning"), callout_class: "warning" ) %>
   <% end %>
 
-  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0">
+  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0" data-draggable-table data-sort-url="#" id="questionnaire-questions-list">
     <% @form.questions.each_with_index do |question, index| %>
       <%= fields_for "questions[questions][]", question do |question_form| %>
         <% if question.separator? %>
@@ -72,9 +72,38 @@
 <%= append_javascript_pack_tag "decidim_forms_admin" %>
 
 <% if questionnaire.questions_editable? %>
-  <script>
+   <script>
     document.addEventListener("DOMContentLoaded", function () {
       window.Decidim.createEditableForm();
+
+      // Function to initialize the sortable functionality
+      function initializeSortable() {
+        const container = document.querySelector("#questionnaire-questions-list");
+        const questionCards = container?.querySelectorAll(".card.questionnaire-question");
+
+        if (!container || !questionCards?.length) return;
+
+        questionCards.forEach(card => {
+          card.setAttribute("draggable", "true");
+          card.setAttribute("role", "option");
+          card.setAttribute("aria-grabbed", "false");
+        });
+
+        window.Decidim?.createSortableList?.("#questionnaire-questions-list");
+      }
+
+      // Initialize on load and when new options such as questions etc are added
+      initializeSortable();
+
+      const observer = new MutationObserver(() => {
+        clearTimeout(observer.timer);
+        observer.timer = setTimeout(initializeSortable, 500);
+      });
+
+      const container = document.querySelector("#questionnaire-questions-list");
+      if (container) {
+        observer.observe(container, { childList: true, subtree: true });
+      }
     });
   </script>
 <% end %>

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

@@ -12,16 +12,9 @@
 
       <div class="flex items-center gap-x-4 ml-auto">
         <% if editable %>
-          <button class="button button__sm button__transparent button__transparent-secondary small alert move-up-question button--title">
-            <%== "#{icon("arrow-up-line")} #{t(".up")}" %>
-          </button>
-
-          <button class="button button__sm button__transparent button__transparent-secondary small alert move-down-question button--title">
-            <%== "#{icon("arrow-down-line")} #{t(".down")}" %>
-          </button>
-
-          <button class="button button__sm button__transparent button__transparent-secondary small alert remove-question button--title">
-            <%= t(".remove") %>
+          <button class="button button__xs button__transparent button__transparent-secondary small alert remove-question button--title">
+            <%= icon("delete-bin-line") %>
+            <span class="hidden md:block"><%= t(".remove") %></span>
           </button>
         <% end %>
       </div>

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

@@ -23,17 +23,7 @@
           </button>
 
           <% if editable %>
-            <button class="button button__sm button__transparent button__transparent-secondary small alert move-up-question button--title">
-              <%= icon("arrow-up-line") %>
-              <%= t(".up") %>
-            </button>
-
-            <button class="button button__sm button__transparent button__transparent-secondary small alert move-down-question button--title">
-              <%= icon("arrow-down-line") %>
-              <%= t(".down") %>
-            </button>
-
-            <button class="button button__sm button__transparent button__transparent-secondary small alert remove-question button--title">
+            <button class="button button__xs button__transparent button__transparent-secondary small alert remove-question button--title">
               <%= icon("delete-bin-line") %>
               <%= t(".remove") %>
             </button>

data/config/locales/ar.yml

@@ -35,11 +35,9 @@ ar:
             add_answer_option: إضافة خيار الإجابة
             any: أي
             description: وصف
-            down: أسفل
             question: سؤال
             remove: إزالة
             statement: بيان
-            up: فوق
           title_and_description:
             description: الوصف
           update:

data/config/locales/bg.yml

@@ -19,7 +19,6 @@ bg:
             tos: Условия за ползване
         questionnaires:
           actions:
-            back: Назад към въпросите
             show: Показване на отговорите
           answer_option:
             answer_option: Възможност за отговор
@@ -72,26 +71,20 @@ bg:
             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: Формулярите бяха запазени успешно.

data/config/locales/ca-IT.yml

@@ -55,7 +55,7 @@ ca-IT:
             tos: Termes del servei
         questionnaires:
           actions:
-            back: Tornar a les preguntes
+            back: Tornar a les respostes
             publish_answers: Publica respostes
             show: Mostrar les respostes
           answer_option:
@@ -125,12 +125,10 @@ ca-IT:
             any: Cap
             collapse: Redueix
             description: Descripció
-            down: Avall
             expand: Expandeix
             question: Pregunta
             remove: Eliminar
             statement: Declaració
-            up: Amunt
           questions_form:
             already_answered_warning: No pots modificar les preguntes d'aquest formulari perquè algunes participants ja han respost el formulari.
             collapse: Replega totes les preguntes
@@ -139,19 +137,15 @@ ca-IT:
             update:
               success: Pregunta/es afegida/es correctament a l'enquesta.
           separator:
-            down: Baixar
             remove: Eliminar
             separator: Separador
-            up: Pujar
           title_and_description:
             collapse: Replegar
             description: Descripció
-            down: Baixar
             expand: Expandir
             remove: Esborrar
             title: Títol
             title_and_description: Títol i descripció
-            up: Pujar
           update:
             invalid: S'ha produït un error en desar el formulari.
             success: Formulari desat correctament.

data/config/locales/ca.yml

@@ -55,7 +55,7 @@ ca:
             tos: Termes del servei
         questionnaires:
           actions:
-            back: Tornar a les preguntes
+            back: Tornar a les respostes
             publish_answers: Publica respostes
             show: Mostrar les respostes
           answer_option:
@@ -125,12 +125,10 @@ ca:
             any: Cap
             collapse: Redueix
             description: Descripció
-            down: Avall
             expand: Expandeix
             question: Pregunta
             remove: Eliminar
             statement: Declaració
-            up: Amunt
           questions_form:
             already_answered_warning: No pots modificar les preguntes d'aquest formulari perquè algunes participants ja han respost el formulari.
             collapse: Replega totes les preguntes
@@ -139,19 +137,15 @@ ca:
             update:
               success: Pregunta/es afegida/es correctament a l'enquesta.
           separator:
-            down: Baixar
             remove: Eliminar
             separator: Separador
-            up: Pujar
           title_and_description:
             collapse: Replegar
             description: Descripció
-            down: Baixar
             expand: Expandir
             remove: Esborrar
             title: Títol
             title_and_description: Títol i descripció
-            up: Pujar
           update:
             invalid: S'ha produït un error en desar el formulari.
             success: Formulari desat correctament.

data/config/locales/cs.yml

@@ -55,7 +55,7 @@ cs:
             tos: Podmínky služby
         questionnaires:
           actions:
-            back: Zpět na otázky
+            back: Zpět k reakcím
             publish_answers: Zveřejnit odpovědi
             show: Zobrazit odpovědi
           answer_option:
@@ -125,12 +125,10 @@ cs:
             any: Žádný
             collapse: Sbalit
             description: Popis
-            down: Dolů
             expand: Rozbalit
             question: Otázka
             remove: Odstranit
             statement: Prohlášení
-            up: Nahoru
           questions_form:
             already_answered_warning: Formulář je již zodpovězen některými uživateli, takže jeho otázky nemůžete upravovat.
             collapse: Sbalit všechny otázky
@@ -139,19 +137,15 @@ cs:
             update:
               success: Otázky ankety byly úspěšně uloženy.
           separator:
-            down: Dolů
             remove: Odebrat
             separator: Oddělovač
-            up: Nahoru
           title_and_description:
             collapse: Sbalit
             description: Popis
-            down: Dolů
             expand: Rozbalit
             remove: Odebrat
             title: Název
             title_and_description: Název a popis
-            up: Nahoru
           update:
             invalid: Při ukládání dotazníku došlo k chybám.
             success: Formulář byl úspěšně uložen.

data/config/locales/de.yml

@@ -55,7 +55,6 @@ de:
             tos: Nutzungsbedingungen
         questionnaires:
           actions:
-            back: Zurück zu Fragen
             publish_answers: Antworten veröffentlichen
             show: Antworten anzeigen
           answer_option:
@@ -125,12 +124,10 @@ de:
             any: Irgendein
             collapse: Einklappen
             description: Beschreibung
-            down: Nach unten
             expand: Ausklappen
             question: Frage
             remove: Löschen
             statement: Aussage
-            up: Oben
           questions_form:
             already_answered_warning: Der Fragebogen wird bereits von einigen Benutzern beantwortet, sodass Sie die Fragen nicht ändern können.
             collapse: Alle Fragen einklappen
@@ -139,19 +136,15 @@ de:
             update:
               success: Umfrage erfolgreich gespeichert.
           separator:
-            down: Runter
             remove: Löschen
             separator: Trennzeichen
-            up: Nach oben
           title_and_description:
             collapse: Einklappen
             description: Beschreibung
-            down: Runter
             expand: Ausklappen
             remove: Entfernen
             title: Titel
             title_and_description: Titel und Beschreibung
-            up: Hinauf
           update:
             invalid: Beim Speichern des Fragebogens sind Fehler aufgetreten.
             success: Formular erfolgreich gespeichert.

data/config/locales/el.yml

@@ -19,7 +19,6 @@ el:
             tos: Όροι χρήσης υπηρεσίας
         questionnaires:
           actions:
-            back: Επιστροφή στις ερωτήσεις
             show: Εμφάνιση απαντήσεων
           answer_option:
             answer_option: Επιλογή απάντησης
@@ -72,26 +71,20 @@ el:
             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: Η φόρμα αποθηκεύτηκε επιτυχώς.

data/config/locales/en.yml

@@ -55,7 +55,7 @@ en:
             tos: Terms of service
         questionnaires:
           actions:
-            back: Back to questions
+            back: Back to responses
             publish_answers: Publish answers
             show: Show responses
           answer_option:
@@ -125,12 +125,10 @@ en:
             any: Any
             collapse: Collapse
             description: Description
-            down: Down
             expand: Expand
             question: Question
             remove: Remove
             statement: Statement
-            up: Up
           questions_form:
             already_answered_warning: The form is already answered by some users so you cannot modify its questions.
             collapse: Collapse all questions
@@ -139,19 +137,15 @@ en:
             update:
               success: Survey questions successfully saved.
           separator:
-            down: Down
             remove: Remove
             separator: Separator
-            up: Up
           title_and_description:
             collapse: Collapse
             description: Description
-            down: Down
             expand: Expand
             remove: Remove
             title: Title
             title_and_description: Title and description
-            up: Up
           update:
             invalid: There was a problem saving the form.
             success: Form successfully saved.

data/config/locales/es-MX.yml

@@ -55,7 +55,7 @@ es-MX:
             tos: Términos y condiciones de uso
         questionnaires:
           actions:
-            back: Volver a las preguntas
+            back: Volver a las respuestas
             publish_answers: Publicar respuestas
             show: Mostrar las respuestas
           answer_option:
@@ -125,12 +125,10 @@ es-MX:
             any: Alguna
             collapse: Contraer
             description: Descripción
-            down: Abajo
             expand: Expandir
             question: Pregunta
             remove: Borrar
             statement: Declaración
-            up: Arriba
           questions_form:
             already_answered_warning: No puedes modificar las preguntas porque algunas participantes ya han respondido el formulario.
             collapse: Contraer todas las preguntas
@@ -139,19 +137,15 @@ es-MX:
             update:
               success: Pregunta/s añadida/s correctamente a la encuesta.
           separator:
-            down: Bajar
             remove: Eliminar
             separator: Separador
-            up: Subir
           title_and_description:
             collapse: Contraer
             description: Descripción
-            down: Bajar
             expand: Expandir
             remove: Eliminar
             title: Título
             title_and_description: Título y descripción
-            up: Subir
           update:
             invalid: Ha habido errores al guardar el cuestionario.
             success: Formulario guardado correctamente.

data/config/locales/es-PY.yml

@@ -55,7 +55,7 @@ es-PY:
             tos: Términos y condiciones de uso
         questionnaires:
           actions:
-            back: Volver a las preguntas
+            back: Volver a las respuestas
             publish_answers: Publicar respuestas
             show: Mostrar las respuestas
           answer_option:
@@ -125,12 +125,10 @@ es-PY:
             any: Alguna
             collapse: Contraer
             description: Descripción
-            down: Abajo
             expand: Expandir
             question: Pregunta
             remove: Borrar
             statement: Declaración
-            up: Arriba
           questions_form:
             already_answered_warning: No puedes modificar las preguntas porque algunas participantes ya han respondido el formulario.
             collapse: Contraer todas las preguntas
@@ -139,19 +137,15 @@ es-PY:
             update:
               success: Pregunta/s añadida/s correctamente a la encuesta.
           separator:
-            down: Bajar
             remove: Eliminar
             separator: Separador
-            up: Subir
           title_and_description:
             collapse: Contraer
             description: Descripción
-            down: Bajar
             expand: Expandir
             remove: Eliminar
             title: Título
             title_and_description: Título y descripción
-            up: Subir
           update:
             invalid: Ha habido errores al guardar el cuestionario.
             success: Formulario guardado correctamente.

data/config/locales/es.yml

@@ -55,7 +55,7 @@ es:
             tos: Términos y condiciones de uso
         questionnaires:
           actions:
-            back: Volver a las preguntas
+            back: Volver a las respuestas
             publish_answers: Publicar respuestas
             show: Mostrar las respuestas
           answer_option:
@@ -125,12 +125,10 @@ es:
             any: Alguna
             collapse: Contraer
             description: Descripción
-            down: Abajo
             expand: Expandir
             question: Pregunta
             remove: Eliminar
             statement: Declaración
-            up: Arriba
           questions_form:
             already_answered_warning: No puedes modificar las preguntas porque algunas participantes ya han respondido el formulario.
             collapse: Contraer todas las preguntas
@@ -139,19 +137,15 @@ es:
             update:
               success: Pregunta/s añadida/s correctamente a la encuesta.
           separator:
-            down: Bajar
             remove: Eliminar
             separator: Separador
-            up: Subir
           title_and_description:
             collapse: Contraer
             description: Descripción
-            down: Bajar
             expand: Expandir
             remove: Eliminar
             title: Título
             title_and_description: Título y descripción
-            up: Subir
           update:
             invalid: Se ha producido un error al guardar el formulario.
             success: Formulario guardado correctamente.

data/config/locales/eu.yml

@@ -55,7 +55,7 @@ eu:
             tos: Zerbitzu-baldintzak
         questionnaires:
           actions:
-            back: Itzuli galderetara
+            back: Itzuli erantzunetara
             publish_answers: Argitaratu erantzunak
             show: Erakutsi erantzunak
           answer_option:
@@ -125,12 +125,10 @@ eu:
             any: Edozein
             collapse: Bildu
             description: Deskribapena
-            down: Behera
             expand: Zabaldu
             question: Galdera
             remove: Kendu
             statement: Adierazpena
-            up: Gora
           questions_form:
             already_answered_warning: Formularioa parte-hartzaile batzuek erantzuten dute dagoeneko; beraz, ezin dituzu galderak aldatu.
             collapse: Kolapsatu galdera guztiak
@@ -139,19 +137,15 @@ eu:
             update:
               success: Inkestaren galderak zuzen gordeta.
           separator:
-            down: Behera
             remove: Kendu
             separator: Bereizlea
-            up: Gora
           title_and_description:
             collapse: Kolapsoa
             description: Deskribapena
-            down: Behera
             expand: Zabaldu
             remove: Kendu
             title: Izenburua
             title_and_description: Izenburua eta deskribapena
-            up: Gora
           update:
             invalid: Arazo bat egon da inprimakia gordetzean.
             success: Galdetegia zuzen gorde da.

data/config/locales/fi-plain.yml

@@ -55,7 +55,7 @@ fi-pl:
             tos: Käyttöehdot
         questionnaires:
           actions:
-            back: Takaisin kysymyksiin
+            back: Takaisin vastauksiin
             publish_answers: Julkaise vastaukset
             show: Näytä vastaukset
           answer_option:
@@ -125,12 +125,10 @@ fi-pl:
             any: Minkä tahansa
             collapse: Sulje
             description: Kuvaus
-            down: Alas
             expand: Avaa
             question: Kysymys
             remove: Poista
             statement: Selite
-            up: Ylös
           questions_form:
             already_answered_warning: Jotkut käyttäjät ovat jo vastanneet lomakkeeseen, joten et voi muokata sen kysymyksiä.
             collapse: Supista kaikki kysymykset
@@ -139,19 +137,15 @@ fi-pl:
             update:
               success: Kyselyn kysymysten tallentaminen onnistui.
           separator:
-            down: Alas
             remove: Poista
             separator: Erotin
-            up: Ylös
           title_and_description:
             collapse: Pienennä
             description: Kuvaus
-            down: Alas
             expand: Laajenna
             remove: Poista
             title: Otsikko
             title_and_description: Otsikko ja kuvaus
-            up: Ylös
           update:
             invalid: Kyselylomakkeiden tallentamisessa on tapahtunut virheitä.
             success: Lomake tallennettu onnistuneesti.