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

2723 commits

Author SHA1 Message Date
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
9b28a3f766 Adaptation demo page with /users/procedure 2015-11-20 18:44:44 +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
18d72745f0 Add description and logo tps on siret page 2015-11-20 17:51:25 +01:00
Xavier J
27dedb1f7b Harmonisation des pages de login 2015-11-20 17:50:27 +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
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
Tanguy PATTE
90c7e85980 remove useless view 2015-11-19 19:03:32 +01:00
Xavier J
b40b0e59b1 color state on search result 2015-11-19 18:04:09 +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
37b4823e9a end move up and down button for type de champ 2015-11-19 15:21:18 +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
Xavier J
9826a294d4 demo procedure page 2015-11-17 18:30:28 +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
26b82b620f sort type de champ by order place 2015-11-17 17:13:06 +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
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
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
eadb42af93 - add bower for rails 
- add "wildhoney_leaflet_freedraw" bower vendor
- remove api_carto
 2015-11-10 18:08:47 +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
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
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
d75ed802d2 lien_demarche not necessary to validate procedure 2015-10-26 16:48:41 +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
d53c43a7b0 Ajout du bouton traité pour les gestionnaires 2015-10-09 12:05:07 +02:00
Tanguy PATTE
a57b9852b2 change link to images 2015-10-08 18:53:41 +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
90e8866d37 FAKE changement libelle 2015-10-08 16:33:44 +02:00
Xavier J
5fd9b39889 FAKE pièce justificative fix test 2015-10-08 16:31:14 +02:00
Xavier J
42f43eebd7 Désactivation de l'obligation de dessin pour l'API carto 2015-10-08 16:26:54 +02:00
Xavier J
e63409ddfd FAKE pièce justificative 2015-10-08 16:07:01 +02:00
Xavier J
e678216ca8 Logo france connect navbar 2015-10-08 12:11:01 +02:00
Xavier J
728150b148 [#915] Revu de code Ok 2015-10-08 11:26:12 +02:00
Tanguy PATTE
a828c6259b Merge branch 'france_connect' of ssh://37.187.249.111:2200/opt/git/tps into france_connect 2015-10-08 11:23:14 +02:00
Tanguy PATTE
968aa92d77 [#920] prefill siret when user has a siret 2015-10-08 11:22:55 +02:00
Xavier J
4ee7c5872c New connexion page view 2015-10-07 18:14:10 +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
3d38f6fcdb add login_with_france_connect boolean at the FC connection 2015-10-07 11:24:07 +02:00
Xavier J
72506df419 new home page connexion 2015-10-06 18:33:01 +02:00
Xavier J
8445944b76 add spec for features France connect connection 2015-10-06 17:06:59 +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
Tanguy PATTE
7f83712449 [#894] display state for user 2015-09-25 11:42:20 +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
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
ba671534c3 [#890] add link to dossier in list dossier 2015-09-24 12:02:59 +02:00
Xavier J
f20f561e6c Fix liens page description et recapitulatif 2015-09-24 11:37:18 +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
6eeac88c95 fix user path and add test full user path 2015-09-24 10:30:29 +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
78e86f00ea [#884] add user 2015-09-23 10:02:01 +02:00
Tanguy PATTE
3898d8f88e [#883] add conditionnal to display modify link in recap 2015-09-22 15:08:21 +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
Tanguy PATTE
5b9acf3875 [#878] add liste of dossier in backoffice 2015-09-22 11:56:14 +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
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
1c817c4a57 use https for highchart 2015-09-01 17:02:54 +02:00
Tanguy PATTE
187e1c332e change asset configuration 2015-09-01 16:59:03 +02:00
Tanguy PATTE
62bfa8df3d use https for carto 2015-09-01 16:35:25 +02:00
Xavier J
236f2d5be4 Changement nom de l'application 2015-09-01 13:59:53 +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
c3d360ae7e style check 2015-08-20 16:07:18 +02:00
Tanguy PATTE
260a664738 clean views 2015-08-20 16:04:36 +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
0eb699d6b9 refactor description controller 2015-08-18 10:43:36 +02:00
Tanguy PATTE
ef69fa453c refactor demandes controller 2015-08-17 17:08:13 +02:00
Tanguy PATTE
f28e3ccbd3 clean view 2015-08-17 13:31:51 +02:00
Tanguy PATTE
eef27af1f4 remove useless if 2015-08-17 12:01:48 +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
c78a4f655b rename ref_formulaire into formulaire 2015-08-14 14:05:09 +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
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
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