decidim-meetings 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ecff3ff25e1f270d3bcd1b057d2f6035179297
-  data.tar.gz: a9796345f56085b0bf6613ec26b83823fb8e1652
+  metadata.gz: 8042c1ee86056372caec282e1b3e663492cfa664
+  data.tar.gz: 76a12945a27cc259cec4131655c7630fed8bb142
 SHA512:
-  metadata.gz: 23ab8448060b0e8b10c0f079a31ded9cda519842ca798c0e5c42a4fb17acd5b9b5ce73c9ce4a9d0b5c66dabc3899fe4e5a78065da5709b3698a7de383b3b1f5b
-  data.tar.gz: 37d206c6c7ff80a8d82416233c6a30a2c9f868c6acff8ab5d6a3b2f0a517ab394d9c56fc3b8ad50f3c53bb50ba70616e511051f41c8cd022c324f322607733b9
+  metadata.gz: 46eb80f168fe576614772d45ed418e0301ede6628e60dc7ec7c874b3191c60ba8aeb0681fad4820a79036713fd65088a2db87c5c9a6a027d095120bcd2a80e75
+  data.tar.gz: 193d415e8a9a3cb445ee1392c4fb4d4c509aad59255ddf8d0e865ea7195f3eb31d8ae57fc422fc54f835e43bd74fe5cfcff0544d4c2f59d1ca08a7133d0fab4d

data/app/assets/javascripts/decidim/meetings/map.js.es6.erb

@@ -1,6 +1,7 @@
 // = require leaflet
 // = require leaflet-tilelayer-here
 // = require leaflet-svg-icon
+// = require leaflet.markercluster
 // = require jquery-tmpl
 // = require_self
 
@@ -22,13 +23,13 @@ L.DivIcon.SVGIcon.DecidimIcon = L.DivIcon.SVGIcon.extend({
 const popupTemplateId = 'meeting-popup';
 $.template('meeting-popup', $(`#${popupTemplateId}`).html());
 
-const addMarkers = (meetingsData, map) => {
+const addMarkers = (meetingsData, markerClusters, map) => {
   const bounds = new L.LatLngBounds(meetingsData.map((meeting) => [meeting.latitude, meeting.longitude]));
 
   meetingsData.forEach((meeting) => {
     let marker = L.marker([meeting.latitude, meeting.longitude], {
       icon: new L.DivIcon.SVGIcon.DecidimIcon()
-    }).addTo(map);
+    });
     let node = document.createElement('div');
 
     $.tmpl('meeting-popup', meeting).appendTo(node);
@@ -39,12 +40,16 @@ const addMarkers = (meetingsData, map) => {
       keepInView: true,
       className: 'map-info'
     }).openPopup();
+
+    markerClusters.addLayer(marker);
   });
 
+  map.addLayer(markerClusters);
   map.fitBounds(bounds, { padding: [100, 100] });
 };
 
 const loadMap = (mapId, meetingsData) => {
+  let markerClusters = L.markerClusterGroup();
   const { hereAppId, hereAppCode } = window.DecidimMeetings.mapConfiguration;
 
   if (window.DecidimMeetings.currentMap) {
@@ -60,7 +65,7 @@ const loadMap = (mapId, meetingsData) => {
   }).addTo(map);
 
   if (meetingsData.length > 0) {
-    addMarkers(meetingsData, map);
+    addMarkers(meetingsData, markerClusters, map);
   } else {
     map.fitWorld();
   }

data/app/assets/stylesheets/decidim/meetings/map.css

@@ -1 +1,3 @@
-/* = require leaflet */
+/* = require leaflet */
+/* = require MarkerCluster */
+/* = require MarkerCluster.Default */

data/app/controllers/decidim/meetings/meetings_controller.rb

@@ -26,7 +26,7 @@ module Decidim
       end
 
       def meeting
-        @meeting ||= meetings.find(params[:id])
+        @meeting ||= Meeting.where(feature: current_feature).find(params[:id])
       end
 
       def search_klass
@@ -35,7 +35,7 @@ module Decidim
 
       def default_filter_params
         {
-          order_start_time: "asc",
+          date: "upcoming",
           search_text: "",
           scope_id: "",
           category_id: ""

data/app/forms/decidim/meetings/admin/close_meeting_form.rb

@@ -15,7 +15,8 @@ module Decidim
         attribute :closed_at, DateTime, default: ->(_form, _attribute) { Time.current }
 
         validates :closing_report, translatable_presence: true
-        validates :attendees_count, :contributions_count, presence: true, numericality: { greater_than_or_equal_to: 0 }
+        validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0 }
+        validates :contributions_count, numericality: true, allow_blank: true
         validates :attending_organizations, presence: true
 
         # Private: Gets the proposals from the meeting and injects them to the form.

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -11,8 +11,8 @@ module Decidim
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
         attribute :address, String
-        attribute :start_time, DateTime
-        attribute :end_time, DateTime
+        attribute :start_time, Decidim::Attributes::TimeWithZone
+        attribute :end_time, Decidim::Attributes::TimeWithZone
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
 

data/app/helpers/decidim/meetings/map_helper.rb

@@ -34,6 +34,7 @@ module Decidim
                                                                description: translated_attribute(meeting.description),
                                                                startTimeDay: l(meeting.start_time, format: "%d"),
                                                                startTimeMonth: l(meeting.start_time, format: "%B"),
+                                                               startTimeYear: l(meeting.start_time, format: "%Y"),
                                                                startTime: "#{meeting.start_time.strftime("%H:%M")} - #{meeting.end_time.strftime("%H:%M")}",
                                                                icon: icon("meetings", width: 40, height: 70, remove_icon_class: true),
                                                                location: translated_attribute(meeting.location),

data/app/services/decidim/meetings/meeting_search.rb

@@ -20,9 +20,13 @@ module Decidim
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
       end
 
-      # Handle the order_start_time filter
-      def search_order_start_time
-        query.order(start_time: order_start_time)
+      # Handle the date filter
+      def search_date
+        if options[:date] == "upcoming"
+          query.where("start_time >= ? ", Time.current).order("start_time ASC")
+        elsif options[:date] == "past"
+          query.where("start_time <= ? ", Time.current).order("start_time DESC")
+        end
       end
 
       # Handle the scope_id filter

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

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

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,6 +1,6 @@
 <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>
+    <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B %Y" %></span>
   </div>
   <div class="card__datetime__time">
     <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>

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

@@ -2,23 +2,23 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t('.search') %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
         <div class="input-group-button">
           <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t('.search') %>
+            <%= icon "magnifying-glass", aria_label: t(".search") %>
           </button>
         </div>
       </div>
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :order_start_time, [["asc", t('.ascendent')], ["desc", t('.descendent')]], :first, :last, legend_title: t('.date') %>
+  <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
 
   <% if current_organization.scopes.any? %>
-    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t(".scopes") %>
   <% 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/app/views/decidim/meetings/meetings/_linked_meetings.html.erb

@@ -8,7 +8,7 @@
           <% 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>
+              <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B %Y" %></span>
             </div>
             <div class="card__datetime__time">
               <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>

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

@@ -1,5 +1,3 @@
-<% 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] %>">
@@ -13,7 +11,7 @@
           <div class="map__date-adress">
             <div class="card__datetime">
               <div class="card__datetime__date">
-                ${startTimeDay} <span class="card__datetime__month">${startTimeMonth}</span>
+                ${startTimeDay} <span class="card__datetime__month">${startTimeMonth} ${startTimeYear}</span>
               </div>
               <div class="card__datetime__time">${starTime}</div>
             </div>

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

@@ -1,4 +1,10 @@
-<% content_for(:title, translated_attribute(meeting.title)) %>
+<% provide(:title, translated_attribute(meeting.title)) %>
+
+<% add_decidim_meta_tags({
+  title: translated_attribute(meeting.title),
+  description: translated_attribute(meeting.description),
+  url: meeting_url(meeting.id)
+}) %>
 
 <div class="row column view-header">
   <h2 class="heading2"><%= translated_attribute meeting.title %></h2>
@@ -18,20 +24,28 @@
       </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>
+          <% if meeting.contributions_count && meeting.contributions_count.positive? %>
+            <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>
+          <% else %>
+            <div class="definition-data__item">
+              <span class="definition-data__title"><%= t(".attendees") %></span>
+              <span class="definition-data__number"><%= meeting.attendees_count %></span>
+            </div>
+          <% end %>
           <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 %>
+    <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
@@ -64,3 +78,6 @@
   </div>
 </div>
 <%= attachments_for meeting %>
+
+<%= javascript_include_tag "decidim/proposals/social_share" %>
+<%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/config/locales/ca.yml

@@ -10,7 +10,7 @@ ca:
   decidim:
     features:
       meetings:
-        name: Llistat de trobades
+        name: Trobades
     meetings:
       actions:
         attachments: Adjunts
@@ -38,7 +38,7 @@ ca:
             title: Edita trobada
             update: Actualitzar trobada
           index:
-            title: Llistat de trobades
+            title: Trobades
           new:
             create: Crear trobada
             title: Nova trobada
@@ -50,19 +50,18 @@ ca:
             name: Trobada
       meetings:
         filters:
-          ascendent: Ascendent
           category: Categoria
           date: Data
-          descendent: Descendent
+          past: Passades
           scopes: Àmbits
           search: Cerca
+          upcoming: Properes
         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:
           attendees: Nombre d'assistents

data/config/locales/en.yml

@@ -51,19 +51,18 @@ en:
             name: Meeting
       meetings:
         filters:
-          ascendent: Ascendent
           category: Category
           date: Date
-          descendent: Descendent
+          past: Past
           scopes: Scopes
           search: Search
+          upcoming: Upcoming
         filters_small_view:
           close_modal: Close modal
           filter: Filter
           filter_for: Filter by
           unfold: Unfold
         index:
-          title: Meetings
           view_meeting: View meeting
         show:
           attendees: Attendees count

data/config/locales/es.yml

@@ -50,19 +50,18 @@ es:
             name: Encuentro
       meetings:
         filters:
-          ascendent: Ascendente
           category: Categoría
           date: Fecha
-          descendent: Descendiente
+          past: Pasadas
           scopes: Ámbitos
           search: Buscar
+          upcoming: Próximas
         filters_small_view:
           close_modal: Cerrar ventana
           filter: Filtrar
           filter_for: Filtrar por
           unfold: Desplegar
         index:
-          title: Lista de encuentros
           view_meeting: Ver encuentro
         show:
           attendees: Número de asistentes

data/config/locales/eu.yml

@@ -0,0 +1,5 @@
+eu:
+  decidim:
+    meetings:
+      actions:
+        close: Itxi

data/lib/decidim/meetings/feature.rb

@@ -22,6 +22,7 @@ Decidim.register_feature(:meetings) do |feature|
 
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :meetings).i18n_name,
+        published_at: Time.current,
         manifest_name: :meetings,
         participatory_process: process
       )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -130,42 +130,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -186,14 +186,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 description: ''
 email:
 - josepjaume@gmail.com
@@ -247,6 +247,7 @@ files:
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/eu.yml
 - db/migrate/20161130121354_create_meetings.rb
 - db/migrate/20170110142105_close_a_meeting.rb
 - db/migrate/20170123151650_add_latitude_and_longitude_to_meetings.rb