decidim 0.0.7 → 0.0.8.1

data/decidim-dev/lib/tasks/test_app.rake

@@ -0,0 +1,18 @@
+require "generators/decidim/dummy_generator"
+
+namespace :decidim do
+  desc "Generates a dummy app for testing"
+  task :generate_test_app do
+    dummy_app_path = File.expand_path(File.join(Dir.pwd, "spec", "decidim_dummy_app"))
+
+    Decidim::Generators::DummyGenerator.start(
+      [
+        "--dummy_app_path=#{dummy_app_path}",
+        "--migrate=true",
+        "--quiet"
+      ]
+    )
+
+    sh "cd #{dummy_app_path} && bundle exec rake assets:precompile"
+  end
+end

data/decidim-meetings/README.md

@@ -17,7 +17,7 @@ $ bundle
 ```
 
 ## Contributing
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).
 
 ## License
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).

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

@@ -0,0 +1,21 @@
+module Decidim
+  module Meetings
+    class MeetingWidgetsController < Decidim::WidgetsController
+      helper_method :model, :current_participatory_process
+
+      private
+
+      def model
+        @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
+    end
+  end
+end

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

@@ -6,6 +6,8 @@ module Decidim
     class MeetingsController < Decidim::Meetings::ApplicationController
       include FilterResource
 
+      helper Decidim::WidgetUrlsHelper
+
       helper_method :meetings, :geocoded_meetings, :meeting
 
       def index

data/decidim-meetings/app/views/decidim/meetings/meeting_widgets/.erb

@@ -0,0 +1,16 @@
+<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 %>
+      <%== 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>
+    </div>
+  </article>
+</div>

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

@@ -0,0 +1,18 @@
+<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>
+</div>

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

@@ -47,6 +47,7 @@
       <% end %>
     <%= feature_reference(meeting) %>
     <%= render partial: "decidim/shared/share_modal" %>
+    <%= embed_modal_for meeting_meeting_widget_url(meeting, format: :js) %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">

data/decidim-meetings/config/locales/ca.yml

@@ -8,7 +8,7 @@ ca:
         contributions_count: Nombre de contribucions
         proposal_ids: Propostes creades en una trobada
       meeting:
-        adress: Adreça
+        address: Adreça
         decidim_category_id: Categoria
         decidim_scope_id: Àmbit
         description: Descripció
@@ -28,7 +28,7 @@ ca:
         confirm_destroy: Esteu segur de que voleu suprimir aquesta trobada?
         destroy: Esborra
         edit: Edita
-        new: Nou/va %{name}
+        new: Nova
         preview: Previsualitzar
         title: Accions
       admin:
@@ -46,12 +46,12 @@ ca:
           destroy:
             success: La trobada s'ha eliminat correctament
           edit:
-            update: Actualitzar trobada
+            update: Actualitzar
           index:
             title: Trobades
           new:
-            create: Crear trobada
-            title: Nova trobada
+            create: Crear
+            title: Crear trobada
           update:
             invalid: Hi ha hagut un problema en actualitzar aquesta trobada
             success: Trobada actualitzada correctament

data/decidim-meetings/config/locales/en.yml

@@ -9,7 +9,7 @@ en:
         contributions_count: Number of contributions
         proposal_ids: Proposals created in the meeting
       meeting:
-        adress: Adress
+        address: Address
         decidim_category_id: Category
         decidim_scope_id: Scope
         description: Description
@@ -29,7 +29,7 @@ en:
         confirm_destroy: Are you sure you want to delete this meeting?
         destroy: Delete
         edit: Edit
-        new: New %{name}
+        new: New
         preview: Preview
         title: Actions
       admin:
@@ -47,12 +47,12 @@ en:
           destroy:
             success: Meeting successfully deleted
           edit:
-            update: Update meeting
+            update: Update
           index:
             title: Meetings
           new:
-            create: Create meeting
-            title: New meeting
+            create: Create 
+            title: Create meeting
           update:
             invalid: There's been a problem updating this meeting
             success: Meeting successfully updated

data/decidim-meetings/config/locales/es.yml

@@ -8,7 +8,7 @@ es:
         contributions_count: Número de contribuciones
         proposal_ids: Propuestas creadas en el encuentro
       meeting:
-        adress: Dirección
+        address: Dirección
         decidim_category_id: Categoría
         decidim_scope_id: Ámbito
         description: Descripción
@@ -28,7 +28,7 @@ es:
         confirm_destroy: '¿Está seguro de que quiere eliminar este encuentro?'
         destroy: Borrar
         edit: Editar
-        new: Nuevo/a %{name}
+        new: Nuevo
         preview: Previsualizar
         title: Acciones
       admin:
@@ -46,12 +46,12 @@ es:
           destroy:
             success: El encuentro se ha eliminado correctamente
           edit:
-            update: Actualizar encuentro
+            update: Actualizar
           index:
             title: Lista de encuentros
           new:
-            create: Crear encuentro
-            title: Nuevo encuentro
+            create: Crear
+            title: Crear encuentro
           update:
             invalid: Ha habido un problema al actualizar este encuentro
             success: Encuentro actualizado correctamente

data/decidim-meetings/config/locales/eu.yml

@@ -8,7 +8,6 @@ eu:
         contributions_count: Ekarpen-kopurua
         proposal_ids: Topaketan sortutako proposamenak
       meeting:
-        adress: Helbidea
         decidim_category_id: Kategoria
         decidim_scope_id: Esparrua
         description: Deskribapena
@@ -28,7 +27,6 @@ eu:
         confirm_destroy: Ziur zaude topaketa hau ezabatu nahi duzula?
         destroy: Ezabatu
         edit: Editatu
-        new: '%{name} berria'
         preview: Aurreikusi
         title: Ekintzak
       admin:
@@ -45,13 +43,8 @@ eu:
             success: Topaketa ongi sortu da
           destroy:
             success: Topaketa zuzen ezabatu da.
-          edit:
-            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.

data/decidim-meetings/config/locales/fi.yml

@@ -8,7 +8,6 @@ fi:
         contributions_count: Kontribuutioiden määrä
         proposal_ids: Ehdotusta luotu tapaamisessa
       meeting:
-        adress: Adressi
         decidim_category_id: Kategoria
         decidim_scope_id: Konteksti
         description: Kuvaus
@@ -28,7 +27,6 @@ fi:
         confirm_destroy: Haluatko varmasti poistaa tämän tapaamisen?
         destroy: Poista
         edit: Muokkaa
-        new: Uusi %{name}
         title: Toiminnot
       admin:
         meeting_closes:
@@ -44,13 +42,8 @@ fi:
             success: Tapaaminen onnistuneesti luotu
           destroy:
             success: Tapaaminen onnistuneesti poistettu
-          edit:
-            update: Päivitä tapaaminen
           index:
             title: Tapaamiset
-          new:
-            create: Luo tapaaminen
-            title: Uusi tapaaminen
           update:
             invalid: Tapaamisen luonnissa tapahtui virhe
             success: Tapaaminen luotu onnistuneesti

data/decidim-meetings/config/locales/fr.yml

@@ -0,0 +1,5 @@
+fr:
+  activemodel:
+    attributes:
+      close_meeting:
+        attendees_count: Nombre de participants

data/decidim-meetings/config/locales/nl.yml

@@ -0,0 +1,5 @@
+nl:
+  activemodel:
+    attributes:
+      meeting:
+        decidim_category_id: Categorie

data/decidim-meetings/db/migrate/20170410074252_remove_not_null_reference_meetings.rb

@@ -0,0 +1,5 @@
+class RemoveNotNullReferenceMeetings < ActiveRecord::Migration[5.0]
+  def change
+    change_column_null :decidim_meetings_meetings, :reference, true
+  end
+end

data/decidim-meetings/lib/decidim/meetings/list_engine.rb

@@ -12,7 +12,9 @@ module Decidim
       isolate_namespace Decidim::Meetings
 
       routes do
-        resources :meetings, only: [:index, :show]
+        resources :meetings, only: [:index, :show] do
+          resource :meeting_widget, only: :show, path: "embed"
+        end
         root to: "meetings#index"
       end
     end

data/decidim-meetings/spec/shared/manage_meetings_examples.rb

@@ -52,45 +52,53 @@ RSpec.shared_examples "manage meetings" do
   end
 
   it "creates a new meeting" do
-    click_link "New Meeting"
+    find(".card-title a.button").click
+
+    fill_in_i18n(
+      :meeting_title,
+      "#title-tabs",
+      en: "My meeting",
+      es: "Mi meeting",
+      ca: "El meu meeting"
+    )
+    fill_in_i18n(
+      :meeting_location,
+      "#location-tabs",
+      en: "Location",
+      es: "Location",
+      ca: "Location"
+    )
+    fill_in_i18n(
+      :meeting_location_hints,
+      "#location_hints-tabs",
+      en: "Location hints",
+      es: "Location hints",
+      ca: "Location hints"
+    )
+    fill_in_i18n_editor(
+      :meeting_description,
+      "#description-tabs",
+      en: "A longer description",
+      es: "Descripción más larga",
+      ca: "Descripció més llarga"
+    )
+
+    fill_in :meeting_address, with: address
+
+    page.execute_script("$('#datetime_field_meeting_start_time').focus()")
+    page.find('.datepicker-dropdown .day', text: '12').click
+    page.find('.datepicker-dropdown .hour', text: '10:00').click
+    page.find('.datepicker-dropdown .minute', text: '10:50').click
+
+    page.execute_script("$('#datetime_field_meeting_end_time').focus()")
+    page.find('.datepicker-dropdown .day', text: '12').click
+    page.find('.datepicker-dropdown .hour', text: '12:00').click
+    page.find('.datepicker-dropdown .minute', text: '12:50').click
+
+    select scope.name, from: :meeting_decidim_scope_id
+    select translated(category.name), from: :meeting_decidim_category_id
 
     within ".new_meeting" do
-      fill_in_i18n(
-        :meeting_title,
-        "#title-tabs",
-        en: "My meeting",
-        es: "Mi meeting",
-        ca: "El meu meeting"
-      )
-      fill_in_i18n(
-        :meeting_location,
-        "#location-tabs",
-        en: "Location",
-        es: "Location",
-        ca: "Location"
-      )
-      fill_in_i18n(
-        :meeting_location_hints,
-        "#location_hints-tabs",
-        en: "Location hints",
-        es: "Location hints",
-        ca: "Location hints"
-      )
-      fill_in_i18n_editor(
-        :meeting_description,
-        "#description-tabs",
-        en: "A longer description",
-        es: "Descripción más larga",
-        ca: "Descripció més llarga"
-      )
-
-      fill_in :meeting_address, with: address
-      fill_in :meeting_start_time, with: 1.day.from_now
-      fill_in :meeting_end_time, with: 1.day.from_now + 2.hours
-
-      select scope.name, from: :meeting_decidim_scope_id
-      select translated(category.name), from: :meeting_decidim_category_id
-
       find("*[type=submit]").click
     end
 
@@ -158,45 +166,52 @@ RSpec.shared_examples "manage meetings" do
     end
 
     it "creates a new meeting" do
-      click_link "New Meeting"
+      find(".card-title a.button").click
 
-      within ".new_meeting" do
-        fill_in_i18n(
-          :meeting_title,
-          "#title-tabs",
-          en: "My meeting",
-          es: "Mi meeting",
-          ca: "El meu meeting"
-        )
-        fill_in_i18n(
-          :meeting_location,
-          "#location-tabs",
-          en: "Location",
-          es: "Location",
-          ca: "Location"
-        )
-        fill_in_i18n(
-          :meeting_location_hints,
-          "#location_hints-tabs",
-          en: "Location hints",
-          es: "Location hints",
-          ca: "Location hints"
-        )
-        fill_in_i18n_editor(
-          :meeting_description,
-          "#description-tabs",
-          en: "A longer description",
-          es: "Descripción más larga",
-          ca: "Descripció més llarga"
-        )
+      fill_in_i18n(
+        :meeting_title,
+        "#title-tabs",
+        en: "My meeting",
+        es: "Mi meeting",
+        ca: "El meu meeting"
+      )
+      fill_in_i18n(
+        :meeting_location,
+        "#location-tabs",
+        en: "Location",
+        es: "Location",
+        ca: "Location"
+      )
+      fill_in_i18n(
+        :meeting_location_hints,
+        "#location_hints-tabs",
+        en: "Location hints",
+        es: "Location hints",
+        ca: "Location hints"
+      )
+      fill_in_i18n_editor(
+        :meeting_description,
+        "#description-tabs",
+        en: "A longer description",
+        es: "Descripción más larga",
+        ca: "Descripció més llarga"
+      )
 
-        fill_in :meeting_address, with: address
-        fill_in :meeting_start_time, with: 1.day.from_now
-        fill_in :meeting_end_time, with: 1.day.from_now + 2.hours
+      fill_in :meeting_address, with: address
+      page.execute_script("$('#datetime_field_meeting_start_time').focus()")
+      page.find('.datepicker-dropdown .day', text: '12').click
+      page.find('.datepicker-dropdown .hour', text: '10:00').click
+      page.find('.datepicker-dropdown .minute', text: '10:50').click
 
-        select scope.name, from: :meeting_decidim_scope_id
-        select translated(category.name), from: :meeting_decidim_category_id
+      page.execute_script("$('#datetime_field_meeting_end_time').focus()")
+      page.find('.datepicker-dropdown .day', text: '12').click
+      page.find('.datepicker-dropdown .hour', text: '12:00').click
+      page.find('.datepicker-dropdown .minute', text: '12:50').click
 
+      select scope.name, from: :meeting_decidim_scope_id
+      select translated(category.name), from: :meeting_decidim_category_id
+
+      within ".new_meeting" do
         find("*[type=submit]").click
       end