decidim-proposals 0.20.1 → 0.21.0

data/config/locales/tr-TR.yml

@@ -73,6 +73,21 @@ tr:
         one: Oy
         other: oy
   decidim:
+    admin:
+      filters:
+        is_emendation_true:
+          label: tip
+          values:
+            'false': Teklif
+            'true': Değişiklikler
+        state_eq:
+          values:
+            evaluating: değerlendirilmesi
+            withdrawn: çekilmiş
+        state_null:
+          label: Belirtmek, bildirmek
+          values:
+            'true': Cevaplanmadı
     components:
       proposals:
         actions:
@@ -193,7 +208,6 @@ tr:
             email_subject: Takip ettiğiniz bir teklif değerlendiriliyor
             notification_title: <a href="%{resource_path}">%{resource_title}</a> teklifi değerlendiriliyor.
         proposal_mentioned:
-          email_intro: Öneriniz "%{mentioned_proposal_title}" söz edilmiştir <a href="%{resource_path}">bu alanda</a> yorumlardaki.
           email_outro: Bu bildirimi, "%{resource_title}" ın bir yazarı olduğunuz için aldınız.
           email_subject: Teklifinizin "%{mentioned_proposal_title}" olduğu belirtildi
           notification_title: Öneriniz "%{mentioned_proposal_title}" söz edilmiştir <a href="%{resource_path}">bu alanda</a> yorumlardaki.
@@ -223,6 +237,8 @@ tr:
           email_outro: Bu bildirimi aldınız çünkü teklifin yazarı sizsiniz.
           email_subject: '%{resource_title} teklif kategorisi güncellendi'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> teklif kategorisi bir yönetici tarafından güncellendi.
+        proposal_update_scope:
+          email_outro: Bu bildirimi aldınız çünkü teklifin yazarı sizsiniz.
         voting_enabled:
           email_intro: 'Teklifleri %{participatory_space_title}oylayabilirsiniz! Bu sayfaya katılmaya başlayın:'
           email_outro: Bu bildirimi, %{participatory_space_title}izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
@@ -289,12 +305,10 @@ tr:
         see_all: Tümünü gör (%{count})
     proposals:
       actions:
-        answer: Cevap
         edit_proposal: Teklifi düzenle
         import: Başka bir bileşenden içe aktar
         new: Yeni teklif
         participatory_texts: Katılımcı metinler
-        private_notes: Özel notlar
         title: Eylemler
       admin:
         actions:
@@ -338,7 +352,7 @@ tr:
           update:
             success: Katılımcı metin başarıyla güncellendi.
         proposal_answers:
-          edit:
+          form:
             accepted: Kabul edilmiş
             answer_proposal: Cevap
             evaluating: değerlendirilmesi
@@ -374,6 +388,7 @@ tr:
             change_category: Kategoriyi değiştir
             merge: Yeni biriyle birleştir
             merge_button: birleşmek
+            publish: Yayınla
             select_component: Bir bileşen seç
             selected: seçilmiş
             split: Bölünmüş teklifler
@@ -383,11 +398,19 @@ tr:
           new:
             create: yaratmak
             title: Teklif oluştur
+          publish_answers:
+            select_a_proposal: Lütfen bir teklif seçin
+          show:
+            authors: Yazarlar
+            body: Vücut
+            created_at: Oluşturulma tarihi
+            proposals: Teklif
+            votes_count: Oy sayısı
           update_category:
-            invalid: 'Bu teklifler zaten %{category} kategorisine sahipti: %{proposals}.'
             select_a_category: Lütfen bir kategori seçin
             select_a_proposal: Lütfen bir teklif seçin
-            success: 'Teklifler başarıyla %{category} kategorisine güncellendi: %{proposals}.'
+          update_scope:
+            select_a_proposal: Lütfen bir teklif seçin
         proposals_imports:
           create:
             invalid: Teklifleri içe aktarırken bir sorun oluştu
@@ -405,12 +428,6 @@ tr:
           create:
             invalid: Seçilen teklifleri bölen bir hata oluştu.
             success: Teklifleri başarılı bir şekilde yenilere ayırdı.
-        shared:
-          info_proposal:
-            body: Vücut
-            created_at: Oluşturulma tarihi
-            proposal_votes_count: Oy sayısı
-            proposals: Teklif
       admin_log:
         proposal:
           answer: "%{user_name} , %{space_name} uzayda %{resource_name} teklifi yanıtladı"
@@ -425,17 +442,21 @@ tr:
         rejected: Reddedilen
         withdrawn: çekilmiş
       application_helper:
+        filter_category_values:
+          all: Herşey
         filter_origin_values:
           all: Herşey
           citizens: Vatandaşlar
           meetings: Toplantılar
           official: Resmi
           user_groups: Kullanıcı Grupları
+        filter_scope_values:
+          all: Herşey
         filter_state_values:
           accepted: Kabul edilmiş
           all: Herşey
           evaluating: değerlendirilmesi
-          except_rejected: Reddedilenlerin tümü hariç
+          not_answered: Cevaplanmadı
           rejected: Reddedilen
         filter_type_values:
           all: Herşey
@@ -484,10 +505,10 @@ tr:
           all: Herşey
           amendment: Değişiklikler
           category: Kategori
-          category_prompt: Kategori İstemi
           open: Açık
           published: Yayınlanan
           related_to: İle ilgili
+          scope: kapsam
           search: Arama
           state: Belirtmek, bildirmek
           withdrawn: çekilmiş
@@ -636,11 +657,12 @@ tr:
         filters:
           amendment_type: tip
           category: Kategori
-          category_prompt: bir kategori seç
           origin: Menşei
           related_to: İle ilgili
+          scope: kapsam
           search: Arama
           state: Belirtmek, bildirmek
+          type: tip
           voted: oy
         filters_small_view:
           close_modal: Yakın kalıcı
@@ -680,6 +702,7 @@ tr:
           creation_date: 'Oluşturma: %{date}'
           view_proposal: Teklifi görüntüle
         show:
+          answer: Cevap
           back_to: Geri
           edit_proposal: Teklifi düzenle
           endorsements_list: Onay Listesi
@@ -696,9 +719,6 @@ tr:
           withdraw_btn_hint: Herhangi bir destek almadığınız sürece fikrinizi değiştirirseniz teklifinizi geri çekebilirsiniz. Teklif silinmemiş, iptal edilen teklifler listesinde görünecektir.
           withdraw_confirmation: Bu teklifi geri çektiğinizden emin misiniz?
           withdraw_proposal: Teklifi geri çek
-        tags:
-          changed_from: "(bir yönetici tarafından <u>%{previous_category}</u> değiştirildi)"
-          filed_as: Olarak dosyalandı
         vote_button:
           already_voted: Çoktan oy verildi
           already_voted_hover: Unvote

data/config/locales/uk.yml

@@ -55,6 +55,18 @@ uk:
         many: Голосів
         other: Голосів
   decidim:
+    admin:
+      filters:
+        is_emendation_true:
+          values:
+            'false': Пропозиції
+        state_eq:
+          values:
+            evaluating: Розглядається
+            withdrawn: Відкликана
+        state_null:
+          values:
+            'true': Без відповідей
     components:
       proposals:
         actions:
@@ -122,7 +134,6 @@ uk:
             email_subject: Пропозиція, за якою ви стежите, зараз розглядається
             notification_title: Пропозиція <a href="%{resource_path}">%{resource_title}</a> розглядається.
         proposal_mentioned:
-          email_intro: Вашу пропозицію "%{mentioned_proposal_title}" було згадано в коментарях <a href="%{resource_path}">в цьому просторі</a>.
           email_subject: Вашу пропозицію "%{mentioned_proposal_title}" було згадано
           notification_title: Вашу пропозицію "%{mentioned_proposal_title}" було згадано в коментарях <a href="%{resource_path}">в цьому просторі</a>.
         proposal_published:
@@ -143,6 +154,8 @@ uk:
           email_outro: Ви отримали це сповіщення, оскільки ви є автором цієї пропозиції.
           email_subject: Категорію пропозиції %{resource_title} було оновлено
           notification_title: Адміністратор оновив категорію пропозиції <a href="%{resource_path}">%{resource_title}</a>.
+        proposal_update_scope:
+          email_outro: Ви отримали це сповіщення, оскільки ви є автором цієї пропозиції.
         voting_enabled:
           email_intro: 'Ви можете голосувати щодо пропозицій у %{participatory_space_title}! Почніть брати участь зі сторінки:'
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{participatory_space_title}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
@@ -154,10 +167,8 @@ uk:
           proposals: Пропозиції
     proposals:
       actions:
-        answer: Відповісти
         import: Запозичити з іншої складової
         new: Додати нову пропозицію
-        private_notes: Приватні примітки
         title: Дії
       admin:
         actions:
@@ -169,7 +180,7 @@ uk:
           proposal:
             name: Пропозиція
         proposal_answers:
-          edit:
+          form:
             accepted: Прийнято
             answer_proposal: Відповісти
             evaluating: Розглядається
@@ -204,11 +215,17 @@ uk:
           new:
             create: Внести
             title: Створити пропозицію
+          publish_answers:
+            select_a_proposal: Будь ласка, оберіть пропозицію
+          show:
+            created_at: Дата створення
+            proposals: Пропозиції
+            votes_count: Кількість голосів
           update_category:
-            invalid: 'Ці пропозиції вже відносились до категорії %{category}: %{proposals}.'
             select_a_category: Будь ласка, виберіть категорію
             select_a_proposal: Будь ласка, оберіть пропозицію
-            success: 'Пропозиції успішно перенесені до категорії %{category}: %{proposals}.'
+          update_scope:
+            select_a_proposal: Будь ласка, оберіть пропозицію
         proposals_imports:
           create:
             invalid: При запозиченні цих пропозицій сталася помилка
@@ -218,12 +235,6 @@ uk:
             no_components: У цьому просторі співучасті немає інших складових пропозицій, звідки можна було б запозичити пропозиції.
             select_component: Будь ласка, оберіть складову
             select_states: Перевірте стани пропозицій, які бажаєте запозичити
-        shared:
-          info_proposal:
-            body: Основний текст
-            created_at: Дата створення
-            proposal_votes_count: Кількість голосів
-            proposals: Пропозиції
       admin_log:
         proposal:
           answer: "%{user_name} відповів на пропозицію %{resource_name} у просторі %{space_name}"
@@ -241,7 +252,7 @@ uk:
           citizens: Громадяни
           official: Службове
         filter_state_values:
-          except_rejected: Усі, окрім відхилених
+          not_answered: Без відповідей
       create:
         error: При спробі збереження цієї пропозиції сталися помилки.
         success: Пропозицію успішно створено. Збережено як чернетку.
@@ -303,7 +314,6 @@ uk:
           comments: Коментарі
         filters:
           category: Категорія
-          category_prompt: Оберіть категорію
           origin: Джерело
           related_to: Пов'язане з
           search: Шукати
@@ -345,6 +355,7 @@ uk:
           creation_date: 'Внесено: %{date}'
           view_proposal: Переглянути пропозицію
         show:
+          answer: Відповісти
           edit_proposal: Редагувати пропозицію
           endorsements_list: Перелік тих, хто підтримав
           proposal_accepted_reason: 'Ця пропозиція була прийнята, тому що:'
@@ -354,9 +365,6 @@ uk:
           withdraw_btn_hint: Ви можете зняти свою пропозицію, якщо ви передумали, доки ви не отримали жодної підтримки. Пропозиція не видаляється, вона з'явиться у списку відкликаних пропозицій.
           withdraw_confirmation: Ви впевнені, що бажаєте зняти цю пропозицію?
           withdraw_proposal: Зняти пропозицію
-        tags:
-          changed_from: "(перенесено з <u>%{previous_category}</u> адміністратором)"
-          filed_as: Відмічено як
         vote_button:
           already_voted: Вже проголосували
           already_voted_hover: Скасувати голос

data/db/migrate/20200203111239_add_proposal_valuation_assignments.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddProposalValuationAssignments < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_proposals_valuation_assignments do |t|
+      t.references :decidim_proposal, null: false, index: { name: "decidim_proposals_valuation_assignment_proposal" }
+      t.references :valuator_role, polymorphic: true, null: false, index: { name: "decidim_proposals_valuation_assignment_valuator_role" }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200210135152_add_costs_to_proposals.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddCostsToProposals < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_proposals_proposals, :cost, :decimal
+    add_column :decidim_proposals_proposals, :cost_report, :jsonb
+    add_column :decidim_proposals_proposals, :execution_period, :jsonb
+  end
+end

data/db/migrate/20200212120110_sync_proposals_state_with_amendments_state.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class SyncProposalsStateWithAmendmentsState < ActiveRecord::Migration[5.2]
+  def up
+    execute <<-SQL.squish
+      UPDATE decidim_proposals_proposals AS proposals
+      SET state = amendments.state
+      FROM decidim_amendments AS amendments
+      WHERE
+        proposals.state IS NULL AND
+        amendments.decidim_emendation_type = 'Decidim::Proposals::Proposal' AND
+        amendments.decidim_emendation_id = proposals.id AND
+        amendments.state IS NOT NULL
+    SQL
+  end
+
+  def down
+    execute <<-SQL.squish
+      UPDATE decidim_proposals_proposals AS proposals
+      SET state = NULL
+      FROM decidim_amendments AS amendments
+      WHERE
+        amendments.decidim_emendation_type = 'Decidim::Proposals::Proposal' AND
+        amendments.decidim_emendation_id = proposals.id AND
+        amendments.state IS NOT NULL
+    SQL
+  end
+end

data/db/migrate/20200227175922_add_state_published_at_to_proposals.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddStatePublishedAtToProposals < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_proposals_proposals, :state_published_at, :datetime
+  end
+end

data/db/migrate/20200306123652_publish_existing_proposals_state.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class PublishExistingProposalsState < ActiveRecord::Migration[5.2]
+  def up
+    execute <<-SQL.squish
+      UPDATE decidim_proposals_proposals SET state_published_at = COALESCE(answered_at, published_at) WHERE state IS NOT NULL
+    SQL
+  end
+
+  def down
+    execute <<-SQL.squish
+      UPDATE decidim_proposals_proposals SET state_published_at = NULL
+    SQL
+  end
+end

data/lib/decidim/proposals.rb

@@ -17,6 +17,7 @@ module Decidim
     autoload :ParticipatoryTextSection, "decidim/proposals/participatory_text_section"
     autoload :DocToMarkdown, "decidim/proposals/doc_to_markdown"
     autoload :OdtToMarkdown, "decidim/proposals/odt_to_markdown"
+    autoload :Valuatable, "decidim/proposals/valuatable"
 
     include ActiveSupport::Configurable
 

data/lib/decidim/proposals/admin_engine.rb

@@ -10,15 +10,19 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
-        resources :proposals, only: [:index, :new, :create, :edit, :update] do
-          post :update_category, on: :collection
+        resources :proposals, only: [:show, :index, :new, :create, :edit, :update] do
+          resources :valuation_assignments, only: [:destroy]
           collection do
+            post :update_category
+            post :publish_answers
+            post :update_scope
             resource :proposals_import, only: [:new, :create]
             resource :proposals_merge, only: [:create]
             resource :proposals_split, only: [:create]
+            resource :valuation_assignment, only: [:create, :destroy]
           end
           resources :proposal_answers, only: [:edit, :update]
-          resources :proposal_notes, only: [:index, :create]
+          resources :proposal_notes, only: [:create]
         end
 
         resources :participatory_texts, only: [:index] do

data/lib/decidim/proposals/component.rb

@@ -34,12 +34,14 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :geocoding_enabled, type: :boolean, default: false
     settings.attribute :attachments_allowed, type: :boolean, default: false
+    settings.attribute :allow_card_image, type: :boolean, default: false
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
     settings.attribute :collaborative_drafts_enabled, type: :boolean, default: false
     settings.attribute :participatory_texts_enabled, type: :boolean, default: false
     settings.attribute :amendments_enabled, type: :boolean, default: false
     settings.attribute :amendments_wizard_help_text, type: :text, translated: true, editor: true, required: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :new_proposal_body_template, type: :text, translated: true, editor: false, required: false
     settings.attribute :new_proposal_help_text, type: :text, translated: true, editor: true
     settings.attribute :proposal_wizard_step_1_help_text, type: :text, translated: true, editor: true
     settings.attribute :proposal_wizard_step_2_help_text, type: :text, translated: true, editor: true
@@ -56,6 +58,8 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :creation_enabled, type: :boolean
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
+    settings.attribute :publish_answers_immediately, type: :boolean, default: true
+    settings.attribute :answers_with_costs, type: :boolean, default: false
     settings.attribute :amendment_creation_enabled, type: :boolean, default: true
     settings.attribute :amendment_reaction_enabled, type: :boolean, default: true
     settings.attribute :amendment_promotion_enabled, type: :boolean, default: true
@@ -86,7 +90,7 @@ Decidim.register_component(:proposals) do |component|
     Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).accepted.not_hidden.count
   end
 
-  component.register_stat :votes_count, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
+  component.register_stat :supports_count, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_hidden
     Decidim::Proposals::ProposalVote.where(proposal: proposals).count
   end
@@ -101,12 +105,25 @@ Decidim.register_component(:proposals) do |component|
     Decidim::Comments::Comment.where(root_commentable: proposals).count
   end
 
+  component.register_stat :followers_count, tag: :followers, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, start_at, end_at|
+    proposals_ids = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_hidden.pluck(:id)
+    Decidim::Follow.where(decidim_followable_type: "Decidim::Proposals::Proposal", decidim_followable_id: proposals_ids).count
+  end
+
   component.exports :proposals do |exports|
-    exports.collection do |component_instance|
-      Decidim::Proposals::Proposal
-        .published
-        .where(component: component_instance)
-        .includes(:category, component: { participatory_space: :organization })
+    exports.collection do |component_instance, user|
+      space = component_instance.participatory_space
+
+      collection = Decidim::Proposals::Proposal
+                   .published
+                   .where(component: component_instance)
+                   .includes(:category, :component)
+
+      if space.user_roles(:valuator).where(user: user).any?
+        collection.with_valuation_assigned_to(user, space)
+      else
+        collection
+      end
     end
 
     exports.include_in_open_data = true
@@ -166,15 +183,17 @@ Decidim.register_component(:proposals) do |component|
     end
 
     5.times do |n|
-      state, answer = if n > 3
-                        ["accepted", Decidim::Faker::Localized.sentence(10)]
-                      elsif n > 2
-                        ["rejected", nil]
-                      elsif n > 1
-                        ["evaluating", nil]
-                      else
-                        [nil, nil]
-                      end
+      state, answer, state_published_at = if n > 3
+                                            ["accepted", Decidim::Faker::Localized.sentence(10), Time.current]
+                                          elsif n > 2
+                                            ["rejected", nil, Time.current]
+                                          elsif n > 1
+                                            ["evaluating", nil, Time.current]
+                                          elsif n.positive?
+                                            ["accepted", Decidim::Faker::Localized.sentence(10), nil]
+                                          else
+                                            [nil, nil, nil]
+                                          end
 
       params = {
         component: component,
@@ -184,7 +203,8 @@ Decidim.register_component(:proposals) do |component|
         body: Faker::Lorem.paragraphs(2).join("\n"),
         state: state,
         answer: answer,
-        answered_at: Time.current,
+        answered_at: state.present? ? Time.current : nil,
+        state_published_at: state_published_at,
         published_at: Time.current
       }
 
@@ -247,7 +267,7 @@ Decidim.register_component(:proposals) do |component|
           scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
           title: "#{proposal.title} #{Faker::Lorem.sentence(1)}",
           body: "#{proposal.body} #{Faker::Lorem.sentence(3)}",
-          state: nil,
+          state: "evaluating",
           answer: nil,
           answered_at: Time.current,
           published_at: Time.current
@@ -290,11 +310,11 @@ Decidim.register_component(:proposals) do |component|
           about: Faker::Lorem.paragraph(2)
         )
 
-        Decidim::Proposals::ProposalVote.create!(proposal: proposal, author: author) unless proposal.answered? && proposal.rejected?
+        Decidim::Proposals::ProposalVote.create!(proposal: proposal, author: author) unless proposal.published_state? && proposal.rejected?
         Decidim::Proposals::ProposalVote.create!(proposal: emendation, author: author) if emendation
       end
 
-      unless proposal.answered? && proposal.rejected?
+      unless proposal.published_state? && proposal.rejected?
         (n * 2).times do |index|
           email = "endorsement-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-endr#{index}@example.org"
           name = "#{Faker::Name.name} #{participatory_space.id} #{n} endr#{index}"