DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
450 commits 2 branches 1166 tags 84 MiB
Commit graph

284 commits

Author SHA1 Message Date
Tanguy PATTE
e6136e17c3 add types_de_champ_ordered in procedure 2015-11-17 15:30:03 +01:00
Tanguy PATTE
65c8c039ac add feature test on type de champ: 
add typde de champ
delete type de champ
 2015-11-17 11:23:13 +01:00
Tanguy PATTE
afd0b72ae8 add support file to wait for ajax request for capybara tests 2015-11-17 11:22:29 +01:00
Tanguy PATTE
5a422c75ac rename type_champs into type_champ and change links/routes for procedure : use show instead of edit 2015-11-17 10:23:05 +01:00
Tanguy PATTE
9942525984 link procedure to administrateur 2015-11-16 18:25:31 +01:00
Tanguy PATTE
2696a6098e remove useless test 2015-11-16 18:08:33 +01:00
Xavier J
3effa5e9fd Gestionnaire procedures though administrateur and dossiers through procedures 2015-11-16 18:08:19 +01:00
Tanguy PATTE
0f73a2fc94 Merge branch 'develop' into refactor_type_de_xxx 2015-11-16 17:09:54 +01:00
Tanguy PATTE
a2f4281f21 refacto. 
split procedure into 3 screen
desactivate order place for type de champ
desactivate features test to rewrite them
use ajax instead of pure js to manage type de champ
 2015-11-16 16:16:08 +01:00
Xavier J
de356ae0ab Add search method on dossier model 2015-11-16 15:58:35 +01:00
Xavier J
dd8bafab49 Add on information entreprise : 
- SIRET Siège social
	- Code naf
	- Code effectif
	- Numéro TVA intracommunautaire
	- Exercices
 2015-11-16 11:23:29 +01:00
Xavier J
803ca14f72 fix test 2015-11-13 15:26:17 +01:00
Xavier J
19b76203c4 Creation three tabs for gestionnaire back office 2015-11-13 15:23:21 +01:00
Xavier J
ce6af625d2 - Save polygon from carte on procedure 
- Display save polygon from database
 2015-11-12 17:34:12 +01:00
Xavier J
eadb42af93 - add bower for rails 
- add "wildhoney_leaflet_freedraw" bower vendor
- remove api_carto
 2015-11-10 18:08:47 +01:00
Xavier J
fd9061abdf - Administrateur can't show only his procedures 
- Gestionnaire can't show only files of his Administrateur's procedures
 2015-11-10 11:58:56 +01:00
Xavier J
dc18e7da6f Create relation between Administrateur, Gestionnaire and Procedure 2015-11-10 10:23:15 +01:00
Xavier J
0906d44ea8 Refactor TypeDeXxxx 2015-11-09 17:15:51 +01:00
Xavier J
f3d8645426 Rename TypeDeChamps to TypeDeChamp 2015-11-05 11:21:44 +01:00
Xavier J
519af34c82 Revu de code 2015-11-04 17:27:01 +01:00
Xavier J
591f52f654 Dynamic display for champs on description and recapitulative page 2015-11-04 11:14:07 +01:00
Xavier J
6fbe735793 Save Champs value since description page 2015-11-03 16:16:39 +01:00
Xavier J
27dbd3a878 Add auto champs objects at a dossier (same as PJ) 
Add dynamic of Champs on the description page
Rename model 'Champs' to 'Champ'
 2015-11-03 15:27:49 +01:00
Xavier J
56eccf55df add table Champs 2015-11-03 10:48:40 +01:00
Xavier J
2050465a75 REFACTOR : remove column 'montant_projet', 'montant_aide_demande', 'date_previsionnelle', 'position_lat', 'position_lon' et 'ref_dossier_cart' of dossier table 2015-11-02 18:56:41 +01:00
Xavier J
8db705ec94 Revu de code OK 2015-11-02 16:36:52 +01:00
Xavier J
c454ea28ed REFACTOR: Change dossier state 'SubmitValidated' To 'Submitted' 2015-11-02 15:46:43 +01:00
Xavier J
285cee939a REFACTOR: Change dossier state 'Submitted' To 'Initiated' 2015-11-02 15:31:15 +01:00
Xavier J
c09fe8e7f6 REFACTOR: Change dossier state 'Processed' To 'Closed' 2015-11-02 15:00:28 +01:00
Xavier J
76d87c7f79 REFACTOR : Change dossier state 'Deposited' To 'SubmitValidated' 2015-11-02 11:52:39 +01:00
Xavier J
da8c166331 REFACTOR: Change dossier state 'Confirmed' To 'Validated' 2015-11-02 11:45:52 +01:00
Xavier J
4a05af89fc REFACTOR: Change dossier state 'Reply' To 'Replied' 2015-11-02 11:33:00 +01:00
Xavier J
c0733849d5 REFACTOR : Change dossier state 'Proposed' To 'Submitted' 2015-11-02 11:23:55 +01:00
Xavier J
0e8919a523 add up and down button to order place TypeDeChamps Procedure 2015-11-02 10:16:53 +01:00
Xavier J
afb11f429a Add button delete for TypeDeChamps and TypeDePieceJustificative on Procedure form 
+ refactor procedure.js
 2015-10-29 17:22:57 +01:00
Xavier J
71f9455e36 Back : Save TypeDePJ for a procedure 2015-10-28 18:09:47 +01:00
Xavier J
059211755a Front to add TypeDePieceJustificative for a procedure 
Back not implement for this commit
 2015-10-28 15:55:31 +01:00
Xavier J
e673fe6ae2 Change updated method for type de champs' procedure 2015-10-28 15:08:23 +01:00
Xavier J
4eecba4ce1 Back : save types de champs for procedure OK 2015-10-28 11:53:16 +01:00
Xavier J
eb69e4f80f FrontEnd to add New type champs at a procedure. 
=> Save into database not implement for the moment
 2015-10-27 17:31:08 +01:00
Xavier J
2d548acba0 Add description to type_de_champs table 2015-10-27 16:15:25 +01:00
Xavier J
5c643c6373 FIX TEST 2015-10-26 18:08:41 +01:00
Xavier J
9392f1d6e3 Create TypeDeChamps 2015-10-26 17:35:02 +01:00
Xavier J
f4db1a16f8 - Change root route 
- Add RootController
 2015-10-26 16:10:38 +01:00
Xavier J
270d28f6da Add procedure edition functionality 2015-10-26 15:54:20 +01:00
Xavier J
49627fccad Add Administrateurs role and his connexion is ok. 2015-10-23 16:19:55 +02:00
Xavier J
c6ed98b978 protect page with check the owner's dossier 2015-10-09 17:33:33 +02:00
Xavier J
0bd43e538a add current_user_dossier function at UserController 2015-10-09 16:26:39 +02:00
Xavier J
3a06c0b870 secure description and carte page with only log user access 2015-10-09 14:43:19 +02:00
Xavier J
d53c43a7b0 Ajout du bouton traité pour les gestionnaires 2015-10-09 12:05:07 +02:00
Xavier J
c1a01f30dd tests fix 2015-10-08 17:08:01 +02:00
Xavier J
285d7c6fa0 Merge branch 'develop' into france_connect 
# Conflicts:
#	db/schema.rb
 2015-10-08 16:54:21 +02:00
Xavier J
728150b148 [#915] Revu de code Ok 2015-10-08 11:26:12 +02:00
Tanguy PATTE
968aa92d77 [#920] prefill siret when user has a siret 2015-10-08 11:22:55 +02:00
Tanguy PATTE
deb13673d7 Merge branch 'france_connect' of ssh://37.187.249.111:2200/opt/git/tps into france_connect 
Conflicts:
	spec/controllers/france_connect_controller_spec.rb
 2015-10-07 16:50:52 +02:00
Tanguy PATTE
afed93247d [#917] redirect to correct location after login with france connect 2015-10-07 16:49:42 +02:00
Xavier J
aeeb9406e9 add france connect logout process 2015-10-07 16:38:29 +02:00
Xavier J
9c6b9d408b [bis] force login_with_france_connect at false when connection devise user 2015-10-07 14:19:16 +02:00
Xavier J
35ef473f59 force login_with_france_connect at false when connection devise user 2015-10-07 14:18:55 +02:00
Tanguy PATTE
76e3b60f71 Merge branch 'france_connect' of ssh://37.187.249.111:2200/opt/git/tps into france_connect 
Conflicts:
	spec/controllers/france_connect_controller_spec.rb
 2015-10-07 12:03:14 +02:00
Tanguy PATTE
6dc891a320 fix siret retrieval from OpenIDConnect::ResponseObject::UserInfo 2015-10-07 12:01:05 +02:00
Xavier J
3d38f6fcdb add login_with_france_connect boolean at the FC connection 2015-10-07 11:24:07 +02:00
Tanguy PATTE
0a14fbd5dd add siret to user 2015-10-07 10:29:44 +02:00
Xavier J
d655b2319a Done test France Connect 2015-10-06 17:41:49 +02:00
Tanguy PATTE
f4e3ec1a72 add feature test on france connect 2015-10-06 17:22:06 +02:00
Xavier J
8445944b76 add spec for features France connect connection 2015-10-06 17:06:59 +02:00
Xavier J
a4661c932f done spec france connect controller 2015-10-06 17:06:37 +02:00
Tanguy PATTE
c57cb5b75d add test to france connect controller 2015-10-06 16:47:25 +02:00
Xavier J
b979c9df32 begin controler france connect test bad code params 2015-10-06 16:35:03 +02:00
Tanguy PATTE
2f21b42c07 add test to france connect controller 2015-10-06 16:17:15 +02:00
Xavier J
abe5d94ac5 test login FranceConnectController 2015-10-06 16:02:30 +02:00
Tanguy PATTE
bde99fff1b add test for france connect service 2015-10-06 12:00:54 +02:00
Xavier J
20cae835e6 begin spec client france connect service 2015-10-06 11:47:42 +02:00
Tanguy PATTE
5cb8f92a81 start test on france connect client 2015-10-06 11:32:57 +02:00
Xavier J
0c2d1d70ff fix bug test 2015-09-28 18:58:10 +02:00
Xavier J
91e937c247 activation page carte for procedure with db attribut use_api_carto is true 2015-09-28 18:55:16 +02:00
Xavier J
97cf5fc605 Les dossiers se soumettent automatiquement au récapitulatif. 2015-09-28 10:32:41 +02:00
Tanguy PATTE
7f91778027 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 2015-09-25 11:42:32 +02:00
Tanguy PATTE
7f83712449 [#894] display state for user 2015-09-25 11:42:20 +02:00
Xavier J
805dd49737 Gestion des états dans le post des commentaires 2015-09-25 10:46:09 +02:00
Tanguy PATTE
92d5fb4cf3 [#890] order dossier for user by last update 2015-09-25 10:26:50 +02:00
Xavier J
170655a72b Fix tests 2015-09-24 18:33:10 +02:00
Xavier J
be5a7f2fd2 Ajout des tableaux séparés et des états de chaque dossier dans le backoffice 2015-09-24 18:12:08 +02:00
Xavier J
2a2147a7bb fix test 2015-09-24 16:54:14 +02:00
Xavier J
af610a4a04 - Revu de la page dossier côté gestionnaire 
- Ajout des boutons de changement d'état gestionnaire
 2015-09-24 16:51:14 +02:00
Tanguy PATTE
46211816ed fix tests 2015-09-24 12:04:44 +02:00
Tanguy PATTE
df04d2ab5b Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 2015-09-24 12:03:10 +02:00
Tanguy PATTE
ba671534c3 [#890] add link to dossier in list dossier 2015-09-24 12:02:59 +02:00
Tanguy PATTE
c1b71b1b54 [#887] filter user dossier list 2015-09-24 11:45:28 +02:00
Xavier J
f20f561e6c Fix liens page description et recapitulatif 2015-09-24 11:37:18 +02:00
Tanguy PATTE
3f11e09937 fix tests 2015-09-24 11:20:04 +02:00
Tanguy PATTE
40310da378 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 2015-09-24 11:17:29 +02:00
Tanguy PATTE
23d11976a2 add validation presence user for dossier 2015-09-24 11:17:17 +02:00
Xavier J
8693f4194c Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 
Conflicts:
	app/views/users/recapitulatif/show.html.haml
	spec/features/recapitulatif_page/_commentaires_flux_spec.rb
	spec/features/recapitulatif_page/show_page_spec.rb
 2015-09-24 10:56:12 +02:00
Xavier J
ea0b64a9dc Correction teste view 2015-09-24 10:42:14 +02:00
Tanguy PATTE
a91380182d force user login on commentaire 2015-09-24 10:34:01 +02:00
Tanguy PATTE
6eeac88c95 fix user path and add test full user path 2015-09-24 10:30:29 +02:00
Xavier J
ded5a6a28f add function "next_step" into dossier 2015-09-24 10:27:14 +02:00
Xavier J
a9109f8b2b Nouvelle organisation de la page récapitulatif 2015-09-24 10:17:59 +02:00
Tanguy PATTE
5772b99d42 move controller into users folder 2015-09-23 19:20:03 +02:00
Tanguy PATTE
e0cb736542 rename start controller into siret controller and change error handling 2015-09-23 16:56:30 +02:00
Tanguy PATTE
ede01b024b [#888] link user to dossier 2015-09-23 12:16:21 +02:00
Tanguy PATTE
8c549bf27b [#887] afficher la liste des dossiers à l'utilisateur 2015-09-23 12:04:57 +02:00
Tanguy PATTE
ca363ca095 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 
Conflicts:
	db/schema.rb
 2015-09-23 10:02:54 +02:00
Tanguy PATTE
78e86f00ea [#884] add user 2015-09-23 10:02:01 +02:00
Xavier J
888ac8b336 initialisation state for dossier with enum 2015-09-22 18:30:20 +02:00
Xavier J
f7fb0f99bf correction home page bad siret error 2015-09-22 15:36:44 +02:00
Tanguy PATTE
d034176fe3 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 
Conflicts:
	app/views/dossiers/_infos_dossier.html.haml
 2015-09-22 15:02:04 +02:00
Tanguy PATTE
5ca014587a [#883] move admin part in backoffice 2015-09-22 15:00:59 +02:00
Xavier J
7443d2feef delete "Modification localisation" in page "recapitulatif" 2015-09-22 14:09:32 +02:00
Xavier J
810395c428 Rename and remove attribut into Dossier 2015-09-22 13:58:32 +02:00
Xavier J
017c90f7b6 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 2015-09-22 13:16:09 +02:00
Xavier J
1bdc737838 Correction des derniers tests suites au changement de schéma de la BDD 2015-09-22 13:15:58 +02:00
Xavier J
542cdbaefd validation des pièces justificative 2015-09-22 13:11:56 +02:00
Tanguy PATTE
8f2f0eddc0 remove duplicated line 2015-09-22 12:00:27 +02:00
Tanguy PATTE
9da4a33e62 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 
Conflicts:
	db/schema.rb
 2015-09-22 11:57:04 +02:00
Tanguy PATTE
5b9acf3875 [#878] add liste of dossier in backoffice 2015-09-22 11:56:14 +02:00
Xavier J
94cfa8a139 ajout de la procédure à la création d'un dossier 2015-09-22 11:24:03 +02:00
Xavier J
632c19bc48 validation à la création d'une procédure sur les attributs 'libelle', 'description' et 'lien démarche' 2015-09-22 11:21:52 +02:00
Tanguy PATTE
ca4e5130c2 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 2015-09-22 11:04:26 +02:00
Tanguy PATTE
b7132ffcc8 [#878] add timestamp to dossier 2015-09-22 11:04:04 +02:00
Xavier J
819c24f28b Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 2015-09-22 10:53:06 +02:00
Xavier J
f955e1d2e4 [#877] Gestion des URL dynamique sur la home page 2015-09-22 10:52:55 +02:00
Tanguy PATTE
3aad85e925 remove users and pros 2015-09-22 10:28:18 +02:00
Tanguy PATTE
3bd9308483 remove blank lines 2015-09-22 10:16:06 +02:00
Tanguy PATTE
44173a17fb add login for gestionnaire 2015-09-22 10:15:12 +02:00
Xavier J
b3383bec9f - Correction des tests suite à la modification du schéma de la base de données. 2015-09-21 17:59:03 +02:00
Xavier J
cb2786bb33 [#876] New home page and disabled liste démarche and cargo 
Bugs know : can not access at the page "Détails de votre projet" => "demarche" is null
 2015-09-21 11:36:26 +02:00
Tanguy PATTE
fe3f235860 include philippe notes 2015-09-02 17:34:13 +02:00
Tanguy PATTE
6b8664286b fix upload piece justificative 2015-08-31 09:50:54 +02:00
Tanguy PATTE
54b4679d19 add mailto 2015-08-25 16:33:55 +02:00
Tanguy PATTE
cfa628231d add email_contact to formulaires 2015-08-25 10:49:09 +02:00
Tanguy PATTE
e5e2fef8ae move validation in model for dossier 2015-08-25 10:19:39 +02:00
Tanguy PATTE
bab43c5cd3 change type of date_previsionnelle 2015-08-24 16:28:47 +02:00
Tanguy PATTE
cee8136ecf create piece jointe when formulaire is linked to dossier 2015-08-24 15:23:07 +02:00
Tanguy PATTE
327412fba3 fix datepicker and test it 2015-08-24 11:42:06 +02:00
Tanguy PATTE
c8baf0c280 fix test 2015-08-21 11:40:02 +02:00
Tanguy PATTE
88b663a514 move check email params in validator 2015-08-21 11:37:13 +02:00
Tanguy PATTE
d557cee249 style check 2015-08-20 17:30:17 +02:00
Tanguy PATTE
a7e6931303 style check 2015-08-20 16:59:15 +02:00
Tanguy PATTE
3a68a0d0ad style check 2015-08-20 16:52:36 +02:00
Tanguy PATTE
d3579ba3ee style check 2015-08-20 16:29:06 +02:00
Tanguy PATTE
54f23ed2bd change test 2015-08-20 16:26:07 +02:00
Tanguy PATTE
8ee596e152 style check 2015-08-20 16:25:54 +02:00
Tanguy PATTE
a265f2e48a refactor description controller 2015-08-20 15:15:20 +02:00
Tanguy PATTE
1e385655a1 refactor tests 2015-08-20 14:24:26 +02:00
Tanguy PATTE
4d728962d0 rename route 2015-08-20 14:12:42 +02:00
Tanguy PATTE
4f5587cb66 remove useless function in admin dossier controller and fix tests 2015-08-20 12:20:54 +02:00
Tanguy PATTE
92e522eb3d delegate libelle do type piece jointe 2015-08-18 17:00:09 +02:00
Tanguy PATTE
bda3a410c4 add empty to piece_jointe 2015-08-18 16:51:57 +02:00