decidim-meetings 0.24.3 → 0.25.0.rc4

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

@@ -1,42 +1,31 @@
 <div class="section minutes-section">
-  <h3 class="section-heading"><%= t(".meeting_minutes") %></h3>
-  <% if translated_attribute(meeting.minutes.description).present? %>
-    <div class="card">
-      <div class="card-section">
-        <div class="row column">
-          <%= decidim_sanitize translated_attribute meeting.minutes.description %>
-        </div>
-      </div>
-    </div>
-  <% end %>
-
-  <% if meeting.minutes.video_url.presence || meeting.minutes.audio_url.presence %>
+  <% if meeting.video_url.presence || meeting.audio_url.presence %>
     <div class="section">
       <h4 class="section-heading"><%= t(".related_information") %></h4>
       <div class="card card--list">
-        <% if meeting.minutes.video_url.presence %>
+        <% if meeting.video_url.presence %>
           <div class="card--list__item">
             <div class="card--list__text">
               <div>
-                <%= link_to decidim_url_escape(meeting.minutes.video_url), decidim_html_escape(meeting.minutes.video_url), target: "_blank", rel: "noopener" %>
+                <%= link_to decidim_url_escape(meeting.video_url), decidim_html_escape(meeting.video_url), target: "_blank", rel: "noopener" %>
               </div>
             </div>
             <div class="card--list__data" aria-hidden="true">
-              <%= link_to decidim_url_escape(meeting.minutes.video_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
+              <%= link_to decidim_url_escape(meeting.video_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
                 <%= icon "external-link", role: "img", "aria-hidden": true %>
               <% end %>
             </div>
           </div>
         <% end %>
-        <% if meeting.minutes.audio_url.presence %>
+        <% if meeting.audio_url.presence %>
           <div class="card--list__item">
             <div class="card--list__text">
               <div>
-                <%= link_to decidim_url_escape(meeting.minutes.audio_url), decidim_html_escape(meeting.minutes.audio_url), target: "_blank", rel: "noopener" %>
+                <%= link_to decidim_url_escape(meeting.audio_url), decidim_html_escape(meeting.audio_url), target: "_blank", rel: "noopener" %>
               </div>
             </div>
             <div class="card--list__data" aria-hidden="true">
-              <%= link_to decidim_url_escape(meeting.minutes.audio_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
+              <%= link_to decidim_url_escape(meeting.audio_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
                 <%= icon "external-link", role: "img", "aria-hidden": true %>
               <% end %>
             </div>

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

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="columns large-3">
     <%= link_to :back do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img" %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria--hidden": true %>
       <%= t(".back") %>
     <% end %>
   </div>

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

@@ -1,6 +1,8 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
-<%= cell "decidim/meetings/meetings_map", search.results %>
+<% if current_component.settings.maps_enabled? && search.results.not_online.exists? %>
+  <%= cell "decidim/meetings/meetings_map", search.results %>
+<% end %>
 
 <div class="row columns">
   <div class="title-action">
@@ -11,7 +13,7 @@
     <% if allowed_to?(:create, :meeting) %>
       <%= action_authorized_link_to :create, new_meeting_path, class: "title-action__action button small", data: { "redirect_url" => new_meeting_path } do %>
         <%= t("new_meeting", scope: "decidim.meetings.meetings.index") %>
-        <%= icon "plus", role: "img" %>
+        <%= icon "plus", role: "img", "aria-hidden": true %>
       <% end %>
     <% end %>
   </div>
@@ -28,5 +30,3 @@
     <%= render partial: "meetings" %>
   </div>
 </div>
-
-<%= javascript_include_tag("decidim/filters") %>

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

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="columns large-3">
     <%= link_to :back do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img" %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
       <%= t(".back") %>
     <% end %>
   </div>

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

@@ -23,7 +23,7 @@ edit_link(
     <% end %>
   </div>
 
-  <h2 class="heading2"><%= present(meeting).title(links: true) %></h2>
+  <h2 class="heading2"><%= present(meeting).title(links: true, html_escape: true ) %></h2>
 
   <%= cell "decidim/author", author_presenter_for(meeting.normalized_author), has_actions: true, from: meeting, context: { extra_classes: ["author-data--small"] } %>
 
@@ -54,7 +54,7 @@ edit_link(
         <%= cell "decidim/meetings/join_meeting_button", meeting, big_button: true, show_remaining_slots: true %>
         <%= render partial: "decidim/shared/follow_button", locals: { followable: meeting, large: false  } %>
       </div>
-      <% if meeting.closed? %>
+      <% if meeting.closed? && meeting.closing_visible? %>
         <% double = meeting.has_contributions? && meeting.has_attendees? %>
         <div class="card card--secondary extra definition-data">
           <% if meeting.has_contributions? %>
@@ -69,7 +69,7 @@ edit_link(
               <span class="definition-data__number"><%= meeting.attendees_count %></span>
             </div>
           <% end %>
-          <% if meeting.attending_organizations %>
+          <% if meeting.attending_organizations.present? %>
             <div class="definition-data__item">
               <span class="definition-data__title"><%= t(".organizations") %></span>
               <span class="definition-data__text"><%= simple_format(meeting.attending_organizations) %></span>
@@ -111,6 +111,7 @@ edit_link(
     <%= resource_version(meeting, versions_path: meeting_versions_path(meeting)) %>
     <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for meeting_widget_url(meeting, format: :js) %>
+    <%= render partial: "calendar_modal", locals: { ics_url: calendar_meeting_url(meeting), google_url: google_calendar_event_url(meeting) } %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
@@ -126,15 +127,14 @@ edit_link(
       <% end %>
       <%= decidim_sanitize(present(meeting).description(links: true)) %>
 
-      <% if meeting.online_meeting? %>
-        <%= render partial: "online_meeting_link", locals: { meeting: meeting } %>
-      <% elsif meeting.hybrid_meeting? %>
-       <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
-       <%= render partial: "online_meeting_link", locals: { meeting: meeting } %>
-      <% else %>
+      <% if meeting.maps_enabled? && !meeting.online_meeting? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
       <% end %>
 
+      <% unless meeting.in_person_meeting? %>
+        <%= cell "decidim/meetings/online_meeting_link", meeting %>
+      <% end %>
+
       <%= render partial: "decidim/shared/tags", locals: { resource: meeting, tags_class_extra: "tags--meeting" } %>
     </div>
 
@@ -142,9 +142,7 @@ edit_link(
       <%= render "meeting_agenda" %>
     <% end %>
 
-    <% if meeting.minutes.present? && meeting.minutes.visible? %>
-      <%= render "meeting_minutes" %>
-    <% end %>
+    <%= cell "decidim/meetings/public_participants_list", meeting %>
 
     <% if !meeting.closed? && meeting.user_group_registrations.any? %>
       <% user_group_ids = meeting.user_group_registrations.user_group_ids %>
@@ -162,12 +160,13 @@ edit_link(
       </div>
     <% end %>
 
-    <% if meeting.closed? %>
+    <% if meeting.closed? && meeting.closing_visible? %>
       <div class="section">
-        <h3 class="section-heading"><%= t(".meeting_report") %></h3>
+        <h3 class="section-heading"><%= t(".meeting_minutes") %></h3>
         <%= decidim_sanitize translated_attribute meeting.closing_report %>
       </div>
     <% end %>
+
     <%= linked_resources_for meeting, :proposals, "proposals_from_meeting" %>
     <%= linked_resources_for meeting, :results, "meetings_through_proposals" %>
   </div>

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

@@ -0,0 +1,13 @@
+<% question.answer_options.each_with_index do |answer_option, idx| %>
+  <% choice = answer.choices.find { |choice| choice.decidim_answer_option_id == answer_option.id } if answer %>
+
+  <%= label_tag do %>
+    <%= check_box_tag "answer[choices][#{idx}][body]",
+                      translated_attribute(answer_option.body),
+                      choice.present?, disabled: disabled %>
+
+    <%= translated_attribute(answer_option.body) %>
+
+    <%= hidden_field_tag "answer[choices][#{idx}][answer_option_id]", answer_option.id, disabled: disabled %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,19 @@
+<% choice = answer.choices.first if answer %>
+
+<% question.answer_options.each_with_index do |answer_option, idx| %>
+  <% choice_id = "#{field_id}_choices_#{idx}" %>
+
+  <%= label_tag "#{choice_id}_body" do %>
+    <%= radio_button_tag "answer[choices][#{idx}][body]",
+                        translated_attribute(answer_option.body),
+                        answer_option.id == choice.try(:decidim_answer_option_id),
+                        id: "#{choice_id}_body", disabled: disabled %>
+
+    <%= translated_attribute(answer_option.body) %>
+
+    <%= hidden_field_tag "answer[choices][#{idx}][answer_option_id]",
+                        answer_option.id,
+                        id: "#{choice_id}_answer_option",
+                        disabled: disabled %>
+  <% end %>
+<% end %>

data/app/views/decidim/meetings/polls/answers/create.js.erb

@@ -0,0 +1,5 @@
+var $question = $("[data-question=\"<%= question.id %>\"]");
+
+if($question.length){
+  $question.replaceWith('<%= j(render partial: "decidim/meetings/polls/questions/question", locals: { form: @form, question: question, open_question: question }).strip.html_safe %>');
+}

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

@@ -0,0 +1,7 @@
+<summary><%= t(".question_results") %></summary>
+
+<div>
+  <p><%= translated_attribute(question.body) %></p>
+
+  <%= cell "decidim/meetings/question_responses", question %>
+</div>

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

@@ -0,0 +1,5 @@
+<% if questionnaire.all_questions_unpublished? %>
+  <p class="padding-1"><%= t(".empty_questions") %></p>
+<% else %>
+  <%= render partial: "decidim/meetings/polls/questions/question", collection: questionnaire.questions.includes([:questionnaire]).visible %>
+<% end %>

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

@@ -0,0 +1,43 @@
+<div class="meeting-polls__admin-label"><%= t(".admin_dashboard") %></div>
+
+<% questionnaire.questions.includes([:questionnaire]).each do |question| %>
+  <details class="meeting-polls__question--admin text-medium open" data-question="<%= question.id %>" <%= "open" if open_question == question.id %>>
+    <summary><%= t(".question") %></summary>
+
+    <%= form_tag(meeting_polls_question_path(meeting, question), method: :patch, remote: true) do %>
+      <div>
+        <p><%= translated_attribute(question.body) %></p>
+
+        <%= link_to t(".edit"), Decidim::EngineRouter.admin_proxy(meeting.component).edit_meeting_poll_path(meeting), target: "_blank", rel: "noopener noreferrer" %>
+
+        <div class="meeting-polls__admin-action meeting-polls__admin-action-question">
+          <div><%= t(".question") %></div>
+          <div>
+            <% if question.unpublished? %>
+              <button class="button button--nomargin primary small"><%= t(".send") %></button>
+            <% else %>
+              <div><strong><%= t(".sent") %></strong></div>
+              <div><%= pluralize(question.answers_count, t(".received_answer"), t(".received_answers")) %></div>
+            <% end %>
+          </div>
+        </div>
+        <div class="meeting-polls__admin-action meeting-polls__admin-action-results">
+          <div><%= t(".results") %></div>
+          <div>
+            <% unless question.unpublished? %>
+              <%= cell "decidim/meetings/question_responses", question %>
+            <% end %>
+
+            <% if question.unpublished? %>
+              <button class="button button--nomargin primary small margin-top-1" disabled><%= t(".send") %></button>
+            <% elsif question.published? %>
+              <button class="button button--nomargin primary small margin-top-1"><%= t(".send") %></button>
+            <% elsif question.closed? %>
+              <div class="margin-top-1"><strong><%= t(".sent") %></strong></div>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </details>
+<% end %>

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

@@ -0,0 +1,29 @@
+<summary><%= t(".question") %></summary>
+
+<div>
+  <p><%= translated_attribute(question.body) %></p>
+
+  <% @form = form || Decidim::Meetings::AnswerForm.new(question_id: question.id, current_user: current_user) %>
+  <%= decidim_form_for(@form, url: meeting_polls_answers_path(meeting), method: :post, remote: true, html: { class: "form answer-questionnaire" }, data: { "safe-path" => meeting_live_event_path(meeting) }) do |form| %>
+    <div class="row column answer question" data-max-choices="<%= question.max_choices %>">
+      <%= render partial: "decidim/meetings/polls/answers/#{question.question_type}", locals: { answer: @form.answer, question: question, answer_form: form, disabled: question.answered_by?(current_user), field_id: question.id  } %>
+
+      <%= form.hidden_field :question_id %>
+
+      <small class="form-error max-choices-alert"><%= t(".max_choices_alert") %></small>
+
+      <% @form.errors.full_messages.each do |msg| %>
+        <small class="form-error is-visible margin-top-1"><%= msg %></small>
+      <% end %>
+    </div>
+    <% if question.answered_by?(current_user) %>
+      <div class="callout success margin-top-1">
+        <%= t(".question_replied") %>
+      </div>
+    <% else %>
+      <div class="text-right">
+        <button class="button button--nomargin primary small margin-top-1"><%= t(".reply_question") %></button>
+      </div>
+    <% end %>
+  <% end %>
+</div>

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

@@ -0,0 +1,7 @@
+<details class="meeting-polls__question text-medium" data-question="<%= question.id %>" <%= "open" if local_assigns.fetch(:open_question, nil) == question %>>
+  <% if question.published? %>
+    <%= render partial: "decidim/meetings/polls/questions/published_question", locals: { question: question, form: local_assigns.fetch(:form, nil) } %>
+  <% elsif question.closed? %>
+    <%= render partial: "decidim/meetings/polls/questions/closed_question", locals: { question: question } %>
+  <% end %>
+</details>

data/app/views/decidim/meetings/polls/questions/index.js.erb

@@ -0,0 +1,5 @@
+var $aside = $("#meeting-poll-aside");
+
+if($aside.length){
+  $aside.html('<%= j(render partial: "decidim/meetings/polls/questions/index").strip.html_safe %>');
+}

data/app/views/decidim/meetings/polls/questions/index_admin.js.erb

@@ -0,0 +1,5 @@
+var $aside = $("#admin-meeting-poll-aside");
+
+if($aside.length){
+  $aside.html('<%= j(render partial: "decidim/meetings/polls/questions/index_admin", locals: { open_question: open_question }).strip.html_safe %>');
+}

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

@@ -1,7 +1,10 @@
-<p><%= t(".confirmed_html", title: present(@meeting).title, url: @locator.url) %></p>
+<p class="email-instructions"><%= t(".confirmed_html", title: present(@meeting).title, url: @locator.url) %></p>
 
 <% if @registration.meeting.component.settings.registration_code_enabled %>
   <p><%= t(".registration_code", code: @registration.code) %></p>
 <% end %>
+<% if @meeting.customize_registration_email? %>
+  <p><%= present(@meeting).registration_email_custom_content %></p>
+<% end %>
 
-<p><%= t(".details") %></p>
+<p class="email-instructions"><%= t(".details") %></p>

data/app/views/devise/mailer/join_meeting.html.erb

@@ -1,14 +1,14 @@
-<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
+<p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
 
-<p>
+<p class="email-instructions">
   <%= t("decidim.meetings.admin.invite_join_meeting_mailer.invite.invited_you_to_join_a_meeting", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
 </p>
 
-<p><%= link_to t("devise.mailer.invitation_instructions.decline"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:meeting].component).decline_invitation_meeting_registration_path(meeting_id: @opts[:meeting], participatory_space_id: @opts[:meeting].component.participatory_space), host: @resource.organization.host) %></p>
-<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:meeting].component).meeting_registration_path(meeting_id: @opts[:meeting], participatory_space_id: @opts[:meeting].component.participatory_space), host: @resource.organization.host) %></p>
+<p class="email-button email-button__cta cta-decline"><%= link_to t("devise.mailer.invitation_instructions.decline"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:meeting].component).decline_invitation_meeting_registration_path(meeting_id: @opts[:meeting], participatory_space_id: @opts[:meeting].component.participatory_space), host: @resource.organization.host) %></p>
+<p class="email-button email-button__cta cta-accept"><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:meeting].component).meeting_registration_path(meeting_id: @opts[:meeting], participatory_space_id: @opts[:meeting].component.participatory_space), host: @resource.organization.host) %></p>
 
 <% if @resource.invitation_due_at %>
-  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
+  <p class="email-small"><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
 <% end %>
 
-<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>
+<p class="email-small email-closing"><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>

data/config/assets.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+base_path = File.expand_path("..", __dir__)
+
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Webpacker.register_entrypoints(
+  decidim_meetings: "#{base_path}/app/packs/entrypoints/decidim_meetings.js",
+  decidim_meetings_admin: "#{base_path}/app/packs/entrypoints/decidim_meetings_admin.js"
+)
+
+Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/meetings/meetings")

data/config/locales/ar.yml

@@ -8,7 +8,8 @@ ar:
       close_meeting:
         attendees_count: عدد الحضور
         attending_organizations: قائمة المنظمات التي حضرت
-        closing_report: أبلغ عن
+        closing_report: الدقائق
+        closing_visible: مرئي
         contributions_count: عدد المساهمات
         proposal_ids: المقترحات التي تم إنشاؤها في الاجتماع
       meeting:
@@ -28,9 +29,6 @@ ar:
         start_time: وقت البدء
         title: عنوان
         transparent: شفاف
-      minutes:
-        description: وصف
-        visible: مرئي
     errors:
       models:
         meeting_agenda:
@@ -162,7 +160,6 @@ ar:
         confirm_destroy: هل أنت متأكد أنك تريد حذف هذا الاجتماع؟
         destroy: حذف
         edit: تعديل
-        minutes: الدقائق
         new: اجتماع جديد
         preview: معاينة
         registrations: التسجيلات
@@ -238,7 +235,6 @@ ar:
             success: تم إغلاق الاجتماع بنجاح
           create:
             invalid: كانت هناك مشكلة في إنشاء هذا الاجتماع
-            success: تم إنشاء الاجتماع بنجاح
           destroy:
             success: تم حذف الاجتماع بنجاح
           edit:
@@ -261,18 +257,6 @@ ar:
           update:
             invalid: حدثت مشكلة أثناء تحديث هذا الاجتماع
             success: تم تحديث الاجتماع بنجاح
-        minutes:
-          create:
-            invalid: كانت هناك مشكلة في إنشاء هذه الدقائق
-            success: تم إنشاء الدقائق بنجاح
-          edit:
-            update: تحديث
-          new:
-            create: إنشاء
-            title: خلق دقائق
-          update:
-            invalid: حدثت مشكلة أثناء تحديث هذه الدقائق
-            success: تم تحديث الدقائق بنجاح
         models:
           meeting:
             name: لقاء
@@ -315,9 +299,6 @@ ar:
           value_types:
             organizer_presenter:
               not_found: 'لم يتم العثور على المنظم في قاعدة البيانات (المعرف: %{id})'
-        minutes:
-          create: "%{user_name} خلق محضر الاجتماع %{resource_name} على %{space_name} الفضاء"
-          update: "%{user_name} تحديث محضر الاجتماع %{resource_name} على %{space_name} الفضاء"
       calendar_modal:
         calendar_url: العنوان الشبكي للتقويم
         close_window: أغلق النافذة
@@ -360,7 +341,6 @@ ar:
           filter_by: مصنف بواسطة
           unfold: كشف
         meeting_minutes:
-          meeting_minutes: محضر الاجتماع
           related_information: معلومات ذات صله
         meetings:
           no_meetings_warning: لا توجد اجتماعات تطابق معايير البحث الخاصة بك أو لا يوجد أي اجتماع مجدولة.
@@ -371,9 +351,8 @@ ar:
         show:
           attendees: الحضور الحضور
           contributions: عدد المساهمات
-          going: ذاهب
           join: أنضم إلى الأجتماع
-          meeting_report: تقرير الاجتماع
+          meeting_minutes: محضر الاجتماع
           no_slots_available: لا فتحات المتاحة
           organizations: حضور المنظمات
           registration_code_help_text: رمز التسجيل الخاص بك