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
