Commit graph

1106 commits

Author SHA1 Message Date
Xavier J
4d78c9684f Merge branch 'staging' 2016-11-23 11:36:26 +01:00
Xavier J
960eed4f19 Merge branch 'develop' into staging 2016-11-23 11:36:14 +01:00
JC
e35c1f8757 Up limit for export form 200 to 400 2016-11-23 11:31:00 +01:00
Xavier J
a57ab2a4d3 Merge branch 'staging' 2016-11-21 10:46:43 +01:00
Xavier J
2568a53951 Merge branch 'develop' into staging 2016-11-21 10:46:29 +01:00
XjulI1
46fa28322e Merge pull request #7 from sgmap/fix-backoffice-search-dossier-by-id
Fix: search dossier by id (backoffice)
2016-11-21 10:40:38 +01:00
Julien Portalier
426fd55f30 Fix: search dossier by id (backoffice) 2016-11-17 19:18:24 +01:00
Xavier J
60d9522a65 Merge branch 'staging' 2016-11-17 12:36:13 +01:00
Xavier J
ea47e6cbfe Merge branch 'develop' into staging 2016-11-17 12:35:13 +01:00
Xavier J
d75a53ffae Fix deploy task 2016-11-17 12:35:05 +01:00
Xavier J
8f012e3731 Add analytics 2016-11-17 12:30:39 +01:00
Xavier J
d7ff46879a Merge branch 'staging' 2016-11-17 12:18:23 +01:00
Xavier J
f569cc0d85 Merge branch 'develop' into staging 2016-11-17 12:18:10 +01:00
Xavier J
b4b2dafc7b Add reply_to for invite mailer 2016-11-17 12:17:59 +01:00
Xavier J
ce20c24f69 Merge branch 'staging' 2016-11-17 11:38:20 +01:00
Xavier J
0423ac6c8a Merge branch 'develop' into staging 2016-11-17 11:37:08 +01:00
Xavier J
06f353968f Local open simplif 2016-11-17 11:37:00 +01:00
Xavier J
996d55cffb Merge branch 'develop' into staging 2016-11-17 11:25:27 +01:00
Xavier J
6e4ddcdbcf Fix test 2016-11-17 11:24:49 +01:00
Xavier J
d144047a50 Fix export data dossiers 2016-11-17 11:13:11 +01:00
XjulI1
926ae9d805 Merge pull request #6 from sgmap/per-champs-comment-flow
Flux de commentaires par champs
2016-11-17 10:52:18 +01:00
Xavier J
893bfaef40 Fix JS 2016-11-17 10:50:28 +01:00
Julien Portalier
8195a57f9c Fix: distinction des commentaires par champ
Les commentaires par champ sont distincts des commentaires généraux
(non attachés à un champ). Ils ne faut donc pas les afficher dans
les commentaires sous le récapitulatif du dossier.
2016-11-16 16:23:43 +01:00
Xavier J
2074923872 Merge branch 'develop' into staging 2016-11-16 15:42:11 +01:00
JC
c557038c38 Adding tooltip for dossiers export amount excess (200) 2016-11-16 11:12:04 +01:00
Julien Portalier
96ca5113f7 Flux de commentaires par champs 2016-11-15 18:36:20 +01:00
Xavier J
789f87de2b Merge branch 'develop' into staging 2016-11-15 17:20:46 +01:00
Xavier J
305410f7a3 Fix Gemfile.lock and tests 2016-11-15 17:20:36 +01:00
JC
23b928f160 Adding limit (200) for dossier exportation 2016-11-15 17:06:40 +01:00
JC
0ac3c5fc86 Merging develop branch updated 2016-11-15 10:46:33 +01:00
JC
f1b177e0bb Testing only primary dossier attributes for data_with_champs methods 2016-11-15 10:19:47 +01:00
JC
a549f95da1 Continue test for data_with_champs 2016-11-14 17:43:34 +01:00
JC
2f96895bb8 Continue tests for data_with_champs method, and add a convert_specific_values_to_string for array 2016-11-14 17:25:17 +01:00
JC
5aa9c75669 Ordering champs through export method, not through serializer 2016-11-14 16:37:58 +01:00
JC
5c3049d6bd Manualy sort type_de_champ by order_place 2016-11-14 14:39:59 +01:00
Xavier J
78b22b6e27 Merge branch 'develop' into staging 2016-11-14 11:03:26 +01:00
Xavier J
ec53f64a64 Fix bug tag received mailer 2016-11-14 11:03:17 +01:00
JC
e49e0b02ef Split methods for export, need to write 2 tests for headers and raw data (export_headers, data_with_champs) 2016-11-14 10:41:56 +01:00
Xavier J
91743a7d06 Merge branch 'staging' 2016-11-10 17:27:41 +01:00
Xavier J
c4f7a6641a Merge branch 'develop' into staging 2016-11-10 17:26:08 +01:00
Xavier J
a72709b6da Fix bug Cerfa on « Modifier document » recap page 2016-11-10 17:26:00 +01:00
Xavier J
44773591d3 Merge branch 'staging' 2016-11-10 16:18:21 +01:00
Xavier J
fddf118884 Merge branch 'develop' into staging 2016-11-10 15:57:27 +01:00
Xavier J
ec4b634f8a Change onglet presentation for gestionnaire. 2016-11-10 15:57:14 +01:00
JC
a89a40df34 Prevent call for headers writting (export with procedures), get filtered dossiers by using the 'yoloServiceRegexCraftedByHandMetaForAllProject' -> extra :), adding tests for generic methods, still need to test export_columns_and_procedure 2016-11-09 17:20:55 +01:00
JC
c01e3987f6 Using serializer to get procedure.dossier from controller 2016-11-09 15:36:18 +01:00
JC
2056605135 Working with procedure types_de_champ ordered by id ASC -> building bunch of 'extra' data to default data values... when value is set (obvious) 2016-11-09 10:49:37 +01:00
JC
973570332f Implemented custom method to catch procedure_id while rendering data on each request format 2016-11-09 09:19:57 +01:00
Xavier J
9c863c7bff Fix bug go to dossier list tableau de bord 2016-11-08 19:03:21 +01:00
Xavier J
86125b219a Import opensimplif rake task 2016-11-08 19:02:57 +01:00