decidim-meetings 0.10.1 → 0.11.0.pre1

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_feature %>
+      <%= 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 %>
     </h2>
   </div>
 
@@ -30,12 +30,12 @@
               <td>
                 <% if meeting.start_time %>
                   <%= l meeting.start_time, format: :long %>
-                <%  end%>
+                <% end %>
               </td>
               <td>
                 <% if meeting.end_time %>
                   <%= l meeting.end_time, format: :long %>
-                <%  end%>
+                <% end %>
               </td>
               <td>
                 <%= humanize_boolean meeting.closed? %>
@@ -48,24 +48,28 @@
               <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_feature %>
+                <% if can? :update, current_component %>
+                  <%= 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 %>
                   <%= 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" %>
                 <% end %>
 
-                <% if can? :update, current_feature %>
+                <% if can? :update, current_component %>
                   <%= 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_feature %>
+                <% if can? :update, current_component %>
                     <%= 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_feature %>
+                <% if can? :update, current_component %>
                   <%= icon_link_to "paperclip", meeting_attachments_path(meeting), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
                 <% end %>
 
-                <% if can? :destroy, current_feature %>
+                <% if can? :destroy, current_component %>
                   <%= 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>
@@ -76,4 +80,4 @@
       <%= paginate meetings, theme: "decidim" %>
     </div>
   </div>
-<div>
+</div>

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

@@ -1,5 +1,5 @@
-<%=  decidim_form_for(@form, html: { class: "form new_meeting" }) do |f| %>
-  <%= render partial: 'form', object: f, locals: { title: t('.title') }  %>
+<%= decidim_form_for(@form, html: { class: "form new_meeting" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
       <%= f.submit t(".create") %>

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

@@ -5,9 +5,9 @@
       <%= 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-features">
+        <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_feature.manifest.name}.admin.exports.registrations"), export_format: format), export_meeting_registrations_path(meeting_id: meeting, format: format) %></li>
+            <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>
@@ -25,6 +25,11 @@
       <p class="help-text"><%= t(".available_slots_help") %></p>
     </div>
 
+    <div class="row column">
+      <%= form.number_field :reserved_slots %>
+      <p class="help-text"><%= t(".reserved_slots_help") %></p>
+    </div>
+
     <div class="row column">
       <%= form.translated :editor, :registration_terms %>
     </div>

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

@@ -1,8 +1,7 @@
-<%=  decidim_form_for(@form, url: meeting_registrations_path, html: { class: "form edit_meeting_registrations" })  do |f| %>
-  <%= render partial: 'form', object: f %>
+<%= decidim_form_for(@form, url: meeting_registrations_path, html: { class: "form edit_meeting_registrations" })  do |f| %>
+  <%= render partial: "form", object: f %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".save") %>
   </div>
 <% end %>
-

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

@@ -20,7 +20,7 @@
     <%= scopes_picker_filter form, :scope_id %>
   <% end %>
 
-  <% if current_feature.categories.any? %>
-    <%= form.categories_select :category_id, current_feature.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t('.category_prompt') %>
+  <% if current_component.categories.any? %>
+    <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
   <% end %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <div class="filters-controls hide-for-mediumlarge">
   <button data-open="filter-box" class="filters-controls__trigger">
     <%= t ".filter" %>
-    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t('.unfold'), role: "img" %>
+    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
   </button>
 </div>
 

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

@@ -12,24 +12,7 @@
 
 <div class="row small-up-1 medium-up-2 card-grid">
   <% meetings.each do |meeting| %>
-    <div class="column">
-      <article class="card card--meeting">
-        <div class="card__content">
-          <%= link_to meeting, class: "card__link" do %>
-            <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
-          <% end %>
-          <%= render partial: "datetime", locals: { meeting: meeting } %>
-          <%= decidim_sanitize meeting_description(meeting) %>
-          <%= render partial: "decidim/shared/tags", locals: { resource: meeting, tags_class_extra: "tags--meeting" } %>
-          <div class="address card__extra">
-            <div class="address__icon">
-              <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
-            </div>
-            <%= render partial: "decidim/shared/address_details", locals: { icon_name: "meetings", geolocalizable: meeting } %>
-          </div>
-        </div>
-      </article>
-    </div>
+    <%= card_for meeting %>
   <% end %>
 </div>
 <%= decidim_paginate meetings, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>

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

@@ -6,10 +6,10 @@
   </div>
   <div class="row">
     <div class="columns medium-8 medium-offset-2">
-      <%= button_to t('.confirm'), meeting_registration_path(meeting), class: "button expanded", data: { disable: true } %>
+      <%= button_to t(".confirm"), meeting_registration_path(meeting), class: "button expanded", data: { disable: true } %>
     </div>
   </div>
   <div class="text-center">
-    <button class="link" data-close><%= t('.cancel') %></button>
+    <button class="link" data-close><%= t(".cancel") %></button>
   </div>
 </div>

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

@@ -1,4 +1,4 @@
-<%= render partial: "decidim/shared/feature_announcement" %>
+<%= render partial: "decidim/shared/component_announcement" %>
 
 <%= dynamic_map_for meetings_data_for_map(geocoded_meetings) do %>
   <template id="marker-popup">
@@ -24,7 +24,7 @@
         </div>
         <div class="map-info__button">
           <a href="${link}" class="button button--sc">
-            <%= t('.view_meeting') %>
+            <%= t(".view_meeting") %>
           </a>
         </div>
       </div>
@@ -37,7 +37,7 @@
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
     <%= render partial: "filters_small_view" %>
-    <div class="card card--secondary show-for-mediumlarge" >
+    <div class="card card--secondary show-for-mediumlarge">
       <%= render partial: "filters" %>
     </div>
   </div>

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

@@ -20,11 +20,11 @@
         <div class="extra__time">
           <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
         </div>
-        <% if !meeting.closed? && meeting.registrations_enabled? %>
+        <% if !meeting.closed? && meeting.registrations_enabled? && meeting.can_participate?(current_user) %>
           <% if meeting.has_registration_for? current_user %>
-            <%= action_authorized_button_to :leave, t('.going'), meeting_registration_path(meeting), method: :delete, class: "button expanded button--sc success", data: { disable: true } %>
+            <%= action_authorized_button_to :leave, t(".going"), meeting_registration_path(meeting), method: :delete, class: "button expanded button--sc success", data: { disable: true } %>
           <% else %>
-            <%= action_authorized_button_to :join, meeting.has_available_slots? ? t('.join') : t('.no_slots_available'), "", class: "button expanded button--sc", disabled: !meeting.has_available_slots?, data: { open: current_user.present? ? "meeting-registration-confirm" : "loginModal" } %>
+            <%= action_authorized_button_to :join, meeting.has_available_slots? ? t(".join") : t(".no_slots_available"), "", class: "button expanded button--sc", disabled: !meeting.has_available_slots?, data: { open: current_user.present? ? "meeting-registration-confirm" : "loginModal" } %>
           <% end %>
           <% if meeting.available_slots.positive? %>
             <span><%= t(".remaining_slots", count: meeting.remaining_slots) %></span>
@@ -51,11 +51,28 @@
           <% end %>
           <div class="definition-data__item">
             <span class="definition-data__title"><%= t(".organizations") %></span>
-            <span class="definition-data__text"><%= meeting.attending_organizations %></span>
+            <span class="definition-data__text"><%= simple_format(meeting.attending_organizations) %></span>
           </div>
         </div>
       <% end %>
     </div>
+
+    <% if meeting.services.any? %>
+      <div class="card card--list">
+        <% meeting.services.each do |service| %>
+          <div class="card--list__item">
+            <div class="card--list__text card--list__text--top">
+              <%= icon "actions", class: "card--list__icon alert" %>
+              <div>
+                <h5 class="card--list__heading heading-small"><%= translated_attribute(service["title"]) %></h5>
+                <span class="text-medium"><%= translated_attribute(service["description"]) %></span>
+              </div>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+
     <%= resource_reference(meeting) %>
     <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for meeting_meeting_widget_url(meeting, format: :js) %>

data/app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_meetings.html.erb

@@ -2,14 +2,14 @@
   <section class="section row collapse upcoming_meetings">
     <h2 class="section-heading"><%= t(".upcoming_meetings") %></h2>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
-      <%= render partial: 'decidim/participatory_processes/participatory_process_groups/meeting', collection: upcoming_meetings %>
+      <%= render partial: "decidim/participatory_processes/participatory_process_groups/meeting", collection: upcoming_meetings %>
     </div>
   </section>
 <% elsif past_meetings.any? %>
   <section class="section row collapse past_meetings">
     <h2 class="section-heading"><%= t(".past_meetings") %></h2>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
-      <%= render partial: 'decidim/participatory_processes/participatory_process_groups/meeting', collection: past_meetings %>
+      <%= render partial: "decidim/participatory_processes/participatory_process_groups/meeting", collection: past_meetings %>
     </div>
   </section>
 <% end %>

data/app/views/decidim/participatory_spaces/_highlighted_meetings.html.erb

@@ -1,19 +1,19 @@
 <% if upcoming_meetings.any? %>
   <div class="section upcoming_meetings">
     <h4 class="section-heading">
-      <%= t(".upcoming_meetings") %> <a href="<%= main_feature_path(upcoming_meetings.first.feature) %>" class="text-small"><%= t(".see_all_meetings") %></a>
+      <%= t(".upcoming_meetings") %> <a href="<%= main_component_path(upcoming_meetings.first.component) %>" class="text-small"><%= t(".see_all_meetings") %></a>
     </h4>
     <div class="card card--list">
-      <%= render partial: 'decidim/participatory_spaces/meeting', collection: upcoming_meetings %>
+      <%= render partial: "decidim/participatory_spaces/meeting", collection: upcoming_meetings %>
     </div>
   </div>
 <% elsif past_meetings.any? %>
   <div class="section past_meetings">
     <h4 class="section-heading">
-      <%= t(".past_meetings") %> <a href="<%= main_feature_path(past_meetings.first.feature) %>" class="text-small"><%= t(".see_all_meetings") %></a>
+      <%= t(".past_meetings") %> <a href="<%= main_component_path(past_meetings.first.component) %>" class="text-small"><%= t(".see_all_meetings") %></a>
     </h4>
     <div class="card card--list">
-      <%= render partial: 'decidim/participatory_spaces/meeting', collection: past_meetings %>
+      <%= render partial: "decidim/participatory_spaces/meeting", collection: past_meetings %>
     </div>
   </div>
 <% end %>

data/app/views/decidim/participatory_spaces/_meeting.html.erb

@@ -1,14 +1 @@
-<div class="card--list__item">
-  <div class="card--list__text">
-    <div>
-      <a href="<%= resource_locator(meeting).path %>" class="card__link">
-        <h6 class="card--list__heading heading6">
-          <%= translated_attribute meeting.title %>
-        </h6>
-        <span class="text-medium">
-          <%= l meeting.start_time, format: :decidim_day_of_year %> - <%= l meeting.start_time, format: :time_of_day %> - <%= l meeting.end_time, format: :time_of_day %>
-        </span>
-      </a>
-    </div>
-  </div>
-</div>
+<%= card_for meeting, size: :list_item %>

data/app/views/devise/mailer/join_meeting.html.erb

@@ -4,7 +4,7 @@
   <%= t("decidim.meetings.admin.invite_join_meeting_mailer.invite.invited_you_to_join_a_meeting", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
 </p>
 
-<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:meeting].feature).meeting_registration_path(meeting_id: @opts[:meeting], participatory_space_id: @opts[:meeting].feature.participatory_space), host: @resource.organization.host) %></p>
+<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:meeting].component).meeting_registration_path(meeting_id: @opts[:meeting], participatory_space_id: @opts[:meeting].component.participatory_space), host: @resource.organization.host) %></p>
 
 <% if @resource.invitation_due_at %>
   <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>

data/app/views/devise/mailer/join_meeting.text.erb

@@ -2,7 +2,7 @@
 
 <%= t("decidim.meetings.admin.invite_join_meeting_mailer.invite.invited_you_to_join_a_meeting", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
 
-<% accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:meeting].feature).meeting_registration_path(meeting_id: @opts[:meeting], participatory_space_id: @opts[:meeting].feature.participatory_space), host: @resource.organization.host) %>
+<% accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:meeting].component).meeting_registration_path(meeting_id: @opts[:meeting], participatory_space_id: @opts[:meeting].component.participatory_space), host: @resource.organization.host) %>
 
 <% if @resource.invitation_due_at %>
 <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %>

data/config/locales/ca.yml

@@ -21,6 +21,28 @@ ca:
         start_time: Hora d'inici
         title: Títol
   decidim:
+    admin:
+      meeting_copies:
+        create:
+          error: S'ha produït un error en duplicar aquesta trobada.
+          success: Trobada duplicada amb èxit.
+        new:
+          copy: Copia
+          select: Selecciona quines dades vols duplicar
+          title: Duplicar trobada
+    components:
+      meetings:
+        actions:
+          join: Inscriu-t'hi
+        name: Trobades
+        settings:
+          global:
+            announcement: Anunci
+            comments_enabled: Comentaris habilitats
+            default_registration_terms: Termes de registre per defecte
+          step:
+            announcement: Anunci
+            comments_blocked: Comentaris bloquejats
     events:
       meetings:
         meeting_closed:
@@ -53,18 +75,6 @@ ca:
           email_outro: Has rebut aquesta notificació perquè estàs seguint la trobada "%{resource_title}". Pots deixar-la de seguir des de l'enllaç anterior.
           email_subject: En menys de 48 hores s'iniciarà la trobada "%{resource_title}".
           notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> començarà en menys de 48 hores.
-    features:
-      meetings:
-        actions:
-          join: Inscriu-t'hi
-        name: Trobades
-        settings:
-          global:
-            announcement: Anunci
-            comments_enabled: Comentaris habilitats
-          step:
-            announcement: Anunci
-            comments_blocked: Comentaris bloquejats
     meetings:
       actions:
         attachment_collections: Col·leccions
@@ -112,6 +122,16 @@ ca:
           new:
             create: Crear
             title: Crear trobada
+          service:
+            description: Descripció
+            down: Avall
+            remove: Elimina
+            service: Servei
+            title: Títol
+            up: Pujar
+          services:
+            add_service: Afegeix servei
+            services: Serveis
           update:
             invalid: Hi ha hagut un problema en actualitzar aquesta trobada
             success: Trobada actualitzada correctament
@@ -127,6 +147,8 @@ ca:
             registrations_count:
               one: Hi ha hagut 1 inscripció.
               other: Hi ha hagut %{count} inscripcions.
+            reserved_slots_help: Deixa'l a 0 si no tens espais reservats
+            reserved_slots_less_than: Ha de ser inferior o igual que %{count}
           update:
             invalid: S'ha produït un problema en desar la configuració de la inscripció.
             success: La configuració de les inscripcions de la trobada s'ha desat correctament.
@@ -135,6 +157,7 @@ ca:
           close: "%{user_name} ha tancat la trobada %{resource_name} a l'espai %{space_name}"
           create: "%{user_name} ha creat la trobada %{resource_name} a l'espai %{space_name}"
           delete: "%{user_name} ha eliminat la trobada %{resource_name} a l'espai %{space_name}"
+          export_registrations: "%{user_name} va exportar les inscripcions de la trobada %{resource_name} de l'espai %{space_name}"
           update: "%{user_name} ha actualitzat la trobada %{resource_name} a l'espai %{space_name}"
       mailer:
         invite_join_meeting_mailer:

data/config/locales/en.yml

@@ -22,6 +22,28 @@ en:
         start_time: Start Time
         title: Title
   decidim:
+    admin:
+      meeting_copies:
+        create:
+          error: There was en error duplicating this meeting.
+          success: Duplicated meeting successfully.
+        new:
+          copy: Copy
+          select: Select which data you would like to duplicate
+          title: Duplicate meeting
+    components:
+      meetings:
+        actions:
+          join: Join
+        name: Meetings
+        settings:
+          global:
+            announcement: Announcement
+            comments_enabled: Comments enabled
+            default_registration_terms: Default registration terms
+          step:
+            announcement: Announcement
+            comments_blocked: Comments blocked
     events:
       meetings:
         meeting_closed:
@@ -54,18 +76,6 @@ en:
           email_outro: You have received this notification because you are following the "%{resource_title}" meeting. You can unfollow it from the previous link.
           email_subject: The "%{resource_title}" meeting will start in less than 48h.
           notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting will start in less than 48h.
-    features:
-      meetings:
-        actions:
-          join: Join
-        name: Meetings
-        settings:
-          global:
-            announcement: Announcement
-            comments_enabled: Comments enabled
-          step:
-            announcement: Announcement
-            comments_blocked: Comments blocked
     meetings:
       actions:
         attachment_collections: Collections
@@ -113,6 +123,16 @@ en:
           new:
             create: Create
             title: Create meeting
+          service:
+            description: Description
+            down: Down
+            remove: Remove
+            service: Service
+            title: Title
+            up: Up
+          services:
+            add_service: Add service
+            services: Services
           update:
             invalid: There's been a problem updating this meeting
             success: Meeting successfully updated
@@ -129,6 +149,8 @@ en:
               one: There has been 1 registration.
               other: There has been %{count} registrations.
               zero: There has not been registrations yet.
+            reserved_slots_help: Leave it to 0 if you don't have reserved slots
+            reserved_slots_less_than: Must be less than or equal to %{count}
           update:
             invalid: There's been a problem saving the registration settings.
             success: Meeting registrations settings successfully saved.
@@ -137,6 +159,7 @@ en:
           close: "%{user_name} closed the %{resource_name} meeting on the %{space_name} space"
           create: "%{user_name} created the %{resource_name} meeting on the %{space_name} space"
           delete: "%{user_name} deleted the %{resource_name} meeting on the %{space_name} space"
+          export_registrations: "%{user_name} exported the registrations of the %{resource_name} meeting on the %{space_name} space"
           update: "%{user_name} updated the %{resource_name} meeting on the %{space_name} space"
       mailer:
         invite_join_meeting_mailer: