Commit graph

907 commits

Author SHA1 Message Date
Xavier J
e9012d8164 User can see archived file in principal list 2015-11-27 15:04:44 +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
02453e4cb1 Pagination per page procedures for admin change 2 => 12 2015-11-26 16:39:37 +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
2eb01bdf42 Add paginate for user dossiers 2015-11-26 12:29:34 +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
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
17ca244a2f end delete type de piece justificative 2015-11-20 15:12:47 +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
Xavier J
c4e0e6b402 Merge branch 'develop' into leaflet_freedraw
# Conflicts:
#	db/schema.rb
2015-11-19 17:29:23 +01:00
Xavier J
61b126b0f9 add api_carto on back office and recapitulative page 2015-11-19 16:47:56 +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
41c0ca27d9 refresh list when delete type de champ 2015-11-17 18:52:49 +01:00
Xavier J
9826a294d4 demo procedure page 2015-11-17 18:30:28 +01:00
Xavier J
9f34d20475 Add search feature for gestionnaire backoffice 2015-11-17 18:21:03 +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
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
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
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
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
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
3a4beadbd1 Order champs by 'order_place' on description page
Champs dimension of textarea form
2015-11-03 16:52:58 +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
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
c0733849d5 REFACTOR : Change dossier state 'Proposed' To 'Submitted' 2015-11-02 11:23:55 +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
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
5c643c6373 FIX TEST 2015-10-26 18:08:41 +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
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
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
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
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
Xavier J
20cae835e6 begin spec client france connect service 2015-10-06 11:47:42 +02:00
Xavier J
fd60692ade Intégration France Connect - sans les tests 2015-10-06 11:21:20 +02:00
Tanguy PATTE
40d5802d4a start france connect 2015-10-05 16:42:29 +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
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
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
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
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
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
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
Tanguy PATTE
a91380182d force user login on commentaire 2015-09-24 10:34:01 +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
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
Tanguy PATTE
1238fdae23 remove comment 2015-09-22 14:57:55 +02:00
Xavier J
a485848908 change default page 404 for not found procedure 2015-09-22 14:08:41 +02:00
Xavier J
810395c428 Rename and remove attribut into Dossier 2015-09-22 13:58:32 +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
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
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
Xavier J
dc7c943d4f Merge branch 'master' of ssh://37.187.249.111:2200/opt/git/admi_facile 2015-08-31 09:51:59 +02:00
Xavier J
9c7b0620ad Correction Redirection après connexion admin 2015-08-31 09:51:46 +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
12760a43d7 specify exception in rescue 2015-08-25 10:49:28 +02:00
Tanguy PATTE
e5e2fef8ae move validation in model for dossier 2015-08-25 10:19:39 +02:00
Tanguy PATTE
cee8136ecf create piece jointe when formulaire is linked to dossier 2015-08-24 15:23:07 +02:00
Tanguy PATTE
88b663a514 move check email params in validator 2015-08-21 11:37:13 +02:00
Tanguy PATTE
5fea76bfef style check 2015-08-20 16:41:15 +02:00
Tanguy PATTE
34c32a7dc5 style check 2015-08-20 16:40:34 +02:00
Tanguy PATTE
0a93b19efb style check 2015-08-20 16:40:04 +02:00
Tanguy PATTE
152e7cd31e style check 2015-08-20 16:39:36 +02:00
Tanguy PATTE
438151ded7 style check 2015-08-20 16:38:40 +02:00
Tanguy PATTE
66b751ff58 style check 2015-08-20 16:37:40 +02:00
Tanguy PATTE
c2f9963938 style check 2015-08-20 16:37:03 +02:00
Tanguy PATTE
49b1e49fd8 style check 2015-08-20 16:36:08 +02:00
Tanguy PATTE
b90dbb7c86 style check 2015-08-20 16:35:24 +02:00
Tanguy PATTE
756f5ffc50 style check 2015-08-20 16:34:47 +02:00
Tanguy PATTE
5cc8c58e05 style check 2015-08-20 16:34:14 +02:00
Tanguy PATTE
b0d7e490d6 style check 2015-08-20 16:33:21 +02:00
Tanguy PATTE
e7b45e6833 style check 2015-08-20 16:32:25 +02:00
Tanguy PATTE
8ee596e152 style check 2015-08-20 16:25:54 +02:00
Tanguy PATTE
78253e877b remove useless variable 2015-08-20 16:11:18 +02:00
Tanguy PATTE
a265f2e48a refactor description controller 2015-08-20 15:15:20 +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
e2ff64a119 add comment 2015-08-18 16:30:36 +02:00
Tanguy PATTE
516cafc72a build default pieces jointes when user choose formulaire 2015-08-18 15:15:34 +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
3a92e727ed stop using get_liste_piece_jointe 2015-08-17 11:42:41 +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
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
5dc8ae822f Affichage des pièces jointes disponibles dans la console admin 2015-08-12 10:09:52 +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
77fe251d8a Suppression des decorates pour établissement 2015-08-11 15:38:34 +02:00
Xavier J
d09ac6043c Revu de code 0 2015-08-11 15:22:07 +02:00
Xavier J
b5b83e939a First Commit 2015-08-10 11:05:06 +02:00