Commit Graph

14352 Commits

Author SHA1 Message Date
Bertocq
d2e8f84759 Create missing shift and choose booth for the officer 2019-03-28 15:47:52 +01:00
Bertocq
80a9ba8aa7 Enable and fix booth selection back 2019-03-28 15:47:52 +01:00
Bertocq
77930d3275 Enable officing panel booth selection back 2019-03-28 15:47:52 +01:00
rgarcia
88c801d6c5 fixes specs 2019-03-28 15:47:52 +01:00
rgarcia
0acec655e2 fixes specs 2019-03-28 15:47:52 +01:00
rgarcia
4761ac91bd Displays officing booth in layout 2019-03-28 15:47:52 +01:00
rgarcia
9c59c8b68e displays booth location instead of booth name 2019-03-28 15:47:52 +01:00
rgarcia
0286ca4c59 displays single booth for any number of polls 2019-03-28 15:47:52 +01:00
rgarcia
5dea0e039e updates notice 2019-03-28 15:47:52 +01:00
rgarcia
74706027cb fixes specs 2019-03-28 15:47:52 +01:00
rgarcia
b4499321d3 stores officer booth on sign in 2019-03-28 15:47:52 +01:00
rgarcia
5835d12694 stores the officer that allowed a voter to vote in a physical booth 2019-03-28 15:47:52 +01:00
kikito
34dfeee9c9 Denormalizes booth_assignmen on the models where it is needed 2019-03-28 15:47:52 +01:00
kikito
10283c32ee Adds scopes to officer_assignment 2019-03-28 15:47:52 +01:00
rgarcia
cc4eed3500 fixes specs 2019-03-28 15:47:52 +01:00
Javi Martín
f6da20da64 Fix typos in investment order tests
There was a typo: `new_order = eq(all(` instead of `new_order = all(`,
which was causing the tests to pass.

However, the final expectation should test that we keep the same order
in the same session, and we were accidentally testing the opposite.

We're also adding an extra check to verify there are investments on the
page, since in some cases we were accessing pages with no investments,
and so these tests were always passing.
2019-03-28 13:51:51 +01:00
decabeza
2b1b05d9ed Fix dev_seeds polls 2019-03-28 13:01:17 +01:00
Javi Martín
5a529e5eb7 Use investments per page instead of Kaminari's
This is the actual number of investments per page in the index action.

Also note one test was generating 100 extra records, which made the test
take more than 40 seconds (on my machine).
2019-03-28 01:34:27 +01:00
decabeza
2af154d539 Merge branch 'master' into proposal-dashboard 2019-03-28 01:26:04 +01:00
Javier Martín
ac58b87036 Merge pull request #3404 from consul/double_quotes
Add missing double quotes
2019-03-27 15:53:51 +01:00
decabeza
91be3cf775 Fix more hound warnings 2019-03-27 15:22:14 +01:00
decabeza
e5bff01027 Replace incoming filter on dashboard polls
Add starts_at attribute intead of incoming because this scope doesn't exists anymore.
2019-03-26 18:25:35 +01:00
decabeza
898d409c47 Improve layout for user proposal view 2019-03-26 18:22:19 +01:00
decabeza
b79061064b Remove all texts of decide madrid 2019-03-26 18:22:02 +01:00
decabeza
f47ec9d7dc Fix hound warnings 2019-03-26 18:21:19 +01:00
decabeza
eda6ea7f12 Merge branch 'master' into dashboard 2019-03-26 16:45:48 +01:00
Raimond Garcia
505365f0fa Merge pull request #3388 from consul/dashboard-polish
Refactor dashboard views
2019-03-26 12:21:18 +01:00
Alberto
29a87e2746 Merge branch 'dashboard' into dashboard-polish 2019-03-26 12:19:20 +01:00
voodoorai2000
af79330646 Remove unnecessary spec
This spec is giving some problems related to duplicity of records due to the way rake tasks are loaded.

It will soon become part of seeds anyways. Removing for now.
2019-03-26 12:13:56 +01:00
Raimond Garcia
f6526f4a45 Merge pull request #3271 from Platoniq/dashboard-user-communication
Dashboard user communication
2019-03-26 12:10:18 +01:00
Javi Martín
3e4e65ead7 Use double quotes inside ERB
We were using single quotes inside ERB code when that code was inside
HTML double quotes.
2019-03-25 14:58:54 +01:00
Javi Martín
4c35df4812 Use double quotes inside string interpolation 2019-03-25 14:58:54 +01:00
Javi Martín
d894d24bff Use double quotes in config/locales 2019-03-25 14:58:54 +01:00
Raimond Garcia
32d168813a Merge pull request #3398 from Platoniq/platoniq-dashboard/polls-form-bugs
Platoniq dashboard/polls form bugs
2019-03-25 14:19:24 +01:00
Javi Martín
2b4e1cf358 Add missing double quotes
We overlooked a few single quotes while we changed thousands of them.
2019-03-25 13:22:35 +01:00
Julian Nicolas Herrero
1b76a34074 Merge pull request #3402 from consul/include_default_custom_pages_in_dev_seeds
Include default custom pages in developers seed
2019-03-22 17:38:42 +01:00
Julian Nicolas Herrero
9cfd3c70be Merge pull request #3385 from consul/welcome_page_not_logged_in_user
Require logged in user if navigate to /welcome
2019-03-22 17:35:29 +01:00
Alberto
ecd4a8a7b7 Merge pull request #3399 from consul/min-age-to-participate
Use min age to participate setting on verification residence form
2019-03-22 17:09:30 +01:00
decabeza
21c6da3767 Use min age to participate setting on verification residence form 2019-03-22 16:15:48 +01:00
Javier Martín
6593bc056a Merge pull request #3401 from consul/backport-remove_obsolete_rake_tasks
Remove obsolete rake tasks
2019-03-22 14:08:42 +01:00
Javi Martín
9d6bd7e788 Remove obsolete rake tasks
These tasks dealt with data migrations or stats generations which were
done only once, so we don't need them anymore.

New CONSUL installations don't need these tasks, and existing CONSUL
installations will execute them when upgrading one release at a time.
2019-03-22 13:07:09 +01:00
Julian Herrero
8e5e757b00 Include default custom pages in developers seed 2019-03-22 12:29:42 +01:00
Javier Martín
7d472b747e Merge pull request #3400 from consul/fix_processes_order
Fix legislation process feed order
2019-03-22 11:14:26 +01:00
Javi Martín
58816aef5f Fix legislation process feed order
We need to add an ORDER BY clause; not doing so was causing different
processes to show up sometimes. As mentioned in the PostgreSQL manual:

> Because the order of the rows in the database table is unpredictable,
> when you use the LIMIT clause, you should always use the ORDER BY
> clause to control the order of rows. If you don’t do so, you will get
> an unpredictable result set.
2019-03-21 17:12:03 +01:00
Alberto
b36e102d01 Merge pull request #3396 from consul/proposals-rake
Add rake to move external_url to description
2019-03-21 16:04:37 +01:00
Senén Rodero Rodríguez
b417e9db31 Initialize new question answers coccon callback
After adding new question we need to initialize new answers
sets.
2019-03-21 14:51:17 +01:00
Senén Rodero Rodríguez
71887f2911 Initialize answers 'after-insert' callback to keep answers order
Also provide a function to initialize new set of answers 'affer-insert'
callback after adding new questions.
2019-03-21 14:51:17 +01:00
Senén Rodero Rodríguez
5e98c23be5 Fix HTML markup
We cannot use 'id' html attributes on nested answers
because there will be many answers form each question so
this would have generated invalid HTML.
2019-03-21 14:51:17 +01:00
Senén Rodero Rodríguez
bc2d020d7e Add nested specs
Check remove behavior of poll nested resources: Questions and Answers
2019-03-21 14:51:17 +01:00
Senén Rodero Rodríguez
0d3e20f370 Fix dashboard poll form nested questions and answers
Nested remove association links were not working properly because of
missing Cocoon needed CSS class
2019-03-21 14:51:17 +01:00