consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,280 Commits 1 Branch 0 Tags
a9159e0ec8fec089b9533dcd65b05d2b51a70e70
Commit Graph

2813 Commits

Author SHA1 Message Date
decabeza
19c158f4eb Add pending and done filters to dashboard administrator tasks 2019-04-24 13:58:27 +02:00
decabeza
cb22e6cbfb Merge branch 'master' into proposal-dashboard 2019-04-23 17:12:47 +02:00
Raimond Garcia
b230cd29ab Merge pull request #3414 from consul/upgrade_to_rails_5 
Upgrade to rails 5
 2019-04-23 16:26:14 +02:00
Julian Herrero
7e422f2187 Fix bug management print voted investments 
If budget is in balloting phase and there are voted investments, it
was not possible to print budgets investments because the ballot was
never being loaded in the controller and therefore an error was raised
when rendering the view.

Failure/Error: <% if ballot.has_investment?(investment) %>

  ActionView::Template::Error:
    undefined method `has_investment?' for nil:NilClass
      app/views/budgets/investments/_ballot.html.erb:3
      app/views/budgets/investments/_investment.html.erb:88
      app/views/custom/management/budgets/investments/print.html.erb:26
 2019-04-17 14:19:32 +02:00
Julian Herrero
e714713d0c Refactor long lines 
Also, use method `have_link' instead of `have_css' to make tests more
readable
 2019-04-17 14:18:35 +02:00
Julian Herrero
879591cc5c Use let instead of an instance variable 2019-04-17 14:16:54 +02:00
rgarcia
d8fdc10ed6 fixes activity specs 2019-04-16 17:28:07 +02:00
Juanjo Bazán
f740a868f5 fixes specs with current devise response implementation 2019-04-16 17:28:07 +02:00
María Checa
394177213c Adds Ballot Sheet model and business logic 2019-04-10 16:04:39 +02:00
María Checa
ccf8d3a8e2 Adds ballot sheets controller and main views 2019-04-10 16:03:47 +02:00
Javier Martín
3ccdf039e4 Merge pull request #3344 from consul/backport-budget_ballots 
Allow voting Budget Investments in booths
 2019-04-09 13:54:00 +02:00
decabeza
94b8caffca Merge branch 'master' into proposal-dashboard 2019-04-04 14:08:30 +02:00
decabeza
7bd0f9c1d7 Adds spec to do not show questions section on budget poll 2019-04-03 22:28:19 +02:00
lalo
237a03552f Move admin budget investments tabs filters to advanced filters component 2019-04-03 22:27:48 +02:00
rgarcia
431c313487 Use scenario instead of it in feature specs 2019-04-03 22:23:27 +02:00
rgarcia
6fa7562181 Automatically create a budget poll if it does not exist 2019-04-03 22:23:22 +02:00
rgarcia
8cfcfcb6a7 Check for link to poll in specs 2019-04-03 22:22:56 +02:00
rgarcia
b1b88918f0 Moving spec to budget_polls folder 2019-04-03 22:22:50 +02:00
María Checa
22727a9876 Hides budget polls in polls public index 2019-04-03 22:22:45 +02:00
María Checa
acb0a6070e Hides budget polls in polls admin index 2019-04-03 22:20:10 +02:00
María Checa
f6739dc7e5 Adds "Admin ballots" button in admin budgets index 2019-04-03 22:20:05 +02:00
rgarcia
7dd314c699 Do not display polls associated to a budget in admin poll questions 
This section is used to select to which poll a question belongs to.

Budget polls are not meant to include questions that come from Citizen
Proposals or Government Questions, thus we do not display them
 2019-04-03 22:20:01 +02:00
Bertocq
dac0264b63 Prevent offline budget vote after voting online 2019-04-03 22:19:56 +02:00
rgarcia
aa7441271d Prevent balloting online after casting a ballot offline 2019-04-03 22:19:51 +02:00
Bertocq
d3660d1245 Create Budget Poll offline/online vote feature test 2019-04-03 22:18:55 +02:00
Javier Martín
12bccf3fd0 Merge pull request #3364 from LextrendIT/3357_add_admin_investments_advanced_filter_for_max_supports 
Add on admin budget investments an advanced filter for max supports
 2019-04-03 21:39:15 +02:00
Javier Martín
844ab5fb0e Merge pull request #3405 from consul/remove_obsolete_test 
Fix investment pagination tests
 2019-04-03 21:13:07 +02:00
Javier Martín
62233191cf Merge pull request #3345 from consul/backport-polls-officer-for-voter 
Add officing booths
 2019-04-03 18:26:05 +02:00
lalo
0a5057a0a8 Add max support advanced filter for admin budget investments 2019-04-02 19:46:16 +02:00
decabeza
d7bde5818e Update texts on check my ballot links 2019-03-28 17:16:15 +01:00
decabeza
17730a41dd Hides not to vote at this time button if already voted 2019-03-28 15:50:34 +01:00
decabeza
18e57b9662 Hides sibebar menu if officer has no shifts 2019-03-28 15:50:34 +01:00
iagirre
a9d1fd3539 Fix for issues 1202, 1203 and 1204. Stub the Date and Time functions in the booth_spec test so that it won't give errors when running tests at midnight. 2019-03-28 15:49:17 +01:00
Bertocq
71bd6e41c6 Replace time.zone.today for date.current 2019-03-28 15:49:17 +01:00
Bertocq
9c7962c3a6 Check poll recount values for booth votes on admin panel 2019-03-28 15:49:17 +01:00
Bertocq
94c37eb588 Fix store officer and booth info spec 2019-03-28 15:47:52 +01:00
Bertocq
4e4057573d Fix store officer and booth info spec 2019-03-28 15:47:52 +01:00
Bertocq
8e61075659 Make clearer the set officing booth usage for secondary booth 2019-03-28 15:47:52 +01:00
Bertocq
49ffcfac06 Move set officing booth helper method calls to background block 2019-03-28 15:47:52 +01:00
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
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