decidim-meetings 0.21.0 → 0.22.0

data/app/queries/decidim/meetings/metrics/meetings_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -21,10 +18,8 @@ module Decidim
                                                            organization: @organization, decidim_category_id: category_id,
                                                            participatory_space_type: space_type, participatory_space_id: space_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -35,8 +30,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          components = Decidim::Component.where(participatory_space: spaces).published
-          @query = Decidim::Meetings::Meeting.where(component: components).joins(:component)
+          @query = Decidim::Meetings::Meeting.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
                                              .left_outer_joins(:category).visible
           @query = @query.where("decidim_meetings_meetings.created_at <= ?", end_time)
           @query = @query.group("decidim_categorizations.decidim_category_id",

data/app/services/decidim/meetings/calendar/meeting_to_event.rb

@@ -39,7 +39,7 @@ module Decidim
           @event.dtstart = Icalendar::Values::DateTime.new(meeting.start_time.utc, "tzid" => "UTC")
           @event.dtend = Icalendar::Values::DateTime.new(meeting.end_time.utc, "tzid" => "UTC")
           @event.summary = present(meeting).title
-          @event.description = strip_tags(present(meeting).description)
+          @event.description = strip_tags(CGI.unescapeHTML(present(meeting).description))
           @event.location = meeting.address
           @event.geo = [meeting.latitude, meeting.longitude]
           @event.url = url_for(meeting)

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

@@ -1,13 +1,13 @@
-<button class="button button--title secondary light share-link text-center calendar" data-open="calendarShare">
+<button class="button button--title share-link text-center calendar" data-open="calendarShare">
   <%= t(".export_calendar") %>
-  <%= icon "share", class: "icon--after" %>
+  <%= icon "share", class: "icon--after", role: "img", "aria-hidden": true %>
 </button>
 <div class="reveal" id="calendarShare" data-reveal>
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".calendar_url") %>:</h3>
+    <h2 class="reveal__title"><%= t(".calendar_url") %>:</h2>
     <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <input type="text" value="<%= "#{path}" %>" readonly>
+  <input type="text" value="<%= "#{path}" %>" readonly title="<%= t(".calendar_url") %>">
 </div>

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

@@ -45,8 +45,8 @@
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <%= hidden_field_tag :state, @state %>
           <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            <button type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>

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

@@ -22,12 +22,7 @@
       </div>
     </div>
     <div class="row column">
-      <% if @form.proposals %>
-        <%= form.select :proposal_ids,
-                      @form.proposals.order(title: :asc).map{|proposal| [decidim_html_escape(present(proposal).title), proposal.id]},
-                      { include_blank: true },
-                      { multiple: true, class: "chosen-select" } %>
-      <% end %>
+      <%= proposals_picker(form, :proposals, proposals_picker_meeting_meeting_closes_path(meeting)) %>
     </div>
   </div>
 </div>

data/app/views/decidim/meetings/admin/meeting_closes/proposals_picker.html.erb

@@ -0,0 +1 @@
+<%= cell "decidim/proposals/proposals_picker", current_component %>

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

@@ -43,7 +43,7 @@
       <% end %>
 
       <div class="columns xlarge-6">
-        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: "", disable_parents: false %>
+        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
       </div>
     </div>
 

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

@@ -77,7 +77,22 @@
                 <%= resource_permissions_link(meeting) %>
 
                 <% if allowed_to? :destroy, :meeting, meeting: meeting %>
-                  <%= icon_link_to "circle-x", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
+                  <% if present(meeting).authored_proposals.empty? %>
+                    <%= icon_link_to "circle-x", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
+                  <% else %>
+                    <%=
+                      content_tag(:button,
+                                  class: ["action-icon", "action-icon--remove", "destroy-meeting-alert"],
+                                  "data-invalid-destroy-message" => t("actions.invalid_destroy.proposals_count", count: present(meeting).authored_proposals.size, scope: "decidim.meetings"),
+                                  "data-proposal-titles" => present(meeting).formatted_proposals_titles) do
+                        content_tag(:span,
+                                    data: { tooltip: true, disable_hover: false, click_open: false },
+                                    title: t("actions.destroy", scope: "decidim.meetings")) do
+                          icon("circle-x")
+                        end
+                      end
+                    %>
+                  <% end %>
                 <% end %>
               </td>
             </tr>
@@ -88,3 +103,5 @@
     </div>
   </div>
 </div>
+
+<%= javascript_include_tag "decidim/meetings/admin/destroy_meeting_alert" %>

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

@@ -18,6 +18,10 @@
   </div>
 
   <div class="card-section">
+    <div class="callout alert">
+      <%= t(".recommendation_message") %>
+    </div>
+
     <div class="row column">
       <%= form.check_box :registrations_enabled %>
     </div>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".meetings")) %>
+
 <div class="wrapper">
   <div class="row">
     <h1 class="section-heading"><%= t(".meetings") %></h1>
@@ -10,10 +12,10 @@
           <div class="filters__section">
             <div class="filters__search">
               <div class="input-group">
-                <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
+                <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search") %>
                 <div class="input-group-button">
-                  <button type="submit" class="button button--muted">
-                    <%= icon "magnifying-glass", aria_label: t(".search") %>
+                  <button type="submit" class="button">
+                    <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
                   </button>
                 </div>
               </div>

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

@@ -1,11 +1,13 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "meetings" } %>
+
 <%= filter_form_for filter do |form| %>
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t(".search") %>
+          <button type="submit" class="button" aria-controls="meetings">
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
           </button>
         </div>
       </div>
@@ -21,6 +23,12 @@
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
+    <%= form.categories_select :category_id,
+                               current_component.categories,
+                               legend_title: t(".category"),
+                               disable_parents: false,
+                               label: "",
+                               prompt: t(".category_prompt"),
+                               aria_label: t(".category") %>
   <% end %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <div class="row small-up-1 medium-up-2 card-grid">
   <% resources.each do |meeting| %>
     <div class="column">
-      <article class="card card--meeting">
+      <div class="card card--meeting">
         <div class="card__content">
           <%= link_to resource_locator(meeting).path, class: "card__link" do %>
             <h5 class="card__title"><%= present(meeting).title %></h5>
@@ -16,7 +16,7 @@
           </div>
           <%= decidim_sanitize( present(meeting).description ) %>
         </div>
-      </article>
+      </div>
     </div>
   <% end %>
 </div>

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

@@ -7,7 +7,7 @@
       <% agenda_items_times = calculate_start_and_end_time_of_agenda_items(meeting.agenda.agenda_items.first_class, meeting) %>
       <% meeting.agenda.agenda_items.first_class.each_with_index do |agenda_item, index| %>
         <h5 class="agenda-item--title heading5">
-          <strong class="text-uppercase"><%= translated_attribute(agenda_item.title) %></strong>&nbsp;
+          <strong><%= translated_attribute(agenda_item.title) %></strong>&nbsp;
           <span class="text-small"><%= display_duration_agenda_items(agenda_item.id, index, agenda_items_times) %></span>
         </h5>
         <hr class="reset m-none mb-s">
@@ -19,7 +19,7 @@
 
           <% agenda_item.agenda_item_children.each_with_index do |agenda_item_child, index_child| %>
             <h6 class="heading6">
-              <strong class="text-uppercase"><%= translated_attribute(agenda_item_child.title) %></strong>&nbsp;
+              <strong><%= translated_attribute(agenda_item_child.title) %></strong>&nbsp;
               <span class="text-small"><%= display_duration_agenda_items(agenda_item_child.id, index_child, agenda_item_children_times) %></span>
             </h6>
             <p><%= translated_attribute(agenda_item_child.description).html_safe %></p>

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

@@ -18,12 +18,12 @@
           <div class="card--list__item">
             <div class="card--list__text">
               <div>
-                <%= link_to meeting.minutes.video_url, meeting.minutes.video_url, target: "_blank", rel: "noopener" %>
+                <%= link_to decidim_url_escape(meeting.minutes.video_url), decidim_html_escape(meeting.minutes.video_url), target: "_blank", rel: "noopener" %>
               </div>
             </div>
-            <div class="card--list__data">
-              <%= link_to meeting.minutes.video_url, target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
-                <%= icon "external-link" %>
+            <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 %>
+                <%= icon "external-link", role: "img", "aria-hidden": true %>
               <% end %>
             </div>
           </div>
@@ -32,12 +32,12 @@
           <div class="card--list__item">
             <div class="card--list__text">
               <div>
-                <%= link_to meeting.minutes.audio_url, meeting.minutes.audio_url, target: "_blank", rel: "noopener" %>
+                <%= link_to decidim_url_escape(meeting.minutes.audio_url), decidim_html_escape(meeting.minutes.audio_url), target: "_blank", rel: "noopener" %>
               </div>
             </div>
-            <div class="card--list__data">
-              <%= link_to meeting.minutes.audio_url, target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
-                <%= icon "external-link" %>
+            <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 %>
+                <%= icon "external-link", role: "img", "aria-hidden": true %>
               <% end %>
             </div>
           </div>

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

@@ -9,7 +9,7 @@
       <%= render partial: "filters" %>
     </div>
   </div>
-  <div id="meetings" class="columns mediumlarge-8 large-9">
+  <div id="meetings" class="columns mediumlarge-8 large-9" aria-live="polite">
     <%= render partial: "meetings" %>
   </div>
 </div>

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

@@ -16,6 +16,12 @@ edit_link(
 %>
 
 <div class="row column view-header">
+
+  <%= link_to :meetings, class: "small hollow" do %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+    <%= t(".back") %>
+  <% end %>
+
   <h2 class="heading2"><%= present(meeting).title(links: true) %></h2>
   <% if meeting.organizer.present? %>
     <%= cell "decidim/author", present(meeting.organizer) %>
@@ -27,7 +33,10 @@ edit_link(
     <div class="card extra">
       <div class="card__content">
         <div class="extra__date">
-          <%= l meeting.start_time, format: "%d" %> <span class="extra__month"><%= l meeting.start_time, format: "%B" %></span>
+          <%= l meeting.start_time, format: "%d" %>
+          <span class="extra__month"><%= l meeting.start_time, format: "%B" %>
+            <%= l(meeting.start_time, format: "%Y") if meeting.start_time.year != Date.current.year %>
+          </span>
         </div>
         <div class="extra__time">
           <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
@@ -77,9 +86,9 @@ edit_link(
         <% meeting.services.each do |service| %>
           <div class="card--list__item">
             <div class="card--list__text card--list__text--top">
-              <%= icon "actions", class: "card--list__icon alert" %>
+              <%= icon "actions", class: "card--list__icon alert", role: "img", "aria-hidden": true %>
               <div>
-                <h5 class="card--list__heading heading-small"><%= translated_attribute(service["title"]) %></h5>
+                <h3 class="card--list__heading heading-small"><%= translated_attribute(service["title"]) %></h3>
                 <span class="text-medium"><%= translated_attribute(service["description"]) %></span>
               </div>
             </div>
@@ -104,7 +113,7 @@ edit_link(
           <%= t("transparent", scope: "decidim.meetings.types") %>
         </span>
       <% end %>
-      <p><%= decidim_sanitize(present(meeting).description(links: true)) %></p>
+      <%= decidim_sanitize(present(meeting).description(links: true)) %>
       <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
       <%= render partial: "decidim/shared/tags", locals: { resource: meeting, tags_class_extra: "tags--meeting" } %>
     </div>

data/app/views/decidim/participatory_processes/participatory_process_groups/_meeting.html.erb

@@ -1,10 +1,10 @@
 <div class="column">
-  <article class="card card--meeting">
+  <div class="card card--meeting">
     <div class="card__content">
       <%= link_to resource_locator(meeting).path, class: "card__link" do %>
         <h5 class="card__title"><%= present(meeting).title %></h5>
       <% end %>
       <%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: meeting } %>
     </div>
-  </article>
+  </div>
 </div>

data/app/views/decidim/participatory_spaces/_conference_venues.html.erb

@@ -1,7 +1,7 @@
 <% if meetings.any? %>
 <hr class="reset mt-none mb-m">
 <section class="section" id="venues">
-  <h4 class="section-heading"><%= t("conference_venues", scope: "decidim.meetings") %></h4>
+  <h3 class="section-heading"><%= t("conference_venues", scope: "decidim.meetings") %></h3>
   <div class="row">
     <div class="column medium-4">
       <% meetings.each do |meeting_block| %>

data/app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb

@@ -1,6 +1,4 @@
 <div class="card__block">
-  <h6>
-    <strong class="text-uppercase text-small"><%= t("upcoming_meeting", scope: "decidim.participatory_spaces.upcoming_meeting_for_card") %></strong>
-  </h6>
+    <strong class="text-small"><%= t("upcoming_meeting", scope: "decidim.participatory_spaces.upcoming_meeting_for_card") %></strong>
   <%= cell("decidim/meetings/meeting_m", upcoming_meeting).date %>
 </div>

data/config/locales/bg-BG.yml

@@ -0,0 +1,29 @@
+bg:
+  activemodel:
+    attributes:
+      agenda:
+        description: Описание
+        duration: Продължителност
+        title: Заглавие
+  decidim:
+    meetings:
+      actions:
+        invalid_destroy:
+          proposals_count:
+            one: 'Срещата не може да бъде премахната, понеже има %{count} участник свързан с нея:'
+            other: 'Срещата не може да бъде премахната, понеже има %{count} участника свързани с нея:'
+      admin:
+        meeting_copies:
+          form:
+            select_organizer: Изберете организатора
+        meetings:
+          destroy:
+            invalid:
+              proposals_count:
+                one: Срещата не може да бъде премахната, понеже има %{count} участник свързан с нея
+                other: Срещата не може да бъде премахната, понеже има %{count} участника свързани с нея
+          form:
+            select_organizer: Изберете организатора
+      meetings:
+        filters:
+          category_prompt: Изберете категория

data/config/locales/ca.yml

@@ -153,6 +153,10 @@ ca:
         confirm_destroy: Segur que vols suprimir aquesta trobada?
         destroy: Esborra
         edit: Edita
+        invalid_destroy:
+          proposals_count:
+            one: 'No es pot destruir la trobada perquè té %{count} proposta associades:'
+            other: 'No es pot destruir la trobada perquè té %{count} propostes associades:'
         minutes: Acta
         new: Nova trobada
         preview: Previsualitzar
@@ -234,6 +238,10 @@ ca:
             invalid: S'ha produït un error en crear aquesta trobada
             success: Trobada creada amb èxit
           destroy:
+            invalid:
+              proposals_count:
+                one: No es pot destruir la trobada perquè té %{count} proposta associades
+                other: No es pot destruir la trobada perquè té %{count} propostes associades
             success: La trobada s'ha eliminat correctament
           edit:
             update: Actualitzar
@@ -283,6 +291,7 @@ ca:
           form:
             available_slots_help: Deixar a 0 si les inscripcions són il·limitades.
             invites: Invitacions
+            recommendation_message: Per raons de privacitat et recomanem que esborris aquest formulari d'inscripció quan ja no el necessitis. Per defecte això és 3 mesos després que la reunió hagi finalitzat.
             registration_form: Formulari d'inscripció
             registrations_count:
               one: Hi ha hagut %{count} inscripció.
@@ -368,7 +377,9 @@ ca:
           confirm: Confirmar
         show:
           attendees: Nombre d'assistents
+          back: Torna al llistat
           contributions: Nombre d'aportacions
+          date: Data
           going: Inscrit
           join: Inscriu-te a la trobada
           meeting_report: Informe de la trobada

data/config/locales/cs.yml

@@ -159,6 +159,12 @@ cs:
         confirm_destroy: Opravdu chcete tuto schůzku smazat?
         destroy: Odstranit
         edit: Upravit
+        invalid_destroy:
+          proposals_count:
+            one: 'Schůzku nelze zničit, protože má k ní přidružený %{count} návrh:'
+            few: 'Schůzku nelze zničit, protože má k ní přidruženo %{count} návrhů:'
+            many: 'Schůzku nelze zničit, protože má k ní přidruženo %{count} návrhů:'
+            other: 'Schůzka nemůže být zničena, protože s ní je spojeno %{count} návrhů:'
         minutes: Minut
         new: Nové setkání
         preview: Náhled
@@ -240,6 +246,12 @@ cs:
             invalid: Při vytváření této schůzky došlo k problému
             success: Setkání bylo úspěšně vytvořeno
           destroy:
+            invalid:
+              proposals_count:
+                one: Schůzku nelze zničit, protože má k ní přidružený %{count} návrh
+                few: Schůzku nelze zničit, protože má k ní přidruženo %{count} návrhů
+                many: Schůzka nemůže být zničena, protože s ní je spojeno %{count} návrhů
+                other: Schůzka nemůže být zničena, protože s ní je spojeno %{count} návrhů
             success: Setkání bylo úspěšně smazáno
           edit:
             update: Aktualizace
@@ -289,6 +301,7 @@ cs:
           form:
             available_slots_help: Nechte to na 0, pokud máte k dispozici neomezené sloty.
             invites: Pozvánky
+            recommendation_message: Z důvodu ochrany osobních údajů doporučujeme odstranit tento nadepsaný formulář, když jej již nepotřebujete. Ve výchozím nastavení je to 3 měsíce po ukončení schůzky.
             registration_form: Registrační formulář
             registrations_count:
               one: Byla zde registrace %{count}.
@@ -376,7 +389,9 @@ cs:
           confirm: Potvrdit
         show:
           attendees: Počet účastníků
+          back: Zpět na seznam
           contributions: Počet příspěvků
+          date: Datum
           going: Chystáte se
           join: Připojte se k setkání
           meeting_report: Zpráva o schůzce