decidim-meetings 0.23.6 → 0.24.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a842085b879c1a1623553767730254c6867ddf2fe3395b74ba93d7a1de819c37
-  data.tar.gz: 70d4bfa767518e8ad406a21530455f240c6e175137ca6263177f7893607798a1
+  metadata.gz: 18653e1c242daed19b47a1986fbd8e12c6dc89d40b66a3264741d32459528e11
+  data.tar.gz: 7260be8c1a3f99993319db38067d463cdf66daa65629a13e9e11d71f6fb08c3e
 SHA512:
-  metadata.gz: 13d26d2fbb27b2201811407c228abf6288a3db91e2be80cd532257fc26513ec2e0bc88210eb4112c91c6e4ad75fa34fed7594f923ba213265a3296fbd0b9252e
-  data.tar.gz: 5994a313372a42c316bb0b3c2748d37b47dc71fa42ab7d93712dc7595fe82db27cbb2558a7da2b239b9d879095b868e12286b76ed3c1c9da1678ceaf05454d6e
+  metadata.gz: 8a1659b38d0e6b3cc197c029d4bc39531385685941a78f7977bf3cb93538de4a7b35e70f1d6aba581cbd13efdd48bdc1b29152d09092bfee21858a4c4ac7fda1
+  data.tar.gz: 1aca577ee9db9cb104b747a11200874154e19c6f4503e0a788602449b750776432381fc767f8468ffc010775b4ed580661faaea668c6c23b894c591300c74123

data/app/assets/config/decidim_meetings_manifest.js

@@ -3,6 +3,7 @@
 //= link decidim/meetings/admin/registrations_form.js
 //= link decidim/meetings/admin/registrations_invite_form.js
 //= link decidim/meetings/admin/meetings_form.js
+//= link decidim/meetings/meetings_form.js
 //= link decidim/meetings/admin/agendas.js
 //= link decidim/meetings/admin/destroy_meeting_alert.js
 //= link_tree ../images/decidim

data/app/assets/javascripts/decidim/meetings/admin/meetings_form.js.es6

@@ -96,5 +96,52 @@
     toggleDisabledHiddenFields();
 
     attachGeocoding($form.find("#meeting_address"));
+
+    const $meetingRegistrationType = $form.find("#meeting_registration_type");
+    const $meetingRegistrationTerms = $form.find("#meeting_registration_terms");
+    const $meetingRegistrationUrl = $form.find("#meeting_registration_url");
+    const $meetingAvailableSlots = $form.find("#meeting_available_slots");
+
+    const toggleDependsOnSelect = ($target, $showDiv, type) => {
+      const value = $target.val();
+      $showDiv.toggle(value === type);
+    };
+
+    $meetingRegistrationType.on("change", (ev) => {
+      const $target = $(ev.target);
+      toggleDependsOnSelect($target, $meetingAvailableSlots, "on_this_platform");
+      toggleDependsOnSelect($target, $meetingRegistrationTerms, "on_this_platform");
+      toggleDependsOnSelect($target, $meetingRegistrationUrl, "on_different_platform");
+    });
+
+    $meetingRegistrationType.trigger("change");
+  }
+
+  const $meetingForm = $(".meetings_form");
+  if ($meetingForm.length > 0) {
+    const $meetingTypeOfMeeting = $meetingForm.find("#meeting_type_of_meeting");
+    const $meetingOnlineFields = $meetingForm.find(".field[data-meeting-type='online']");
+    const $meetingInPersonFields = $meetingForm.find(".field[data-meeting-type='in_person']");
+
+    const toggleDependsOnSelect = ($target, $showDiv, type) => {
+      const value = $target.val();
+      if (value === "hybrid") {
+        $showDiv.show();
+      } else {
+        $showDiv.hide();
+        if (value === type) {
+          $showDiv.show();
+        }
+      }
+    };
+
+    $meetingTypeOfMeeting.on("change", (ev) => {
+      const $target = $(ev.target);
+      toggleDependsOnSelect($target, $meetingOnlineFields, "online");
+      toggleDependsOnSelect($target, $meetingInPersonFields, "in_person");
+    });
+
+    toggleDependsOnSelect($meetingTypeOfMeeting, $meetingOnlineFields, "online");
+    toggleDependsOnSelect($meetingTypeOfMeeting, $meetingInPersonFields, "in_person");
   }
 })(window);

data/app/assets/javascripts/decidim/meetings/meetings_form.js.es6

@@ -5,5 +5,50 @@
   $(() => {
     // Adds the latitude/longitude inputs after the geocoding is done
     attachGeocoding($("#meeting_address"));
+
+    const $form = $(".meetings_form");
+    if ($form.length > 0) {
+      const $meetingTypeOfMeeting = $form.find("#meeting_type_of_meeting");
+      const $meetingOnlineFields = $form.find(".field[data-meeting-type='online']");
+      const $meetingInPersonFields = $form.find(".field[data-meeting-type='in_person']");
+
+      const toggleDependsOnSelect = ($target, $showDiv, type) => {
+        const value = $target.val();
+        if (value === "hybrid") {
+          $showDiv.show();
+        } else {
+          $showDiv.hide();
+          if (value === type) {
+            $showDiv.show();
+          }
+        }
+      };
+
+      $meetingTypeOfMeeting.on("change", (ev) => {
+        const $target = $(ev.target);
+        toggleDependsOnSelect($target, $meetingOnlineFields, "online");
+        toggleDependsOnSelect($target, $meetingInPersonFields, "in_person");
+      });
+
+      toggleDependsOnSelect($meetingTypeOfMeeting, $meetingOnlineFields, "online");
+      toggleDependsOnSelect($meetingTypeOfMeeting, $meetingInPersonFields, "in_person");
+
+
+      const $meetingRegistrationType = $form.find("#meeting_registration_type");
+      const $meetingRegistrationTerms = $form.find("#meeting_registration_terms");
+      const $meetingRegistrationUrl = $form.find("#meeting_registration_url");
+      const $meetingAvailableSlots = $form.find("#meeting_available_slots");
+
+      $meetingRegistrationType.on("change", (ev) => {
+        const $target = $(ev.target);
+        toggleDependsOnSelect($target, $meetingAvailableSlots, "on_this_platform");
+        toggleDependsOnSelect($target, $meetingRegistrationTerms, "on_this_platform");
+        toggleDependsOnSelect($target, $meetingRegistrationUrl, "on_different_platform");
+      });
+
+      toggleDependsOnSelect($meetingRegistrationType, $meetingAvailableSlots, "on_this_platform");
+      toggleDependsOnSelect($meetingRegistrationType, $meetingRegistrationTerms, "on_this_platform");
+      toggleDependsOnSelect($meetingRegistrationType, $meetingRegistrationUrl, "on_different_platform");
+    }
   });
 })(window);

data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/elements.erb

@@ -0,0 +1,16 @@
+<div class="row">
+  <div class="column medium-6">
+    <% elements.first(4).each do |element| %>
+      <%= card_for element, size: :highlighted_list_item %>
+    <% end %>
+  </div>
+  <div class="columns medium-6">
+    <% if geolocation_enabled? %>
+      <%= cell "decidim/meetings/meetings_map", elements %>
+    <% else %>
+      <% elements.offset(4).first(4).each do |element| %>
+        <%= card_for element, size: :highlighted_list_item %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/heading.erb

@@ -0,0 +1 @@
+<h2 class="section-heading"><%= t("decidim.meetings.content_blocks.upcoming_events.upcoming_events") %></h2>

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module ContentBlocks
+      class HighlightedMeetingsCell < Decidim::ContentBlocks::HighlightedElementsCell
+        def base_relation
+          Decidim::Meetings::Meeting.where(component: published_components)
+        end
+
+        def elements
+          @elements ||= base_relation.order(start_time: :asc).limit(limit)
+        end
+
+        def geolocation_enabled?
+          Decidim::Map.available?(:geocoding)
+        end
+
+        private
+
+        def limit
+          geolocation_enabled? ? 4 : 8
+        end
+      end
+    end
+  end
+end

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

@@ -35,4 +35,11 @@
   <% if shows_remaining_slots? %>
     <span><%= t("remaining_slots", scope: "decidim.meetings.meetings.show", count: model.remaining_slots) %></span>
   <% end %>
+<% elsif model.on_different_platform? %>
+  <%= action_authorized_link_to(
+    :join,
+    i18n_join_text,
+    model.registration_url,
+    class: button_classes
+  ) %>
 <% end %>

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

@@ -2,21 +2,13 @@
 
 module Decidim
   module Meetings
-    # A cell to display when actions happen on a meeting.
+    # A cell to display when a meeting has been created.
     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
+        I18n.t(
+          "decidim.meetings.last_activity.new_meeting_at_html",
+          link: participatory_space_link
+        )
       end
 
       def resource_link_text

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

@@ -18,6 +18,8 @@ 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
@@ -27,10 +29,6 @@ module Decidim
         end
       end
 
-      def title
-        present(model).title
-      end
-
       def resource_icon
         icon "meetings", remove_icon_class: true, width: 40, height: 70
       end

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

@@ -0,0 +1,21 @@
+<article class="card">
+  <div class="card__content">
+    <div class="card__header">
+      <%= link_to meeting_path, class: "card__link" do %>
+        <h5 class="card__title">
+          <%= title %>
+        </h5>
+      <% end %>
+    </div>
+    <div class="row">
+      <time datetime="<%= l(model.start_time, format: :long_dashed) %>" class="column medium-4 text-muted">
+        <%= icon "datetime", class: "mr-xs", role: "img", "aria-hidden": true %>
+        <%= l start_date, format: :decidim_with_month_name %>
+      </time>
+      <div class="column medium-8 text-muted">
+        <%= participatory_space_class_name %>
+        <%= link_to participatory_space_title, participatory_space_path %>
+      </div>
+    </div>
+  </div>
+</article>

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell renders the Highlighted List Item Card (:highlighted_list_item)
+    # meeting card for an instance of a Meeting. This card is used in the
+    # content block of Highlighted Meetings and is based on :s size card
+    class MeetingHighlightedListItemCell < MeetingSCell; end
+  end
+end

data/app/cells/decidim/meetings/meeting_m/address.erb

@@ -1 +1,5 @@
-<%= cell "decidim/address", model %>
+<% if online_meeting? %>
+  <%= cell "decidim/meetings/meeting_url", model %>
+<% else %>
+  <%= cell "decidim/address", model %>
+<% end %>

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

@@ -27,6 +27,8 @@ module Decidim
         present(model).title
       end
 
+      delegate :online_meeting?, to: :model
+
       private
 
       def spans_multiple_dates?

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

@@ -0,0 +1,15 @@
+<div class="card__icondata">
+  <ul class="card-data">
+    <li class="card-data__item">
+      <%= resource_icon %>
+    </li>
+    <li class="card-data__item">
+      <div class="text-left">
+        <div class="card__icondata--address">
+          <span><%= link_to(model.online_meeting_url, model.online_meeting_url, target: "_blank") %></span><br>
+          <span><%= translated_attribute model.location_hints %></span>
+        </div>
+      </div>
+    </li>
+  </ul>
+</div>

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell renders the URL address of an online meeting.
+    class MeetingUrlCell < Decidim::ViewModel
+      include Cell::ViewModel::Partial
+      include LayoutHelper
+
+      private
+
+      def resource_icon
+        icon "video", class: "icon--big", role: "img", "aria-hidden": true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+<blockquote>
+  <%= render_value model.description %>
+</blockquote>

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cells renders a small preview of the `Meeting` that is
+    # used in the moderations panel.
+    class ReportedContentCell < Decidim::ReportedContentCell
+      def show
+        render :show
+      end
+    end
+  end
+end

data/app/commands/decidim/meetings/admin/create_meeting.rb

@@ -40,6 +40,11 @@ module Decidim
             description: parsed_description,
             end_time: form.end_time,
             start_time: form.start_time,
+            online_meeting_url: form.online_meeting_url,
+            registration_type: form.registration_type,
+            registration_url: form.registration_url,
+            available_slots: form.available_slots,
+            type_of_meeting: form.clean_type_of_meeting,
             address: form.address,
             latitude: form.latitude,
             longitude: form.longitude,

data/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb

@@ -37,7 +37,7 @@ module Decidim
 
         def already_invited?
           return false unless user.persisted?
-          return false unless meeting.invites.where(user: user).exists?
+          return false unless meeting.invites.exists?(user: user)
 
           form.errors.add(:email, :already_invited)
           true

data/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -48,6 +48,11 @@ module Decidim
             description: parsed_description,
             end_time: form.end_time,
             start_time: form.start_time,
+            online_meeting_url: form.online_meeting_url,
+            registration_type: form.registration_type,
+            registration_url: form.registration_url,
+            available_slots: form.available_slots,
+            type_of_meeting: form.clean_type_of_meeting,
             address: form.address,
             latitude: form.latitude,
             longitude: form.longitude,

data/app/commands/decidim/meetings/admin/validate_registration_code.rb

@@ -35,6 +35,8 @@ module Decidim
         end
 
         def send_notification
+          return unless meeting.component.settings.registration_code_enabled
+
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.registration_code_validated",
             event_class: Decidim::Meetings::RegistrationCodeValidatedEvent,

data/app/commands/decidim/meetings/close_meeting.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This command is executed when the user closes a Meeting from the public
+    # views.
+    class CloseMeeting < Rectify::Command
+      # Initializes a CloseMeeting Command.
+      #
+      # form - The form from which to get the data.
+      # meeting - The current instance of the page to be closed.
+      def initialize(form, meeting)
+        @form = form
+        @meeting = meeting
+      end
+
+      # Closes the meeting if valid.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        transaction do
+          close_meeting
+          link_proposals
+        end
+
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :form, :meeting
+
+      def close_meeting
+        parsed_closing_report = Decidim::ContentProcessor.parse(form.closing_report, current_organization: form.current_organization).rewrite
+
+        Decidim.traceability.perform_action!(
+          :close,
+          meeting,
+          form.current_user
+        ) do
+          meeting.update!(
+            closed_at: form.closed_at,
+            closing_report: { I18n.locale => parsed_closing_report }
+          )
+        end
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_closed",
+          event_class: Decidim::Meetings::CloseMeetingEvent,
+          resource: meeting,
+          followers: meeting.followers
+        )
+      end
+
+      def proposals
+        meeting.sibling_scope(:proposals).where(id: @form.proposal_ids)
+      end
+
+      def link_proposals
+        meeting.link_resources(proposals, "proposals_from_meeting")
+      end
+    end
+  end
+end

data/app/commands/decidim/meetings/create_meeting.rb

@@ -45,7 +45,13 @@ module Decidim
           location_hints: { I18n.locale => form.location_hints },
           author: form.current_user,
           decidim_user_group_id: form.user_group_id,
-          registration_terms: form.current_component.settings.default_registration_terms,
+          online_meeting_url: form.online_meeting_url,
+          registration_type: form.registration_type,
+          registration_url: form.registration_url,
+          available_slots: form.available_slots,
+          registration_terms: { I18n.locale => form.registration_terms },
+          registrations_enabled: form.registrations_enabled,
+          type_of_meeting: form.clean_type_of_meeting,
           component: form.current_component
         }
 

data/app/commands/decidim/meetings/leave_meeting.rb

@@ -40,11 +40,11 @@ module Decidim
 
       def questionnaire_answers
         questionnaire = Decidim::Forms::Questionnaire.find_by(questionnaire_for_id: @meeting)
-        questionnaire.answers.where(user: @user)
+        questionnaire.answers.where(user: @user) if questionnaire.present?
       end
 
       def destroy_questionnaire_answers
-        questionnaire_answers.destroy_all
+        questionnaire_answers.try(:destroy_all)
       end
 
       def decrement_score

data/app/commands/decidim/meetings/update_meeting.rb

@@ -55,7 +55,14 @@ module Decidim
             location: { I18n.locale => form.location },
             location_hints: { I18n.locale => form.location_hints },
             author: form.current_user,
-            decidim_user_group_id: form.user_group_id
+            decidim_user_group_id: form.user_group_id,
+            registration_type: form.registration_type,
+            registration_url: form.registration_url,
+            available_slots: form.available_slots,
+            registration_terms: { I18n.locale => form.registration_terms },
+            registrations_enabled: form.registrations_enabled,
+            type_of_meeting: form.clean_type_of_meeting,
+            online_meeting_url: form.online_meeting_url
           },
           visibility: "public-only"
         )

data/app/controllers/decidim/meetings/admin/application_controller.rb

@@ -13,7 +13,7 @@ module Decidim
         helper_method :meetings, :meeting
 
         def meetings
-          @meetings ||= Meeting.where(component: current_component).order("created_at DESC").page(params[:page]).per(15)
+          @meetings ||= Meeting.where(component: current_component).order(:start_time).page(params[:page]).per(15)
         end
 
         def meeting

data/app/controllers/decidim/meetings/admin/meeting_closes_controller.rb

@@ -12,13 +12,13 @@ module Decidim
         def edit
           enforce_permission_to :close, :meeting, meeting: meeting
 
-          @form = form(CloseMeetingForm).from_model(meeting)
+          @form = form(Admin::CloseMeetingForm).from_model(meeting)
         end
 
         def update
           enforce_permission_to :close, :meeting, meeting: meeting
 
-          @form = form(CloseMeetingForm).from_params(params.merge(proposals: meeting.sibling_scope(:proposals)))
+          @form = form(Admin::CloseMeetingForm).from_params(params.merge(proposals: meeting.sibling_scope(:proposals)))
 
           CloseMeeting.call(@form, meeting) do
             on(:ok) do

data/app/controllers/decidim/meetings/directory/meetings_controller.rb

@@ -25,7 +25,7 @@ module Decidim
           @meeting_spaces = @meeting_spaces.sort_by do |_param, name|
             name
           end
-          @meeting_spaces = @meeting_spaces.prepend(["all", t(".all")])
+          @meeting_spaces.prepend(["all", t(".all")])
         end
 
         def calendar
@@ -53,7 +53,7 @@ module Decidim
 
         def default_search_params
           {
-            scope: Meeting.visible_meeting_for(current_user)
+            scope: Meeting.not_hidden.visible_meeting_for(current_user)
           }
         end
 

data/app/controllers/decidim/meetings/meeting_closes_controller.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This controller allows a participant to update the closing_report and the linked proposals of a closed meeting
+    class MeetingClosesController < Decidim::Meetings::ApplicationController
+      include Decidim::Proposals::Admin::Picker
+      include FormFactory
+
+      helper_method :meeting
+
+      def edit
+        enforce_permission_to :close, :meeting, meeting: meeting
+
+        @form = form(CloseMeetingForm).from_model(meeting)
+      end
+
+      def update
+        enforce_permission_to :close, :meeting, meeting: meeting
+
+        @form = form(CloseMeetingForm).from_params(params.merge(proposals: meeting.sibling_scope(:proposals)))
+
+        CloseMeeting.call(@form, meeting) do
+          on(:ok) do
+            flash[:notice] = I18n.t("meetings.close.success", scope: "decidim.meetings.admin")
+            redirect_to meeting_path(meeting)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("meetings.close.invalid", scope: "decidim.meetings.admin")
+            render action: "edit"
+          end
+        end
+      end
+
+      private
+
+      def meeting
+        @meeting ||= Meeting.where(component: current_component).find(params[:id])
+      end
+    end
+  end
+end

data/app/controllers/decidim/meetings/meetings_controller.rb

@@ -53,8 +53,6 @@ module Decidim
       def show
         raise ActionController::RoutingError, "Not Found" unless meeting
 
-        @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
-
         return if meeting.current_user_can_visit_meeting?(current_user)
 
         flash[:alert] = I18n.t("meeting.not_allowed", scope: "decidim.meetings")
@@ -92,7 +90,7 @@ module Decidim
       end
 
       def meetings
-        @meetings ||= paginate(search.results.not_hidden)
+        @meetings ||= paginate(search.results.order(:start_time))
       end
 
       def registration
@@ -111,9 +109,11 @@ module Decidim
         {
           search_text: "",
           date: %w(upcoming),
+          activity: "all",
           scope_id: default_filter_scope_params,
           category_id: default_filter_category_params,
-          origin: default_filter_origin_params
+          origin: default_filter_origin_params,
+          type: default_filter_type_params
         }
       end
 
@@ -124,9 +124,13 @@ module Decidim
         filter_origin_params
       end
 
+      def default_filter_type_params
+        %w(all) + Decidim::Meetings::Meeting::TYPE_OF_MEETING
+      end
+
       def default_search_params
         {
-          scope: Meeting.visible_meeting_for(current_user)
+          scope: Meeting.not_hidden.visible_meeting_for(current_user)
         }
       end
     end

data/app/forms/decidim/meetings/admin/close_meeting_form.rb

@@ -28,10 +28,10 @@ module Decidim
         end
 
         def proposals
-          @proposals ||= Decidim.find_resource_manifest(:proposals)
-                                .try(:resource_scope, current_component)
-                                &.where(id: proposal_ids)
-                                &.order(title: :asc)
+          @proposals = Decidim.find_resource_manifest(:proposals)
+                              .try(:resource_scope, current_component)
+                              &.where(id: proposal_ids)
+                              &.order(title: :asc)
         end
       end
     end