decidim-meetings 0.24.1 → 0.25.0.rc2

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

@@ -0,0 +1,52 @@
+.meeting-polls{
+  &__header{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px;
+    background-color: #f4f4f4;
+    border: 1px solid #e8e8e8;
+  }
+
+  &__button{
+    @extend .button;
+    @extend .button--nomargin;
+    @extend .hollow;
+    @extend .small;
+
+    background-color: $white;
+    font-weight: 600;
+
+    &.is-open{
+      background-color: var(--primary);
+      color: $white;
+    }
+
+    & + &{
+      margin-left: $global-margin * .25;
+    }
+  }
+
+  &__close{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-left: 2 * $global-margin;
+    cursor: pointer;
+
+    a{
+      display: flex;
+      align-items: baseline;
+    }
+
+    span{
+      font-size: 2em;
+      margin-left: $global-margin * .5;
+      line-height: .5;
+    }
+
+    svg{
+      margin-left: .2rem;
+    }
+  }
+}

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