decidim-meetings 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ea072be2a343bf0bb84667728294c6dc3ded5a
-  data.tar.gz: 510360ace6994dd82f35d8f07ee1f4e2a3dc39b0
+  metadata.gz: 22f81c150f17b70a28b1a9a513d76d1f90e9de3b
+  data.tar.gz: 4bd9899672a6c814d4322f5fb2f7262ed736a3e1
 SHA512:
-  metadata.gz: 3d78cca584964606032e1b31cba81b0b5891ba48cbd6144df435bbc3b63b465a9077b8fdc7a9131d75463a95e0b76afcd0560011727cfc6547eb809ee43f9621
-  data.tar.gz: f616788bd5122d7672919ff032ea17c47eed4b7be6dee6be3bc8ac820156080482fef6d40425e02b00c14bf082bedcacdfc16374bd1f419bf58bce82cb2b0cd6
+  metadata.gz: b8ae9ce44e534ae5d1022dc42d5b7632fce9c276adbbcfa1f6dde6da223d9d47528e66e6be254147993eebbe949fedc3864051557a807d08caf7ae6f4e1158ed
+  data.tar.gz: b6d6f816fc9b436622ebe2e44a68918b0d3fda3201f8cc1ba46a26798600e1cc85ca0638d1c29c21a6771f12eea2981285637ea6def671e0c752dd96193210b3

data/app/assets/images/decidim/meetings/icon.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02"><path d="M693.07,543.84a18,18,0,1,1,18-18A18,18,0,0,1,693.07,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,693.07,509.83Z" transform="translate(-675.07 -507.83)"/><path d="M693.07,526.93a4.1,4.1,0,1,1,4.1-4.1A4.1,4.1,0,0,1,693.07,526.93Zm0-6.19a2.1,2.1,0,1,0,2.1,2.1A2.1,2.1,0,0,0,693.07,520.74Z" transform="translate(-675.07 -507.83)"/><path d="M693.07,536.65a1,1,0,0,1-.67-0.26c-0.29-.26-7.11-6.5-7.11-14a7.78,7.78,0,0,1,15.57,0c0,7.46-6.82,13.71-7.11,14A1,1,0,0,1,693.07,536.65Zm0-20a5.79,5.79,0,0,0-5.78,5.78c0,5.29,4.13,10.11,5.78,11.82,1.65-1.72,5.78-6.54,5.78-11.82A5.79,5.79,0,0,0,693.07,516.64Z" transform="translate(-675.07 -507.83)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02"><path d="M693.07,543.84a18,18,0,1,1,18-18A18,18,0,0,1,693.07,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,693.07,509.83Z" transform="translate(-675.07 -507.83)"/><path d="M693.07,526.93a4.1,4.1,0,1,1,4.1-4.1A4.1,4.1,0,0,1,693.07,526.93Zm0-6.19a2.1,2.1,0,1,0,2.1,2.1A2.1,2.1,0,0,0,693.07,520.74Z" transform="translate(-675.07 -507.83)"/><path d="M693.07,536.65a1,1,0,0,1-.67-0.26c-0.29-.26-7.11-6.5-7.11-14a7.78,7.78,0,0,1,15.57,0c0,7.46-6.82,13.71-7.11,14A1,1,0,0,1,693.07,536.65Zm0-20a5.79,5.79,0,0,0-5.78,5.78c0,5.29,4.13,10.11,5.78,11.82,1.65-1.72,5.78-6.54,5.78-11.82A5.79,5.79,0,0,0,693.07,516.64Z" transform="translate(-675.07 -507.83)"/></svg>

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

@@ -5,7 +5,6 @@ module Decidim
     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

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

@@ -4,7 +4,6 @@ module Decidim
   module Meetings
     class MeetingWidgetsController < Decidim::WidgetsController
       helper MeetingsHelper
-      helper_method :model, :current_participatory_process
 
       private
 
@@ -12,10 +11,6 @@ module Decidim
         @model ||= Meeting.where(feature: params[:feature_id]).find(params[:meeting_id])
       end
 
-      def current_participatory_process
-        @current_participatory_process ||= model.feature.participatory_process
-      end
-
       def iframe_url
         @iframe_url ||= meeting_meeting_widget_url(model)
       end

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

@@ -41,19 +41,17 @@ module Decidim
           current_feature.participatory_process.scope
         end
 
+        alias feature current_feature
+
         def scope
           return unless current_feature
-          @scope ||= process_scope || current_feature.scopes.where(id: decidim_scope_id).first
+          @scope ||= current_feature.scopes.where(id: decidim_scope_id).first || process_scope
         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/views/decidim/meetings/admin/meetings/_form.html.erb

@@ -34,9 +34,9 @@
       </div>
     </div>
     <div class="row" >
-      <% if !@form.process_scope %>
+      <% if current_participatory_process.has_subscopes? %>
         <div class="columns xlarge-6" >
-          <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+          <%= form.scopes_select :decidim_scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope) %>
         </div>
       <% end %>
 
@@ -45,4 +45,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

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

@@ -5,4 +5,4 @@
   <div class="card__datetime__time">
     <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
   </div>
-</div>
+</div>

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

@@ -16,8 +16,8 @@
     <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
   <% end %>
 
-  <% 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") %>
+  <% if current_participatory_process.has_subscopes? %>
+    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope, include_root: true), multiple: true %>
   <% end %>
 
   <% if current_feature.categories.any? %>

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

@@ -15,4 +15,4 @@
   <div class="filters">
     <%= render partial: "filters" %>
   </div>
-</div>
+</div>

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

@@ -20,7 +20,7 @@
           <% end %>
           <%= render partial: "datetime", locals: { meeting: meeting } %>
           <%== meeting_description(meeting) %>
-          <%= render partial: "tags", locals: { meeting: meeting } %>
+          <%= render partial: "decidim/shared/tags", locals: { resource: meeting, tags_class_extra: "tags--meeting" } %>
           <div class="address card__extra">
             <div class="address__icon">
               <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>

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

@@ -1,3 +1,5 @@
+<%= render partial: "decidim/shared/feature_announcement" %>
+
 <%= dynamic_map_for meetings_data_for_map(geocoded_meetings) do %>
   <template id="marker-popup">
     <div class="map-info__content">

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

@@ -2,7 +2,11 @@ var $meetings = $('#meetings');
 
 $meetings.html('<%= j(render partial: "meetings") %>');
 
+var $dropdownMenu = $('.dropdown.menu', $meetings);
+$dropdownMenu.foundation();
+
 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

@@ -53,7 +53,7 @@
     <div class="section">
       <p><%== translated_attribute meeting.description %></p>
       <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
-      <%= render partial: "tags", locals: { meeting: meeting } %>
+      <%= render partial: "decidim/shared/tags", locals: { resource: meeting, tags_class_extra: "tags--meeting" } %>
     </div>
     <% if meeting.closed? %>
       <div class="section">

data/config/i18n-tasks.yml

@@ -1,7 +1,10 @@
 base_locale: en
 ignore_unused:
 - "decidim.features.meetings.name"
+- "decidim.features.meetings.settings.*"
 - "activemodel.attributes.*"
 - "decidim.resource_links.*"
+ignore_missing:
+  - decidim.scopes.global
 search:
   strict: false

data/config/locales/ca.yml

@@ -64,6 +64,7 @@ ca:
           category_prompt: Selecciona una categoria
           date: Data
           past: Passades
+          scope_prompt: Seleccioneu un àmbit
           scopes: Àmbits
           search: Cerca
           upcoming: Properes
@@ -97,4 +98,4 @@ ca:
         result_meetings: 'Trobades relacionades:'
       proposals_from_meeting:
         meeting_proposals: 'Propostes relacionades:'
-        proposal_meetings: 'Trobades relacionades:'
+        proposal_meetings: 'Trobades relacionades:'

data/config/locales/en.yml

@@ -22,6 +22,11 @@ en:
     features:
       meetings:
         name: Meetings
+        settings:
+          global:
+            announcement: Announcement
+          step:
+            announcement: Announcement
     meetings:
       actions:
         attachments: Attachments
@@ -65,6 +70,7 @@ en:
           category_prompt: Select a category
           date: Date
           past: Past
+          scope_prompt: Select a scope
           scopes: Scopes
           search: Search
           upcoming: Upcoming

data/config/locales/es.yml

@@ -64,6 +64,7 @@ es:
           category_prompt: Selecciona una categoría
           date: Fecha
           past: Pasadas
+          scope_prompt: Seleccione un ámbito
           scopes: Ámbitos
           search: Buscar
           upcoming: Próximas
@@ -97,4 +98,4 @@ es:
         result_meetings: 'Encuentros relacionados:'
       proposals_from_meeting:
         meeting_proposals: 'Propuestas relacionadas:'
-        proposal_meetings: 'Encuentros relacionados:'
+        proposal_meetings: 'Encuentros relacionados:'

data/config/locales/eu.yml

@@ -96,4 +96,4 @@ eu:
         result_meetings: 'Proposamenarekin lotutako topaketak:'
       proposals_from_meeting:
         meeting_proposals: 'Topaketari dagozkion proposamenak:'
-        proposal_meetings: 'Proposamenarekin lotutako topaketak:'
+        proposal_meetings: 'Proposamenarekin lotutako topaketak:'

data/config/locales/fi.yml

@@ -87,4 +87,4 @@ fi:
         result_meetings: 'Liittyvät tapaamiset:'
       proposals_from_meeting:
         meeting_proposals: 'Liittyvät ehdotukset:'
-        proposal_meetings: 'Liittyvät tapaamiset:'
+        proposal_meetings: 'Liittyvät tapaamiset:'

data/config/locales/fr.yml

@@ -96,4 +96,4 @@ fr:
         result_meetings: 'Rencontres connexes :'
       proposals_from_meeting:
         meeting_proposals: 'Propositions créées à cette rencontre :'
-        proposal_meetings: 'Rencontre connexes :'
+        proposal_meetings: 'Rencontre connexes :'

data/config/locales/it.yml

@@ -84,4 +84,4 @@ it:
         result_meetings: 'Meeting correlati:'
       proposals_from_meeting:
         meeting_proposals: 'Proposte correlate:'
-        proposal_meetings: 'Meeting correlati alle proposte:'
+        proposal_meetings: 'Meeting correlati alle proposte:'

data/config/locales/nl.yml

@@ -2,4 +2,4 @@ nl:
   activemodel:
     attributes:
       meeting:
-        decidim_category_id: Categorie
+        decidim_category_id: Categorie

data/config/locales/pl.yml

@@ -0,0 +1,63 @@
+pl:
+  activemodel:
+    attributes:
+      meeting:
+        address: Adres
+        decidim_category_id: Kategoria
+        decidim_scope_id: Zakres
+        description: Opis
+        start_time: Czas rozpoczęcia
+        title: Tytuł
+  decidim:
+    features:
+      meetings:
+        name: Spotkania
+    meetings:
+      actions:
+        attachments: Załączniki
+        confirm_destroy: Czy na pewno chcesz usunąć to spotkanie?
+      admin:
+        meeting_closes:
+          edit:
+            title: Zamknij spotkanie
+        meetings:
+          close:
+            invalid: Wystąpił problem podczas zamykania tego spotkania
+            success: Spotkanie zostało pomyślnie zamknięte
+          create:
+            invalid: Podczas tworzenia tego spotkania wystąpił problem
+            success: Spotkanie zostało pomyślnie utworzone
+          destroy:
+            success: Spotkanie zostało pomyślnie usunięte
+          index:
+            title: Spotkania
+          new:
+            title: Utwórz spotkanie
+          update:
+            invalid: Podczas aktualizowania tego spotkania wystąpił problem
+        models:
+          meeting:
+            name: Spotkanie
+      meetings:
+        filters:
+          category: Kategoria
+          category_prompt: Wybierz kategorię
+          date: Data
+          scope_prompt: Wybierz zakres
+          scopes: Zakresy
+          upcoming: Nadchodzące
+        filters_small_view:
+          filter_by: Filtruj według
+      models:
+        meeting:
+          fields:
+            closed: Zamknięte
+            map: Mapa
+            start_time: Data rozpoczęcia
+            title: Tytuł
+    resource_links:
+      meetings_through_proposals:
+        meeting_results: 'Powiązane wyniki:'
+        result_meetings: 'Powiązane spotkania:'
+      proposals_from_meeting:
+        proposal_meetings: 'Powiązane spotkania:'

data/lib/decidim/meetings/feature.rb

@@ -23,6 +23,14 @@ Decidim.register_feature(:meetings) do |feature|
     meetings.count
   end
 
+  feature.settings(:global) do |settings|
+    settings.attribute :announcement, type: :text, translated: true, editor: true
+  end
+
+  feature.settings(:step) do |settings|
+    settings.attribute :announcement, type: :text, translated: true, editor: true
+  end
+
   feature.seeds do |process|
     feature = Decidim::Feature.create!(
       name: Decidim::Features::Namer.new(process.organization.available_locales, :meetings).i18n_name,
@@ -31,10 +39,18 @@ Decidim.register_feature(:meetings) do |feature|
       participatory_process: process
     )
 
+    if process.scope
+      scopes = process.scope.descendants
+      global = process.scope
+    else
+      scopes = process.organization.scopes
+      global = nil
+    end
+
     3.times do
       meeting = Decidim::Meetings::Meeting.create!(
         feature: feature,
-        scope: process.organization.scopes.sample,
+        scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
         category: process.categories.sample,
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-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.4.4
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -116,56 +116,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 description: A meetings component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -209,7 +209,6 @@ files:
 - app/views/decidim/meetings/meetings/_filters_small_view.html.erb
 - app/views/decidim/meetings/meetings/_linked_meetings.html.erb
 - app/views/decidim/meetings/meetings/_meetings.html.erb
-- app/views/decidim/meetings/meetings/_tags.html.erb
 - app/views/decidim/meetings/meetings/index.html.erb
 - app/views/decidim/meetings/meetings/index.js.erb
 - app/views/decidim/meetings/meetings/show.html.erb
@@ -222,6 +221,7 @@ files:
 - config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/nl.yml
+- config/locales/pl.yml
 - db/migrate/20161130121354_create_meetings.rb
 - db/migrate/20170110142105_close_a_meeting.rb
 - db/migrate/20170123151650_add_latitude_and_longitude_to_meetings.rb

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

@@ -1,10 +0,0 @@
-<% if meeting.category.present? || meeting.scope.present? %>
-  <ul class="tags tags--meeting" >
-    <% if meeting.category.present? %>
-      <li><%= link_to translated_attribute(meeting.category.name), resource_locator(meeting).index(filter: { category_id: meeting.category.id }) %></li>
-    <% end %>
-    <% if !current_participatory_process.scope && meeting.scope.present? %>
-      <li><%= link_to meeting.scope.name, resource_locator(meeting).index(filter: { scope_id: [meeting.scope.id] }) %></li>
-    <% end %>
-  </ul>
-<% end %>