decidim-meetings 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8042c1ee86056372caec282e1b3e663492cfa664
-  data.tar.gz: 76a12945a27cc259cec4131655c7630fed8bb142
+  metadata.gz: 9d6c1f40dbb0175a5cd5c11bc88557d06d66b89c
+  data.tar.gz: f2da758bcd9b1737ab28eecce25eff1b37fc8f97
 SHA512:
-  metadata.gz: 46eb80f168fe576614772d45ed418e0301ede6628e60dc7ec7c874b3191c60ba8aeb0681fad4820a79036713fd65088a2db87c5c9a6a027d095120bcd2a80e75
-  data.tar.gz: 193d415e8a9a3cb445ee1392c4fb4d4c509aad59255ddf8d0e865ea7195f3eb31d8ae57fc422fc54f835e43bd74fe5cfcff0544d4c2f59d1ca08a7133d0fab4d
+  metadata.gz: 7079774eb36091ab6fe3efed02111e85e32673449eb6565cbb43aae81555658af56c817bc44d2d559da164358c1a75a3d48ab31efff19b97424e3591e1be16af
+  data.tar.gz: 55329e0fbf37991eb434095e4ae2c6facbf37d8cf41b20cfc676aefb58967de57884b5db87cb94a6dfcc9652846f004594ec0846a9c6410b85f641e97fc8c294

data/app/commands/decidim/meetings/admin/create_meeting.rb

@@ -15,17 +15,14 @@ module Decidim
         def call
           return broadcast(:invalid) if @form.invalid?
 
-          build_meeting
-          return broadcast(:invalid) if Decidim.geocoder.present? && !geocode_meeting
-          create_meeting
-
-          broadcast(:ok)
+          create_meeting!
+          broadcast(:ok, @meeting)
         end
 
         private
 
-        def build_meeting
-          @meeting = Meeting.new(
+        def create_meeting!
+          @meeting = Meeting.create!(
             scope: @form.scope,
             category: @form.category,
             title: @form.title,
@@ -33,21 +30,13 @@ module Decidim
             end_time: @form.end_time,
             start_time: @form.start_time,
             address: @form.address,
+            latitude: @form.latitude,
+            longitude: @form.longitude,
             location: @form.location,
             location_hints: @form.location_hints,
             feature: @form.current_feature
           )
         end
-
-        def geocode_meeting
-          result = @meeting.geocode
-          @form.errors.add :address, :invalid unless result
-          result
-        end
-
-        def create_meeting
-          @meeting.save!
-        end
       end
     end
   end

data/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -20,17 +20,14 @@ module Decidim
         def call
           return broadcast(:invalid) if @form.invalid?
 
-          change_meeting
-          return broadcast(:invalid) if Decidim.geocoder.present? && @meeting.address_changed? && !geocode_meeting
-          update_meeting
-
-          broadcast(:ok)
+          update_meeting!
+          broadcast(:ok, @meeting)
         end
 
         private
 
-        def change_meeting
-          @meeting.assign_attributes(
+        def update_meeting!
+          @meeting.update_attributes!(
             scope: @form.scope,
             category: @form.category,
             title: @form.title,
@@ -38,6 +35,8 @@ module Decidim
             end_time: @form.end_time,
             start_time: @form.start_time,
             address: @form.address,
+            latitude: @form.latitude,
+            longitude: @form.longitude,
             location: @form.location,
             location_hints: @form.location_hints
           )

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

@@ -8,6 +8,7 @@ module Decidim
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Features::BaseController
+      helper Decidim::Meetings::ApplicationHelper
     end
   end
 end

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

@@ -8,15 +8,24 @@ module Decidim
 
       helper_method :meetings, :geocoded_meetings, :meeting
 
-      def index; end
-
-      def static_map
-        @meeting = Meeting.where(feature: current_feature).find(params[:id])
-        send_data StaticMapGenerator.new(@meeting).data, type: "image/jpeg", disposition: "inline"
+      def index
+        if search.results.empty? && params.dig("filter", "date") != "past"
+          @past_meetings = search_klass.new(search_params.merge(date: "past"))
+          unless @past_meetings.results.empty?
+            params[:filter] ||= {}
+            params[:filter][:date] = "past"
+            @forced_past_meetings = true
+            @search = @past_meetings
+          end
+        end
       end
 
       private
 
+      def meeting
+        @meeting ||= Meeting.where(feature: current_feature).find(params[:id])
+      end
+
       def meetings
         @meetings ||= search.results.page(params[:page]).per(12)
       end
@@ -25,10 +34,6 @@ module Decidim
         @geocoded_meetings ||= search.results.select(&:geocoded?)
       end
 
-      def meeting
-        @meeting ||= Meeting.where(feature: current_feature).find(params[:id])
-      end
-
       def search_klass
         MeetingSearch
       end

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

@@ -11,6 +11,8 @@ module Decidim
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
         attribute :address, String
+        attribute :latitude, Float
+        attribute :longitude, Float
         attribute :start_time, Decidim::Attributes::TimeWithZone
         attribute :end_time, Decidim::Attributes::TimeWithZone
         attribute :decidim_scope_id, Integer
@@ -20,6 +22,7 @@ module Decidim
         validates :description, translatable_presence: true
         validates :location, translatable_presence: true
         validates :address, presence: true
+        validates :address, geocoding: true, if: -> { Decidim.geocoder.present? }
         validates :start_time, presence: true, date: { before: :end_time }
         validates :end_time, presence: true, date: { after: :start_time }
 
@@ -27,15 +30,23 @@ module Decidim
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
 
+        def process_scope
+          current_feature.participatory_process.scope
+        end
+
         def scope
           return unless current_feature
-          @scope ||= current_feature.scopes.where(id: decidim_scope_id).first
+          @scope ||= process_scope || current_feature.scopes.where(id: decidim_scope_id).first
         end
 
         def category
           return unless current_feature
           @category ||= current_feature.categories.where(id: decidim_category_id).first
         end
+
+        def feature
+          current_feature
+        end
       end
     end
   end

data/app/helpers/decidim/meetings/admin/application_helper.rb

@@ -5,7 +5,7 @@ module Decidim
       # Custom helpers, scoped to the meetings admin engine.
       #
       module ApplicationHelper
-        include MapHelper
+        include Decidim::MapHelper
       end
     end
   end

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

@@ -5,7 +5,8 @@ module Decidim
     #
     module ApplicationHelper
       include PaginateHelper
-      include MapHelper
+      include Decidim::MapHelper
+      include Decidim::Meetings::MapHelper
     end
   end
 end

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

@@ -1,45 +1,23 @@
 # frozen_string_literal: true
 module Decidim
   module Meetings
-    # This helper include some methods for rendering meetings static and dynamic maps.
+    # This helper include some methods for rendering meetings dynamic maps.
     module MapHelper
-      # Renders a link to openstreetmaps with the meeting latitude and longitude.
-      # The link's content is a static map image.
-      #
-      # meeting - A Decidim::Meetings::Meeting object
-      # options - An optional hash of options (default: { zoom: 17 })
-      #           * zoom: A number to represent the zoom value of the map
-      def static_map_link(meeting, options = {})
-        if meeting.geocoded?
-          zoom = options[:zoom] || 17
-          latitude = meeting.latitude
-          longitude = meeting.longitude
-
-          map_url = "https://www.openstreetmap.org/?mlat=#{latitude}&mlon=#{longitude}#map=#{zoom}/#{latitude}/#{longitude}"
-
-          link_to map_url, target: "_blank" do
-            image_tag decidim_meetings.static_map_meeting_path(feature_id: meeting.feature,
-                                                               participatory_process_id: meeting.feature.participatory_process,
-                                                               id: meeting)
-          end
-        end
-      end
-
       # Serialize a collection of geocoded meetings to be used by the dynamic map component
       #
       # geocoded_meetings - A collection of geocoded meetings
       def meetings_data_for_map(geocoded_meetings)
         geocoded_meetings.map do |meeting|
           meeting.slice(:latitude, :longitude, :address).merge(title: translated_attribute(meeting.title),
-                                                               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),
-                                                               locationHints: translated_attribute(meeting.location_hints),
-                                                               link: meeting_path(meeting))
+                                                                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),
+                                                                locationHints: translated_attribute(meeting.location_hints),
+                                                                link: meeting_path(meeting))
         end
       end
     end

data/app/models/decidim/meetings/meeting.rb

@@ -8,6 +8,7 @@ module Decidim
       include Decidim::Resourceable
       include Decidim::HasAttachments
       include Decidim::HasFeature
+      include Decidim::HasReference
       include Decidim::HasScope
       include Decidim::HasCategory
 
@@ -15,7 +16,7 @@ module Decidim
 
       validates :title, presence: true
 
-      geocoded_by :address
+      geocoded_by :address, http_headers: lambda { |proposal| { "Referer" => proposal.feature.organization.host } }
 
       def closed?
         closed_at.present?

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

@@ -29,11 +29,6 @@ module Decidim
         end
       end
 
-      # Handle the scope_id filter
-      def search_scope_id
-        query.where(decidim_scope_id: scope_id)
-      end
-
       private
 
       # Internal: builds the needed query to search for a text in the organization's

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

@@ -26,9 +26,11 @@
   <%= form.datetime_field :end_time %>
 </div>
 
-<div class="field" >
-  <%= form.collection_select :decidim_scope_id, current_organization.scopes, :id, :name, include_blank: true %>
-</div>
+<% if !@form.process_scope %>
+  <div class="field" >
+    <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+  </div>
+<% end %>
 
 <div class="field" >
   <%= form.categories_select :decidim_category_id, current_participatory_process.categories, prompt: "", disable_parents: false %>

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

@@ -12,10 +12,12 @@
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
+  <% unless @forced_past_meetings %>
+    <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
+  <% end %>
 
-  <% 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") %>
+  <% if !current_participatory_process.scope && current_organization.scopes.any? %>
+    <%= form.collection_check_boxes :scope_id, search_organization_scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t(".scopes") %>
   <% end %>
 
   <% if current_feature.categories.any? %>

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

@@ -7,7 +7,7 @@
 
 <div class="reveal" id="filter-box" data-reveal>
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t ".filter_for" %>:</h3>
+    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

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

@@ -1,3 +1,13 @@
+<% if @forced_past_meetings %>
+  <div class="callout warning">
+    <%= t ".upcoming_meetings_warning" %>
+  </div>
+<% elsif meetings.length == 0 %>
+  <div class="callout warning">
+    <%= t ".no_meetings_warning" %>
+  </div>
+<% end %>
+
 <div class="row small-up-1 medium-up-2 card-grid">
   <% meetings.each do |meeting| %>
     <div class="column">
@@ -13,7 +23,7 @@
             <div class="address__icon">
               <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
             </div>
-            <%= render partial: "address_details", locals: { meeting: meeting } %>
+            <%= render partial: "decidim/shared/address_details", locals: { icon_name: "meetings", geolocalizable: meeting } %>
           </div>
         </div>
       </article>

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

@@ -3,7 +3,7 @@
     <% if meeting.category.present? %>
       <li><%= link_to translated_attribute(meeting.category.name), decidim_meetings.meetings_path(filter: { category_id: meeting.category.id }) %></li>
     <% end %>
-    <% if meeting.scope.present? %>
+    <% if !current_participatory_process.scope && meeting.scope.present? %>
       <li><%= link_to meeting.scope.name, decidim_meetings.meetings_path(filter: { scope_id: [meeting.scope.id] }) %></li>
     <% end %>
   </ul>

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

@@ -1,40 +1,35 @@
-<% 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} ${startTimeYear}</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>
+<%= dynamic_map_for meetings_data_for_map(geocoded_meetings) do %>
+  <template id="marker-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} ${startTimeYear}</span>
             </div>
+            <div class="card__datetime__time">${starTime}</div>
           </div>
-          <div class="map-info__button">
-            <a href="${link}" class="button button--sc">
-              <%= t('.view_meeting') %>
-            </a>
+          <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>
-    </template>
-    <%= stylesheet_link_tag "decidim/meetings/map" %>
-    <%= javascript_include_tag "decidim/meetings/map" %>
-  </div>
+    </div>
+  </template>
+  <%= stylesheet_link_tag "decidim/map" %>
+  <%= javascript_include_tag "decidim/map" %>
 <% end %>
 
 <div class="row">

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

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

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

@@ -45,26 +45,13 @@
           </div>
         </div>
       <% end %>
+    <%= feature_reference(meeting) %>
     <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <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 } %>
-          </div>
-          <% if Decidim.geocoder.present? %>
-            <div class="address__map">
-              <%= static_map_link(meeting) %>
-            </div>
-          <% end %>
-        </div>
-      </div>
+      <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
       <%= render partial: "tags", locals: { meeting: meeting } %>
     </div>
     <% if meeting.closed? %>

data/config/i18n-tasks.yml

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

data/config/locales/ca.yml

@@ -7,6 +7,16 @@ ca:
         closing_report: Informe
         contributions_count: Nombre de contribucions
         proposal_ids: Propostes creades en una trobada
+      meeting:
+        adress: Adreça
+        decidim_category_id: Categoria
+        decidim_scope_id: Àmbit
+        description: Descripció
+        end_time: Hora de finalització
+        location: Ubicació
+        location_hints: Detalls d'ubicació
+        start_time: Hora d'inici
+        title: Editar trobada
   decidim:
     features:
       meetings:
@@ -59,10 +69,13 @@ ca:
         filters_small_view:
           close_modal: Tancar finestra
           filter: Filtra
-          filter_for: Filtra per
+          filter_by: Filtra per
           unfold: Desplegar
         index:
           view_meeting: Veure trobada
+        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.
         show:
           attendees: Nombre d'assistents
           contributions: Nombre d'aportacions
@@ -78,6 +91,8 @@ ca:
             title: Títol
     resource_links:
       meetings_through_proposals:
-        results: 'Resultats relacionats:'
+        meeting_results: 'Resultats relacionats:'
+        result_meetings: 'Trobades relacionades:'
       proposals_from_meeting:
-        proposals: Propostes relacionades
+        meeting_proposals: 'Propostes relacionades:'
+        proposal_meetings: 'Trobades relacionades:'

data/config/locales/en.yml

@@ -8,6 +8,16 @@ en:
         closing_report: Report
         contributions_count: Number of contributions
         proposal_ids: Proposals created in the meeting
+      meeting:
+        adress: Adress
+        decidim_category_id: Category
+        decidim_scope_id: Scope
+        description: Description
+        end_time: End Time
+        location: Location
+        location_hints: Location hints
+        start_time: Start Time
+        title: Title
   decidim:
     features:
       meetings:
@@ -60,10 +70,15 @@ en:
         filters_small_view:
           close_modal: Close modal
           filter: Filter
-          filter_for: Filter by
+          filter_by: Filter by
           unfold: Unfold
         index:
           view_meeting: View meeting
+        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.
         show:
           attendees: Attendees count
           contributions: Contributions count
@@ -79,6 +94,8 @@ en:
             title: Title
     resource_links:
       meetings_through_proposals:
-        results: 'Related results:'
+        meeting_results: 'Related results:'
+        result_meetings: 'Related meetings:'
       proposals_from_meeting:
-        proposals: Related proposals
+        meeting_proposals: 'Related proposals:'
+        proposal_meetings: 'Related meetings:'

data/config/locales/es.yml

@@ -7,6 +7,16 @@ es:
         closing_report: Informe
         contributions_count: Número de contribuciones
         proposal_ids: Propuestas creadas en el encuentro
+      meeting:
+        adress: Dirección
+        decidim_category_id: Categoría
+        decidim_scope_id: Ámbito
+        description: Descripción
+        end_time: Hora de finalización
+        location: Ubicación
+        location_hints: Pistas de ubicación
+        start_time: Hora de inicio
+        title: Título
   decidim:
     features:
       meetings:
@@ -59,10 +69,13 @@ es:
         filters_small_view:
           close_modal: Cerrar ventana
           filter: Filtrar
-          filter_for: Filtrar por
+          filter_by: Filtrar por
           unfold: Desplegar
         index:
           view_meeting: Ver encuentro
+        meetings:
+          no_meetings_warning: No hay encuentros que coincidan con el criterio de búsqueda o no hay ningún encuentro programado.
+          upcoming_meetings_warning: Actualmente no hay encuentros programados, pero puedes ver los encuentros anteriores.
         show:
           attendees: Número de asistentes
           contributions: Número de contribuciones
@@ -78,6 +91,8 @@ es:
             title: Título
     resource_links:
       meetings_through_proposals:
-        results: 'Resultados relacionados:'
+        meeting_results: 'Resultados relacionados:'
+        result_meetings: 'Encuentros relacionados:'
       proposals_from_meeting:
-        proposals: Propuestas relacionadas
+        meeting_proposals: 'Propuestas relacionadas:'
+        proposal_meetings: 'Encuentros relacionados:'

data/config/locales/eu.yml

@@ -1,5 +1,79 @@
 eu:
+  activemodel:
+    attributes:
+      close_meeting:
+        attendees_count: Bertaratuen kopurua
+        attending_organizations: 'Parte hartu duten erakundeen zerrenda:'
+        closing_report: Txostena
+        contributions_count: Ekarpen-kopurua
+        proposal_ids: Topaketan sortutako proposamenak
   decidim:
+    features:
+      meetings:
+        name: Topaketa-zerrenda
     meetings:
       actions:
-        close: Itxi
+        attachments: Fitxategi erantsiak
+        close: Itxi
+        confirm_destroy: Ziur zaude topaketa hau ezabatu nahi duzula?
+        destroy: Garbitu
+        edit: Editatu
+        new: '%{name} berria'
+        title: Ekintzak
+      admin:
+        meeting_closes:
+          edit:
+            close: Itxi
+            title: Itxi topaketa
+        meetings:
+          close:
+            invalid: Arazo bat izan da topaketa hau ixtean.
+            success: Topaketa ongi itxi da
+          create:
+            invalid: Arazo bat izan da topaketa hau sortzean.
+            success: Topaketa ongi sortu da
+          destroy:
+            success: Topaketa zuzen ezabatu da.
+          edit:
+            title: Editatu topaketa
+            update: Eguneratu topaketa
+          index:
+            title: Topaketa-zerrenda
+          new:
+            create: Sortu topaketa
+            title: Topaketa berria
+          update:
+            invalid: Arazo bat izan da topaketa hau eguneratzean.
+            success: Topaketa zuzen eguneratu da.
+        models:
+          meeting:
+            name: Topaketa
+      meetings:
+        filters:
+          category: Kategoria
+          date: Jaioteguna
+          scopes: Esparruak
+          search: Bilatu
+        filters_small_view:
+          close_modal: Itxi leihoa
+          filter: Iragazi
+          filter_by: 'Iragazi honen arabera:'
+          unfold: Zabaldu
+        index:
+          view_meeting: Ikusi topaketa
+        show:
+          attendees: Bertaratuen kopurua
+          contributions: Ekarpen-kopurua
+          meeting_report: Topaketaren txostena
+          organizations: Bertaratutako erakundeak
+      models:
+        meeting:
+          fields:
+            closed: Itxita
+            end_time: Bukaera-data
+            map: Mapa
+            start_time: Hasiera-data
+            title: Izenburua
+    resource_links:
+      meetings_through_proposals:
+        meeting_results: 'Honekin lotutako emaitzak:'

data/config/locales/fi.yml

@@ -0,0 +1,98 @@
+fi:
+  activemodel:
+    attributes:
+      close_meeting:
+        attendees_count: Osallistujien määrä
+        attending_organizations: Osallistuvien organisaatioiden lista
+        closing_report: Raportti
+        contributions_count: Kontribuutioiden määrä
+        proposal_ids: Ehdotusta luotu tapaamisessa
+      meeting:
+        adress: Adressi
+        decidim_category_id: Kategoria
+        decidim_scope_id: Konteksti
+        description: Kuvaus
+        end_time: Lopetusaika
+        location: Paikka
+        location_hints: Paikan tarkemmat tiedot
+        start_time: Aloitusaika
+        title: Otsikko
+  decidim:
+    features:
+      meetings:
+        name: Tapaamiset
+    meetings:
+      actions:
+        attachments: Liitteet
+        close: Sulje
+        confirm_destroy: Haluatko varmasti poistaa tämän tapaamisen?
+        destroy: Poista
+        edit: Muokkaa
+        new: Uusi %{name}
+        title: Toiminnot
+      admin:
+        meeting_closes:
+          edit:
+            close: Lopeta
+            title: Lopeta tapaaminen
+        meetings:
+          close:
+            invalid: Tapaamisen lopettamisessa tapahtui virhe
+            success: Tapaaminen onnistuneesti lopetettu
+          create:
+            invalid: Tapaamisen luonnissa tapahtui virhe
+            success: Tapaaminen onnistuneesti luotu
+          destroy:
+            success: Tapaaminen onnistuneesti poistettu
+          edit:
+            title: Muokkaa tapaamista
+            update: Päivitä tapaaminen
+          index:
+            title: Tapaamiset
+          new:
+            create: Luo tapaaminen
+            title: Uusi tapaaminen
+          update:
+            invalid: Tapaamisen luonnissa tapahtui virhe
+            success: Tapaaminen luotu onnistuneesti
+        models:
+          meeting:
+            name: Tapaaminen
+      meetings:
+        filters:
+          category: Kategoria
+          date: Päivämäärä
+          past: Menneet
+          scopes: Kontekstit
+          search: Etsi
+          upcoming: Tulevat
+        filters_small_view:
+          close_modal: Sulje ikkuna
+          filter: Suodata
+          filter_by: Suodata
+          unfold: Avaa
+        index:
+          view_meeting: Näytä tapaaminen
+        meetings:
+          no_meetings_warning: Yksikään tapaaminen ei vastaa hakukriteerejäsi tai yhtään tapaamista ei ole määritelty
+          upcoming_meetings_warning: Tällä hetkellä tapaamisia ei ole määritelty, mutta täältä löydät kaikki aikaisemmat tapaamiset.
+        show:
+          attendees: Osallistujamäärä
+          contributions: Kontribuutioiden määrä
+          meeting_report: Tapaamisraportti
+          organizations: Osallistuneet organisaatiot
+      models:
+        meeting:
+          fields:
+            closed: Suljettu
+            end_time: Lopetusaika
+            map: Kartta
+            start_time: Aloitusaika
+            title: Otsikko
+    resource_links:
+      meetings_through_proposals:
+        meeting_results: 'Liittyvät tulokset:'
+        result_meetings: 'Liittyvät tapaamiset:'
+      proposals_from_meeting:
+        meeting_proposals: 'Liittyvät ehdotukset:'
+        proposal_meetings: 'Liittyvät tapaamiset:'

data/db/migrate/20170215132546_add_reference_to_meetings.rb

@@ -0,0 +1,7 @@
+class AddReferenceToMeetings < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_meetings_meetings, :reference, :string
+    Decidim::Meetings::Meeting.find_each(&:save)
+    change_column_null :decidim_meetings_meetings, :reference, false
+  end
+end

data/lib/decidim/meetings/admin_engine.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require "geocoder"
 
 module Decidim
   module Meetings
@@ -22,31 +21,6 @@ module Decidim
       def load_seed
         nil
       end
-
-      initializer "decidim_meetings.geocoder" do |_app|
-        if Decidim.geocoder.present?
-          Geocoder.configure(
-            # geocoding service (see below for supported options):
-            lookup: :here,
-
-            # IP address geocoding service (see below for supported options):
-            # :ip_lookup => :maxmind,
-
-            # to use an API key:
-            api_key: [Decidim.geocoder&.fetch(:here_app_id), Decidim.geocoder&.fetch(:here_app_code)]
-
-            # geocoding service request timeout, in seconds (default 3):
-            # :timeout => 5,
-
-            # set default units to kilometers:
-            # :units => :km,
-
-            # caching (see below for details):
-            # :cache => Redis.new,
-            # :cache_prefix => "..."
-          )
-        end
-      end
     end
   end
 end

data/lib/decidim/meetings/list_engine.rb

@@ -12,17 +12,9 @@ module Decidim
       isolate_namespace Decidim::Meetings
 
       routes do
-        resources :meetings, only: [:index, :show] do
-          member do
-            get :static_map
-          end
-        end
+        resources :meetings, only: [:index, :show]
         root to: "meetings#index"
       end
-
-      initializer "decidim_meetings.assets" do |app|
-        app.config.assets.precompile += %w(decidim_meetings_manifest.js)
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-24 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.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -82,20 +82,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: geocoder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -130,70 +116,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 description: ''
 email:
 - josepjaume@gmail.com
@@ -205,10 +177,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/decidim_meetings_manifest.js
 - app/assets/images/decidim/meetings/icon.svg
-- app/assets/javascripts/decidim/meetings/map.js.es6.erb
-- app/assets/stylesheets/decidim/meetings/map.css
 - app/commands/decidim/meetings/admin/close_meeting.rb
 - app/commands/decidim/meetings/admin/create_meeting.rb
 - app/commands/decidim/meetings/admin/update_meeting.rb
@@ -226,14 +195,12 @@ files:
 - app/models/decidim/meetings/application_record.rb
 - app/models/decidim/meetings/meeting.rb
 - app/services/decidim/meetings/meeting_search.rb
-- app/services/decidim/meetings/static_map_generator.rb
 - app/views/decidim/meetings/admin/meeting_closes/_form.html.erb
 - app/views/decidim/meetings/admin/meeting_closes/edit.html.erb
 - app/views/decidim/meetings/admin/meetings/_form.html.erb
 - app/views/decidim/meetings/admin/meetings/edit.html.erb
 - app/views/decidim/meetings/admin/meetings/index.html.erb
 - app/views/decidim/meetings/admin/meetings/new.html.erb
-- app/views/decidim/meetings/meetings/_address_details.html.erb
 - app/views/decidim/meetings/meetings/_datetime.html.erb
 - app/views/decidim/meetings/meetings/_filters.html.erb
 - app/views/decidim/meetings/meetings/_filters_small_view.html.erb
@@ -248,10 +215,12 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/eu.yml
+- config/locales/fi.yml
 - db/migrate/20161130121354_create_meetings.rb
 - db/migrate/20170110142105_close_a_meeting.rb
 - db/migrate/20170123151650_add_latitude_and_longitude_to_meetings.rb
 - db/migrate/20170129153716_remove_short_description_from_meetings.rb
+- db/migrate/20170215132546_add_reference_to_meetings.rb
 - lib/decidim/meetings.rb
 - lib/decidim/meetings/admin.rb
 - lib/decidim/meetings/admin_engine.rb

data/app/assets/config/decidim_meetings_manifest.js

@@ -1,2 +0,0 @@
-//= link decidim/meetings/map.js
-//= link decidim/meetings/map.css

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

@@ -1,97 +0,0 @@
-// = require leaflet
-// = require leaflet-tilelayer-here
-// = require leaflet-svg-icon
-// = require leaflet.markercluster
-// = require jquery-tmpl
-// = require_self
-
-/* globals L */
-
-L.DivIcon.SVGIcon.DecidimIcon = L.DivIcon.SVGIcon.extend({
-  options: {
-    fillColor: '#ef604d',
-    opacity: 0
-  },
-  _createPathDescription: function() {
-    return 'M14 1.17a11.685 11.685 0 0 0-11.685 11.685c0 11.25 10.23 20.61 10.665 21a1.5 1.5 0 0 0 2.025 0c0.435-.435 10.665-9.81 10.665-21A11.685 11.685 0 0 0 14 1.17Zm0 17.415A5.085 5.085 0 1 1 19.085 13.5 5.085 5.085 0 0 1 14 18.585Z';
-  },
-  _createCircle: function() {
-    return ""
-  }
-});
-
-const popupTemplateId = 'meeting-popup';
-$.template('meeting-popup', $(`#${popupTemplateId}`).html());
-
-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()
-    });
-    let node = document.createElement('div');
-
-    $.tmpl('meeting-popup', meeting).appendTo(node);
-
-    marker.bindPopup(node, {
-      maxwidth: 640,
-      minWidth: 500,
-      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) {
-    window.DecidimMeetings.currentMap.remove();
-    window.DecidimMeetings.currentMap = null;
-  }
-
-  const map = L.map(mapId);
-
-  L.tileLayer.here({
-    appId: hereAppId,
-    appCode: hereAppCode,
-  }).addTo(map);
-
-  if (meetingsData.length > 0) {
-    addMarkers(meetingsData, markerClusters, map);
-  } else {
-    map.fitWorld();
-  }
-
-  map.scrollWheelZoom.disable();
-
-  return map;
-};
-
-window.DecidimMeetings = {
-  loadMap,
-  currentMap: null,
-  mapConfiguration: {}
-};
-
-$(() => {
-  const mapId = 'meetings-map';
-  const $map = $(`#${mapId}`);
-
-  const meetingsData = $map.data('meetings');
-  const hereAppId = $map.data('here-app-id');
-  const hereAppCode = $map.data('here-app-code');
-
-  window.DecidimMeetings.mapConfiguration = { hereAppId, hereAppCode };
-
-  if ($map.length > 0) {
-    window.DecidimMeetings.currentMap = loadMap(mapId, meetingsData);
-  }
-});

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

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

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

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-require "httparty"
-
-module Decidim
-  module Meetings
-    # This class generates a url to create a static map image for a geocoded meeting
-    class StaticMapGenerator
-      BASE_HOST = "image.maps.cit.api.here.com"
-      BASE_PATH = "/mia/1.6/mapview"
-
-      def initialize(meeting, options = {})
-        @meeting = meeting
-        @options = options
-
-        @options[:zoom] ||= 15
-        @options[:width] ||= 120
-        @options[:height] ||= 120
-      end
-
-      def data
-        return if Decidim.geocoder.nil?
-
-        Rails.cache.fetch(@meeting.cache_key) do
-          request = HTTParty.get(uri)
-          request.body
-        end
-      end
-
-      private
-
-      def uri
-        params = {
-          c: "#{@meeting.latitude}, #{@meeting.longitude}",
-          z: @options[:zoom],
-          w: @options[:width],
-          h: @options[:height],
-          f: "1",
-          app_id: Decidim.geocoder&.fetch(:here_app_id),
-          app_code: Decidim.geocoder&.fetch(:here_app_code)
-        }
-
-        uri = URI.parse("https://#{BASE_HOST}#{BASE_PATH}").tap do |uri|
-          uri.query = URI.encode_www_form params
-        end
-
-        uri
-      end
-    end
-  end
-end

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

@@ -1,5 +0,0 @@
-<div class="address__details">
-  <strong><%== translated_attribute meeting.location %></strong><br />
-  <span><%= meeting.address %></span><br />
-  <span><%== translated_attribute meeting.location_hints %></span>
-</div>