diff --git a/Gemfile b/Gemfile index 675e738b1..ab00df68e 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'jquery-ui-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' -gem 'devise', '~> 3.5.6' +gem 'devise', '~> 3.5.7' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' gem 'omniauth' @@ -39,7 +39,7 @@ gem 'ckeditor', '~> 4.1.5' gem 'cancancan' gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc' gem 'initialjs-rails', '0.2.0.1' -gem 'unicorn', '~> 5.0.1' +gem 'unicorn', '~> 5.1.0' gem 'paranoia' gem 'rinku', require: 'rails_rinku' gem 'savon' @@ -52,13 +52,14 @@ gem 'newrelic_rpm', '~> 3.14' gem 'whenever', require: false gem 'pg_search' -gem 'ahoy_matey', '~> 1.2.1' +gem 'ahoy_matey', '~> 1.4.0' gem 'groupdate' # group temporary data gem 'tolk' # Web interface for translations gem 'browser' gem 'turnout' gem 'redcarpet' + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' @@ -73,7 +74,7 @@ group :development, :test do gem 'quiet_assets' gem 'letter_opener_web', '~> 1.3.0' gem 'i18n-tasks' - gem 'capistrano', '3.4.0', require: false + gem 'capistrano', '3.4.1', require: false gem "capistrano-bundler", '1.1.4', require: false gem "capistrano-rails", '1.1.6', require: false gem "capistrano-rvm", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 18fa95bd9..12cb537d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,14 +49,15 @@ GEM activerecord (>= 3.2, < 5) acts_as_votable (0.10.0) addressable (2.4.0) - ahoy_matey (1.2.1) + ahoy_matey (1.4.0) addressable - browser (>= 0.4.0) - errbase + browser (~> 2.0) geocoder - rails + rack-attack + railties referer-parser (>= 0.3.0) request_store + safely_block user_agent_parser uuidtools akami (1.3.1) @@ -70,15 +71,15 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bcrypt (3.1.10) - browser (1.1.0) + bcrypt (3.1.11) + browser (2.0.3) builder (3.2.2) bullet (5.0.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.9.0) - byebug (8.2.2) + byebug (8.2.4) cancancan (1.13.1) - capistrano (3.4.0) + capistrano (3.4.1) i18n rake (>= 10.0.0) sshkit (~> 1.3) @@ -91,9 +92,9 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano3-delayed-job (1.6.0) + capistrano3-delayed-job (1.7.0) capistrano (>= 3.0.0) - capybara (2.6.2) + capybara (2.7.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -125,14 +126,14 @@ GEM tins (~> 1.6.0) daemons (1.2.3) dalli (2.7.6) - database_cleaner (1.5.1) + database_cleaner (1.5.2) debug_inspector (0.0.2) delayed_job (4.1.1) activesupport (>= 3.0, < 5.0) delayed_job_active_record (4.1.0) activerecord (>= 3.0, < 5) delayed_job (>= 3.0, < 5) - devise (3.5.6) + devise (3.5.7) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -154,16 +155,16 @@ GEM errbase (0.0.3) erubis (2.7.0) execjs (2.6.0) - factory_girl (4.5.0) + factory_girl (4.7.0) activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) railties (>= 3.0.0) faker (1.6.3) i18n (~> 0.5) faraday (0.9.2) multipart-post (>= 1.2, < 3) - foundation-rails (6.2.0.1) + foundation-rails (6.2.1.0) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) @@ -176,7 +177,7 @@ GEM fuubar (2.0.0) rspec (~> 3.0) ruby-progressbar (~> 1.4) - geocoder (1.3.1) + geocoder (1.3.4) globalid (0.3.6) activesupport (>= 4.1.0) groupdate (2.5.2) @@ -208,7 +209,7 @@ GEM jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) - jwt (1.5.3) + jwt (1.5.4) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -223,9 +224,11 @@ GEM railties (>= 3.2) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.99.1) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mini_portile2 (2.0.0) minitest (5.8.4) multi_json (1.11.2) @@ -233,8 +236,8 @@ GEM multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.0.2) - newrelic_rpm (3.15.0.314) + net-ssh (3.1.1) + newrelic_rpm (3.15.1.316) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) nori (2.6.0) @@ -284,6 +287,8 @@ GEM rack (1.6.4) rack-accept (0.4.5) rack (>= 0.4) + rack-attack (4.4.1) + rack rack-test (0.6.3) rack (>= 1.0) rails (4.2.6) @@ -310,12 +315,12 @@ GEM activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.15.0) - rake (11.1.1) + raindrops (0.16.0) + rake (11.1.2) redcarpet (3.3.4) referer-parser (0.3.0) - request_store (1.3.0) - responders (2.1.1) + request_store (1.3.1) + responders (2.1.2) railties (>= 4.2.0, < 5.1) rinku (1.7.3) rollbar (2.8.3) @@ -343,7 +348,9 @@ GEM rspec-support (3.4.1) ruby-progressbar (1.7.5) safe_yaml (1.0.4) - sass (3.4.21) + safely_block (0.1.0) + errbase + sass (3.4.22) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -365,10 +372,10 @@ GEM json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - spring (1.6.4) + spring (1.7.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.5.2) + sprockets (3.6.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-es6 (0.9.0) @@ -379,7 +386,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.8.1) + sshkit (1.9.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) term-ansicolor (1.3.2) @@ -395,17 +402,16 @@ GEM safe_yaml (>= 0.8.6) turbolinks (2.5.3) coffee-rails - turnout (2.2.1) + turnout (2.3.0) rack (~> 1.3) rack-accept (~> 0.4) + tilt (>= 1.4, < 3) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - unicorn (5.0.1) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) + unicorn (5.1.0) kgio (~> 2.6) - rack raindrops (~> 0.7) uniform_notifier (1.9.0) user_agent_parser (2.3.0) @@ -433,13 +439,13 @@ PLATFORMS DEPENDENCIES acts-as-taggable-on acts_as_votable - ahoy_matey (~> 1.2.1) + ahoy_matey (~> 1.4.0) ancestry browser bullet byebug cancancan - capistrano (= 3.4.0) + capistrano (= 3.4.1) capistrano-bundler (= 1.1.4) capistrano-rails (= 1.1.6) capistrano-rvm @@ -452,7 +458,7 @@ DEPENDENCIES dalli database_cleaner delayed_job_active_record (~> 4.1.0) - devise (~> 3.5.6) + devise (~> 3.5.7) devise-async email_spec factory_girl_rails @@ -494,7 +500,7 @@ DEPENDENCIES turbolinks turnout uglifier (>= 1.3.0) - unicorn (~> 5.0.1) + unicorn (~> 5.1.0) web-console (~> 3.0) whenever diff --git a/README.md b/README.md index 251a0f8e3..e6181f38c 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ bin/rails s ``` -Prerequisites for testing: install PhantomJS >= 2.0 +Prerequisites for testing: install PhantomJS >= 1.9.8 Run the tests with: @@ -56,10 +56,26 @@ Run the tests with: bin/rspec ``` -## Licence +You can use the default admin user from the seeds file: + + **user:** admin@madrid.es + **pass:** 12345678 + +But for some actions like voting, you will need a verified user, the seeds file also includes one: + + **user:** verified@madrid.es + **pass:** 12345678 + +### OAuth + +To test authentication services with external OAuth suppliers - right now Twitter, Facebook and Google - you'll need to create an "application" in each of the supported platforms and set the *key* and *secret* provided in your *secrets.yml* + +In the case of Google, verify that the APIs *Contacts API* and *Google+ API* are enabled for the application. + +## License Code published under AFFERO GPL v3 (see [LICENSE-AGPLv3.txt](LICENSE-AGPLv3.txt)) ## Contributions -See [CONTRIBUTING_EN.md](CONTRIBUTING_EN.md) \ No newline at end of file +See [CONTRIBUTING_EN.md](CONTRIBUTING_EN.md) diff --git a/README_ES.md b/README_ES.md index c3fd3cdff..e0392bc51 100644 --- a/README_ES.md +++ b/README_ES.md @@ -47,7 +47,7 @@ Para ejecutar la aplicación en local: bin/rails s ``` -Prerequisitos para los tests: tener instalado PhantomJS >= 2.0 +Prerequisitos para los tests: tener instalado PhantomJS >= 1.9.8 Para ejecutar los tests: @@ -55,6 +55,17 @@ Para ejecutar los tests: bin/rspec ``` +Puedes usar el usuario administrador por defecto del fichero seeds: + + **user:** admin@madrid.es + **pass:** 12345678 + +Pero para ciertas acciones, como apoyar, necesitarás un usuario verificado, el fichero seeds proporciona uno: + + **user:** verified@madrid.es + **pass:** 12345678 + + ### OAuth Para probar los servicios de autenticación mediante proveedores externos OAuth — en este momento Twitter, Facebook y Google —, necesitas crear una "aplicación" en cada una de las plataformas soportadas y configurar la *key* y el *secret* proporcionados en tu *secrets.yml* diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 7323d578f..5fe0c1d3d 100644 Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index e272b9550..51044c3e2 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -48,4 +48,5 @@ + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 4db54078d..b0b156581 100644 Binary files a/app/assets/fonts/icons.ttf and b/app/assets/fonts/icons.ttf differ diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index 33d2d4dee..edcc9bc61 100644 Binary files a/app/assets/fonts/icons.woff and b/app/assets/fonts/icons.woff differ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 68d9c636c..e24d144bb 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -43,6 +43,7 @@ //= require forms //= require tracks //= require valuation_spending_proposal_form +//= require embed_video var initialize_modules = function() { App.Comments.initialize(); @@ -61,6 +62,7 @@ var initialize_modules = function() { App.Forms.initialize(); App.Tracks.initialize(); App.ValuationSpendingProposalForm.initialize(); + App.EmbedVideo.initialize(); }; $(function(){ diff --git a/app/assets/javascripts/embed_video.js.coffee b/app/assets/javascripts/embed_video.js.coffee new file mode 100644 index 000000000..85c18ac8e --- /dev/null +++ b/app/assets/javascripts/embed_video.js.coffee @@ -0,0 +1,7 @@ +App.EmbedVideo = + + initialize: -> + $('#js-embedded-video').each -> + code = $(this).data("video-code") + $('#js-embedded-video').html(code) + \ No newline at end of file diff --git a/app/assets/javascripts/votes.js.coffee b/app/assets/javascripts/votes.js.coffee index 43469909d..e4223c644 100644 --- a/app/assets/javascripts/votes.js.coffee +++ b/app/assets/javascripts/votes.js.coffee @@ -5,11 +5,13 @@ App.Votes = $("div.anonymous-votes", votes).show(); $("div.organizations-votes", votes).show(); $("div.not-logged", votes).show(); + $("div.no-supports-allowed", votes).show(); $("div.logged", votes).hide(); , -> $("div.anonymous-votes", votes).hide(); $("div.organizations-votes", votes).hide(); $("div.not-logged", votes).hide(); + $("div.no-supports-allowed", votes).hide(); $("div.logged", votes).show(); initialize: -> diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index e01655f6d..1ccd7c880 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -116,7 +116,7 @@ body.admin { [class^="icon-"] { display: inline-block; font-size: rem-calc(24); - padding-right: rem-calc(24); + padding-right: rem-calc(12); padding-top: rem-calc(4); padding-left: 12px\9 !important; padding-right: 12px\9 !important; @@ -349,3 +349,22 @@ body.admin { margin-bottom: 0; } +body.admin { + + .investment-projects-list.medium-9 { + width: 100%; + } +} + +.admin-content .select-geozone { + + a { + display: block; + + &.active { + color: $brand; + font-weight: bold; + text-decoration: underline; + } + } +} diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 822e4cd4c..68065e82a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,4 +11,4 @@ @import "annotator.min"; @import "annotator_overrides"; @import "jquery-ui/datepicker"; -@import "datepicker_overrides"; \ No newline at end of file +@import "datepicker_overrides"; diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index b13b09f46..2c06f745a 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -160,3 +160,6 @@ .icon-no-notification:before { content: "\78"; } +.icon-whatsapp:before { + content: "\50"; +} diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index bc6aa3694..d897a2a28 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -164,10 +164,12 @@ .progress { background-color: rgba(255,255,255,.8); - height: rem-calc(12); + height: $line-height/2; .meter { background: $votes-like; + display: block; + height: $line-height/2; } } @@ -238,7 +240,7 @@ } } - .anonymous-votes, .organizations-votes { + .anonymous-votes, .organizations-votes, .no-supports-allowed { background: $warning-bg; color: $warning-color; height: 100%; @@ -274,7 +276,7 @@ .debate-new, .debate-edit, .proposal-new, .proposal-edit, -.spending-proposal-new, .spending-proposal-edit { +.spending-proposal-new, .spending-proposal-edit { .back { @include back; @@ -335,13 +337,30 @@ // 03. Show participation // - - - - - - - - - - - - - - - - - - - - - - - - - -.debate-show, .proposal-show { +.debate-show, .proposal-show, .investment-project-show { + + p { + word-wrap: break-word; + } + + .social-share-full .social-share-button { + display:inline; + } + + .whatsapp:before { + background-color: #43d854; + color: white; + font-size: 1.7em; + margin-left: rem-calc(0.5); + padding: rem-calc(9.5) rem-calc(9.8); + vertical-align: rem-calc(10); + } .edit-debate, .edit-proposal { margin-bottom: 0; } - .debate-info, .proposal-info { + .debate-info, .proposal-info, .investment-project-info { clear: both; color: $text-medium; font-size: $small-font-size; @@ -532,7 +551,7 @@ } } -.debate, .proposal { +.debate, .proposal, .investment-project { margin-bottom: 0; margin-top: 0; @@ -551,7 +570,7 @@ padding-bottom: rem-calc(12); } - .label-debate, .label-proposal { + .label-debate, .label-proposal, .label-investment-project { background: none; clear: both; display: block; @@ -573,6 +592,10 @@ color: $proposals; } + .label-investment-project { + color: $budget; + } + h3 { font-weight: bold; margin: 0; @@ -582,7 +605,7 @@ } } - .debate-content, .proposal-content { + .debate-content, .proposal-content, .investment-project-content { margin: 0; min-height: rem-calc(180); position: relative; @@ -592,24 +615,27 @@ } } - .icon-debates, .icon-proposals { + .icon-debates, .icon-proposals, .icon-budget { font-size: rem-calc(18); line-height: $line-height; - position: absolute; + margin-left: rem-calc(6); top: 0; } .icon-debates { color: $debates; - left: rem-calc(48); } .icon-proposals { color: $proposals; - left: rem-calc(72); } - .debate-info, .proposal-info { + .icon-budget { + color: $budget; + font-size: $small-font-size; + } + + .debate-info, .proposal-info, .investment-project-info { color: $text-medium; font-size: $small-font-size; margin: rem-calc(6) 0 0; @@ -624,7 +650,7 @@ } } - .debate-description, .proposal-description { + .debate-description, .proposal-description, .investment-project-description { color: $text; font-size: rem-calc(13); height: rem-calc(72); @@ -785,6 +811,62 @@ } } +.investment-project, .investment-project-show { + + .supports { + @include supports; + background: none; + border: 0; + border-left: 1px solid $border; + margin: 0 rem-calc(-12); + min-height: rem-calc(180); + padding-top: $line-height*2; + + &:after { + content: none; + } + + .button-support { + background: $budget; + color: white; + + &:hover { + background: $budget-hover; + color: white; + cursor: pointer; + } + + &:active { + opacity: .75; + } + } + + .total-supports { + color: $budget; + font-size: $base-font-size; + font-weight: bold; + } + + .supported { + color: $budget; + } + + .no-supports-allowed { + background: rgba(69,67,114,.96); + color: white; + padding: rem-calc(12); + } + + .no-supports-allowed p, .no-supports-allowed a { + color: white; + } + } +} + +.investment-project-show .supports { + border: 0; +} + .proposals-summary { .panel { @@ -792,6 +874,12 @@ } } +.investment-project .supports .total-supports.no-button, +.investment-project-show .supports .total-supports.no-button { + display: block; + margin-top: $line-height*1.5; +} + // 05. Featured // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index 6882442d1..5d59ebf8f 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -74,6 +74,7 @@ $proposals: #FFA42D; $proposals-border: #CC8425; $budget: #454372; +$budget-hover: #7571BF; $highlight: #E7F2FC; $featured: #FED900; diff --git a/app/controllers/admin/api/stats_controller.rb b/app/controllers/admin/api/stats_controller.rb index dfedb1c54..e58d9d754 100644 --- a/app/controllers/admin/api/stats_controller.rb +++ b/app/controllers/admin/api/stats_controller.rb @@ -1,7 +1,9 @@ class Admin::Api::StatsController < Admin::Api::BaseController def show - unless params[:events].present? || params[:visits].present? + unless params[:events].present? || + params[:visits].present? || + params[:spending_proposals].present? return render json: {}, status: :bad_request end @@ -18,7 +20,10 @@ class Admin::Api::StatsController < Admin::Api::BaseController ds.add "Visits", Visit.group_by_day(:started_at).count end + if params[:spending_proposals].present? + ds.add "Spending proposals", SpendingProposal.group_by_day(:created_at).count + end + render json: ds.build end - end diff --git a/app/controllers/admin/spending_proposals_controller.rb b/app/controllers/admin/spending_proposals_controller.rb index 25707e66e..e7d1cc45c 100644 --- a/app/controllers/admin/spending_proposals_controller.rb +++ b/app/controllers/admin/spending_proposals_controller.rb @@ -7,7 +7,7 @@ class Admin::SpendingProposalsController < Admin::BaseController load_and_authorize_resource def index - @spending_proposals = SpendingProposal.search(params, @current_filter).order(created_at: :desc).page(params[:page]) + @spending_proposals = SpendingProposal.scoped_filter(params, @current_filter).order(created_at: :desc).page(params[:page]) end def show @@ -21,10 +21,8 @@ class Admin::SpendingProposalsController < Admin::BaseController def update if @spending_proposal.update(spending_proposal_params) - path = admin_spending_proposal_path( @spending_proposal, - { anchor: 'classification' }.merge(SpendingProposal.filter_params(params))) - - redirect_to path, notice: t("flash.actions.update.spending_proposal") + redirect_to admin_spending_proposal_path(@spending_proposal, SpendingProposal.filter_params(params)), + notice: t("flash.actions.update.spending_proposal") else render :edit end @@ -33,7 +31,7 @@ class Admin::SpendingProposalsController < Admin::BaseController private def spending_proposal_params - params.require(:spending_proposal).permit(:administrator_id, :tag_list, valuator_ids: []) + params.require(:spending_proposal).permit(:title, :description, :external_url, :geozone_id, :association_name, :administrator_id, :tag_list, valuator_ids: []) end end diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb index f724a054c..f21ceea9b 100644 --- a/app/controllers/admin/stats_controller.rb +++ b/app/controllers/admin/stats_controller.rb @@ -18,10 +18,10 @@ class Admin::StatsController < Admin::BaseController @verified_users = User.with_hidden.level_two_or_three_verified.count @unverified_users = User.with_hidden.unverified.count @users = User.with_hidden.count - - @user_ids_who_voted_proposals = - ActsAsVotable::Vote.where(votable_type: 'Proposal').pluck(:voter_id).uniq.count + @user_ids_who_voted_proposals = + ActsAsVotable::Vote.where(votable_type: 'Proposal').pluck(:voter_id).uniq.count @user_ids_who_didnt_vote_proposals = @verified_users - @user_ids_who_voted_proposals - end + @spending_proposals = SpendingProposal.count + end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 280dd0c4d..640adf299 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -77,6 +77,10 @@ class ApplicationController < ActionController::Base @proposal_votes = current_user ? current_user.proposal_votes(proposals) : {} end + def set_spending_proposal_votes(spending_proposals) + @spending_proposal_votes = current_user ? current_user.spending_proposal_votes(spending_proposals) : {} + end + def set_comment_flags(comments) @comment_flags = current_user ? current_user.comment_flags(comments) : {} end diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb index 855ad1de5..01066c8ad 100644 --- a/app/controllers/concerns/commentable_actions.rb +++ b/app/controllers/concerns/commentable_actions.rb @@ -65,8 +65,7 @@ module CommentableActions end end - - def map + def map @resource = resource_model.new @tag_cloud = tag_cloud end diff --git a/app/controllers/management/account_controller.rb b/app/controllers/management/account_controller.rb new file mode 100644 index 000000000..85b9feea4 --- /dev/null +++ b/app/controllers/management/account_controller.rb @@ -0,0 +1,13 @@ +class Management::AccountController < Management::BaseController + + before_action :only_verified_users + + def show + end + + private + def only_verified_users + check_verified_user t("management.account.alert.unverified_user") + end + +end diff --git a/app/controllers/management/base_controller.rb b/app/controllers/management/base_controller.rb index bced745b4..f01bbebbc 100644 --- a/app/controllers/management/base_controller.rb +++ b/app/controllers/management/base_controller.rb @@ -20,6 +20,16 @@ class Management::BaseController < ActionController::Base @managed_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number]) end + def current_user + managed_user + end + + def check_verified_user(alert_msg) + unless current_user.level_two_or_three_verified? + redirect_to management_document_verifications_path, alert: alert_msg + end + end + def set_locale if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym) session[:locale] = params[:locale] diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb index 6e01a8c77..3f4284a06 100644 --- a/app/controllers/management/proposals_controller.rb +++ b/app/controllers/management/proposals_controller.rb @@ -2,7 +2,7 @@ class Management::ProposalsController < Management::BaseController include HasOrders include CommentableActions - before_action :check_verified_user, except: :print + before_action :only_verified_users, except: :print before_action :set_proposal, only: [:vote, :show] before_action :parse_search_terms, only: :index before_action :load_categories, only: [:new, :edit] @@ -40,14 +40,8 @@ class Management::ProposalsController < Management::BaseController Proposal end - def check_verified_user - unless current_user.level_two_or_three_verified? - redirect_to management_document_verifications_path, alert: t("management.proposals.alert.unverified_user") - end - end - - def current_user - managed_user + def only_verified_users + check_verified_user t("management.proposals.alert.unverified_user") end ### Duplicated in application_controller. Move to a concern. diff --git a/app/controllers/management/spending_proposals_controller.rb b/app/controllers/management/spending_proposals_controller.rb index 3a17d86b1..49378ca63 100644 --- a/app/controllers/management/spending_proposals_controller.rb +++ b/app/controllers/management/spending_proposals_controller.rb @@ -1,6 +1,12 @@ class Management::SpendingProposalsController < Management::BaseController - before_action :check_verified_user + before_action :only_verified_users, except: :print + before_action :set_spending_proposal, only: [:vote, :show] + + def index + @spending_proposals = apply_filters_and_search(SpendingProposal).order(cached_votes_up: :desc).page(params[:page]).for_render + set_spending_proposal_votes(@spending_proposals) + end def new @spending_proposal = SpendingProposal.new @@ -18,23 +24,55 @@ class Management::SpendingProposalsController < Management::BaseController end def show - @spending_proposal = SpendingProposal.find(params[:id]) + set_spending_proposal_votes(@spending_proposal) + end + + def vote + @spending_proposal.register_vote(current_user, 'yes') + set_spending_proposal_votes(@spending_proposal) + end + + def print + params[:geozone] ||= 'all' + @spending_proposals = apply_filters_and_search(SpendingProposal).order(cached_votes_up: :desc).for_render.limit(15) + set_spending_proposal_votes(@spending_proposals) end private + def set_spending_proposal + @spending_proposal = SpendingProposal.find(params[:id]) + end + def spending_proposal_params params.require(:spending_proposal).permit(:title, :description, :external_url, :geozone_id, :terms_of_service, :captcha, :captcha_key) end - def check_verified_user - unless current_user.level_two_or_three_verified? - redirect_to management_document_verifications_path, alert: t("management.spending_proposals.alert.unverified_user") + def only_verified_users + check_verified_user t("management.spending_proposals.alert.unverified_user") + end + + # This should not be necessary. Maybe we could create a specific show view for managers. + def set_spending_proposal_votes(spending_proposals) + @spending_proposal_votes = current_user ? current_user.spending_proposal_votes(spending_proposals) : {} + end + + def set_geozone_name + if params[:geozone] == 'all' + @geozone_name = t('geozones.none') + else + @geozone_name = Geozone.find(params[:geozone]).name end end - def current_user - managed_user + def apply_filters_and_search(target) + target = params[:unfeasible].present? ? target.unfeasible : target.not_unfeasible + if params[:geozone].present? + target = target.by_geozone(params[:geozone]) + set_geozone_name + end + target = target.search(params[:search]) if params[:search].present? + target end end diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb index 53c432fd1..8ee04cfdf 100644 --- a/app/controllers/management/users_controller.rb +++ b/app/controllers/management/users_controller.rb @@ -18,6 +18,12 @@ class Management::UsersController < Management::BaseController end end + def erase + managed_user.erase(t("management.users.erased_by_manager", manager: current_manager['login'])) if current_manager.present? + destroy_session + redirect_to management_document_verifications_path, notice: t("management.users.erased_notice") + end + def logout destroy_session redirect_to management_root_url, notice: t("management.sessions.signed_out_managed_user") diff --git a/app/controllers/spending_proposals_controller.rb b/app/controllers/spending_proposals_controller.rb index 9b64c462d..9915b0b50 100644 --- a/app/controllers/spending_proposals_controller.rb +++ b/app/controllers/spending_proposals_controller.rb @@ -1,21 +1,28 @@ class SpendingProposalsController < ApplicationController include FeatureFlags - load_and_authorize_resource - before_action :authenticate_user!, except: [:index] - before_action :verify_access, only: [:show] - before_filter -> { flash.now[:notice] = flash[:notice].html_safe if flash[:html_safe] && flash[:notice] } + before_action -> { flash.now[:notice] = flash[:notice].html_safe if flash[:html_safe] && flash[:notice] } + + load_and_authorize_resource feature_flag :spending_proposals + respond_to :html, :js + def index + @spending_proposals = apply_filters_and_search(SpendingProposal).page(params[:page]).for_render + set_spending_proposal_votes(@spending_proposals) end def new @spending_proposal = SpendingProposal.new end + def show + set_spending_proposal_votes(@spending_proposal) + end + def create @spending_proposal = SpendingProposal.new(spending_proposal_params) @spending_proposal.author = current_user @@ -29,19 +36,38 @@ class SpendingProposalsController < ApplicationController end def destroy - spending_proposal = current_user.spending_proposals.find(params[:id]) + spending_proposal = SpendingProposal.find(params[:id]) spending_proposal.destroy redirect_to user_path(current_user, filter: 'spending_proposals'), notice: t('flash.actions.destroy.spending_proposal') end + def vote + @spending_proposal.register_vote(current_user, 'yes') + set_spending_proposal_votes(@spending_proposal) + end + private def spending_proposal_params params.require(:spending_proposal).permit(:title, :description, :external_url, :geozone_id, :association_name, :terms_of_service, :captcha, :captcha_key) end - def verify_access - raise CanCan::AccessDenied unless current_user.try(:valuator?) || current_user.try(:administrator?) || @spending_proposal.author == current_user + def set_geozone_name + if params[:geozone] == 'all' + @geozone_name = t('geozones.none') + else + @geozone_name = Geozone.find(params[:geozone]).name + end + end + + def apply_filters_and_search(target) + target = params[:unfeasible].present? ? target.unfeasible : target.not_unfeasible + if params[:geozone].present? + target = target.by_geozone(params[:geozone]) + set_geozone_name + end + target = target.search(params[:search]) if params[:search].present? + target end end diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 0bdd2a801..81eaa08cb 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -41,9 +41,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController end def save_user(user) - @user.save || - @user.save_requiring_finish_signup || - @user.save_requiring_finish_signup_without_email + @user.save || @user.save_requiring_finish_signup end end diff --git a/app/controllers/valuation/spending_proposals_controller.rb b/app/controllers/valuation/spending_proposals_controller.rb index f8c63c974..d3bc585b1 100644 --- a/app/controllers/valuation/spending_proposals_controller.rb +++ b/app/controllers/valuation/spending_proposals_controller.rb @@ -9,8 +9,9 @@ class Valuation::SpendingProposalsController < Valuation::BaseController load_and_authorize_resource def index + @geozone_filters = geozone_filters if current_user.valuator? - @spending_proposals = SpendingProposal.search(params_for_current_valuator, @current_filter).order(created_at: :desc).page(params[:page]) + @spending_proposals = SpendingProposal.scoped_filter(params_for_current_valuator, @current_filter).order(cached_votes_up: :desc).page(params[:page]) else @spending_proposals = SpendingProposal.none.page(params[:page]) end @@ -18,6 +19,11 @@ class Valuation::SpendingProposalsController < Valuation::BaseController def valuate if valid_price_params? && @spending_proposal.update(valuation_params) + + if @spending_proposal.unfeasible_email_pending? + @spending_proposal.send_unfeasible_email + end + redirect_to valuation_spending_proposal_path(@spending_proposal), notice: t('valuation.spending_proposals.notice.valuate') else render action: :edit @@ -26,6 +32,25 @@ class Valuation::SpendingProposalsController < Valuation::BaseController private + def geozone_filters + spending_proposals = SpendingProposal.by_valuator(current_user.valuator.try(:id)).valuation_open.all.to_a + + [ { name: t('valuation.spending_proposals.index.geozone_filter_all'), + id: nil, + pending_count: spending_proposals.size + }, + { name: t('geozones.none'), + id: 'all', + pending_count: spending_proposals.count{|x| x.geozone_id.nil?} + } + ] + Geozone.all.order(name: :asc).collect do |g| + { name: g.name, + id: g.id, + pending_count: spending_proposals.count{|x| x.geozone_id == g.id} + } + end.select{ |x| x[:pending_count] > 0 } + end + def valuation_params params[:spending_proposal][:feasible] = nil if params[:spending_proposal][:feasible] == 'nil' diff --git a/app/helpers/embed_videos_helper.rb b/app/helpers/embed_videos_helper.rb new file mode 100644 index 000000000..b48799bf5 --- /dev/null +++ b/app/helpers/embed_videos_helper.rb @@ -0,0 +1,30 @@ +module EmbedVideosHelper + + def embedded_video_code + link = @proposal.video_url + if link.match(/vimeo.*/) + server = "Vimeo" + elsif link.match(/youtu*.*/) + server = "YouTube" + end + + if server == "Vimeo" + regExp = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/ + src = "https://player.vimeo.com/video/" + elsif server == "YouTube" + regExp = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/ + src = "https://www.youtube.com/embed/" + end + + if regExp + match = link.match(regExp) + end + + if match and match[2] + '' + else + '' + end + end + +end \ No newline at end of file diff --git a/app/helpers/spending_proposals_helper.rb b/app/helpers/spending_proposals_helper.rb index 43ef7311a..ba68ad42a 100644 --- a/app/helpers/spending_proposals_helper.rb +++ b/app/helpers/spending_proposals_helper.rb @@ -3,4 +3,14 @@ module SpendingProposalsHelper def spending_proposal_tags_select_options ActsAsTaggableOn::Tag.spending_proposal_tags.pluck(:name) end + + def namespaced_spending_proposal_path(spending_proposal, options={}) + @namespace_spending_proposal_path ||= namespace + case @namespace_spending_proposal_path + when "management" + management_spending_proposal_path(spending_proposal, options) + else + spending_proposal_path(spending_proposal, options) + end + end end \ No newline at end of file diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb index 5116b60dd..097711b88 100644 --- a/app/helpers/stats_helper.rb +++ b/app/helpers/stats_helper.rb @@ -14,4 +14,10 @@ module StatsHelper content_tag :div, "", opt end + def spending_proposals_chart_tag(opt={}) + events = events.join(',') if events.is_a? Array + opt[:data] ||= {} + opt[:data][:graph] = admin_api_stats_path(spending_proposals: true) + content_tag :div, "", opt + end end diff --git a/app/helpers/valuation_helper.rb b/app/helpers/valuation_helper.rb index 9e3a054c1..0983ea567 100644 --- a/app/helpers/valuation_helper.rb +++ b/app/helpers/valuation_helper.rb @@ -2,9 +2,9 @@ module ValuationHelper def valuator_select_options(valuator=nil) if valuator.present? - Valuator.where.not(id: valuator.id).order('users.username asc').includes(:user).collect { |v| [ v.name, v.id ] }.prepend([valuator.name, valuator.id]) + Valuator.where.not(id: valuator.id).order("description ASC").order("users.email ASC").includes(:user).collect { |v| [ v.description_or_email, v.id ] }.prepend([valuator.description_or_email, valuator.id]) else - Valuator.all.order('users.username asc').includes(:user).collect { |v| [ v.name, v.id ] } + Valuator.all.order("description ASC").order("users.email ASC").includes(:user).collect { |v| [ v.description_or_email, v.id ] } end end diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index 356f2ea45..82abbb205 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -7,7 +7,7 @@ class Mailer < ApplicationMailer @comment = comment @commentable = comment.commentable with_user(@commentable.author) do - mail(to: @commentable.author.email, subject: t('mailers.comment.subject', commentable: t("activerecord.models.#{@commentable.class.name.downcase}", count: 1).downcase)) if @commentable.present? && @commentable.author.present? + mail(to: @commentable.author.email, subject: t('mailers.comment.subject', commentable: t("activerecord.models.#{@commentable.class.name.underscore}", count: 1).downcase)) if @commentable.present? && @commentable.author.present? end end @@ -33,6 +33,15 @@ class Mailer < ApplicationMailer end end + def unfeasible_spending_proposal(spending_proposal) + @spending_proposal = spending_proposal + @author = spending_proposal.author + + with_user(@author) do + mail(to: @author.email, subject: t('mailers.unfeasible_spending_proposal.subject', code: @spending_proposal.code)) + end + end + private def with_user(user, &block) diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 78cb60806..1b440795f 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -37,7 +37,7 @@ module Abilities can :manage, Annotation - can [:read, :update], SpendingProposal + can [:read, :update, :destroy], SpendingProposal end end end diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb index 92eacea52..5bb43725b 100644 --- a/app/models/abilities/common.rb +++ b/app/models/abilities/common.rb @@ -43,8 +43,8 @@ module Abilities if user.level_two_or_three_verified? can :vote, Proposal can :vote_featured, Proposal + can :vote, SpendingProposal can :create, SpendingProposal - can :destroy, SpendingProposal, author_id: user.id end can :create, Annotation diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb index 237da73f7..d8ae2acf0 100644 --- a/app/models/spending_proposal.rb +++ b/app/models/spending_proposal.rb @@ -2,8 +2,10 @@ class SpendingProposal < ActiveRecord::Base include Measurable include Sanitizable include Taggable + include Searchable apply_simple_captcha + acts_as_votable belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :geozone @@ -24,12 +26,17 @@ class SpendingProposal < ActiveRecord::Base scope :managed, -> { valuation_open.where(valuation_assignments_count: 0).where("administrator_id IS NOT ?", nil) } scope :valuating, -> { valuation_open.where("valuation_assignments_count > 0 AND valuation_finished = ?", false) } scope :valuation_finished, -> { where(valuation_finished: true) } + scope :feasible, -> { where(feasible: true) } + scope :unfeasible, -> { where(feasible: false) } + scope :not_unfeasible, -> { where("feasible IS ? OR feasible = ?", nil, true) } scope :by_admin, -> (admin) { where(administrator_id: admin.presence) } scope :by_tag, -> (tag_name) { tagged_with(tag_name) } scope :by_valuator, -> (valuator) { where("valuation_assignments.valuator_id = ?", valuator.presence).joins(:valuation_assignments) } - scope :for_render, -> { includes(:geozone, administrator: :user, valuators: :user) } + scope :for_render, -> { includes(:geozone) } + + before_validation :set_responsible_name def description super.try :html_safe @@ -39,14 +46,26 @@ class SpendingProposal < ActiveRecord::Base params.select{|x,_| %w{geozone_id administrator_id tag_name valuator_id}.include? x.to_s } end - def self.search(params, current_filter) + def self.scoped_filter(params, current_filter) results = self results = results.by_geozone(params[:geozone_id]) if params[:geozone_id].present? results = results.by_admin(params[:administrator_id]) if params[:administrator_id].present? results = results.by_tag(params[:tag_name]) if params[:tag_name].present? results = results.by_valuator(params[:valuator_id]) if params[:valuator_id].present? results = results.send(current_filter) if current_filter.present? - results.for_render + results.includes(:geozone, administrator: :user, valuators: :user) + end + + def searchable_values + { title => 'A', + author.username => 'B', + geozone.try(:name) => 'B', + description => 'C' + } + end + + def self.search(terms) + self.pg_search(terms) end def self.by_geozone(geozone) @@ -68,4 +87,51 @@ class SpendingProposal < ActiveRecord::Base end end + def unfeasible_email_pending? + unfeasible_email_sent_at.blank? && unfeasible? && valuation_finished? + end + + def unfeasible? + feasible == false + end + + def valuation_finished? + valuation_finished + end + + def total_votes + cached_votes_up + physical_votes + end + + def code + "#{created_at.strftime('%Y')}-#{id}" + (administrator.present? ? "-A#{administrator.id}" : "") + end + + def send_unfeasible_email + Mailer.unfeasible_spending_proposal(self).deliver_later + update(unfeasible_email_sent_at: Time.now) + end + + def reason_for_not_being_votable_by(user) + return :not_voting_allowed if Setting["feature.spending_proposal_features.voting_allowed"].blank? + return :not_logged_in unless user + return :not_verified unless user.can?(:vote, SpendingProposal) + return :unfeasible if unfeasible? + return :organization if user.organization? + end + + def votable_by?(user) + reason_for_not_being_votable_by(user).blank? + end + + def register_vote(user, vote_value) + if votable_by?(user) + vote_by(voter: user, vote: vote_value) + end + end + + def set_responsible_name + self.responsible_name = author.try(:document_number) if author.try(:document_number).present? + end + end diff --git a/app/models/user.rb b/app/models/user.rb index 3b58fb607..ea889ac57 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -26,7 +26,7 @@ class User < ActiveRecord::Base belongs_to :geozone validates :username, presence: true, if: :username_required? - validates :username, uniqueness: true, if: :username_required? + validates :username, uniqueness: { scope: :registering_with_oauth }, if: :username_required? validates :document_number, uniqueness: { scope: :document_type }, allow_nil: true validate :validate_username_length @@ -83,6 +83,11 @@ class User < ActiveRecord::Base voted.each_with_object({}) { |v, h| h[v.votable_id] = v.value } end + def spending_proposal_votes(spending_proposals) + voted = votes.for_spending_proposals(spending_proposals) + voted.each_with_object({}) { |v, h| h[v.votable_id] = v.value } + end + def comment_flags(comments) comment_flags = flags.for_comments(comments) comment_flags.each_with_object({}){ |f, h| h[f.flaggable_id] = true } @@ -149,6 +154,7 @@ class User < ActiveRecord::Base confirmed_phone: nil, unconfirmed_phone: nil ) + self.identities.destroy_all end def erased? @@ -177,11 +183,11 @@ class User < ActiveRecord::Base end def username_required? - !organization? && !erased? && !registering_with_oauth + !organization? && !erased? end def email_required? - !erased? && !registering_with_oauth + !erased? end def has_official_email? @@ -210,12 +216,21 @@ class User < ActiveRecord::Base end def save_requiring_finish_signup - self.update(registering_with_oauth: true) + begin + self.registering_with_oauth = true + self.save(validate: false) + # Devise puts unique constraints for the email the db, so we must detect & handle that + rescue ActiveRecord::RecordNotUnique + self.email = nil + self.save(validate: false) + end + true end - def save_requiring_finish_signup_without_email - self.update(registering_with_oauth: true, email: nil) + def ability + @ability ||= Ability.new(self) end + delegate :can?, :cannot?, to: :ability private def clean_document_number diff --git a/app/models/verification/management/document.rb b/app/models/verification/management/document.rb index ee9e5462d..fcbc19ca4 100644 --- a/app/models/verification/management/document.rb +++ b/app/models/verification/management/document.rb @@ -32,7 +32,7 @@ class Verification::Management::Document end def under_sixteen?(response) - 16.years.ago < string_to_date(response.date_of_birth) + 16.years.ago.beginning_of_day < response.date_of_birth.beginning_of_day end def verified? @@ -43,4 +43,4 @@ class Verification::Management::Document user.update(verified_at: Time.now) if user? end -end \ No newline at end of file +end diff --git a/app/models/verification/residence.rb b/app/models/verification/residence.rb index 0c1ed5f9a..5756af2b3 100644 --- a/app/models/verification/residence.rb +++ b/app/models/verification/residence.rb @@ -31,6 +31,8 @@ class Verification::Residence user.update(document_number: document_number, document_type: document_type, geozone: self.geozone, + date_of_birth: date_of_birth.to_datetime, + gender: gender, residence_verified_at: Time.now) end @@ -75,6 +77,10 @@ class Verification::Residence @census_api_response.district_code end + def gender + @census_api_response.gender + end + private def call_census_api @@ -84,7 +90,7 @@ class Verification::Residence def residency_valid? @census_api_response.valid? && @census_api_response.postal_code == postal_code && - @census_api_response.date_of_birth == date_to_string(date_of_birth) + @census_api_response.date_of_birth == date_of_birth end def clean_document_number diff --git a/app/models/verification/sms.rb b/app/models/verification/sms.rb index ba484c4f3..1a013f1d8 100644 --- a/app/models/verification/sms.rb +++ b/app/models/verification/sms.rb @@ -4,14 +4,9 @@ class Verification::Sms attr_accessor :user, :phone, :confirmation_code validates_presence_of :phone - validates :phone, length: { is: 9 } - validate :spanish_phone + validates :phone, format: { with: /\A[\d \+]+\z/ } validate :uniqness_phone - def spanish_phone - errors.add(:phone, :invalid) unless phone.start_with?('6', '7') - end - def uniqness_phone errors.add(:phone, :taken) if User.where(confirmed_phone: phone).any? end @@ -40,4 +35,4 @@ class Verification::Sms def generate_confirmation_code rand.to_s[2..5] end -end \ No newline at end of file +end diff --git a/app/views/admin/shared/_spending_proposal_search.html.erb b/app/views/admin/shared/_spending_proposal_search.html.erb new file mode 100644 index 000000000..c3e276ebe --- /dev/null +++ b/app/views/admin/shared/_spending_proposal_search.html.erb @@ -0,0 +1,10 @@ +<%= form_for(SpendingProposal.new, url: url, as: :spending_proposal, method: :get) do |f| %> +
+
+ <%= text_field_tag :search, "", placeholder: t("admin.shared.spending_proposal_search.placeholder") %> +
+
+ <%= f.submit t("admin.shared.spending_proposal_search.button"), class: "button success expanded" %> +
+
+<% end %> \ No newline at end of file diff --git a/app/views/admin/spending_proposals/edit.html.erb b/app/views/admin/spending_proposals/edit.html.erb index 59180eb16..1fd86da59 100644 --- a/app/views/admin/spending_proposals/edit.html.erb +++ b/app/views/admin/spending_proposals/edit.html.erb @@ -2,43 +2,71 @@ <%= t("admin.spending_proposals.show.back") %> <% end %> -<%= render 'written_by_author' %> - -

<%= t("admin.spending_proposals.edit.classification") %>

- <%= form_for @spending_proposal, url: admin_spending_proposal_path(@spending_proposal) do |f| %> <% SpendingProposal.filter_params(params).each do |filter_name, filter_value| %> - <%= hidden_field_tag filter_name, filter_value %> + <%= hidden_field_tag filter_name, filter_value %> <% end %> - <%= f.select(:administrator_id, - @admins.collect{ |a| [a.name_and_email, a.id ] }, - { include_blank: t("admin.spending_proposals.edit.undefined") }, - class: "small-12 medium-6") %> +
+
+ <%= f.text_field :title, maxlength: SpendingProposal.title_max_length %> +
- <%= f.label :tag_list, t("admin.spending_proposals.edit.tags") %> -
- <% @tags.each do |tag| %> - <%= tag.name %> - <% end %> +
+ <%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale } %> +
+ +
+ <%= f.text_field :external_url %> +
+ +
+ <%= f.select :geozone_id, geozone_select_options, include_blank: t("geozones.none") %> +
+ +
+ <%= f.text_field :association_name, placeholder: t("spending_proposals.form.association_name") %> +
- <%= f.text_field :tag_list, value: @spending_proposal.tag_list.to_s, - label: false, - placeholder: t("admin.spending_proposals.edit.tags_placeholder"), - class: 'js-tag-list' %> - <%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %> +

<%= t("admin.spending_proposals.edit.classification") %>

- <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %> - <%= b.label(title: valuator_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %> - <% end %> +
+ +
+ <%= f.select(:administrator_id, + @admins.collect{ |a| [a.name_and_email, a.id ] }, + { include_blank: t("admin.spending_proposals.edit.undefined") }) %> +
+ + +
+ <%= f.label :tag_list, t("admin.spending_proposals.edit.tags") %> +
+ <% @tags.each do |tag| %> + <%= tag.name %> + <% end %> +
+ <%= f.text_field :tag_list, value: @spending_proposal.tag_list.to_s, + label: false, + placeholder: t("admin.spending_proposals.edit.tags_placeholder"), + class: 'js-tag-list' %> +
+ +
+ <%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %> + + <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %> + <%= b.label(title: valuator_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %> + <% end %> +
+

<%= f.submit(class: "button", value: t("admin.spending_proposals.edit.submit_button")) %>

- <% end %>
diff --git a/app/views/admin/spending_proposals/index.html.erb b/app/views/admin/spending_proposals/index.html.erb index f50dea628..1ad804c51 100644 --- a/app/views/admin/spending_proposals/index.html.erb +++ b/app/views/admin/spending_proposals/index.html.erb @@ -2,21 +2,30 @@
<%= form_tag admin_spending_proposals_path, method: :get, enforce_utf8: false do %> -
+
<%= select_tag :administrator_id, options_for_select(admin_select_options, params[:administrator_id]), { prompt: t("admin.spending_proposals.index.administrator_filter_all"), label: false, class: "js-submit-on-change" } %>
-
+ +
+ <%= select_tag :valuator_id, + options_for_select(valuator_select_options, params[:valuator_id]), + { prompt: t("admin.spending_proposals.index.valuator_filter_all"), + label: false, + class: "js-submit-on-change" } %> +
+ +
<%= select_tag :geozone_id, options_for_select(geozone_select_options.unshift([t("geozones.none"), "all"]), params[:geozone_id]), { prompt: t("admin.spending_proposals.index.geozone_filter_all"), label: false, class: "js-submit-on-change" } %>
-
+
<%= select_tag :tag_name, options_for_select(spending_proposal_tags_select_options, params[:tag_name]), { prompt: t("admin.spending_proposals.index.tags_filter_all"), diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb index bbcf4b4fc..64313e030 100644 --- a/app/views/admin/spending_proposals/show.html.erb +++ b/app/views/admin/spending_proposals/show.html.erb @@ -1,16 +1,16 @@ -<%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)) do %> +<%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)), data: {no_turbolink: true} do %> <%= t("admin.spending_proposals.show.back") %> <% end %> <%= render 'written_by_author' %> -

<%= t("admin.spending_proposals.show.classification") %>

+<%= link_to t("admin.spending_proposals.show.edit"), + edit_admin_spending_proposal_path(@spending_proposal, + SpendingProposal.filter_params(params)) %> -

- <%= link_to t("admin.spending_proposals.show.edit_classification"), - edit_admin_spending_proposal_path(@spending_proposal, - {anchor: 'form'}.merge(SpendingProposal.filter_params(params))) %> -

+
+ +

<%= t("admin.spending_proposals.show.classification") %>

<%= t("admin.spending_proposals.show.assigned_admin") %>: <%= @spending_proposal.administrator.try(:name_and_email) || t("admin.spending_proposals.show.undefined") %> @@ -31,12 +31,19 @@ <% end %>

+

+ <%= link_to t("admin.spending_proposals.show.edit_classification"), + edit_admin_spending_proposal_path(@spending_proposal, + {anchor: 'classification'}.merge(SpendingProposal.filter_params(params))) %> +

+

<%= t("admin.spending_proposals.show.dossier") %>

+<%= render 'valuation/spending_proposals/written_by_valuators' %> +

<%= link_to t("admin.spending_proposals.show.edit_dossier"), edit_valuation_spending_proposal_path(@spending_proposal) %>

-<%= render 'valuation/spending_proposals/written_by_valuators' %> diff --git a/app/views/admin/stats/show.html.erb b/app/views/admin/stats/show.html.erb index 93b6be821..9a9ecbfa8 100644 --- a/app/views/admin/stats/show.html.erb +++ b/app/views/admin/stats/show.html.erb @@ -84,6 +84,13 @@

+ +
+

+ <%= t "admin.stats.show.summary.spending_proposals" %>
+ <%= number_with_delimiter(@spending_proposals) %> +

+
@@ -97,6 +104,12 @@ <%= events_chart_tag event %> <% end %>
+ +
+

<%= t "admin.stats.show.spending_proposals_title" %>

+ <%= spending_proposals_chart_tag id: "spending_proposals" %> +
+
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 93ca49862..cfce656a2 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -54,8 +54,14 @@

<%= t("debates.show.share") %>

- <%= social_share_button_tag(@debate.title) %> - + <% end %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index d791fe7b9..921532119 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -44,7 +44,7 @@ -
+
<%= render "shared/subnavigation" %> diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index 75240f25d..6561573ee 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -16,55 +16,65 @@
-
+
<%= render 'shared/locale_switcher' %>
-
+ -
- +
+
+
-
-
- <%= render "/management/menu" %> -
+
+
+
+ <%= render "/management/menu" %> +
- <%= render "management/account_info" %> + <%= render "management/account_info" %> -
- <% if notice %> -
- - <%= notice %> -
- <% end %> +
+ <% if notice %> +
+ + <%= notice %> +
+ <% end %> - <% if alert %> -
- - <%= alert %> -
- <% end %> + <% if alert %> +
+ + <%= alert %> +
+ <% end %> - <%= yield %> -
+ <%= yield %> +
+
diff --git a/app/views/mailer/unfeasible_spending_proposal.html.erb b/app/views/mailer/unfeasible_spending_proposal.html.erb new file mode 100644 index 000000000..1e55106f1 --- /dev/null +++ b/app/views/mailer/unfeasible_spending_proposal.html.erb @@ -0,0 +1,35 @@ + + +

+ <%= t("mailers.unfeasible_spending_proposal.hi") %> +

+ +

+ <%= t("mailers.unfeasible_spending_proposal.unfeasible_html", + title: @spending_proposal.title) %> +

+ +

+ <%= @spending_proposal.feasible_explanation %> +

+ +

+ <%= t("mailers.unfeasible_spending_proposal.new_html", + url: link_to(t("mailers.unfeasible_spending_proposal.new_href"), + new_spending_proposal_url, style: "color: #2895F1; text-decoration: underline;")) %> +

+ +

+ <%= t("mailers.unfeasible_spending_proposal.reconsider_html", code: @spending_proposal.code) %> +

+ +

+ <%= t("mailers.unfeasible_spending_proposal.sorry") %> +

+ +

+ <%= t("mailers.unfeasible_spending_proposal.sincerely") %>
+ + <%= t("mailers.unfeasible_spending_proposal.signatory") %> +

+ \ No newline at end of file diff --git a/app/views/management/_account_info.html.erb b/app/views/management/_account_info.html.erb index d27f1524d..20a6bc24d 100644 --- a/app/views/management/_account_info.html.erb +++ b/app/views/management/_account_info.html.erb @@ -1,5 +1,5 @@ <% if managed_user.document_number.present? %> -
+
diff --git a/app/views/management/account/show.html.erb b/app/views/management/account/show.html.erb new file mode 100644 index 000000000..09287ee3e --- /dev/null +++ b/app/views/management/account/show.html.erb @@ -0,0 +1,3 @@ +

<%= t("management.account.show.title") %>

+ +<%= render 'management/users/erase_user_account' %> diff --git a/app/views/management/dashboard/index.html.erb b/app/views/management/dashboard/index.html.erb index 4145592d8..e32a46d0e 100644 --- a/app/views/management/dashboard/index.html.erb +++ b/app/views/management/dashboard/index.html.erb @@ -1,14 +1,6 @@

<%= t("management.dashboard.index.title") %>

-

Desde aquí puedes gestionar usuarios a través de las siguientes acciones:

- -

Usuarios

- -

Crear propuesta

- -

Apoyar propuesta

- -

Imprimir propuestas

+

<%= t("management.dashboard.index.info") %>

diff --git a/app/views/management/document_verifications/new.html.erb b/app/views/management/document_verifications/new.html.erb index 068d84f41..1c1b5778d 100644 --- a/app/views/management/document_verifications/new.html.erb +++ b/app/views/management/document_verifications/new.html.erb @@ -13,3 +13,5 @@ <%= f.hidden_field :document_number %> <%= f.submit t("management.document_verifications.verify"), class: "button success" %> <% end %> + +<%= render 'management/users/erase_user_account' %> \ No newline at end of file diff --git a/app/views/management/proposals/index.html.erb b/app/views/management/proposals/index.html.erb index 18136e2ed..e7966f0c5 100644 --- a/app/views/management/proposals/index.html.erb +++ b/app/views/management/proposals/index.html.erb @@ -7,7 +7,7 @@
<% if @search_terms %> -

+

<%= page_entries_info @proposals %> <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>

diff --git a/app/views/management/proposals/print.html.erb b/app/views/management/proposals/print.html.erb index 7399376f1..71220c74b 100644 --- a/app/views/management/proposals/print.html.erb +++ b/app/views/management/proposals/print.html.erb @@ -20,8 +20,8 @@ <%= render @proposals %>
-

<%= t("management.print.info") %>
- <%= t("management.print.note") %>

+

<%= t("management.print.proposals_info") %>
+ <%= t("management.print.proposals_note") %>

diff --git a/app/views/management/spending_proposals/_spending_proposal.html.erb b/app/views/management/spending_proposals/_spending_proposal.html.erb new file mode 100644 index 000000000..59b8bc675 --- /dev/null +++ b/app/views/management/spending_proposals/_spending_proposal.html.erb @@ -0,0 +1 @@ +<%= render partial: 'spending_proposals/spending_proposal', locals: {spending_proposal: spending_proposal} %> \ No newline at end of file diff --git a/app/views/management/spending_proposals/_votes.html.erb b/app/views/management/spending_proposals/_votes.html.erb new file mode 100644 index 000000000..6549aa204 --- /dev/null +++ b/app/views/management/spending_proposals/_votes.html.erb @@ -0,0 +1,2 @@ +<%= render 'spending_proposals/votes', + { spending_proposal: spending_proposal, vote_url: vote_management_spending_proposal_path(spending_proposal, value: 'yes') } %> \ No newline at end of file diff --git a/app/views/management/spending_proposals/index.html.erb b/app/views/management/spending_proposals/index.html.erb new file mode 100644 index 000000000..49e4151d2 --- /dev/null +++ b/app/views/management/spending_proposals/index.html.erb @@ -0,0 +1,25 @@ +
+ + <%= render 'admin/shared/spending_proposal_search', url: management_spending_proposals_path %> + + +
+
+ + +
+ <%= content_tag(:h2, t("management.spending_proposals.filters.unfeasible")) if params[:unfeasible].present? %> + <%= content_tag(:h2, t("management.spending_proposals.filters.by_geozone", geozone: @geozone_name)) if @geozone_name.present? %> + <% if params[:search].present? %> +

+ <%= page_entries_info @spending_proposals %> + <%= t("management.spending_proposals.search_results", count: @spending_proposals.size, search_term: params[:search]) %> +

+ <% end %> +
+ + <%= render @spending_proposals %> + <%= paginate @spending_proposals %> +
+
+
\ No newline at end of file diff --git a/app/views/management/spending_proposals/print.html.erb b/app/views/management/spending_proposals/print.html.erb new file mode 100644 index 000000000..46a012149 --- /dev/null +++ b/app/views/management/spending_proposals/print.html.erb @@ -0,0 +1,34 @@ +
+
+
+ +
+ <%= form_tag print_management_spending_proposals_path, method: :get, enforce_utf8: false do %> +
+ <%= select_tag :geozone, + options_for_select(geozone_select_options.unshift([t("geozones.none"), "all"]), params[:geozone]), + { label: false, + class: "js-submit-on-change" } %> +
+ <% end %> + + + <%= t('management.spending_proposals.print.print_button') %> + +
+ +
+ <%= content_tag(:h2, t("management.spending_proposals.filters.unfeasible"), class: "inline-block") if params[:unfeasible].present? %> + <%= content_tag(:h2, t("management.spending_proposals.filters.by_geozone", geozone: @geozone_name), class: "inline-block") if @geozone_name.present? %> + <%= content_tag(:h2, t("management.spending_proposals.search_results", count: @spending_proposals.size, search_term: params[:search]), class: "inline-block") if params[:search].present? %> +
+ + <%= render @spending_proposals %> + +
+

<%= t("management.print.spending_proposals_info") %>
+ <%= t("management.print.spending_proposals_note") %>

+
+
+
+
diff --git a/app/views/management/spending_proposals/vote.js.erb b/app/views/management/spending_proposals/vote.js.erb new file mode 100644 index 000000000..2c789f995 --- /dev/null +++ b/app/views/management/spending_proposals/vote.js.erb @@ -0,0 +1 @@ +<%= render template: 'spending_proposals/vote' %> \ No newline at end of file diff --git a/app/views/management/users/_erase_user_account.html.erb b/app/views/management/users/_erase_user_account.html.erb new file mode 100644 index 000000000..af2e3b75b --- /dev/null +++ b/app/views/management/users/_erase_user_account.html.erb @@ -0,0 +1,9 @@ +<%= link_to t("management.users.erase_account_link"), "#", class: "delete js-toggle-link", data: { "toggle-selector" => "#erase-account-form" } %> + + \ No newline at end of file diff --git a/app/views/proposals/_comments.html.erb b/app/views/proposals/_comments.html.erb index 4a0bd2aea..31f1cb8ba 100644 --- a/app/views/proposals/_comments.html.erb +++ b/app/views/proposals/_comments.html.erb @@ -2,7 +2,6 @@
-

<%= t("proposals.show.comments_title") %> (<%= @proposal.comments_count %>) diff --git a/app/views/proposals/_featured_votes.html.erb b/app/views/proposals/_featured_votes.html.erb index 0e9319a29..bfc979450 100644 --- a/app/views/proposals/_featured_votes.html.erb +++ b/app/views/proposals/_featured_votes.html.erb @@ -37,7 +37,7 @@ <% if voted_for?(@featured_proposals_votes, proposal) %> <% if setting['twitter_handle'] %> <% end %> <% end %> diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb index 1c52356eb..65d970530 100644 --- a/app/views/proposals/_votes.html.erb +++ b/app/views/proposals/_votes.html.erb @@ -53,7 +53,7 @@ <% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %> <% end %>

diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 3a7434d75..0a5b35c0c 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -50,6 +50,14 @@
<%= @proposal.summary %>
+ <% if @proposal.video_url.present? %> +
+
+
+
+
+ <% end %> + <%= safe_html_with_links @proposal.description %> <% if @proposal.external_url.present? %> @@ -86,7 +94,14 @@

<%= t("proposals.show.share") %>

- <%= social_share_button_tag(@proposal.title) %> +
diff --git a/app/views/proposals/summary.html.erb b/app/views/proposals/summary.html.erb index 0ef9450a3..acf1d0255 100644 --- a/app/views/proposals/summary.html.erb +++ b/app/views/proposals/summary.html.erb @@ -1,6 +1,6 @@
-
+
<%= link_to :back, class: 'back left' do %> diff --git a/app/views/spending_proposals/_sidebar.html.erb b/app/views/spending_proposals/_sidebar.html.erb new file mode 100644 index 000000000..8fc8693e8 --- /dev/null +++ b/app/views/spending_proposals/_sidebar.html.erb @@ -0,0 +1,15 @@ +
+

<%= t("spending_proposals.index.sidebar.geozones") %>

+
+
+ <%= link_to t('geozones.all'), spending_proposals_path(geozone: nil) %> + <%= link_to t('geozones.none'), spending_proposals_path(geozone: 'all') %> + <% Geozone.all.each do |geozone| %> + <%= link_to geozone.name, spending_proposals_path(geozone: geozone.id) %> + <% end %> +
+ +
+

<%= t("spending_proposals.index.sidebar.feasibility") %>

+
+<%= link_to t('spending_proposals.index.sidebar.unfeasible'), spending_proposals_path(unfeasible: '1') %> \ No newline at end of file diff --git a/app/views/spending_proposals/_spending_proposal.html.erb b/app/views/spending_proposals/_spending_proposal.html.erb new file mode 100644 index 000000000..af59def70 --- /dev/null +++ b/app/views/spending_proposals/_spending_proposal.html.erb @@ -0,0 +1,59 @@ +
+
+
+ +
+
+ + <% cache [locale_and_user_status(spending_proposal), 'index', spending_proposal, spending_proposal.author] do %> + <%= t("spending_proposals.spending_proposal.spending_proposal") %> + +

<%= link_to spending_proposal.title, namespaced_spending_proposal_path(spending_proposal) %>

+

+ + <%= l spending_proposal.created_at.to_date %> + + <% if spending_proposal.author.hidden? || spending_proposal.author.erased? %> +  •  + + <%= t("spending_proposals.show.author_deleted") %> + + <% else %> +  •  + + <%= spending_proposal.author.name %> + + <% if spending_proposal.author.official? %> +  •  + + <%= spending_proposal.author.official_position %> + + <% end %> + <% end %> + + <% if spending_proposal.author.verified_organization? %> +  •  + + <%= t("shared.collective") %> + + <% end %> + +  •  + <%= geozone_name(spending_proposal) %> +

+
+

<%= link_to spending_proposal.description, namespaced_spending_proposal_path(spending_proposal) %>

+
+
+ <% end %> +
+
+ +
+ <%= render 'votes', + { spending_proposal: spending_proposal, vote_url: vote_spending_proposal_path(spending_proposal, value: 'yes') } %> +
+ +
+
+
diff --git a/app/views/spending_proposals/_votes.html.erb b/app/views/spending_proposals/_votes.html.erb new file mode 100644 index 000000000..85220d6c9 --- /dev/null +++ b/app/views/spending_proposals/_votes.html.erb @@ -0,0 +1,42 @@ +
+ + <% reason = spending_proposal.reason_for_not_being_votable_by(current_user) %> + <% voting_allowed = true unless reason.presence == :not_voting_allowed %> + <% user_voted_for = voted_for?(@spending_proposal_votes, spending_proposal) %> + + + <%= t("spending_proposals.spending_proposal.supports", count: spending_proposal.total_votes) %> + + +
+ <% if user_voted_for %> +
+ <%= t("spending_proposals.spending_proposal.already_supported") %> +
+ <% elsif voting_allowed %> + <%= link_to vote_url, + class: "button button-support small expanded", + title: t('spending_proposals.spending_proposal.support_title'), method: "post", remote: true do %> + <%= t("spending_proposals.spending_proposal.support") %> + <% end %> + <% end %> +
+ + <% if reason.present? && !user_voted_for %> + + <% end %> + + <% if user_voted_for && setting['twitter_handle'] %> + + <% end %> +
diff --git a/app/views/spending_proposals/index.html.erb b/app/views/spending_proposals/index.html.erb index 00a1b6442..563b84e23 100644 --- a/app/views/spending_proposals/index.html.erb +++ b/app/views/spending_proposals/index.html.erb @@ -1,16 +1,37 @@ <% provide :title do %><%= t('spending_proposals.index.title') %><% end %> -
-
-
-

<%= t('spending_proposals.index.title') %>

+<% content_for :header_addon do %> + <%= render "shared/search_form", + search_path: spending_proposals_path(page: 1), + i18n_namespace: "spending_proposals.index.search_form" %> +<% end %> -

<%= t('spending_proposals.index.text_html') %>

+
+
+
- <% if can? :create, SpendingProposal %> - <%= link_to t('spending_proposals.index.create_link'), new_spending_proposal_path, class: 'button' %> - <% else %> -

<%= t('spending_proposals.index.verified_only', verify_account: link_to(t('spending_proposals.index.verify_account'), verification_path)).html_safe %>

- <% end %> +
+ <%= content_tag(:h2, t("spending_proposals.index.unfeasible")) if params[:unfeasible].present? %> + <%= content_tag(:h2, t("spending_proposals.index.by_geozone", geozone: @geozone_name)) if @geozone_name.present? %> + <% if params[:search].present? %> +

+ <%= page_entries_info @spending_proposals %> + <%= t("spending_proposals.index.search_results", count: @spending_proposals.size, search_term: params[:search]) %> +

+ <% end %> +
+ +
+ <%= link_to t("spending_proposals.index.start_spending_proposal"), new_spending_proposal_path, class: 'button expanded' %> +
+ <%= render partial: 'spending_proposals/spending_proposal', collection: @spending_proposals %> + <%= paginate @spending_proposals %>
+ +
+ +
+
-
\ No newline at end of file +
diff --git a/app/views/spending_proposals/show.html.erb b/app/views/spending_proposals/show.html.erb index 987118a6a..0da045860 100644 --- a/app/views/spending_proposals/show.html.erb +++ b/app/views/spending_proposals/show.html.erb @@ -1,12 +1,12 @@ <% provide :title do %><%= @spending_proposal.title %><% end %> -
+

<%= @spending_proposal.title %>

-
+
<%= render '/shared/author_info', resource: @spending_proposal %>  •  @@ -15,6 +15,12 @@ <%= geozone_name(@spending_proposal) %>
+
+

+ <%= t("spending_proposals.show.code") %> + <%= @spending_proposal.id %> +

+ <%= safe_html_with_links @spending_proposal.description.html_safe %> <% if @spending_proposal.external_url.present? %> @@ -25,5 +31,26 @@
+ +
-
\ No newline at end of file +
diff --git a/app/views/spending_proposals/vote.js.erb b/app/views/spending_proposals/vote.js.erb new file mode 100644 index 000000000..cc3e5a16d --- /dev/null +++ b/app/views/spending_proposals/vote.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id(@spending_proposal) %>_votes").html('<%= j render("spending_proposals/votes", spending_proposal: @spending_proposal, vote_url: vote_spending_proposal_path(@spending_proposal, value: "yes")) %>'); \ No newline at end of file diff --git a/app/views/users/registrations/finish_signup.html.erb b/app/views/users/registrations/finish_signup.html.erb index fa7bb621e..79f160a51 100644 --- a/app/views/users/registrations/finish_signup.html.erb +++ b/app/views/users/registrations/finish_signup.html.erb @@ -3,6 +3,10 @@ <%= form_for current_user, as: :user, url: do_finish_signup_path, html: { role: 'form'} do |f| %> <%= render 'shared/errors', resource: current_user %> +
+ <%= t("omniauth.finish_signup.username_warning") %> +
+ <% if current_user.errors.include? :username %> <%= f.text_field :username, placeholder: t("devise_views.users.registrations.new.username_label") %> <% else %> diff --git a/app/views/valuation/spending_proposals/index.html.erb b/app/views/valuation/spending_proposals/index.html.erb index e6c05d6c7..8536ec424 100644 --- a/app/views/valuation/spending_proposals/index.html.erb +++ b/app/views/valuation/spending_proposals/index.html.erb @@ -1,13 +1,14 @@

<%= t("valuation.spending_proposals.index.title") %>

-
- <%= form_tag valuation_spending_proposals_path, method: :get, enforce_utf8: false do %> -
- <%= select_tag :geozone_id, - options_for_select(geozone_select_options.unshift([t("geozones.none"), "all"]), params[:geozone_id]), - { prompt: t("valuation.spending_proposals.index.geozone_filter_all"), - label: false, - class: "js-submit-on-change" } %> +
+ <% @geozone_filters.each_slice(8) do |slice| %> +
+ <% slice.each do |filter| %> + <%= link_to valuation_spending_proposals_path(geozone_id: filter[:id]), + class: "#{'active' if params[:geozone_id].to_s == filter[:id].to_s}" do %> + <%= filter[:name] %> (<%= filter[:pending_count] %>) + <% end %> + <% end %>
<% end %>
@@ -38,4 +39,4 @@ <% end %> -<%= paginate @spending_proposals %> \ No newline at end of file +<%= paginate @spending_proposals %> diff --git a/app/views/verification/sms/new.html.erb b/app/views/verification/sms/new.html.erb index 92e8551cd..06f679e36 100644 --- a/app/views/verification/sms/new.html.erb +++ b/app/views/verification/sms/new.html.erb @@ -29,9 +29,10 @@ <%= render "shared/errors", resource: @sms %>
- <%= f.label t("verification.sms.new.phone") %> + <%= f.label :phone, t("verification.sms.new.phone"), class: "inline-block" %> + <%= t("verification.sms.new.phone_format_html") %>

<%= t("verification.sms.new.phone_note") %>

- <%= f.text_field :phone, label: false %> + <%= f.text_field :phone, label: false, placeholder: t("verification.sms.new.phone_placeholder") %>
<%= f.submit t("verification.sms.new.submit_button"), class: "button success" %> diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index c5e88d8dd..40086aab9 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -131,6 +131,7 @@ ignore_unused: - 'proposals.index.select_order' - 'proposals.index.orders.*' - 'proposals.index.search_form.*' + - 'spending_proposals.index.search_form.*' - 'notifications.index.comments_on*' - 'notifications.index.replies_to*' - 'helpers.page_entries_info.*' # kaminari diff --git a/config/initializers/vote_extensions.rb b/config/initializers/vote_extensions.rb index 50fb60c9f..345cb8f01 100644 --- a/config/initializers/vote_extensions.rb +++ b/config/initializers/vote_extensions.rb @@ -7,6 +7,10 @@ ActsAsVotable::Vote.class_eval do where(votable_type: 'Proposal', votable_id: proposals) end + def self.for_spending_proposals(spending_proposals) + where(votable_type: 'SpendingProposal', votable_id: spending_proposals) + end + def value vote_flag end diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index faebcb449..91c035dfb 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -67,6 +67,13 @@ en: organization: name: "Name of organisation" responsible_name: "Person responsible for the group" + spending_proposal: + administrator_id: "Administrador" + association_name: "Association name" + description: "Description" + external_url: "Link to additional documentation" + geozone_id: "Scope of operation" + title: "Title" errors: models: debate: @@ -77,5 +84,3 @@ en: attributes: tag_list: less_than_or_equal_to: "tags must be less than or equal to %{count}" - spending_proposal: - administrator_id: "Administrator" diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml index 50dd53006..a7644f02e 100644 --- a/config/locales/activerecord.es.yml +++ b/config/locales/activerecord.es.yml @@ -38,8 +38,8 @@ es: one: "Propuesta ciudadana" other: "Propuestas ciudadanas" spending_proposal: - one: "Propuesta de gasto" - other: "Propuestas de gasto" + one: "Propuesta de inversión" + other: "Propuestas de inversión" attributes: comment: body: "Comentario" @@ -69,6 +69,11 @@ es: responsible_name: "Persona responsable del colectivo" spending_proposal: administrator_id: "Administrador" + association_name: "Nombre de la asociación" + description: "Descripción" + external_url: "Enlace a documentación adicional" + geozone_id: "Ámbito de actuación" + title: "Título" errors: models: debate: diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index bf0b1cebd..912067443 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -145,6 +145,9 @@ en: proposal_search: button: Search placeholder: Search proposals by title, code, description or question + spending_proposal_search: + button: Search + placeholder: Search spending proposals by title or description user_search: button: Search placeholder: Search user by name or email' @@ -152,6 +155,7 @@ en: index: geozone_filter_all: All zones administrator_filter_all: All administrators + valuator_filter_all: All valuators tags_filter_all: All tags filters: valuation_open: Open @@ -169,6 +173,7 @@ en: back: Back classification: Clasification heading: "Investment project %{id}" + edit: Edit edit_classification: Edit classification association_name: Association by: By @@ -195,6 +200,7 @@ en: debates: Debates proposal_votes: Proposal votes proposals: Proposals + spending_proposals: Spending Proposals unverified_users: Unverified users user_level_three: Level three users user_level_two: Level two users @@ -203,6 +209,7 @@ en: verified_users_who_didnt_vote_proposals: Verified users who didn't votes proposals visits: Visits votes: Total votes + spending_proposals_title: Spending Proposals visits_title: Visits tags: create: Create Topic diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 5eec969cf..71c75914b 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -145,6 +145,9 @@ es: proposal_search: button: Buscar placeholder: Buscar propuestas por título, código, descripción o pregunta + spending_proposal_search: + button: Buscar + placeholder: Buscar propuestas por título o descripción user_search: button: Buscar placeholder: Buscar usuario por nombre o email @@ -152,6 +155,7 @@ es: index: geozone_filter_all: Todos los ámbitos de actuación administrator_filter_all: Todos los administradores + valuator_filter_all: Todos los evaluadores tags_filter_all: Todas las etiquetas filters: valuation_open: Abiertas @@ -169,6 +173,7 @@ es: back: Volver classification: Clasificación heading: Propuesta de inversión %{id} + edit: Editar edit_classification: Editar clasificación association_name: Asociación by: Autor @@ -195,6 +200,7 @@ es: debates: Debates proposal_votes: Votos en propuestas proposals: Propuestas + spending_proposals: Propuestas de inversión unverified_users: Usuarios sin verificar user_level_three: Usuarios de nivel tres user_level_two: Usuarios de nivel dos @@ -203,6 +209,7 @@ es: verified_users_who_didnt_vote_proposals: Usuarios verificados que no han votado propuestas visits: Visitas votes: Votos + spending_proposals_title: Propuestas de inversión visits_title: Visitas tags: create: Crear Tema diff --git a/config/locales/en.yml b/config/locales/en.yml index 1f752a9f2..b5899e63a 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -154,6 +154,7 @@ en: verification/sms: phone geozones: none: All city + all: All scopes layouts: application: chrome: Google Chrome @@ -412,20 +413,43 @@ en: new: Create title: Spending proposal title index: - create_link: Create spending proposal - text_html: Here you can send spending proposals to be considered in the frame of the annual participatory budgeting. title: Participatory budgeting - verified_only: Only verified users can create spending proposals, %{verify_account}. - verify_account: verify your account + unfeasible: Unfeasible investment projects + by_geozone: "Investment projects with scope: %{geozone}" + search_form: + button: Search + placeholder: Investment projects... + title: Search + search_results: + one: " containing the term '%{search_term}'" + other: " containing the term '%{search_term}'" + sidebar: + geozones: Scope of operation + feasibility: Feasibility + unfeasible: Unfeasible + start_spending_proposal: Create an investment project new: - back_link: Back more_info: How do participatory budgeting works? recommendation_one: It's mandatory that the proposal makes reference to a budgetable action. recommendation_three: Try to go into details when describing your spending proposal so the reviewing team undertands your points. recommendation_two: Any proposal or comment suggesting illegal action will be deleted. recommendations_title: How to create a spending proposal start_new: Create spending proposal + back_link: Back + show: + author_deleted: User deleted + code: 'Proposal code:' + share: Share wrong_price_format: Only integer numbers + spending_proposal: + spending_proposal: Investment project + already_supported: You have already supported this. Share it! + support: Support + support_title: Support this project + supports: + one: 1 support + other: "%{count} supports" + zero: No supports stats: index: visits: Visits @@ -476,6 +500,12 @@ en: unauthenticated: You must %{signin} or %{signup} to continue. verified_only: Only verified users can vote on proposals; %{verify_account}. verify_account: verify your account + spending_proposals: + not_logged_in: You must %{signin} or %{signup} to continue. + not_verified: Only verified users can vote on proposals; %{verify_account}. + organization: Organisations are not permitted to vote + unfeasible: Unfeasible investment projects can not be supported + not_voting_allowed: Voting phase is closed welcome: debates: alt: Icon debates @@ -512,6 +542,7 @@ en: omniauth: finish_signup: title: "Additional details" + username_warning: "Due to a change in the way we interact with social networks, it is possible that your username now appears as 'already in use'. If that is your case, please choose a different username." twitter: sign_in: "Sign in with Twitter" sign_up: "Sign up with Twitter" diff --git a/config/locales/es.yml b/config/locales/es.yml index 0e7a8b125..f1241bb15 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -154,6 +154,7 @@ es: verification/sms: el teléfono geozones: none: Toda la ciudad + all: Todos los ámbitos layouts: application: chrome: Google Chrome @@ -412,20 +413,43 @@ es: new: Crear title: Título de la propuesta de gasto index: - create_link: Enviar propuesta de gasto - text_html: Desde esta sección podrás sugerir propuestas de gasto que irán asociadas a las partidas de presupuestos ciudadanos.
El requisito principal es que sean propuestas presupuestables. title: Presupuestos participativos - verified_only: Sólo los usuarios verificados pueden crear propuestas de gasto, %{verify_account}. - verify_account: verifica tu cuenta + unfeasible: Propuestas de inversión no viables + by_geozone: "Propuestas de inversión con ámbito: %{geozone}" + search_form: + button: Buscar + placeholder: Propuestas de inversión... + title: Buscar + search_results: + one: " que contiene '%{search_term}'" + other: " que contienen '%{search_term}'" + sidebar: + geozones: Ámbitos de actuación + feasibility: Viabilidad + unfeasible: No viables + start_spending_proposal: Crea una propuesta de inversión new: - back_link: Volver more_info: "¿Cómo funcionan los presupuestos participativos?" recommendation_one: Es fundamental que haga referencia a una actuación presupuestable. recommendation_three: Intenta detallar lo máximo posible la propuesta para que el equipo de gobierno encargado de estudiarla tenga las menor dudas posibles. recommendation_two: Cualquier propuesta o comentario que implique acciones ilegales será eliminada. recommendations_title: Cómo crear una propuesta de gasto start_new: Crear una propuesta de gasto + back_link: Volver + show: + author_deleted: Usuario eliminado + code: 'Código de la propuesta:' + share: Compartir wrong_price_format: Solo puede incluir caracteres numéricos + spending_proposal: + spending_proposal: Propuesta de inversión + already_supported: Ya has apoyado este proyecto. ¡Compártelo! + support: Apoyar + support_title: Apoyar este proyecto + supports: + one: 1 apoyo + other: "%{count} apoyos" + zero: Sin apoyos stats: index: visits: Visitas @@ -476,6 +500,12 @@ es: unauthenticated: Necesitas %{signin} o %{signup} para continuar. verified_only: Las propuestas sólo pueden ser votadas por usuarios verificados, %{verify_account}. verify_account: verifica tu cuenta + spending_proposals: + not_logged_in: Necesitas %{signin} o %{signup} para continuar. + not_verified: Las propuestas de inversión sólo pueden ser apoyadas por usuarios verificados, %{verify_account}. + organization: Las organizaciones no pueden votar. + unfeasible: No se pueden votar propuestas inviables. + not_voting_allowed: El periodo de votación está cerrado. welcome: debates: alt: Icono debates @@ -512,6 +542,7 @@ es: omniauth: finish_signup: title: "Detalles adicionales de tu cuenta" + username_warning: "Debido a que hemos cambiado la forma en la que nos conectamos con redes sociales y es posible que tu nombre de usuario aparezca como 'ya en uso', incluso si antes podías acceder con él. Si es tu caso, por favor elige un nombre de usuario distinto." twitter: sign_in: "Entra con Twitter" sign_up: "Regístrate con Twitter" diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 8e337b42e..16cc762d6 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -20,3 +20,13 @@ en: new_reply_by_html: There is a new response from %{commenter} to your comment on subject: Someone has responded to your comment title: New response to your comment + unfeasible_spending_proposal: + hi: "Dear user," + new_html: "For all these, we invite you to elaborate a new proposal that ajusts to the conditions of this process. You can do it following this link: %{url}." + new_href: "new investment project" + reconsider_html: "If you believe that the rejected proposal meets the requirements to be an investment proposal, you can communicate this, within 48 hours, responding to the email address preparticipativos@madrid.es. Including the code %{code} in the subject of the email." + sincerely: "Sincerely" + signatory: "DEPARTMENT OF PUBLIC PARTICIPATION" + sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation." + subject: "Your investment project '%{code}' has been marked as unfeasible" + unfeasible_html: "From the Madrid City Council we want to thank you for your participation in the participatory budgets of the city of Madrid. We regret to inform you that your proposal '%{title}' will be excluded from this participatory process for the following reason:" \ No newline at end of file diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index fb0e7b2fb..8a16c00ec 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -20,3 +20,13 @@ es: new_reply_by_html: Hay una nueva respuesta de %{commenter} a tu comentario en subject: Alguien ha respondido a tu comentario title: Nueva respuesta a tu comentario + unfeasible_spending_proposal: + hi: "Estimado usuario," + new_html: "Por todo ello, te invitamos a que elabores una nueva propuesta que se ajuste a las condiciones de este proceso. Esto lo puedes hacer en este enlace: %{url}." + new_href: "nueva propuesta de inversión" + reconsider_html: "Si consideras que la propuesta rechazada cumple los requisitos para mantenerla como propuesta de inversión, podrás comunicarlo, en el plazo de 48 horas, al correo preparticipativos@madrid.es, indicando necesariamente para su tramitación el código %{code} como asunto del correo, correspondiente a tu propuesta." + sincerely: "Atentamente" + signatory: "DIRECCIÓN GENERAL DE PARTICIPACIÓN CIUDADANA" + sorry: "Sentimos las molestias ocasionadas y volvemos a darte las gracias por tu inestimable participación." + subject: "Tu propuesta de inversión '%{code}' ha sido marcada como inviable" + unfeasible_html: "Desde el Ayuntamiento de Madrid queremos agradecer tu participación en los Presupuestos Participativos de la ciudad de Madrid. Lamentamos informarte de que tu propuesta '%{title}' quedará excluida de este proceso participativo por el siguiente motivo:" diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml index 7d8a9f12e..74a58ac26 100644 --- a/config/locales/management.en.yml +++ b/config/locales/management.en.yml @@ -1,6 +1,11 @@ --- en: management: + account: + alert: + unverified_user: No verified user logged in yet + show: + title: User account account_info: change_user: Change user document_number_label: 'Document number:' @@ -12,6 +17,7 @@ en: dashboard: index: title: Management + info: Here you can manage users through all actions listed in the left menu. document_number: Document number document_type_label: Document type document_verifications: @@ -41,17 +47,22 @@ en: print_proposals: Print proposals support_proposals: Support proposals create_spending_proposal: Create spending proposal + print_spending_proposals: Print spending proposals + support_spending_proposals: Support spending proposals title: Management users: Users + edit_user_accounts: Edit user account permissions: create_proposals: Create proposals debates: Engage in debates support_proposals: Support proposals vote_proposals: Vote proposals print: - info: Create yor proposal on http://decide.madrid.es - note: The proposals more supported will be voted. If are accepted by a majority, the city Council shall be carried out. + proposals_info: Create yor proposal on http://decide.madrid.es + proposals_note: The proposals more supported will be voted. If are accepted by a majority, the city Council shall be carried out. proposals_title: 'Proposals:' + spending_proposals_info: Participate at http://decide.madrid.es + spending_proposals_note: Participatory budget will be assigned to the most votes spending proposals. print_info: Print this info proposals: alert: @@ -63,6 +74,14 @@ en: alert: unverified_user: User is not verified create: Create spending proposal + filters: + unfeasible: Unfeasible investment projects + by_geozone: "Investment projects with scope: %{geozone}" + print: + print_button: Print + search_results: + one: " containing the term '%{search_term}'" + other: " containing the term '%{search_term}'" sessions: signed_out: Signed out successfully. signed_out_managed_user: User session signed out successfully. @@ -72,3 +91,9 @@ en: create_user_info: 'We will create an account with the following data:' create_user_submit: Create user create_user_success_html: We have sent an email to the email address %{email} in order to verify that it belongs to this user. It contains a link they have to click. Then they will have to set their access password before being able to log in to the website + erased_notice: User account deleted. + erased_by_manager: "Deleted by manager: %{manager}" + erase_account_link: Delete user + erase_account_confirm: Are you sure you want to erase the account? This action can not be undone + erase_warning: This action can not be undone. Please make sure you want to erase this account. + erase_submit: Delete account diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index 5c1fe68d9..c4545e675 100644 --- a/config/locales/management.es.yml +++ b/config/locales/management.es.yml @@ -1,6 +1,11 @@ --- es: management: + account: + alert: + unverified_user: Solo se pueden editar cuentas de usuarios verificados + show: + title: Cuenta de usuario account_info: change_user: Cambiar usuario document_number_label: 'Número de documento:' @@ -12,6 +17,7 @@ es: dashboard: index: title: Gestión + info: Desde aquí puedes gestionar usuarios a través de las acciones listadas en el menú de la izquierda. document_number: Número de documento document_type_label: Tipo de documento document_verifications: @@ -40,18 +46,23 @@ es: create_proposal: Crear propuesta print_proposals: Imprimir propuestas support_proposals: Apoyar propuestas - create_spending_proposal: Crear propuesta de gasto + create_spending_proposal: Crear propuesta de inversión + print_spending_proposals: Imprimir propts. de inversión + support_spending_proposals: Apoyar propts. de inversión title: Gestión users: Usuarios + edit_user_accounts: Editar cuenta de usuario permissions: create_proposals: Crear nuevas propuestas debates: Participar en debates support_proposals: Apoyar propuestas vote_proposals: Participar en las votaciones finales print: - info: Haz tu propuesta en http://decide.madrid.es - note: Las propuestas más apoyadas serán llevadas a votación. Y si las acepta una mayoría, el Ayuntamiento las llevará a cabo. + proposals_info: Haz tu propuesta en http://decide.madrid.es + proposals_note: Las propuestas más apoyadas serán llevadas a votación. Y si las acepta una mayoría, el Ayuntamiento las llevará a cabo. proposals_title: 'Propuestas:' + spending_proposals_info: Participa en http://decide.madrid.es + spending_proposals_note: Los presupuestos participativos se invertirán en las propuestas de inversión más apoyadas. print_info: Imprimir esta información proposals: alert: @@ -62,7 +73,15 @@ es: spending_proposals: alert: unverified_user: Este usuario no está verificado - create: Crear propuesta de gasto + create: Crear propuesta de inversión + filters: + unfeasible: Propuestas de inversión no viables + by_geozone: "Propuestas de inversión con ámbito: %{geozone}" + print: + print_button: Imprimir + search_results: + one: " que contiene '%{search_term}'" + other: " que contienen '%{search_term}'" sessions: signed_out: Has cerrado la sesión correctamente. signed_out_managed_user: Se ha cerrado correctamente la sesión del usuario. @@ -72,3 +91,9 @@ es: create_user_info: 'Procedemos a crear un usuario con la siguiente información:' create_user_submit: Crear usuario create_user_success_html: Hemos enviado un correo electrónico a %{email} para verificar que es suya. El correo enviado contiene un link que el usuario deberá pulsar. Entonces podrá seleccionar una clave de acceso, y entrar en la web de participación. + erased_notice: Cuenta de usuario borrada. + erased_by_manager: "Borrada por el manager: %{manager}" + erase_account_link: Borrar cuenta + erase_account_confirm: ¿Seguro que quieres borrar a este usuario? Esta acción no se puede deshacer + erase_warning: Esta acción no se puede deshacer. Por favor asegurese de que quiere eliminar esta cuenta. + erase_submit: Borrar cuenta diff --git a/config/locales/settings.en.yml b/config/locales/settings.en.yml index 756debb24..32874e32b 100755 --- a/config/locales/settings.en.yml +++ b/config/locales/settings.en.yml @@ -15,4 +15,6 @@ en: per_page_code: "Code to be included on every page" feature: debates: Debates - spending_proposals: Spending proposals + spending_proposals: Investment projects + spending_proposal_features: + voting_allowed: Voting on investment projects diff --git a/config/locales/settings.es.yml b/config/locales/settings.es.yml index 36d4edf63..aa5dea14e 100644 --- a/config/locales/settings.es.yml +++ b/config/locales/settings.es.yml @@ -15,4 +15,6 @@ es: per_page_code: "Código a incluir en cada página" feature: debates: Debates - spending_proposals: Propuestas de gasto + spending_proposals: Propuestas de inversión + spending_proposal_features: + voting_allowed: Votaciones sobre propuestas de inversión. \ No newline at end of file diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml index 24c9ae928..8b7617f1a 100755 --- a/config/locales/verification.en.yml +++ b/config/locales/verification.en.yml @@ -83,7 +83,9 @@ en: title: Security code confirmation new: phone: Enter your mobile phone number to receive the code + phone_format_html: "(Example: 612345678 or +34612345678)" phone_note: We only user your phone for send to you a code, we never contact to you. + phone_placeholder: "Example: 612345678 or +34612345678" submit_button: Send title: Send confirmation code update: diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml index be676ab0f..7c27584a7 100644 --- a/config/locales/verification.es.yml +++ b/config/locales/verification.es.yml @@ -83,7 +83,9 @@ es: title: SMS de confirmación new: phone: Introduce tu teléfono móvil para recibir el código + phone_format_html: "(Ejemplo: 612345678 ó +34612345678)" phone_note: Sólo usaremos tu teléfono para enviarte un código, nunca te contactaremos. + phone_placeholder: "Ejemplo: 612345678 ó +34612345678" submit_button: Enviar title: SMS de confirmación update: diff --git a/config/routes.rb b/config/routes.rb index 680f657ab..dd4281788 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -66,7 +66,9 @@ Rails.application.routes.draw do end scope '/participatory_budget' do - resources :spending_proposals, only: [:index, :new, :create, :show, :destroy], path: 'investment_projects' + resources :spending_proposals, only: [:index, :new, :create, :show, :destroy], path: 'investment_projects' do + post :vote, on: :member + end end resources :stats, only: [:index] @@ -74,19 +76,17 @@ Rails.application.routes.draw do resources :legislations, only: [:show] resources :annotations do - collection do - get :search - end + get :search, on: :collection end resources :users, only: [:show] resource :account, controller: "account", only: [:show, :update, :delete] do - collection { get :erase } + get :erase, on: :collection end resources :notifications, only: [:index, :show] do - collection { put :mark_all_as_read } + put :mark_all_as_read, on: :collection end resource :verification, controller: "verification", only: [:show] @@ -102,7 +102,7 @@ Rails.application.routes.draw do namespace :admin do root to: "dashboard#index" resources :organizations, only: :index do - collection { get :search } + get :search, on: :collection member do put :verify put :reject @@ -146,20 +146,20 @@ Rails.application.routes.draw do resources :tags, only: [:index, :create, :update, :destroy] resources :officials, only: [:index, :edit, :update, :destroy] do - collection { get :search} + get :search, on: :collection end resources :settings, only: [:index, :update] resources :moderators, only: [:index, :create, :destroy] do - collection { get :search } + get :search, on: :collection end resources :valuators, only: [:index, :create] do - collection { get :search } + get :search, on: :collection end resources :verifications, controller: :verifications, only: :index do - collection { get :search} + get :search, on: :collection end resource :activity, controller: :activity, only: :show @@ -181,30 +181,18 @@ Rails.application.routes.draw do end resources :debates, only: :index do - member do - put :hide - end - collection do - put :moderate - end + put :hide, on: :member + put :moderate, on: :collection end resources :proposals, only: :index do - member do - put :hide - end - collection do - put :moderate - end + put :hide, on: :member + put :moderate, on: :collection end resources :comments, only: :index do - member do - put :hide - end - collection do - put :moderate - end + put :hide, on: :member + put :moderate, on: :collection end end @@ -212,9 +200,7 @@ Rails.application.routes.draw do root to: "spending_proposals#index" resources :spending_proposals, only: [:index, :show, :edit] do - member do - patch :valuate - end + patch :valuate, on: :member end end @@ -222,9 +208,7 @@ Rails.application.routes.draw do root to: "dashboard#index" resources :document_verifications, only: [:index, :new, :create] do - collection do - post :check - end + post :check, on: :collection end resources :email_verifications, only: [:new, :create] @@ -232,23 +216,24 @@ Rails.application.routes.draw do resources :users, only: [:new, :create] do collection do delete :logout + delete :erase end end + resource :account, controller: "account", only: [:show] + get 'sign_in', to: 'sessions#create' resource :session, only: [:create, :destroy] resources :proposals, only: [:index, :new, :create, :show] do - member do - post :vote - end - - collection do - get :print - end + post :vote, on: :member + get :print, on: :collection end - resources :spending_proposals, only: [:new, :create, :show] + resources :spending_proposals, only: [:index, :new, :create, :show] do + post :vote, on: :member + get :print, on: :collection + end end if Rails.env.development? diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 44db5f896..5a97a3aec 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -13,6 +13,7 @@ Setting.create(key: 'max_votes_for_debate_edit', value: '1000') Setting.create(key: 'max_votes_for_proposal_edit', value: '1000') Setting.create(key: 'proposal_code_prefix', value: 'MAD') Setting.create(key: 'votes_for_proposal_success', value: '100') +Setting.create(key: 'comments_body_max_length', value: '1000') Setting.create(key: 'blog_url', value: '/blog') Setting.create(key: 'url', value: 'http://localhost:3000') @@ -20,6 +21,7 @@ Setting.create(key: 'org_name', value: 'Consul') Setting.create(key: 'place_name', value: 'City') Setting.create(key: 'feature.debates', value: "true") Setting.create(key: 'feature.spending_proposals', value: "true") +Setting.create(key: 'feature.spending_proposal_features.voting_allowed', value: "true") Setting.create(key: 'feature.twitter_login', value: "true") Setting.create(key: 'feature.facebook_login', value: "true") Setting.create(key: 'feature.google_login', value: "true") @@ -46,6 +48,12 @@ moderator.create_moderator valuator = create_user('valuator@madrid.es', 'valuator') valuator.create_valuator +level_2 = create_user('leveltwo@madrid.es', 'level 2') +level_2.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: "2222222222", document_type: "1" ) + +verified = create_user('verified@madrid.es', 'verified') +verified.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.now, document_number: "3333333333") + (1..10).each do |i| org_name = Faker::Company.name org_user = create_user("org#{i}@madrid.es", org_name) diff --git a/db/migrate/20160328152843_add_unfeasible_email_sent_at_to_spending_proposals.rb b/db/migrate/20160328152843_add_unfeasible_email_sent_at_to_spending_proposals.rb new file mode 100644 index 000000000..bbe1dc6ec --- /dev/null +++ b/db/migrate/20160328152843_add_unfeasible_email_sent_at_to_spending_proposals.rb @@ -0,0 +1,5 @@ +class AddUnfeasibleEmailSentAtToSpendingProposals < ActiveRecord::Migration + def change + add_column :spending_proposals, :unfeasible_email_sent_at, :datetime, default: nil + end +end diff --git a/db/migrate/20160329115418_add_votes_up_to_spending_proposals.rb b/db/migrate/20160329115418_add_votes_up_to_spending_proposals.rb new file mode 100644 index 000000000..3b0f2a7ad --- /dev/null +++ b/db/migrate/20160329115418_add_votes_up_to_spending_proposals.rb @@ -0,0 +1,5 @@ +class AddVotesUpToSpendingProposals < ActiveRecord::Migration + def change + add_column :spending_proposals, :cached_votes_up, :integer, default: 0 + end +end diff --git a/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb b/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb new file mode 100644 index 000000000..080a8ebc9 --- /dev/null +++ b/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb @@ -0,0 +1,8 @@ +class AddTsvectorToSpendingProposals < ActiveRecord::Migration + + def change + add_column :spending_proposals, :tsv, :tsvector + add_index :spending_proposals, :tsv, using: "gin" + end + +end diff --git a/db/migrate/20160406163649_add_responsible_name_to_spending_proposals.rb b/db/migrate/20160406163649_add_responsible_name_to_spending_proposals.rb new file mode 100644 index 000000000..5749400bb --- /dev/null +++ b/db/migrate/20160406163649_add_responsible_name_to_spending_proposals.rb @@ -0,0 +1,5 @@ +class AddResponsibleNameToSpendingProposals < ActiveRecord::Migration + def change + add_column :spending_proposals, :responsible_name, :string, limit: 60 + end +end diff --git a/db/migrate/20160411161531_add_genre_and_dob_to_users.rb b/db/migrate/20160411161531_add_genre_and_dob_to_users.rb new file mode 100644 index 000000000..aa8100fa3 --- /dev/null +++ b/db/migrate/20160411161531_add_genre_and_dob_to_users.rb @@ -0,0 +1,6 @@ +class AddGenreAndDobToUsers < ActiveRecord::Migration + def change + add_column :users, :genre, :string, index: true, limit: 10 + add_column :users, :date_of_birth, :datetime, index: true + end +end diff --git a/db/migrate/20160413122359_rename_genre_to_gender.rb b/db/migrate/20160413122359_rename_genre_to_gender.rb new file mode 100644 index 000000000..f0bccfc28 --- /dev/null +++ b/db/migrate/20160413122359_rename_genre_to_gender.rb @@ -0,0 +1,5 @@ +class RenameGenreToGender < ActiveRecord::Migration + def change + rename_column :users, :genre, :gender + end +end diff --git a/db/migrate/20160415150524_add_physical_votes_to_spending_proposals.rb b/db/migrate/20160415150524_add_physical_votes_to_spending_proposals.rb new file mode 100644 index 000000000..a90b1d1a7 --- /dev/null +++ b/db/migrate/20160415150524_add_physical_votes_to_spending_proposals.rb @@ -0,0 +1,5 @@ +class AddPhysicalVotesToSpendingProposals < ActiveRecord::Migration + def change + add_column :spending_proposals, :physical_votes, :integer, default: 0 + end +end diff --git a/db/migrate/20160418144013_add_index_to_username.rb b/db/migrate/20160418144013_add_index_to_username.rb new file mode 100644 index 000000000..191f24ac6 --- /dev/null +++ b/db/migrate/20160418144013_add_index_to_username.rb @@ -0,0 +1,5 @@ +class AddIndexToUsername < ActiveRecord::Migration + def change + add_index :users, :username + end +end diff --git a/db/migrate/20160418172919_activate_newsletter_by_default.rb b/db/migrate/20160418172919_activate_newsletter_by_default.rb new file mode 100644 index 000000000..cdee85f1b --- /dev/null +++ b/db/migrate/20160418172919_activate_newsletter_by_default.rb @@ -0,0 +1,5 @@ +class ActivateNewsletterByDefault < ActiveRecord::Migration + def change + change_column :users, :newsletter, :boolean, default: true + end +end diff --git a/db/schema.rb b/db/schema.rb index a406d3f4c..49f0011f2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160315092854) do +ActiveRecord::Schema.define(version: 20160418172919) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -296,8 +296,8 @@ ActiveRecord::Schema.define(version: 20160315092854) do t.text "description" t.integer "author_id" t.string "external_url" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "geozone_id" t.integer "price", limit: 8 t.boolean "feasible" @@ -305,16 +305,22 @@ ActiveRecord::Schema.define(version: 20160315092854) do t.text "price_explanation" t.text "feasible_explanation" t.text "internal_comments" - t.boolean "valuation_finished", default: false + t.boolean "valuation_finished", default: false t.text "explanations_log" t.integer "administrator_id" - t.integer "valuation_assignments_count", default: 0 + t.integer "valuation_assignments_count", default: 0 t.integer "price_first_year", limit: 8 t.string "time_scope" + t.datetime "unfeasible_email_sent_at" + t.integer "cached_votes_up", default: 0 + t.tsvector "tsv" + t.string "responsible_name", limit: 60 + t.integer "physical_votes", default: 0 end add_index "spending_proposals", ["author_id"], name: "index_spending_proposals_on_author_id", using: :btree add_index "spending_proposals", ["geozone_id"], name: "index_spending_proposals_on_geozone_id", using: :btree + add_index "spending_proposals", ["tsv"], name: "index_spending_proposals_on_tsv", using: :gin create_table "taggings", force: :cascade do |t| t.integer "tag_id" @@ -410,13 +416,15 @@ ActiveRecord::Schema.define(version: 20160315092854) do t.string "erase_reason" t.datetime "erased_at" t.boolean "public_activity", default: true - t.boolean "newsletter", default: false + t.boolean "newsletter", default: true t.integer "notifications_count", default: 0 t.boolean "registering_with_oauth", default: false t.string "locale" t.string "oauth_email" t.integer "geozone_id" t.string "redeemable_code" + t.string "gender", limit: 10 + t.datetime "date_of_birth" end add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree @@ -424,6 +432,7 @@ ActiveRecord::Schema.define(version: 20160315092854) do add_index "users", ["geozone_id"], name: "index_users_on_geozone_id", using: :btree add_index "users", ["hidden_at"], name: "index_users_on_hidden_at", using: :btree add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree + add_index "users", ["username"], name: "index_users_on_username", using: :btree create_table "valuation_assignments", force: :cascade do |t| t.integer "valuator_id" diff --git a/db/seeds.rb b/db/seeds.rb index 55bd65e22..067349837 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -22,6 +22,9 @@ Setting["max_votes_for_debate_edit"] = 1000 # Max votes where a proposal is still editable Setting["max_votes_for_proposal_edit"] = 1000 +# Max length for comments +Setting['comments_body_max_length'] = 1000 + # Prefix for the Proposal codes Setting["proposal_code_prefix"] = 'MAD' @@ -37,6 +40,7 @@ Setting['per_page_code'] = '' # Social settings Setting["twitter_handle"] = nil +Setting["twitter_hashtag"] = nil Setting["facebook_handle"] = nil Setting["youtube_handle"] = nil Setting["blog_url"] = nil @@ -58,5 +62,5 @@ Setting['feature.facebook_login'] = true Setting['feature.google_login'] = true Setting['feature.public_stats'] = true -# Max length for comments -Setting['comments_body_max_length'] = 1000 +# Spending proposals feature flags +Setting['feature.spending_proposal_features.voting_allowed'] = true diff --git a/lib/active_model/dates.rb b/lib/active_model/dates.rb index a519e3840..f9605ddbd 100644 --- a/lib/active_model/dates.rb +++ b/lib/active_model/dates.rb @@ -13,13 +13,4 @@ module ActiveModel::Dates attrs.except("#{field}(1i)", "#{field}(2i)", "#{field}(3i)") end - def date_to_string(date) - date.strftime("%d-%m-%Y") - end - - def string_to_date(value) - day, month, year = value.split("-") - Date.new(year.to_i, month.to_i, day.to_i) - end - -end \ No newline at end of file +end diff --git a/lib/census_api.rb b/lib/census_api.rb index 737f7f873..678a748c6 100644 --- a/lib/census_api.rb +++ b/lib/census_api.rb @@ -38,7 +38,10 @@ class CensusApi end def date_of_birth - data[:datos_habitante][:item][:fecha_nacimiento_string] + str = data[:datos_habitante][:item][:fecha_nacimiento_string] + day, month, year = str.match(/(\d\d?)\D(\d\d?)\D(\d\d\d?\d?)/)[1..3] + return nil unless day.present? && month.present? && year.present? + Date.new(year.to_i, month.to_i, day.to_i) end def postal_code @@ -49,6 +52,15 @@ class CensusApi data[:datos_vivienda][:item][:codigo_distrito] end + def gender + case data[:datos_habitante][:item][:descripcion_sexo] + when "Varón" + "male" + when "Mujer" + "female" + end + end + private def data @@ -86,7 +98,7 @@ class CensusApi end def stubbed_response_body - {:get_habita_datos_response=>{:get_habita_datos_return=>{:hay_errores=>false, :datos_habitante=>{:item=>{:fecha_nacimiento_string=>"31-12-1980", :identificador_documento=>"12345678Z", }}, :datos_vivienda=>{:item=>{:codigo_postal=>"28013", :codigo_distrito=>"01"}}}}} + {get_habita_datos_response: {get_habita_datos_return: {hay_errores: false, datos_habitante: { item: {fecha_nacimiento_string: "31-12-1980", identificador_documento: "12345678Z", descripcion_sexo: "Varón" }}, datos_vivienda: {item: {codigo_postal: "28013", codigo_distrito: "01"}}}}} end def is_dni?(document_type) diff --git a/lib/manager_authenticator.rb b/lib/manager_authenticator.rb index 3f0d58357..2d8e6f1f9 100644 --- a/lib/manager_authenticator.rb +++ b/lib/manager_authenticator.rb @@ -1,7 +1,7 @@ class ManagerAuthenticator def initialize(data={}) - @manager = {login: data[:login], user_key: data[:clave_usuario], date: data[:fecha_conexion]} + @manager = {login: data[:login], user_key: data[:clave_usuario], date: data[:fecha_conexion]}.with_indifferent_access end def auth diff --git a/lib/tasks/spending_proposals.rake b/lib/tasks/spending_proposals.rake new file mode 100644 index 000000000..365338d96 --- /dev/null +++ b/lib/tasks/spending_proposals.rake @@ -0,0 +1,21 @@ +namespace :spending_proposals do + desc "Sends an email to the authors of unfeasible spending proposals" + task send_unfeasible_emails: :environment do + SpendingProposal.find_each do |spending_proposal| + if spending_proposal.unfeasible_email_pending? + spending_proposal.send_unfeasible_email + puts "email sent for proposal #{spending_proposal.title}" + else + puts "this proposal is feasible: #{spending_proposal.title}" + end + end + end + + desc "Updates all spending proposals to recalculate their tsv and responsible_name columns" + task touch: :environment do + SpendingProposal.find_in_batches do |spending_proposal| + spending_proposal.each(&:save) + end + end + +end diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake index 0ce4cdfee..efbeeaa94 100644 --- a/lib/tasks/users.rake +++ b/lib/tasks/users.rake @@ -40,5 +40,40 @@ namespace :users do end end + desc "Associates demographic information to users" + task assign_demographic: :environment do + User.residence_verified.where(gender: nil).find_each do |u| + begin + response = CensusApi.new.call(u.document_type, u.document_number) + if response.valid? + u.gender = response.gender + u.date_of_birth = response.date_of_birth.to_datetime + u.save + print "." + else + print "X" + end + rescue + puts "Could not assign gender/dob for user: #{u.id}" + end + end + end + desc "Makes duplicate username users change their username" + task social_network_reset: :environment do + duplicated_usernames = User.all.select(:username).group(:username).having('count(username) > 1').pluck(:username) + + duplicated_usernames.each do |username| + print "." + user_ids = User.where(username: username).order(created_at: :asc).pluck(:id) + user_ids_to_review = Identity.where(user_id: user_ids).pluck(:user_id) + user_ids_to_review.shift if user_ids.size == user_ids_to_review.size + user_ids_to_review.each { |id| User.find(id).update(registering_with_oauth: true) } + end + end + + desc "Removes identities associated to erased users" + task remove_erased_identities: :environment do + Identity.joins(:user).where('users.erased_at IS NOT NULL').destroy_all + end end diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb index fcfec8638..144ff9b31 100644 --- a/spec/features/admin/spending_proposals_spec.rb +++ b/spec/features/admin/spending_proposals_spec.rb @@ -143,6 +143,52 @@ feature 'Admin spending proposals' do end + scenario "Filtering by valuator", :js do + user = create(:user) + valuator = create(:valuator, user: user, description: 'Valuator 1') + + spending_proposal = create(:spending_proposal, title: "Realocate visitors") + spending_proposal.valuators << valuator + + create(:spending_proposal, title: "Destroy the city") + + visit admin_spending_proposals_path + expect(page).to have_link("Realocate visitors") + expect(page).to have_link("Destroy the city") + + select "Valuator 1", from: "valuator_id" + + expect(page).to have_content('There is 1 spending proposal') + expect(page).to_not have_link("Destroy the city") + expect(page).to have_link("Realocate visitors") + + select "All valuators", from: "valuator_id" + + expect(page).to have_content('There are 2 spending proposals') + expect(page).to have_link("Destroy the city") + expect(page).to have_link("Realocate visitors") + + select "Valuator 1", from: "valuator_id" + expect(page).to have_content('There is 1 spending proposal') + click_link("Realocate visitors") + click_link("Back") + + expect(page).to have_content('There is 1 spending proposal') + expect(page).to_not have_link("Destroy the city") + expect(page).to have_link("Realocate visitors") + + click_link("Realocate visitors") + click_on("Edit classification") + expect(page).to have_button("Update") + click_on("Back") + expect(page).to_not have_button("Update") + click_on("Back") + + expect(page).to have_content('There is 1 spending proposal') + expect(page).to_not have_link("Destroy the city") + expect(page).to have_link("Realocate visitors") + end + scenario "Current filter is properly highlighted" do filters_links = {'valuation_open' => 'Open', 'without_admin' => 'Without assigned admin', @@ -284,6 +330,24 @@ feature 'Admin spending proposals' do context "Edit" do + scenario "Change title, description or geozone" do + spending_proposal = create(:spending_proposal) + create(:geozone, name: "Barbate") + + visit admin_spending_proposal_path(spending_proposal) + click_link 'Edit' + + fill_in 'spending_proposal_title', with: 'Potatoes' + fill_in 'spending_proposal_description', with: 'Carrots' + select 'Barbate', from: 'spending_proposal[geozone_id]' + + click_button 'Update' + + expect(page).to have_content 'Potatoes' + expect(page).to have_content 'Carrots' + expect(page).to have_content 'Barbate' + end + scenario "Add administrator" do spending_proposal = create(:spending_proposal) administrator = create(:administrator, user: create(:user, username: 'Marta', email: 'marta@admins.org')) diff --git a/spec/features/admin/tags_spec.rb b/spec/features/admin/tags_spec.rb index 74579c1b8..b944cdd9e 100644 --- a/spec/features/admin/tags_spec.rb +++ b/spec/features/admin/tags_spec.rb @@ -33,7 +33,7 @@ feature 'Admin tags' do scenario 'Update' do visit admin_tags_path featured_checkbox = find("#tag_featured_#{@tag1.id}") - expect(featured_checkbox.checked?).to be_nil + expect(featured_checkbox.checked?).to be_blank within("#edit_tag_#{@tag1.id}") do check "tag_featured_#{@tag1.id}" @@ -42,7 +42,7 @@ feature 'Admin tags' do visit admin_tags_path featured_checkbox = find("#tag_featured_#{@tag1.id}") - expect(featured_checkbox.checked?).to eq('checked') + expect(featured_checkbox.checked?).to eq(true) end scenario 'Delete' do diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index fd3b219e6..c6f0d3708 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -122,4 +122,30 @@ feature 'Emails' do expect(email).to have_body_text(user_confirmation_path) end + scenario "Email on unfeasible spending proposal" do + spending_proposal = create(:spending_proposal) + administrator = create(:administrator) + valuator = create(:valuator) + spending_proposal.update(administrator: administrator) + spending_proposal.valuators << valuator + + login_as(valuator.user) + visit edit_valuation_spending_proposal_path(spending_proposal) + + choose 'spending_proposal_feasible_false' + fill_in 'spending_proposal_feasible_explanation', with: 'This is not legal as stated in Article 34.9' + check 'spending_proposal_valuation_finished' + click_button 'Save changes' + + expect(page).to have_content "Dossier updated" + spending_proposal.reload + + email = open_last_email + expect(email).to have_subject("Your investment project '#{spending_proposal.code}' has been marked as unfeasible") + expect(email).to deliver_to(spending_proposal.author.email) + expect(email).to have_body_text(spending_proposal.title) + expect(email).to have_body_text(spending_proposal.code) + expect(email).to have_body_text(spending_proposal.feasible_explanation) + end + end diff --git a/spec/features/management/account_spec.rb b/spec/features/management/account_spec.rb new file mode 100644 index 000000000..3b9951d41 --- /dev/null +++ b/spec/features/management/account_spec.rb @@ -0,0 +1,32 @@ +require 'rails_helper' + +feature 'Account' do + + background do + login_as_manager + end + + scenario "Should not allow unverified users to create spending proposals" do + user = create(:user) + login_managed_user(user) + + click_link "Edit user account" + + expect(page).to have_content "No verified user logged in yet" + end + + scenario 'Delete a user account', :js do + user = create(:user, :level_two) + login_managed_user(user) + + visit management_account_path + + click_link "Delete user" + click_link "Delete account" + + expect(page).to have_content "User account deleted." + + expect(user.reload.erase_reason).to eq "Deleted by manager: JJB042" + end + +end \ No newline at end of file diff --git a/spec/features/management/proposals_spec.rb b/spec/features/management/proposals_spec.rb index f83c37a0c..e5279bac4 100644 --- a/spec/features/management/proposals_spec.rb +++ b/spec/features/management/proposals_spec.rb @@ -185,7 +185,7 @@ feature 'Proposals' do context "Printing" do - scenario 'Printing proposals', :js do + scenario 'Printing proposals' do 6.times { create(:proposal) } click_link "Print proposals" diff --git a/spec/features/management/spending_proposals_spec.rb b/spec/features/management/spending_proposals_spec.rb index 52ea36801..760d2a07a 100644 --- a/spec/features/management/spending_proposals_spec.rb +++ b/spec/features/management/spending_proposals_spec.rb @@ -51,4 +51,174 @@ feature 'Spending Proposals' do end end + context "Searching" do + scenario "by title" do + spending_proposal1 = create(:spending_proposal, title: "Show me what you got") + spending_proposal2 = create(:spending_proposal, title: "Get Schwifty") + + user = create(:user, :level_two) + login_managed_user(user) + + click_link "Support spending proposals" + + fill_in "search", with: "what you got" + click_button "Search" + + expect(current_path).to eq(management_spending_proposals_path) + + within("#investment-projects") do + expect(page).to have_css('.investment-project', count: 1) + expect(page).to have_content(spending_proposal1.title) + expect(page).to_not have_content(spending_proposal2.title) + expect(page).to have_css("a[href='#{management_spending_proposal_path(spending_proposal1)}']", text: spending_proposal1.title) + expect(page).to have_css("a[href='#{management_spending_proposal_path(spending_proposal1)}']", text: spending_proposal1.description) + end + end + + scenario "by district" do + spending_proposal1 = create(:spending_proposal, title: "Hey ho", geozone_id: create(:geozone, name: "District 9").id) + spending_proposal2 = create(:spending_proposal, title: "Let's go", geozone_id: create(:geozone, name: "Area 52").id) + + user = create(:user, :level_two) + login_managed_user(user) + + click_link "Support spending proposals" + + fill_in "search", with: "Area 52" + click_button "Search" + + expect(current_path).to eq(management_spending_proposals_path) + + within("#investment-projects") do + expect(page).to have_css('.investment-project', count: 1) + expect(page).to_not have_content(spending_proposal1.title) + expect(page).to have_content(spending_proposal2.title) + expect(page).to have_css("a[href='#{management_spending_proposal_path(spending_proposal2)}']", text: spending_proposal2.title) + expect(page).to have_css("a[href='#{management_spending_proposal_path(spending_proposal2)}']", text: spending_proposal2.description) + end + end + end + + scenario "Listing" do + spending_proposal1 = create(:spending_proposal, title: "Show me what you got") + spending_proposal2 = create(:spending_proposal, title: "Get Schwifty") + + user = create(:user, :level_two) + login_managed_user(user) + + click_link "Support spending proposals" + + expect(current_path).to eq(management_spending_proposals_path) + + within(".account-info") do + expect(page).to have_content "Identified as" + expect(page).to have_content "#{user.username}" + expect(page).to have_content "#{user.email}" + expect(page).to have_content "#{user.document_number}" + end + + within("#investment-projects") do + expect(page).to have_css('.investment-project', count: 2) + expect(page).to have_css("a[href='#{management_spending_proposal_path(spending_proposal1)}']", text: spending_proposal1.title) + expect(page).to have_css("a[href='#{management_spending_proposal_path(spending_proposal1)}']", text: spending_proposal1.description) + expect(page).to have_css("a[href='#{management_spending_proposal_path(spending_proposal2)}']", text: spending_proposal2.title) + expect(page).to have_css("a[href='#{management_spending_proposal_path(spending_proposal2)}']", text: spending_proposal2.description) + end + end + + context "Voting" do + + scenario 'Voting spending proposals on behalf of someone in index view', :js do + spending_proposal = create(:spending_proposal) + + user = create(:user, :level_two) + login_managed_user(user) + + click_link "Support spending proposals" + + within("#investment-projects") do + find('.in-favor a').click + + expect(page).to have_content "1 support" + expect(page).to have_content "You have already supported this. Share it!" + end + expect(current_path).to eq(management_spending_proposals_path) + end + + scenario 'Voting spending proposals on behalf of someone in show view', :js do + spending_proposal = create(:spending_proposal) + + user = create(:user, :level_two) + login_managed_user(user) + + click_link "Support spending proposals" + + within("#investment-projects") do + click_link spending_proposal.title + end + + find('.in-favor a').click + expect(page).to have_content "1 support" + expect(page).to have_content "You have already supported this. Share it!" + expect(current_path).to eq(management_spending_proposal_path(spending_proposal)) + end + + scenario "Should not allow unverified users to vote proposals" do + spending_proposal = create(:spending_proposal) + + user = create(:user) + login_managed_user(user) + + click_link "Support spending proposals" + + expect(page).to have_content "User is not verified" + end + end + + context "Printing" do + + scenario 'Printing spending proposals' do + 16.times { create(:spending_proposal, geozone_id: nil) } + + click_link "Print spending proposals" + + expect(page).to have_css('.investment-project', count: 15) + expect(page).to have_css("a[href='javascript:window.print();']", text: 'Print') + end + + scenario "Filtering spending proposals by geozone to be printed", :js do + district_9 = create(:geozone, name: "District Nine") + create(:spending_proposal, title: 'Change district 9', geozone: district_9, cached_votes_up: 10) + create(:spending_proposal, title: 'Destroy district 9', geozone: district_9, cached_votes_up: 100) + create(:spending_proposal, title: 'Nuke district 9', geozone: district_9, cached_votes_up: 1) + create(:spending_proposal, title: 'Add new districts to the city', geozone_id: nil) + + user = create(:user, :level_two) + login_managed_user(user) + + click_link "Print spending proposals" + + expect(page).to have_content "Investment projects with scope: All city" + + within '#investment-projects' do + expect(page).to have_content('Add new districts to the city') + expect(page).to_not have_content('Change district 9') + expect(page).to_not have_content('Destroy district 9') + expect(page).to_not have_content('Nuke district 9') + end + + select 'District Nine', from: 'geozone' + + expect(page).to have_content "Investment projects with scope: District Nine" + expect(current_url).to include("geozone=#{district_9.id}") + + within '#investment-projects' do + expect(page).to_not have_content('Add new districts to the city') + expect('Destroy district 9').to appear_before('Change district 9') + expect('Change district 9').to appear_before('Nuke district 9') + end + end + + end + end \ No newline at end of file diff --git a/spec/features/management/users_spec.rb b/spec/features/management/users_spec.rb index 31e4bbeeb..021edaaad 100644 --- a/spec/features/management/users_spec.rb +++ b/spec/features/management/users_spec.rb @@ -1,10 +1,12 @@ require 'rails_helper' -feature 'users' do - - scenario 'Creating a level 3 user from scratch' do +feature 'Users' do + background do login_as_manager + end + + scenario 'Create a level 3 user from scratch' do visit management_document_verifications_path fill_in 'document_verification_document_number', with: '1234' @@ -42,4 +44,28 @@ feature 'users' do expect(page).to have_content "Your account has been confirmed." end + scenario 'Delete a level 2 user account from document verification page', :js do + level_2_user = create(:user, :level_two, document_number: 13579) + + visit management_document_verifications_path + fill_in 'document_verification_document_number', with: '13579' + click_button 'Check' + + expect(page).to_not have_content "This user account is already verified." + expect(page).to have_content "This user can participate in the website with the following permissions" + + click_link "Delete user" + click_link "Delete account" + + expect(page).to have_content "User account deleted." + + expect(level_2_user.reload.erase_reason).to eq "Deleted by manager: JJB042" + + visit management_document_verifications_path + fill_in 'document_verification_document_number', with: '13579' + click_button 'Check' + + expect(page).to have_content "no user account associated to it" + end + end \ No newline at end of file diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 2d2804233..bde574935 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -87,6 +87,29 @@ feature 'Proposals' do end end + context "Embedded video" do + scenario "Show YouTube video" do + proposal = create(:proposal, video_url: "http://www.youtube.com/watch?v=a7UFm6ErMPU") + visit proposal_path(proposal) + expect(page).to have_selector("div[id='js-embedded-video']") + expect(page.html).to include 'https://www.youtube.com/embed/a7UFm6ErMPU' + end + + scenario "Show Vimeo video" do + proposal = create(:proposal, video_url: "https://vimeo.com/7232823" ) + visit proposal_path(proposal) + expect(page).to have_selector("div[id='js-embedded-video']") + expect(page.html).to include 'https://player.vimeo.com/video/7232823' + end + + scenario "Dont show video" do + proposal = create(:proposal, video_url: nil) + + visit proposal_path(proposal) + expect(page).to_not have_selector("div[id='js-embedded-video']") + end + end + scenario 'Social Media Cards' do proposal = create(:proposal) diff --git a/spec/features/spending_proposals_spec.rb b/spec/features/spending_proposals_spec.rb index 0fd31f5f7..cb3a6d8d5 100644 --- a/spec/features/spending_proposals_spec.rb +++ b/spec/features/spending_proposals_spec.rb @@ -5,17 +5,88 @@ feature 'Spending proposals' do let(:author) { create(:user, :level_two, username: 'Isabel') } scenario 'Index' do - visit spending_proposals_path - - expect(page).to_not have_link('Create spending proposal', href: new_spending_proposal_path) - expect(page).to have_link('verify your account') - - login_as(author) + spending_proposals = [create(:spending_proposal), create(:spending_proposal), create(:spending_proposal, feasible: true)] + unfeasible_spending_proposal = create(:spending_proposal, feasible: false) visit spending_proposals_path - expect(page).to have_link('Create spending proposal', href: new_spending_proposal_path) - expect(page).to_not have_link('verify your account') + expect(page).to have_selector('#investment-projects .investment-project', count: 3) + spending_proposals.each do |spending_proposal| + within('#investment-projects') do + expect(page).to have_content spending_proposal.title + expect(page).to have_css("a[href='#{spending_proposal_path(spending_proposal)}']", text: spending_proposal.title) + expect(page).to_not have_content(unfeasible_spending_proposal.title) + end + end + end + + context("Search") do + scenario 'Search by text' do + spending_proposal1 = create(:spending_proposal, title: "Get Schwifty") + spending_proposal2 = create(:spending_proposal, title: "Schwifty Hello") + spending_proposal3 = create(:spending_proposal, title: "Do not show me") + + visit spending_proposals_path + + within(".expanded #search_form") do + fill_in "search", with: "Schwifty" + click_button "Search" + end + + within("#investment-projects") do + expect(page).to have_css('.investment-project', count: 2) + + expect(page).to have_content(spending_proposal1.title) + expect(page).to have_content(spending_proposal2.title) + expect(page).to_not have_content(spending_proposal3.title) + end + end + end + + context("Filters") do + scenario 'by geozone' do + geozone1 = create(:geozone) + spending_proposal1 = create(:spending_proposal, geozone: geozone1) + spending_proposal2 = create(:spending_proposal, geozone: create(:geozone)) + spending_proposal3 = create(:spending_proposal, geozone: geozone1) + spending_proposal4 = create(:spending_proposal) + + visit spending_proposals_path + + within(".geozone") do + click_link geozone1.name + end + + within("#investment-projects") do + expect(page).to have_css('.investment-project', count: 2) + + expect(page).to have_content(spending_proposal1.title) + expect(page).to have_content(spending_proposal3.title) + expect(page).to_not have_content(spending_proposal2.title) + expect(page).to_not have_content(spending_proposal4.title) + end + end + + scenario 'by unfeasibility' do + geozone1 = create(:geozone) + spending_proposal1 = create(:spending_proposal, feasible: false) + spending_proposal2 = create(:spending_proposal, feasible: true) + spending_proposal3 = create(:spending_proposal) + + visit spending_proposals_path + + within("#sidebar") do + click_link "Unfeasible" + end + + within("#investment-projects") do + expect(page).to have_css('.investment-project', count: 1) + + expect(page).to have_content(spending_proposal1.title) + expect(page).to_not have_content(spending_proposal2.title) + expect(page).to_not have_content(spending_proposal3.title) + end + end end scenario 'Create' do @@ -95,61 +166,7 @@ feature 'Spending proposals' do expect(page).to have_content error_message end - scenario "Show (as admin)" do - user = create(:user) - admin = create(:administrator, user: user) - login_as(admin.user) - - spending_proposal = create(:spending_proposal, - geozone: create(:geozone), - association_name: 'People of the neighbourhood') - - visit spending_proposal_path(spending_proposal) - - expect(page).to have_content(spending_proposal.title) - expect(page).to have_content(spending_proposal.description) - expect(page).to have_content(spending_proposal.author.name) - expect(page).to have_content(spending_proposal.association_name) - expect(page).to have_content(spending_proposal.geozone.name) - end - - scenario "Show (as valuator)" do - user = create(:user) - admin = create(:valuator, user: user) - login_as(admin.user) - - spending_proposal = create(:spending_proposal, - geozone: create(:geozone), - association_name: 'People of the neighbourhood') - - visit spending_proposal_path(spending_proposal) - - expect(page).to have_content(spending_proposal.title) - expect(page).to have_content(spending_proposal.description) - expect(page).to have_content(spending_proposal.author.name) - expect(page).to have_content(spending_proposal.association_name) - expect(page).to have_content(spending_proposal.geozone.name) - end - - scenario "Show (as author)" do - author = create(:user) - login_as(author) - - spending_proposal = create(:spending_proposal, - geozone: create(:geozone), - association_name: 'People of the neighbourhood', - author: author) - - visit spending_proposal_path(spending_proposal) - - expect(page).to have_content(spending_proposal.title) - expect(page).to have_content(spending_proposal.description) - expect(page).to have_content(spending_proposal.author.name) - expect(page).to have_content(spending_proposal.association_name) - expect(page).to have_content(spending_proposal.geozone.name) - end - - scenario "Show (as user)" do + scenario "Show" do user = create(:user) login_as(user) @@ -159,16 +176,24 @@ feature 'Spending proposals' do visit spending_proposal_path(spending_proposal) - expect(page).to_not have_content(spending_proposal.title) - expect(page).to have_content("You do not have permission to access this page") + expect(page).to have_content(spending_proposal.title) + expect(page).to have_content(spending_proposal.description) + expect(page).to have_content(spending_proposal.author.name) + expect(page).to have_content(spending_proposal.association_name) + expect(page).to have_content(spending_proposal.geozone.name) + within("#spending_proposal_code") do + expect(page).to have_content(spending_proposal.id) + end end context "Destroy" do - scenario "User can destroy owned spending proposals" do + scenario "Admin can destroy owned spending proposals" do + admin = create(:administrator) user = create(:user, :level_two) spending_proposal = create(:spending_proposal, author: user) - login_as(user) + + login_as(admin.user) visit user_path(user) within("#spending_proposal_#{spending_proposal.id}") do diff --git a/spec/features/users_auth_spec.rb b/spec/features/users_auth_spec.rb index a1c9374be..f9b92bb12 100644 --- a/spec/features/users_auth_spec.rb +++ b/spec/features/users_auth_spec.rb @@ -169,6 +169,12 @@ feature 'Users' do expect(current_path).to eq(finish_signup_path) + expect(page).to have_field('user_username', with: 'manuela') + + click_button 'Register' + + expect(current_path).to eq(do_finish_signup_path) + fill_in 'user_username', with: 'manuela2' click_button 'Register' diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index eff63b18b..93369a2c9 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -240,19 +240,19 @@ feature 'Users' do expect(page).to have_content('Build a school') end - scenario 'delete button is shown if logged in user is author' do + scenario 'delete button is not shown if logged in user is author' do login_as(@author) visit user_path(@author) within("#spending_proposal_#{@spending_proposal.id}") do - expect(page).to have_content('Delete') + expect(page).to_not have_content('Delete') end end - scenario 'delete button is not shown if logged in user is admin' do + scenario 'delete button is shown if logged in user is admin' do login_as(create(:administrator).user) visit user_path(@author) within("#spending_proposal_#{@spending_proposal.id}") do - expect(page).to_not have_content('Delete') + expect(page).to have_content('Delete') end end diff --git a/spec/features/valuation/spending_proposals_spec.rb b/spec/features/valuation/spending_proposals_spec.rb index 8af416dc2..98037607c 100644 --- a/spec/features/valuation/spending_proposals_spec.rb +++ b/spec/features/valuation/spending_proposals_spec.rb @@ -37,6 +37,21 @@ feature 'Valuation spending proposals' do expect(page).to_not have_content(spending_proposal2.title) end + scenario 'Index orders spending proposals by votes' do + spending_proposal10 = create(:spending_proposal, cached_votes_up: 10) + spending_proposal100 = create(:spending_proposal, cached_votes_up: 100) + spending_proposal1 = create(:spending_proposal, cached_votes_up: 1) + + spending_proposal1.valuators << @valuator + spending_proposal10.valuators << @valuator + spending_proposal100.valuators << @valuator + + visit valuation_spending_proposals_path + + expect(spending_proposal100.title).to appear_before(spending_proposal10.title) + expect(spending_proposal10.title).to appear_before(spending_proposal1.title) + end + scenario 'Index shows assignments info' do spending_proposal1 = create(:spending_proposal) spending_proposal2 = create(:spending_proposal) @@ -76,17 +91,17 @@ feature 'Valuation spending proposals' do expect(page).to have_link("Realocate visitors") expect(page).to have_link("Destroy the city") - select "District 9", from: "geozone_id" + click_link "District 9", exact: false expect(page).to have_link("Realocate visitors") expect(page).to_not have_link("Destroy the city") - select "All city", from: "geozone_id" + click_link "All city", exact: false expect(page).to have_link("Destroy the city") expect(page).to_not have_link("Realocate visitors") - select "All zones", from: "geozone_id" + click_link "All zones", exact: false expect(page).to have_link("Realocate visitors") expect(page).to have_link("Destroy the city") end diff --git a/spec/features/votes_spec.rb b/spec/features/votes_spec.rb index 3ccf6bcdb..2ae64effe 100644 --- a/spec/features/votes_spec.rb +++ b/spec/features/votes_spec.rb @@ -313,7 +313,7 @@ feature 'Votes' do scenario 'Not logged user trying to vote comments in proposals', :js do proposal = create(:proposal) comment = create(:comment, commentable: proposal) - + visit comment_path(comment) within("#comment_#{comment.id}_reply") do find("div.votes").hover @@ -361,4 +361,98 @@ feature 'Votes' do expect_message_only_verified_can_vote_proposals end end + + feature 'Spending Proposals' do + background { login_as(@manuela) } + + feature 'Index' do + scenario "Index shows user votes on proposals" do + spending_proposal1 = create(:spending_proposal) + spending_proposal2 = create(:spending_proposal) + spending_proposal3 = create(:spending_proposal) + create(:vote, voter: @manuela, votable: spending_proposal1, vote_flag: true) + + visit spending_proposals_path + + within("#investment-projects") do + within("#spending_proposal_#{spending_proposal1.id}_votes") do + expect(page).to have_content "You have already supported this. Share it!" + end + + within("#spending_proposal_#{spending_proposal2.id}_votes") do + expect(page).to_not have_content "You have already supported this. Share it!" + end + + within("#spending_proposal_#{spending_proposal3.id}_votes") do + expect(page).to_not have_content "You have already supported this. Share it!" + end + end + end + + scenario 'Create from spending proposal index', :js do + spending_proposal = create(:spending_proposal) + visit spending_proposals_path + + within('.supports') do + find('.in-favor a').click + + expect(page).to have_content "1 support" + expect(page).to have_content "You have already supported this. Share it!" + end + end + end + + feature 'Single spending proposal' do + background do + @proposal = create(:spending_proposal) + end + + scenario 'Show no votes' do + visit spending_proposal_path(@proposal) + expect(page).to have_content "No supports" + end + + scenario 'Trying to vote multiple times', :js do + visit spending_proposal_path(@proposal) + + within('.supports') do + find('.in-favor a').click + expect(page).to have_content "1 support" + + expect(page).to_not have_selector ".in-favor a" + end + end + + scenario 'Create from proposal show', :js do + visit spending_proposal_path(@proposal) + + within('.supports') do + find('.in-favor a').click + + expect(page).to have_content "1 support" + expect(page).to have_content "You have already supported this. Share it!" + end + end + end + end + + scenario 'Disable voting on spending proposals', :js do + login_as(@manuela) + Setting["feature.spending_proposal_features.voting_allowed"] = nil + spending_proposal = create(:spending_proposal) + + visit spending_proposals_path + + within("#spending_proposal_#{spending_proposal.id}") do + find("div.supports").hover + expect_message_voting_not_allowed + end + + visit spending_proposal_path(spending_proposal) + + within("#spending_proposal_#{spending_proposal.id}") do + find("div.supports").hover + expect_message_voting_not_allowed + end + end end diff --git a/spec/lib/census_api_spec.rb b/spec/lib/census_api_spec.rb index a49133d23..fb14f39c5 100644 --- a/spec/lib/census_api_spec.rb +++ b/spec/lib/census_api_spec.rb @@ -29,7 +29,7 @@ describe CensusApi do describe '#call' do let(:invalid_body) { {get_habita_datos_response: {get_habita_datos_return: {datos_habitante: {}}}} } - let(:valid_body){ {get_habita_datos_response: {get_habita_datos_return: {datos_habitante: {item: {fecha_nacimiento_string: "1/1/1980"}}}}} } + let(:valid_body){ {get_habita_datos_response: {get_habita_datos_return: {datos_habitante: {item: {fecha_nacimiento_string: "1-1-1980"}}}}} } it "returns the response for the first valid variant" do allow(api).to receive(:get_response_body).with(1, "00123456").and_return(invalid_body) @@ -39,7 +39,7 @@ describe CensusApi do response = api.call(1, "123456") expect(response).to be_valid - expect(response.date_of_birth).to eq('1/1/1980') + expect(response.date_of_birth).to eq(Date.new(1980,1,1)) end it "returns the last failed response" do diff --git a/spec/models/abilities/administrator_spec.rb b/spec/models/abilities/administrator_spec.rb index b5ee78dd0..f9ed7a0c5 100644 --- a/spec/models/abilities/administrator_spec.rb +++ b/spec/models/abilities/administrator_spec.rb @@ -55,4 +55,5 @@ describe "Abilities::Administrator" do it { should be_able_to(:read, SpendingProposal) } it { should be_able_to(:update, SpendingProposal) } it { should be_able_to(:valuate, SpendingProposal) } + it { should be_able_to(:destroy, SpendingProposal) } end diff --git a/spec/models/abilities/common_spec.rb b/spec/models/abilities/common_spec.rb index 8c90f7cea..468173797 100644 --- a/spec/models/abilities/common_spec.rb +++ b/spec/models/abilities/common_spec.rb @@ -92,7 +92,7 @@ describe "Abilities::Common" do it { should be_able_to(:create, SpendingProposal) } it { should_not be_able_to(:destroy, create(:spending_proposal)) } - it { should be_able_to(:destroy, own_spending_proposal) } + it { should_not be_able_to(:destroy, own_spending_proposal) } end describe "when level 3 verified" do @@ -104,6 +104,6 @@ describe "Abilities::Common" do it { should be_able_to(:create, SpendingProposal) } it { should_not be_able_to(:destroy, create(:spending_proposal)) } - it { should be_able_to(:destroy, own_spending_proposal) } + it { should_not be_able_to(:destroy, own_spending_proposal) } end end diff --git a/spec/models/residence_spec.rb b/spec/models/residence_spec.rb index fbc33d39c..ce151eaee 100644 --- a/spec/models/residence_spec.rb +++ b/spec/models/residence_spec.rb @@ -85,7 +85,7 @@ describe Verification::Residence do describe "save" do - it "should store document number, document type, and geozone" do + it "should store document number, document type, geozone, date of birth and gender" do user = create(:user) residence.user = user residence.save @@ -93,6 +93,10 @@ describe Verification::Residence do user.reload expect(user.document_number).to eq('12345678Z') expect(user.document_type).to eq("1") + expect(user.date_of_birth.year).to eq(1980) + expect(user.date_of_birth.month).to eq(12) + expect(user.date_of_birth.day).to eq(31) + expect(user.gender).to eq('male') expect(user.geozone).to eq(geozone) end diff --git a/spec/models/sms_spec.rb b/spec/models/sms_spec.rb index f52ff3c6e..83723cb3c 100644 --- a/spec/models/sms_spec.rb +++ b/spec/models/sms_spec.rb @@ -7,9 +7,16 @@ describe Verification::Sms do end it "should validate uniqness of phone" do - user = create(:user, confirmed_phone: "699999999") + create(:user, confirmed_phone: "699999999") sms = Verification::Sms.new(phone: "699999999") expect(sms).to_not be_valid end -end \ No newline at end of file + it "only allows spaces, numbers and the + sign" do + expect(build(:verification_sms, phone: "0034 666666666")).to be_valid + expect(build(:verification_sms, phone: "+34 666666666")).to be_valid + expect(build(:verification_sms, phone: "hello there")).to_not be_valid + expect(build(:verification_sms, phone: "555; DROP TABLE USERS")).to_not be_valid + end + +end diff --git a/spec/models/spending_proposal_spec.rb b/spec/models/spending_proposal_spec.rb index 2a10851b6..5bff7cadd 100644 --- a/spec/models/spending_proposal_spec.rb +++ b/spec/models/spending_proposal_spec.rb @@ -59,6 +59,69 @@ describe SpendingProposal do expect(spending_proposal.feasibility).to eq "undefined" end end + + describe "#unfeasible?" do + it "returns true when not feasible" do + spending_proposal.feasible = false + expect(spending_proposal.unfeasible?).to eq true + end + + it "returns false when feasible" do + spending_proposal.feasible = true + expect(spending_proposal.unfeasible?).to eq false + end + end + + describe "#unfeasible_email_pending?" do + let(:spending_proposal) { create(:spending_proposal) } + + it "returns true when marked as unfeasibable and valuation_finished" do + spending_proposal.update(feasible: false, valuation_finished: true) + expect(spending_proposal.unfeasible_email_pending?).to eq true + end + + it "returns false when marked as feasible" do + spending_proposal.update(feasible: true) + expect(spending_proposal.unfeasible_email_pending?).to eq false + end + + it "returns false when marked as feasable and valuation_finished" do + spending_proposal.update(feasible: true, valuation_finished: true) + expect(spending_proposal.unfeasible_email_pending?).to eq false + end + + it "returns false when unfeasible email already sent" do + spending_proposal.update(unfeasible_email_sent_at: 1.day.ago) + expect(spending_proposal.unfeasible_email_pending?).to eq false + end + end + + describe "#send_unfeasible_email" do + let(:spending_proposal) { create(:spending_proposal) } + + it "sets the time when the unfeasible email was sent" do + expect(spending_proposal.unfeasible_email_sent_at).to_not be + spending_proposal.send_unfeasible_email + expect(spending_proposal.unfeasible_email_sent_at).to be + end + + it "send an email" do + expect {spending_proposal.send_unfeasible_email}.to change { ActionMailer::Base.deliveries.count }.by(1) + end + end + + describe "#code" do + let(:spending_proposal) { create(:spending_proposal) } + + it "returns the proposal id" do + expect(spending_proposal.code).to include("#{spending_proposal.id}") + end + + it "returns the administrator id when assigned" do + spending_proposal.administrator = create(:administrator) + expect(spending_proposal.code).to include("#{spending_proposal.id}-A#{spending_proposal.administrator.id}") + end + end end describe "by_admin" do @@ -164,6 +227,108 @@ describe SpendingProposal do expect(valuation_finished.first).to eq(spending_proposal3) end end + + describe "feasible" do + it "should return all feasible spending proposals" do + feasible_spending_proposal = create(:spending_proposal, feasible: true) + create(:spending_proposal) + + expect(SpendingProposal.feasible).to eq [feasible_spending_proposal] + end + end + + describe "unfeasible" do + it "should return all unfeasible spending proposals" do + unfeasible_spending_proposal = create(:spending_proposal, feasible: false) + create(:spending_proposal, feasible: true) + + expect(SpendingProposal.unfeasible).to eq [unfeasible_spending_proposal] + end + end + + describe "not_unfeasible" do + it "should return all not unfeasible spending proposals" do + not_unfeasible_spending_proposal_1 = create(:spending_proposal, feasible: true) + not_unfeasible_spending_proposal_2 = create(:spending_proposal) + create(:spending_proposal, feasible: false) + + not_unfeasibles = SpendingProposal.not_unfeasible + + expect(not_unfeasibles.size).to eq(2) + expect(not_unfeasibles.include?(not_unfeasible_spending_proposal_1)).to eq(true) + expect(not_unfeasibles.include?(not_unfeasible_spending_proposal_2)).to eq(true) + end + end end + describe 'Supports' do + let(:user) { create(:user, :level_two) } + let(:luser) { create(:user) } + let(:district) { create(:geozone) } + let(:city_sp) { create(:spending_proposal) } + let(:district_sp) { create(:spending_proposal, geozone: district) } + + describe '#reason_for_not_being_votable_by' do + it "rejects not logged in users" do + expect(city_sp.reason_for_not_being_votable_by(nil)).to eq(:not_logged_in) + expect(district_sp.reason_for_not_being_votable_by(nil)).to eq(:not_logged_in) + end + + it "rejects not verified users" do + expect(city_sp.reason_for_not_being_votable_by(luser)).to eq(:not_verified) + expect(district_sp.reason_for_not_being_votable_by(luser)).to eq(:not_verified) + end + + it "rejects unfeasible spending proposals" do + unfeasible = create(:spending_proposal, feasible: false, valuation_finished: true) + expect(unfeasible.reason_for_not_being_votable_by(user)).to eq(:unfeasible) + end + + it "rejects organizations" do + create(:organization, user: user) + expect(city_sp.reason_for_not_being_votable_by(user)).to eq(:organization) + expect(district_sp.reason_for_not_being_votable_by(user)).to eq(:organization) + end + + it "rejects votes when voting is not allowed (via admin setting)" do + Setting["feature.spending_proposal_features.voting_allowed"] = nil + expect(city_sp.reason_for_not_being_votable_by(user)).to eq(:not_voting_allowed) + expect(district_sp.reason_for_not_being_votable_by(user)).to eq(:not_voting_allowed) + end + + it "accepts valid votes when voting is allowed" do + Setting["feature.spending_proposal_features.voting_allowed"] = true + expect(city_sp.reason_for_not_being_votable_by(user)).to be_nil + expect(district_sp.reason_for_not_being_votable_by(user)).to be_nil + end + end + end + + describe "responsible_name" do + let(:user) { create(:user, document_number: "123456") } + let!(:spending_proposal) { create(:spending_proposal, author: user) } + + it "gets updated with the document_number" do + expect(spending_proposal.responsible_name).to eq("123456") + end + + it "does not get updated if the user is erased" do + user.erase + expect(user.document_number).to be_blank + spending_proposal.touch + expect(spending_proposal.responsible_name).to eq("123456") + end + end + + describe "total votes" do + it "takes into account physical votes in addition to web votes" do + sp = create(:spending_proposal) + sp.register_vote(create(:user, :level_two), true) + expect(sp.total_votes).to eq(1) + sp.physical_votes = 10 + expect(sp.total_votes).to eq(11) + end + end + + end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index c63959a64..b49e3cc6b 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -79,8 +79,8 @@ describe User do end describe 'subscription_to_website_newsletter' do - it 'should be false by default' do - expect(subject.newsletter).to eq(false) + it 'should be true by default' do + expect(subject.newsletter).to eq(true) end end end @@ -333,6 +333,7 @@ describe User do email_verification_token: "token3", confirmed_phone:"5678", unconfirmed_phone:"5678") + user.erase('a test') user.reload @@ -353,6 +354,14 @@ describe User do expect(user.confirmation_token).to be_nil expect(user.reset_password_token).to be_nil expect(user.email_verification_token).to be_nil + + end + + it "destroys associated identities" do + user = create(:user) + identity = create(:identity, user: user) + user.erase('an identity test') + expect(Identity.exists?(identity.id)).to_not be end end diff --git a/spec/models/verification/management/document_spec.rb b/spec/models/verification/management/document_spec.rb index b4140f7ed..35fd89855 100644 --- a/spec/models/verification/management/document_spec.rb +++ b/spec/models/verification/management/document_spec.rb @@ -3,35 +3,35 @@ require 'rails_helper' describe Verification::Management::Document do describe "#valid_age?" do it "returns false when the user is younger than sixteen years old" do - census_response = double(date_of_birth: "31-12-#{16.years.ago.year}") + census_response = double(date_of_birth: Date.new(16.years.ago.year, 12, 31)) expect(Verification::Management::Document.new.valid_age?(census_response)).to be false end it "returns true when the user is sixteen years old" do - census_response = double(date_of_birth: 16.years.ago.strftime("%d-%m-%Y")) + census_response = double(date_of_birth: Date.new(16.years.ago.year, 16.years.ago.month, 16.years.ago.day)) expect(Verification::Management::Document.new.valid_age?(census_response)).to be true end it "returns true when the user is older than sixteen years old" do - census_response = double(date_of_birth: "31-12-#{33.years.ago.year}") + census_response = double(date_of_birth: Date.new(33.years.ago.year, 12, 31)) expect(Verification::Management::Document.new.valid_age?(census_response)).to be true end end describe "#under_sixteen?" do it "returns true when the user is younger than sixteen years old" do - census_response = double(date_of_birth: "31-12-#{16.years.ago.year}") + census_response = double(date_of_birth: Date.new(16.years.ago.year, 12, 31)) expect(Verification::Management::Document.new.under_sixteen?(census_response)).to be true end it "returns false when the user is sixteen years old" do - census_response = double(date_of_birth: 16.years.ago.strftime("%d-%m-%Y")) + census_response = double(date_of_birth: Date.new(16.years.ago.year, 16.years.ago.month, 16.years.ago.day)) expect(Verification::Management::Document.new.under_sixteen?(census_response)).to be false end it "returns false when the user is older than sixteen years old" do - census_response = double(date_of_birth: "31-12-#{33.years.ago.year}") + census_response = double(date_of_birth: Date.new(33.years.ago.year, 12, 31)) expect(Verification::Management::Document.new.under_sixteen?(census_response)).to be false end end -end \ No newline at end of file +end diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index f3669f253..340d7c8a7 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -27,7 +27,7 @@ module CommonActions def login_as_manager login, user_key, date = "JJB042", "31415926", Time.now.strftime("%Y%m%d%H%M%S") - allow_any_instance_of(ManagerAuthenticator).to receive(:auth).and_return({login: login, user_key: user_key, date: date}) + allow_any_instance_of(ManagerAuthenticator).to receive(:auth).and_return({login: login, user_key: user_key, date: date}.with_indifferent_access) visit management_sign_in_path(login: login, clave_usuario: user_key, fecha_conexion: date) end @@ -63,7 +63,7 @@ module CommonActions commentable_path = commentable.is_a?(Proposal) ? proposal_path(commentable) : debate_path(commentable) visit commentable_path - fill_in "comment-body-#{commentable.class.name.downcase}_#{commentable.id}", with: 'Have you thought about...?' + fill_in "comment-body-#{commentable.class.name.underscore}_#{commentable.id}", with: 'Have you thought about...?' click_button 'Publish comment' expect(page).to have_content 'Have you thought about...?' @@ -174,6 +174,11 @@ module CommonActions expect(page).to have_selector('.in-favor a', visible: false) end + def expect_message_voting_not_allowed + expect(page).to have_content 'Voting phase is closed' + expect(page).to_not have_selector('.in-favor a') + end + def create_featured_proposals [create(:proposal, :with_confidence_score, cached_votes_up: 100), create(:proposal, :with_confidence_score, cached_votes_up: 90), diff --git a/spec/support/phantomjs_ext/disable_js_fx.js b/spec/support/phantomjs_ext/disable_js_fx.js index 2b97f0a0f..eae828ac8 100644 --- a/spec/support/phantomjs_ext/disable_js_fx.js +++ b/spec/support/phantomjs_ext/disable_js_fx.js @@ -1,3 +1,5 @@ document.addEventListener("DOMContentLoaded", function() { - $.fx.off = true; + if (typeof $ !== 'undefined') { + $.fx.off = true; + } });