decidim-meetings 0.0.8.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8b84070cb3d3171fe6747f00691ed636022a1ab
-  data.tar.gz: 40848e4b2ab0096799772020dab43583feb82f14
+  metadata.gz: 10310591e17cdbc120f83562dcd1d1bebe7b77b0
+  data.tar.gz: dd60ae30b8c198b4ba74096c707542865c3b4414
 SHA512:
-  metadata.gz: c6df878b0e98c1e9997f01127b530645a1522513b9364e664c6e4c58c4bfb92d1cee8789a26130f9f5104ea9c1e72bc5e4ce8ee9f9290a731f407222f8443bc3
-  data.tar.gz: 166f6ec6dd4eb4ec98ed95c14ffdd4674611b3c9f4ba0f29cbfa2c9e44897007a972fbf30ab1ab8adb27379111935c7e4842f1f665d12a06ad074e065d28454a
+  metadata.gz: 720a4ae74c3c839f239a4a56b4dd87b12820c21331f4d49296700a466c304a24b59054461778f85401ecbc9f2c50718af492970bfe1f27122233f7538a4b3c26
+  data.tar.gz: a647e5ad326579a4ec12789b7e474d8a9927c46e845c1d57b75c068d163e20089f17505f41a1a8494a0a6df6ada1bf83b9c349829769cf3e870d41b4bb921dc1

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Decidim
   module Meetings
     class MeetingWidgetsController < Decidim::WidgetsController

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

@@ -11,14 +11,14 @@ module Decidim
       helper_method :meetings, :geocoded_meetings, :meeting
 
       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
+        return unless 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
 

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

@@ -9,15 +9,15 @@ module Decidim
       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

@@ -16,7 +16,7 @@ module Decidim
 
       validates :title, presence: true
 
-      geocoded_by :address, http_headers: lambda { |proposal| { "Referer" => proposal.feature.organization.host } }
+      geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.feature.organization.host } }
 
       def closed?
         closed_at.present?

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

@@ -1,18 +1,9 @@
-<div class="column">
-  <article class="card card--meeting">
-    <div class="card__content">
-      <%= link_to model, class: "card__link" do %>
-        <h5 class="card__title"><%= translated_attribute model.title %></h5>
-      <% end %>
-      <%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: model } %>
-      <%== translated_attribute model.description %>
-      <%= render partial: "decidim/meetings/meetings/tags", locals: { meeting: model } %>
-      <div class="address card__extra">
-        <div class="address__icon">
-          <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
-        </div>
-        <%= render partial: "decidim/shared/address_details", locals: { icon_name: "meetings", geolocalizable: model } %>
-      </div>
-    </div>
-  </article>
+<%= content_for(:title, translated_attribute(model.title)) %>
+<%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: model } %>
+<%== translated_attribute model.description %>
+<div class="address card__extra">
+  <div class="address__icon">
+    <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
+  </div>
+  <%= render partial: "decidim/shared/address_details", locals: { icon_name: "meetings", geolocalizable: model } %>
 </div>

data/config/locales/fr.yml

@@ -2,4 +2,98 @@ fr:
   activemodel:
     attributes:
       close_meeting:
-        attendees_count: Nombre de participants
+        attendees_count: Nombre de participants
+        attending_organizations: Liste des organisations qui ont assisté à la rencontre
+        closing_report: Signaler
+        contributions_count: Nombre de contributions
+        proposal_ids: Propositions créées lors de la rencontre
+      meeting:
+        address: Adresse
+        decidim_category_id: Catégorie
+        decidim_scope_id: Domaine d'application
+        description: Description
+        end_time: Heure de fin
+        location: Lieu
+        location_hints: Indicateurs d’emplacement
+        start_time: Heure de début
+        title: Titre
+  decidim:
+    features:
+      meetings:
+        name: Rencontres
+    meetings:
+      actions:
+        attachments: Documents liés
+        close: Fermer
+        confirm_destroy: Êtes-vous sûr de vouloir supprimer cette rencontre?
+        destroy: Supprimer
+        edit: Modifier
+        new: Nouveau
+        preview: Aperçu
+        title: Actions
+      admin:
+        meeting_closes:
+          edit:
+            close: Fermer
+            title: Clore la rencontre
+        meetings:
+          close:
+            invalid: Il y a eu un problème au moment de clore cette réunion
+            success: Rencontre cloturée avec succès
+          create:
+            invalid: Il y a eu un problème lors de la création de cette rencontre
+            success: Rencontre créée avec succès
+          destroy:
+            success: La rencontre a été supprimée avec succès
+          edit:
+            update: Mettre à jour
+          index:
+            title: Rencontres
+          new:
+            create: Créer
+            title: Créer une rencontre
+          update:
+            invalid: Il y a eu un problème lors de la mise à jour de cette rencontre
+            success: Réncontre mise à jour avec succès
+        models:
+          meeting:
+            name: Rencontre
+      meetings:
+        filters:
+          category: Catégorie
+          category_prompt: Sélectionner une catégorie
+          date: Date
+          past: Passées
+          scopes: Domaines d'application
+          search: Rechercher
+          upcoming: À venir
+        filters_small_view:
+          close_modal: Fermer la fenêtre de dialogue
+          filter: Filtrer
+          filter_by: Filtrer par
+          unfold: Déplier
+        index:
+          view_meeting: Voir la rencontre
+        meetings:
+          no_meetings_warning: Aucune rencontre ne correspond à vos critères de recherche ou aucune rencontre n'est prévue.
+          upcoming_meetings_warning: À l'heure actuelle, il n'y a pas de rencontre planifiées, mais ici, vous trouverez une liste de toutes les réunions passées.
+        show:
+          attendees: Nombre de participants
+          contributions: Décompte des contributions
+          meeting_report: Compte rendu de la rencontre
+          organizations: Organisations participantes
+      models:
+        meeting:
+          fields:
+            closed: Clos
+            end_time: Heure de fin
+            map: Carte
+            start_time: Date de début
+            title: Titre
+    resource_links:
+      meetings_through_proposals:
+        meeting_results: 'Résultats associés :'
+        result_meetings: 'Rencontres connexes :'
+      proposals_from_meeting:
+        meeting_proposals: 'Propositions connexes :'
+        proposal_meetings: 'Rencontre connexes :'

data/lib/decidim/meetings/feature.rb

@@ -16,6 +16,13 @@ Decidim.register_feature(:meetings) do |feature|
     resource.template = "decidim/meetings/meetings/linked_meetings"
   end
 
+  feature.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |features, start_at, end_at|
+    meetings = Decidim::Meetings::Meeting.where(feature: features)
+    meetings = meetings.where("created_at >= ?", start_at) if start_at.present?
+    meetings = meetings.where("created_at <= ?", end_at) if end_at.present?
+    meetings.count
+  end
+
   feature.seeds do
     Decidim::ParticipatoryProcess.all.each do |process|
       next unless process.steps.any?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.0.8.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-18 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.8.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -116,56 +116,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 description: ''
 email:
 - josepjaume@gmail.com