decidim-reporting_proposals 0.2.0 → 0.4.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.eslintrc.json +1 -0
- data/.github/workflows/lint.yml +1 -0
- data/.github/workflows/test_integration.yml +5 -1
- data/.github/workflows/test_unit.yml +5 -1
- data/Gemfile +1 -0
- data/Gemfile.lock +269 -227
- data/README.md +108 -16
- data/app/cells/concerns/decidim/reporting_proposals/proposals_picker_cell_override.rb +24 -0
- data/app/commands/concerns/decidim/admin/hide_resource_override.rb +34 -0
- data/app/commands/concerns/decidim/proposals/admin/answer_proposal_override.rb +41 -0
- data/app/commands/concerns/decidim/proposals/admin/assign_proposals_to_valuator_override.rb +30 -0
- data/app/commands/concerns/decidim/proposals/publish_proposal_override.rb +72 -0
- data/app/commands/concerns/decidim/reporting_proposals/admin/create_answer_override.rb +17 -0
- data/app/commands/concerns/decidim/reporting_proposals/admin/create_result_override.rb +17 -0
- data/app/commands/concerns/decidim/reporting_proposals/admin/update_result_override.rb +34 -0
- data/app/commands/concerns/decidim/reporting_proposals/close_meeting_override.rb +15 -0
- data/app/commands/concerns/decidim/reporting_proposals/create_project_override.rb +15 -0
- data/app/commands/concerns/decidim/templates/admin/copy_questionnaire_template_override.rb +32 -0
- data/app/commands/concerns/decidim/templates/admin/create_questionnaire_template_override.rb +32 -0
- data/app/commands/decidim/templates/admin/copy_proposal_answer_template.rb +35 -0
- data/app/commands/decidim/templates/admin/create_proposal_answer_template.rb +48 -0
- data/app/commands/decidim/templates/admin/update_proposal_answer_template.rb +52 -0
- data/app/controllers/concerns/decidim/proposals/admin/valuation_assignments_controller_override.rb +35 -0
- data/app/controllers/concerns/decidim/templates/admin/application_controller_override.rb +20 -0
- data/app/controllers/decidim/reporting_proposals/admin/proposal_notes_controller.rb +4 -5
- data/app/controllers/decidim/templates/admin/proposal_answer_templates_controller.rb +181 -0
- data/app/events/concerns/decidim/proposals/publish_proposal_event_override.rb +35 -0
- data/app/forms/concerns/decidim/reporting_proposals/close_meeting_form_override.rb +28 -0
- data/app/forms/concerns/decidim/reporting_proposals/form_builder_override.rb +1 -3
- data/app/forms/concerns/decidim/reporting_proposals/map_included_proposals_for_form_override.rb +28 -0
- data/app/forms/concerns/decidim/reporting_proposals/map_related_proposals_for_form_override.rb +28 -0
- data/app/forms/decidim/templates/admin/proposal_answer_template_form.rb +21 -0
- data/app/helpers/concerns/decidim/reporting_proposals/resource_helper_override.rb +25 -0
- data/app/mailers/concerns/decidim/admin/hidden_resource_mailer.rb +28 -0
- data/app/mailers/concerns/decidim/proposals/admin/notification_answer_proposal_mailer.rb +25 -0
- data/app/mailers/concerns/decidim/proposals/admin/proposals_valuator_mailer.rb +30 -0
- data/app/mailers/concerns/decidim/proposals/notification_publish_proposal_mailer.rb +23 -0
- data/app/mailers/concerns/decidim/reported_mailer_override.rb +16 -0
- data/app/models/concerns/decidim/reporting_proposals/participatory_space_role_config/valuator_override.rb +4 -1
- data/app/overrides/decidim/proposals/admin/proposal_answers/_form/add_template_chooser.html.erb.deface +5 -0
- data/app/overrides/decidim/proposals/admin/proposals/show/add_address.html.erb.deface +3 -0
- data/app/overrides/decidim/proposals/admin/proposals/show/add_valuators_form.html.erb.deface +19 -0
- data/app/overrides/decidim/reported_mailer/report/add_link_to_admin.html.erb.deface +5 -0
- data/app/packs/entrypoints/decidim_templates_admin.js +1 -0
- data/app/packs/src/decidim/reporting_proposals/user_camera_inputs.js +37 -39
- data/app/packs/src/decidim/templates/admin/proposal_answer_template_chooser.js +27 -0
- data/app/packs/stylesheets/decidim/reporting_proposals/manage_component_admin.scss +31 -0
- data/app/presenters/concerns/decidim/resource_locator_presenter_override.rb +38 -0
- data/app/resources/concerns/decidim/resource_manifest_override.rb +14 -0
- data/app/views/decidim/admin/hidden_resource_mailer/notify_mail.html.erb +12 -0
- data/app/views/decidim/proposals/admin/notification_answer_proposal_mailer/notify_proposal_author.html.erb +7 -0
- data/app/views/decidim/proposals/admin/proposals/_address.html.erb +13 -0
- data/app/views/decidim/proposals/admin/proposals_valuator_mailer/notify_proposals_valuator.html.erb +17 -0
- data/app/views/decidim/proposals/notification_publish_proposal_mailer/notify_proposal_author.html.erb +7 -0
- data/app/views/decidim/proposals/proposals/index.js.erb +19 -0
- data/app/views/decidim/templates/admin/proposal_answer_templates/_form.html.erb +34 -0
- data/app/views/decidim/templates/admin/proposal_answer_templates/_template_chooser.html.erb +16 -0
- data/app/views/decidim/templates/admin/proposal_answer_templates/edit.html.erb +3 -0
- data/app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb +52 -0
- data/app/views/decidim/templates/admin/proposal_answer_templates/new.html.erb +6 -0
- data/config/assets.rb +2 -1
- data/config/i18n-tasks.yml +3 -0
- data/config/locales/ca.yml +81 -7
- data/config/locales/de.yml +77 -3
- data/config/locales/en.yml +87 -0
- data/config/locales/es.yml +328 -254
- data/db/migrate/20230404103706_add_target_and_field_values_to_decidim_templates_templates.rb +12 -0
- data/db/migrate/20230404104741_migrate_templatable.rb +13 -0
- data/decidim-reporting_proposals.gemspec +5 -0
- data/lib/decidim/reporting_proposals/admin_engine.rb +16 -1
- data/lib/decidim/reporting_proposals/component.rb +1 -1
- data/lib/decidim/reporting_proposals/config.rb +10 -5
- data/lib/decidim/reporting_proposals/engine.rb +38 -1
- data/lib/decidim/reporting_proposals/test/factories.rb +10 -0
- data/lib/decidim/reporting_proposals/version.rb +2 -7
- metadata +152 -2
@@ -0,0 +1,12 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class AddTargetAndFieldValuesToDecidimTemplatesTemplates < ActiveRecord::Migration[6.0]
|
4
|
+
def change
|
5
|
+
unless ActiveRecord::Base.connection.column_exists?(:decidim_templates_templates, :field_values)
|
6
|
+
add_column :decidim_templates_templates, :field_values, :json, default: {}
|
7
|
+
end
|
8
|
+
unless ActiveRecord::Base.connection.column_exists?(:decidim_templates_templates, :target)
|
9
|
+
add_column :decidim_templates_templates, :target, :string
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class MigrateTemplatable < ActiveRecord::Migration[6.0]
|
4
|
+
def self.up
|
5
|
+
Decidim::Templates::Template.find_each do |template|
|
6
|
+
next if template.target.present?
|
7
|
+
|
8
|
+
template.update(target: template.templatable_type.demodulize.tableize.singularize)
|
9
|
+
end
|
10
|
+
end
|
11
|
+
|
12
|
+
def self.down; end
|
13
|
+
end
|
@@ -27,8 +27,13 @@ Gem::Specification.new do |spec|
|
|
27
27
|
spec.add_dependency "decidim-core", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
|
28
28
|
spec.add_dependency "decidim-participatory_processes", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
|
29
29
|
spec.add_dependency "decidim-proposals", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
|
30
|
+
spec.add_dependency "decidim-templates", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
|
30
31
|
spec.add_dependency "deface", ">= 1.9"
|
31
32
|
|
33
|
+
spec.add_development_dependency "decidim-accountability", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
|
34
|
+
spec.add_development_dependency "decidim-budgets", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
|
32
35
|
spec.add_development_dependency "decidim-dev", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
|
36
|
+
spec.add_development_dependency "decidim-elections", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
|
37
|
+
spec.add_development_dependency "decidim-meetings", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
|
33
38
|
spec.add_development_dependency "decidim-templates", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
|
34
39
|
end
|
@@ -14,7 +14,22 @@ module Decidim
|
|
14
14
|
put :hide_proposal, to: "proposals#hide_proposal"
|
15
15
|
post :add_photos, to: "proposals#add_photos"
|
16
16
|
delete :remove_photo, to: "proposals#remove_photo"
|
17
|
-
resources :proposal_notes, only:
|
17
|
+
resources :proposal_notes, only: :update
|
18
|
+
end
|
19
|
+
|
20
|
+
initializer "decidim_reporting_proposals.template_routes" do
|
21
|
+
if defined? Decidim::Templates::AdminEngine
|
22
|
+
Decidim::Templates::AdminEngine.routes do
|
23
|
+
resources :proposal_answer_templates do
|
24
|
+
member do
|
25
|
+
post :copy
|
26
|
+
end
|
27
|
+
collection do
|
28
|
+
get :fetch
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
18
33
|
end
|
19
34
|
|
20
35
|
initializer "decidim_reporting_proposals.admin_mount_routes" do
|
@@ -96,7 +96,7 @@ Decidim.register_component(:reporting_proposals) do |component|
|
|
96
96
|
settings.attribute :suggested_hashtags, type: :text, editor: false, required: false
|
97
97
|
end
|
98
98
|
|
99
|
-
component.register_resource(:
|
99
|
+
component.register_resource(:reporting_proposal) do |resource|
|
100
100
|
resource.model_class_name = "Decidim::Proposals::Proposal"
|
101
101
|
resource.template = "decidim/proposals/proposals/linked_proposals"
|
102
102
|
resource.card = "decidim/proposals/proposal"
|
@@ -34,11 +34,6 @@ module Decidim
|
|
34
34
|
[:proposals, :reporting_proposals]
|
35
35
|
end
|
36
36
|
|
37
|
-
# Public Setting to prevent adding the camera button on not photo/image input[type=file]
|
38
|
-
config_accessor :camera_button_on_attachments do
|
39
|
-
false
|
40
|
-
end
|
41
|
-
|
42
37
|
# Public setting to prevent valuators or admins to modify the photos attached to a proposal
|
43
38
|
# otherwise can be configured at the component level
|
44
39
|
config_accessor :allow_proposal_photo_editing do
|
@@ -49,5 +44,15 @@ module Decidim
|
|
49
44
|
config_accessor :valuators_assign_other_valuators do
|
50
45
|
true
|
51
46
|
end
|
47
|
+
|
48
|
+
# Public setting to to get an e-mail notification when there is a new answer to a proposal
|
49
|
+
config_accessor :notify_authors_on_answering do
|
50
|
+
[:proposals, :reporting_proposals]
|
51
|
+
end
|
52
|
+
|
53
|
+
# Public setting to to get an e-mail notification when the proposal is published
|
54
|
+
config_accessor :notify_authors_on_publish do
|
55
|
+
[:proposals, :reporting_proposals]
|
56
|
+
end
|
52
57
|
end
|
53
58
|
end
|
@@ -17,15 +17,47 @@ module Decidim
|
|
17
17
|
ComponentValidator.include(Decidim::ReportingProposals::ComponentValidatorOverride)
|
18
18
|
Decidim::Category.include(Decidim::ReportingProposals::CategoryOverride)
|
19
19
|
Decidim::FormBuilder.include(Decidim::ReportingProposals::FormBuilderOverride)
|
20
|
+
Decidim::ResourceHelper.include(Decidim::ReportingProposals::ResourceHelperOverride)
|
20
21
|
Decidim::Map::Autocomplete::Builder.include(Decidim::ReportingProposals::MapBuilderOverride)
|
21
22
|
Decidim::CreateReport.include(Decidim::ReportingProposals::CreateReportOverride)
|
22
23
|
Decidim::Proposals::ProposalSerializer.include(Decidim::ReportingProposals::ProposalSerializerOverride)
|
24
|
+
Decidim::Proposals::ProposalsPickerCell.include(Decidim::ReportingProposals::ProposalsPickerCellOverride)
|
25
|
+
Decidim::Proposals::PublishProposal.include(Decidim::Proposals::PublishProposalOverride)
|
26
|
+
Decidim::Proposals::Admin::AnswerProposal.include(Decidim::Proposals::Admin::AnswerProposalOverride)
|
27
|
+
Decidim::Accountability::Admin::ResultForm.include(Decidim::ReportingProposals::MapIncludedProposalsForFormOverride)
|
28
|
+
Decidim::Accountability::Admin::CreateResult.include(Decidim::ReportingProposals::Admin::CreateResultOverride)
|
29
|
+
Decidim::Accountability::Admin::UpdateResult.include(Decidim::ReportingProposals::Admin::UpdateResultOverride)
|
30
|
+
Decidim::Accountability::Admin::UpdateImportedResult.include(Decidim::ReportingProposals::Admin::UpdateResultOverride)
|
31
|
+
Decidim::Meetings::CloseMeetingForm.include(Decidim::ReportingProposals::CloseMeetingFormOverride)
|
32
|
+
Decidim::Meetings::Admin::CloseMeetingForm.include(Decidim::ReportingProposals::CloseMeetingFormOverride)
|
33
|
+
Decidim::Meetings::Admin::CloseMeeting.include(Decidim::ReportingProposals::CloseMeetingOverride)
|
34
|
+
Decidim::Meetings::CloseMeeting.include(Decidim::ReportingProposals::CloseMeetingOverride)
|
35
|
+
Decidim::Budgets::Admin::ProjectForm.include(Decidim::ReportingProposals::MapIncludedProposalsForFormOverride)
|
36
|
+
Decidim::Budgets::Admin::CreateProject.include(Decidim::ReportingProposals::CreateProjectOverride)
|
37
|
+
Decidim::Budgets::Admin::UpdateProject.include(Decidim::ReportingProposals::CreateProjectOverride)
|
38
|
+
if defined?(Decidim::Elections::Admin::AnswerForm)
|
39
|
+
Decidim::Elections::Admin::AnswerForm.include(Decidim::ReportingProposals::MapRelatedProposalsForFormOverride)
|
40
|
+
Decidim::Elections::Admin::CreateAnswer.include(Decidim::ReportingProposals::Admin::CreateAnswerOverride)
|
41
|
+
Decidim::Elections::Admin::UpdateAnswer.include(Decidim::ReportingProposals::Admin::CreateAnswerOverride)
|
42
|
+
end
|
23
43
|
Decidim::Admin::CategoryForm.include(Decidim::ReportingProposals::Admin::CategoryFormOverride)
|
24
44
|
Decidim::Admin::CreateCategory.include(Decidim::ReportingProposals::Admin::CreateCategoryOverride)
|
25
45
|
Decidim::Admin::UpdateCategory.include(Decidim::ReportingProposals::Admin::UpdateCategoryOverride)
|
26
46
|
Decidim::Proposals::Admin::Permissions.include(Decidim::ReportingProposals::Admin::PermissionsOverride)
|
27
47
|
Decidim::ParticipatorySpaceRoleConfig::Valuator.include(Decidim::ReportingProposals::ParticipatorySpaceRoleConfig::ValuatorOverride)
|
28
48
|
|
49
|
+
# port of https://github.com/openpoke/decidim/pull/31,23,29,24,43
|
50
|
+
Decidim::ReportedMailer.include(Decidim::ReportedMailerOverride)
|
51
|
+
Decidim::ResourceLocatorPresenter.include(Decidim::ResourceLocatorPresenterOverride)
|
52
|
+
Decidim::ResourceManifest.include(Decidim::ResourceManifestOverride)
|
53
|
+
Decidim::Proposals::PublishProposal.include(Decidim::Proposals::PublishProposalOverride)
|
54
|
+
Decidim.find_resource_manifest(:proposal).admin_route_name = "proposal"
|
55
|
+
Decidim::Proposals::PublishProposalEvent.include(Decidim::Proposals::PublishProposalEventOverride)
|
56
|
+
Decidim::Proposals::Admin::AssignProposalsToValuator.include(Decidim::Proposals::Admin::AssignProposalsToValuatorOverride)
|
57
|
+
Decidim::Admin::HideResource.include(Decidim::Admin::HideResourceOverride)
|
58
|
+
Decidim::Templates::Admin::CopyQuestionnaireTemplate.include(Decidim::Templates::Admin::CopyQuestionnaireTemplateOverride)
|
59
|
+
Decidim::Templates::Admin::CreateQuestionnaireTemplate.include(Decidim::Templates::Admin::CreateQuestionnaireTemplateOverride)
|
60
|
+
|
29
61
|
# Search user roles for different participatory spaces and apply override to all of them
|
30
62
|
# We'll make sure this does not break rails in situations where database is not installed (ie, creating the test or development apps)
|
31
63
|
begin
|
@@ -41,13 +73,18 @@ module Decidim
|
|
41
73
|
initializer "decidim_reporting_proposals.overrides", after: "decidim.action_controller" do
|
42
74
|
config.to_prepare do
|
43
75
|
Decidim::Admin::ComponentsController.include(Decidim::ReportingProposals::Admin::NeedsHeaderSnippets)
|
76
|
+
Decidim::Admin::CategoriesController.include(Decidim::ReportingProposals::Admin::CategoriesControllerOverride)
|
44
77
|
Decidim::Proposals::ProposalsController.include(Decidim::ReportingProposals::ProposalsControllerOverride)
|
45
78
|
Decidim::Proposals::ProposalWizardHelper.include(Decidim::ReportingProposals::ProposalWizardHelperOverride)
|
46
79
|
Decidim::Proposals::Admin::ProposalsController.include(Decidim::ReportingProposals::Admin::NeedsHeaderSnippets)
|
47
80
|
Decidim::Proposals::Admin::ProposalsController.include(Decidim::ReportingProposals::Admin::ProposalsControllerOverride)
|
48
81
|
Decidim::Proposals::Admin::ProposalAnswersController.include(Decidim::ReportingProposals::Admin::ProposalAnswersControllerOverride)
|
49
82
|
Decidim::Proposals::Admin::ProposalsHelper.include(Decidim::ReportingProposals::Admin::ProposalsHelperOverride)
|
50
|
-
Decidim::Admin::
|
83
|
+
Decidim::Templates::Admin::ApplicationController.include(Decidim::Templates::Admin::ApplicationControllerOverride)
|
84
|
+
|
85
|
+
# port of https://github.com/openpoke/decidim/pull/24
|
86
|
+
Decidim::Proposals::Admin::ValuationAssignmentsController.include(Decidim::Proposals::Admin::ValuationAssignmentsControllerOverride)
|
87
|
+
|
51
88
|
begin
|
52
89
|
Decidim::Templates::Admin::ProposalAnswerTemplatesController.include(Decidim::ReportingProposals::Admin::ProposalAnswerTemplatesControllerOverride)
|
53
90
|
rescue StandardError => e
|
@@ -11,3 +11,13 @@ FactoryBot.define do
|
|
11
11
|
valuator_role { create :participatory_process_user_role, role: "valuator" }
|
12
12
|
end
|
13
13
|
end
|
14
|
+
|
15
|
+
FactoryBot.modify do
|
16
|
+
factory :template, class: "Decidim::Templates::Template" do
|
17
|
+
trait :proposal_answer do
|
18
|
+
templatable { organization }
|
19
|
+
target { :proposal_answer }
|
20
|
+
field_values { { internal_state: :accepted } }
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -2,13 +2,8 @@
|
|
2
2
|
|
3
3
|
module Decidim
|
4
4
|
module ReportingProposals
|
5
|
-
VERSION = "0.2
|
6
|
-
|
7
|
-
# Provisional until
|
8
|
-
# https://github.com/openpoke/decidim/pull/23
|
9
|
-
# https://github.com/openpoke/decidim/pull/37
|
10
|
-
# are merged on upstream
|
11
|
-
DECIDIM_VERSION = { github: "openpoke/decidim", branch: "0.26-lucerne" }.freeze
|
5
|
+
VERSION = "0.4.2"
|
6
|
+
DECIDIM_VERSION = "0.26.5"
|
12
7
|
|
13
8
|
COMPAT_DECIDIM_VERSION = [">= 0.25.0", "< 0.27"].freeze
|
14
9
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-reporting_proposals
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2
|
4
|
+
version: 0.4.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ivan Vergés
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-07-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: decidim-admin
|
@@ -90,6 +90,26 @@ dependencies:
|
|
90
90
|
- - "<"
|
91
91
|
- !ruby/object:Gem::Version
|
92
92
|
version: '0.27'
|
93
|
+
- !ruby/object:Gem::Dependency
|
94
|
+
name: decidim-templates
|
95
|
+
requirement: !ruby/object:Gem::Requirement
|
96
|
+
requirements:
|
97
|
+
- - ">="
|
98
|
+
- !ruby/object:Gem::Version
|
99
|
+
version: 0.25.0
|
100
|
+
- - "<"
|
101
|
+
- !ruby/object:Gem::Version
|
102
|
+
version: '0.27'
|
103
|
+
type: :runtime
|
104
|
+
prerelease: false
|
105
|
+
version_requirements: !ruby/object:Gem::Requirement
|
106
|
+
requirements:
|
107
|
+
- - ">="
|
108
|
+
- !ruby/object:Gem::Version
|
109
|
+
version: 0.25.0
|
110
|
+
- - "<"
|
111
|
+
- !ruby/object:Gem::Version
|
112
|
+
version: '0.27'
|
93
113
|
- !ruby/object:Gem::Dependency
|
94
114
|
name: deface
|
95
115
|
requirement: !ruby/object:Gem::Requirement
|
@@ -104,6 +124,46 @@ dependencies:
|
|
104
124
|
- - ">="
|
105
125
|
- !ruby/object:Gem::Version
|
106
126
|
version: '1.9'
|
127
|
+
- !ruby/object:Gem::Dependency
|
128
|
+
name: decidim-accountability
|
129
|
+
requirement: !ruby/object:Gem::Requirement
|
130
|
+
requirements:
|
131
|
+
- - ">="
|
132
|
+
- !ruby/object:Gem::Version
|
133
|
+
version: 0.25.0
|
134
|
+
- - "<"
|
135
|
+
- !ruby/object:Gem::Version
|
136
|
+
version: '0.27'
|
137
|
+
type: :development
|
138
|
+
prerelease: false
|
139
|
+
version_requirements: !ruby/object:Gem::Requirement
|
140
|
+
requirements:
|
141
|
+
- - ">="
|
142
|
+
- !ruby/object:Gem::Version
|
143
|
+
version: 0.25.0
|
144
|
+
- - "<"
|
145
|
+
- !ruby/object:Gem::Version
|
146
|
+
version: '0.27'
|
147
|
+
- !ruby/object:Gem::Dependency
|
148
|
+
name: decidim-budgets
|
149
|
+
requirement: !ruby/object:Gem::Requirement
|
150
|
+
requirements:
|
151
|
+
- - ">="
|
152
|
+
- !ruby/object:Gem::Version
|
153
|
+
version: 0.25.0
|
154
|
+
- - "<"
|
155
|
+
- !ruby/object:Gem::Version
|
156
|
+
version: '0.27'
|
157
|
+
type: :development
|
158
|
+
prerelease: false
|
159
|
+
version_requirements: !ruby/object:Gem::Requirement
|
160
|
+
requirements:
|
161
|
+
- - ">="
|
162
|
+
- !ruby/object:Gem::Version
|
163
|
+
version: 0.25.0
|
164
|
+
- - "<"
|
165
|
+
- !ruby/object:Gem::Version
|
166
|
+
version: '0.27'
|
107
167
|
- !ruby/object:Gem::Dependency
|
108
168
|
name: decidim-dev
|
109
169
|
requirement: !ruby/object:Gem::Requirement
|
@@ -124,6 +184,46 @@ dependencies:
|
|
124
184
|
- - "<"
|
125
185
|
- !ruby/object:Gem::Version
|
126
186
|
version: '0.27'
|
187
|
+
- !ruby/object:Gem::Dependency
|
188
|
+
name: decidim-elections
|
189
|
+
requirement: !ruby/object:Gem::Requirement
|
190
|
+
requirements:
|
191
|
+
- - ">="
|
192
|
+
- !ruby/object:Gem::Version
|
193
|
+
version: 0.25.0
|
194
|
+
- - "<"
|
195
|
+
- !ruby/object:Gem::Version
|
196
|
+
version: '0.27'
|
197
|
+
type: :development
|
198
|
+
prerelease: false
|
199
|
+
version_requirements: !ruby/object:Gem::Requirement
|
200
|
+
requirements:
|
201
|
+
- - ">="
|
202
|
+
- !ruby/object:Gem::Version
|
203
|
+
version: 0.25.0
|
204
|
+
- - "<"
|
205
|
+
- !ruby/object:Gem::Version
|
206
|
+
version: '0.27'
|
207
|
+
- !ruby/object:Gem::Dependency
|
208
|
+
name: decidim-meetings
|
209
|
+
requirement: !ruby/object:Gem::Requirement
|
210
|
+
requirements:
|
211
|
+
- - ">="
|
212
|
+
- !ruby/object:Gem::Version
|
213
|
+
version: 0.25.0
|
214
|
+
- - "<"
|
215
|
+
- !ruby/object:Gem::Version
|
216
|
+
version: '0.27'
|
217
|
+
type: :development
|
218
|
+
prerelease: false
|
219
|
+
version_requirements: !ruby/object:Gem::Requirement
|
220
|
+
requirements:
|
221
|
+
- - ">="
|
222
|
+
- !ruby/object:Gem::Version
|
223
|
+
version: 0.25.0
|
224
|
+
- - "<"
|
225
|
+
- !ruby/object:Gem::Version
|
226
|
+
version: '0.27'
|
127
227
|
- !ruby/object:Gem::Dependency
|
128
228
|
name: decidim-templates
|
129
229
|
requirement: !ruby/object:Gem::Requirement
|
@@ -173,14 +273,30 @@ files:
|
|
173
273
|
- LICENSE-AGPLv3.txt
|
174
274
|
- README.md
|
175
275
|
- Rakefile
|
276
|
+
- app/cells/concerns/decidim/reporting_proposals/proposals_picker_cell_override.rb
|
176
277
|
- app/cells/decidim/reporting_proposals/edit_note_modal/show.erb
|
177
278
|
- app/cells/decidim/reporting_proposals/edit_note_modal_cell.rb
|
279
|
+
- app/commands/concerns/decidim/admin/hide_resource_override.rb
|
280
|
+
- app/commands/concerns/decidim/proposals/admin/answer_proposal_override.rb
|
281
|
+
- app/commands/concerns/decidim/proposals/admin/assign_proposals_to_valuator_override.rb
|
282
|
+
- app/commands/concerns/decidim/proposals/publish_proposal_override.rb
|
283
|
+
- app/commands/concerns/decidim/reporting_proposals/admin/create_answer_override.rb
|
178
284
|
- app/commands/concerns/decidim/reporting_proposals/admin/create_category_override.rb
|
285
|
+
- app/commands/concerns/decidim/reporting_proposals/admin/create_result_override.rb
|
179
286
|
- app/commands/concerns/decidim/reporting_proposals/admin/update_category_override.rb
|
287
|
+
- app/commands/concerns/decidim/reporting_proposals/admin/update_result_override.rb
|
288
|
+
- app/commands/concerns/decidim/reporting_proposals/close_meeting_override.rb
|
289
|
+
- app/commands/concerns/decidim/reporting_proposals/create_project_override.rb
|
180
290
|
- app/commands/concerns/decidim/reporting_proposals/create_report_override.rb
|
291
|
+
- app/commands/concerns/decidim/templates/admin/copy_questionnaire_template_override.rb
|
292
|
+
- app/commands/concerns/decidim/templates/admin/create_questionnaire_template_override.rb
|
181
293
|
- app/commands/decidim/reporting_proposals/admin/update_proposal.rb
|
182
294
|
- app/commands/decidim/reporting_proposals/admin/update_proposal_note.rb
|
183
295
|
- app/commands/decidim/reporting_proposals/create_reporting_proposal.rb
|
296
|
+
- app/commands/decidim/templates/admin/copy_proposal_answer_template.rb
|
297
|
+
- app/commands/decidim/templates/admin/create_proposal_answer_template.rb
|
298
|
+
- app/commands/decidim/templates/admin/update_proposal_answer_template.rb
|
299
|
+
- app/controllers/concerns/decidim/proposals/admin/valuation_assignments_controller_override.rb
|
184
300
|
- app/controllers/concerns/decidim/reporting_proposals/admin/categories_controller_override.rb
|
185
301
|
- app/controllers/concerns/decidim/reporting_proposals/admin/needs_header_snippets.rb
|
186
302
|
- app/controllers/concerns/decidim/reporting_proposals/admin/proposal_answer_templates_controller_override.rb
|
@@ -188,19 +304,32 @@ files:
|
|
188
304
|
- app/controllers/concerns/decidim/reporting_proposals/admin/proposals_controller_override.rb
|
189
305
|
- app/controllers/concerns/decidim/reporting_proposals/needs_proposal_extra_validations_snippets.rb
|
190
306
|
- app/controllers/concerns/decidim/reporting_proposals/proposals_controller_override.rb
|
307
|
+
- app/controllers/concerns/decidim/templates/admin/application_controller_override.rb
|
191
308
|
- app/controllers/decidim/reporting_proposals/admin/application_controller.rb
|
192
309
|
- app/controllers/decidim/reporting_proposals/admin/proposal_notes_controller.rb
|
193
310
|
- app/controllers/decidim/reporting_proposals/admin/proposals_controller.rb
|
194
311
|
- app/controllers/decidim/reporting_proposals/application_controller.rb
|
195
312
|
- app/controllers/decidim/reporting_proposals/geolocation_controller.rb
|
313
|
+
- app/controllers/decidim/templates/admin/proposal_answer_templates_controller.rb
|
314
|
+
- app/events/concerns/decidim/proposals/publish_proposal_event_override.rb
|
196
315
|
- app/forms/concerns/decidim/reporting_proposals/admin/category_form_override.rb
|
316
|
+
- app/forms/concerns/decidim/reporting_proposals/close_meeting_form_override.rb
|
197
317
|
- app/forms/concerns/decidim/reporting_proposals/form_builder_override.rb
|
198
318
|
- app/forms/concerns/decidim/reporting_proposals/map_builder_override.rb
|
319
|
+
- app/forms/concerns/decidim/reporting_proposals/map_included_proposals_for_form_override.rb
|
320
|
+
- app/forms/concerns/decidim/reporting_proposals/map_related_proposals_for_form_override.rb
|
199
321
|
- app/forms/decidim/reporting_proposals/admin/proposal_photo_form.rb
|
200
322
|
- app/forms/decidim/reporting_proposals/proposal_form.rb
|
323
|
+
- app/forms/decidim/templates/admin/proposal_answer_template_form.rb
|
201
324
|
- app/helpers/concerns/decidim/reporting_proposals/admin/proposals_helper_override.rb
|
202
325
|
- app/helpers/concerns/decidim/reporting_proposals/proposal_wizard_helper_override.rb
|
326
|
+
- app/helpers/concerns/decidim/reporting_proposals/resource_helper_override.rb
|
203
327
|
- app/jobs/decidim/reporting_proposals/assign_proposal_valuators_job.rb
|
328
|
+
- app/mailers/concerns/decidim/admin/hidden_resource_mailer.rb
|
329
|
+
- app/mailers/concerns/decidim/proposals/admin/notification_answer_proposal_mailer.rb
|
330
|
+
- app/mailers/concerns/decidim/proposals/admin/proposals_valuator_mailer.rb
|
331
|
+
- app/mailers/concerns/decidim/proposals/notification_publish_proposal_mailer.rb
|
332
|
+
- app/mailers/concerns/decidim/reported_mailer_override.rb
|
204
333
|
- app/models/concerns/decidim/reporting_proposals/category_override.rb
|
205
334
|
- app/models/concerns/decidim/reporting_proposals/participatory_space_role_config/valuator_override.rb
|
206
335
|
- app/models/concerns/decidim/reporting_proposals/participatory_space_user_role_override.rb
|
@@ -208,13 +337,16 @@ files:
|
|
208
337
|
- app/overrides/decidim/admin/categories/_form/add_valuators_field.html.erb.deface
|
209
338
|
- app/overrides/decidim/admin/categories/index/add_table_column_name.html.erb.deface
|
210
339
|
- app/overrides/decidim/admin/categories/index/add_valuators.html.erb.deface
|
340
|
+
- app/overrides/decidim/proposals/admin/proposal_answers/_form/add_template_chooser.html.erb.deface
|
211
341
|
- app/overrides/decidim/proposals/admin/proposal_notes/_proposal_notes/add_edit_link.html.erb.deface
|
212
342
|
- app/overrides/decidim/proposals/admin/proposal_notes/_proposal_notes/add_links_to_note.html.erb.deface
|
213
343
|
- app/overrides/decidim/proposals/admin/proposals/_proposal-tr/add_td_hide_action.html.erb.deface
|
214
344
|
- app/overrides/decidim/proposals/admin/proposals/_proposal-tr/add_valuators_name.html.erb.deface
|
215
345
|
- app/overrides/decidim/proposals/admin/proposals/_proposal-tr/replace_td_title.html.erb.deface
|
346
|
+
- app/overrides/decidim/proposals/admin/proposals/show/add_address.html.erb.deface
|
216
347
|
- app/overrides/decidim/proposals/admin/proposals/show/add_photo_management.html.erb.deface
|
217
348
|
- app/overrides/decidim/proposals/admin/proposals/show/add_send_email_btn.html.erb.deface
|
349
|
+
- app/overrides/decidim/proposals/admin/proposals/show/add_valuators_form.html.erb.deface
|
218
350
|
- app/overrides/decidim/proposals/admin/proposals/show/remove_photos.html.erb.deface
|
219
351
|
- app/overrides/decidim/proposals/admin/proposals/show/replace_valuators.html.erb.deface
|
220
352
|
- app/overrides/decidim/proposals/proposals/_proposal_similar/add_distance_badge.html.erb.deface
|
@@ -230,6 +362,7 @@ files:
|
|
230
362
|
- app/overrides/decidim/proposals/proposals/new/replace_body.html.erb.deface
|
231
363
|
- app/overrides/decidim/proposals/proposals/new/replace_javascript.html.erb.deface
|
232
364
|
- app/overrides/decidim/proposals/proposals/show/add_additional_button.html.erb.deface
|
365
|
+
- app/overrides/decidim/reported_mailer/report/add_link_to_admin.html.erb.deface
|
233
366
|
- app/overrides/layouts/decidim/_process_header_steps/always_show_new_proposals.html.erb.deface
|
234
367
|
- app/packs/entrypoints/decidim_reporting_proposals.js
|
235
368
|
- app/packs/entrypoints/decidim_reporting_proposals_camera.js
|
@@ -237,11 +370,13 @@ files:
|
|
237
370
|
- app/packs/entrypoints/decidim_reporting_proposals_js_validations.js
|
238
371
|
- app/packs/entrypoints/decidim_reporting_proposals_list_component_admin.js
|
239
372
|
- app/packs/entrypoints/decidim_reporting_proposals_manage_component_admin.js
|
373
|
+
- app/packs/entrypoints/decidim_templates_admin.js
|
240
374
|
- app/packs/images/.keep
|
241
375
|
- app/packs/src/decidim/reporting_proposals/proposal_extra_validations.js
|
242
376
|
- app/packs/src/decidim/reporting_proposals/proposals/add_proposal.js
|
243
377
|
- app/packs/src/decidim/reporting_proposals/reverse_geocoding.js
|
244
378
|
- app/packs/src/decidim/reporting_proposals/user_camera_inputs.js
|
379
|
+
- app/packs/src/decidim/templates/admin/proposal_answer_template_chooser.js
|
245
380
|
- app/packs/stylesheets/decidim/reporting_proposals/geocoding_addons.scss
|
246
381
|
- app/packs/stylesheets/decidim/reporting_proposals/list_component_admin.scss
|
247
382
|
- app/packs/stylesheets/decidim/reporting_proposals/manage_component_admin.scss
|
@@ -250,13 +385,21 @@ files:
|
|
250
385
|
- app/permissions/concerns/decidim/reporting_proposals/admin/permissions_override.rb
|
251
386
|
- app/permissions/decidim/reporting_proposals/admin/permissions.rb
|
252
387
|
- app/permissions/decidim/reporting_proposals/permissions.rb
|
388
|
+
- app/presenters/concerns/decidim/resource_locator_presenter_override.rb
|
253
389
|
- app/queries/decidim/reporting_proposals/nearby_proposals.rb
|
390
|
+
- app/resources/concerns/decidim/resource_manifest_override.rb
|
254
391
|
- app/serializers/decidim/reporting_proposals/proposal_serializer_override.rb
|
255
392
|
- app/validators/concerns/decidim/reporting_proposals/component_validator_override.rb
|
393
|
+
- app/views/decidim/admin/hidden_resource_mailer/notify_mail.html.erb
|
394
|
+
- app/views/decidim/proposals/admin/notification_answer_proposal_mailer/notify_proposal_author.html.erb
|
256
395
|
- app/views/decidim/proposals/admin/proposal_notes/_editing_note.html.erb
|
257
396
|
- app/views/decidim/proposals/admin/proposal_notes/_proposal_notes_body.html.erb
|
397
|
+
- app/views/decidim/proposals/admin/proposals/_address.html.erb
|
258
398
|
- app/views/decidim/proposals/admin/proposals/_send_email_button.html.erb
|
399
|
+
- app/views/decidim/proposals/admin/proposals_valuator_mailer/notify_proposals_valuator.html.erb
|
400
|
+
- app/views/decidim/proposals/notification_publish_proposal_mailer/notify_proposal_author.html.erb
|
259
401
|
- app/views/decidim/proposals/proposals/_additional_button.html.erb
|
402
|
+
- app/views/decidim/proposals/proposals/index.js.erb
|
260
403
|
- app/views/decidim/reporting_proposals/admin/categories/_column_valuators.html.erb
|
261
404
|
- app/views/decidim/reporting_proposals/admin/categories/_valuators.html.erb
|
262
405
|
- app/views/decidim/reporting_proposals/admin/categories/_valuators_field.html.erb
|
@@ -269,6 +412,11 @@ files:
|
|
269
412
|
- app/views/decidim/reporting_proposals/proposals/_new_proposal_fields.html.erb
|
270
413
|
- app/views/decidim/reporting_proposals/proposals/_reporting_proposal_fields.html.erb
|
271
414
|
- app/views/decidim/reporting_proposals/proposals/_user_group.html.erb
|
415
|
+
- app/views/decidim/templates/admin/proposal_answer_templates/_form.html.erb
|
416
|
+
- app/views/decidim/templates/admin/proposal_answer_templates/_template_chooser.html.erb
|
417
|
+
- app/views/decidim/templates/admin/proposal_answer_templates/edit.html.erb
|
418
|
+
- app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb
|
419
|
+
- app/views/decidim/templates/admin/proposal_answer_templates/new.html.erb
|
272
420
|
- bin/rails
|
273
421
|
- bin/webpack-dev-server
|
274
422
|
- codecov.yml
|
@@ -280,6 +428,8 @@ files:
|
|
280
428
|
- config/locales/es.yml
|
281
429
|
- crowdin.yml
|
282
430
|
- db/migrate/20221219151846_create_decidim_categories_valuators.rb
|
431
|
+
- db/migrate/20230404103706_add_target_and_field_values_to_decidim_templates_templates.rb
|
432
|
+
- db/migrate/20230404104741_migrate_templatable.rb
|
283
433
|
- decidim-reporting_proposals.gemspec
|
284
434
|
- lib/decidim/api/reporting_proposals_type.rb
|
285
435
|
- lib/decidim/reporting_proposals.rb
|