decidim-meetings 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abde624ab239d2dbeae35b06b79632893437fd14
-  data.tar.gz: 3683132fd6eaeab416e483df234b065bc2a0ac2a
+  metadata.gz: 1aa5a2141c9baade3d0027cbc8e00c5e96e36387
+  data.tar.gz: c78b2357556bf27eb5d1fe9e9ecca23d54648c56
 SHA512:
-  metadata.gz: d8c3006680761d50b8f54bc18682279c1963dfe3c0d7acb6e833c2237d140af7a56eff4c88453a66c0899c9b5a9bfb25c98403399594763fe35fdf3d4ce14844
-  data.tar.gz: 6faf324a08e90825ec3ab1162269b03bb8f5bfcfd09f4ec9cb93796a1e7c802611df79ceaf5d48dc7f09ae9efdd46754fe412f29e8d0e2d1ffa7b4add29c14d0
+  metadata.gz: e83095f7cea0fe8739b5a89d5ffe822207707aa8aa26e3f0bb692b10c5eb4a87b52ed746730dd007ec88e5e25c1fc83e860aa2b956a7be385f5d9fbcede5c4cc
+  data.tar.gz: 21e066f55defd6c26157989dc3c871ad01422d9c9ad5a7ee002ec2fd7da5076ccdb48e6325b8c51e082361328c3c60b56e33801f2f2ea11e45a977bcf922fafd

data/README.md

@@ -1,5 +1,5 @@
 # Decidim::Meetings
-The Meeetings module adds meeting to any participatory process. It adds a CRUD engine to the admin and public view scoped inside the participatory process.
+The Meetings module adds meeting to any participatory process. It adds a CRUD engine to the admin and public view scoped inside the participatory process.
 
 ## Usage
 Meetings will be available as a Feature for a Participatory Process.

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

@@ -5,7 +5,7 @@ module Decidim
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     #
-    # Note that it inherits from `Decidim::Components::BaseController`, which
+    # Note that it inherits from `Decidim::Features::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Features::BaseController
       helper Decidim::Meetings::ApplicationHelper

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

@@ -3,7 +3,7 @@
     <div class="column">
       <article class="card card--meeting">
         <div class="card__content">
-          <%= link_to decidim_resource_path(meeting), class: "card__link" do %>
+          <%= link_to resource_locator(meeting).path, class: "card__link" do %>
             <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
           <% end %>
           <div class="card__datetime">

data/config/locales/it.yml

@@ -0,0 +1,87 @@
+it:
+  activemodel:
+    attributes:
+      close_meeting:
+        attendees_count: Numero di partecipanti
+        attending_organizations: Elenco delle organizzazioni partecipanti
+      meeting:
+        address: Indirizzo
+        decidim_category_id: Categoria
+        decidim_scope_id: Visibilità
+        description: Descrizione
+        end_time: Orario fine
+        start_time: Orario inizio
+  decidim:
+    features:
+      meetings:
+        name: Incontri
+    meetings:
+      actions:
+        attachments: Allegati
+        close: Chiuso
+        confirm_destroy: Sei certo di voler cancellare questo meeting?
+        destroy: Cancella
+        edit: Modifica
+        new: Nuovo
+        preview: Anteprima
+        title: Azioni
+      admin:
+        meeting_closes:
+          edit:
+            close: Chiudi
+            title: Chiusura meeting
+        meetings:
+          close:
+            invalid: C'è stato un problema durante la chiusura di questo meeting.
+            success: OK, il meeting è stato chiuso.
+          create:
+            invalid: C'è stato un problema durante la creazione di questo meeting.
+            success: OK, il meeting è stato creato con successo.
+          destroy:
+            success: OK, il meeting è stato cancellato.
+          edit:
+            update: Modifica
+          new:
+            create: Crea
+            title: Crea meeting
+          update:
+            invalid: C'è stato un problema durante l'aggiornamento di questo meeting.
+            success: OK, il meeting è stato aggiornato.
+      meetings:
+        filters:
+          category: Categoria
+          category_prompt: Scegli una categoria
+          date: Data
+          past: Passato
+          scopes: Visibilità
+          search: Cerca
+          upcoming: Imminenti
+        filters_small_view:
+          close_modal: Chiudi modalità
+          filter: Filtra
+          filter_by: Filtra per
+          unfold: Espandi
+        index:
+          view_meeting: Visualizza meeting
+        meetings:
+          no_meetings_warning: Nessun meeting corrisponde ai tuoi criteri di ricerca oppure non vi è nessun meeting in programma.
+          upcoming_meetings_warning: Attualmente non vi sono meeting in programma, ma qui puoi trovare elencati tutti i meeting effettuati in passato.
+        show:
+          attendees: Conteggio dei partecipanti
+          contributions: Conteggio dei contributi
+          organizations: Organizzazioni partecipanti.
+      models:
+        meeting:
+          fields:
+            closed: Chiuso
+            end_time: Data di fine
+            map: Mappa
+            start_time: Data di inizio
+            title: Titolo
+    resource_links:
+      meetings_through_proposals:
+        meeting_results: 'Risultati correlati:'
+        result_meetings: 'Meeting correlati:'
+      proposals_from_meeting:
+        meeting_proposals: 'Proposte correlate:'
+        proposal_meetings: 'Meeting correlati alle proposte:'

data/db/migrate/20161130121354_create_meetings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateMeetings < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_meetings_meetings do |t|

data/db/migrate/20170110142105_close_a_meeting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CloseAMeeting < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_meetings_meetings, :closing_report, :jsonb

data/db/migrate/20170123151650_add_latitude_and_longitude_to_meetings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddLatitudeAndLongitudeToMeetings < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_meetings_meetings, :latitude, :float

data/db/migrate/20170129153716_remove_short_description_from_meetings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveShortDescriptionFromMeetings < ActiveRecord::Migration[5.0]
   def change
     remove_column :decidim_meetings_meetings, :short_description

data/db/migrate/20170215132546_add_reference_to_meetings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReferenceToMeetings < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_meetings_meetings, :reference, :string

data/db/migrate/20170410074252_remove_not_null_reference_meetings.rb

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

data/db/migrate/20170612101925_migrate_meetings_category.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class MigrateMeetingsCategory < ActiveRecord::Migration[5.1]
+  def change
+    # Create categorizations ensuring database integrity
+    execute('
+      INSERT INTO decidim_categorizations(decidim_category_id, categorizable_id, categorizable_type, created_at, updated_at)
+        SELECT decidim_category_id, decidim_meetings_meetings.id, \'Decidim::Meetings::Meeting\', NOW(), NOW()
+        FROM decidim_meetings_meetings
+        INNER JOIN decidim_categories ON decidim_categories.id = decidim_meetings_meetings.decidim_category_id
+    ')
+    # Remove unused column
+    remove_column :decidim_meetings_meetings, :decidim_category_id
+  end
+end

data/lib/decidim/meetings/feature.rb

@@ -54,13 +54,13 @@ Decidim.register_feature(:meetings) do |feature|
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
+          file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
           attached_to: meeting
         )
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(File.dirname(__FILE__), "seeds", "Exampledocument.pdf")),
+          file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
           attached_to: meeting
         )
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-16 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.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -116,56 +116,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 description: A meetings component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -219,6 +219,7 @@ files:
 - config/locales/eu.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/nl.yml
 - db/migrate/20161130121354_create_meetings.rb
 - db/migrate/20170110142105_close_a_meeting.rb
@@ -226,6 +227,7 @@ files:
 - db/migrate/20170129153716_remove_short_description_from_meetings.rb
 - db/migrate/20170215132546_add_reference_to_meetings.rb
 - db/migrate/20170410074252_remove_not_null_reference_meetings.rb
+- db/migrate/20170612101925_migrate_meetings_category.rb
 - lib/decidim/meetings.rb
 - lib/decidim/meetings/admin.rb
 - lib/decidim/meetings/admin_engine.rb