decidim-meetings 0.28.5 → 0.29.0.rc1

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

@@ -15,9 +15,9 @@ module Decidim
       helper Decidim::ShortLinkHelper
       include Decidim::AttachmentsHelper
 
-      helper_method :meetings, :meeting, :registration, :search, :nav_paths, :tab_panel_items
+      helper_method :meetings, :meeting, :registration, :search, :tab_panel_items
 
-      before_action :add_addtional_csp_directives, only: [:show]
+      before_action :add_additional_csp_directives, only: [:show]
 
       def new
         enforce_permission_to :create, :meeting
@@ -76,7 +76,7 @@ module Decidim
 
         @form = meeting_form.from_params(params)
 
-        UpdateMeeting.call(@form, current_user, meeting) do
+        UpdateMeeting.call(@form, meeting) do
           on(:ok) do |meeting|
             flash[:notice] = I18n.t("meetings.update.success", scope: "decidim.meetings")
             redirect_to Decidim::ResourceLocatorPresenter.new(meeting).path
@@ -110,36 +110,6 @@ module Decidim
         @meeting ||= Meeting.not_hidden.where(component: current_component).find_by(id: params[:id])
       end
 
-      def next_meeting
-        return if search_collection.size < 2
-
-        search_collection.order(:start_time, :id).where(
-          Decidim::Meetings::Meeting.arel_table[:start_time].gt(meeting.start_time).or(
-            Decidim::Meetings::Meeting.arel_table[:start_time].eq(meeting.start_time).and(
-              Decidim::Meetings::Meeting.arel_table[:id].gt(meeting.id)
-            )
-          )
-        ).first
-      end
-
-      def prev_meeting
-        return if search_collection.size < 2
-
-        search_collection.order(:start_time, :id).where(
-          Decidim::Meetings::Meeting.arel_table[:start_time].lt(meeting.start_time).or(
-            Decidim::Meetings::Meeting.arel_table[:start_time].eq(meeting.start_time).and(
-              Decidim::Meetings::Meeting.arel_table[:id].lt(meeting.id)
-            )
-          )
-        ).last
-      end
-
-      def nav_paths
-        return {} if meeting.blank?
-
-        { prev_path: prev_meeting, next_path: next_meeting }.compact_blank.transform_values { |meeting| meeting_path(meeting) }
-      end
-
       def meetings
         is_past_meetings = params.dig("filter", "with_any_date")&.include?("past")
         @meetings ||= paginate(search.result.order(start_time: is_past_meetings ? :desc : :asc))

data/app/controllers/decidim/meetings/polls/answers_controller.rb

@@ -9,11 +9,19 @@ module Decidim
 
         helper_method :question
 
+        def admin
+          enforce_permission_to(:update, :poll, meeting:)
+        end
+
+        def index
+          enforce_permission_to(:reply_poll, :meeting, meeting:)
+        end
+
         def create
           enforce_permission_to(:create, :answer, question:)
-          @form = form(AnswerForm).from_params(params, question:, current_user:)
+          @form = form(AnswerForm).from_params(params.merge(question:, current_user:))
 
-          CreateAnswer.call(@form, current_user, questionnaire) do
+          CreateAnswer.call(@form, questionnaire) do
             # Both :ok and :invalid render the same template, because
             # validation errors are displayed in the template
             respond_to do |format|

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

@@ -11,7 +11,7 @@ module Decidim
 
         @form = form(Decidim::Forms::QuestionnaireForm).from_params(params, session_token:)
 
-        JoinMeeting.call(meeting, current_user, @form) do
+        JoinMeeting.call(meeting, @form) do
           on(:ok) do
             flash[:notice] = I18n.t("registrations.create.success", scope: "decidim.meetings")
             redirect_to after_answer_path
@@ -32,9 +32,9 @@ module Decidim
       def create
         enforce_permission_to(:register, :meeting, meeting:)
 
-        @form = JoinMeetingForm.from_params(params)
+        @form = JoinMeetingForm.from_params(params).with_context(current_user:)
 
-        JoinMeeting.call(meeting, current_user, @form) do
+        JoinMeeting.call(meeting, @form) do
           on(:ok) do
             flash[:notice] = I18n.t("registrations.create.success", scope: "decidim.meetings")
             redirect_after_path

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

@@ -7,7 +7,7 @@ module Decidim
       class CloseMeetingForm < Decidim::Form
         include TranslatableAttributes
 
-        translatable_attribute :closing_report, Decidim::Attributes::RichText
+        translatable_attribute :closing_report, String
         attribute :video_url, String
         attribute :audio_url, String
         attribute :closing_visible, Boolean, default: true

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

@@ -8,7 +8,7 @@ module Decidim
         include TranslatableAttributes
 
         translatable_attribute :title, String
-        translatable_attribute :description, Decidim::Attributes::RichText
+        translatable_attribute :description, String
 
         attribute :duration, Integer, default: 0
         attribute :parent_id, Integer

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

@@ -23,7 +23,7 @@ module Decidim
         attribute :iframe_access_level, String
 
         translatable_attribute :title, String
-        translatable_attribute :description, Decidim::Attributes::RichText
+        translatable_attribute :description, String
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
 

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

@@ -15,8 +15,8 @@ module Decidim
         attribute :available_slots, Integer
         attribute :reserved_slots, Integer
 
-        translatable_attribute :registration_terms, Decidim::Attributes::RichText
-        translatable_attribute :registration_email_custom_content, Decidim::Attributes::RichText
+        translatable_attribute :registration_terms, String
+        translatable_attribute :registration_email_custom_content, String
 
         validates :registration_terms, translatable_presence: true, if: ->(form) { form.registrations_enabled? }
         validates :available_slots, :reserved_slots, presence: true, if: ->(form) { form.registrations_enabled? }
@@ -37,7 +37,7 @@ module Decidim
 
         # We need this method to ensure the form object will always have an ID,
         # and thus its `to_param` method will always return a significant value.
-        # If we remove this method, get an error onn the `update` action and try
+        # If we remove this method, get an error on the `update` action and try
         # to resubmit the form, the form will not hold an ID, so the `to_param`
         # method will return an empty string and Rails will treat this as a
         # `create` action, thus raising an error since this action is not defined

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

@@ -18,10 +18,10 @@ module Decidim
         translatable_attribute :description, String
 
         validates :position, numericality: { greater_than_or_equal_to: 0 }
-        validates :question_type, inclusion: { in: Decidim::Meetings::Question::QUESTION_TYPES }
-        validates :max_choices, numericality: { only_integer: true, greater_than: 1, less_than_or_equal_to: ->(form) { form.number_of_options } }, allow_blank: true
+        validates :question_type, inclusion: { in: Decidim::Meetings::Question::QUESTION_TYPES }, if: :editable?
+        validates :max_choices, numericality: { only_integer: true, greater_than: 1, less_than_or_equal_to: ->(form) { form.number_of_options } }, allow_blank: true, if: :editable?
         validates :body, translatable_presence: true, if: :requires_body?
-        validates :answer_options, presence: true
+        validates :answer_options, presence: true, if: :editable?
 
         def to_param
           return id if id.present?
@@ -29,6 +29,10 @@ module Decidim
           "questionnaire-question-id"
         end
 
+        def editable?
+          @editable ||= id.blank? || Decidim::Meetings::Question.unpublished.unanswered.exists?(id:)
+        end
+
         def number_of_options
           answer_options.size
         end
@@ -36,7 +40,7 @@ module Decidim
         private
 
         def requires_body?
-          !deleted
+          editable? && !deleted
         end
       end
     end

data/app/forms/decidim/meetings/answer_form.rb

@@ -24,8 +24,8 @@ module Decidim
         @answer ||= Decidim::Meetings::Answer.find_by(decidim_user_id: current_user.id, decidim_question_id: question_id) if current_user
       end
 
-      def label(idx)
-        base = "#{idx + 1}. #{translated_attribute(question.body)}"
+      def label
+        base = translated_attribute(question.body)
         base += " (#{max_choices_label})" if question.max_choices
         base
       end
@@ -43,13 +43,13 @@ module Decidim
       end
 
       def selected_choices
-        choices.select(&:body)
+        choices.select(&:answer_option_id)
       end
 
       private
 
       def max_choices
-        errors.add(:choices, :too_many) if selected_choices.size > question.max_choices
+        errors.add(:choices, :too_many, count: question.max_choices) if selected_choices.size > question.max_choices
       end
 
       def mandatory_label

data/app/forms/decidim/meetings/meeting_form.rb

@@ -56,7 +56,7 @@ module Decidim
 
       alias component current_component
 
-      # Finds the Scope from the given decidim_scope_id, uses the compoenent scope if missing.
+      # Finds the Scope from the given decidim_scope_id, uses the component scope if missing.
       #
       # Returns a Decidim::Scope
       def scope

data/app/helpers/decidim/meetings/application_helper.rb

@@ -59,11 +59,7 @@ module Decidim
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_meeting_body(meeting)
-        render_meeting_sanitize_field(meeting, :description)
-      end
-
-      def render_meeting_sanitize_field(meeting, field)
-        sanitized = render_sanitized_content(meeting, field)
+        sanitized = render_sanitized_content(meeting, :description)
         if safe_content?
           Decidim::ContentProcessor.render_without_format(sanitized).html_safe
         else

data/app/mailers/decidim/meetings/close_meeting_reminder_mailer.rb

@@ -27,7 +27,7 @@ module Decidim
             to: @user.email,
             subject: I18n.t(
               "decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.subject",
-              organization_name: @organization.name
+              meeting_title: decidim_sanitize_translated(@meeting.title)
             )
           )
         end

data/app/models/decidim/meetings/meeting.rb

@@ -61,13 +61,14 @@ module Decidim
       scope :past, -> { where(arel_table[:end_time].lteq(Time.current)) }
       scope :upcoming, -> { where(arel_table[:end_time].gteq(Time.current)) }
       scope :withdrawn, -> { where(state: "withdrawn") }
-      scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
+      scope :withdrawn, -> { where.not(withdrawn_at: nil) }
+      scope :not_withdrawn, -> { where(withdrawn_at: nil) }
       scope :with_availability, lambda { |state_key|
         case state_key
         when "withdrawn"
           withdrawn
         else
-          except_withdrawn
+          not_withdrawn
         end
       }
       scope_search_multi :with_any_date, [:upcoming, :past]
@@ -271,7 +272,7 @@ module Decidim
       #
       # Returns Boolean.
       def withdrawn?
-        state == "withdrawn"
+        withdrawn_at.present?
       end
 
       # Checks whether the user can withdraw the given meeting.
@@ -282,6 +283,11 @@ module Decidim
         user && !withdrawn? && !past? && authored_by?(user)
       end
 
+      def withdraw!
+        self.withdrawn_at = Time.zone.now
+        save
+      end
+
       # Overwrites method from Paddable to add custom rules in order to know
       # when to display a pad or not.
       def pad_is_visible?
@@ -323,7 +329,7 @@ module Decidim
 
       # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
       def reported_searchable_content_extras
-        [normalized_author.name]
+        [author_name]
       end
 
       def has_contributions?

data/app/models/decidim/meetings/poll.rb

@@ -14,6 +14,14 @@ module Decidim
       delegate :organization, to: :meeting
 
       QUESTION_TYPES = %w(single_option multiple_option).freeze
+
+      def has_questions?
+        questionnaire&.questions&.exists?
+      end
+
+      def has_open_questions?
+        has_questions? && questionnaire.questions.not_closed.exists?
+      end
     end
   end
 end

data/app/models/decidim/meetings/question.rb

@@ -28,6 +28,7 @@ module Decidim
       validates :question_type, inclusion: { in: QUESTION_TYPES }
 
       scope :visible, -> { where(status: [:published, :closed]) }
+      scope :unanswered, -> { where.missing(:answers) }
 
       def multiple_choice?
         %w(single_option multiple_option).include?(question_type)

data/app/models/decidim/meetings/questionnaire.rb

@@ -11,12 +11,6 @@ module Decidim
       has_many :questions, -> { order(:position) }, class_name: "Question", foreign_key: "decidim_questionnaire_id", dependent: :destroy
       has_many :answers, class_name: "Answer", foreign_key: "decidim_questionnaire_id", dependent: :destroy
 
-      # Public: returns whether the questionnaire questions can be modified or not.
-      def questions_editable?
-        has_component = questionnaire_for.meeting.respond_to? :component
-        (has_component && !questionnaire_for.meeting.component.published?) || answers.empty?
-      end
-
       def all_questions_unpublished?
         questions.all?(&:unpublished?)
       end

data/app/packs/src/decidim/meetings/admin/meetings_form.js

@@ -117,9 +117,9 @@ $(() => {
     toggleDependsOnSelect($meetingRegistrationType, $meetingRegistrationUrl, "on_different_platform");
 
     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 $meetingOnlineAccessLevelFields = $form.find(".field[data-meeting-type='online-access-level']");
+    const $meetingOnlineFields = $form.find("[data-meeting-type='online']");
+    const $meetingInPersonFields = $form.find("[data-meeting-type='in_person']");
+    const $meetingOnlineAccessLevelFields = $form.find("[data-meeting-type='online-access-level']");
     const $meetingIframeEmbedType = $form.find("#meeting_iframe_embed_type");
 
     const toggleTypeDependsOnSelect = ($target, $showDiv, type) => {

data/app/packs/src/decidim/meetings/meetings_form.js

@@ -11,9 +11,9 @@ $(() => {
   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 $meetingOnlineAccessLevelFields = $form.find(".field[data-meeting-type='online-access-level']");
+    const $meetingOnlineFields = $form.find("[data-meeting-type='online']");
+    const $meetingInPersonFields = $form.find("[data-meeting-type='in_person']");
+    const $meetingOnlineAccessLevelFields = $form.find("[data-meeting-type='online-access-level']");
 
     const toggleDependsOnSelect = ($target, $showDiv, type) => {
       const value = $target.val();

data/app/packs/src/decidim/meetings/meetings_polls.js

@@ -9,6 +9,8 @@ $(() => {
   if ($container.length) {
     const poll = new MeetingsPollComponent($container, $container.data("decidim-meetings-poll"), $counter);
 
+    poll.mountComponent();
+
     $(".meeting-polls__action-list").on("click", (event) => {
       event.preventDefault();
 
@@ -29,6 +31,9 @@ $(() => {
 
   if ($adminContainer.length) {
     const adminPoll = new MeetingsPollComponent($adminContainer, $adminContainer.data("decidim-admin-meetings-poll"));
+
+    adminPoll.mountComponent();
+
     $(".meeting-polls__action-administrate").on("click", (event) => {
       event.preventDefault();
 

data/app/packs/src/decidim/meetings/poll.component.js

@@ -4,7 +4,7 @@ import createOptionAttachedInputs from "src/decidim/forms/option_attached_inputs
 import createMaxChoicesAlertComponent from "src/decidim/forms/max_choices_alert.component"
 
 /**
- * A plain Javascript component that handles questions from polls in meetings:
+ * A plain JavaScript component that handles questions from polls in meetings:
  *   - fetches them via Ajax
  *   - enables a polling to automatically update them
  *
@@ -24,9 +24,11 @@ export default class PollComponent {
     this.$element = $element;
     this.$counter = $counter;
     this.questionsUrl = config.questionsUrl;
-    this.pollingInterval = config.pollingInterval || 5000;
+    this.pollingInterval = config.pollingInterval || 10000;
     this.mounted = false;
     this.questions = {};
+    this.questionsStatuses = {};
+    this.answersStatuses = {};
   }
 
   /**
@@ -66,7 +68,9 @@ export default class PollComponent {
    * @returns {Void} - Returns nothing
    */
   _fetchQuestions() {
-    // Store current questions state (open / closed) before overwritting them with the Ajax call
+    $("#content").addClass("spinner-container")
+
+    // Store current questions state (open / closed) before overwriting them with the Ajax call
     // response.
     this._storeQuestionState(this.$element);
 
@@ -79,6 +83,8 @@ export default class PollComponent {
       this._setQuestionsState(this.$element);
       this._pollQuestions();
       this._addValidations();
+
+      $("#content").removeClass("spinner-container")
     });
   }
 
@@ -92,6 +98,12 @@ export default class PollComponent {
     $("[data-question]", $parent).each((_i, el) => {
       const $el = $(el);
       const questionId = $el.data("question");
+      const elForm = $el.find("form");
+
+      this.questionsStatuses[questionId] = $el.data("status");
+      if (elForm.length > 0) {
+        this.answersStatuses[questionId] = Object.fromEntries(new FormData(elForm[0]));
+      }
       if ($el[0].open === true) {
         this.questions[questionId] = OPEN;
       } else {
@@ -124,12 +136,28 @@ export default class PollComponent {
     const questionId = $el.data("question");
     // Current question state
     const state = this.questions[questionId];
+    const questionStatus = this.questionsStatuses[questionId];
+    const answersStatuses = this.answersStatuses[questionId];
+
     // New questions have a special class
     if (!state) {
       $el.addClass("is-new");
     } else if (state === OPEN) {
       $el.prop(OPEN, true);
     }
+
+    if ($el.data("status") === CLOSED && $el.data("status") !== questionStatus) {
+      $el.data("status", `${CLOSED}-new`);
+      document.getElementById(`closed-announcement-${questionId}`).hidden = false;
+    }
+
+    if (answersStatuses) {
+      for (const [key, value] of Object.entries(answersStatuses)) {
+        if (key.includes("[choices]")) {
+          $el.find(`[name='${key}'][value='${value}']`).prop("checked", true);
+        }
+      }
+    }
   }
 
   /**
@@ -177,7 +205,7 @@ export default class PollComponent {
       });
     });
 
-    $.unique($(".js-check-box-collection").parents(".answer")).each((idx, el) => {
+    $.unique($(".js-check-box-collection").parents("[data-max-choices]")).each((idx, el) => {
       const maxChoices = $(el).data("max-choices");
       if (maxChoices) {
         createMaxChoicesAlertComponent({

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

@@ -6,17 +6,29 @@
   }
 
   &__calendar {
-    @apply order-first flex flex-col min-w-48 rounded bg-background text-center md:w-14;
+    @apply w-14 flex flex-col justify-start rounded bg-background text-center;
 
     &:only-child &-month {
       @apply rounded-t;
     }
 
     &-container {
-      @apply flex flex-wrap flex-col md:flex-row gap-2 border-4 border-background rounded;
+      @apply grid grid-cols-[auto_1fr] md:grid-cols-[auto_1fr_1fr] items-center gap-0 md:gap-x-5 border-4 border-background rounded md:h-[140px] overflow-hidden;
 
-      ul {
-        @apply flex-1 p-2;
+      > *:nth-child(2) {
+        @apply p-4 md:p-0;
+
+        &:not(:last-child) {
+          @apply col-span-2 md:col-auto order-2 md:order-1;
+        }
+
+        &:last-child {
+          @apply md:col-span-2 pr-4;
+        }
+      }
+
+      > *:nth-child(3) {
+        @apply order-1 md:order-2 h-[135px] md:h-full;
       }
     }
 
@@ -43,7 +55,7 @@
     }
 
     &__lg {
-      @apply flex min-w-48;
+      @apply w-fit justify-center [&>*]:px-2 min-w-24 h-[8.5rem];
     }
 
     &__lg &-month {
@@ -113,13 +125,17 @@
         }
 
         &::-webkit-progress-bar {
-          @apply bg-white;
+          @apply bg-gray lg:bg-white;
         }
 
         &::-moz-progress-bar {
           @apply bg-success;
         }
       }
+
+      &-label {
+        @apply text-sm font-bold lg:hidden;
+      }
     }
 
     &-block {
@@ -163,3 +179,107 @@
     }
   }
 }
+
+// layout reset stuff
+.meeting-poll__layout {
+  header,
+  main h1,
+  footer {
+    @apply hidden md:block;
+  }
+
+  .layout-1col {
+    padding: 0;
+  }
+}
+
+.meeting-polls {
+  @apply m-0 md:mt-10 md:mb-24;
+
+  counter-reset: question;
+
+  &__question {
+    @apply bg-white;
+
+    summary {
+      @apply p-4 font-normal text-black text-md transition bg-background cursor-pointer marker:text-secondary;
+
+      transition: background-color 0.2s ease-in-out;
+
+      & > span:first-child::after {
+        counter-increment: question;
+        content: "#" counter(question);
+      }
+
+      & > span:last-child:not(:only-child) {
+        @apply text-sm font-semibold float-right;
+      }
+
+      & + * {
+        @apply mt-4 mb-8 md:mb-16 pr-4 pl-[calc(1rem+14px)] md:px-0 space-y-6;
+      }
+    }
+
+    &[open] summary {
+      @apply bg-secondary md:bg-background marker:text-white md:marker:text-secondary text-white md:text-black;
+    }
+
+    &.is-new {
+      animation: animateHighlight 5s ease-in-out forwards;
+    }
+
+    & + & {
+      @apply mt-4;
+    }
+
+    @keyframes animateHighlight {
+      0%,
+      80% {
+        background-color: rgba(var(--warning-rgb), 0.1);
+      }
+    }
+  }
+
+  &__answer {
+    label {
+      @apply block p-4 ring-4 ring-background rounded transition;
+
+      &:not(:has([disabled])) {
+        @apply hover:ring-tertiary hover:cursor-pointer;
+      }
+    }
+
+    label + label,
+    & + & {
+      @apply mt-4;
+    }
+
+    &--value {
+      @apply flex gap-2 justify-between text-gray-2 text-lg;
+
+      > *:last-child {
+        @apply w-1/6 flex-none text-gray text-right;
+      }
+    }
+
+    &--bar {
+      @apply w-full h-2.5 overflow-hidden rounded bg-background;
+
+      > * {
+        @apply bg-success h-full rounded;
+      }
+    }
+  }
+
+  &__admin-action {
+    @apply py-4 grid grid-cols-2 gap-x-4 gap-y-8 border-t border-t-gray [&>*:nth-child(2)]:ml-auto [&>*:nth-child(3)]:col-span-2;
+  }
+
+  &__topbar {
+    @apply my-4 md:my-0 px-4 md:px-0 py-2 md:py-10 flex justify-between gap-4 bg-background md:bg-transparent;
+
+    &.is-admin {
+      @apply mt-0 bg-tertiary md:bg-transparent text-black;
+    }
+  }
+}