decidim-meetings 0.11.2 → 0.12.0.pre

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

@@ -12,7 +12,7 @@
 
 <div class="row small-up-1 medium-up-2 card-grid">
   <% meetings.each do |meeting| %>
-    <%= card_for meeting %>
+    <%= card_for meeting, context: { current_user: current_user } %>
   <% end %>
 </div>
 <%= decidim_paginate meetings, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>

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

@@ -8,6 +8,9 @@
 
 <div class="row column view-header">
   <h2 class="heading2"><%= translated_attribute meeting.title %></h2>
+  <% if meeting.organizer.present? %>
+    <%= render partial: "decidim/shared/author_reference", locals: { author: present(meeting.organizer) } %>
+  <% end %>
 </div>
 <div class="row">
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8
@@ -20,16 +23,7 @@
         <div class="extra__time">
           <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
         </div>
-        <% 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 } %>
-          <% 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" } %>
-          <% end %>
-          <% if meeting.available_slots.positive? %>
-            <span><%= t(".remaining_slots", count: meeting.remaining_slots) %></span>
-          <% end %>
-        <% end %>
+        <%= cell "decidim/meetings/join_meeting_button", meeting, big_button: true, show_remaining_slots: true %>
         <%= render partial: "decidim/shared/follow_button", locals: { followable: meeting } %>
       </div>
       <% if meeting.closed? %>
@@ -79,10 +73,29 @@
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
+      <% if meeting.private_meeting? %>
+        <span class="<%= meeting_type_badge_css_class("private") %> label proposal-status">
+          <%= t("private_meeting", scope: "decidim.meetings.types") %>
+        </span>
+      <% end %>
+      <% if meeting.private_meeting? and meeting.transparent? %>
+        <span class="<%= meeting_type_badge_css_class("transparent") %> label proposal-status">
+          <%= t("transparent", scope: "decidim.meetings.types") %>
+        </span>
+      <% end %>
       <p><%= decidim_sanitize translated_attribute meeting.description %></p>
       <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
       <%= render partial: "decidim/shared/tags", locals: { resource: meeting, tags_class_extra: "tags--meeting" } %>
     </div>
+
+    <% if meeting.agenda.present? && meeting.agenda.visible? %>
+      <%= render "meeting_agenda" %>
+    <% end %>
+
+    <% if meeting.minutes.present? && meeting.minutes.visible? %>
+      <%= render "meeting_minutes" %>
+    <% end %>
+
     <% if meeting.closed? %>
       <div class="section">
         <h3 class="section-heading"><%= t(".meeting_report") %></h3>
@@ -96,7 +109,5 @@
 <%= attachments_for meeting %>
 <%= comments_for meeting %>
 
-<%= render partial: "registration_confirm" %>
-
 <%= javascript_include_tag "decidim/proposals/social_share" %>
 <%= stylesheet_link_tag "decidim/proposals/social_share" %>

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

@@ -1 +1 @@
-<%= card_for meeting, size: :list_item %>
+<%= card_for meeting, size: :list_item, context: { current_user: current_user } %>

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

@@ -0,0 +1,6 @@
+<div class="card__block">
+  <h6>
+    <strong class="text-uppercase text-small"><%= t("upcoming_meeting", scope: "decidim.participatory_spaces.upcoming_meeting_for_card") %></strong>
+  </h6>
+  <%= cell("decidim/meetings/meeting_m", upcoming_meeting).date %>
+</div>

data/config/locales/ca.yml

@@ -1,6 +1,10 @@
 ca:
   activemodel:
     attributes:
+      agenda:
+        description: Descripció
+        duration: Durada
+        title: Títol
       close_meeting:
         attendees_count: Nombre d'assistents
         attending_organizations: Llista d'organitzacions que han participat
@@ -16,10 +20,42 @@ ca:
         end_time: Hora de finalització
         location: Ubicació
         location_hints: Detalls d'ubicació
+        private_meeting: Trobada privada
         registration_terms: Termes i condicions de l'inscripció
         registrations_enabled: Inscripcions obertes
         start_time: Hora d'inici
         title: Títol
+        transparent: Transparent
+      minutes:
+        audio_url: URL de l'àudio
+        description: Descripció
+        video_url: URL del vídeo
+        visible: És visible
+    errors:
+      models:
+        meeting_agenda:
+          attributes:
+            base:
+              too_many_minutes: La durada dels elements supera la durada de la trobada per %{count} minuts
+              too_many_minutes_child: La durada del sub-ítem supera la durada del punt "%{parent_title}" del programa per %{count} minuts
+    models:
+      decidim/meetings/close_meeting_event: Trobada tancada
+      decidim/meetings/create_meeting_event: Trobada
+      decidim/meetings/meeting_registrations_enabled_event: S'han activat registres
+      decidim/meetings/meeting_registrations_over_percentage_event: Inscripcions per sobre del límit
+      decidim/meetings/upcoming_meeting_event: Propera trobada
+      decidim/meetings/update_meeting_event: Trobada actualitzada
+  activerecord:
+    models:
+      decidim/meetings/meeting:
+        one: Trobada
+        other: Trobades
+      decidim/meetings/minutes:
+        one: Acta
+        other: Actes
+      decidim/meetings/registration:
+        one: Inscripció
+        other: Inscripcions
   decidim:
     admin:
       meeting_copies:
@@ -77,17 +113,49 @@ ca:
           notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> començarà en menys de 48 hores.
     meetings:
       actions:
+        agenda: Ordre del dia
         attachment_collections: Col·leccions
         attachments: Adjunts
         close: Tancar
         confirm_destroy: Segur que vols suprimir aquesta trobada?
         destroy: Esborra
         edit: Edita
+        minutes: Acta
         new: Nova
         preview: Previsualitzar
         registrations: Inscripcions
         title: Accions
       admin:
+        agenda:
+          agenda_item:
+            add_agenda_item_child: Afegir un sub-ítem a l'ordre del dia
+            agenda_item: Punt de l'ordre del dia
+            agenda_item_children: Sub-ítems de l'ordre del dia
+            down: Baixar
+            remove: Eliminar
+            up: Amunt
+          agenda_item_child:
+            agenda_item_child: Sub-ítem de l'ordre del dia
+            down: Baixar
+            remove: Eliminar
+            up: Pujar
+          create:
+            invalid: Hi ha hagut un problema en crear aquesta agenda
+            success: S'ha creat l'agenda correctament
+          edit:
+            title: Edita l'agenda
+            update: Actualització
+          form:
+            add_agenda_item: Afegeix un element de l'agenda
+            agenda_items: Punts de l'ordre del dia
+            end_date: Data de finalització
+            start_date: Data d'inici
+          new:
+            create: Crear
+            title: Nova agenda
+          update:
+            invalid: Hi ha hagut un problema en actualitzar aquesta agenda
+            success: L'agenda s'ha actualitzat correctament
         exports:
           registrations: Inscripcions
         invite_join_meeting_mailer:
@@ -106,6 +174,9 @@ ca:
           edit:
             close: Tancar
             title: Tancar trobada
+        meeting_copies:
+          form:
+            select_organizer: Selecciona l'organitzador
         meetings:
           close:
             invalid: Hi ha hagut un problema en tancar aquesta trobada
@@ -117,6 +188,8 @@ ca:
             success: La trobada s'ha eliminat correctament
           edit:
             update: Actualitzar
+          form:
+            select_organizer: Selecciona l'organitzador
           index:
             title: Trobades
           new:
@@ -135,6 +208,18 @@ ca:
           update:
             invalid: Hi ha hagut un problema en actualitzar aquesta trobada
             success: Trobada actualitzada correctament
+        minutes:
+          create:
+            invalid: Hi ha hagut un problema en crear aquesta acta
+            success: S'ha creat l'acta amb èxit
+          edit:
+            update: Actualitza
+          new:
+            create: Crea
+            title: Crea l'acta
+          update:
+            invalid: Hi ha hagut un problema en actualitzar aquesta acta
+            success: L'acta s'ha actualitzat correctament
         models:
           meeting:
             name: Trobada
@@ -159,6 +244,12 @@ ca:
           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}"
+          value_types:
+            organizer_presenter:
+              not_found: 'L''organitzador no s''ha trobat a la base de dades (identificació: %{id})'
+        minutes:
+          create: "%{user_name} ha creat l'acta de la reunió %{resource_name} a l'espai %{space_name}"
+          update: "%{user_name} va ha actualitzat l'acta de la reunió %{resource_name} a l'espai %{space_name}"
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -166,6 +257,8 @@ ca:
         registration_mailer:
           confirmation:
             subject: La teva inscripció a la trobada ha estat confirmada
+      meeting:
+        not_allowed: No tens permís per veure aquesta trobada
       meetings:
         filters:
           category: Categoria
@@ -181,6 +274,9 @@ ca:
           unfold: Desplegar
         index:
           view_meeting: Veure trobada
+        meeting_minutes:
+          meeting_minutes: Minuts de trobada
+          related_information: Informació relacionada
         meetings:
           no_meetings_warning: No hi ha trobades que coincideixin amb el criteri de cerca o no hi ha cap trobada programada.
           upcoming_meetings_warning: Actualment no hi ha trobades programades, però pots veure les anteriors trobades.
@@ -198,6 +294,7 @@ ca:
           remaining_slots:
             one: 1 espai reservat restant
             other: "%{count} inscripcions restants"
+          view: Veure
       models:
         meeting:
           fields:
@@ -218,6 +315,9 @@ ca:
         destroy:
           invalid: Hi ha hagut un problema en sortir d'aquesta trobada.
           success: Heu deixat la trobada amb èxit.
+      types:
+        private_meeting: Trobada privada
+        transparent: Transparent
     participatory_processes:
       participatory_process_groups:
         highlighted_meetings:
@@ -228,13 +328,15 @@ ca:
         past_meetings: Trobades anteriors
         see_all_meetings: Veure totes les trobades
         upcoming_meetings: Properes trobades
+      upcoming_meeting_for_card:
+        upcoming_meeting: Propera reunió
     resource_links:
       meetings_through_proposals:
-        meeting_results: 'Resultats relacionats:'
-        result_meetings: 'Trobades relacionades:'
+        meeting_result: 'Resultats relacionats:'
+        result_meeting: 'Trobades relacionades:'
       proposals_from_meeting:
-        meeting_proposals: 'Propostes relacionades:'
-        proposal_meetings: 'Trobades relacionades:'
+        meeting_proposal: 'Propostes relacionades:'
+        proposal_meeting: 'Trobades relacionades:'
   devise:
     mailer:
       join_meeting:

data/config/locales/en.yml

@@ -2,6 +2,10 @@
 en:
   activemodel:
     attributes:
+      agenda:
+        description: Description
+        duration: Duration
+        title: Title
       close_meeting:
         attendees_count: Number of attendees
         attending_organizations: List of organizations that attended
@@ -17,10 +21,42 @@ en:
         end_time: End Time
         location: Location
         location_hints: Location hints
+        private_meeting: Private meeting
         registration_terms: Registration terms
         registrations_enabled: Registrations enabled
         start_time: Start Time
         title: Title
+        transparent: Transparent
+      minutes:
+        audio_url: Audio url
+        description: Description
+        video_url: Video url
+        visible: Is visible
+    errors:
+      models:
+        meeting_agenda:
+          attributes:
+            base:
+              too_many_minutes: The duration of the items exceed the meeting duration by %{count} minutes
+              too_many_minutes_child: The duration of the item childs exceed the agenda item "%{parent_title}" parent duration by %{count} minutes
+    models:
+      decidim/meetings/close_meeting_event: Meeting closed
+      decidim/meetings/create_meeting_event: Meeting
+      decidim/meetings/meeting_registrations_enabled_event: Registrations enabled
+      decidim/meetings/meeting_registrations_over_percentage_event: Registrations over limit
+      decidim/meetings/upcoming_meeting_event: Upcoming meeting
+      decidim/meetings/update_meeting_event: Meeting updated
+  activerecord:
+    models:
+      decidim/meetings/meeting:
+        one: Meeting
+        other: Meetings
+      decidim/meetings/minutes:
+        one: Minutes
+        other: Minutes
+      decidim/meetings/registration:
+        one: Registration
+        other: Registrations
   decidim:
     admin:
       meeting_copies:
@@ -78,17 +114,49 @@ en:
           notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting will start in less than 48h.
     meetings:
       actions:
+        agenda: Agenda
         attachment_collections: Collections
         attachments: Attachments
         close: Close
         confirm_destroy: Are you sure you want to delete this meeting?
         destroy: Delete
         edit: Edit
+        minutes: Minutes
         new: New
         preview: Preview
         registrations: Registrations
         title: Actions
       admin:
+        agenda:
+          agenda_item:
+            add_agenda_item_child: Add agenda item child
+            agenda_item: Agenda Item
+            agenda_item_children: Agenda Item Childs
+            down: Down
+            remove: Remove
+            up: Up
+          agenda_item_child:
+            agenda_item_child: Agenda Item Child
+            down: Down
+            remove: Remove
+            up: Up
+          create:
+            invalid: There's been a problem creating this agenda
+            success: Agenda successfully created
+          edit:
+            title: Edit agenda
+            update: Update
+          form:
+            add_agenda_item: Add agenda item
+            agenda_items: Agenda items
+            end_date: End date
+            start_date: Start date
+          new:
+            create: Create
+            title: New agenda
+          update:
+            invalid: There's been a problem updating this agenda
+            success: Agenda successfully updated
         exports:
           registrations: Registrations
         invite_join_meeting_mailer:
@@ -107,6 +175,9 @@ en:
           edit:
             close: Close
             title: Close meeting
+        meeting_copies:
+          form:
+            select_organizer: Select the organizer
         meetings:
           close:
             invalid: There's been a problem closing this meeting
@@ -118,6 +189,8 @@ en:
             success: Meeting successfully deleted
           edit:
             update: Update
+          form:
+            select_organizer: Select the organizer
           index:
             title: Meetings
           new:
@@ -136,6 +209,18 @@ en:
           update:
             invalid: There's been a problem updating this meeting
             success: Meeting successfully updated
+        minutes:
+          create:
+            invalid: There's been a problem creating this minutes
+            success: Minutes successfully created
+          edit:
+            update: Update
+          new:
+            create: Create
+            title: Create minutes
+          update:
+            invalid: There's been a problem updating this minutes
+            success: Minutes successfully updated
         models:
           meeting:
             name: Meeting
@@ -161,6 +246,12 @@ en:
           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"
+          value_types:
+            organizer_presenter:
+              not_found: 'The organizer was not found on the database (ID: %{id})'
+        minutes:
+          create: "%{user_name} created the minutes of the meeting %{resource_name} on the %{space_name} space"
+          update: "%{user_name} updated the minutes of the meeting %{resource_name} on the %{space_name} space"
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -168,6 +259,8 @@ en:
         registration_mailer:
           confirmation:
             subject: Your meeting's registration has been confirmed
+      meeting:
+        not_allowed: You are not allowed to view this meeting
       meetings:
         filters:
           category: Category
@@ -183,6 +276,9 @@ en:
           unfold: Unfold
         index:
           view_meeting: View meeting
+        meeting_minutes:
+          meeting_minutes: Meeting Minutes
+          related_information: Related Information
         meetings:
           no_meetings_warning: No meetings match your search criteria or there isn't any meeting scheduled.
           upcoming_meetings_warning: Currently, there are no scheduled meetings, but here you can find all the past meetings listed.
@@ -201,6 +297,7 @@ en:
             one: 1 slot remaining
             other: "%{count} slots remaining"
             zero: No slots remaining
+          view: View
       models:
         meeting:
           fields:
@@ -221,6 +318,9 @@ en:
         destroy:
           invalid: There's been a problem leaving this meeting.
           success: You have left the meeting successfully.
+      types:
+        private_meeting: Private meeting
+        transparent: Transparent
     participatory_processes:
       participatory_process_groups:
         highlighted_meetings:
@@ -231,13 +331,15 @@ en:
         past_meetings: Past meetings
         see_all_meetings: See all meetings
         upcoming_meetings: Upcoming meetings
+      upcoming_meeting_for_card:
+        upcoming_meeting: Upcoming meeting
     resource_links:
       meetings_through_proposals:
-        meeting_results: 'Related results:'
-        result_meetings: 'Related meetings:'
+        meeting_result: 'Related results:'
+        result_meeting: 'Related meetings:'
       proposals_from_meeting:
-        meeting_proposals: 'Related proposals:'
-        proposal_meetings: 'Related meetings:'
+        meeting_proposal: 'Related proposals:'
+        proposal_meeting: 'Related meetings:'
   devise:
     mailer:
       join_meeting: