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

3921 commits

Author SHA1 Message Date
Guillaume Lazzara
b58b0de8b0 Add gestionnaire management 2016-02-09 11:01:10 +01:00
Guillaume Lazzara
2a2aef34db Add gestionnaire administration panel. 2016-02-09 11:01:10 +01:00
Xavier J
bc41412b6b Test send email when gestionnaire invite user 2016-02-09 10:51:15 +01:00
Xavier J
1aa5e7c397 Mask cerfa link procedure if is blank 2016-02-08 19:52:07 +01:00
Xavier J
e2a896d0b0 Gestionnaire can invite an email contact to participate at a dossier 2016-02-08 18:16:18 +01:00
Xavier J
d7dbd28507 fix test cerfa flag 2016-02-04 14:08:35 +01:00
Xavier J
01d71aa1cd Merge branch 'develop' into cerfa_flag 2016-02-04 11:03:49 +01:00
Guillaume Lazzara
07806701dc Fix variable name 2016-02-04 10:39:25 +01:00
Guillaume Lazzara
e20de3dba9 First attempt 2016-02-02 18:37:38 +01:00
Xavier J
7a61786814 Active landing page 2016-02-01 17:16:00 +01:00
Xavier J
68bb4935e7 Fix bug enterprise's date_creation 2016-01-28 11:29:44 +01:00
Xavier J
cef48fb03c Fix test 2016-01-27 16:00:11 +01:00
Xavier J
2220c94ce9 Merge branch 'develop' of github.com:sgmap/tps into develop 2016-01-27 15:59:57 +01:00
Xavier J
5513504555 - Refactor code carte 
- Delete auto-comments when edit carte and description
 2016-01-27 15:48:27 +01:00
Tanguy PATTE
d449c34387 Merge branch 'develop' of github.com:sgmap/tps into develop 2016-01-27 14:37:24 +01:00
Xavier J
008ca19bef un-used files deleted 2016-01-26 16:47:13 +01:00
Xavier J
98cd4ed88f Refactor Url restriction system 2016-01-26 15:52:05 +01:00
Tanguy PATTE
6d5f00deb9 Merge branch 'develop' of github.com:sgmap/tps into develop 
Conflicts:
	db/schema.rb
 2016-01-25 16:09:46 +01:00
Tanguy PATTE
dc5ac9807d start api to display dossier 
missing pj, fields, exercices
 2016-01-25 16:08:10 +01:00
Xavier J
c1ea10bd82 Add restriction on User's URL based on Dossier state 2016-01-25 15:54:21 +01:00
Xavier J
4d812220fd - Add FranceConnectInformation table to make safe FranceConnect pivot identity. 
- Adapt source code with the new table
 2016-01-21 17:06:09 +01:00
Tanguy PATTE
514918b2b8 parametrize pagination on dossier index api 2016-01-21 11:41:24 +01:00
Tanguy PATTE
f75f0e26d6 Merge branch 'develop' of github.com:sgmap/tps into develop 
Conflicts:
	db/schema.rb
 2016-01-20 15:50:13 +01:00
Tanguy PATTE
78bd982f97 Add API index on Dossier. 2016-01-20 15:48:46 +01:00
Xavier J
65ba614be2 Refactor function create in user dossier controller 2016-01-20 10:34:22 +01:00
Xavier J
a738128f4a Suppression de FCEntreprise 2016-01-19 17:40:45 +01:00
Xavier J
e8fd212d13 - Code review 
- Delete Mandataires sociaux adapter
- Add function to get mandataires sociaux in Enterprise Adapter
 2016-01-19 17:19:38 +01:00
Xavier J
e0d980e804 Delete on Factory Dossier :with_user 2016-01-18 17:18:04 +01:00
Xavier J
6a3525c7e2 Save Cadastre 2016-01-18 12:03:18 +01:00
Xavier J
b5f2163c51 Add Cadastre table 2016-01-15 15:28:56 +01:00
Xavier J
0f93aba6bc fix test 2016-01-15 13:15:50 +01:00
Xavier J
2ce8e4734b Add get_cadastre on TPS carte page and display on leaflet map 2016-01-15 11:53:00 +01:00
Tanguy PATTE
6dfdb474a5 Merge branch 'develop' of github.com:sgmap/tps into develop 2016-01-13 18:21:09 +01:00
Xavier J
d48c600476 Add lib API SGMAP Cartography Cadastre 
Adapt lib API SGMAP Cartography Quartier Prioritaire at the new API architecture
 2016-01-12 17:24:42 +01:00
Tanguy PATTE
0df5324891 Merge branch 'develop' of github.com:sgmap/tps into develop 
Conflicts:
	.gitignore
 2016-01-12 15:32:13 +01:00
Tanguy PATTE
c04627431c add module api carto in api procedure 2016-01-12 15:11:42 +01:00
Xavier J
5540a786db Disable FC Enterprise 2016-01-11 17:19:25 +01:00
Xavier J
64909e85a4 Fix tests view for smart listing 2016-01-11 14:10:41 +01:00
Xavier J
24ace22245 Fix test carte controller 2016-01-07 11:47:52 +01:00
Xavier J
332eab3771 Check if France Connect User is a mandataire social of the enterprise 2016-01-06 14:17:08 +01:00
Xavier J
3f048d0709 Add Mandataires Sociaux siade lib 2016-01-06 10:55:27 +01:00
Xavier J
4961f39a71 Add check password to connect with france connect particulier whereas a TPS account have the same email adresse 2016-01-05 12:18:00 +01:00
Xavier J
02b7680083 Fix bug send email sign up user 2016-01-04 16:09:04 +01:00
Xavier J
39b15e8b3d Refactor dossier decorators 2015-12-24 16:12:16 +01:00
Xavier J
9fb575ef8c Refactor procedure locked and retrieve management 2015-12-24 15:57:03 +01:00
Xavier J
de0acc0a22 Change URL for not found procedure 2015-12-24 15:22:30 +01:00
Xavier J
3c18882407 Create facade for dossier into user and gestionnaire views 2015-12-24 15:10:20 +01:00
Xavier J
1a3aebe6ab Merge branch 'develop' of github.com:sgmap/tps into develop 2015-12-24 10:12:52 +01:00
Xavier J
9e0dfb593e Add FranceConnect Particulier 
Reactivate FranceConnect Entreprise
 2015-12-24 10:12:23 +01:00
Tanguy PATTE
3ea381413f Merge branch 'develop' of github.com:sgmap/tps into develop 2015-12-21 17:52:00 +01:00
Tanguy PATTE
f474c8e8e1 add api v1 procedure controller 2015-12-21 17:51:49 +01:00
Tanguy PATTE
e40e1299ad add organisation and direction to procedure factory 2015-12-21 17:51:08 +01:00
Xavier J
c20f9a87e9 Front : Procedure can not be edited when at least one file with state other what draft is created by user 2015-12-21 14:40:28 +01:00
Xavier J
43779aafee Error 403 when admin would edit a procedure with at least one dossier 2015-12-21 12:02:53 +01:00
Xavier J
229973f14c Rename FranceConnect to FranceConnect::Entreprise 2015-12-18 12:01:26 +01:00
Xavier J
563e739958 Minor fix bug 2015-12-17 12:53:43 +01:00
Xavier J
44554a9baa Send an email when user submitted his file 2015-12-17 10:09:44 +01:00
Xavier J
ed8b4ff083 Add mailer submitted dossier. 2015-12-17 10:06:40 +01:00
Tanguy PATTE
789ea308ee Merge branch 'develop' of github.com:sgmap/tps into develop 2015-12-15 16:49:58 +01:00
Tanguy PATTE
d2978c4656 add api token in administrator's profile page 2015-12-15 16:49:48 +01:00
Xavier J
b237d7c890 Send email when gestionnaire valide a dossier 2015-12-15 15:37:46 +01:00
Xavier J
a24ff681fc - Send email when gestionnaire write a new commentaire 
- Change url on mail => redirect on dossier recapitulative page
 2015-12-15 15:33:21 +01:00
Xavier J
4aedf72631 Send email when user create new account 2015-12-15 15:17:12 +01:00
Xavier J
372011e4d6 NotificationMailer : dossier_validated 2015-12-15 11:41:50 +01:00
Xavier J
25937b2635 NotificationMailer : new answer 2015-12-15 11:02:07 +01:00
Xavier J
1652a747a1 Merge branch 'develop' of github.com:sgmap/tps into develop 2015-12-15 11:01:28 +01:00
Tanguy PATTE
cea90384e4 Merge branch 'develop' of github.com:sgmap/tps into develop 
Conflicts:
	spec/views/users/dossiers/new_html.haml_spec.rb
 2015-12-14 17:30:21 +01:00
Tanguy PATTE
a8960784f8 remove puts in test 2015-12-14 17:29:15 +01:00
Tanguy PATTE
e4b54999f4 add api_token for admin 2015-12-14 17:28:36 +01:00
Tanguy PATTE
60cb6cccf5 remove blank test file 2015-12-14 17:27:24 +01:00
Tanguy PATTE
cf99b30349 change banner for admin 2015-12-14 17:27:14 +01:00
Xavier J
a65f271a60 Add mailer Welcome 2015-12-14 16:09:20 +01:00
Xavier J
a2a5d63c0d Display RNA information on partial dossier entreprise information 2015-12-11 12:36:44 +01:00
Xavier J
05298f7a40 Add RNAInformation model 2015-12-11 11:05:38 +01:00
Xavier J
704e491cd0 Add lib RNA connect to apientreprise 2015-12-11 10:36:16 +01:00
Xavier J
d49e9fe75a admin can upload a logo for his procedure 2015-12-10 17:13:39 +01:00
Xavier J
8755ce2ab1 add euro flag to procedure object 2015-12-10 16:09:21 +01:00
Xavier J
90a3b6763b sign_out all devises connect before sign_in an other 2015-12-09 15:10:11 +01:00
Xavier J
e9145b031f Change organisation sources for lib apicarto quartiersprioritaires 2015-12-08 16:02:35 +01:00
Xavier J
11596ade65 - QP not research if module_api_carto have not activated quartiers_prioritaires 
- Carte page is not accessible if module_api_cart have not activated use_api_carto
 2015-12-08 11:18:49 +01:00
Xavier J
0e3bec7f9f Administrateur can be select dynamically the activation of api carto modules 2015-12-08 10:11:58 +01:00
Xavier J
8130e7d155 Add model ModuleAPICarto 2015-12-07 11:29:34 +01:00
Xavier J
92d57db91d - migrate page show to edit for procedure admin 
- create new page show for procedure admin
 2015-12-04 16:17:35 +01:00
Xavier J
debac1ed91 Désactivation des tests FranceConnect 2015-12-03 15:41:30 +01:00
Xavier J
2b6aba16ac - valid siren on create file 2015-12-03 15:02:22 +01:00
Xavier J
afaa6a5ac9 - delete route '/users/siret' 
- delete route 'users/procedure'
- create route 'users/dossiers/new?procedure_id=:procedure_id'
- delete a part of unused code
- adapt demo page with new procedure URL
 2015-12-03 12:00:22 +01:00
Xavier J
851f4e830e - rename tests 2015-12-02 18:17:47 +01:00
Xavier J
3e55d7ba3b - Delete routes 'users/dossiers/a_traiter - en_attente - termine' for user 
- Add routes 'uses/dossiers/?liste=xxx' to reach at file lists for user
 2015-12-02 18:03:52 +01:00
Xavier J
5cebb5b621 - Code review 
- Delete routes 'users/dossiers/a_traiter - en_attente - termine' for user
- Add routes 'uses/dossiers/?liste=xxx' to reach at file lists for user
 2015-12-02 16:52:09 +01:00
Xavier J
a3df5a546d - add test on active tab for back office 
- refactor code back office file list
- add decorator for select active tabs
 2015-12-02 14:05:56 +01:00
Xavier J
91cf5020fc Change logic test for GeojsonServiceSpec 2015-11-30 17:12:32 +01:00
Xavier J
141e23a381 Code review 2015-11-30 17:03:36 +01:00
Xavier J
58f840ac92 - Redirect User dossier index to User dossier a traiter 
- Fix tests
- Order file list by last updated for User
 2015-11-30 15:56:06 +01:00
Xavier J
da49c633dc Add tabs on view list file for users 2015-11-30 14:48:37 +01:00
Xavier J
3eb990a611 Administrator can unarchived a procedure 2015-11-27 17:13:06 +01:00
Xavier J
7c3f322d6e Add tabs for administrateur procedures list 2015-11-27 16:23:02 +01:00
Xavier J
3fd7e6b6c0 Gestionnaire can't access to a archived file with direct URL 2015-11-27 15:09:16 +01:00
Xavier J
e9012d8164 User can see archived file in principal list 2015-11-27 15:04:44 +01:00
Xavier J
1e1a6b3693 Gestionnaire can see archived file 2015-11-27 15:04:24 +01:00
Xavier J
a79ecbba6d Add archive button on recapitulative page user dossier 2015-11-27 13:56:54 +01:00
Xavier J
dd09a38bbb User can begin a new dossier with a procedure archived 
Administrateur can see archived procedure
 2015-11-27 10:39:05 +01:00
Xavier J
833752161f Add button archive on procedure 2015-11-26 18:41:41 +01:00
Xavier J
5e3bc1472c Add pagination for administrateur procedure 2015-11-26 16:00:12 +01:00
Xavier J
37ea69ec51 Add pagination for gestionnaire dossier 
Fix test for user pagination
 2015-11-26 15:47:31 +01:00
Xavier J
eb5985efc4 - Save QP on database 
- Display on all Map (User and Gestionnaire)
 2015-11-25 17:05:14 +01:00
Xavier J
f4e63d40b0 Add QP on user carte 2015-11-25 10:26:55 +01:00
Xavier J
e928284c15 Add QuartierPrioritaire model and reference at Dossier 2015-11-24 10:02:55 +01:00
Xavier J
5fd78b3fcb add adapter for sgmap api carto 2015-11-23 18:43:07 +01:00
Xavier J
edc4f7dcd9 add spec support files for sgmap api carto 2015-11-23 18:42:51 +01:00
Xavier J
2bb57b1091 add service Geojson to_polygon 2015-11-23 18:41:48 +01:00
Xavier J
e6cc95fc5f Add sgmap api carto driver to search qp 2015-11-23 18:41:24 +01:00
Xavier J
db346fb66f - create route /users/procedure/:procedure_id to replace /users/siret/?procedure_id= 
- /users/siret/ redirect to /users/procedure/
- siren can be past on the URL /users/siret and /users/procedure
 2015-11-20 18:14:52 +01:00
Xavier J
4ff31f5f81 Mask draft files for user 2015-11-20 17:50:54 +01:00
Tanguy PATTE
d6e4a76bf9 Merge branch 'develop' into refactor_type_de_xxx 
Conflicts:
	db/schema.rb
 2015-11-20 17:16:45 +01:00
Tanguy PATTE
52133c0f43 add button save for pj and type de champ 2015-11-20 17:12:36 +01:00
Tanguy PATTE
5a9a6226c7 remove validation on description for pj 2015-11-20 15:33:03 +01:00
Tanguy PATTE
19fef43d76 remove useless files 2015-11-20 15:12:55 +01:00
Tanguy PATTE
17ca244a2f end delete type de piece justificative 2015-11-20 15:12:47 +01:00
Tanguy PATTE
bd5dc1e35a refresh list of pj when adding new one 2015-11-20 14:17:38 +01:00
Tanguy PATTE
1379d6d495 change PieceJustificativeController : 
replace edit by show
add update
 2015-11-20 13:54:56 +01:00
Xavier J
f92f0f46cc After create new procedure, admin is redirect to type de champ form 2015-11-20 10:54:07 +01:00
Tanguy PATTE
90c7e85980 remove useless view 2015-11-19 19:03:32 +01:00
Xavier J
c4e0e6b402 Merge branch 'develop' into leaflet_freedraw 
# Conflicts:
#	db/schema.rb
 2015-11-19 17:29:23 +01:00
Xavier J
5a6db41d1e fix test 2015-11-19 17:23:51 +01:00
Xavier J
d8e1770935 delete rails-bower 2015-11-19 17:20:22 +01:00
Xavier J
61b126b0f9 add api_carto on back office and recapitulative page 2015-11-19 16:47:56 +01:00
Tanguy PATTE
37b4823e9a end move up and down button for type de champ 2015-11-19 15:21:18 +01:00
Tanguy PATTE
fde504b54d add move down for type de champ controller and refactor 2015-11-19 11:37:01 +01:00
Tanguy PATTE
0503e2f278 add move_up for type de champ controller 2015-11-18 19:03:51 +01:00
Tanguy PATTE
7e4b26274b change type de champ view 2015-11-18 17:03:53 +01:00
Tanguy PATTE
c4e8c6c989 change rule to display arrow button for type de champ 2015-11-18 16:56:38 +01:00
Tanguy PATTE
41c0ca27d9 refresh list when delete type de champ 2015-11-17 18:52:49 +01:00
Tanguy PATTE
1ab89b63aa add arrow in view for order place managment 2015-11-17 18:22:15 +01:00
Xavier J
9f34d20475 Add search feature for gestionnaire backoffice 2015-11-17 18:21:03 +01:00
Tanguy PATTE
cf81623937 force order place to index for type de champ 2015-11-17 17:18:00 +01:00
Tanguy PATTE
008fb396b7 remove blank line 2015-11-17 17:13:17 +01:00
Tanguy PATTE
26b82b620f sort type de champ by order place 2015-11-17 17:13:06 +01:00
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
Tanguy PATTE
f49477dee7 add api_entreprise to piece_jointe 2015-08-18 16:44:16 +02:00
Tanguy PATTE
1f960a4b43 add fonction empty for cerfa 2015-08-18 16:30:57 +02:00
Tanguy PATTE
516cafc72a build default pieces jointes when user choose formulaire 2015-08-18 15:15:34 +02:00
Tanguy PATTE
892484b494 build cerfa on create new dossier 2015-08-18 14:22:16 +02:00
Tanguy PATTE
8273438910 add cerfa model 2015-08-18 13:52:00 +02:00
Tanguy PATTE
0eb699d6b9 refactor description controller 2015-08-18 10:43:36 +02:00
Tanguy PATTE
67a4ff2519 refactor carte controller 2015-08-18 10:43:22 +02:00
Tanguy PATTE
ef69fa453c refactor demandes controller 2015-08-17 17:08:13 +02:00
Tanguy PATTE
c38a9f4498 refactor dossiers controller 2015-08-17 16:27:21 +02:00
Tanguy PATTE
1e04916005 rename Api into API 
change api error managment
refactor dossier controller
rewrite test for dossier controller
 2015-08-17 15:53:35 +02:00
Tanguy PATTE
0b37aef0d9 add test for etablissement 2015-08-17 11:51:00 +02:00
Tanguy PATTE
61b6ec5c9d add tests to entreprise 2015-08-17 11:47:19 +02:00
Tanguy PATTE
db79bd9c3d add test to commentaire 2015-08-17 11:43:01 +02:00
Tanguy PATTE
bf0164b4c7 add test and fix association to piece jointe 2015-08-17 11:41:57 +02:00
Tanguy PATTE
e53c808b42 add test and fix association fo type piece jointe 2015-08-17 11:24:09 +02:00
Tanguy PATTE
ae3ffbd780 fix association for formulaire 2015-08-17 11:15:04 +02:00
Tanguy PATTE
27cfe498ab add test for evenement vie and fix associations 2015-08-17 11:14:18 +02:00
Tanguy PATTE
b9a08f6422 add test for model dossier 2015-08-17 11:13:21 +02:00
Tanguy PATTE
a86ecb69de use entreprise decorator 
add test to entreprise decorator
refacto views
 2015-08-14 18:07:40 +02:00
Tanguy PATTE
107b11d510 rename ref_demarche into demarche_id 
fix association between formulaire and type_piece_jointe
fix association between formulaire and evenement_vie
 2015-08-14 15:02:11 +02:00
Tanguy PATTE
c78a4f655b rename ref_formulaire into formulaire 2015-08-14 14:05:09 +02:00
Tanguy PATTE
a807ba5ae9 rename ref piece jointe into type piece jointe 2015-08-14 12:06:26 +02:00
Tanguy PATTE
b9b17e2b0c refactor test 2015-08-13 17:12:18 +02:00
Tanguy PATTE
3c57643f76 add database cleaner 
add factory girl
fix tests
rename dossier_pdf into piece_jointe
rename ref_piece_jointe into content
 2015-08-13 15:56:58 +02:00
Xavier J
cfee2a6ddf Revu de code de la partie "/dossiers/dossier_id:/carte" : 
/app/controllers/carte_controller.rb
- l10/11 @dossier.update_attributes()
- l27 : le @dossier ne semble pas necessaire
- l32 : update attributes Ajouter :
	def dossier_id params[:dossier_id] end

/spec/controllers/carte_controller_spec.rb
- l 11/16 : utiliser nouvelle syntaxe pour les hashs : get :show, dossier_id: dossier_id
- l32 bancal : Commentaire.last.id, en theorie tu n'as jamais besoin d'écrire de requête sql dans tes tests l36 subject { Commentaire.last }
- l64, le cas ou c'est en erreur n'est pas testé (le géocodeur renvoie nil)
 2015-08-12 14:02:40 +02:00
Xavier J
6e2c0f733c - Fix bug message erreur "Pas de dessin" 
- Fix warning SIADETOKEN existant
 2015-08-12 10:38:34 +02:00
Xavier J
a8f9237ec1 Merge branch 'master' of ssh://37.187.249.111:2200/opt/git/admi_facile 2015-08-12 10:10:26 +02:00
Xavier J
5dc8ae822f Affichage des pièces jointes disponibles dans la console admin 2015-08-12 10:09:52 +02:00
Tanguy PATTE
f1f4f6f743 add siade token in spec helper 2015-08-11 16:18:40 +02:00
Xavier J
587081ff2f Nouvelles fonctionnalités : posibilité d'upload plusieurs pièces jointes pour un dossier. 2015-08-11 15:39:16 +02:00
Xavier J
d09ac6043c Revu de code 0 2015-08-11 15:22:07 +02:00
Xavier J
03b8a58d74 Ajout des supports pour tests pièces jointes PDF 2015-08-11 15:09:16 +02:00
Xavier J
629fa3a03a Suppression décorateur et helpeur inutile 2015-08-11 15:07:54 +02:00
Xavier J
b5b83e939a First Commit 2015-08-10 11:05:06 +02:00