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
@@ -1,20 +1,37 @@
|
|
1
1
|
es:
|
2
|
+
activemodel:
|
3
|
+
attributes:
|
4
|
+
close_meeting:
|
5
|
+
attendees_count: Número de asistentes
|
6
|
+
attending_organizations: Lista de organizaciones que han participado
|
7
|
+
closing_report: Informe
|
8
|
+
contributions_count: Número de contribuciones
|
9
|
+
proposal_ids: Propuestas creadas en el encuentro
|
2
10
|
decidim:
|
3
11
|
features:
|
4
12
|
meetings:
|
5
13
|
name: Lista de encuentros
|
6
14
|
meetings:
|
7
15
|
actions:
|
16
|
+
attachments: Archivos adjuntos
|
17
|
+
close: Cerrar
|
8
18
|
confirm_destroy: '¿Está seguro de que quiere eliminar este encuentro?'
|
9
19
|
destroy: Borrar
|
10
20
|
edit: Editar
|
11
21
|
new: Nuevo/a %{name}
|
12
22
|
title: Acciones
|
13
23
|
admin:
|
24
|
+
meeting_closes:
|
25
|
+
edit:
|
26
|
+
close: Cerrar
|
27
|
+
title: Cerrar encuentro
|
14
28
|
meetings:
|
29
|
+
close:
|
30
|
+
invalid: Ha habido un problema al cerrar este encuentro
|
31
|
+
success: Encuentro cerrado con éxito
|
15
32
|
create:
|
16
33
|
invalid: Ha habido un problema al crear este encuentro
|
17
|
-
success:
|
34
|
+
success: Encuentro creado con éxito
|
18
35
|
destroy:
|
19
36
|
success: El encuentro se ha eliminado correctamente
|
20
37
|
edit:
|
@@ -39,13 +56,29 @@ es:
|
|
39
56
|
descendent: Descendiente
|
40
57
|
scopes: Ámbitos
|
41
58
|
search: Buscar
|
59
|
+
filters_small_view:
|
60
|
+
close_modal: Cerrar ventana
|
61
|
+
filter: Filtrar
|
62
|
+
filter_for: Filtrar por
|
63
|
+
unfold: Desplegar
|
42
64
|
index:
|
43
65
|
title: Lista de encuentros
|
66
|
+
view_meeting: Ver encuentro
|
44
67
|
show:
|
45
|
-
|
68
|
+
attendees: Número de asistentes
|
69
|
+
contributions: Número de contribuciones
|
70
|
+
meeting_report: Informe del encuentro
|
71
|
+
organizations: Organizaciones que han asistido
|
46
72
|
models:
|
47
73
|
meeting:
|
48
74
|
fields:
|
75
|
+
closed: Cerrado
|
49
76
|
end_time: Fecha de finalización
|
77
|
+
map: Mapa
|
50
78
|
start_time: Fecha de inicio
|
51
|
-
title: Título
|
79
|
+
title: Título
|
80
|
+
resource_links:
|
81
|
+
meetings_through_proposals:
|
82
|
+
results: 'Resultados relacionados:'
|
83
|
+
proposals_from_meeting:
|
84
|
+
proposals: Propuestas relacionadas
|
@@ -0,0 +1,9 @@
|
|
1
|
+
class CloseAMeeting < ActiveRecord::Migration[5.0]
|
2
|
+
def change
|
3
|
+
add_column :decidim_meetings_meetings, :closing_report, :jsonb
|
4
|
+
add_column :decidim_meetings_meetings, :attendees_count, :integer
|
5
|
+
add_column :decidim_meetings_meetings, :contributions_count, :integer
|
6
|
+
add_column :decidim_meetings_meetings, :attending_organizations, :text
|
7
|
+
add_column :decidim_meetings_meetings, :closed_at, :time, index: true
|
8
|
+
end
|
9
|
+
end
|
@@ -18,6 +18,13 @@ Gem::Specification.new do |s|
|
|
18
18
|
s.add_dependency "date_validator", "~> 0.9"
|
19
19
|
s.add_dependency "searchlight", "~> 4.1.0"
|
20
20
|
s.add_dependency "kaminari", "~> 1.0.1"
|
21
|
+
s.add_dependency "geocoder", "~> 1.4.1"
|
22
|
+
s.add_dependency "httparty", "~> 0.14.0"
|
23
|
+
s.add_dependency "jquery-tmpl-rails", "~> 1.1.0"
|
21
24
|
|
22
25
|
s.add_development_dependency "decidim-dev", Decidim.version
|
26
|
+
s.add_development_dependency "decidim-proposals", Decidim.version
|
27
|
+
s.add_development_dependency "decidim-admin", Decidim.version
|
28
|
+
s.add_development_dependency "webmock", "~> 2.3.2"
|
29
|
+
s.add_development_dependency "decidim-results", Decidim.version
|
23
30
|
end
|
@@ -1,4 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
require "geocoder"
|
3
|
+
|
2
4
|
module Decidim
|
3
5
|
module Meetings
|
4
6
|
# This is the engine that runs on the public interface of `decidim-meetings`.
|
@@ -10,13 +12,41 @@ module Decidim
|
|
10
12
|
paths["db/migrate"] = nil
|
11
13
|
|
12
14
|
routes do
|
13
|
-
resources :meetings
|
15
|
+
resources :meetings do
|
16
|
+
resources :meeting_closes, only: [:edit, :update]
|
17
|
+
resources :attachments
|
18
|
+
end
|
14
19
|
root to: "meetings#index"
|
15
20
|
end
|
16
21
|
|
17
22
|
def load_seed
|
18
23
|
nil
|
19
24
|
end
|
25
|
+
|
26
|
+
initializer "decidim_meetings.geocoder" do |_app|
|
27
|
+
if Decidim.geocoder.present?
|
28
|
+
Geocoder.configure(
|
29
|
+
# geocoding service (see below for supported options):
|
30
|
+
lookup: :here,
|
31
|
+
|
32
|
+
# IP address geocoding service (see below for supported options):
|
33
|
+
# :ip_lookup => :maxmind,
|
34
|
+
|
35
|
+
# to use an API key:
|
36
|
+
api_key: [Decidim.geocoder&.fetch(:here_app_id), Decidim.geocoder&.fetch(:here_app_code)]
|
37
|
+
|
38
|
+
# geocoding service request timeout, in seconds (default 3):
|
39
|
+
# :timeout => 5,
|
40
|
+
|
41
|
+
# set default units to kilometers:
|
42
|
+
# :units => :km,
|
43
|
+
|
44
|
+
# caching (see below for details):
|
45
|
+
# :cache => Redis.new,
|
46
|
+
# :cache_prefix => "..."
|
47
|
+
)
|
48
|
+
end
|
49
|
+
end
|
20
50
|
end
|
21
51
|
end
|
22
52
|
end
|
@@ -11,6 +11,11 @@ Decidim.register_feature(:meetings) do |feature|
|
|
11
11
|
raise StandardError, "Can't remove this feature" if Decidim::Meetings::Meeting.where(feature: instance).any?
|
12
12
|
end
|
13
13
|
|
14
|
+
feature.register_resource do |resource|
|
15
|
+
resource.model_class_name = "Decidim::Meetings::Meeting"
|
16
|
+
resource.template = "decidim/meetings/meetings/linked_meetings"
|
17
|
+
end
|
18
|
+
|
14
19
|
feature.seeds do
|
15
20
|
Decidim::ParticipatoryProcess.all.each do |process|
|
16
21
|
next unless process.steps.any?
|
@@ -30,17 +35,26 @@ Decidim.register_feature(:meetings) do |feature|
|
|
30
35
|
description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
|
31
36
|
Decidim::Faker::Localized.paragraph(3)
|
32
37
|
end,
|
33
|
-
short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
|
34
|
-
Decidim::Faker::Localized.paragraph(3)
|
35
|
-
end,
|
36
38
|
location: Decidim::Faker::Localized.sentence,
|
37
39
|
location_hints: Decidim::Faker::Localized.sentence,
|
38
40
|
start_time: 3.weeks.from_now,
|
39
41
|
end_time: 3.weeks.from_now + 4.hours,
|
40
|
-
address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}"
|
42
|
+
address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
|
43
|
+
latitude: Faker::Address.latitude,
|
44
|
+
longitude: Faker::Address.longitude
|
45
|
+
)
|
46
|
+
Decidim::Attachment.create!(
|
47
|
+
title: Decidim::Faker::Localized.sentence(2),
|
48
|
+
description: Decidim::Faker::Localized.sentence(5),
|
49
|
+
file: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
|
50
|
+
attached_to: meeting
|
51
|
+
)
|
52
|
+
Decidim::Attachment.create!(
|
53
|
+
title: Decidim::Faker::Localized.sentence(2),
|
54
|
+
description: Decidim::Faker::Localized.sentence(5),
|
55
|
+
file: File.new(File.join(File.dirname(__FILE__), "seeds", "Exampledocument.pdf")),
|
56
|
+
attached_to: meeting
|
41
57
|
)
|
42
|
-
|
43
|
-
Decidim::Comments::Seed.comments_for(meeting)
|
44
58
|
end
|
45
59
|
end
|
46
60
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
require "searchlight"
|
3
3
|
require "kaminari"
|
4
|
+
require "jquery-tmpl-rails"
|
4
5
|
|
5
6
|
module Decidim
|
6
7
|
module Meetings
|
@@ -11,9 +12,17 @@ module Decidim
|
|
11
12
|
isolate_namespace Decidim::Meetings
|
12
13
|
|
13
14
|
routes do
|
14
|
-
resources :meetings, only: [:index, :show]
|
15
|
+
resources :meetings, only: [:index, :show] do
|
16
|
+
member do
|
17
|
+
get :static_map
|
18
|
+
end
|
19
|
+
end
|
15
20
|
root to: "meetings#index"
|
16
21
|
end
|
22
|
+
|
23
|
+
initializer "decidim_meetings.assets" do |app|
|
24
|
+
app.config.assets.precompile += %w(decidim_meetings_manifest.js)
|
25
|
+
end
|
17
26
|
end
|
18
27
|
end
|
19
28
|
end
|
Binary file
|
Binary file
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
FactoryGirl.define do
|
3
|
+
factory :meeting, class: Decidim::Meetings::Meeting do
|
4
|
+
title { Decidim::Faker::Localized.sentence(3) }
|
5
|
+
description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
|
6
|
+
location { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
|
7
|
+
location_hints { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
|
8
|
+
address { Faker::Lorem.sentence(3) }
|
9
|
+
latitude { Faker::Address.latitude }
|
10
|
+
longitude { Faker::Address.longitude }
|
11
|
+
start_time { 1.day.from_now }
|
12
|
+
end_time { start_time.advance(hours: 2) }
|
13
|
+
feature { build(:feature, manifest_name: "meetings") }
|
14
|
+
|
15
|
+
trait :closed do
|
16
|
+
closing_report { Decidim::Faker::Localized.sentence(3) }
|
17
|
+
attendees_count { rand(50) }
|
18
|
+
contributions_count { rand(50) }
|
19
|
+
attending_organizations { Array.new(3) { Faker::GameOfThrones.house }.join(", ") }
|
20
|
+
closed_at { Time.current }
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -0,0 +1,78 @@
|
|
1
|
+
require "spec_helper"
|
2
|
+
|
3
|
+
describe Decidim::Meetings::Admin::CloseMeeting do
|
4
|
+
let(:meeting) { create :meeting }
|
5
|
+
let(:form) do
|
6
|
+
double(
|
7
|
+
:invalid? => invalid,
|
8
|
+
closing_report: { en: "Great meeting" },
|
9
|
+
attendees_count: 10,
|
10
|
+
contributions_count: 15,
|
11
|
+
attending_organizations: "Some organization",
|
12
|
+
closed_at: Time.current,
|
13
|
+
proposal_ids: proposal_ids
|
14
|
+
)
|
15
|
+
end
|
16
|
+
let(:proposal_feature) do
|
17
|
+
create(:feature, manifest_name: :proposals, participatory_process: meeting.feature.participatory_process)
|
18
|
+
end
|
19
|
+
let(:invalid) { false }
|
20
|
+
let(:proposals) do
|
21
|
+
create_list(
|
22
|
+
:proposal,
|
23
|
+
3,
|
24
|
+
feature: proposal_feature
|
25
|
+
)
|
26
|
+
end
|
27
|
+
let(:proposal_ids) { proposals.map(&:id) }
|
28
|
+
|
29
|
+
subject { described_class.new(form, meeting) }
|
30
|
+
|
31
|
+
context "when the form is not valid" do
|
32
|
+
let(:invalid) { true }
|
33
|
+
|
34
|
+
it "is not valid" do
|
35
|
+
expect { subject.call }.to broadcast(:invalid)
|
36
|
+
end
|
37
|
+
|
38
|
+
it "doesn't perform any other action" do
|
39
|
+
expect(meeting).not_to receive(:update_attributes!)
|
40
|
+
expect(Decidim::ResourceLink).not_to receive(:create!)
|
41
|
+
|
42
|
+
subject.call
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
context "when everything is ok" do
|
47
|
+
it "updates the meeting with the closing details" do
|
48
|
+
subject.call
|
49
|
+
|
50
|
+
expect(meeting).to be_closed
|
51
|
+
end
|
52
|
+
|
53
|
+
context "when previous proposals had been linked" do
|
54
|
+
let(:previous_proposals) { create_list(:proposal, 3, feature: proposal_feature) }
|
55
|
+
|
56
|
+
before do
|
57
|
+
meeting.link_resources(previous_proposals, "proposals_from_meeting")
|
58
|
+
end
|
59
|
+
|
60
|
+
it "unlinks them" do
|
61
|
+
expect(meeting.linked_resources(:proposals, "proposals_from_meeting")).to match_array(previous_proposals)
|
62
|
+
|
63
|
+
subject.call
|
64
|
+
|
65
|
+
expect(meeting.linked_resources(:proposals, "proposals_from_meeting").length).to eq(3)
|
66
|
+
expect(meeting.linked_resources(:proposals, "proposals_from_meeting")).not_to match_array(previous_proposals)
|
67
|
+
expect(meeting.linked_resources(:proposals, "proposals_from_meeting")).to match_array(proposals)
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
it "links to the given proposals" do
|
72
|
+
subject.call
|
73
|
+
|
74
|
+
expect(meeting.linked_resources(:proposals, "proposals_from_meeting").length).to eq(3)
|
75
|
+
expect(meeting.linked_resources(:proposals, "proposals_from_meeting")).to match_array(proposals)
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
@@ -3,26 +3,38 @@ require "spec_helper"
|
|
3
3
|
describe Decidim::Meetings::Admin::CreateMeeting do
|
4
4
|
let(:organization) { create :organization, available_locales: [:en] }
|
5
5
|
let(:participatory_process) { create :participatory_process, organization: organization }
|
6
|
-
let(:current_feature) { create :feature, participatory_process: participatory_process }
|
6
|
+
let(:current_feature) { create :feature, participatory_process: participatory_process, manifest_name: "meetings" }
|
7
7
|
let(:scope) { create :scope, organization: organization }
|
8
8
|
let(:category) { create :category, participatory_process: participatory_process }
|
9
|
+
let(:address) { "address" }
|
9
10
|
let(:form) do
|
10
11
|
double(
|
11
12
|
:invalid? => invalid,
|
12
13
|
title: {en: "title"},
|
13
14
|
description: {en: "description"},
|
14
|
-
short_description: {en: "short_description"},
|
15
15
|
location: {en: "location"},
|
16
16
|
location_hints: {en: "location_hints"},
|
17
17
|
start_time: 1.day.from_now,
|
18
18
|
end_time: 1.day.from_now + 1.hour,
|
19
|
-
address:
|
19
|
+
address: address,
|
20
20
|
scope: scope,
|
21
21
|
category: category,
|
22
22
|
current_feature: current_feature
|
23
23
|
)
|
24
24
|
end
|
25
25
|
let(:invalid) { false }
|
26
|
+
let(:latitude) { 40.1234 }
|
27
|
+
let(:longitude) { 2.1234 }
|
28
|
+
|
29
|
+
before do
|
30
|
+
Decidim.geocoder = {
|
31
|
+
here_app_id: "1234",
|
32
|
+
here_app_code: "5678"
|
33
|
+
}
|
34
|
+
Geocoder::Lookup::Test.add_stub(address, [
|
35
|
+
{ 'latitude' => latitude, 'longitude' => longitude }
|
36
|
+
])
|
37
|
+
end
|
26
38
|
|
27
39
|
subject { described_class.new(form) }
|
28
40
|
|
@@ -55,5 +67,12 @@ describe Decidim::Meetings::Admin::CreateMeeting do
|
|
55
67
|
subject.call
|
56
68
|
expect(meeting.feature).to eq current_feature
|
57
69
|
end
|
70
|
+
|
71
|
+
it "geocodes the meeting" do
|
72
|
+
subject.call
|
73
|
+
last_meeting = Decidim::Meetings::Meeting.last
|
74
|
+
expect(last_meeting.latitude).to eq(latitude)
|
75
|
+
expect(last_meeting.longitude).to eq(longitude)
|
76
|
+
end
|
58
77
|
end
|
59
78
|
end
|
@@ -1,26 +1,38 @@
|
|
1
1
|
require "spec_helper"
|
2
2
|
|
3
3
|
describe Decidim::Meetings::Admin::UpdateMeeting do
|
4
|
-
let(:meeting) { create
|
4
|
+
let(:meeting) { create(:meeting) }
|
5
5
|
let(:organization) { meeting.feature.organization }
|
6
6
|
let(:scope) { create :scope, organization: organization }
|
7
7
|
let(:category) { create :category, participatory_process: meeting.feature.participatory_process }
|
8
|
+
let(:address) { meeting.address }
|
8
9
|
let(:form) do
|
9
10
|
double(
|
10
11
|
:invalid? => invalid,
|
11
12
|
title: {en: "title"},
|
12
13
|
description: {en: "description"},
|
13
|
-
short_description: {en: "short_description"},
|
14
14
|
location: {en: "location"},
|
15
15
|
location_hints: {en: "location_hints"},
|
16
16
|
start_time: 1.day.from_now,
|
17
17
|
end_time: 1.day.from_now + 1.hour,
|
18
18
|
scope: scope,
|
19
19
|
category: category,
|
20
|
-
address:
|
20
|
+
address: address
|
21
21
|
)
|
22
22
|
end
|
23
23
|
let(:invalid) { false }
|
24
|
+
let(:latitude) { 40.1234 }
|
25
|
+
let(:longitude) { 2.1234 }
|
26
|
+
|
27
|
+
before do
|
28
|
+
Decidim.geocoder = {
|
29
|
+
here_app_id: "1234",
|
30
|
+
here_app_code: "5678"
|
31
|
+
}
|
32
|
+
Geocoder::Lookup::Test.add_stub(address, [
|
33
|
+
{ 'latitude' => latitude, 'longitude' => longitude }
|
34
|
+
])
|
35
|
+
end
|
24
36
|
|
25
37
|
subject { described_class.new(form, meeting) }
|
26
38
|
|
@@ -47,5 +59,22 @@ describe Decidim::Meetings::Admin::UpdateMeeting do
|
|
47
59
|
subject.call
|
48
60
|
expect(meeting.category).to eq category
|
49
61
|
end
|
62
|
+
|
63
|
+
context "when the address has not changed" do
|
64
|
+
it "doesn't geocode the meeting" do
|
65
|
+
expect(meeting).not_to receive(:geocode)
|
66
|
+
subject.call
|
67
|
+
end
|
68
|
+
end
|
69
|
+
|
70
|
+
context "when the address has changed" do
|
71
|
+
let(:address) { "New address" }
|
72
|
+
|
73
|
+
it "geocodes the meeting" do
|
74
|
+
allow(form).to receive_message_chain(:errors, :add)
|
75
|
+
expect(meeting).to receive(:geocode)
|
76
|
+
subject.call
|
77
|
+
end
|
78
|
+
end
|
50
79
|
end
|
51
80
|
end
|