consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,688 Commits 1 Branch 0 Tags
259e05c3e0e02a396549f53fe217b9d22acc7ede
Commit Graph

120 Commits

Author SHA1 Message Date
Raimond Garcia
259e05c3e0 Merge pull request #3410 from LextrendIT/report_generation 
Report generation, download CSV
 2019-06-12 11:45:59 +02:00
German Galia
9d1ca3bfd4 Report generation. Download csv 2019-06-12 10:17:31 +02:00
Raimond Garcia
22787151f5 Merge pull request #3439 from LextrendIT/feature/add_admin_investments_column_chooser 
Add columns selector JS component and change Rails view to use it
 2019-06-11 17:17:52 +02:00
Raimond Garcia
d266cb33ce Merge pull request #3427 from LextrendIT/feature/unify_valuator_and_admin_investment_pages 
Display preview public page component on admin and valuators investment page
 2019-06-11 14:44:45 +02:00
lalo
4740aeaddf Add columns selector JS component and change Rails view to use it 2019-06-11 14:33:40 +02:00
lalo
be8a0dbe8a Add Milestone tag select filter on executions public page 2019-06-07 14:17:32 +02:00
lalo
63e0cd02d0 Display milestone_tags input for investments, display milestone_tags on admin and tests 2019-06-07 14:07:43 +02:00
Javier Martín
81b67349f2 Merge pull request #3580 from consul/use_find_instead_of_find_by_id 
Use find instead of find by
 2019-06-05 19:04:47 +02:00
lalo
d0e1eff532 Add description field to administrator users like evaluators description 2019-06-05 16:18:12 +02:00
lalo
c538d08fee Display public investment view on admin and valuator pages as preview 2019-06-04 09:30:51 +02:00
Julian Herrero
b122302c58 Use find instead of find_by_id 
Better raise a 404 HTML NotFound exception than any other unexpected error.
 2019-06-03 17:54:19 +02:00
Javi Martín
307cf24846 Use describe on feature tests 
The `type: :feature` is automatically detected by RSpec because these
tests are inside the `spec/features` folder. Using `feature` re-adds a
`type: :feature` to these files, which will result in a conflict when we
upgrade to Rails 5.1's system tests.

Because of this change, we also need to change `background` to `before`
or else these tests will fail.
 2019-05-28 16:36:54 +02:00
Alberto
1c10c22b08 Merge pull request #3509 from consul/menu-users 
Users menu
 2019-05-21 12:54:42 +02:00
decabeza
6cfb2e896d Change admin menu to menu 2019-05-17 17:47:46 +02:00
decabeza
035b11c460 Hide select text if budget finished 2019-05-17 17:42:58 +02:00
lalo
237a03552f Move admin budget investments tabs filters to advanced filters component 2019-04-03 22:27:48 +02:00
lalo
0a5057a0a8 Add max support advanced filter for admin budget investments 2019-04-02 19:46:16 +02:00
Julian Herrero
c82b2a975a Add new settings tab for participation processes 
- Rename setting keys
- New tab por participation processes
- Hide these settings from features tab
 2019-03-19 19:45:32 +01:00
Javi Martín
4980819528 Fix valuation tags being overwritten 
When params[:budget_investment][:valuation_tag_list] was not present,
which is the case when updating an investment using the "mark as visible
to valuators" checkbox, we were removing all valuation tags.

Using a virtual attribute to assign the tags only if the parameter is
present simplifies the code in the controller and avoids the issue.
 2019-02-26 14:16:10 +01:00
decabeza
26741d9560 Fix hound warnings 2019-02-20 13:56:58 +01:00
decabeza
9e9eb1359b Add icon to sortable table 2019-02-20 13:07:08 +01:00
Javi Martín
bd67fcb9cf Consider having valuator group as having valuator 
So under the tab "without valuator" we don't show investments assigned
to a valuator group, just as expected by administrators.

There was a conflict while applying this commit to the CONSUL repo. I've
decided to re-introduce the test which was deleted in commit dddf026a,
which hadn't been deleted in AyuntamientoMadrid@192f1182.
 2019-02-15 21:11:24 +01:00
Javier Martín
b330de01f6 Merge pull request #3148 from matisnape/budget_investments_sorting_columns 
Add sort links to admin tables
 2019-02-15 19:19:11 +01:00
decabeza
5974b7ee84 Update calculate winners button on budgets form 2019-02-05 17:15:26 +01:00
Anna Anks Nowak
39cc997ef4 Add check for arrow icons 2019-01-10 16:11:51 +01:00
Anna Anks Nowak
0affaaee7e Refactor sorting specs to work with direction 2019-01-10 16:11:46 +01:00
Javi Martín
7c06320f39 Fix typo 2019-01-09 12:55:27 +01:00
Javi Martín
be864ee92f Make sure selected investment is visibile in spec 
After changing the order for budget investments, the selected investment
didn't appear on the first page anymore, and so it couldn't be clicked
on during the test.
 2019-01-09 12:55:22 +01:00
María Checa
650fe2553e Add default order for admin budget investments list 
When there's no sorting option selected, by default it orders the investment list by supports and, for those with the same number of supports, by ID.
 2019-01-02 12:52:28 +01:00
Javi Martín
3e83b5893c Make milestone specs reusable 2018-12-11 19:22:55 +01:00
Julian Nicolas Herrero
14d4d175d4 Merge pull request #3064 from microweb10/budget_investments_valuator_group_spec 
Add missing feature spec Admin budget investments Edit Do not display valuators of an assigned group
 2018-12-05 10:10:09 +01:00
Julian Herrero
43dac8d276 add missing spec 2018-12-02 17:45:39 +01:00
Raimond Garcia
1b7a2adf56 Merge pull request #3034 from behraaang/bugfix/pagination-after-select 
Fix pagination after selecting/unselecting budget investment
 2018-11-27 11:04:41 +01:00
behraaang
88f01fb999 fix spec 2018-11-16 01:12:14 +03:30
behraaang
7a9888a793 Fix failed spec, add pagination spec for unselecting an investemnt 2018-11-15 23:30:08 +03:30
Javi Martín
579ea8ab43 Make capybara wait between valuation actions 
As mentioned in the comments in PR #1256:

"These failures take place because the checkbox is already present
before clicking in 'under valuation', and so Capybara doesn't have to
wait for the 'under valuation' request to finish before clicking the
checkbox."

So sometimes Capybara tries to check/uncheck the checkbox at the same
time that checkbox is being replaced by the new content, resulting in no
request being sent to the server.

Making Capybara check the page to ensure the new content is already
loaded before checking/unchecking the checkbox solves the problem.
 2018-11-06 19:04:50 +01:00
Javi Martín
b2e15facce Remove duplicated valuators specs 
Since one of them was slightly different, I've kept the most recent one.
 2018-11-06 17:23:22 +01:00
Angel Perez
601391954a Refactor tests to interact directly with the UI rather than with the DOM 2018-09-10 11:41:37 -04:00
Angel Perez
c240c57171 Add budget investment factory to fix failing scenario 
Changes introduced in commits 41f66fa and dc87b75 will render the
'See results' button under `admin/budget_investments` only if a
finished budget has winner investments associated with it
 2018-07-26 14:54:20 +02:00
María Checa
15a07ad4eb Adds logic to show 'see results' button only for finished budgets 2018-07-26 14:31:42 +02:00
Alberto
89f2f53e75 Merge pull request #2799 from wairbut-m2c/backport-2588-fix_supports_filter 
Fix `max_per_heading` filter in Admin budget investments list
 2018-07-26 14:11:03 +02:00
Alberto
f93b1e24fb Merge pull request #2797 from wairbut-m2c/fix-admin-budget-investments-spec 
Fix order-dependent spec
 2018-07-26 13:57:04 +02:00
Alberto
d17b628426 Merge branch 'master' into backport-2588-fix_supports_filter 2018-07-26 13:44:20 +02:00
María Checa
5dfefbbe2f Change admin budget investments list order by supports from less to more 
Sorting by id is in descending order and by title ascending

Backported from AyuntamientoMadrid/consul
 2018-07-26 12:24:53 +02:00
Marko Lovic
b816a5be00 Fix order-dependent specs 
Due to how DB IDs are assigned with AUTO INCREMENT, tests
cannot assume that any specific ID will be available.
 2018-07-26 11:25:51 +02:00
Alberto
7b8003dcb9 Merge pull request #2790 from wairbut-m2c/backport-1421-investments_csv_fixes 
Add visible_to_valuators and author_username to admin investments CSV
 2018-07-25 18:41:29 +02:00
María Checa
e9d73eb687 Fix max_per_heading filter in Admin budget investments list 
Also changed the name of the param to `min_total_supports`, which is more descriptive on what it actually does.

Backport of 75f20d5 and 07f0806 from AyuntamientoMadrid/consul fork
 2018-07-25 15:44:51 +02:00
Marko Lovic
601e3058d8 Add visible_to_valuators and author username to admin investments CSV 
Backport based on 012e4be by María Checa from AyuntamientoMadrid/consul fork
 2018-07-25 15:10:56 +02:00
Alberto
61589122ef Merge pull request #2723 from wairbut-m2c/backport_2400_combine_free_text_search_and_filters 
Combine text search and filters for Investments on Admin panel
 2018-07-25 14:42:19 +02:00
Marko Lovic
53a1ea8847 Fix spec 2018-07-25 14:15:37 +02:00