decidim-proposals 0.0.2 → 0.0.3

data/config/locales/en.yml

@@ -1,20 +1,41 @@
 ---
 en:
+  activemodel:
+    attributes:
+      proposal:
+        body: Body
+        category_id: Category
+        scope_id: Scope
+        title: Title
+        user_group_id: Create proposal as
   decidim:
     features:
       proposals:
         name: Proposals
         settings:
           step:
+            creation_enabled: Proposal creation enabled
+            votes_blocked: Votes blocked
             votes_enabled: Votes enabled
     proposals:
       actions:
+        answer: Answer
         new: New proposal
+        title: Actions
       admin:
         models:
           proposal:
             name: Proposal
+        proposal_answers:
+          edit:
+            accepted: Accepted
+            answer_proposal: Answer proposal
+            rejected: Rejected
+            title: Answer for proposal %{title}
         proposals:
+          answer:
+            invalid: There's been a problem answering this proposal
+            success: Proposal successfully answered
           create:
             invalid: There's been a problem creating this proposal
             success: Proposal successfully created
@@ -26,6 +47,10 @@ en:
           new:
             create: Create proposal
             title: New proposal
+      answers:
+        accepted: Accepted
+        not_answered: Not answered
+        rejected: Rejected
       create:
         error: There's been errors when saving the proposal.
         success: Proposal created successfully.
@@ -35,6 +60,7 @@ en:
             category: Category
             official_proposal: Official proposal
             scope: Scope
+            state: State
             title: Title
       proposals:
         count:
@@ -42,16 +68,28 @@ en:
             one: 1 proposal
             other: "%{count} proposals"
         filters:
+          accepted: Accepted
           activity: Activity
           all: All
           category: Category
           citizenship: Citizenship
           official: Official
           origin: Origin
+          rejected: Rejected
           search: Search
+          state: State
           voted: Voted
+        filters_small_view:
+          close_modal: Close modal
+          filter: Filter
+          filter_for: Filter by
+          unfold: Unfold
         index:
           new_proposal: New proposal
+        linked_proposals:
+          proposal_votes:
+            one: <span class="card--list__data__number">1</span>vote
+            other: <span class="card--list__data__number">%{count}</span>votes
         new:
           back: Back
           select_a_category: Please select a category
@@ -64,10 +102,26 @@ en:
           close_window: Close window
           share: Share
           share_link: Share link
+        show:
+          proposal_rejected_reason: 'This proposal has been rejected because:'
         vote_button:
           already_voted: Already voted
+          no_votes_remaining: No votes remaining
           vote: Vote
+          votes_blocked: Voting disabled
         votes_count:
           count:
             one: VOTE
             other: VOTES
+        votes_limit:
+          vote_limit:
+            description: Instead of voting as many proposals as you want you can only
+              vote up to %{limit} proposals.
+            left: Remaining
+            title: You have %{limit} votes to distribute
+            votes: Votes
+    resource_links:
+      included_proposals:
+        results: 'Proposal appearing in these results:'
+      proposals_from_meeting:
+        meetings: Related meetings

data/config/locales/es.yml

@@ -1,19 +1,40 @@
 es:
+  activemodel:
+    attributes:
+      proposal:
+        body: Cuerpo
+        category_id: Categoría
+        scope_id: Ámbito
+        title: Título
+        user_group_id: Crear propuesta como
   decidim:
     features:
       proposals:
         name: Propuestas
         settings:
           step:
+            creation_enabled: Habilitar creación de propuestas
+            votes_blocked: Votación bloqueada
             votes_enabled: Votos habilitados
     proposals:
       actions:
+        answer: Respuesta
         new: Nueva propuesta
+        title: Acciones
       admin:
         models:
           proposal:
             name: Propuesta
+        proposal_answers:
+          edit:
+            accepted: Aceptada
+            answer_proposal: Respuesta a la propuesta
+            rejected: Rechazada
+            title: Responder a la propuesta %{title}
         proposals:
+          answer:
+            invalid: Ha habido un problema al responder a esta propuesta
+            success: Propuesta respuesta con éxito
           create:
             invalid: Ha habido un problema al crear esta propuesta
             success: Propuesta creada correctamente
@@ -25,6 +46,10 @@ es:
           new:
             create: Crear propuesta
             title: Nueva propuesta
+      answers:
+        accepted: Aceptadas
+        not_answered: No contestada
+        rejected: Rechazada
       create:
         error: Ha habido errores al guardar la propuesta.
         success: Propuesta creada correctamente.
@@ -34,6 +59,7 @@ es:
             category: Categoría
             official_proposal: Propuesta oficial
             scope: Ámbito
+            state: Estado
             title: Título
       proposals:
         count:
@@ -41,16 +67,28 @@ es:
             one: 1 propuesta
             other: "%{count} propuestas"
         filters:
+          accepted: Aceptadas
           activity: Actividad
           all: Todas
           category: Categoría
           citizenship: Ciudadanía
           official: Oficial
           origin: Origen
+          rejected: Rechazadas
           search: Buscar
+          state: Estado
           voted: Votado
+        filters_small_view:
+          close_modal: Cerrar ventana
+          filter: Filtrar
+          filter_for: Filtrar por
+          unfold: Desplegar
         index:
           new_proposal: Nueva propuesta
+        linked_proposals:
+          proposal_votes:
+            one: <span class="card--list__data__number">1</span>vote
+            other: <span class="card--list__data__number">%{count}</span>votos
         new:
           back: Atrás
           select_a_category: Por favor, seleccione una categoría
@@ -63,10 +101,25 @@ es:
           close_window: Cerrar ventana
           share: Compartir
           share_link: Compartir enlace
+        show:
+          proposal_rejected_reason: 'Esta propuesta ha sido rechazada porque:'
         vote_button:
           already_voted: Ya votado
+          no_votes_remaining: No hay votos restantes
           vote: Votar
+          votes_blocked: Votación desactivada
         votes_count:
           count:
             one: VOTAR
-            other: VOTOS
+            other: VOTOS
+        votes_limit:
+          vote_limit:
+            description: En lugar de votación tantas propuestas como desee, sólo se puede votar hasta %{limit} propuestas.
+            left: Restante
+            title: Tiene %{limit} votos a distribuir
+            votes: Votos
+    resource_links:
+      included_proposals:
+        results: 'Propuesta formulada en estos resultados:'
+      proposals_from_meeting:
+        meetings: Encuentros relacionados

data/db/migrate/20170120151202_add_user_group_id_to_proposals.rb

@@ -0,0 +1,5 @@
+class AddUserGroupIdToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :decidim_user_group_id, :integer, index: true
+  end
+end

data/db/migrate/20170131092413_add_answers_to_proposals.rb

@@ -0,0 +1,7 @@
+class AddAnswersToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :state, :string, index: true
+    add_column :decidim_proposals_proposals, :answered_at, :datetime, index: true
+    add_column :decidim_proposals_proposals, :answer, :jsonb
+  end
+end

data/lib/decidim/proposals/admin_engine.rb

@@ -8,7 +8,9 @@ module Decidim
       paths["db/migrate"] = nil
 
       routes do
-        resources :proposals, only: [:index, :new, :create]
+        resources :proposals, only: [:index, :new, :create] do
+          resources :proposal_answers, only: [:edit, :update]
+        end
         root to: "proposals#index"
       end
 

data/lib/decidim/proposals/engine.rb

@@ -12,7 +12,7 @@ module Decidim
 
       routes do
         resources :proposals, only: [:create, :new, :index, :show] do
-          resources :proposal_votes, only: [:create]
+          resource :proposal_vote, only: [:create, :destroy]
         end
         root to: "proposals#index"
       end
@@ -20,6 +20,12 @@ module Decidim
       initializer "decidim_proposals.assets" do |app|
         app.config.assets.precompile += %w(decidim_proposals_manifest.js decidim_proposals_manifest.css)
       end
+
+      initializer "decidim_proposals.inject_abilities_to_user" do |_app|
+        Decidim.configure do |config|
+          config.abilities += ["Decidim::Proposals::Abilities::CurrentUser"]
+        end
+      end
     end
   end
 end

data/lib/decidim/proposals/feature.rb

@@ -13,8 +13,21 @@ Decidim.register_feature(:proposals) do |feature|
     end
   end
 
+  feature.settings(:global) do |settings|
+    settings.attribute :vote_limit, type: :integer, default: 0
+    settings.attribute :comments_always_enabled, type: :boolean, default: true
+  end
+
   feature.settings(:step) do |settings|
     settings.attribute :votes_enabled, type: :boolean
+    settings.attribute :votes_blocked, type: :boolean
+    settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :creation_enabled, type: :boolean
+  end
+
+  feature.register_resource do |resource|
+    resource.model_class_name = "Decidim::Proposals::Proposal"
+    resource.template = "decidim/proposals/proposals/linked_proposals"
   end
 
   feature.seeds do
@@ -25,8 +38,11 @@ Decidim.register_feature(:proposals) do |feature|
         name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
         manifest_name: :proposals,
         participatory_process: process,
+        settings: {
+          vote_limit: 0
+        },
         step_settings: {
-          process.active_step.id => { votes_enabled: true }
+          process.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true }
         }
       )
 
@@ -38,6 +54,17 @@ Decidim.register_feature(:proposals) do |feature|
           author: Decidim::User.where(organization: feature.organization).all.sample
         )
 
+        if n > 15
+          proposal.state = "accepted"
+          proposal.answered_at = Time.current
+          proposal.save!
+        elsif n > 9
+          proposal.state = "rejected"
+          proposal.answered_at = Time.current
+          proposal.answer = Decidim::Faker::Localized.sentence(10)
+          proposal.save!
+        end
+
         rand(3).times do |m|
           email = "vote-author-#{process.id}-#{n}-#{m}@decidim.org"
           name = "#{Faker::Name.name} #{process.id} #{n} #{m}"

data/lib/decidim/proposals/test/factories.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+require "decidim/core/test/factories"
+require "decidim/admin/test/factories"
+require "decidim/comments/test/factories"
+require "decidim/meetings/test/factories"
+require "decidim/results/test/factories"
+require "decidim/budgets/test/factories"
+
+FactoryGirl.define do
+  factory :proposal_feature, class: Decidim::Feature do
+    name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :proposals).i18n_name }
+    manifest_name :proposals
+    participatory_process { create(:participatory_process, :with_steps) }
+
+    trait :with_votes_enabled do
+      step_settings do
+        {
+          participatory_process.active_step.id => { votes_enabled: true }
+        }
+      end
+    end
+
+    trait :with_vote_limit do
+      transient do
+        vote_limit 10
+      end
+
+      settings do
+        {
+          vote_limit: vote_limit
+        }
+      end
+    end
+
+    trait :with_votes_blocked do
+      step_settings do
+        {
+          participatory_process.active_step.id => {
+            votes_enabled: true,
+            votes_blocked: true
+          }
+        }
+      end
+    end
+
+    trait :with_creation_enabled do
+      step_settings do
+        {
+          participatory_process.active_step.id => { creation_enabled: true }
+        }
+      end
+    end
+  end
+
+  factory :proposal, class: Decidim::Proposals::Proposal do
+    title { Faker::Lorem.sentence }
+    body { Faker::Lorem.sentences(3).join("\n") }
+    feature { create(:proposal_feature) }
+    author do
+      create(:user, organization: feature.organization) if feature
+    end
+
+    trait :official do
+      author nil
+    end
+
+    trait :accepted do
+      state "accepted"
+      answered_at { Time.current }
+    end
+
+    trait :rejected do
+      state "rejected"
+      answer { Decidim::Faker::Localized.sentence }
+      answered_at { Time.current }
+    end
+  end
+
+  factory :proposal_vote, class: Decidim::Proposals::ProposalVote do
+    proposal { build(:proposal) }
+    author { build(:user, organization: proposal.organization) }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,14 +88,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: decidim-meetings
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: decidim-results
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: decidim-budgets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: A proposals component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -112,32 +154,42 @@ files:
 - app/assets/images/decidim/proposals/icon.svg
 - app/assets/javascripts/decidim/proposals/social_share.js
 - app/assets/stylesheets/decidim/proposals/social_share.css.scss
+- app/commands/decidim/proposals/admin/answer_proposal.rb
 - app/commands/decidim/proposals/admin/create_proposal.rb
 - app/commands/decidim/proposals/create_proposal.rb
 - app/controllers/decidim/proposals/admin/application_controller.rb
+- app/controllers/decidim/proposals/admin/proposal_answers_controller.rb
 - app/controllers/decidim/proposals/admin/proposals_controller.rb
 - app/controllers/decidim/proposals/application_controller.rb
 - app/controllers/decidim/proposals/proposal_votes_controller.rb
 - app/controllers/decidim/proposals/proposals_controller.rb
+- app/forms/decidim/proposals/admin/proposal_answer_form.rb
 - app/forms/decidim/proposals/admin/proposal_form.rb
 - app/forms/decidim/proposals/proposal_form.rb
 - app/helpers/decidim/proposals/application_helper.rb
 - app/helpers/decidim/proposals/proposal_votes_helper.rb
+- app/models/decidim/proposals/abilities/current_user.rb
 - app/models/decidim/proposals/application_record.rb
 - app/models/decidim/proposals/proposal.rb
 - app/models/decidim/proposals/proposal_vote.rb
 - app/services/decidim/proposals/proposal_search.rb
+- app/views/decidim/proposals/admin/proposal_answers/edit.html.erb
 - app/views/decidim/proposals/admin/proposals/_form.html.erb
 - app/views/decidim/proposals/admin/proposals/index.html.erb
 - app/views/decidim/proposals/admin/proposals/new.html.erb
-- app/views/decidim/proposals/proposal_votes/create.js.erb
+- app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb
 - app/views/decidim/proposals/proposals/_count.html.erb
 - app/views/decidim/proposals/proposals/_filters.html.erb
+- app/views/decidim/proposals/proposals/_filters_small_view.html.erb
+- app/views/decidim/proposals/proposals/_linked_proposals.html.erb
 - app/views/decidim/proposals/proposals/_proposal.html.erb
+- app/views/decidim/proposals/proposals/_proposal_badge.html.erb
 - app/views/decidim/proposals/proposals/_proposals.html.erb
+- app/views/decidim/proposals/proposals/_remaining_votes_count.html.erb
 - app/views/decidim/proposals/proposals/_share.html.erb
 - app/views/decidim/proposals/proposals/_vote_button.html.erb
 - app/views/decidim/proposals/proposals/_votes_count.html.erb
+- app/views/decidim/proposals/proposals/_votes_limit.html.erb
 - app/views/decidim/proposals/proposals/index.html.erb
 - app/views/decidim/proposals/proposals/index.js.erb
 - app/views/decidim/proposals/proposals/new.html.erb
@@ -151,11 +203,14 @@ files:
 - db/migrate/20170112115253_create_proposal_votes.rb
 - db/migrate/20170113114245_add_text_search_indexes.rb
 - db/migrate/20170118120151_add_counter_cache_votes_to_proposals.rb
+- db/migrate/20170120151202_add_user_group_id_to_proposals.rb
+- db/migrate/20170131092413_add_answers_to_proposals.rb
 - lib/decidim/proposals.rb
 - lib/decidim/proposals/admin.rb
 - lib/decidim/proposals/admin_engine.rb
 - lib/decidim/proposals/engine.rb
 - lib/decidim/proposals/feature.rb
+- lib/decidim/proposals/test/factories.rb
 homepage: https://github.com/AjuntamentdeBarcelona/decidim
 licenses:
 - AGPLv3