decidim-meetings 0.24.3 → 0.25.0.rc4

data/app/packs/stylesheets/decidim/meetings/_main.scss

@@ -0,0 +1,178 @@
+.meeting-polls{
+  &__main{
+    flex: 1;
+    display: flex;
+  }
+
+  &__iframe{
+    @extend .bg-muted;
+
+    display: flex;
+
+    > *{
+      flex: 1;
+      border: 0;
+    }
+  }
+
+  &__aside{
+    flex: 0;
+    counter-reset: question;
+
+    & + div{
+      flex: 1;
+    }
+
+    &.is-open{
+      flex: 0 0 20%;
+
+      & + div{
+        flex: 0 0 80%;
+      }
+
+      // shrink iframe when there's two panels
+      & + & + div{
+        flex: 0 0 60%;
+      }
+
+      & + &{
+        border-left: 1px solid #e8e8e8;
+      }
+    }
+  }
+
+  &__question{
+    background-color: $white;
+    border-bottom: 1px solid #e8e8e8;
+
+    summary{
+      @extend .padding-1;
+
+      cursor: pointer;
+      font-weight: bold;
+      color: var(--secondary);
+      transition: background-color .2s ease-in-out;
+
+      &:hover{
+        background-color: #f4f4f4;
+      }
+
+      &::after{
+        counter-increment: question;
+        content: "#" counter(question);
+      }
+
+      & ~ *{
+        padding: 0 1rem 1rem;
+
+        // dynamic content
+        > :first-child{
+          font-weight: 600;
+          line-height: 1.25;
+        }
+
+        label{
+          display: flex;
+          align-items: baseline;
+          cursor: pointer;
+          line-height: 1.25;
+        }
+
+        label + label{
+          margin-top: $global_margin;
+        }
+        // end dynamic content
+      }
+    }
+
+    &[open] .meeting-polls__answer--bar > *{
+      opacity: 1;
+      transform: translateX(0);
+    }
+
+    &.is-new{
+      animation: animateHighlight 5s ease-in-out forwards;
+    }
+
+    @keyframes animateHighlight{
+      0%,
+      80%{
+        background-color: rgba(var(--warning-rgb), .1);
+      }
+    }
+  }
+
+  &__question--admin{
+    @extend .meeting-polls__question;
+
+    summary ~ *{
+      border-top: 1px solid #e8e8e8;
+      background-color: #f6f6f6;
+      padding: 1rem;
+
+      a{
+        text-decoration: underline;
+        margin-bottom: $global_margin;
+        display: block;
+      }
+
+      > :first-child{
+        font-weight: normal;
+      }
+    }
+  }
+
+  &__answer{
+    display: flex;
+    align-items: center;
+
+    &--value{
+      flex: 0 0 15%;
+      font-weight: bold;
+    }
+
+    &--bar{
+      flex: 0 0 85%;
+      height: 10px;
+      overflow: hidden;
+
+      > *{
+        background-color: var(--primary);
+        height: 100%;
+        opacity: 0;
+      }
+    }
+  }
+
+  // vertical flow
+  label + &__answer + label{
+    margin-top: 1.5 * $global_margin;
+  }
+
+  &__admin-label{
+    background-color: #9675ce;
+    color: $white;
+    font-weight: bold;
+    font-size: 14px;
+    padding: 1rem;
+  }
+
+  &__admin-action{
+    border-top: 1px solid #e8e8e8;
+    padding: .5rem 0;
+    display: flex;
+    align-items: center;
+
+    &:last-child{
+      border-bottom: 1px solid #e8e8e8;
+    }
+
+    :first-child{
+      flex: 0 0 40%;
+    }
+
+    :last-child{
+      flex: 0 0 60%;
+    }
+  }
+}

data/app/packs/stylesheets/decidim/meetings/_meetings.scss

@@ -0,0 +1,2 @@
+@import "main";
+@import "header";

data/app/permissions/decidim/meetings/admin/permissions.rb

@@ -11,7 +11,8 @@ module Decidim
           allowed_registration_form_action?
           allowed_meeting_action?
           allowed_agenda_action?
-          allowed_minutes_action?
+          allowed_poll_action?
+          allowed_export_answers?
 
           permission_action
         end
@@ -26,8 +27,8 @@ module Decidim
           @agenda ||= context.fetch(:agenda, nil)
         end
 
-        def minutes
-          @minutes ||= context.fetch(:minutes, nil)
+        def poll
+          @poll ||= context.fetch(:poll, nil)
         end
 
         def registration_form
@@ -69,14 +70,21 @@ module Decidim
           end
         end
 
-        def allowed_minutes_action?
-          return unless permission_action.subject == :minutes
+        def allowed_poll_action?
+          return unless permission_action.subject == :poll
 
           case permission_action.action
-          when :create
-            toggle_allow(meeting.present?)
           when :update
-            toggle_allow(minutes.present? && meeting.present?)
+            toggle_allow(poll.present? && meeting.present?)
+          end
+        end
+
+        def allowed_export_answers?
+          return unless permission_action.subject == :questionnaire
+
+          case permission_action.action
+          when :export_answers
+            permission_action.allow!
           end
         end
       end

data/app/permissions/decidim/meetings/permissions.rb

@@ -10,23 +10,36 @@ module Decidim
         return Decidim::Meetings::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
 
-        return permission_action if permission_action.subject != :meeting
-
-        case permission_action.action
-        when :join
-          toggle_allow(can_join_meeting?)
-        when :leave
-          toggle_allow(can_leave_meeting?)
-        when :decline_invitation
-          toggle_allow(can_decline_invitation?)
-        when :create
-          toggle_allow(can_create_meetings?)
-        when :update
-          toggle_allow(can_update_meeting?)
-        when :close
-          toggle_allow(can_close_meeting?)
-        when :register
-          toggle_allow(can_register_invitation_meeting?)
+        case permission_action.subject
+        when :answer
+          case permission_action.action
+          when :create
+            toggle_allow(can_answer_question?)
+          end
+        when :question
+          case permission_action.action
+          when :update
+            toggle_allow(can_update_question?)
+          end
+        when :meeting
+          case permission_action.action
+          when :join
+            toggle_allow(can_join_meeting?)
+          when :leave
+            toggle_allow(can_leave_meeting?)
+          when :decline_invitation
+            toggle_allow(can_decline_invitation?)
+          when :create
+            toggle_allow(can_create_meetings?)
+          when :update
+            toggle_allow(can_update_meeting?)
+          when :close
+            toggle_allow(can_close_meeting?)
+          when :register
+            toggle_allow(can_register_invitation_meeting?)
+          end
+        else
+          return permission_action
         end
 
         permission_action
@@ -38,6 +51,10 @@ module Decidim
         @meeting ||= context.fetch(:meeting, nil)
       end
 
+      def question
+        @question ||= context.fetch(:question, nil)
+      end
+
       def can_join_meeting?
         meeting.can_be_joined_by?(user) &&
           authorized?(:join, resource: meeting)
@@ -73,6 +90,14 @@ module Decidim
         meeting.can_register_invitation?(user) &&
           authorized?(:register, resource: meeting)
       end
+
+      def can_answer_question?
+        question.present? && user.present? && !question.answered_by?(user)
+      end
+
+      def can_update_question?
+        user.present? && user.admin? && question.present?
+      end
     end
   end
 end

data/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb

@@ -33,7 +33,11 @@ module Decidim
             start_date: :date,
             title: "Decidim::Meetings::AdminLog::ValueTypes::MeetingTitleDescriptionPresenter",
             private_meeting: :boolean,
-            transparent: :boolean
+            transparent: :boolean,
+            published_at: :date,
+            video_url: :string,
+            audio_url: :string,
+            closing_visible: :boolean
           }
         end
 

data/app/presenters/decidim/meetings/meeting_presenter.rb

@@ -5,22 +5,17 @@ module Decidim
     #
     # Decorator for meetings
     #
-    class MeetingPresenter < SimpleDelegator
-      include Decidim::TranslationsHelper
+    class MeetingPresenter < Decidim::ResourcePresenter
       include Decidim::ResourceHelper
-      include Decidim::SanitizeHelper
 
       def meeting
         __getobj__
       end
 
-      def title(links: false, all_locales: false)
+      def title(links: false, html_escape: false, all_locales: false)
         return unless meeting
 
-        handle_locales(meeting.title, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_html_escape(content))
-          renderer.render(links: links).html_safe
-        end
+        super meeting.title, links, html_escape, all_locales
       end
 
       def description(links: false, all_locales: false)
@@ -65,6 +60,26 @@ module Decidim
         end
       end
 
+      def registration_email_custom_content(links: false, all_locales: false)
+        return unless meeting
+
+        handle_locales(meeting.registration_email_custom_content, all_locales) do |content|
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize(content))
+          renderer.render(links: links).html_safe
+        end
+      end
+
+      # start time and end time in rfc3339 format removing '-' and ':' symbols
+      # joined with '/'. This format is used to generate the dates query param
+      # in google calendars event link
+      def dates_param
+        return unless meeting
+
+        [meeting.start_time, meeting.end_time].map do |date|
+          date.rfc3339.tr("-:", "")
+        end.join("/")
+      end
+
       # Next methods are used for present a Meeting As Proposal Author
       def name
         title
@@ -83,7 +98,7 @@ module Decidim
       end
 
       def avatar_url
-        ActionController::Base.helpers.asset_path("decidim/meetings/icon.svg")
+        ActionController::Base.helpers.asset_pack_path("media/images/decidim_meetings.svg")
       end
 
       def deleted?
@@ -99,6 +114,7 @@ module Decidim
       end
 
       def proposals
+        return unless Decidim::Meetings.enable_proposal_linking
         return unless meeting
 
         @proposals ||= meeting.authored_proposals.load
@@ -109,22 +125,6 @@ module Decidim
 
         proposals.map.with_index { |proposal, index| "#{index + 1}) #{proposal.title}\n" }
       end
-
-      private
-
-      def handle_locales(content, all_locales, &block)
-        if all_locales
-          content.each_with_object({}) do |(key, value), parsed_content|
-            parsed_content[key] = if key == "machine_translations"
-                                    handle_locales(value, all_locales, &block)
-                                  else
-                                    block.call(value)
-                                  end
-          end
-        else
-          yield(translated_attribute(content))
-        end
-      end
     end
   end
 end

data/app/queries/decidim/meetings/filtered_meetings.rb

@@ -27,7 +27,7 @@ module Decidim
       # Finds the Projects scoped to an array of components and filtered
       # by a range of dates.
       def query
-        meetings = Decidim::Meetings::Meeting.not_hidden.where(component: @components)
+        meetings = Decidim::Meetings::Meeting.not_hidden.published.where(component: @components)
         meetings = meetings.where("created_at >= ?", @start_at) if @start_at.present?
         meetings = meetings.where("created_at <= ?", @end_at) if @end_at.present?
         meetings

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

@@ -30,7 +30,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          @query = Decidim::Meetings::Meeting.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
+          @query = Decidim::Meetings::Meeting.where(component: visible_components_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/queries/decidim/meetings/questionnaire_user_answers.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # A class used to collect user answers for a questionnaire
+    class QuestionnaireUserAnswers < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # questionnaire - a Questionnaire object
+      def self.for(questionnaire)
+        new(questionnaire).query
+      end
+
+      # Initializes the class.
+      #
+      # questionnaire = a Questionnaire object
+      def initialize(questionnaire)
+        @questionnaire = questionnaire
+      end
+
+      # Finds and group answers by user for each questionnaire's question.
+      def query
+        answers = Answer.joins(:question).where(questionnaire: @questionnaire)
+
+        answers.sort_by { |answer| answer.question.position }.group_by(&:user).values
+      end
+    end
+  end
+end

data/app/serializers/decidim/meetings/data_portability_invite_serializer.rb

@@ -26,7 +26,8 @@ module Decidim
             attendees_count: resource.meeting.attendees_count,
             attending_organizations: resource.meeting.attending_organizations,
             closed_at: resource.meeting.closed_at,
-            closing_report: resource.meeting.closing_report
+            closing_report: resource.meeting.closing_report,
+            published_at: resource.meeting.published_at
           }
         }
       end

data/app/serializers/decidim/meetings/data_portability_registration_serializer.rb

@@ -24,7 +24,8 @@ module Decidim
             attendees_count: resource.meeting.attendees_count,
             attending_organizations: resource.meeting.attending_organizations,
             closed_at: resource.meeting.closed_at,
-            closing_report: resource.meeting.closing_report
+            closing_report: resource.meeting.closing_report,
+            published_at: resource.meeting.published_at
           }
         }
       end

data/app/serializers/decidim/meetings/registration_serializer.rb

@@ -21,18 +21,9 @@ module Decidim
       private
 
       def serialize_answers
-        questions = resource.meeting.questionnaire.questions
-        answers = resource.meeting.questionnaire.answers.where(user: resource.user)
-        questions.each_with_index.inject({}) do |serialized, (question, idx)|
-          answer = answers.find_by(question: question)
-          serialized.update("#{idx + 1}. #{translated_attribute(question.body)}" => normalize_body(answer))
-        end
-      end
-
-      def normalize_body(answer)
-        return "" unless answer
-
-        answer.body || answer.choices.pluck(:body)
+        Decidim::Forms::UserAnswersSerializer.new(
+          resource.meeting.questionnaire.answers.where(user: resource.user)
+        ).serialize
       end
     end
   end

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

@@ -13,8 +13,8 @@ module Decidim
         def events
           Rails.cache.fetch(cache_key) do
             meetings.map do |meeting|
-              MeetingToEvent.new(meeting).to_ical
-            end.join
+              MeetingCalendar.new(meeting).events
+            end.compact.join
           end
         end
 

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Calendar
+      # This class handles how to convert a single meeting to the ICalendar
+      # format. It caches its result until the meeting is updated again.
+      # This class generates a ICalendar entry for an individual meeting.
+      class MeetingCalendar < BaseCalendar
+        # Renders the meeting in an ICalendar format. It caches the results in
+        # Rails' cache.
+        #
+        # Returns a String.
+        def events
+          Rails.cache.fetch(cache_key) do
+            MeetingToEvent.new(meeting).to_ical
+          end
+        end
+
+        private
+
+        alias meeting resource
+
+        # Defines the cache key for the given component.
+        #
+        # Returns a String.
+        def cache_key
+          "meetings-calendar-meeting-#{meeting.id}-#{meeting.updated_at.to_i}"
+        end
+      end
+    end
+  end
+end

data/app/services/decidim/meetings/calendar_renderer.rb

@@ -9,6 +9,8 @@ module Decidim
           Calendar::OrganizationCalendar.for(resource)
         when Decidim::Component
           Calendar::ComponentCalendar.for(resource)
+        when Decidim::Meetings::Meeting
+          Calendar::MeetingCalendar.for(resource)
         end
       end
     end

data/app/services/decidim/meetings/meeting_iframe_embedder.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require "cgi"
+
+module Decidim
+  module Meetings
+    # This class handles the streaming url to be included in the iframe present
+    # in the live event. For some services it's required to transforma a bit
+    # the structure of the URL.
+    class MeetingIframeEmbedder
+      # Public: Initializes the service.
+      # online_meeting_service_url - A String containing the url of the online meeting
+      def initialize(online_meeting_service_url)
+        @online_meeting_service_url = online_meeting_service_url
+      end
+
+      def embed_transformed_url(request_host)
+        return nil if parsed_online_meeting_uri.nil?
+
+        case parsed_online_meeting_uri.host
+        when "www.youtube.com"
+          transform_youtube_url(parsed_online_meeting_uri)
+        when "www.twitch.tv"
+          transform_twitch_url(parsed_online_meeting_uri, request_host)
+        else
+          online_meeting_service_url
+        end
+      end
+
+      def embeddable?
+        return nil if parsed_online_meeting_uri.nil?
+
+        EMBEDDABLE_SERVICES.include?(parsed_online_meeting_uri.host)
+      end
+
+      def embed_code(request_host)
+        return nil if parsed_online_meeting_uri.nil?
+
+        %(
+<iframe
+  allow="camera; microphone; fullscreen; display-capture; autoplay"
+  loading="lazy"
+  src="#{embed_transformed_url(request_host)}"
+  style="height: 100%; width: 100%; border: 0px;"
+/>
+        )
+      end
+
+      private
+
+      EMBEDDABLE_SERVICES = %( www.youtube.com www.twitch.tv )
+
+      attr_accessor :online_meeting_service_url
+
+      # Youtube transformation consists on:
+      # 1. extract the video id from the parameter v
+      # 2. Create a new URL using the domain youtube-nocookie.com, converting it to an embed
+      #    and appending the video id
+      def transform_youtube_url(uri)
+        return online_meeting_service_url if uri.query.blank?
+
+        video_id = CGI.parse(uri.query).fetch("v")&.first
+
+        return online_meeting_service_url if video_id.blank?
+
+        "https://www.youtube-nocookie.com/embed/#{video_id}"
+      end
+
+      # Twitch transformation consists on:
+      # 1. extract the video id from the third URL parameter
+      # 2. extract the request host
+      # 3. build the embed url using both the video ID and the request host as parent argument
+      def transform_twitch_url(uri, request_host)
+        _, param_name, video_id = *uri.path.split("/")
+
+        return online_meeting_service_url if video_id.blank? || param_name != "videos"
+
+        "https://player.twitch.tv/?video=#{video_id}&parent=#{request_host}"
+      end
+
+      def parsed_online_meeting_uri
+        @parsed_online_meeting_uri ||= URI.parse(online_meeting_service_url) if online_meeting_service_url.present?
+      end
+    end
+  end
+end

data/app/services/decidim/meetings/meeting_search.rb

@@ -11,9 +11,9 @@ module Decidim
       # Public: Initializes the service.
       # component     - A Decidim::Component to get the meetings from.
       # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
+      # per_page    - The number of meetings to return per page.
       def initialize(options = {})
-        scope = options.fetch(:scope, Meeting.all)
+        scope = options.fetch(:scope, Meeting.published)
         super(scope, options)
       end
 

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

@@ -65,4 +65,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/meetings/admin/agendas" %>
+<%= javascript_pack_tag "decidim_meetings_admin" %>

data/app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb

@@ -1,8 +1,8 @@
-<p><%= t("devise.mailer.invitation_instructions.hello", email: @user.name) %></p>
+<p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @user.name) %></p>
 
-<p>
+<p class="email-instructions">
   <%= t ".invited_you_to_join_a_meeting", invited_by: @invited_by.name, application: @user.organization.name %>
 </p>
 
-<p><%= link_to t(".decline", meeting_title: present(@meeting).title),routes.decline_invitation_meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
-<p><%= link_to t(".join", meeting_title: present(@meeting).title),routes.meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
+<p class="email-button email-button__cta cta-decline"><%= link_to t(".decline", meeting_title: present(@meeting).title),routes.decline_invitation_meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
+<p class="email-button email-button__cta cta-accept"><%= link_to t(".join", meeting_title: present(@meeting).title),routes.meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>