Commit graph

1692 commits

Author SHA1 Message Date
Simon Lehericey
eb3bb63a8f DescriptionController: remove useless @champs 2017-04-19 10:52:04 +02:00
Simon Lehericey
866a54085c DescriptionController: cosmetic 2017-04-19 10:52:04 +02:00
Simon Lehericey
157d1818b2 DescriptionController: move instance var to local var 2017-04-19 10:52:04 +02:00
gregoirenovel
b36252b916 Merge pull request #117 from sgmap/pieces_justificatives_improvements
Pieces justificatives improvements
2017-04-19 10:30:40 +02:00
Simon Lehericey
71542f6a3a PiecesJustificativesService: more explicit selection of content 2017-04-19 10:24:08 +02:00
Simon Lehericey
21d7a96062 PiecesJustificativesService: less violent error message in case of virus 2017-04-19 10:22:30 +02:00
Simon Lehericey
395c9d5bb1 PiecesJustificativesService: improve error message when the file cannot be saved 2017-04-19 10:20:32 +02:00
Simon Lehericey
e0828dda13 PiecesJustificativesService: save_pj returns nil if no errors 2017-04-19 10:16:30 +02:00
LeSim
c103e55579 Merge pull request #115 from sgmap/french_datetime
Commentaire: use fr local to display date
2017-04-19 10:10:57 +02:00
Simon Lehericey
8e7e7a8ab4 Stats Index: remove useless locale 2017-04-19 10:06:22 +02:00
Simon Lehericey
4c74b04a91 Commentaire: use fr local to display date 2017-04-19 10:06:22 +02:00
LeSim
030bdc86d6 Merge pull request #82 from sgmap/pieces_justificatives_refactor
Pieces justificatives refactor
2017-04-18 18:07:11 +02:00
Simon Lehericey
367b7c6ae1 DescriptionController: use common system to redirect with errors 2017-04-18 17:48:03 +02:00
Simon Lehericey
591ed2037e PiecesJustificativesServices: refactor upload_one! 2017-04-18 17:48:03 +02:00
Simon Lehericey
03e9cd523e PiecesJustificativesService: mandatory pj check and add test 2017-04-18 17:48:03 +02:00
Simon Lehericey
e49ea2d0e0 PiecesJustificative: add field to set it mandatory
small css to align the fields
2017-04-18 17:48:03 +02:00
Simon Lehericey
a907b9c062 Migration: add mandatory column to type de piece justificative 2017-04-18 17:48:03 +02:00
gregoirenovel
955552b0d2 Merge pull request #111 from sgmap/french-format
French format
2017-04-18 14:35:15 +02:00
gregoirenovel
3abbb0bdcd Use french formatting for numbers on the Stats page 2017-04-18 14:34:56 +02:00
gregoirenovel
858109c64b Add the complete french number part of fr.yml 2017-04-18 14:34:56 +02:00
gregoirenovel
be50c48eae Merge pull request #113 from sgmap/favicon
[Fix #112] Add favicons
2017-04-18 14:34:02 +02:00
gregoirenovel
21ff863dab [Fix #112] Add favicons 2017-04-17 19:32:26 +02:00
gregoirenovel
ca2d7038d4 Merge pull request #108 from sgmap/remove_tps_v2_in_deploy
Remove tps_v2 reference in deploy script
2017-04-17 09:43:51 +02:00
Mathieu Magnin
cc36ec49e2 Remove tps_v2 reference in deploy script 2017-04-14 16:14:17 +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
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
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
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
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