decidim-meetings 0.11.2 → 0.12.0.pre

data/app/types/decidim/meetings/meeting_type.rb

@@ -7,10 +7,10 @@ module Decidim
       description "A meeting"
 
       interfaces [
-        Decidim::Comments::CommentableInterface,
-        Decidim::Core::CategorizableInterface,
-        Decidim::Core::ScopableInterface,
-        Decidim::Core::AttachableInterface
+        -> { Decidim::Comments::CommentableInterface },
+        -> { Decidim::Core::CategorizableInterface },
+        -> { Decidim::Core::ScopableInterface },
+        -> { Decidim::Core::AttachableInterface }
       ]
 
       field :id, !types.ID

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

@@ -0,0 +1,50 @@
+<% agenda_item = form.object %>
+<div class="card meeting-agenda-item" id="<%= tabs_id %>-field">
+  <div class="card-divider agenda-item-divider">
+    <h2 class="card-title">
+      <span>
+        <%== "#{icon("move")} #{t(".agenda_item")}" %>
+      </span>
+
+      <button class="button small alert hollow move-up-agenda-item button--title">
+        <%== "#{icon("arrow-top")} #{t(".up")}" %>
+      </button>
+
+      <button class="button small alert hollow move-down-agenda-item button--title">
+        <%== "#{icon("arrow-bottom")} #{t(".down")}" %>
+      </button>
+
+      <button class="button small alert hollow remove-agenda-item button--title">
+        <%= t(".remove") %>
+      </button>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <%= render "agenda_item_fields", tabs_id: tabs_id, form: form, agenda_item: agenda_item %>
+
+    <div class="card">
+      <div class="card-divider">
+        <h2 class="card-title"><%= t(".agenda_item_children") %></h2>
+      </div>
+      <div class="card-section">
+        <div class="meeting-agenda-item-childs">
+          <template>
+            <%= fields_for "meeting_agenda[agenda_items][#{agenda_item.to_param}][agenda_item_children][#{blank_agenda_item.to_param_child}]", blank_agenda_item do |agenda_item_child_form| %>
+              <%= render "agenda_item_child", form: agenda_item_child_form, tabs_id: tabs_id, tabs_id_child: tabs_id_for_agenda_item_child(blank_agenda_item), editable: true %>
+            <% end %>
+          </template>
+
+          <div class="meeting-agenda-item-childs-list">
+            <% agenda_item.agenda_item_children.each do |agenda_item_child| %>
+              <%= fields_for "meeting_agenda[agenda_items][#{agenda_item.to_param}][agenda_item_children][]", agenda_item_child do |agenda_item_child_form| %>
+                <%= render "agenda_item_child", form: agenda_item_child_form, tabs_id: tabs_id, tabs_id_child: tabs_id_for_agenda_item_child(agenda_item_child), editable: true %>
+              <% end %>
+            <% end %>
+          </div>
+          <button class="button add-agenda-item-child"><%= t(".add_agenda_item_child") %></button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,26 @@
+<% agenda_item_child = form.object %>
+<div class="card meeting-agenda-item-child" id="<%= tabs_id %>-child-<%= tabs_id_child %>-field">
+  <div class="card-divider agenda-item-child-divider">
+    <h2 class="card-title">
+      <span>
+        <%== "#{icon("move")} #{t(".agenda_item_child")}" %>
+      </span>
+
+      <button class="button small alert hollow move-up-agenda-item-child button--title">
+        <%== "#{icon("arrow-top")} #{t(".up")}" %>
+      </button>
+
+      <button class="button small alert hollow move-down-agenda-item-child button--title">
+        <%== "#{icon("arrow-bottom")} #{t(".down")}" %>
+      </button>
+
+      <button class="button small alert hollow remove-agenda-item-child button--title">
+        <%= t(".remove") %>
+      </button>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <%= render "agenda_item_fields", tabs_id: tabs_id_child, form: form, agenda_item: agenda_item_child %>
+  </div>
+</div>

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

@@ -0,0 +1,19 @@
+<div class="grid-x">
+  <div class="cell auto">
+    <%= form.translated :text_field, :title, tabs_id: tabs_id %>
+  </div>
+  <div class="cell small-2">
+    <%= form.number_field :duration, tabs_id: tabs_id, min: 0 %>
+  </div>
+</div>
+
+<div class="grid-x">
+  <div class="cell auto">
+    <%= form.translated :editor, :description, tabs_id: tabs_id, rows: 6 %>
+  </div>
+</div>
+
+<%= form.hidden_field :id %>
+<%= form.hidden_field :parent_id %>
+<%= form.hidden_field :position, value: agenda_item.position || 0 %>
+<%= form.hidden_field :deleted %>

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

@@ -0,0 +1,66 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <div class="flex--sbc">
+        <div class="grid-x align-middle">
+          <u> <%= translated_attribute(meeting.title) %> </u> &nbsp;<%= icon "arrow-right" %>&nbsp;<%= title %>
+        </div>
+      </div>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="grid-x card-title">
+      <div class="cell small-2"><strong><%= t(".start_date") %></strong></div>
+      <div class="cell small-2"><strong><%= t(".end_date") %></strong></div>
+    </div>
+    <div class="grid-x text-muted">
+      <div class="cell small-2"><%= meeting.start_time.strftime("%m/%d/%Y %R") %></div>
+      <div class="cell small-2"><%= meeting.end_time.strftime("%m/%d/%Y %R") %></div>
+    </div>
+  </div>
+</div>
+
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= title %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
+
+    <div class="row column">
+      <%= form.check_box :visible %>
+    </div>
+  </div>
+</div>
+
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".agenda_items") %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="meeting-agenda-items">
+      <template>
+        <%= fields_for "meeting_agenda[agenda_items][#{blank_agenda_item.to_param}]", blank_agenda_item do |agenda_item_form| %>
+          <%= render "agenda_item", form: agenda_item_form, tabs_id: tabs_id_for_agenda_item(blank_agenda_item), editable: true %>
+        <% end %>
+      </template>
+
+      <div class="meeting-agenda-items-list">
+        <% @form.agenda_items.each do |agenda_item| %>
+          <%= fields_for "meeting_agenda[agenda_items][]", agenda_item do |agenda_item_form| %>
+            <%= render "agenda_item", form: agenda_item_form, tabs_id: tabs_id_for_agenda_item(agenda_item), editable: true %>
+          <% end %>
+        <% end %>
+      </div>
+      <button class="button add-agenda-item"><%= t(".add_agenda_item") %></button>
+    </div>
+  </div>
+</div>
+
+<%= javascript_include_tag "decidim/meetings/admin/agendas" %>

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

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: meeting_agenda_path(meeting, agenda), html: { class: "form edit_agenda" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+
+    <div class="button--double form-general-submit">
+      <%= f.submit t(".update") %>
+    </div>
+<% end %>

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

@@ -0,0 +1,8 @@
+<%= decidim_form_for(@form, url: meeting_agenda_index_path(meeting), html: { method: :post, class: "form new_agenda" }) do |f| %>
+
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+
+  <div class="button--double form-general-submit">
+      <%= f.submit t(".create") %>
+  </div>
+<% end %>

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

@@ -33,8 +33,22 @@
         <%= form.datetime_field :end_time %>
       </div>
     </div>
-  </div>
 
+    <div class="row column">
+      <% prompt_options = { url: decidim_admin.users_organization_url, text: t(".select_organizer") } %>
+      <%= form.autocomplete_select(:organizer_id, form.object.organizer.presence, { multiple: false }, prompt_options) do |user|
+        { value: user.id, label: "#{user.name} (@#{user.nickname})" }
+      end %>
+    </div>
+
+    <div class="row column" id="private_meeting">
+      <%= form.check_box :private_meeting %>
+    </div>
+
+    <div class="row column" id="transparent">
+      <%= form.check_box :transparent %>
+    </div>
+  </div>
 </div>
 
 <%= render "decidim/meetings/admin/meetings/services", form: form %>

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

@@ -44,6 +44,21 @@
         <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: "", disable_parents: false %>
       </div>
     </div>
+
+    <div class="row column">
+      <% prompt_options = { url: decidim_admin.users_organization_url, text: t(".select_organizer") } %>
+      <%= form.autocomplete_select(:organizer_id, form.object.organizer.presence, { multiple: false }, prompt_options) do |user|
+        { value: user.id, label: "#{user.name} (@#{user.nickname})" }
+      end %>
+    </div>
+
+    <div class="row column" id="private_meeting">
+      <%= form.check_box :private_meeting %>
+    </div>
+
+    <div class="row column" id="transparent">
+      <%= form.check_box :transparent %>
+    </div>
   </div>
 </div>
 

data/app/views/decidim/meetings/admin/meetings/index.html.erb

@@ -2,7 +2,7 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t(".title") %>
-      <%= link_to t("actions.new", scope: "decidim.meetings", name: t("models.meeting.name", scope: "decidim.meetings.admin")), new_meeting_path, class: "button tiny button--title" if can? :manage, current_component %>
+      <%= link_to t("actions.new", scope: "decidim.meetings", name: t("models.meeting.name", scope: "decidim.meetings.admin")), new_meeting_path, class: "button tiny button--title" if allowed_to? :create, :meeting %>
     </h2>
   </div>
 
@@ -48,28 +48,30 @@
               <td class="table-list__actions">
                 <%= icon_link_to "eye", resource_locator(meeting).path, t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank %>
 
-                <% if can? :update, current_component %>
+                <% if allowed_to? :copy, :meeting, meeting: meeting %>
                   <%= icon_link_to "clipboard", new_meeting_copy_path(meeting), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
                 <% end %>
 
-                <% if can? :update, current_component %>
+                <% if allowed_to? :update, :meeting, meeting: meeting %>
                   <%= icon_link_to "pencil", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>
                   <%= icon_link_to "people", edit_meeting_registrations_path(meeting), t("actions.registrations", scope: "decidim.meetings"), class: "action-icon--registrations" %>
+                  <%= icon_link_to "clock", meeting.minutes.present? ? edit_meeting_minute_path(meeting, meeting.minutes) : new_meeting_minute_path(meeting), t("actions.minutes", scope: "decidim.meetings"), class: "action-icon--minutes" %>
+                  <%= icon_link_to "calendar", meeting.agenda.present? ? edit_meeting_agenda_path(meeting, meeting.agenda) : new_meeting_agenda_path(meeting), t("actions.agenda", scope: "decidim.meetings"), class: "action-icon--agenda" %>
                 <% end %>
 
-                <% if can? :update, current_component %>
+                <% if allowed_to? :close, :meeting, meeting: meeting %>
                   <%= icon_link_to "lock-locked", edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), t("actions.close", scope: "decidim.meetings"), class: "action-icon--close" %>
                 <% end %>
 
-                <% if can? :update, current_component %>
+                <% if allowed_to? :update, :meeting, meeting: meeting %>
                     <%= icon_link_to "folder", meeting_attachment_collections_path(meeting), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
                 <% end %>
 
-                <% if can? :update, current_component %>
+                <% if allowed_to? :update, :meeting, meeting: meeting %>
                   <%= icon_link_to "paperclip", meeting_attachments_path(meeting), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
                 <% end %>
 
-                <% if can? :destroy, current_component %>
+                <% if allowed_to? :destroy, :meeting, meeting: meeting %>
                   <%= icon_link_to "circle-x", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
                 <% end %>
               </td>

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

@@ -0,0 +1,23 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :editor, :description %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :video_url %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :audio_url %>
+    </div>
+
+    <div class="row column">
+      <%= form.check_box :visible %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/meetings/admin/minutes/edit.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: meeting_minute_path(@current_meeting, @minutes), html: { class: "form edit_minutes" })  do |f| %>
+  <%= render partial: "form", object: f %>
+
+    <div class="button--double form-general-submit">
+      <%= f.submit t(".update") %>
+    </div>
+<% end %>

data/app/views/decidim/meetings/admin/minutes/new.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: meeting_minutes_path(current_meeting), html: { method: :post, class: "form new_minutes" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+
+  <div class="button--double form-general-submit">
+      <%= f.submit t(".create") %>
+  </div>
+<% end %>

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

@@ -2,15 +2,17 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= title %>
-      <%= link_to t(".invite_user"), meeting.registrations_enabled ? new_meeting_registrations_invites_path(meeting) : "#", class: "button tiny button--title #{'disabled' unless meeting.registrations_enabled?}" %>
-      <span class="exports dropdown tiny button button--simple button--title" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></span>
-      <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
-        <ul class="vertical menu add-components">
-          <% %w{CSV JSON Excel}.each do |format| %>
-            <li class="exports--format--<%= format.downcase %> exports--registrations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{current_component.manifest.name}.admin.exports.registrations"), export_format: format), export_meeting_registrations_path(meeting_id: meeting, format: format) %></li>
-          <% end %>
-        </ul>
-      </div>
+      <%= link_to t(".invite_user"), meeting.registrations_enabled ? new_meeting_registrations_invites_path(meeting) : "#", class: "button tiny button--title #{'disabled' unless allowed_to? :invite_user, :meeting, meeting: meeting}" %>
+      <% if allowed_to? :export_registrations, :meeting, meeting: meeting %>
+        <span class="exports dropdown tiny button button--simple button--title" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></span>
+        <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
+          <ul class="vertical menu add-components">
+            <% %w{CSV JSON Excel}.each do |format| %>
+              <li class="exports--format--<%= format.downcase %> exports--registrations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{current_component.manifest.name}.admin.exports.registrations"), export_format: format), export_meeting_registrations_path(meeting_id: meeting, format: format) %></li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
     </h2>
   </div>
 

data/app/views/decidim/meetings/meetings/_linked_meetings.html.erb

@@ -1,6 +1,5 @@
 <div class="row small-up-1 medium-up-2 card-grid">
   <% resources.each do |meeting| %>
-    <% next unless meeting.component.published? %>
     <div class="column">
       <article class="card card--meeting">
         <div class="card__content">

data/app/views/decidim/meetings/meetings/_meeting_agenda.html.erb

@@ -0,0 +1,31 @@
+<div class="section agenda-section">
+  <div class="flex--sbe">
+    <h2 class="section-heading"><%= translated_attribute(meeting.agenda.title) %></h2>
+  </div>
+  <div class="card">
+    <div class="card__content scroll">
+      <% agenda_items_times = calculate_start_and_end_time_of_agenda_items(meeting.agenda.agenda_items.first_class, meeting) %>
+      <% meeting.agenda.agenda_items.first_class.each_with_index do |agenda_item, index| %>
+        <h5 class="agenda-item--title heading5">
+          <strong class="text-uppercase"><%= translated_attribute(agenda_item.title) %></strong>&nbsp;
+          <span class="text-small"><%= display_duration_agenda_items(agenda_item.id, index, agenda_items_times) %></span>
+        </h5>
+        <hr class="reset m-none mb-s" />
+        <p><%= translated_attribute(agenda_item.description).html_safe %></p>
+
+        <% if agenda_item.agenda_item_children.presence %>
+          <% parent_start_time = agenda_items_times[index][:start_time] %>
+          <% agenda_item_children_times = calculate_start_and_end_time_of_agenda_items(agenda_item.agenda_item_children, meeting, parent_start_time) %>
+
+          <% agenda_item.agenda_item_children.each_with_index do |agenda_item_child, index_child| %>
+            <h6 class="heading6">
+              <strong class="text-uppercase"><%= translated_attribute(agenda_item_child.title) %></strong>&nbsp;
+              <span class="text-small"><%= display_duration_agenda_items(agenda_item_child.id, index_child, agenda_item_children_times) %></span>
+            </h6>
+            <p><%= translated_attribute(agenda_item_child.description).html_safe %></p>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/meetings/meetings/_meeting_minutes.html.erb

@@ -0,0 +1,48 @@
+<div class="section minutes-section">
+  <h3 class="section-heading"><%= t(".meeting_minutes") %></h3>
+  <% if translated_attribute(meeting.minutes.description).present? %>
+    <div class="card">
+      <div class="card-section">
+        <div class="row column">
+          <%= decidim_sanitize translated_attribute meeting.minutes.description %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+
+  <% if meeting.minutes.video_url.presence || meeting.minutes.audio_url.presence %>
+    <div class="section">
+      <h4 class="section-heading"><%= t(".related_information") %></h4>
+      <div class="card card--list">
+        <% if meeting.minutes.video_url.presence %>
+          <div class="card--list__item">
+            <div class="card--list__text">
+              <div>
+                <%= link_to meeting.minutes.video_url, meeting.minutes.video_url, target: "_blank" %>
+              </div>
+            </div>
+            <div class="card--list__data">
+              <%= link_to meeting.minutes.video_url, target: "_blank", class: "card--list__data__icon" do %>
+                <%= icon "external-link" %>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+        <% if meeting.minutes.video_url.presence %>
+          <div class="card--list__item">
+            <div class="card--list__text">
+              <div>
+                <%= link_to meeting.minutes.audio_url, meeting.minutes.audio_url, target: "_blank" %>
+              </div>
+            </div>
+            <div class="card--list__data">
+              <%= link_to meeting.minutes.audio_url, target: "_blank", class: "card--list__data__icon" do %>
+                <%= icon "external-link" %>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+</div>