decidim-meetings 0.11.2 → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67f58ebb0991c3bfd60730942696df7eea675439fbde8a7197c7c470190a7f40
-  data.tar.gz: 3d6a27096b35c96665ee53d53c9773391a30c13a87576e551ce90bcdbba7fb51
+  metadata.gz: ba1d143141173018ffc39b1c91fc371339fc2d65e40127c3578a1b5d32f8a0a3
+  data.tar.gz: 2b0020c3c8cf0d12b8ab02f1e5919e5d3ee723be8f03536baae7e5fc02f121a4
 SHA512:
-  metadata.gz: a3eef6ff97b71be244bd174b1794bc7cd1ccb0f4a2219b597f57358d197c1bb97e5c4abcd6f9e9291ebd40836915c1ee940ccd9dcbd5199b136394bf0c22dc8e
-  data.tar.gz: c4e907b0687775be95799613837582bc16c6cddb0298dd95a6a16b1c655ff04cca4b74b6569d28a96f93cbc846ceca18bfd7353ddd23e542fc355fc4a22f5414
+  metadata.gz: bdfc43c0090c3c23543027eb1a113a75f87a40cc64dc17f8181727114aec8e64c36146e7d26fea5e411b19e3d39c9a26c63c853683cc9977af45785f893f09d1
+  data.tar.gz: edb9298e91ef4c5c89faa78c04368fc86f27dd3d336948bca0213ad147f1d44f96a302e71cfdae2704f297e6a717a929ff0e8db542adc3c26f2353b6ae6dab51

data/app/assets/config/admin/decidim_meetings_manifest.js

@@ -1,2 +1,4 @@
 //= link decidim/meetings/admin/meetings_form.js
 //= link decidim/meetings/admin/registrations_form.js
+//= link decidim/meetings/admin/meetings_form.js
+//= link decidim/meetings/admin/agendas.js

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

@@ -0,0 +1,158 @@
+((exports) => {
+  const { AutoLabelByPositionComponent, AutoButtonsByPositionComponent, createDynamicFields, createSortList } = exports.DecidimAdmin;
+  const { createQuillEditor } = exports.Decidim;
+
+  const wrapperSelector = ".meeting-agenda-items";
+  const fieldSelector = ".meeting-agenda-item";
+  const childsWrapperSelector = ".meeting-agenda-item-childs";
+  const childFieldSelector = ".meeting-agenda-item-child";
+
+  const autoLabelByPosition = new AutoLabelByPositionComponent({
+    listSelector: ".meeting-agenda-item:not(.hidden)",
+    labelSelector: ".card-title span:first",
+    onPositionComputed: (el, idx) => {
+      $(el).find("input[name$=\\[position\\]]").val(idx);
+    }
+  });
+
+  const autoButtonsByPosition = new AutoButtonsByPositionComponent({
+    listSelector: ".meeting-agenda-item:not(.hidden)",
+    hideOnFirstSelector: ".move-up-agenda-item",
+    hideOnLastSelector: ".move-down-agenda-item"
+  });
+
+  const createSortableList = () => {
+    createSortList(".meeting-agenda-items-list:not(.published)", {
+      handle: ".agenda-item-divider",
+      placeholder: '<div style="border-style: dashed; border-color: #000"></div>',
+      forcePlaceholderSize: true,
+      onSortUpdate: () => { autoLabelByPosition.run() }
+    });
+  };
+
+  const createSortableListChild = () => {
+    createSortList(".meeting-agenda-item-childs-list:not(.published)", {
+      handle: ".agenda-item-child-divider",
+      placeholder: '<div style="border-style: dashed; border-color: #000"></div>',
+      forcePlaceholderSize: true,
+      onSortUpdate: () => { autoLabelByPosition.run() }
+    });
+  };
+
+  const autoLabelByPositionChild = new AutoLabelByPositionComponent({
+    listSelector: ".meeting-agenda-item-child:not(.hidden)",
+    labelSelector: ".card-title span:first",
+    onPositionComputed: (el, idx) => {
+      $(el).find("input[name$=\\[position\\]]").val(idx);
+    }
+  });
+
+  const autoButtonsByPositionChild = new AutoButtonsByPositionComponent({
+    listSelector: ".meeting-agenda-item-child:not(.hidden)",
+    hideOnFirstSelector: ".move-up-agenda-item-child",
+    hideOnLastSelector: ".move-down-agenda-item-child"
+  });
+
+  const createDynamicFieldsForAgendaItemChilds = (fieldId) => {
+    return createDynamicFields({
+      placeholderId: "meeting-agenda-item-child-id",
+      wrapperSelector: `#${fieldId} ${childsWrapperSelector}`,
+      containerSelector: ".meeting-agenda-item-childs-list",
+      fieldSelector: childFieldSelector,
+      addFieldButtonSelector: ".add-agenda-item-child",
+      removeFieldButtonSelector: ".remove-agenda-item-child",
+      moveUpFieldButtonSelector: ".move-up-agenda-item-child",
+      moveDownFieldButtonSelector: ".move-down-agenda-item-child",
+
+      onAddField: ($field) => {
+        createSortableListChild();
+
+        $field.find(".editor-container").each((idx, el) => {
+          createQuillEditor(el);
+        });
+
+        autoLabelByPositionChild.run();
+        autoButtonsByPositionChild.run();
+      },
+      onRemoveField: () => {
+        autoLabelByPositionChild.run();
+        autoButtonsByPositionChild.run();
+      },
+      onMoveUpField: () => {
+        autoLabelByPositionChild.run();
+        autoButtonsByPositionChild.run();
+      },
+      onMoveDownField: () => {
+        autoLabelByPositionChild.run();
+        autoButtonsByPositionChild.run();
+      }
+    });
+  };
+
+  const dynamicFieldsForAgendaItemChilds = {};
+
+  const setupInitialAgendaItemChildAttributes = ($target) => {
+    const fieldId = $target.attr("id");
+
+    dynamicFieldsForAgendaItemChilds[fieldId] = createDynamicFieldsForAgendaItemChilds(fieldId);
+
+  }
+
+  const hideDeletedAgendaItem = ($target) => {
+    const inputDeleted = $target.find("input[name$=\\[deleted\\]]").val();
+
+    if (inputDeleted === "true") {
+      $target.addClass("hidden");
+      $target.hide();
+    }
+  };
+
+  createDynamicFields({
+    placeholderId: "meeting-agenda-item-id",
+    wrapperSelector: wrapperSelector,
+    containerSelector: ".meeting-agenda-items-list",
+    fieldSelector: fieldSelector,
+    addFieldButtonSelector: ".add-agenda-item",
+    removeFieldButtonSelector: ".remove-agenda-item",
+    moveUpFieldButtonSelector: ".move-up-agenda-item",
+    moveDownFieldButtonSelector: ".move-down-agenda-item",
+    onAddField: ($field) => {
+      // createDynamicFieldsForAgendaItemChilds($field);
+      setupInitialAgendaItemChildAttributes($field);
+      createSortableList();
+
+      $field.find(".editor-container").each((idx, el) => {
+        createQuillEditor(el);
+      });
+
+      autoLabelByPosition.run();
+      autoButtonsByPosition.run();
+    },
+    onRemoveField: () => {
+      autoLabelByPosition.run();
+      autoButtonsByPosition.run();
+    },
+    onMoveUpField: () => {
+      autoLabelByPosition.run();
+      autoButtonsByPosition.run();
+    },
+    onMoveDownField: () => {
+      autoLabelByPosition.run();
+      autoButtonsByPosition.run();
+    }
+  });
+
+  createSortableList();
+
+  $(fieldSelector).each((idx, el) => {
+    const $target = $(el);
+
+    hideDeletedAgendaItem($target);
+    setupInitialAgendaItemChildAttributes($target);
+  });
+
+  autoLabelByPosition.run();
+  autoButtonsByPosition.run();
+  autoLabelByPositionChild.run();
+  autoButtonsByPositionChild.run();
+})(window);

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

@@ -75,4 +75,23 @@
 
   autoLabelByPosition.run();
   autoButtonsByPosition.run();
+
+  const $form = $(".edit_meeting, .new_meeting, .copy_meetings");
+
+  if ($form.length > 0) {
+    const $privateMeeting = $form.find("#private_meeting");
+    const $transparent = $form.find("#transparent");
+
+    const toggleDisabledHiddenFields = () => {
+      const enabledPrivateSpace = $privateMeeting.find("input[type='checkbox']").prop("checked");
+      $transparent.find("input[type='checkbox']").attr("disabled", "disabled");
+
+      if (enabledPrivateSpace) {
+        $transparent.find("input[type='checkbox']").attr("disabled", !enabledPrivateSpace);
+      }
+    };
+
+    $privateMeeting.on("change", toggleDisabledHiddenFields);
+    toggleDisabledHiddenFields();
+  }
 })(window);

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

@@ -0,0 +1,15 @@
+<div class="reveal" data-reveal id="meeting-registration-confirm-<%= model.id %>">
+  <div class="row">
+    <div class="columns medium-10 medium-offset-1 help-text">
+      <%= decidim_sanitize translated_attribute(model.registration_terms) %>
+    </div>
+  </div>
+  <div class="row">
+    <div class="columns medium-8 medium-offset-2">
+      <%= button_to t("confirm", scope: "decidim.meetings.meetings.registration_confirm"), meeting_registration_path(model), class: "button expanded", data: { disable: true } %>
+    </div>
+  </div>
+  <div class="text-center">
+    <button class="link" data-close><%= t("cancel", scope: "decidim.meetings.meetings.registration_confirm") %></button>
+  </div>
+</div>

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

@@ -0,0 +1,27 @@
+<% if model.can_be_joined_by?(current_user) %>
+  <% if model.has_registration_for? current_user %>
+    <%= action_authorized_button_to(
+      :join,
+      meeting_registration_path(model),
+      method: :delete,
+      class: "#{button_classes} secondary light",
+      data: { disable: true }
+    ) do %>
+      <%= icon("check", class: "icon--small") %>
+      <%= t("going", scope: "decidim.meetings.meetings.show") %>
+    <% end %>
+  <% else %>
+    <%= render :registration_confirm %>
+    <%= 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" }
+    ) %>
+  <% end %>
+  <% if shows_remaining_slots? %>
+    <span><%= t("remaining_slots", scope: "decidim.meetings.meetings.show", count: model.remaining_slots) %></span>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell renders the button to join a meeting.
+    class JoinMeetingButtonCell < Decidim::ViewModel
+      include MeetingCellsHelper
+      include Decidim::SanitizeHelper
+
+      def show
+        render
+      end
+
+      private
+
+      delegate :current_user, :current_component, to: :controller, prefix: false
+
+      def button_classes
+        return "button expanded button--sc" if big_button?
+        "button card__button button--sc small"
+      end
+
+      def big_button?
+        options[:big_button]
+      end
+
+      def shows_remaining_slots?
+        options[:show_remaining_slots] && model.available_slots.positive?
+      end
+
+      def i18n_join_text
+        return I18n.t("join", scope: "decidim.meetings.meetings.show") if model.has_available_slots?
+        I18n.t("no_slots_available", scope: "decidim.meetings.meetings.show")
+      end
+    end
+  end
+end

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

@@ -5,7 +5,8 @@ module Decidim
     # This cell renders the meeting card for an instance of a Meeting
     # the default size is the Medium Card (:m)
     # also available the List Item Card (:list_item)
-    class MeetingCell < Decidim::Meetings::ViewModel
+    class MeetingCell < Decidim::ViewModel
+      include MeetingCellsHelper
       include Cell::ViewModel::Partial
 
       def show
@@ -14,14 +15,6 @@ module Decidim
 
       private
 
-      def title
-        translated_attribute model.title
-      end
-
-      def description
-        decidim_sanitize meeting_description(model)
-      end
-
       def card_size
         case @options[:size]
         when :list_item
@@ -35,10 +28,6 @@ module Decidim
         icon "meetings", remove_icon_class: true, width: 40, height: 70
       end
 
-      def resource_path
-        resource_locator(model).path
-      end
-
       def current_component
         model.component
       end

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

@@ -13,6 +13,14 @@ module Decidim
 
       private
 
+      def resource_path
+        resource_locator(model).path
+      end
+
+      def title
+        translated_attribute model.title
+      end
+
       def resource_date_time
         str = l model.start_time, format: :decidim_day_of_year
         str += " - "

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

@@ -0,0 +1,14 @@
+<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">
+          <%= render partial: "decidim/shared/address_details.html", locals: { geolocalizable: model } %>
+        </div>
+      </div>
+    </li>
+  </ul>
+</div>

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

@@ -0,0 +1,2 @@
+<%= render :date %>
+<%= render :address %>

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

@@ -0,0 +1,8 @@
+<div class="card__icondata">
+  <ul class="card-data">
+    <li class="card-data__item">
+      <%= icon "datetime", class: "icon--big" %>
+    </li>
+    <%= meeting_date %>
+  </ul>
+</div>

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

@@ -0,0 +1,9 @@
+<div class="card__footer">
+  <div class="card__support">
+    <% if can_join? %>
+      <%= cell "decidim/meetings/join_meeting_button", model %>
+    <% else %>
+      <%= link_to t("view", scope: "decidim.meetings.meetings.show"), resource_path, class: "card__button button secondary button--sc small light" %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,17 @@
+<li class="card-data__item">
+  <div class="card-data__item--multiple">
+    <div>
+      <strong>
+        <%= l start_date, format: :decidim_with_month_name %>
+      </strong>
+      <%= formatted_start_time %>
+    </div>
+    <%= icon "arrow-thin-right", class: "icon--big muted" %>
+    <div>
+      <strong>
+        <%= l end_date, format: :decidim_with_month_name %>
+      </strong>
+      <%= formatted_end_time %>
+    </div>
+  </div>
+</li>

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

@@ -0,0 +1,9 @@
+<li class="card-data__item">
+  <div>
+    <strong>
+      <%= l start_date, format: :decidim_with_month_name %>
+    </strong>
+    &nbsp;·&nbsp;
+    <%= formatted_start_time %> - <%= formatted_end_time %>
+  </div>
+</li>

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

@@ -0,0 +1 @@
+<%= render partial: "decidim/shared/tags.html", locals: { resource: model, tags_class_extra: "tags--meeting" } %>

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

@@ -4,13 +4,46 @@ module Decidim
   module Meetings
     # This cell renders the Medium (:m) meeting card
     # for an given instance of a Meeting
-    class MeetingMCell < Decidim::Meetings::MeetingCell
-      def show
+    class MeetingMCell < Decidim::CardMCell
+      include MeetingCellsHelper
+
+      def date
         render
       end
 
-      def header
-        render
+      private
+
+      def resource_icon
+        icon "meetings", class: "icon--big"
+      end
+
+      def spans_multiple_dates?
+        start_date != end_date
+      end
+
+      def meeting_date
+        return render(:multiple_dates) if spans_multiple_dates?
+        render(:single_date)
+      end
+
+      def formatted_start_time
+        model.start_time.strftime("%H:%M")
+      end
+
+      def formatted_end_time
+        model.end_time.strftime("%H:%M")
+      end
+
+      def start_date
+        model.start_time.to_date
+      end
+
+      def end_date
+        model.end_time.to_date
+      end
+
+      def can_join?
+        model.can_be_joined_by?(current_user)
       end
     end
   end