Commit graph

5342 commits

Author SHA1 Message Date
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
7443d2feef delete "Modification localisation" in page "recapitulatif" 2015-09-22 14:09:32 +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
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
542cdbaefd validation des pièces justificative 2015-09-22 13:11:56 +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
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
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
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
a9b001e762 remove error from javascript file with L variable 2015-08-24 11:41:50 +02:00
Tanguy PATTE
88b663a514 move check email params in validator 2015-08-21 11:37:13 +02:00
Tanguy PATTE
752c40657d style check 2015-08-20 16:45:20 +02:00
Tanguy PATTE
4412aceeb8 style check 2015-08-20 16:43:18 +02:00
Tanguy PATTE
a1e9b938d6 style check 2015-08-20 16:42:32 +02:00
Tanguy PATTE
3c7d291c52 style check 2015-08-20 16:42:05 +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
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
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
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
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
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
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
3a92e727ed stop using get_liste_piece_jointe 2015-08-17 11:42:41 +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
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
Tanguy PATTE
c16d7a12f2 stop loading everything and every language for bootstrap datepicker 2015-08-13 15:55:26 +02:00
Tanguy PATTE
b2853d909f remove useless assets files 2015-08-13 15:55:26 +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
c02f5c320a Styles des bouttons input type file 2015-08-11 15:10:14 +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