Commit graph

3471 commits

Author SHA1 Message Date
Mathieu Magnin
ca2dca8fb5 Merge branch 'develop' into staging 2017-04-13 17:08:39 +02:00
gregoirenovel
b5b2bd7b9f Merge pull request #100 from sgmap/add_individual_infos_to_csv
Add individual infos to flat table export serializer
2017-04-13 16:58:53 +02:00
Mathieu Magnin
1612b60126 Remove useless code 2017-04-13 16:54:00 +02:00
Mathieu Magnin
320d5da40f Add individual infos to flat table export serializer 2017-04-13 16:54:00 +02:00
gregoirenovel
a6708ce1f0 Merge branch 'staging' 2017-04-13 15:48:11 +02:00
gregoirenovel
d0b4026793 Merge branch 'develop' into staging 2017-04-13 15:35:20 +02:00
Mathieu Magnin
f5e8631b71 Merge pull request #94 from sgmap/fix-test
Order types_de_piece_justificative on Procedure
2017-04-13 15:06:56 +02:00
gregoirenovel
d531b02bc5 Order types_de_piece_justificative on Procedure
So that /spec/controllers/api/v1/
dossiers_controller_spec.rb#L163-L179 (on commit
8852431 for example) does not randomly fail due
to unordered types_de_piece_justificative
2017-04-13 14:48:18 +02:00
Mathieu Magnin
3e41c648a2 Merge pull request #95 from sgmap/auto-deploy-master
[Fix #93] Auto-deploy master after it has built
2017-04-13 14:13:43 +02:00
gregoirenovel
142ca444d3 [Fix #93] Auto-deploy master after it has built 2017-04-13 11:55:43 +02:00
Mathieu Magnin
5a5052b14b Merge branch 'develop' into staging 2017-04-13 09:55:02 +02:00
gregoirenovel
8852431efe Merge pull request #92 from sgmap/add_ssh_key_to_deploy_with_circleci
Add ssh key to deploy with circleci
2017-04-13 09:50:13 +02:00
Mathieu Magnin
11455ce5bb Add ssh key to deploy with circleci 2017-04-13 09:25:34 +02:00
Mathieu Magnin
364a97b127 Merge branch 'develop' into staging 2017-04-13 09:07:01 +02:00
Mathieu Magnin
3c3d0fcfbd Merge pull request #91 from sgmap/fix_csv_export_with_no_dossiers
Fix csv export with no dossiers
2017-04-12 18:20:37 +02:00
Mathieu Magnin
080c7c3d04 Fix csv export with no dossiers 2017-04-12 18:19:37 +02:00
gregoirenovel
33d033d680 Merge pull request #90 from sgmap/remove_sqlite_flag_for_tests
Remove sqlite flag for tests
2017-04-12 17:55:36 +02:00
Mathieu Magnin
3730ba76b5 Remove sqlite flag for tests 2017-04-12 17:34:31 +02:00
gregoirenovel
79d81b413f Merge pull request #86 from sgmap/circleci_2
Circleci 2
2017-04-12 16:09:55 +02:00
Mathieu Magnin
8870f50118 Migrate to CircleCI 2.0 2017-04-12 16:09:25 +02:00
gregoirenovel
19cde557ce Merge branch 'develop' into staging
Fixed a conflict in README.md
2017-04-12 13:50:08 +02:00
gregoirenovel
3f15cb99fd Merge pull request #87 from sgmap/better-stats
Better stats
2017-04-11 17:05:53 +02:00
gregoirenovel
f4ff778a5c Add a missing newline before the end of the controller
Same spacing rules at the top and at the bottom
of the file
2017-04-11 16:58:27 +02:00
gregoirenovel
913735554c Improve StatsController#thirty_days_flow and #clean_hash 2017-04-11 16:58:27 +02:00
gregoirenovel
11015787bf Add new total numbers to the Stats page 2017-04-11 16:51:38 +02:00
gregoirenovel
52ea4a1b8d Add new charts and a segmented control to the Stats page 2017-04-11 16:51:38 +02:00
gregoirenovel
9dc4901294 Change the template and style of the Stats page 2017-04-11 15:29:19 +02:00
gregoirenovel
e370c4e393 Exclude draft Dossiers and unpublished Procedures from Stats 2017-04-11 15:29:19 +02:00
gregoirenovel
2074ac93ba Add StatsController#thirty_days_flow_hash 2017-04-11 15:29:19 +02:00
gregoirenovel
e192038045 Rename the variables in StatsController#index 2017-04-11 15:29:19 +02:00
gregoirenovel
c4c6095abd Only show the last 30 days of data in Stats 2017-04-11 15:29:19 +02:00
gregoirenovel
de01914fa7 Fix the where clause in Stats
Now properly show the last 90 days of data instead
of strict quarters.

With the previous code, on the
1st of january, april, july and october, only one
day of data would be shown.
2017-04-11 15:29:18 +02:00
gregoirenovel
664d821dc0 Add a link to the Stats page in the footer 2017-04-11 15:29:18 +02:00
gregoirenovel
f84cd7f11b Make Stats a public page 2017-04-11 15:29:18 +02:00
Mathieu Magnin
9c59d634b0 Merge pull request #83 from sgmap/small_refacto_description_controller
DescriptionController: refacto
2017-04-11 14:58:12 +02:00
gregoirenovel
d697fb1ada Merge pull request #85 from sgmap/guard_watch_service
Guardfile: watch services directory
2017-04-11 14:54:28 +02:00
Simon Lehericey
4997bf54cd Guardfile: watch services directory 2017-04-11 14:51:27 +02:00
Simon Lehericey
4a16fb2ce2 DescriptionController: refacto 2017-04-11 14:45:30 +02:00
gregoirenovel
dd1fd419c7 Require mandatory fields on the frontend side 2017-04-11 14:25:49 +02:00
LeSim
1c3db68886 Merge pull request #52 from sgmap/champ_dossier
Champ dossier
2017-04-11 14:20:07 +02:00
Simon Lehericey
a324a22ba2 DossierLink: add show template 2017-04-11 13:54:33 +02:00
Simon Lehericey
3228737a87 DossierLink: add edition template 2017-04-11 13:54:33 +02:00
Simon Lehericey
785219c956 DossierLink: add type de champ 2017-04-11 13:54:33 +02:00
Simon Lehericey
ed36897337 DossiersController: add get procedure libelle 2017-04-11 13:54:33 +02:00
gregoirenovel
d531ed057c Merge pull request #75 from sgmap/champs_service_refactor
Champs service refactor + un peu de DescriptionController
2017-04-11 12:19:18 +02:00
Simon Lehericey
ccf956ec01 DescriptionController: refactor redirection for draft 2017-04-11 12:11:10 +02:00
Simon Lehericey
d14a75c24a DescriptionController: refactor check_mandatory_fields 2017-04-11 12:11:10 +02:00
Simon Lehericey
191b29aff5 DescriptionController: simplify update logic 2017-04-11 12:11:10 +02:00
Simon Lehericey
3a9065e4c1 DescriptionController: remove useless code 2017-04-11 12:11:10 +02:00
Simon Lehericey
c4e128a506 DescriptionController: rename variable 2017-04-11 12:11:09 +02:00