decidim-meetings 0.27.10 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7eb94f7dff6994e48fa770258b3a8b42a7a9adf0bd8cce80b59b3acefee1cbe
-  data.tar.gz: 3a90f2f9e2f20a83a9dbf7563b41b0f7c183abd550262f70870a2c82065ec454
+  metadata.gz: 93a241fc0fd0001dca0742aa036870fad47d1920466304a88687ee9df038ac95
+  data.tar.gz: 92d9be9a5908337903a535eafc57283c431f09d32e6914561fbf1ce2987a1811
 SHA512:
-  metadata.gz: cf2db137476c016fc3243cf89dc13e9d748938eadb1fa789521bff5b04429894496ee49f6af003ad39e6a7ba03c790ff3ddc800ac5b560d81ebedcff01daeff1
-  data.tar.gz: dfbb91752cd20b038a076be6b2eca5fc7779d52a5adb9d82e7eb582f3e7a9c63162352e27474bdd698717408771b6732889f7e2d110c35ff19d7fb6783f6b3b5
+  metadata.gz: 10652328d80c951307926aa7f23929def21662f4f17a663fcfd22e8972329fa244cc666aea9f86d67b18b2a851a6a42b4016c10ebed10855cceb4ab142c5db48
+  data.tar.gz: 364398407b41b687662b81f29a1db756d4f1ecab6e4bb9a9c7284fb9f02f76dc8579e871a237396b3cfce0595d7cfef10f7c862da10af62d05df8d674e800dc4

data/app/cells/decidim/meetings/attending_organizations_list_cell.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Meetings
+    # This cell renders the list of public participanting
+    # organizations of a meeting.
+    #
+    # Example:
+    #
+    #    cell("decidim/participating_organizations_list", meeting)
+    class AttendingOrganizationsListCell < PublicParticipantsListCell
+      private
+
+      def user_group_ids
+        model.user_group_registrations.user_group_ids
+      end
+
+      def user_groups
+        Decidim::UserGroup.where(id: user_group_ids)
+      end
+
+      # Finds the public organizations (as user groups) of meeting
+      #
+      # Returns an Array of presented UserGroups
+      def public_participants
+        @public_participants ||= user_groups.map { |user_group| present(user_group) }
+      end
+    end
+  end
+end

data/app/cells/decidim/meetings/cancel_registration_meeting_button/cancelation_modal.erb

@@ -0,0 +1,21 @@
+<%= decidim_modal id: "meeting-cancelation-confirm-#{model.id}", class: "meeting__cancelation-modal" do %>
+  <%= decidim_form_for(registration_form, url: meeting_registration_path(model), method: :delete) do |form| %>
+    <div data-dialog-container>
+      <%= icon "door-open-line" %>
+      <h2 id="dialog-title-meeting-cancelation-confirm-<%= model.id %>" data-dialog-title><%= t("leave", scope: "decidim.meetings.meetings.show") %></h2>
+      <div>
+
+        <div id="dialog-desc-meeting-cancelation-confirm-<%= model.id %>" class="meeting__cancelation-modal__description"><%= t("leave_confirmation", scope: "decidim.meetings.meetings.show") %></div>
+      </div>
+    </div>
+    <div data-dialog-actions>
+      <button type="button" class="button button__sm md:button__lg button__transparent-secondary" data-dialog-close="meeting-cancelation-confirm-<%= model.id %>">
+        <span><%= t("close", scope: "decidim.shared.flag_modal") %></span>
+      </button>
+      <button type="submit" class="button button__sm md:button__lg button__secondary">
+        <span><%= t("leave", scope: "decidim.meetings.meetings.show") %></span>
+        <%= icon "arrow-right-line" %>
+      </button>
+    </div>
+  <% end %>
+<% end %>

data/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb

@@ -1,13 +1,10 @@
-<div class="text-center">
-  <%= action_authorized_link_to(
-    :join,
-    meeting_registration_path(model),
-    resource: model,
-    method: :delete,
-    class: button_classes,
-    data: { disable: true, confirm: t("leave_confirmation", scope: "decidim.meetings.meetings.show") }
-  ) do %>
-    <%= t("leave", scope: "decidim.meetings.meetings.show") %>
-    <%= icon icon_name %>
-  <% end %>
-</div>
+<%= render :cancelation_modal %>
+<%= action_authorized_button_to(
+  :join,
+  "#",
+  class: button_classes,
+  data: { "dialog-open": "meeting-cancelation-confirm-#{model.id}" }
+) do %>
+  <%= t("leave", scope: "decidim.meetings.meetings.show") %>
+  <%= icon icon_name %>
+<% end %>

data/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb

@@ -21,11 +21,11 @@ module Decidim
       end
 
       def button_classes
-        ""
+        "button button__sm button__text-secondary"
       end
 
       def icon_name
-        "circle-x"
+        "calendar-close-line"
       end
 
       def registration_form

data/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb

@@ -3,29 +3,19 @@
 module Decidim
   module Meetings
     module ContentBlocks
-      class HighlightedMeetingsCell < Decidim::ContentBlocks::HighlightedElementsCell
-        def base_relation
-          Decidim::Meetings::Meeting
-            .except_withdrawn
-            .published
-            .not_hidden
-            .upcoming
-            .visible_for(current_user)
-            .where(component: published_components)
-        end
+      class HighlightedMeetingsCell < Decidim::ContentBlocks::HighlightedElementsWithCellForListCell
+        private
 
-        def elements
-          @elements ||= base_relation.order(start_time: :asc).limit(limit)
+        def list_cell_path
+          "decidim/meetings/highlighted_meetings_for_component"
         end
 
-        def geolocation_enabled?
-          Decidim::Map.available?(:geocoding)
+        def see_all_path
+          meetings_directory_path if model.scope_name == "homepage"
         end
 
-        private
-
-        def limit
-          geolocation_enabled? ? 4 : 8
+        def meetings_directory_path
+          Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path
         end
       end
     end

data/app/cells/decidim/meetings/dates_and_map/show.erb

@@ -0,0 +1,25 @@
+<div class="meeting__calendar-container">
+  <div class="meeting__calendar meeting__calendar__lg">
+    <div class="meeting__calendar-month">
+      <span><%= l(start_time, format: !same_month? ? "%b" : "%B") %></span>
+      <span class="meeting__calendar-separator"><%= "-" if !same_month? %></span>
+      <span><%= l(end_time, format: "%b") if !same_month? %></span>
+    </div>
+    <div class="meeting__calendar-day">
+      <span><%= l(start_time, format: "%d") %></span>
+      <span class="meeting__calendar-separator"><%= "-" if !same_day? || !same_month? %></span>
+      <span><%= l(end_time, format: "%d") if !same_day? || !same_month? %></span>
+    </div>
+    <div class="meeting__calendar-time">
+      <time datetime="<%= start_time.iso8601 %>"><%= l(start_time, format: "%H:%M") %></time>
+      <span class="meeting__calendar-separator"><%= "-" %></span>
+      <time datetime="<%= end_time.iso8601 %>"><%= l(end_time, format: "%H:%M") %></time>
+    </div>
+  </div>
+
+  <%= static_map %>
+
+  <% if online? %>
+    <%= cell("decidim/address", meeting, online: true) %>
+  <% end %>
+</div>

data/app/cells/decidim/meetings/dates_and_map/static_map.erb

@@ -0,0 +1 @@
+<%= render partial: "decidim/shared/static_map", formats: [:html], locals: { geolocalizable: meeting } %>

data/app/cells/decidim/meetings/dates_and_map_cell.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell renders the meeting dates range and the map if enabled and
+    # available
+    class DatesAndMapCell < Decidim::ViewModel
+      include Cell::ViewModel::Partial
+      include Decidim::MapHelper
+
+      alias meeting model
+
+      delegate :start_time, :end_time, :maps_enabled?, :online?, to: :meeting
+      delegate :snippets, to: :controller
+
+      def static_map
+        return render :static_map if display_map?
+      end
+
+      private
+
+      def same_month?
+        start_time.month == end_time.month
+      end
+
+      def same_day?
+        start_time.day == end_time.day
+      end
+
+      def display_map?
+        maps_enabled? && !online?
+      end
+    end
+  end
+end

data/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb

@@ -1,34 +1,36 @@
-<% if upcoming_meetings.any? %>
-  <div class="section row collapse upcoming_meetings">
-    <h3 class="section-heading">
-      <%= decidim_escape_translated(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.upcoming_meetings") %>
-      <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: upcoming_meetings_count) %></a>
-    </h3>
-    <div class="card card--list">
-      <% upcoming_meetings.includes(:component).each do |meeting| %>
-        <%= card_for meeting, size: :list_item %>
-      <% end %>
-    </div>
-    <%= link_to(
-      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: upcoming_meetings_count),
-      main_component_path(model),
-      class: "button button--sc hollow button--right"
-    ) %>
+<%# NOTE: Since this call can be called from outside decidim-meetings, frontend assets are required %>
+
+<%= apply_meetings_pack_tags %>
+
+<div class="content-block__title">
+  <h2 class="h2 decorator">
+    <%= single_component? ? translated_attribute(model.name) : t("decidim.components.meetings.name") %>
+  </h2>
+  <div class="label text-lg"><%= meetings_count %></div>
+  <% if see_all_path.present? %>
+    <%= link_to see_all_path, class: "button button__sm button__text-secondary" do %>
+      <span><%= t("decidim.participatory_spaces.highlighted_meetings.see_all") %></span>
+      <%= icon "arrow-right-line" %>
+    <% end %>
+  <% end %>
+</div>
+<% if show_map? %>
+  <div class="meeting-list__block-map">
+    <%= cell "decidim/meetings/meetings_map", collection %>
   </div>
-<% elsif past_meetings.any? %>
-  <div class="section row collapse past_meetings">
-    <h3 class="section-heading">
-      <%= decidim_escape_translated(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.past_meetings") %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: past_meetings_count) %></a>
-    </h3>
-    <div class="card card--list">
-      <% past_meetings.each do |meeting| %>
-        <%= card_for meeting, size: :list_item %>
+<% end %>
+<div class="meeting-list__block-list">
+  <% if show_calendar? %>
+    <div class="meeting-list__block-list-aside">
+      <% calendar_months.each do |start_date| %>
+        <%= cell "decidim/meetings/meeting_month", collection, start_date: %>
       <% end %>
     </div>
-    <%= link_to(
-      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: past_meetings_count),
-      main_component_path(model),
-      class: "button button--sc hollow button--right"
-    ) %>
+  <% end %>
+  <div class="card__list-list">
+    <span class="meeting-list__block-list-title"><%= title %></span>
+    <% collection.includes(:component).each do |meeting| %>
+      <%= cell "decidim/meetings/meeting_l", meeting, title_tag: :h3, **options.slice(:show_space) %>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb

@@ -8,41 +8,89 @@ module Decidim
     # It is intended to be used in the `participatory_space_highlighted_elements`
     # view hook.
     class HighlightedMeetingsForComponentCell < Decidim::ViewModel
+      include Decidim::Meetings::ApplicationHelper
       include Decidim::ComponentPathHelper
       include Decidim::CardHelper
+      include Decidim::LayoutHelper
+
+      delegate :snippets, to: :controller
 
       def show
-        render unless meetings_count.zero?
+        render unless items_blank?
+      end
+
+      def items_blank?
+        meetings_count.zero?
       end
 
       private
 
+      def meetings_count
+        @meetings_count ||= meetings.size
+      end
+
+      def base_relation
+        @base_relation ||= Decidim::Meetings::Meeting.where(component: model)
+                                                     .except_withdrawn
+                                                     .published
+                                                     .not_hidden
+                                                     .visible_for(current_user)
+      end
+
+      def section_id
+        return "upcoming_meetings" if show_upcoming_meetings?
+
+        "past_meetings"
+      end
+
+      def collection
+        @collection ||= meetings.limit(limit)
+      end
+
       def meetings
-        @meetings ||= Decidim::Meetings::Meeting.where(component: model)
-                                                .except_withdrawn
-                                                .published
-                                                .not_hidden
-                                                .visible_for(current_user)
+        @meetings ||= show_upcoming_meetings? ? upcoming_meetings : past_meetings
       end
 
-      def past_meetings
-        @past_meetings ||= meetings.past.order(end_time: :desc, start_time: :desc).limit(3)
+      def title
+        return t("upcoming_meetings", scope: "decidim.participatory_spaces.highlighted_meetings") if show_upcoming_meetings?
+
+        t("past_meetings", scope: "decidim.participatory_spaces.highlighted_meetings")
       end
 
-      def upcoming_meetings
-        @upcoming_meetings ||= meetings.upcoming.order(:start_time, :end_time).limit(3)
+      def show_upcoming_meetings?
+        @show_upcoming_meetings ||= options[:force_upcoming] || upcoming_meetings.present?
       end
 
-      def meetings_count
-        @meetings_count ||= meetings.count
+      def show_map?
+        maps_active? && !all_online_meetings?
       end
 
-      def past_meetings_count
-        @past_meetings_count ||= meetings.past.count
+      def maps_active?
+        Decidim::Map.available?(:geocoding, :dynamic)
       end
 
-      def upcoming_meetings_count
-        @upcoming_meetings_count ||= meetings.upcoming.count
+      def all_online_meetings?
+        collection.collect(&:type_of_meeting).all?("online")
+      end
+
+      def show_calendar?
+        @show_calendar ||= show_upcoming_meetings? && collection.minimum(:start_time).before?(2.months.from_now.beginning_of_month)
+      end
+
+      def calendar_months
+        [Date.current, Date.current.next_month]
+      end
+
+      def past_meetings
+        @past_meetings ||= base_relation.past.order(end_time: :desc, start_time: :desc)
+      end
+
+      def upcoming_meetings
+        @upcoming_meetings ||= base_relation.upcoming.order(:start_time, :end_time)
+      end
+
+      def single_component?
+        @single_component ||= model.is_a?(Decidim::Component)
       end
 
       def cache_hash
@@ -53,6 +101,18 @@ module Decidim
         hash << I18n.locale.to_s
         hash.join(Decidim.cache_key_separator)
       end
+
+      def component_routes
+        Decidim::EngineRouter.main_proxy(model)
+      end
+
+      def limit
+        3
+      end
+
+      def see_all_path
+        @see_all_path ||= options[:see_all_path] || (single_component? && main_component_path(model))
+      end
     end
   end
 end

data/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb

@@ -0,0 +1,25 @@
+<%= decidim_modal id: "meeting-registration-confirm-#{model.id}", class: "meeting__registration-modal" do %>
+  <%= decidim_form_for(registration_form, url: meeting_registration_path(model), method: :post) do |form| %>
+    <div data-dialog-container>
+      <%= icon "login-circle-line" %>
+      <h2 id="dialog-title-meeting-registration-confirm-<%= model.id %>" data-dialog-title><%= t("join", scope: "decidim.meetings.meetings.show") %></h2>
+      <div>
+
+        <div class="form__wrapper">
+          <%= cell("decidim/represent_user_group", form) %>
+          <%= cell("decidim/public_participation", form) %>
+          <span class="meeting__registration-modal__terms"><%= registration_terms_text %></span>
+        </div>
+      </div>
+    </div>
+    <div data-dialog-actions>
+      <button type="button" class="button button__sm md:button__lg button__transparent-secondary" data-dialog-close="meeting-registration-confirm-<%= model.id %>">
+        <span><%= i18n_cancel_text %></span>
+      </button>
+      <button type="submit" class="button button__sm md:button__lg button__secondary">
+        <span><%= i18n_confirm_text %></span>
+        <%= icon "arrow-right-line" %>
+      </button>
+    </div>
+  <% end %>
+<% end %>

data/app/cells/decidim/meetings/join_meeting_button/remaining_slots.erb

@@ -0,0 +1,4 @@
+<div class="meeting__aside-progress">
+  <span><%= t("remaining_slots", scope: "decidim.meetings.meetings.show", count: model.remaining_slots) %></span>
+  <progress value="<%= model.remaining_slots %>" max="<%= model.available_slots %>"></progress>
+</div>

data/app/cells/decidim/meetings/join_meeting_button/show.erb

@@ -6,23 +6,25 @@
         i18n_join_text,
         join_meeting_registration_path(model),
         class: button_classes,
-        disabled: !model.has_available_slots?,
+        disabled: !model.has_available_slots?
       ) %>
     <% else %>
-      <%= render :registration_confirm %>
+      <%= render :registration_modal %>
       <%= action_authorized_button_to(
         :join,
         i18n_join_text,
         "#",
         class: button_classes,
         disabled: !model.has_available_slots?,
-        data: { open: current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" }
+        data: { "dialog-open": current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" }
       ) %>
     <% end %>
   <% end %>
+
   <% if shows_remaining_slots? %>
-    <span><%= t("remaining_slots", scope: "decidim.meetings.meetings.show", count: model.remaining_slots) %></span>
+    <%= render :remaining_slots %>
   <% end %>
+
 <% elsif model.on_different_platform? %>
   <%= action_authorized_link_to(
     :join,

data/app/cells/decidim/meetings/join_meeting_button_cell.rb

@@ -10,6 +10,8 @@ module Decidim
       include ActionView::Helpers::FormOptionsHelper
 
       def show
+        return unless model.can_be_joined_by?(current_user) || model.on_different_platform?
+
         render
       end
 
@@ -22,13 +24,7 @@ module Decidim
       end
 
       def button_classes
-        return "button expanded button--sc" if big_button?
-
-        "button card__button button--sc small"
-      end
-
-      def big_button?
-        options[:big_button]
+        "button button__xl button__secondary w-full"
       end
 
       def shows_remaining_slots?

data/app/cells/decidim/meetings/meeting_activity_cell.rb

@@ -5,18 +5,7 @@ module Decidim
     # A cell to display when actions happen on a meeting.
     class MeetingActivityCell < ActivityCell
       def title
-        case action
-        when "update"
-          I18n.t(
-            "decidim.meetings.last_activity.meeting_updated_at_html",
-            link: participatory_space_link
-          )
-        else
-          I18n.t(
-            "decidim.meetings.last_activity.new_meeting_at_html",
-            link: participatory_space_link
-          )
-        end
+        action == "update" ? I18n.t("decidim.meetings.last_activity.meeting_updated") : I18n.t("decidim.meetings.last_activity.new_meeting")
       end
 
       def resource_link_text

data/app/cells/decidim/meetings/meeting_card_metadata_cell.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell renders metadata for an instance of a Meeting
+    class MeetingCardMetadataCell < Decidim::CardMetadataCell
+      include Decidim::LayoutHelper
+      include ActionView::Helpers::DateHelper
+
+      alias meeting model
+
+      delegate :type_of_meeting, :start_time, :end_time, :category, :withdrawn?, to: :meeting
+
+      alias start_date start_time
+      alias end_date end_time
+
+      def initialize(*)
+        super
+
+        @items.prepend(*meeting_items)
+      end
+
+      private
+
+      def meeting_items
+        [type, duration_item, comments_count_item, category_item, withdrawn_item]
+      end
+
+      def meeting_items_for_map
+        [dates_item, type].compact_blank.map do |item|
+          {
+            text: item[:text],
+            icon: icon(item[:icon]).html_safe
+          }
+        end
+      end
+
+      def type
+        {
+          text: t(type_of_meeting, scope: "decidim.meetings.meetings.filters.type_values"),
+          icon: resource_type_icon_key(type_of_meeting)
+        }
+      end
+
+      def official
+        return unless official?
+
+        {
+          text: t("decidim.meetings.models.meeting.fields.official_meeting"),
+          icon: "information-line"
+        }
+      end
+
+      def withdrawn_item
+        return unless withdrawn?
+
+        {
+          text: t("withdraw", scope: "decidim.meetings.types"),
+          icon: resource_type_icon_key("withdrawn")
+        }
+      end
+    end
+  end
+end

data/app/cells/decidim/meetings/meeting_cell.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This cell renders the meeting card for an instance of a Meeting
-    # the default size is the Medium Card (:m)
+    # the default size is the List Card (:l)
     # also available the List Item Card (:list_item)
     class MeetingCell < Decidim::ViewModel
       include Decidim::SanitizeHelper
@@ -18,14 +18,10 @@ module Decidim
 
       def card_size
         case @options[:size]
-        when :highlighted_list_item
-          "decidim/meetings/meeting_highlighted_list_item"
-        when :list_item
-          "decidim/meetings/meeting_list_item"
         when :s
           "decidim/meetings/meeting_s"
         else
-          "decidim/meetings/meeting_m"
+          "decidim/meetings/meeting_l"
         end
       end
 

data/app/cells/decidim/meetings/meeting_l/image.erb

@@ -0,0 +1,5 @@
+<time class="card__calendar" datetime="<%= meeting.start_time.iso8601 %>">
+  <div class="card__calendar-month"><%= l(meeting.start_time, format: "%b") %></div>
+  <div class="card__calendar-day"><%= l(meeting.start_time, format: "%d") %></div>
+  <div class="card__calendar-time"><%= l(meeting.start_time, format: "%H:%M") %></div>
+</time>

data/app/cells/decidim/meetings/meeting_l_cell.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Meetings
+    # This cell renders the List (:l) meeting card
+    # for an instance of a Meeting
+    class MeetingLCell < Decidim::CardLCell
+      delegate :component_settings, to: :controller
+
+      alias meeting model
+
+      def has_image?
+        true
+      end
+
+      def extra_class
+        "card__calendar-list__reset"
+      end
+
+      def image
+        render
+      end
+
+      private
+
+      def metadata_cell
+        "decidim/meetings/meeting_card_metadata"
+      end
+    end
+  end
+end