decidim 0.0.2 → 0.0.3

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

@@ -15,18 +15,20 @@ 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)
         end
 
         private
 
-        def create_meeting
-          Meeting.create!(
+        def build_meeting
+          @meeting = Meeting.new(
             scope: @form.scope,
             category: @form.category,
             title: @form.title,
-            short_description: @form.short_description,
             description: @form.description,
             end_time: @form.end_time,
             start_time: @form.start_time,
@@ -36,6 +38,16 @@ module Decidim
             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/decidim-meetings/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -20,18 +20,20 @@ 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)
         end
 
         private
 
-        def update_meeting
-          @meeting.update_attributes!(
+        def change_meeting
+          @meeting.assign_attributes(
             scope: @form.scope,
             category: @form.category,
             title: @form.title,
-            short_description: @form.short_description,
             description: @form.description,
             end_time: @form.end_time,
             start_time: @form.start_time,
@@ -40,6 +42,16 @@ module Decidim
             location_hints: @form.location_hints
           )
         end
+
+        def geocode_meeting
+          result = @meeting.geocode
+          @form.errors.add :address, :invalid unless result
+          result
+        end
+
+        def update_meeting
+          @meeting.save!
+        end
       end
     end
   end

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

@@ -8,6 +8,15 @@ module Decidim
       # Note that it inherits from `Decidim::Features::BaseController`, which
       # override its layout and provide all kinds of useful methods.
       class ApplicationController < Decidim::Admin::Features::BaseController
+        helper_method :meetings, :meeting
+
+        def meetings
+          @meetings ||= Meeting.where(feature: current_feature)
+        end
+
+        def meeting
+          @meeting ||= meetings.find(params[:id])
+        end
       end
     end
   end

data/decidim-meetings/app/controllers/decidim/meetings/admin/attachments_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module Decidim
+  module Meetings
+    module Admin
+      # Controller that allows managing all the attachments for a participatory
+      # process.
+      #
+      class AttachmentsController < Admin::ApplicationController
+        include Decidim::Admin::Concerns::HasAttachments
+
+        def after_destroy_path
+          meetings_path
+        end
+
+        def attached_to
+          meeting
+        end
+
+        def meeting
+          @meeting ||= meetings.find(params[:meeting_id])
+        end
+
+        def authorization_object
+          meeting.feature
+        end
+      end
+    end
+  end
+end

data/decidim-meetings/app/controllers/decidim/meetings/admin/meeting_closes_controller.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+module Decidim
+  module Meetings
+    module Admin
+      # This controller allows an admin to manage meetings from a Participatory Process
+      class MeetingClosesController < Admin::ApplicationController
+        helper ResourceHelper
+        helper_method :meeting
+
+        def edit
+          @form = form(CloseMeetingForm).from_model(meeting)
+        end
+
+        def update
+          @form = form(CloseMeetingForm).from_params(params.merge(proposals: meeting.sibling_scope(:proposals)))
+
+          CloseMeeting.call(@form, meeting) do
+            on(:ok) do
+              flash[:notice] = I18n.t("meetings.close.success", scope: "decidim.meetings.admin")
+              redirect_to meetings_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("meetings.close.invalid", scope: "decidim.meetings.admin")
+              render action: "edit"
+            end
+          end
+        end
+
+        private
+
+        def meeting
+          @meeting ||= Meeting.where(feature: current_feature).find(params[:id])
+        end
+      end
+    end
+  end
+end

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

@@ -4,8 +4,6 @@ module Decidim
     module Admin
       # This controller allows an admin to manage meetings from a Participatory Process
       class MeetingsController < Admin::ApplicationController
-        helper_method :meetings
-
         def new
           @form = form(MeetingForm).instance
         end
@@ -53,16 +51,6 @@ module Decidim
 
           redirect_to meetings_path
         end
-
-        private
-
-        def meetings
-          @meetings ||= Meeting.where(feature: current_feature)
-        end
-
-        def meeting
-          @meeting ||= meetings.find(params[:id])
-        end
       end
     end
   end

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

@@ -6,14 +6,23 @@ module Decidim
     class MeetingsController < Decidim::Meetings::ApplicationController
       include FilterResource
 
-      helper_method :meetings, :meeting
+      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"
+      end
+
       private
 
       def meetings
-        @meetings ||= search.results
+        @meetings ||= search.results.page(params[:page]).per(12)
+      end
+
+      def geocoded_meetings
+        @geocoded_meetings ||= search.results.select(&:geocoded?)
       end
 
       def meeting
@@ -24,13 +33,6 @@ module Decidim
         MeetingSearch
       end
 
-      def default_search_params
-        {
-          page: params[:page],
-          per_page: 12
-        }
-      end
-
       def default_filter_params
         {
           order_start_time: "asc",

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Decidim
+  module Meetings
+    module Admin
+      # This class holds a Form to close a meeting from Decidim's admin panel.
+      class CloseMeetingForm < Decidim::Form
+        include TranslatableAttributes
+
+        translatable_attribute :closing_report, String
+        attribute :attendees_count, Integer, default: 0
+        attribute :contributions_count, Integer, default: 0
+        attribute :attending_organizations, String
+        attribute :proposal_ids, Array[Integer]
+        attribute :proposals
+        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 :attending_organizations, presence: true
+
+        # Private: Gets the proposals from the meeting and injects them to the form.
+        #
+        # Returns nothing.
+        def map_model(model)
+          self.proposal_ids = model.linked_resources(:proposals, "proposals_from_meeting").pluck(:id)
+          self.proposals = model.sibling_scope(:proposals)
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,6 @@ module Decidim
         include TranslatableAttributes
 
         translatable_attribute :title, String
-        translatable_attribute :short_description, String
         translatable_attribute :description, String
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
@@ -18,7 +17,6 @@ module Decidim
         attribute :decidim_category_id, Integer
 
         validates :title, translatable_presence: true
-        validates :short_description, translatable_presence: true
         validates :description, translatable_presence: true
         validates :location, translatable_presence: true
         validates :address, presence: true

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Decidim
+  module Meetings
+    module Admin
+      # Custom helpers, scoped to the meetings admin engine.
+      #
+      module ApplicationHelper
+        include MapHelper
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ module Decidim
     #
     module ApplicationHelper
       include PaginateHelper
+      include MapHelper
     end
   end
 end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+module Decidim
+  module Meetings
+    # This helper include some methods for rendering meetings static and 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"),
+                                                               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
+  end
+end

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

@@ -1,28 +1,24 @@
 # frozen_string_literal: true
+
 module Decidim
   module Meetings
     # The data store for a Meeting in the Decidim::Meetings component. It stores a
     # title, description and any other useful information to render a custom meeting.
     class Meeting < Meetings::ApplicationRecord
-      belongs_to :feature, foreign_key: "decidim_feature_id", class_name: Decidim::Feature
-      belongs_to :scope, foreign_key: "decidim_scope_id", class_name: Decidim::Scope
-      belongs_to :category, foreign_key: "decidim_category_id", class_name: Decidim::Category
-      has_one :organization, through: :feature
-      validates :title, presence: true
+      include Decidim::Resourceable
+      include Decidim::HasAttachments
+      include Decidim::HasFeature
+      include Decidim::HasScope
+      include Decidim::HasCategory
 
-      validate :scope_belongs_to_organization
-      validate :category_belongs_to_organization
+      feature_manifest_name "meetings"
 
-      private
+      validates :title, presence: true
 
-      def scope_belongs_to_organization
-        return unless scope
-        errors.add(:scope, :invalid) unless feature.scopes.where(id: scope.id).exists?
-      end
+      geocoded_by :address
 
-      def category_belongs_to_organization
-        return unless category
-        errors.add(:category, :invalid) unless feature.categories.where(id: category.id).exists?
+      def closed?
+        closed_at.present?
       end
     end
   end

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

@@ -18,7 +18,6 @@ module Decidim
         query
           .where(localized_search_text_in(:title), text: "%#{search_text}%")
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
-          .or(query.where(localized_search_text_in(:short_description), text: "%#{search_text}%"))
       end
 
       # Handle the order_start_time filter

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

@@ -0,0 +1,50 @@
+# 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