decidim 0.0.2 → 0.0.3
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of decidim might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.travis.yml +12 -0
- data/Dockerfile +2 -0
- data/Gemfile.lock +80 -54
- data/README.md +15 -2
- data/decidim-admin/app/assets/javascripts/decidim/admin/application.js.es6 +3 -2
- data/decidim-admin/app/assets/javascripts/decidim/admin/tab_focus.js.es6 +1 -1
- data/decidim-admin/app/assets/stylesheets/decidim/admin/_foundation_and_overrides.scss +1 -1
- data/decidim-admin/app/commands/decidim/admin/{create_participatory_process_attachment.rb → create_attachment.rb} +6 -7
- data/decidim-admin/app/commands/decidim/admin/create_participatory_process.rb +12 -3
- data/decidim-admin/app/commands/decidim/admin/{update_participatory_process_attachment.rb → update_attachment.rb} +7 -6
- data/decidim-admin/app/commands/decidim/admin/update_feature.rb +2 -1
- data/decidim-admin/app/commands/decidim/admin/update_organization.rb +1 -0
- data/decidim-admin/app/commands/decidim/admin/update_participatory_process.rb +16 -4
- data/decidim-admin/app/constraints/decidim/admin/organization_dashboard_constraint.rb +1 -1
- data/decidim-admin/app/controllers/decidim/admin/application_controller.rb +2 -2
- data/decidim-admin/app/controllers/decidim/admin/concerns/has_attachments.rb +116 -0
- data/decidim-admin/app/controllers/decidim/admin/participatory_process_attachments_controller.rb +5 -67
- data/decidim-admin/app/controllers/decidim/admin/users_controller.rb +5 -5
- data/decidim-admin/app/forms/decidim/admin/{participatory_process_attachment_form.rb → attachment_form.rb} +2 -2
- data/decidim-admin/app/forms/decidim/admin/feature_form.rb +1 -0
- data/decidim-admin/app/forms/decidim/admin/organization_form.rb +1 -0
- data/decidim-admin/app/forms/decidim/admin/participatory_process_form.rb +8 -1
- data/decidim-admin/app/helpers/decidim/admin/application_helper.rb +1 -0
- data/decidim-admin/app/helpers/decidim/admin/feature_settings_helper.rb +29 -0
- data/decidim-admin/app/models/decidim/admin/abilities/admin_user.rb +4 -4
- data/decidim-admin/app/models/decidim/admin/abilities/base.rb +3 -3
- data/decidim-admin/app/models/decidim/admin/abilities/participatory_process_admin.rb +15 -7
- data/decidim-admin/app/views/decidim/admin/{participatory_process_attachments → attachments}/_form.html.erb +0 -0
- data/decidim-admin/app/views/decidim/admin/attachments/edit.html.erb +9 -0
- data/decidim-admin/app/views/decidim/admin/attachments/index.html.erb +37 -0
- data/decidim-admin/app/views/decidim/admin/attachments/new.html.erb +9 -0
- data/decidim-admin/app/views/decidim/admin/attachments/show.html.erb +25 -0
- data/decidim-admin/app/views/decidim/admin/features/_form.html.erb +1 -0
- data/decidim-admin/app/views/decidim/admin/features/_settings_fields.html.erb +6 -3
- data/decidim-admin/app/views/decidim/admin/organization/_form.html.erb +4 -0
- data/decidim-admin/app/views/decidim/admin/participatory_processes/_form.html.erb +16 -0
- data/decidim-admin/app/views/decidim/admin/participatory_processes/show.html.erb +11 -1
- data/decidim-admin/app/views/layouts/decidim/admin/_header.html.erb +2 -2
- data/decidim-admin/app/views/layouts/decidim/admin/_sidebar.html.erb +1 -1
- data/decidim-admin/app/views/layouts/decidim/admin/participatory_process.html.erb +2 -2
- data/decidim-admin/config/locales/ca.yml +29 -27
- data/decidim-admin/config/locales/en.yml +29 -27
- data/decidim-admin/config/locales/es.yml +29 -27
- data/decidim-admin/config/routes.rb +1 -1
- data/decidim-admin/db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb +9 -0
- data/decidim-admin/decidim-admin.gemspec +0 -1
- data/decidim-admin/lib/decidim/admin/engine.rb +2 -2
- data/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb +103 -0
- data/decidim-admin/spec/commands/create_category_spec.rb +1 -1
- data/decidim-admin/spec/commands/create_feature_spec.rb +1 -1
- data/decidim-admin/spec/commands/create_participatory_process_spec.rb +32 -2
- data/decidim-admin/spec/commands/create_static_page_spec.rb +1 -1
- data/decidim-admin/spec/commands/destroy_category_spec.rb +1 -1
- data/decidim-admin/spec/commands/destroy_feature_spec.rb +2 -2
- data/decidim-admin/spec/commands/destroy_participatory_process_step_spec.rb +1 -1
- data/decidim-admin/spec/commands/update_category_spec.rb +1 -1
- data/decidim-admin/spec/commands/update_feature_spec.rb +3 -1
- data/decidim-admin/spec/commands/update_organization_spec.rb +12 -2
- data/decidim-admin/spec/commands/update_static_page_spec.rb +1 -1
- data/decidim-admin/spec/features/admin_manages_organization_admins_spec.rb +1 -1
- data/decidim-admin/spec/features/admin_manages_organization_scopes_spec.rb +1 -1
- data/decidim-admin/spec/features/admin_manages_participatory_processes_spec.rb +1 -1
- data/decidim-admin/spec/features/static_pages_spec.rb +1 -1
- data/decidim-admin/spec/forms/participatory_process_form_spec.rb +32 -2
- data/decidim-admin/spec/forms/participatory_process_step_form_spec.rb +3 -3
- data/decidim-admin/spec/forms/scope_form_spec.rb +2 -2
- data/decidim-admin/spec/forms/static_page_form_spec.rb +2 -2
- data/decidim-admin/spec/helpers/feature_settings_helper_spec.rb +56 -0
- data/decidim-admin/spec/models/abilities/admin_user_spec.rb +7 -6
- data/decidim-admin/spec/models/abilities/participatory_process_admin_spec.rb +5 -8
- data/decidim-admin/spec/shared/manage_process_admins_examples.rb +1 -1
- data/decidim-admin/spec/shared/manage_process_attachments_examples.rb +4 -94
- data/decidim-admin/spec/shared/manage_process_categories_examples.rb +2 -1
- data/decidim-admin/spec/shared/manage_process_steps_examples.rb +1 -1
- data/decidim-admin/spec/shared/manage_processes_examples.rb +4 -3
- data/decidim-admin/spec/views/decidim/static_pages/_form.html.erb_spec.rb +2 -2
- data/decidim-api/app/views/layouts/decidim/api/documentation.html.erb +1 -1
- data/decidim-api/decidim-api.gemspec +1 -1
- data/decidim-api/lib/decidim/api.rb +1 -0
- data/decidim-api/lib/decidim/api/schema.rb +5 -0
- data/decidim-api/lib/decidim/api/test/type_context.rb +1 -0
- data/decidim-api/lib/decidim/api/types/author_interface.rb +13 -0
- data/decidim-api/spec/types/query_type_spec.rb +1 -1
- data/decidim-api/spec/types/translated_field_type_spec.rb +1 -1
- data/decidim-budgets/.gitignore +7 -0
- data/decidim-budgets/README.md +23 -0
- data/decidim-budgets/Rakefile +2 -0
- data/decidim-budgets/app/assets/config/decidim_budgets_manifest.js +1 -0
- data/decidim-budgets/app/assets/images/decidim/budgets/icon.svg +4 -0
- data/decidim-budgets/app/assets/javascripts/decidim/budgets/projects.js.es6 +28 -0
- data/decidim-budgets/app/assets/stylesheets/decidim/budgets/_budgets.scss +1 -0
- data/decidim-budgets/app/assets/stylesheets/decidim/budgets/budget/_budget-list.scss +32 -0
- data/decidim-budgets/app/assets/stylesheets/decidim/budgets/budget/_budget-meter.scss +78 -0
- data/decidim-budgets/app/assets/stylesheets/decidim/budgets/budget/_progress.scss +17 -0
- data/decidim-budgets/app/commands/decidim/budgets/add_line_item.rb +43 -0
- data/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb +52 -0
- data/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb +56 -0
- data/decidim-budgets/app/commands/decidim/budgets/cancel_order.rb +36 -0
- data/decidim-budgets/app/commands/decidim/budgets/checkout.rb +34 -0
- data/decidim-budgets/app/commands/decidim/budgets/remove_line_item.rb +35 -0
- data/decidim-budgets/app/controllers/concerns/decidim/budgets/needs_current_order.rb +27 -0
- data/decidim-budgets/app/controllers/decidim/budgets/admin/application_controller.rb +14 -0
- data/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb +69 -0
- data/decidim-budgets/app/controllers/decidim/budgets/application_controller.rb +13 -0
- data/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb +43 -0
- data/decidim-budgets/app/controllers/decidim/budgets/orders_controller.rb +38 -0
- data/decidim-budgets/app/controllers/decidim/budgets/projects_controller.rb +44 -0
- data/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb +44 -0
- data/decidim-budgets/app/helpers/decidim/budgets/application_helper.rb +12 -0
- data/decidim-budgets/app/helpers/decidim/budgets/projects_helper.rb +29 -0
- data/decidim-budgets/app/models/decidim/budgets/application_record.rb +9 -0
- data/decidim-budgets/app/models/decidim/budgets/line_item.rb +20 -0
- data/decidim-budgets/app/models/decidim/budgets/order.rb +52 -0
- data/decidim-budgets/app/models/decidim/budgets/project.rb +15 -0
- data/decidim-budgets/app/services/decidim/budgets/project_search.rb +58 -0
- data/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb +31 -0
- data/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb +9 -0
- data/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb +27 -0
- data/{decidim-admin/app/views/decidim/admin/participatory_process_attachments → decidim-budgets/app/views/decidim/budgets/admin/projects}/new.html.erb +0 -0
- data/decidim-budgets/app/views/decidim/budgets/line_items/update_budget.js.erb +21 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_budget_confirm.html.erb +30 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_budget_excess.html.erb +14 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_budget_summary.html.erb +46 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_count.html.erb +1 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_filters.html.erb +24 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_linked_projects.html.erb +12 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_order_progress.html.erb +34 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_order_selected_projects.html.erb +25 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_order_total_budget.html.erb +1 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_project.html.erb +40 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_project_budget_button.html.erb +9 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_projects.html.erb +8 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/_tags.html.erb +10 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/index.html.erb +26 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/index.js.erb +2 -0
- data/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb +48 -0
- data/decidim-budgets/bin/rails +14 -0
- data/decidim-budgets/config/i18n-tasks.yml +4 -0
- data/decidim-budgets/config/locales/ca.yml +84 -0
- data/decidim-budgets/config/locales/en.yml +95 -0
- data/decidim-budgets/config/locales/es.yml +84 -0
- data/decidim-budgets/db/migrate/20170127114122_create_projects.rb +15 -0
- data/decidim-budgets/db/migrate/20170130095615_create_orders.rb +13 -0
- data/decidim-budgets/db/migrate/20170130101825_create_line_items.rb +10 -0
- data/decidim-budgets/decidim-budgets.gemspec +24 -0
- data/decidim-budgets/lib/decidim/budgets.rb +11 -0
- data/decidim-budgets/lib/decidim/budgets/admin.rb +9 -0
- data/decidim-budgets/lib/decidim/budgets/admin_engine.rb +22 -0
- data/decidim-budgets/lib/decidim/budgets/feature.rb +59 -0
- data/decidim-budgets/lib/decidim/budgets/list_engine.rb +30 -0
- data/decidim-budgets/lib/decidim/budgets/test/factories.rb +43 -0
- data/decidim-budgets/spec/commands/add_line_item_spec.rb +48 -0
- data/decidim-budgets/spec/commands/cancel_order_spec.rb +42 -0
- data/decidim-budgets/spec/commands/checkout_spec.rb +45 -0
- data/decidim-budgets/spec/commands/create_project_spec.rb +72 -0
- data/decidim-budgets/spec/commands/remove_line_item_spec.rb +31 -0
- data/decidim-budgets/spec/commands/update_project_spec.rb +65 -0
- data/decidim-budgets/spec/factories.rb +4 -0
- data/decidim-budgets/spec/features/admin_manages_projects_spec.rb +16 -0
- data/decidim-budgets/spec/features/orders_spec.rb +149 -0
- data/decidim-budgets/spec/features/process_admin_manages_projects_spec.rb +17 -0
- data/decidim-budgets/spec/forms/project_form_spec.rb +115 -0
- data/decidim-budgets/spec/models/line_item_spec.rb +35 -0
- data/decidim-budgets/spec/models/order_spec.rb +45 -0
- data/decidim-budgets/spec/models/project_spec.rb +30 -0
- data/decidim-budgets/spec/services/project_search_spec.rb +97 -0
- data/decidim-budgets/spec/shared/admin_shared_context.rb +11 -0
- data/decidim-budgets/spec/shared/manage_projects_examples.rb +104 -0
- data/decidim-budgets/spec/spec_helper.rb +2 -0
- data/decidim-comments/app/assets/javascripts/decidim/comments/bundle.js +0 -0
- data/decidim-comments/app/commands/decidim/comments/create_comment.rb +2 -1
- data/decidim-comments/app/forms/decidim/comments/comment_form.rb +1 -0
- data/decidim-comments/app/frontend/application/apollo_client.js +1 -1
- data/decidim-comments/app/frontend/application/application.component.jsx +1 -1
- data/decidim-comments/app/frontend/comments/add_comment_form.component.jsx +76 -20
- data/decidim-comments/app/frontend/comments/add_comment_form.component.test.jsx +77 -22
- data/decidim-comments/app/frontend/comments/add_comment_form.fragment.graphql +6 -0
- data/decidim-comments/app/frontend/comments/add_comment_form.mutation.graphql +2 -2
- data/decidim-comments/app/frontend/comments/comment.component.jsx +15 -15
- data/decidim-comments/app/frontend/comments/comment.component.test.jsx +42 -41
- data/decidim-comments/app/frontend/comments/comment_order_selector.component.jsx +1 -1
- data/decidim-comments/app/frontend/comments/comment_thread.component.jsx +7 -7
- data/decidim-comments/app/frontend/comments/comment_thread.component.test.jsx +21 -19
- data/decidim-comments/app/frontend/comments/comments.component.jsx +21 -17
- data/decidim-comments/app/frontend/comments/comments.component.test.jsx +47 -32
- data/decidim-comments/app/frontend/comments/comments.query.graphql +6 -3
- data/decidim-comments/app/frontend/comments/down_vote_button.component.jsx +21 -10
- data/decidim-comments/app/frontend/comments/up_vote_button.component.jsx +23 -12
- data/decidim-comments/app/frontend/comments/vote_button.component.jsx +15 -7
- data/decidim-comments/app/frontend/comments/vote_button_component.test.jsx +7 -2
- data/decidim-comments/app/frontend/entry.js +1 -8
- data/decidim-comments/app/frontend/support/generate_user_data.js +13 -0
- data/decidim-comments/app/frontend/support/generate_user_group_data.js +14 -0
- data/decidim-comments/app/helpers/decidim/comments/comments_helper.rb +10 -15
- data/decidim-comments/app/models/decidim/comments/comment.rb +5 -7
- data/decidim-comments/app/types/decidim/comments/comment_type.rb +5 -1
- data/decidim-comments/config/locales/ca.yml +5 -1
- data/decidim-comments/config/locales/en.yml +4 -1
- data/decidim-comments/config/locales/es.yml +5 -1
- data/decidim-comments/db/migrate/20170123102043_add_user_group_id_to_comments.rb +5 -0
- data/decidim-comments/decidim-comments.gemspec +0 -1
- data/decidim-comments/lib/decidim/comments/engine.rb +0 -1
- data/decidim-comments/lib/decidim/comments/mutation_extensions.rb +2 -1
- data/decidim-comments/spec/commands/create_comment_spec.rb +6 -3
- data/decidim-comments/spec/commands/vote_comment_spec.rb +4 -4
- data/decidim-comments/spec/features/comments_spec.rb +27 -3
- data/decidim-comments/spec/forms/comment_form_spec.rb +6 -3
- data/decidim-comments/spec/models/comment_spec.rb +25 -32
- data/decidim-comments/spec/queries/comments_with_replies_spec.rb +2 -2
- data/decidim-comments/spec/types/comment_type_spec.rb +2 -2
- data/decidim-comments/spec/types/query_type_spec.rb +5 -5
- data/decidim-dev/app/views/decidim/dummy_resource/_linked_dummys.html.erb +5 -0
- data/decidim-dev/config/locales/en.yml +5 -0
- data/decidim-dev/decidim-dev.gemspec +3 -3
- data/decidim-dev/lib/decidim/dev/assets/avatar.jpg +0 -0
- data/decidim-dev/lib/decidim/dev/assets/icon.png +0 -0
- data/decidim-dev/lib/decidim/dev/test/base_spec_helper.rb +1 -0
- data/decidim-dev/lib/decidim/dev/test/rspec_support/action_mailer.rb +1 -1
- data/decidim-dev/lib/decidim/dev/test/rspec_support/engine_routes.rb +9 -5
- data/decidim-dev/lib/decidim/dev/test/rspec_support/feature.rb +24 -0
- data/decidim-meetings/app/assets/config/decidim_meetings_manifest.js +2 -0
- data/decidim-meetings/app/assets/javascripts/decidim/meetings/map.js.es6.erb +92 -0
- data/decidim-meetings/app/assets/stylesheets/decidim/meetings/map.css +1 -0
- data/decidim-meetings/app/commands/decidim/meetings/admin/close_meeting.rb +53 -0
- data/decidim-meetings/app/commands/decidim/meetings/admin/create_meeting.rb +15 -3
- data/decidim-meetings/app/commands/decidim/meetings/admin/update_meeting.rb +15 -3
- data/decidim-meetings/app/controllers/decidim/meetings/admin/application_controller.rb +9 -0
- data/decidim-meetings/app/controllers/decidim/meetings/admin/attachments_controller.rb +29 -0
- data/decidim-meetings/app/controllers/decidim/meetings/admin/meeting_closes_controller.rb +38 -0
- data/decidim-meetings/app/controllers/decidim/meetings/admin/meetings_controller.rb +0 -12
- data/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb +11 -9
- data/decidim-meetings/app/forms/decidim/meetings/admin/close_meeting_form.rb +31 -0
- data/decidim-meetings/app/forms/decidim/meetings/admin/meeting_form.rb +0 -2
- data/decidim-meetings/app/helpers/decidim/meetings/admin/application_helper.rb +12 -0
- data/decidim-meetings/app/helpers/decidim/meetings/application_helper.rb +1 -0
- data/decidim-meetings/app/helpers/decidim/meetings/map_helper.rb +46 -0
- data/decidim-meetings/app/models/decidim/meetings/meeting.rb +11 -15
- data/decidim-meetings/app/services/decidim/meetings/meeting_search.rb +0 -1
- data/decidim-meetings/app/services/decidim/meetings/static_map_generator.rb +50 -0
- data/decidim-meetings/app/views/decidim/meetings/admin/meeting_closes/_form.html.erb +23 -0
- data/decidim-meetings/app/views/decidim/meetings/admin/meeting_closes/edit.html.erb +9 -0
- data/decidim-meetings/app/views/decidim/meetings/admin/meetings/_form.html.erb +2 -6
- data/decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb +14 -0
- data/decidim-meetings/app/views/decidim/meetings/meetings/_datetime.html.erb +8 -0
- data/decidim-meetings/app/views/decidim/meetings/meetings/_filters.html.erb +2 -2
- data/decidim-meetings/app/views/decidim/meetings/meetings/_filters_small_view.html.erb +18 -0
- data/decidim-meetings/app/views/decidim/meetings/meetings/_linked_meetings.html.erb +22 -0
- data/decidim-meetings/app/views/decidim/meetings/meetings/_meetings.html.erb +3 -10
- data/decidim-meetings/app/views/decidim/meetings/meetings/index.html.erb +42 -0
- data/decidim-meetings/app/views/decidim/meetings/meetings/index.js.erb +6 -0
- data/decidim-meetings/app/views/decidim/meetings/meetings/show.html.erb +33 -7
- data/decidim-meetings/bin/rails +1 -1
- data/decidim-meetings/config/i18n-tasks.yml +2 -0
- data/decidim-meetings/config/locales/ca.yml +37 -4
- data/decidim-meetings/config/locales/en.yml +34 -1
- data/decidim-meetings/config/locales/es.yml +36 -3
- data/decidim-meetings/db/migrate/20170110142105_close_a_meeting.rb +9 -0
- data/decidim-meetings/db/migrate/20170123151650_add_latitude_and_longitude_to_meetings.rb +6 -0
- data/decidim-meetings/db/migrate/20170129153716_remove_short_description_from_meetings.rb +5 -0
- data/decidim-meetings/decidim-meetings.gemspec +7 -0
- data/decidim-meetings/lib/decidim/meetings/admin_engine.rb +31 -1
- data/decidim-meetings/lib/decidim/meetings/feature.rb +20 -6
- data/decidim-meetings/lib/decidim/meetings/list_engine.rb +10 -1
- data/decidim-meetings/lib/decidim/meetings/seeds/Exampledocument.pdf +0 -0
- data/decidim-meetings/lib/decidim/meetings/seeds/city.jpeg +0 -0
- data/decidim-meetings/lib/decidim/meetings/test/factories.rb +23 -0
- data/decidim-meetings/spec/commands/close_meeting_spec.rb +78 -0
- data/decidim-meetings/spec/commands/create_meeting_spec.rb +22 -3
- data/decidim-meetings/spec/commands/update_meeting_spec.rb +32 -3
- data/decidim-meetings/spec/controllers/meetings_controller_spec.rb +41 -0
- data/decidim-meetings/spec/factories.rb +3 -13
- data/decidim-meetings/spec/features/admin_manages_meetings_attachments_spec.rb +10 -0
- data/decidim-meetings/spec/features/explore_meetings_spec.rb +55 -1
- data/decidim-meetings/spec/features/process_admin_manages_meetings_attachments_spec.rb +12 -0
- data/decidim-meetings/spec/forms/close_meeting_form_spec.rb +90 -0
- data/decidim-meetings/spec/forms/meeting_form_spec.rb +1 -7
- data/decidim-meetings/spec/models/meeting_spec.rb +42 -24
- data/decidim-meetings/spec/services/meeting_search_spec.rb +1 -17
- data/decidim-meetings/spec/services/static_map_generator_spec.rb +33 -0
- data/decidim-meetings/spec/shared/manage_attachments_examples.rb +17 -0
- data/decidim-meetings/spec/shared/manage_meetings_examples.rb +58 -8
- data/decidim-meetings/spec/spec_helper.rb +5 -0
- data/decidim-meetings/spec/support/geocoder.rb +7 -0
- data/decidim-meetings/vendor/assets/javascripts/leaflet-svg-icon.js +179 -0
- data/decidim-meetings/vendor/assets/javascripts/leaflet-tilelayer-here.js +166 -0
- data/decidim-meetings/vendor/assets/javascripts/leaflet.js +9 -0
- data/decidim-meetings/vendor/assets/stylesheets/leaflet.css +624 -0
- data/decidim-pages/app/models/decidim/pages/page.rb +10 -1
- data/decidim-pages/app/views/decidim/pages/application/show.html.erb +2 -1
- data/decidim-pages/spec/commands/create_page_spec.rb +2 -2
- data/decidim-pages/spec/commands/destroy_page_spec.rb +1 -1
- data/decidim-pages/spec/commands/update_page_spec.rb +1 -1
- data/decidim-pages/spec/factories.rb +1 -1
- data/decidim-pages/spec/features/admin_spec.rb +1 -0
- data/decidim-pages/spec/models/page_spec.rb +15 -0
- data/decidim-proposals/app/assets/stylesheets/decidim/proposals/social_share.css.scss +5 -0
- data/decidim-proposals/app/commands/decidim/proposals/admin/answer_proposal.rb +43 -0
- data/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb +1 -0
- data/decidim-proposals/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb +37 -0
- data/decidim-proposals/app/controllers/decidim/proposals/admin/proposals_controller.rb +1 -0
- data/decidim-proposals/app/controllers/decidim/proposals/proposal_votes_controller.rb +18 -7
- data/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb +8 -7
- data/decidim-proposals/app/forms/decidim/proposals/admin/proposal_answer_form.rb +18 -0
- data/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb +1 -0
- data/decidim-proposals/app/helpers/decidim/proposals/application_helper.rb +17 -0
- data/decidim-proposals/app/helpers/decidim/proposals/proposal_votes_helper.rb +19 -0
- data/decidim-proposals/app/models/decidim/proposals/abilities/current_user.rb +59 -0
- data/decidim-proposals/app/models/decidim/proposals/proposal.rb +30 -33
- data/decidim-proposals/app/models/decidim/proposals/proposal_vote.rb +2 -0
- data/decidim-proposals/app/services/decidim/proposals/proposal_search.rb +11 -0
- data/decidim-proposals/app/views/decidim/proposals/admin/proposal_answers/edit.html.erb +15 -0
- data/decidim-proposals/app/views/decidim/proposals/admin/proposals/index.html.erb +8 -0
- data/decidim-proposals/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb +20 -0
- data/decidim-proposals/app/views/decidim/proposals/proposals/_filters.html.erb +3 -1
- data/decidim-proposals/app/views/decidim/proposals/proposals/_filters_small_view.html.erb +18 -0
- data/decidim-proposals/app/views/decidim/proposals/proposals/_linked_proposals.html.erb +27 -0
- data/decidim-proposals/app/views/decidim/proposals/proposals/_proposal.html.erb +3 -2
- data/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_badge.html.erb +3 -0
- data/decidim-proposals/app/views/decidim/proposals/proposals/_remaining_votes_count.html.erb +1 -0
- data/decidim-proposals/app/views/decidim/proposals/proposals/_share.html.erb +1 -1
- data/decidim-proposals/app/views/decidim/proposals/proposals/_vote_button.html.erb +16 -4
- data/decidim-proposals/app/views/decidim/proposals/proposals/_votes_limit.html.erb +23 -0
- data/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb +13 -3
- data/decidim-proposals/app/views/decidim/proposals/proposals/new.html.erb +6 -0
- data/decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb +15 -2
- data/decidim-proposals/config/i18n-tasks.yml +3 -0
- data/decidim-proposals/config/locales/ca.yml +54 -1
- data/decidim-proposals/config/locales/en.yml +54 -0
- data/decidim-proposals/config/locales/es.yml +54 -1
- data/decidim-proposals/db/migrate/20170120151202_add_user_group_id_to_proposals.rb +5 -0
- data/decidim-proposals/db/migrate/20170131092413_add_answers_to_proposals.rb +7 -0
- data/decidim-proposals/decidim-proposals.gemspec +3 -0
- data/decidim-proposals/lib/decidim/proposals/admin_engine.rb +3 -1
- data/decidim-proposals/lib/decidim/proposals/engine.rb +7 -1
- data/decidim-proposals/lib/decidim/proposals/feature.rb +28 -1
- data/decidim-proposals/lib/decidim/proposals/test/factories.rb +83 -0
- data/decidim-proposals/spec/commands/decidim/proposals/admin_create_proposal_spec.rb +14 -0
- data/decidim-proposals/spec/commands/decidim/proposals/answer_proposal_spec.rb +53 -0
- data/decidim-proposals/spec/commands/decidim/proposals/create_proposal_spec.rb +3 -56
- data/decidim-proposals/spec/controllers/decidim/admin/proposal_answers_controller_spec.rb +45 -0
- data/decidim-proposals/spec/controllers/decidim/proposal_votes_controller_spec.rb +113 -0
- data/decidim-proposals/spec/controllers/decidim/proposals_controller_spec.rb +53 -0
- data/decidim-proposals/spec/factories.rb +1 -23
- data/decidim-proposals/spec/features/proposals_spec.rb +201 -38
- data/decidim-proposals/spec/features/vote_proposal_spec.rb +83 -11
- data/decidim-proposals/spec/forms/decidim/proposals/admin_proposal_form_spec.rb +13 -0
- data/decidim-proposals/spec/forms/decidim/proposals/proposal_answer_form_spec.rb +50 -0
- data/decidim-proposals/spec/forms/decidim/proposals/proposal_form_spec.rb +5 -93
- data/decidim-proposals/spec/helpers/application_helper_spec.rb +33 -0
- data/decidim-proposals/spec/helpers/proposal_votes_helper_spec.rb +53 -0
- data/decidim-proposals/spec/lib/decidim/proposals/feature_spec.rb +1 -1
- data/decidim-proposals/spec/models/decidim/proposals/proposal_spec.rb +21 -19
- data/decidim-proposals/spec/models/decidim/proposals/proposal_vote_spec.rb +19 -1
- data/decidim-proposals/spec/services/decidim/proposals/proposal_search_spec.rb +66 -25
- data/decidim-proposals/spec/shared/create_proposal_examples.rb +69 -0
- data/decidim-proposals/spec/shared/manage_proposals_examples.rb +49 -0
- data/decidim-proposals/spec/shared/proposal_form_examples.rb +100 -0
- data/decidim-results/.gitignore +7 -0
- data/decidim-results/README.md +23 -0
- data/decidim-results/Rakefile +2 -0
- data/decidim-results/app/assets/images/decidim/results/icon.svg +1 -0
- data/decidim-results/app/commands/decidim/results/admin/create_result.rb +65 -0
- data/decidim-results/app/commands/decidim/results/admin/update_result.rb +69 -0
- data/decidim-results/app/controllers/decidim/results/admin/application_controller.rb +14 -0
- data/decidim-results/app/controllers/decidim/results/admin/results_controller.rb +69 -0
- data/decidim-results/app/controllers/decidim/results/application_controller.rb +13 -0
- data/decidim-results/app/controllers/decidim/results/results_controller.rb +42 -0
- data/decidim-results/app/forms/decidim/results/admin/result_form.rb +40 -0
- data/decidim-results/app/helpers/decidim/results/application_helper.rb +11 -0
- data/decidim-results/app/models/decidim/results/application_record.rb +9 -0
- data/decidim-results/app/models/decidim/results/result.rb +15 -0
- data/decidim-results/app/services/decidim/results/result_search.rb +44 -0
- data/decidim-results/app/services/decidim/results/result_stats_calculator.rb +51 -0
- data/decidim-results/app/views/decidim/results/admin/results/_form.html.erb +23 -0
- data/decidim-results/app/views/decidim/results/admin/results/edit.html.erb +9 -0
- data/decidim-results/app/views/decidim/results/admin/results/index.html.erb +27 -0
- data/decidim-results/app/views/decidim/results/admin/results/new.html.erb +9 -0
- data/decidim-results/app/views/decidim/results/results/_count.html.erb +1 -0
- data/decidim-results/app/views/decidim/results/results/_filters.html.erb +22 -0
- data/decidim-results/app/views/decidim/results/results/_linked_results.html.erb +12 -0
- data/decidim-results/app/views/decidim/results/results/_results.html.erb +16 -0
- data/decidim-results/app/views/decidim/results/results/_tags.html.erb +10 -0
- data/decidim-results/app/views/decidim/results/results/index.html.erb +22 -0
- data/decidim-results/app/views/decidim/results/results/index.js.erb +2 -0
- data/decidim-results/app/views/decidim/results/results/show.html.erb +52 -0
- data/decidim-results/bin/rails +14 -0
- data/decidim-results/config/i18n-tasks.yml +5 -0
- data/decidim-results/config/locales/ca.yml +61 -0
- data/decidim-results/config/locales/en.yml +62 -0
- data/decidim-results/config/locales/es.yml +61 -0
- data/decidim-results/db/migrate/20170116104125_create_results.rb +14 -0
- data/decidim-results/db/migrate/20170129164553_remove_short_description_from_results.rb +5 -0
- data/decidim-results/decidim-results.gemspec +26 -0
- data/decidim-results/lib/decidim/results.rb +11 -0
- data/decidim-results/lib/decidim/results/admin.rb +9 -0
- data/decidim-results/lib/decidim/results/admin_engine.rb +22 -0
- data/decidim-results/lib/decidim/results/feature.rb +52 -0
- data/decidim-results/lib/decidim/results/list_engine.rb +19 -0
- data/decidim-results/lib/decidim/results/test/factories.rb +11 -0
- data/decidim-results/spec/commands/create_result_spec.rb +90 -0
- data/decidim-results/spec/commands/update_result_spec.rb +83 -0
- data/decidim-results/spec/factories.rb +6 -0
- data/decidim-results/spec/features/admin_manages_results_spec.rb +16 -0
- data/decidim-results/spec/features/explore_results_spec.rb +186 -0
- data/decidim-results/spec/features/process_admin_manages_results_spec.rb +17 -0
- data/decidim-results/spec/forms/result_form_spec.rb +91 -0
- data/decidim-results/spec/models/result_spec.rb +18 -0
- data/decidim-results/spec/services/result_search_spec.rb +97 -0
- data/decidim-results/spec/services/result_stats_calculator_spec.rb +93 -0
- data/decidim-results/spec/shared/admin_shared_context.rb +11 -0
- data/decidim-results/spec/shared/manage_results_examples.rb +96 -0
- data/decidim-results/spec/spec_helper.rb +2 -0
- data/decidim-system/app/assets/javascripts/decidim/system/application.js.es6 +1 -3
- data/decidim-system/app/views/layouts/decidim/system/_header.html.erb +2 -2
- data/decidim-system/decidim-system.gemspec +0 -1
- data/decidim-system/lib/decidim/system/engine.rb +0 -1
- data/decidim-system/spec/features/manage_admins_spec.rb +1 -1
- data/decidim-system/spec/features/organizations_spec.rb +1 -1
- data/decidim.gemspec +2 -0
- data/docs/how_to_create_a_plugin.md +0 -2
- data/lib/decidim.rb +2 -0
- data/lib/generators/decidim/install_generator.rb +1 -0
- data/lib/generators/decidim/templates/Gemfile.erb +10 -1
- data/lib/generators/decidim/templates/initializer.rb +9 -0
- data/lib/generators/decidim/templates/secrets.yml.erb +3 -0
- data/lib/generators/decidim/templates/social_share_button.rb +1 -1
- data/package.json +2 -3
- data/yarn.lock +10 -8
- metadata +265 -32
- data/decidim-admin/app/helpers/decidim/admin/aria_selected_link_to_helper.rb +0 -28
- data/decidim-admin/app/views/decidim/admin/participatory_process_attachments/edit.html.erb +0 -9
- data/decidim-admin/app/views/decidim/admin/participatory_process_attachments/index.html.erb +0 -37
- data/decidim-admin/app/views/decidim/admin/participatory_process_attachments/show.html.erb +0 -25
- data/decidim-comments/app/frontend/support/generate_current_user_data.js +0 -13
- data/decidim-comments/app/types/decidim/comments/author_type.rb +0 -15
- data/decidim-comments/spec/types/author_type_spec.rb +0 -21
- data/decidim-dev/lib/decidim/dev/assets/avatar.svg +0 -14
- data/decidim-proposals/app/views/decidim/proposals/proposal_votes/create.js.erb +0 -5
@@ -0,0 +1,69 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Decidim
|
3
|
+
module Results
|
4
|
+
module Admin
|
5
|
+
# This command is executed when the user changes a Result from the admin
|
6
|
+
# panel.
|
7
|
+
class UpdateResult < Rectify::Command
|
8
|
+
# Initializes an UpdateResult Command.
|
9
|
+
#
|
10
|
+
# form - The form from which to get the data.
|
11
|
+
# result - The current instance of the result to be updated.
|
12
|
+
def initialize(form, result)
|
13
|
+
@form = form
|
14
|
+
@result = result
|
15
|
+
end
|
16
|
+
|
17
|
+
# Updates the result if valid.
|
18
|
+
#
|
19
|
+
# Broadcasts :ok if successful, :invalid otherwise.
|
20
|
+
def call
|
21
|
+
return broadcast(:invalid) if form.invalid?
|
22
|
+
|
23
|
+
transaction do
|
24
|
+
update_result
|
25
|
+
link_proposals
|
26
|
+
link_meetings
|
27
|
+
end
|
28
|
+
|
29
|
+
broadcast(:ok)
|
30
|
+
end
|
31
|
+
|
32
|
+
private
|
33
|
+
|
34
|
+
attr_reader :result, :form
|
35
|
+
|
36
|
+
def update_result
|
37
|
+
result.update_attributes!(
|
38
|
+
scope: form.scope,
|
39
|
+
category: form.category,
|
40
|
+
title: form.title,
|
41
|
+
description: form.description
|
42
|
+
)
|
43
|
+
end
|
44
|
+
|
45
|
+
def proposals
|
46
|
+
@proposals ||= result.sibling_scope(:proposals).where(id: form.proposal_ids)
|
47
|
+
end
|
48
|
+
|
49
|
+
def meeting_ids
|
50
|
+
@meeting_ids ||= proposals.flat_map do |proposal|
|
51
|
+
proposal.linked_resources(:meetings, "proposals_from_meeting").pluck(:id)
|
52
|
+
end.uniq
|
53
|
+
end
|
54
|
+
|
55
|
+
def meetings
|
56
|
+
@meetings ||= result.sibling_scope(:meetings).where(id: meeting_ids)
|
57
|
+
end
|
58
|
+
|
59
|
+
def link_proposals
|
60
|
+
result.link_resources(proposals, "included_proposals")
|
61
|
+
end
|
62
|
+
|
63
|
+
def link_meetings
|
64
|
+
result.link_resources(meetings, "meetings_through_proposals")
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Decidim
|
3
|
+
module Results
|
4
|
+
module Admin
|
5
|
+
# This controller is the abstract class from which all other controllers of
|
6
|
+
# this engine inherit.
|
7
|
+
#
|
8
|
+
# Note that it inherits from `Decidim::Features::BaseController`, which
|
9
|
+
# override its layout and provide all kinds of useful methods.
|
10
|
+
class ApplicationController < Decidim::Admin::Features::BaseController
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -0,0 +1,69 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Decidim
|
3
|
+
module Results
|
4
|
+
module Admin
|
5
|
+
# This controller allows an admin to manage results from a Participatory Process
|
6
|
+
class ResultsController < Admin::ApplicationController
|
7
|
+
helper_method :results
|
8
|
+
|
9
|
+
def new
|
10
|
+
@form = form(ResultForm).instance
|
11
|
+
end
|
12
|
+
|
13
|
+
def create
|
14
|
+
@form = form(ResultForm).from_params(params)
|
15
|
+
|
16
|
+
CreateResult.call(@form) do
|
17
|
+
on(:ok) do
|
18
|
+
flash[:notice] = I18n.t("results.create.success", scope: "decidim.results.admin")
|
19
|
+
redirect_to results_path
|
20
|
+
end
|
21
|
+
|
22
|
+
on(:invalid) do
|
23
|
+
flash.now[:alert] = I18n.t("results.create.invalid", scope: "decidim.results.admin")
|
24
|
+
render action: "new"
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
def edit
|
30
|
+
@form = form(ResultForm).from_model(result)
|
31
|
+
end
|
32
|
+
|
33
|
+
def update
|
34
|
+
@form = form(ResultForm).from_params(params)
|
35
|
+
|
36
|
+
UpdateResult.call(@form, result) do
|
37
|
+
on(:ok) do
|
38
|
+
flash[:notice] = I18n.t("results.update.success", scope: "decidim.results.admin")
|
39
|
+
redirect_to results_path
|
40
|
+
end
|
41
|
+
|
42
|
+
on(:invalid) do
|
43
|
+
flash.now[:alert] = I18n.t("results.update.invalid", scope: "decidim.results.admin")
|
44
|
+
render action: "edit"
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
def destroy
|
50
|
+
result.destroy!
|
51
|
+
|
52
|
+
flash[:notice] = I18n.t("results.destroy.success", scope: "decidim.results.admin")
|
53
|
+
|
54
|
+
redirect_to results_path
|
55
|
+
end
|
56
|
+
|
57
|
+
private
|
58
|
+
|
59
|
+
def results
|
60
|
+
@results ||= Result.where(feature: current_feature)
|
61
|
+
end
|
62
|
+
|
63
|
+
def result
|
64
|
+
@result ||= results.find(params[:id])
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Results
|
5
|
+
# This controller is the abstract class from which all other controllers of
|
6
|
+
# this engine inherit.
|
7
|
+
#
|
8
|
+
# Note that it inherits from `Decidim::Components::BaseController`, which
|
9
|
+
# override its layout and provide all kinds of useful methods.
|
10
|
+
class ApplicationController < Decidim::Features::BaseController
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
@@ -0,0 +1,42 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Results
|
5
|
+
# Exposes the result resource so users can view them
|
6
|
+
class ResultsController < Decidim::Results::ApplicationController
|
7
|
+
include FilterResource
|
8
|
+
|
9
|
+
helper_method :results, :result, :stats_calculator
|
10
|
+
|
11
|
+
private
|
12
|
+
|
13
|
+
def results
|
14
|
+
@results ||= search.results.page(params[:page]).per(12)
|
15
|
+
end
|
16
|
+
|
17
|
+
def result
|
18
|
+
@result ||= results.find(params[:id])
|
19
|
+
end
|
20
|
+
|
21
|
+
def stats_calculator
|
22
|
+
@stats_calculator ||= ResultStatsCalculator.new(result)
|
23
|
+
end
|
24
|
+
|
25
|
+
def search_klass
|
26
|
+
ResultSearch
|
27
|
+
end
|
28
|
+
|
29
|
+
def default_filter_params
|
30
|
+
{
|
31
|
+
search_text: "",
|
32
|
+
scope_id: "",
|
33
|
+
category_id: ""
|
34
|
+
}
|
35
|
+
end
|
36
|
+
|
37
|
+
def context_params
|
38
|
+
{ feature: current_feature, organization: current_organization }
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
@@ -0,0 +1,40 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Decidim
|
3
|
+
module Results
|
4
|
+
module Admin
|
5
|
+
# This class holds a Form to create/update results from Decidim's admin panel.
|
6
|
+
class ResultForm < Decidim::Form
|
7
|
+
include TranslatableAttributes
|
8
|
+
include TranslationsHelper
|
9
|
+
|
10
|
+
translatable_attribute :title, String
|
11
|
+
translatable_attribute :description, String
|
12
|
+
attribute :decidim_scope_id, Integer
|
13
|
+
attribute :decidim_category_id, Integer
|
14
|
+
attribute :proposal_ids, Array[Integer]
|
15
|
+
|
16
|
+
validates :title, translatable_presence: true
|
17
|
+
validates :description, translatable_presence: true
|
18
|
+
|
19
|
+
validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
|
20
|
+
validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
|
21
|
+
|
22
|
+
def map_model(model)
|
23
|
+
self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
|
24
|
+
end
|
25
|
+
|
26
|
+
def proposals
|
27
|
+
@proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, context.current_feature)&.order(title: :asc)&.pluck(:title, :id)
|
28
|
+
end
|
29
|
+
|
30
|
+
def scope
|
31
|
+
@scope ||= context.current_feature.scopes.where(id: decidim_scope_id).first
|
32
|
+
end
|
33
|
+
|
34
|
+
def category
|
35
|
+
@category ||= context.current_feature.categories.where(id: decidim_category_id).first
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Decidim
|
3
|
+
module Results
|
4
|
+
# The data store for a Result in the Decidim::Results component. It stores a
|
5
|
+
# title, description and any other useful information to render a custom result.
|
6
|
+
class Result < Results::ApplicationRecord
|
7
|
+
include Decidim::Resourceable
|
8
|
+
include Decidim::HasFeature
|
9
|
+
include Decidim::HasScope
|
10
|
+
include Decidim::HasCategory
|
11
|
+
|
12
|
+
feature_manifest_name "results"
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
@@ -0,0 +1,44 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Decidim
|
3
|
+
module Results
|
4
|
+
# This class handles search and filtering of results. Needs a
|
5
|
+
# `current_feature` param with a `Decidim::Feature` in order to
|
6
|
+
# find the results.
|
7
|
+
class ResultSearch < ResourceSearch
|
8
|
+
# Public: Initializes the service.
|
9
|
+
# feature - A Decidim::Feature to get the results from.
|
10
|
+
# page - The page number to paginate the results.
|
11
|
+
# per_page - The number of proposals to return per page.
|
12
|
+
def initialize(options = {})
|
13
|
+
super(Result.all, options)
|
14
|
+
end
|
15
|
+
|
16
|
+
# Handle the search_text filter
|
17
|
+
def search_search_text
|
18
|
+
query
|
19
|
+
.where(localized_search_text_in(:title), text: "%#{search_text}%")
|
20
|
+
.or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
|
21
|
+
end
|
22
|
+
|
23
|
+
# Handle the scope_id filter
|
24
|
+
def search_scope_id
|
25
|
+
query.where(decidim_scope_id: scope_id)
|
26
|
+
end
|
27
|
+
|
28
|
+
private
|
29
|
+
|
30
|
+
# Internal: builds the needed query to search for a text in the organization's
|
31
|
+
# available locales. Note that it is intended to be used as follows:
|
32
|
+
#
|
33
|
+
# Example:
|
34
|
+
# Resource.where(localized_search_text_for(:title, text: "my_query"))
|
35
|
+
#
|
36
|
+
# The Hash with the `:text` key is required or it won't work.
|
37
|
+
def localized_search_text_in(field)
|
38
|
+
options[:organization].available_locales.map do |l|
|
39
|
+
"#{field} ->> '#{l}' ILIKE :text"
|
40
|
+
end.join(" OR ")
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
@@ -0,0 +1,51 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Decidim
|
3
|
+
module Results
|
4
|
+
# This class handles statistics of results. Needs a `result` in
|
5
|
+
# order to find the stats.
|
6
|
+
class ResultStatsCalculator
|
7
|
+
# Public: Initializes the service.
|
8
|
+
# result - The result from which to calculate the stats.
|
9
|
+
def initialize(result)
|
10
|
+
@result = result
|
11
|
+
end
|
12
|
+
|
13
|
+
def proposals_count
|
14
|
+
proposals.count
|
15
|
+
end
|
16
|
+
|
17
|
+
def votes_count
|
18
|
+
return 0 unless proposals
|
19
|
+
proposals.sum { |proposal| proposal.votes.size }
|
20
|
+
end
|
21
|
+
|
22
|
+
def comments_count
|
23
|
+
Decidim::Comments::Comment.where(commentable: proposals).count
|
24
|
+
end
|
25
|
+
|
26
|
+
def attendees_count
|
27
|
+
meetings.where("attendees_count > 0").sum(:attendees_count)
|
28
|
+
end
|
29
|
+
|
30
|
+
def contributions_count
|
31
|
+
meetings.where("contributions_count > 0").sum(:contributions_count)
|
32
|
+
end
|
33
|
+
|
34
|
+
def meetings_count
|
35
|
+
meetings.count
|
36
|
+
end
|
37
|
+
|
38
|
+
private
|
39
|
+
|
40
|
+
attr_reader :result
|
41
|
+
|
42
|
+
def proposals
|
43
|
+
@proposals ||= result.linked_resources(:proposals, "included_proposals")
|
44
|
+
end
|
45
|
+
|
46
|
+
def meetings
|
47
|
+
@meetings ||= result.linked_resources(:meetings, "meetings_through_proposals")
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
51
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
<div class="field" >
|
2
|
+
<%= form.translated :text_field, :title, autofocus: true %>
|
3
|
+
</div>
|
4
|
+
|
5
|
+
<div class="field" >
|
6
|
+
<%= form.translated :editor, :description %>
|
7
|
+
</div>
|
8
|
+
|
9
|
+
<div class="field" >
|
10
|
+
<%= form.collection_select :decidim_scope_id, current_organization.scopes, :id, :name, include_blank: true %>
|
11
|
+
</div>
|
12
|
+
|
13
|
+
<div class="field" >
|
14
|
+
<%= form.categories_select :decidim_category_id, current_participatory_process.categories, include_blank: true, disable_parents: false %>
|
15
|
+
</div>
|
16
|
+
|
17
|
+
<% if @form.proposals %>
|
18
|
+
<%= form.select :proposal_ids,
|
19
|
+
@form.proposals,
|
20
|
+
{},
|
21
|
+
{ multiple: true, class: "chosen-select" }
|
22
|
+
%>
|
23
|
+
<% end %>
|
@@ -0,0 +1,27 @@
|
|
1
|
+
<h2><%= t(".title") %></h2>
|
2
|
+
|
3
|
+
<div class="actions title">
|
4
|
+
<%= link_to t("actions.new", scope: "decidim.results", name: t("models.result.name", scope: "decidim.results.admin")), new_result_path, class: 'new' if can? :manage, current_feature %>
|
5
|
+
</div>
|
6
|
+
|
7
|
+
<table class="stack">
|
8
|
+
<thead>
|
9
|
+
<tr>
|
10
|
+
<th><%= t("models.result.fields.title", scope: "decidim.results") %></th>
|
11
|
+
<th class="actions"><%= t("actions.title", scope: "decidim.results") %></th>
|
12
|
+
</tr>
|
13
|
+
</thead>
|
14
|
+
<tbody>
|
15
|
+
<% results.each do |result| %>
|
16
|
+
<tr data-id="<%= result.id %>">
|
17
|
+
<td>
|
18
|
+
<%= link_to translated_attribute(result.title), decidim_results.result_path(id: result, feature_id: current_feature, participatory_process_id: current_participatory_process), target: :blank %><br />
|
19
|
+
</td>
|
20
|
+
<td class="actions">
|
21
|
+
<%= link_to t("actions.edit", scope: "decidim.results"), edit_result_path(result) if can? :update, current_feature %>
|
22
|
+
<%= link_to t("actions.destroy", scope: "decidim.results"), result_path(result), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.results") } if can? :destroy, current_feature %>
|
23
|
+
</td>
|
24
|
+
</tr>
|
25
|
+
<% end %>
|
26
|
+
</tbody>
|
27
|
+
</table>
|