decidim 0.0.2 → 0.0.3

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

@@ -0,0 +1,23 @@
+<div class="field">
+  <%= form.translated :text_area, :closing_report, autofocus: true, rows: 15 %>
+</div>
+
+<div class="field">
+  <%= form.text_area :attending_organizations, rows: 5 %>
+</div>
+
+<div class="field">
+  <%= form.number_field :attendees_count, min: 0 %>
+</div>
+
+<div class="field">
+  <%= form.number_field :contributions_count, min: 0 %>
+</div>
+
+<% if @form.proposals %>
+  <%= form.select :proposal_ids,
+                  @form.proposals.order("title ASC").pluck(:title, :id),
+                  { include_blank: true },
+                  { multiple: true, class: "chosen-select" }
+  %>
+<% end %>

data/decidim-meetings/app/views/decidim/meetings/admin/meeting_closes/edit.html.erb

@@ -0,0 +1,9 @@
+<h3><%= t ".title" %></h3>
+
+<%= form_for(@form, url: meeting_meeting_close_path(meeting, @form)) do |f| %>
+  <%= render partial: 'form', object: f %>
+
+  <div class="actions">
+    <%= f.submit t(".close") %>
+  </div>
+<% end %>

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

@@ -3,11 +3,11 @@
 </div>
 
 <div class="field" >
-  <%= form.translated :editor, :short_description %>
+  <%= form.translated :editor, :description %>
 </div>
 
 <div class="field" >
-  <%= form.translated :editor, :description %>
+  <%= form.text_field :address %>
 </div>
 
 <div class="field" >
@@ -18,10 +18,6 @@
   <%= form.translated :text_area, :location_hints %>
 </div>
 
-<div class="field" >
-  <%= form.text_field :address %>
-</div>
-
 <div class="field" >
   <%= form.datetime_field :start_time %>
 </div>

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

@@ -10,6 +10,10 @@
       <th><%= t("models.meeting.fields.title", scope: "decidim.meetings") %></th>
       <th><%= t("models.meeting.fields.start_time", scope: "decidim.meetings") %></th>
       <th><%= t("models.meeting.fields.end_time", scope: "decidim.meetings") %></th>
+      <th><%= t("models.meeting.fields.closed", scope: "decidim.meetings") %></th>
+      <% if Decidim.geocoder.present? %>
+        <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
+      <% end %>
       <th class="actions"><%= t("actions.title", scope: "decidim.meetings") %></th>
     </tr>
   </thead>
@@ -29,8 +33,18 @@
             <%= l meeting.end_time, format: :long %>
           <%  end%>
         </td>
+        <td>
+          <%= humanize_boolean meeting.closed? %>
+        </td>
+        <% if Decidim.geocoder.present? %>
+          <td>
+            <%= static_map_link(meeting) %>
+          </td>
+        <% end %>
         <td class="actions">
           <%= link_to t("actions.edit", scope: "decidim.meetings"), edit_meeting_path(meeting) if can? :update, current_feature %>
+          <%= link_to t("actions.close", scope: "decidim.meetings"), edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id) if can? :update, current_feature %>
+          <%= link_to t("actions.attachments", scope: "decidim.meetings"), meeting_attachments_path(meeting) if can? :update, current_feature %>
           <%= link_to t("actions.destroy", scope: "decidim.meetings"), meeting_path(meeting), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } if can? :destroy, current_feature %>
         </td>
       </tr>

data/decidim-meetings/app/views/decidim/meetings/meetings/_datetime.html.erb

@@ -0,0 +1,8 @@
+<div class="card__datetime">
+  <div class="card__datetime__date">
+    <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B" %></span>
+  </div>
+  <div class="card__datetime__time">
+    <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
+  </div>
+</div>

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

@@ -11,7 +11,7 @@
       </div>
     </div>
   </div>
-  
+
   <%= form.collection_radio_buttons :order_start_time, [["asc", t('.ascendent')], ["desc", t('.descendent')]], :first, :last, legend_title: t('.date') %>
 
   <% if current_organization.scopes.any? %>
@@ -19,6 +19,6 @@
   <% end %>
 
   <% if current_feature.categories.any? %>
-    <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, include_blank: true %>  
+    <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, include_blank: true %>
   <% end %>
 <% end %>

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

@@ -0,0 +1,18 @@
+<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" %>
+  </button>
+</div>
+
+<div class="reveal" id="filter-box" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t ".filter_for" %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="filters">
+    <%= render partial: "filters" %>
+  </div>
+</div>

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

@@ -0,0 +1,22 @@
+<div class="row small-up-1 medium-up-2 card-grid">
+  <% resources.each do |meeting| %>
+    <div class="column">
+      <article class="card card--meeting">
+        <div class="card__content">
+          <%= link_to decidim_resource_path(meeting), class: "card__link" do %>
+            <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
+          <% end %>
+          <div class="card__datetime">
+            <div class="card__datetime__date">
+              <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B" %></span>
+            </div>
+            <div class="card__datetime__time">
+              <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
+            </div>
+          </div>
+          <%== translated_attribute meeting.description %>
+        </div>
+      </article>
+    </div>
+  <% end %>
+</div>

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

@@ -6,21 +6,14 @@
           <%= link_to meeting, class: "card__link" do %>
             <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
           <% end %>
-          <div class="card__datetime">
-            <div class="card__datetime__date">
-              <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B" %></span>
-            </div>
-            <div class="card__datetime__time">
-              <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
-            </div>
-          </div>
-          <%== translated_attribute meeting.short_description %>
+          <%= render partial: "datetime", locals: { meeting: meeting } %>
+          <%== translated_attribute meeting.description %>
           <%= render partial: "tags", locals: { meeting: meeting } %>
           <div class="address card__extra">
             <div class="address__icon">
               <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
             </div>
-            <%= render partial: 'address_details', locals: { meeting: meeting } %>
+            <%= render partial: "address_details", locals: { meeting: meeting } %>
           </div>
         </div>
       </article>

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

@@ -1,7 +1,47 @@
 <% content_for(:title, t(".title")) %>
 
+<% if Decidim.geocoder.present? %>
+  <div class="row column">
+    <div class="google-map" id="meetings-map" data-meetings="<%= meetings_data_for_map(geocoded_meetings).to_json %>" data-here-app-id="<%= Decidim.geocoder[:here_app_id] %>" data-here-app-code="<%= Decidim.geocoder[:here_app_code] %>">
+    </div>
+
+    <template id="meeting-popup">
+      <div class="map-info__content">
+        <h3>${title}</h3>
+        <div id="bodyContent">
+          <p>{{html description}}</p>
+          <div class="map__date-adress">
+            <div class="card__datetime">
+              <div class="card__datetime__date">
+                ${startTimeDay} <span class="card__datetime__month">${startTimeMonth}</span>
+              </div>
+              <div class="card__datetime__time">${starTime}</div>
+            </div>
+            <div class="address card__extra">
+              <div class="address__icon">{{html icon}}</div>
+              <div class="address__details">
+                <strong>{{html location}}</strong><br />
+                <span>${address}</span><br />
+                <span>{{html locationHints}}</span>
+              </div>
+            </div>
+          </div>
+          <div class="map-info__button">
+            <a href="${link}" class="button button--sc">
+              <%= t('.view_meeting') %>
+            </a>
+          </div>
+        </div>
+      </div>
+    </template>
+    <%= stylesheet_link_tag "decidim/meetings/map" %>
+    <%= javascript_include_tag "decidim/meetings/map" %>
+  </div>
+<% end %>
+
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
+    <%= render partial: "filters_small_view" %>
     <div class="card card--secondary show-for-mediumlarge" >
       <%= render partial: "filters" %>
     </div>
@@ -10,3 +50,5 @@
     <%= render partial: "meetings" %>
   </div>
 </div>
+
+<%= javascript_include_tag("decidim/filters") %>

data/decidim-meetings/app/views/decidim/meetings/meetings/index.js.erb

@@ -1,2 +1,8 @@
 var $meetings = $('#meetings');
+
 $meetings.html('<%= j(render partial: "meetings") %>');
+
+window.DecidimMeetings.currentMap = window.DecidimMeetings.loadMap(
+  'meetings-map',
+  JSON.parse('<%= escape_javascript meetings_data_for_map(geocoded_meetings).to_json.html_safe %>')
+);

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

@@ -15,26 +15,52 @@
           <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
         </div>
       </div>
-    </div>
+      </div>
+      <% if meeting.closed? %>
+        <div class="card card--secondary extra definition-data">
+          <div class="definition-data__item definition-data__item--double">
+            <span class="definition-data__title"><%= t(".attendees") %></span>
+            <span class="definition-data__number"><%= meeting.attendees_count %></span>
+          </div>
+          <div class="definition-data__item definition-data__item--double">
+            <span class="definition-data__title"><%= t(".contributions") %></span>
+            <span class="definition-data__number"><%= meeting.contributions_count %></span>
+          </div>
+          <div class="definition-data__item">
+            <span class="definition-data__title"><%= t(".organizations") %></span>
+            <span class="definition-data__text"><%= meeting.attending_organizations %></span>
+          </div>
+        </div>
+      <% end %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
-      <%== translated_attribute meeting.short_description %>
+      <p><%== translated_attribute meeting.description %></p>
       <div class="card card--secondary">
         <div class="card__content address">
           <div class="address__info">
             <div class="address__icon">
               <%= icon "meetings", width: 40, height: 70 %>
             </div>
-            <%= render partial: 'address_details', locals: { meeting: meeting } %>
+            <%= render partial: "address_details", locals: { meeting: meeting } %>
           </div>
+          <% if Decidim.geocoder.present? %>
+            <div class="address__map">
+              <%= static_map_link(meeting) %>
+            </div>
+          <% end %>
         </div>
       </div>
       <%= render partial: "tags", locals: { meeting: meeting } %>
     </div>
-    <div class="section">
-      <h3 class="section-heading"><%= t(".meeting_description") %></h3>
-      <%== translated_attribute meeting.description %>
-    </div>
+    <% if meeting.closed? %>
+      <div class="section">
+        <h3 class="section-heading"><%= t(".meeting_report") %></h3>
+        <%== translated_attribute meeting.closing_report %>
+      </div>
+    <% end %>
+    <%= linked_resources_for meeting, :proposals, "proposals_from_meeting" %>
+    <%= linked_resources_for meeting, :results, "meetings_through_proposals" %>
   </div>
 </div>
+<%= attachments_for meeting %>

data/decidim-meetings/bin/rails

@@ -4,7 +4,7 @@
 # installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/meetings/engine", __FILE__)
+ENGINE_PATH = File.expand_path("../../lib/decidim/meetings/list_engine", __FILE__)
 
 # Set up gems listed in the Gemfile.
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)

data/decidim-meetings/config/i18n-tasks.yml

@@ -2,3 +2,5 @@ base_locale: en
 locales: [en]
 ignore_unused:
 - "decidim.features.meetings.name"
+- "activemodel.attributes.close_meeting.*"
+- "decidim.resource_links.*"

data/decidim-meetings/config/locales/ca.yml

@@ -1,20 +1,37 @@
 ca:
+  activemodel:
+    attributes:
+      close_meeting:
+        attendees_count: Nombre d'assistents
+        attending_organizations: Llista d'organitzacions que han participat
+        closing_report: Informe
+        contributions_count: Nombre de contribucions
+        proposal_ids: Propostes creades en una trobada
   decidim:
     features:
       meetings:
         name: Llistat de trobades
     meetings:
       actions:
+        attachments: Adjunts
+        close: Tancar
         confirm_destroy: Esteu segur de que voleu suprimir aquesta trobada?
         destroy: Esborra
         edit: Edita
         new: Nou/va %{name}
         title: Accions
       admin:
+        meeting_closes:
+          edit:
+            close: Tancar
+            title: Tancar trobada
         meetings:
+          close:
+            invalid: Hi ha hagut un problema en tancar aquesta trobada
+            success: Trobada tancada amb èxit
           create:
             invalid: Hi ha hagut un problema en crear aquesta trobada
-            success: Reunió creada amb èxit
+            success: Trobada creada amb èxit
           destroy:
             success: La trobada s'ha eliminat correctament
           edit:
@@ -27,7 +44,7 @@ ca:
             title: Nova trobada
           update:
             invalid: Hi ha hagut un problema en actualitzar aquesta trobada
-            success: Reunió actualitzada correctament
+            success: Trobada actualitzada correctament
         models:
           meeting:
             name: Trobada
@@ -39,13 +56,29 @@ ca:
           descendent: Descendent
           scopes: Àmbits
           search: Cerca
+        filters_small_view:
+          close_modal: Tancar finestra
+          filter: Filtra
+          filter_for: Filtra per
+          unfold: Desplegar
         index:
           title: Llistat de trobades
+          view_meeting: Veure trobada
         show:
-          meeting_description: Descripció de reunions
+          attendees: Nombre d'assistents
+          contributions: Nombre d'aportacions
+          meeting_report: Informe de la trobada
+          organizations: Llista d'organitzacions que han atès
       models:
         meeting:
           fields:
+            closed: Tancada
             end_time: Data de finalització
+            map: Mapa
             start_time: Data d'inici
-            title: Títol
+            title: Títol
+    resource_links:
+      meetings_through_proposals:
+        results: 'Resultats relacionats:'
+      proposals_from_meeting:
+        proposals: Propostes relacionades

data/decidim-meetings/config/locales/en.yml

@@ -1,18 +1,35 @@
 ---
 en:
+  activemodel:
+    attributes:
+      close_meeting:
+        attendees_count: Number of attendees
+        attending_organizations: List of organizations that attended
+        closing_report: Report
+        contributions_count: Number of contributions
+        proposal_ids: Proposals created in the meeting
   decidim:
     features:
       meetings:
         name: Meetings
     meetings:
       actions:
+        attachments: Attachments
+        close: Close
         confirm_destroy: Are you sure you want to delete this meeting?
         destroy: Delete
         edit: Edit
         new: New %{name}
         title: Actions
       admin:
+        meeting_closes:
+          edit:
+            close: Close
+            title: Close meeting
         meetings:
+          close:
+            invalid: There's been a problem closing this meeting
+            success: Meeting successfully closed
           create:
             invalid: There's been a problem creating this meeting
             success: Meeting successfully created
@@ -40,13 +57,29 @@ en:
           descendent: Descendent
           scopes: Scopes
           search: Search
+        filters_small_view:
+          close_modal: Close modal
+          filter: Filter
+          filter_for: Filter by
+          unfold: Unfold
         index:
           title: Meetings
+          view_meeting: View meeting
         show:
-          meeting_description: Meeting description
+          attendees: Attendees count
+          contributions: Contributions count
+          meeting_report: Meeting report
+          organizations: Attending organizations
       models:
         meeting:
           fields:
+            closed: Closed
             end_time: End date
+            map: Map
             start_time: Start date
             title: Title
+    resource_links:
+      meetings_through_proposals:
+        results: 'Related results:'
+      proposals_from_meeting:
+        proposals: Related proposals