decidim-consultations 0.24.0 → 0.25.0.rc1

data/config/locales/pt.yml

@@ -119,6 +119,8 @@ pt:
           questions: Questões
           results: Resultados
         questions_submenu:
+          attachments: Anexos
+          categories: Categorias
           components: Componentes
           configuration: Configuração
           consultation: Consulta
@@ -321,10 +323,6 @@ pt:
           title: O que são consultas?
     menu:
       consultations: Consultas
-    pages:
-      home:
-        statistics:
-          consultations_count: Consultas
     questions:
       next_button: Próxima pergunta
       previous_button: Pergunta anterior
@@ -361,10 +359,6 @@ pt:
           vote: Voto
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Anexos
-          categories: Categorias
       consultation_voting_data:
         start_voting_date: A votação começa
       question_components:

data/config/locales/ro-RO.yml

@@ -124,6 +124,8 @@ ro:
           questions: Întrebări
           results: Rezultate
         questions_submenu:
+          attachments: Atașamente
+          categories: Categorii
           components: Componente
           configuration: Configurare
           consultation: Consultare
@@ -334,10 +336,6 @@ ro:
           title: Ce sunt consultările?
     menu:
       consultations: Consultări
-    pages:
-      home:
-        statistics:
-          consultations_count: Consultări
     questions:
       next_button: Următoarea întrebare
       previous_button: Întrebarea precedentă
@@ -372,12 +370,11 @@ ro:
       consultations:
         actions:
           vote: Votează
+    statistics:
+      consultations_count: Consultări
+      votes_count: Voturi
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Atașamente
-          categories: Categorii
       consultation_voting_data:
         start_voting_date: Votarea începe
       question_components:

data/config/locales/ru.yml

@@ -98,6 +98,8 @@ ru:
           info: Сведения
           questions: Вопросы
         questions_submenu:
+          attachments: Прикрепленные файлы
+          categories: Категории
           components: Составляющие
           consultation: Консультация
           info: Сведения
@@ -243,10 +245,6 @@ ru:
         unspecified: Не указано
     menu:
       consultations: Консультации
-    pages:
-      home:
-        statistics:
-          consultations_count: Консультации
     questions:
       results:
         title: Итоги
@@ -274,10 +272,6 @@ ru:
         title: 'Консультация: подтвердите поддержку'
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Прикрепленные файлы
-          categories: Категории
       consultation_voting_data:
         start_voting_date: Голосование начинается
       question_components:

data/config/locales/sk.yml

@@ -127,6 +127,8 @@ sk:
           questions: Otázky
           results: Výsledky
         questions_submenu:
+          attachments: Prílohy
+          categories: Kategórie
           components: Súčasti
           configuration: Konfigurácia
           consultation: Konzultácia
@@ -339,10 +341,6 @@ sk:
           title: Čo sú konzultácie?
     menu:
       consultations: Konzultácie
-    pages:
-      home:
-        statistics:
-          consultations_count: Konzultácie
     questions:
       next_button: Ďalšia otázka
       previous_button: Predchádzajúca otázka
@@ -377,10 +375,6 @@ sk:
           vote: Hlasovať
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Prílohy
-          categories: Kategórie
       consultation_voting_data:
         start_voting_date: Hlasovanie začína
       question_components:

data/config/locales/sv.yml

@@ -94,6 +94,7 @@ sv:
         create:
           error: Det gick inte att skapa ett nytt samråd.
           success: Samrådet har skapats.
+        deprecation_warning: Konsultationsmodulen kommer att tas bort inom en nära framtid. Vi arbetar på nästa kryptografiskt säkra version som kallas Omröstningar.
         edit:
           update: Uppdatera
         form:
@@ -119,6 +120,8 @@ sv:
           questions: Frågor
           results: Resultat
         questions_submenu:
+          attachments: Bilagor
+          categories: Kategorier
           components: Komponenter
           configuration: Konfiguration
           consultation: Samråd
@@ -318,13 +321,11 @@ sv:
     help:
       participatory_spaces:
         consultations:
+          contextual: "<p>Ett <strong>samråd</strong> är ett utrymme där du kan ställa en tydlig fråga till alla personer som bildar en organisation, där du kan be att få medverka i samrådet, samt sätta igång och hantera debatten för eller emot ett svar. När samrådsdatumet anländer kan du rösta och publicera resultatet av omröstningarna.</p> <p>Exempel: Samråden kan handla om nästan allting som påverkar en organisation: till exempel att ändra organisationens namn eller logotyp med flera alternativa förslag, rösta ja eller nej om att bli en del av en större organisation, anta eller avvisa en ny strategisk plan eller resultatet från en arbetsgrupp, eller besluta om förtroendevalda ska kunna sitta högst en, två eller tre mandatperioder.</p>\n"
+          page: "<p>Ett <strong>samråd</strong> är ett utrymme där du kan ställa en tydlig fråga till alla personer som bildar en organisation, där du kan be att få medverka i samrådet, samt sätta igång och hantera debatten för eller emot ett svar. När samrådsdatumet anländer kan du rösta och publicera resultatet av omröstningarna.</p> <p>Exempel: Samråden kan handla om nästan allting som påverkar en organisation: till exempel att ändra organisationens namn eller logotyp med flera alternativa förslag, rösta ja eller nej om att bli en del av en större organisation, anta eller avvisa en ny strategisk plan eller resultatet från en arbetsgrupp, eller besluta om förtroendevalda ska kunna sitta högst en, två eller tre mandatperioder.</p>\n"
           title: Vad är samråd?
     menu:
       consultations: Samråd
-    pages:
-      home:
-        statistics:
-          consultations_count: Samråd
     questions:
       next_button: Nästa fråga
       previous_button: Föregående fråga
@@ -359,12 +360,11 @@ sv:
       consultations:
         actions:
           vote: Rösta
+    statistics:
+      consultations_count: Samråd
+      votes_count: Röster
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Bilagor
-          categories: Kategorier
       consultation_voting_data:
         start_voting_date: Omröstningen börjar
       question_components:

data/config/locales/tr-TR.yml

@@ -119,6 +119,8 @@ tr:
           questions: Sorular
           results: Sonuçlar
         questions_submenu:
+          attachments: Ekler
+          categories: Kategoriler
           components: Bileşenler
           configuration: Konfigürasyon
           consultation: Danışma
@@ -323,10 +325,6 @@ tr:
           title: Danışma nedir?
     menu:
       consultations: İstişareler
-    pages:
-      home:
-        statistics:
-          consultations_count: Danışmalar
     questions:
       next_button: Sonraki soru
       previous_button: Önceki soru
@@ -363,10 +361,6 @@ tr:
           vote: Oy ver
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Ekler
-          categories: Kategoriler
       consultation_voting_data:
         start_voting_date: Oylama başlıyor
       question_components:

data/config/locales/uk.yml

@@ -98,6 +98,8 @@ uk:
           info: Відомості
           questions: Питання
         questions_submenu:
+          attachments: Вкладені файли
+          categories: Категорії
           components: Складові
           consultation: Консультація
           info: Відомості
@@ -243,10 +245,6 @@ uk:
         unspecified: Не вказано
     menu:
       consultations: Консультації
-    pages:
-      home:
-        statistics:
-          consultations_count: Консультації
     questions:
       results:
         title: Підсумки
@@ -274,10 +272,6 @@ uk:
         title: 'Консультація: підтвердьте підтримку'
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Вкладені файли
-          categories: Категорії
       consultation_voting_data:
         start_voting_date: Голосування починається
       question_components:

data/config/locales/zh-CN.yml

@@ -115,6 +115,8 @@ zh-CN:
           questions: 问 题
           results: 成果
         questions_submenu:
+          attachments: 附件
+          categories: 类别管理
           components: 组件
           configuration: 配置
           consultation: Consultation
@@ -311,10 +313,6 @@ zh-CN:
           title: 什么是协商？
     menu:
       consultations: 协商
-    pages:
-      home:
-        statistics:
-          consultations_count: 协商
     questions:
       next_button: 下一个问题
       previous_button: 上一个问题
@@ -351,10 +349,6 @@ zh-CN:
           vote: 投票
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: 附件
-          categories: 类别管理
       consultation_voting_data:
         start_voting_date: 投票开始
       question_components:

data/lib/decidim/api/consultation_question_type.rb

@@ -47,6 +47,14 @@ module Decidim
       field :min_votes, GraphQL::Types::Int, "The minimum number of votes in this question", null: true
       field :response_groups_count, GraphQL::Types::Int, "The number of group responses for this question", null: true
       field :instructions, Decidim::Core::TranslatedFieldType, "Instructions for this question", null: true
+
+      def banner_image
+        object.attached_uploader(:banner_image).path
+      end
+
+      def hero_image
+        object.attached_uploader(:hero_image).path
+      end
     end
   end
 end

data/lib/decidim/api/consultation_type.rb

@@ -24,6 +24,14 @@ module Decidim
       field :results_published_at, Decidim::Core::DateType, "Date when the results have been published", null: true
 
       field :questions, [Decidim::Consultations::ConsultationQuestionType, { null: true }], "", null: true
+
+      def introductory_image
+        object.attached_uploader(:introductory_image).path
+      end
+
+      def banner_image
+        object.attached_uploader(:banner_image).path
+      end
     end
   end
 end

data/lib/decidim/consultations/admin_engine.rb

@@ -55,36 +55,121 @@ module Decidim
 
       initializer "decidim_consultations.admin_consultation_menu" do
         Decidim.menu :admin_consultation_menu do |menu|
-          menu.item I18n.t("info", scope: "decidim.admin.menu.consultations_submenu"),
-                    decidim_admin_consultations.edit_consultation_path(current_consultation),
-                    position: 1.0,
-                    active: is_active_link?(decidim_admin_consultations.edit_consultation_path(current_consultation)),
-                    if: allowed_to?(:update, :consultation, consultation: current_consultation)
-          menu.item I18n.t("questions", scope: "decidim.admin.menu.consultations_submenu"),
-                    decidim_admin_consultations.consultation_questions_path(current_consultation),
-                    position: 1.1,
-                    active: is_active_link?(decidim_admin_consultations.consultation_questions_path(current_consultation)),
-                    if: allowed_to?(:read, :question)
-          menu.item I18n.t("results", scope: "decidim.admin.menu.consultations_submenu"),
-                    decidim_admin_consultations.results_consultation_path(current_consultation),
-                    position: 1.0,
-                    active: is_active_link?(decidim_admin_consultations.results_consultation_path(current_consultation)),
-                    if: allowed_to?(:read, :question)
+          menu.add_item :edit_consultation,
+                        I18n.t("info", scope: "decidim.admin.menu.consultations_submenu"),
+                        decidim_admin_consultations.edit_consultation_path(current_consultation),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.edit_consultation_path(current_consultation)),
+                        if: allowed_to?(:update, :consultation, consultation: current_consultation)
+          menu.add_item :consultation_questions,
+                        I18n.t("questions", scope: "decidim.admin.menu.consultations_submenu"),
+                        decidim_admin_consultations.consultation_questions_path(current_consultation),
+                        position: 1.1,
+                        active: is_active_link?(decidim_admin_consultations.consultation_questions_path(current_consultation)),
+                        if: allowed_to?(:read, :question)
+          menu.add_item :results_consultation,
+                        I18n.t("results", scope: "decidim.admin.menu.consultations_submenu"),
+                        decidim_admin_consultations.results_consultation_path(current_consultation),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.results_consultation_path(current_consultation)),
+                        if: allowed_to?(:read, :question)
         end
       end
       initializer "decidim_consultations.admin_menu" do
         Decidim.menu :admin_menu do |menu|
-          menu.item I18n.t("menu.consultations", scope: "decidim.admin"),
-                    decidim_admin_consultations.consultations_path,
-                    icon_name: "comment-square",
-                    position: 2.65,
-                    active: :inclusive,
-                    if: allowed_to?(:enter, :space_area, space_name: :consultations)
+          menu.add_item :consultations,
+                        I18n.t("menu.consultations", scope: "decidim.admin"),
+                        decidim_admin_consultations.consultations_path,
+                        icon_name: "comment-square",
+                        position: 2.65,
+                        active: :inclusive,
+                        if: allowed_to?(:enter, :space_area, space_name: :consultations)
         end
       end
-      initializer "decidim_consultations.action_controller" do |_app|
-        ActiveSupport.on_load :action_controller do
-          helper Decidim::Consultations::Admin::ConsultationMenuHelper if respond_to?(:helper)
+
+      initializer "decidim_consultations.admin_question_menu" do
+        Decidim.menu :admin_question_menu do |menu|
+          menu.add_item :edit_consultation,
+                        I18n.t("consultation", scope: "decidim.admin.menu.questions_submenu"),
+                        decidim_admin_consultations.edit_consultation_path(current_participatory_space.consultation),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.edit_consultation_path(current_participatory_space.consultation)),
+                        if: allowed_to?(:update, :consultation, consultation: current_participatory_space.consultation)
+          menu.add_item :consultation_questions,
+                        I18n.t("questions", scope: "decidim.admin.menu.consultations_submenu"),
+                        decidim_admin_consultations.consultation_questions_path(current_participatory_space.consultation),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.consultation_questions_path(current_participatory_space.consultation)),
+                        submenu: { target_menu: :admin_questions_menu }
+
+          menu.add_item :results_consultation,
+                        I18n.t("results", scope: "decidim.admin.menu.consultations_submenu"),
+                        decidim_admin_consultations.results_consultation_path(current_participatory_space.consultation),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.results_consultation_path(current_participatory_space.consultation))
+        end
+      end
+      initializer "decidim_consultations.admin_questions_menu" do
+        Decidim.menu :admin_questions_menu do |menu|
+          menu.add_item :edit_question,
+                        I18n.t("info", scope: "decidim.admin.menu.questions_submenu"),
+                        decidim_admin_consultations.edit_question_path(current_participatory_space),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.edit_question_path(current_participatory_space)),
+                        if: allowed_to?(:update, :question, question: current_participatory_space)
+
+          menu.add_item :edit_question_configuration,
+                        I18n.t("configuration", scope: "decidim.admin.menu.questions_submenu"),
+                        decidim_admin_consultations.edit_question_configuration_path(current_participatory_space),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.edit_question_configuration_path(current_participatory_space)),
+                        if: allowed_to?(:configure, :question, question: current_participatory_space)
+          menu.add_item :responses,
+                        I18n.t("responses", scope: "decidim.admin.menu.questions_submenu"),
+                        decidim_admin_consultations.responses_path(current_participatory_space),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.responses_path(current_participatory_space)) ||
+                                is_active_link?(decidim_admin_consultations.response_groups_path(current_participatory_space)),
+                        if: allowed_to?(:read, :response)
+
+          menu.add_item :components,
+                        I18n.t("components", scope: "decidim.admin.menu.questions_submenu"),
+                        decidim_admin_consultations.components_path(current_participatory_space),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.components_path(current_participatory_space)),
+                        if: allowed_to?(:read, :component),
+                        submenu: { target_menu: :admin_consultation_components_menu, options: { container_options: { id: "components-list" } } }
+
+          menu.add_item :categories,
+                        I18n.t("categories", scope: "decidim.admin.menu.questions_submenu"),
+                        decidim_admin_consultations.categories_path(current_participatory_space),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.categories_path(current_participatory_space)),
+                        if: allowed_to?(:read, :category)
+          menu.add_item :question_attachments,
+                        I18n.t("attachments", scope: "decidim.admin.menu.questions_submenu"),
+                        decidim_admin_consultations.question_attachments_path(current_participatory_space),
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_consultations.question_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment)
+        end
+      end
+      initializer "decidim_consultations.admin_consultation_components_menu" do
+        Decidim.menu :admin_consultation_components_menu do |menu|
+          current_participatory_space.components.each do |component|
+            caption = translated_attribute(component.name)
+            if component.primary_stat.present?
+              caption += content_tag(:span, component.primary_stat, class: component.primary_stat.zero? ? "component-counter component-counter--off" : "component-counter")
+            end
+
+            menu.add_item [component.manifest_name, component.id].join("_"),
+                          caption.html_safe,
+                          manage_component_path(component),
+                          active: is_active_link?(manage_component_path(component)) ||
+                                  is_active_link?(decidim_admin_consultations.edit_component_path(current_participatory_space, component)) ||
+                                  is_active_link?(decidim_admin_consultations.edit_component_permissions_path(current_participatory_space, component)),
+                          if: component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name)
+          end
         end
       end
     end