decidim-meetings 0.30.3 → 0.31.0.rc1

data/app/views/decidim/meetings/admin/registrations/edit.html.erb

@@ -3,57 +3,37 @@
   <h1 class="item_show__header-title">
     <%= t("title", scope: "decidim.meetings.admin.registrations.form") %>
     <div class="flex items-center gap-x-4 ml-auto">
-      <%= link_to t("invites", scope: "decidim.meetings.admin.registrations.form"), meeting_registrations_invites_path(meeting), class: "button button__sm button__secondary #{"disabled" unless allowed_to? :read_invites, :meeting, meeting: meeting}" %>
+      <%= link_to t("registrations", scope: "decidim.meetings.admin.registrations.form"), meeting_registrations_attendees_path(meeting), class: "button button__sm button__transparent-secondary #{"disabled" unless allowed_to? :read_invites, :meeting, meeting: meeting}" %>
+      <%= link_to t("invites", scope: "decidim.meetings.admin.registrations.form"), meeting_registrations_invites_path(meeting), class: "button button__sm button__transparent-secondary #{"disabled" unless allowed_to? :read_invites, :meeting, meeting: meeting}" %>
+
       <% if allowed_to? :export_registrations, :meeting, meeting: meeting %>
-            <span class="exports button button__sm button__secondary button--title" data-toggle="export-dropdown">
-              <%= t "actions.export", scope: "decidim.admin" %>
-              <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
-            </span>
-        <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
-          <ul class="vertical menu add-components">
+        <div class="relative">
+          <button class="button button__sm button__transparent-secondary" data-controller="dropdown" data-target="export-dropdown">
+            <%= t "actions.export", scope: "decidim.admin" %>
+            <%= icon "arrow-down-s-line" %>
+            <%= icon "arrow-down-s-line" %>
+          </button>
+
+          <ul class="dropdown dropdown_bottom" id="export-dropdown">
             <% %w(CSV JSON Excel).each do |format| %>
-              <%= link_to export_meeting_registrations_path(meeting_id: meeting, format:) do %>
-                <li class="exports--format--<%= format.downcase %> exports--registrations"><%= t("decidim.admin.exports.export_as", name: t("decidim.#{current_component.manifest.name}.admin.exports.registrations"), export_format: format) %></li>
-              <% end %>
+              <li class="dropdown__item">
+                <%= link_to export_meeting_registrations_path(meeting_id: meeting, format:), class: "dropdown__button" do %>
+                  <%= t("decidim.admin.exports.export_as", name: t("decidim.#{current_component.manifest.name}.admin.exports.registrations"), export_format: format) %>
+                <% end %>
+              </li>
             <% end %>
           </ul>
         </div>
       <% end %>
-      <%= link_to t("registration_form" , scope: "decidim.meetings.admin.registrations.form"), edit_meeting_registrations_form_path(meeting_id: meeting.id), class: "button button__sm button__secondary" %>
-      <%= link_to t("manage_questions" , scope: "decidim.meetings.admin.registrations.form"), edit_questions_meeting_registrations_form_path(meeting_id: meeting.id), class: "button button__sm button__secondary" %>
+
+      <%= link_to t("registration_form" , scope: "decidim.meetings.admin.registrations.form"), edit_meeting_registrations_form_path(meeting_id: meeting.id), class: "button button__sm button__transparent-secondary" %>
+      <%= link_to t("manage_questions" , scope: "decidim.meetings.admin.registrations.form"), edit_questions_meeting_registrations_form_path(meeting_id: meeting.id), class: "button button__sm button__transparent-secondary" %>
     </div>
   </h1>
 </div>
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
-    <% if meeting.component.settings.registration_code_enabled %>
-      <div class="card mb-4">
-        <div class="card-divider">
-          <h2 class="card-title">
-            <%= t(".validate_registration_code") %>
-          </h2>
-        </div>
-        <div class="card-section">
-          <%= decidim_form_for(@validation_form, url: validate_registration_code_meeting_registrations_path, html: { class: "form form-defaults validate_meeting_registration_code" })  do |f| %>
-            <div class="form__wrapper">
-              <div class="card-section">
-                <div class="row column">
-                  <div>
-                    <%= f.label :code %>
-                  </div>
-                  <%= f.text_field :code, label: false %>
-                </div>
-                <div class="row column">
-                  <%= f.submit t(".validate"), class: "button button__sm button__secondary" %>
-                </div>
-              </div>
-            </div>
-          <% end %>
-        </div>
-      </div>
-    <% end %>
-
     <%= cell("decidim/announcement", t("recommendation_message", scope: "decidim.meetings.admin.registrations.form"), callout_class: "warning" ) %>
 
     <%= decidim_form_for(@form, url: meeting_registrations_path, html: { class: "form-defaults form edit_meeting_registrations mt-4" })  do |f| %>

data/app/views/decidim/meetings/admin/registrations_attendees/index.html.erb

@@ -0,0 +1,126 @@
+<% add_decidim_page_title(t("title", scope: "decidim.meetings.admin.registrations_attendees.index")) %>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t("title", scope: "decidim.meetings.admin.registrations_attendees.index") %>
+    <div class="flex items-center gap-x-4 ml-auto">
+      <%= link_to t("invites", scope: "decidim.meetings.admin.registrations.form"), meeting_registrations_invites_path(meeting), class: "button button__sm button__transparent-secondary #{"disabled" unless allowed_to? :read_invites, :meeting, meeting: meeting}" %>
+
+      <% if allowed_to? :export_registrations, :meeting, meeting: meeting %>
+        <div class="relative">
+          <button class="exports button button__sm button__transparent-secondary button--title" data-controller="dropdown" data-target="export-dropdown">
+            <%= t "actions.export", scope: "decidim.admin" %>
+            <%= icon "arrow-down-s-line" %>
+            <%= icon "arrow-down-s-line" %>
+          </button>
+
+          <ul class="dropdown dropdown__bottom" id="export-dropdown" aria-hidden="true">
+            <% %w(CSV JSON Excel).each do |format| %>
+              <li class="dropdown__item">
+                <%= link_to export_meeting_registrations_path(meeting_id: meeting, format:), class: "dropdown__button" do %>
+                  <%= t("decidim.admin.exports.export_as", name: t("decidim.#{current_component.manifest.name}.admin.exports.registrations"), export_format: format) %>
+                <% end %>
+              </li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
+
+      <%= link_to t("registration_form" , scope: "decidim.meetings.admin.registrations.form"), edit_meeting_registrations_form_path(meeting_id: meeting.id), class: "button button__sm button__transparent-secondary" %>
+      <%= link_to t("manage_questions" , scope: "decidim.meetings.admin.registrations.form"), edit_questions_meeting_registrations_form_path(meeting_id: meeting.id), class: "button button__sm button__transparent-secondary" %>
+    </div>
+  </h1>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <% if meeting.component.settings.registration_code_enabled %>
+      <div class="card mb-4">
+        <div class="card-divider">
+          <h2 class="card-title">
+            <%= t(".validate_registration_code") %>
+          </h2>
+        </div>
+        <div class="card-section">
+          <%= decidim_form_for(@validation_form, url: validate_registration_code_meeting_registrations_attendees_path, html: { class: "form form-defaults validate_meeting_registration_code" })  do |f| %>
+            <div class="form__wrapper">
+              <div class="card-section">
+                <div class="row column">
+                  <div>
+                    <%= f.label :code %>
+                  </div>
+                  <%= f.text_field :code, label: false %>
+                </div>
+                <div class="row column">
+                  <%= f.submit t(".validate"), class: "button button__sm button__transparent-secondary" %>
+                </div>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    <div class="card" id="meeting-invites">
+      <div class="table-stacked">
+        <table class="table-list">
+          <thead>
+            <tr>
+              <th><%= t("models.registration.fields.name", scope: "decidim.meetings") %></th>
+              <th><%= t("models.registration.fields.email", scope: "decidim.meetings") %></th>
+              <th><%= t("models.registration.fields.status", scope: "decidim.meetings") %></th>
+              <th><%= t("models.registration.actions", scope: "decidim.meetings") %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% registrations.each do |registration| %>
+              <% presenter = registration.presenter %>
+
+              <tr data-id="<%= registration.id %>">
+                <td data-label="<%= t("models.registration.fields.name", scope: "decidim.meetings") %>">
+                  <%= presenter.name %>
+                </td>
+                <td data-label="<%= t("models.registration.fields.email", scope: "decidim.meetings") %>">
+                  <%= presenter.email %>
+                </td>
+                <td class="<%= presenter.status_html_class %>" data-label="<%= t("models.registration.fields.status", scope: "decidim.meetings") %>">
+                  <strong class="label <%= presenter.status_html_class %>">
+                    <%= presenter.status %>
+                  </strong>
+                </td>
+                <td class="table-list__actions" data-label="<%= t("models.registration.actions", scope: "decidim.meetings") %>">
+                  <% if allowed_to? :update, :meeting, meeting: meeting %>
+                    <button type="button" data-controller="dropdown" data-target="actions-meeting-registration-<%= registration.id %>" aria-label="<%= t("actions.actions_label", scope: "decidim.admin", resource: translated_attribute(meeting.title)) %>">
+                      <%= icon "more-fill", class: "text-secondary" %>
+                    </button>
+
+                    <div class="inline-block relative">
+                      <ul id="actions-meeting-registration-<%= registration.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                        <li class="dropdown__item">
+                          <% if presenter.validated? %>
+                            <div class="dropdown__button-disabled">
+                              <%= with_tooltip t("tooltips.cannot_mark_attendee", scope: "decidim.admin") do %>
+                                <%= icon "user-follow-line", class: "text-gray" %>
+                                <span>
+                                  <%= t("actions.mark_as_attendee", scope: "decidim.meetings") %>
+                                </span>
+                              <% end %>
+                            </div>
+                          <% else %>
+                            <%= link_to mark_as_attendee_meeting_registrations_attendee_path(id: registration), method: :put, class: "dropdown__button" do %>
+                              <%= icon "user-follow-line" %>
+                              <%= t("actions.mark_as_attendee", scope: "decidim.meetings") %>
+                            <% end %>
+                          <% end %>
+                        </li>
+                      </ul>
+                    </div>
+                  <% end %>
+                </td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/decidim/meetings/layouts/live_event.html.erb

@@ -15,7 +15,7 @@
 
     <header class="meeting-polls__header">
       <div>
-        <strong class="text-secondary"><%= current_organization_name %></strong> / <strong><%= present(meeting).title(links: true, html_escape: true ) %></strong>
+        <strong class="text-secondary"><%= current_organization_name %></strong> / <strong><%= present(meeting).title(html_escape: true) %></strong>
       </div>
 
       <div class="flex gap-10">

data/app/views/decidim/meetings/meeting_closes/_form.html.erb

@@ -1,7 +1,7 @@
-<%= text_editor_for(form, :closing_report, hashtaggable: true) %>
+<%= text_editor_for(form, :closing_report) %>
 
 <%= form.number_field :attendees_count, min: 0, help_text: t("decidim.forms.meetings.attendees_count_help_text") %>
 
-<% if Decidim::Meetings.enable_proposal_linking %>
+<% if Decidim.module_installed?(:proposals) %>
   <%= render partial: "decidim/proposals/proposals/proposals_picker", locals: { form:, field: :proposals } %>
 <% end %>

data/app/views/decidim/meetings/meetings/_form.html.erb

@@ -1,9 +1,9 @@
 <div>
-  <%= form.text_field :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
+  <%= form.text_field :title, autofocus: true %>
 </div>
 
 <div>
-  <%= text_editor_for(form, :description, hashtaggable: true) %>
+  <%= text_editor_for(form, :description) %>
 </div>
 
 <div>
@@ -79,13 +79,4 @@
   <label><%= t(".disclaimer", organization: organization_name(current_component.organization)) %></label><br>
 </div>
 
-<div>
-  <%= form.select(
-    :user_group_id,
-    Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map { |g| [g.name, g.id] },
-    prompt: current_user.name,
-    label: t(".create_as")
-  ) %>
-</div>
-
 <%= append_javascript_pack_tag "decidim_meetings" %>

data/app/views/decidim/meetings/meetings/_meeting.html.erb

@@ -3,7 +3,7 @@
   <%= render partial: "schema_org_event_meeting" %>
 
   <section class="layout-main__section layout-main__heading">
-      <h1 class="h2 decorator"><%= present(meeting).title(links: true, html_escape: true ) %></h1>
+      <h1 class="h2 decorator"><%= present(meeting).title(html_escape: true ) %></h1>
       <%= cell "decidim/meetings/dates_and_map", meeting %>
       <div class="block md:hidden">
         <%= render partial: "meeting_aside", locals: { hide_modal: true } %>
@@ -34,7 +34,7 @@
     <div class="layout-author <%= "has_status" if meeting.private_meeting? || meeting.withdrawn? %>">
       <div class="relative flex items-center justify-center w-full">
         <div class="w-10/12 flex items-center gap-4">
-          <%= cell "decidim/author", author_presenter_for(meeting.normalized_author), from: meeting, context_actions: nil, layout: :compact %>
+          <%= cell "decidim/author", author_presenter_for(meeting.author), from: meeting, context_actions: nil, layout: :compact %>
         </div>
         <%= render "decidim/shared/resource_actions", resource: meeting do %>
           <%= render "decidim/meetings/meetings/meeting_actions" %>

data/app/views/decidim/meetings/meetings/_meeting_actions.html.erb

@@ -1,6 +1,6 @@
 <% if allowed_to?(:update, :meeting, meeting: meeting) %>
   <li role="menuitem">
-    <%= link_to edit_meeting_path(meeting), class: "button button__sm button__text button__text-secondary"  do %>
+    <%= link_to edit_meeting_path(meeting), class: "dropdown__button"  do %>
       <span><%= t("edit_meeting", scope: "decidim.meetings.meetings.meeting") %></span>
       <%= icon "pencil-line" %>
     <% end %>
@@ -10,7 +10,7 @@
 <% if allowed_to?(:close, :meeting, meeting: meeting) %>
   <% caption = meeting.closed? ? t("edit_close_meeting", scope: "decidim.meetings.meetings.meeting") : t("close_meeting", scope: "decidim.meetings.meetings.meeting") %>
   <li role="menuitem">
-    <%= link_to edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "button button__sm button__text button__text-secondary"  do %>
+    <%= link_to edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "dropdown__button"  do %>
       <span><%= caption %></span>
       <%= icon "lock-line" %>
     <% end %>
@@ -23,7 +23,7 @@
           :withdraw,
           withdraw_meeting_path(meeting),
           method: :put,
-          class: "button button__sm button__text button__text-secondary" ,
+          class: "dropdown__button" ,
           title: t("withdraw_btn_hint", scope: "decidim.meetings.meetings.show"),
           data: { confirm: t("withdraw_confirmation_html", scope: "decidim.meetings.meetings.show") }
         ) do %>

data/app/views/decidim/meetings/meetings/_meeting_agenda.html.erb

@@ -12,7 +12,7 @@
       <span><%= display_duration_agenda_items(agenda_item.id, index, agenda_items_times) %></span>
     </h3>
 
-    <div class="meeting__agenda-item__description editor-content"><%= decidim_sanitize_translated(agenda_item.description).html_safe %></div>
+    <div class="meeting__agenda-item__description editor-content"><%= render_meeting_sanitize_field(agenda_item, :description) %></div>
 
     <% if agenda_item.agenda_item_children.presence %>
       <% parent_start_time = agenda_items_times[index][:start_time] %>
@@ -24,7 +24,7 @@
             <span><%= translated_attribute(agenda_item_child.title) %></span>
             <span><%= display_duration_agenda_items(agenda_item_child.id, index_child, agenda_item_children_times) %></span>
           </h4>
-          <div class="meeting__agenda-item__description"><%= decidim_sanitize_translated(agenda_item_child.description).html_safe %></div>
+          <div class="meeting__agenda-item__description"><%= render_meeting_sanitize_field(agenda_item_child, :description) %></div>
         </div>
       <% end %>
     <% end %>

data/app/views/decidim/meetings/meetings/_meeting_aside.html.erb

@@ -1,7 +1,7 @@
 <%= render partial: "meeting_poll_actions" %>
 
 <% if meeting.can_be_joined_by?(current_user) || meeting.on_different_platform? %>
-  <section class="layout-aside__section layout-aside__buttons layout-aside__ctas-buttons" data-sticky-buttons>
+  <section class="layout-aside__section layout-aside__buttons layout-aside__ctas-buttons" data-controller="sticky-buttons">
     <%= cell "decidim/meetings/join_meeting_button", meeting, show_remaining_slots: true, hide_modal: local_assigns[:hide_modal] %>
   </section>
 <% end %>
@@ -35,19 +35,20 @@
       <% end %>
     <% end %>
 
-    <% if registration.present? && registration.meeting.component.settings.registration_code_enabled %>
+  <% if registration.present? %>
+    <%= waitlist_status_block(registration) %>
+
+    <% if registration.meeting.component.settings.registration_code_enabled && registration.registered? %>
+      <%= render partial: "registration_code_modal" %>
       <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "coupon-line" } do %>
-        <h3 class="meeting__aside-block__title"><%= registration_code_help_text %></h3>
-        <div class="meeting__aside-block__large"><%= registration.code %></div>
-        <% if registration.validated? %>
-          <div class="label success"><%= t("validated", scope: "decidim.meetings.meetings.show.registration_state") %></div>
-          <% else %>
-          <div class="label warning"><%= t("validation_pending", scope: "decidim.meetings.meetings.show.registration_state") %></div>
-        <% end %>
+        <a href="#" class="text-secondary underline font-semibold text-sm" data-dialog-open="RegistrationQRCodeDialog">
+          <%= registration_code_help_text %>
+        </a>
       <% end %>
     <% end %>
+  <% end %>
 
-    <% if meeting.services.any? %>
+  <% if meeting.services.any? %>
       <% meeting.services.each do |service| %>
         <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "star-line" } do %>
           <h3 class="meeting__aside-block__title"><%= translated_attribute(service["title"]) %></h3>

data/app/views/decidim/meetings/meetings/_meeting_poll_actions.html.erb

@@ -2,10 +2,10 @@
 <% if meeting.poll&.has_questions? %>
   <section class="layout-aside__section layout-aside__buttons<%= extra_classes %>">
     <% reply_text = meeting.poll.has_open_questions? ? t("reply_poll", scope: "decidim.meetings.meetings.meeting") : t("view_poll", scope: "decidim.meetings.meetings.meeting") %>
-    <%= action_authorized_link_to :reply_poll, reply_text, meeting_polls_answers_path(meeting), class: "button button__xl button__secondary w-full", data: { "redirect_url" => meeting_polls_answers_path(meeting) }, resource: meeting %>
+    <%= action_authorized_link_to :reply_poll, reply_text, meeting_polls_responses_path(meeting), class: "button button__xl button__secondary w-full", data: { "redirect_url" => meeting_polls_responses_path(meeting) }, resource: meeting %>
     <% if !allowed_to?(:reply_poll, :meeting, meeting:) && allowed_to?(:update, :poll, meeting:) %>
-      <%= link_to admin_meeting_polls_answers_path(meeting), class: "button button__sm button__transparent-secondary w-full" do %>
-        <span><%= t("administrate", scope: "decidim.meetings.polls.answers.index") %></span>
+      <%= link_to admin_meeting_polls_responses_path(meeting), class: "button button__sm button__transparent-secondary w-full" do %>
+        <span><%= t("administrate", scope: "decidim.meetings.polls.responses.index") %></span>
       <% end %>
     <% end %>
   </section>

data/app/views/decidim/meetings/meetings/_registration_code_modal.html.erb

@@ -0,0 +1,16 @@
+<%= decidim_modal id: "RegistrationQRCodeDialog", class: "qr-modal" do %>
+  <div data-dialog-container>
+    <div data-dialog-title>
+      <%= icon "qr-code-line" %>
+      <h2 class="h4" tabindex="-1"><%= t("registration_and_qr_code", scope: "decidim.meetings.meetings.show") %></h2>
+    </div>
+    <div class="content">
+      <div>
+        <img src="data:;base64,<%= registration_qr_code_image %>" alt="<%= t("registration_and_qr_code", scope: "decidim.meetings.meetings.show") %>">
+      </div>
+      <div class="text-center">
+        <h2 class="h4"><%= t("registration_code", code: registration.code, scope: "decidim.meetings.meetings.show") %></h2>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/decidim/meetings/polls/questions/_index_admin.html.erb

@@ -25,7 +25,7 @@
           <% if question.unpublished? %>
             <button class="button button__sm button__secondary"><%= t(".send") %></button>
           <% else %>
-            <div><%= pluralize(question.answers_count, t(".received_answer"), t(".received_answers")) %></div>
+            <div><%= pluralize(question.responses_count, t(".received_response"), t(".received_responses")) %></div>
           <% end %>
         </div>
 

data/app/views/decidim/meetings/polls/questions/_published_question.html.erb

@@ -4,15 +4,15 @@
 
 <div>
 
-  <% @form = form || Decidim::Meetings::AnswerForm.new(question_id: question.id, current_user:) %>
+  <% @form = form || Decidim::Meetings::ResponseForm.new(question_id: question.id, current_user:) %>
 
   <p class="h3"><%= @form.label %></p>
 
-  <%= decidim_form_for(@form, url: meeting_polls_answers_path(meeting), method: :post, remote: true, html: { class: "form-defaults" }, data: { "safe-path" => meeting_live_event_path(meeting) }) do |form| %>
-    <div class="meeting-polls__answer" data-max-choices="<%= question.max_choices %>">
+  <%= decidim_form_for(@form, url: meeting_polls_responses_path(meeting), method: :post, remote: true, html: { class: "form-defaults" }, data: { "safe-path" => meeting_live_event_path(meeting) }) do |form| %>
+    <div class="meeting-polls__response" data-max-choices="<%= question.max_choices %>">
       <p class="form-error max-choices-alert mt-0 mb-4"><%= t(".max_choices_alert") %></p>
 
-      <%= render partial: "decidim/meetings/polls/answers/#{question.question_type}", locals: { answer: @form.answer, question:, answer_form: form, disabled: question.answered_by?(current_user), field_id: question.id } %>
+      <%= render partial: "decidim/meetings/polls/responses/#{question.question_type}", locals: { response: @form.response, question:, response_form: form, disabled: question.responded_by?(current_user), field_id: question.id } %>
 
       <%= form.hidden_field :question_id %>
 
@@ -20,7 +20,7 @@
         <small class="form-error is-visible mt-1"><%= msg %></small>
       <% end %>
 
-      <% if question.answered_by?(current_user) %>
+      <% if question.responded_by?(current_user) %>
         <%= cell("decidim/announcement", t(".question_replied"), callout_class: "success" ) %>
       <% else %>
         <button class="ml-auto mt-8 button button__lg button__secondary"><%= t(".reply_question") %></button>

data/app/views/decidim/meetings/polls/responses/_multiple_option.html.erb

@@ -0,0 +1,13 @@
+<div class="response-questionnaire__single-option js-check-box-collection">
+  <% question.response_options.each_with_index do |response_option, idx| %>
+    <% choice = response.choices.find { |choice| choice.decidim_response_option_id == response_option.id } if response %>
+
+    <%= label_tag "response[choices][#{response_option.id}][response_option_id]", nil, class: "js-collection-input" do %>
+      <%= check_box_tag "response[choices][#{response_option.id}][response_option_id]",
+                        response_option.id,
+                        choice.present?, disabled: %>
+
+      <%= translated_attribute(response_option.body) %>
+    <% end %>
+  <% end %>
+</div>

data/app/views/decidim/meetings/polls/responses/_single_option.html.erb

@@ -0,0 +1,13 @@
+<% choice = response.choices.first if response %>
+
+<% question.response_options.each_with_index do |response_option, idx| %>
+  <% choice_id = "#{field_id}_choices_#{idx}" %>
+
+  <%= label_tag "#{choice_id}_response_option" do %>
+    <%= radio_button_tag "response[choices][#{question.id}][response_option_id]",
+                         response_option.id,
+                         response_option.id == choice.try(:decidim_response_option_id),
+                         id: "#{choice_id}_response_option", disabled: %>
+    <%= translated_attribute(response_option.body) %>
+  <% end %>
+<% end %>

data/app/views/decidim/meetings/polls/{answers → responses}/admin.html.erb

@@ -14,17 +14,17 @@
   <div class="meeting-polls__topbar is-admin">
     <%= link_to meeting_path(meeting), class: "button button__sm button__text md:button__text-secondary" do %>
       <%= icon "arrow-left-line" %>
-      <%= t("back_to_meeting", scope: "decidim.meetings.polls.answers.index_admin") %>
+      <%= t("back_to_meeting", scope: "decidim.meetings.polls.responses.index_admin") %>
     <% end %>
 
-    <%= action_authorized_link_to :reply_poll, meeting_polls_answers_path(meeting), class: "button button__sm button__secondary", data: { "redirect_url" => meeting_polls_answers_path(meeting) }, resource: meeting do %>
-      <%= t("view_poll", scope: "decidim.meetings.polls.answers.index_admin") %>
+    <%= action_authorized_link_to :reply_poll, meeting_polls_responses_path(meeting), class: "button button__sm button__secondary", data: { "redirect_url" => meeting_polls_responses_path(meeting) }, resource: meeting do %>
+      <%= t("view_poll", scope: "decidim.meetings.polls.responses.index_admin") %>
     <% end %>
   </div>
 
   <div class="text-center">
     <h1 class="title-decorator inline-block text-left">
-      <%= t("title", scope: "decidim.meetings.polls.answers.index_admin") %>
+      <%= t("title", scope: "decidim.meetings.polls.responses.index_admin") %>
     </h1>
   </div>
 

data/app/views/decidim/meetings/polls/{answers → responses}/index.html.erb

@@ -14,19 +14,19 @@
   <div class="meeting-polls__topbar">
     <%= link_to meeting_path(meeting), class: "button button__sm button__text-secondary" do %>
       <%= icon "arrow-left-line" %>
-      <%= t("back_to_meeting", scope: "decidim.meetings.polls.answers.index_admin") %>
+      <%= t("back_to_meeting", scope: "decidim.meetings.polls.responses.index_admin") %>
     <% end %>
 
     <% if admin_allowed_to?(:update, :poll, meeting: meeting, poll: poll) %>
-      <%= link_to admin_meeting_polls_answers_path(meeting), class: "button button__sm button__primary" do %>
-        <%= t("administrate", scope: "decidim.meetings.polls.answers.index") %>
+      <%= link_to admin_meeting_polls_responses_path(meeting), class: "button button__sm button__primary" do %>
+        <%= t("administrate", scope: "decidim.meetings.polls.responses.index") %>
       <% end %>
     <% end %>
   </div>
 
   <div class="text-center">
     <h1 class="title-decorator inline-block text-left">
-      <%= t("title", scope: "decidim.meetings.polls.answers.index") %>
+      <%= t("title", scope: "decidim.meetings.polls.responses.index") %>
     </h1>
   </div>
 

data/app/views/decidim/meetings/registration_mailer/confirmation.html.erb

@@ -1,8 +1,13 @@
 <p class="email-instructions"><%= t(".confirmed_html", title: present(@meeting).title, url: @locator.url) %></p>
 
-<% if @registration.meeting.component.settings.registration_code_enabled %>
+<% if @registration_code_enabled %>
   <p><%= t(".registration_code", code: @registration.code) %></p>
+
+  <center>
+    <%= image_tag attachments[@qr_filename].url %>
+  </center>
 <% end %>
+
 <% if @meeting.customize_registration_email? %>
   <p><%= present(@meeting).registration_email_custom_content %></p>
 <% end %>

data/config/assets.rb

@@ -2,8 +2,8 @@
 
 base_path = File.expand_path("..", __dir__)
 
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
-Decidim::Webpacker.register_entrypoints(
+Decidim::Shakapacker.register_path("#{base_path}/app/packs")
+Decidim::Shakapacker.register_entrypoints(
   decidim_meetings: "#{base_path}/app/packs/entrypoints/decidim_meetings.js",
   decidim_meetings_admin: "#{base_path}/app/packs/entrypoints/decidim_meetings_admin.js"
 )