Commit graph

255 commits

Author SHA1 Message Date
Mathieu Magnin
6c41cbcc5e Clean css 2017-02-14 16:20:52 +01:00
Xavier J
5d733c11fd Delete references @opensimplif 2017-02-13 15:46:28 +01:00
Mathieu Magnin
82546a3ad4 Fix merge error 2017-02-08 15:32:49 +01:00
Xavier J
5edd16c30f Fix indentation 2017-02-07 17:52:56 +01:00
Xavier J
7cd08ec3f9 Merge branch 'develop' into print_css_for_dossier_show
# Conflicts:
#	app/views/dossiers/_messagerie.html.haml
2017-02-07 17:38:02 +01:00
Mathieu Magnin
e99746639b Merge branch 'send_user_notification_when_invite_send_a_message' into develop 2017-02-01 17:01:34 +01:00
Mathieu Magnin
91bd058106 Some fixes after review 2017-02-01 15:58:56 +01:00
Mathieu Magnin
34d05e4d9e Improve the print css for the dossier/show 2017-02-01 14:24:24 +01:00
Mathieu Magnin
38e8acf285 Change some wordings and clean some templates 2017-01-31 10:46:20 +01:00
Mathieu Magnin
c7934b2f97 Send a mail to usager if somebody else wrote a new commentaire on his dossier 2017-01-30 15:17:45 +01:00
Xavier J
23df8a2348 - Ajust TPS for OpenSimplif
- Create /simplifcations routes for OpenSimplifController
2017-01-09 17:12:11 +01:00
Xavier J
99e6749c96 Fix invite to access a files 2017-01-04 18:03:03 +01:00
Xavier J
9ed1fc5125 Change libelle message header section 2017-01-02 15:23:05 +01:00
JC
f407f3a266 Need refactoring on dossier_show rendered partials 2017-01-02 14:05:31 +01:00
JC
fdf6efafb2 Display hist for pieces justificatives only if multiple files uploaded 2017-01-02 11:44:21 +01:00
JC
aa2d2ad924 No notification message, when gestionnaire on index 2016-12-28 12:20:34 +01:00
JC
9e88a0d889 Display action renseigner un siret when not gestionnaire logged and dossier in states draft, replied, initiated 2016-12-28 12:06:37 +01:00
JC
6dd4736f9d Margin credentials and champs in dossier show 2016-12-28 11:55:39 +01:00
JC
a727c5146f Cannot have the right feature test about invites, both side User and Gestionnaire 2016-12-26 14:16:08 +01:00
Xavier J
31653ff553 Add everywhere col-sm-X and col-xs-X 2016-12-23 16:58:06 +01:00
Xavier J
cd7b7e4055 - Fix display private form
- Refacto code private form
2016-12-22 11:39:44 +01:00
Xavier J
d4522ae82e Refacto code in Récapitulatif view 2016-12-22 10:55:27 +01:00
Xavier J
76757b1d22 Fix bug display « PIÈCES JOINTES » header section 2016-12-22 10:52:04 +01:00
Xavier J
e258118825 Reactive cartographie 2016-12-20 14:48:09 +01:00
JC
04a8632bda Merge branch 'develop_v2' into develop 2016-12-19 17:17:10 +01:00
JC
691f061828 Features tests about user: create and edit dossier 2016-12-19 17:16:07 +01:00
Xavier J
0563ae1090 Fix CSS for default data block Infos 2016-12-19 16:31:18 +01:00
Xavier J
bc4e3860be Fix all tests 2016-12-14 18:41:33 +01:00
JC
e228f20684 Adding white back to some views 2016-12-07 17:55:42 +01:00
JC
e10bd08800 2nd round about css and some adjustements: message/pj empty validation, margins, link_to div inclusion and more 2016-12-07 16:59:35 +01:00
Xavier J
6f731f700f Fix description view for champs and private champs 2016-12-07 15:44:28 +01:00
JC
6f019f9a0f Time to launch on staging 2016-12-07 14:44:10 +01:00
JC
5c93920f74 Mutualize all informations in dossier_show partial, now work on css 2016-12-07 13:58:00 +01:00
JC
6d8d8470d8 Need to test UI 2016-12-06 15:36:04 +01:00
JC
029fb1faec Continue working on css, display carto (buggy), now adding private fields 2016-12-06 15:22:57 +01:00
JC
f0d5b5dc25 Need to add carto body, and then private field block 2016-12-06 15:17:18 +01:00
JC
e367cba480 Added condition to show renseigner un siret action in dossiers#show 2016-12-06 14:41:50 +01:00
JC
7058fde758 First step about user registration is safe (CSS) 2016-12-06 13:56:33 +01:00
JC
c8f176de74 Using carto block, need to add css classes even if empty + need to refactor some of backoffice/dossiers/show Vs users/recapitulatif/show + then continue on document block and add a siren button on construct dossier 2016-12-06 13:14:06 +01:00
JC
41ebb648ef Having editer action for construct dossier, now need the carto default_block to be shown 2016-12-06 13:06:34 +01:00
JC
02f913afdf Now rework the action interface for dossiers in their show 2016-12-06 12:51:02 +01:00
JC
17e5800487 Add feature flag OpenSimplif for comments per field 2016-12-05 15:24:07 +01:00
JC
e24008bae4 font-size increased for options in download menu (dossiers#index), adding caret to display dropdown 2016-12-05 11:27:26 +01:00
JC
27cc62ea1e Working on dossiers#show recapitulatif for users 2016-12-02 16:33:36 +01:00
JC
62f64d2bea Working on dossiers#show 2016-12-02 10:39:28 +01:00
JC
06ee5726ed Fixing css on split-hr-left 2016-11-30 11:22:29 +01:00
JC
53692be01d Css on left-pannel action for dossiers#show 2016-11-29 16:03:59 +01:00
JC
67091f995b Changing css index filters dossiers#index 2016-11-29 15:47:58 +01:00
JC
f66b593596 Continue css upon dossiers#show, doing procedure libelle 2016-11-29 14:56:24 +01:00
JC
3772fee85f Dossier content displayed by default on dossiers#show 2016-11-29 14:46:09 +01:00
JC
a1242bb55a Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-11-28 18:34:39 +01:00
JC
4a5c053ae5 Continue on dossier#show 2016-11-28 18:34:31 +01:00
Xavier J
53b0b9ee63 Fix bug right preference panel 2016-11-28 16:49:50 +01:00
Xavier J
eb75d9b337 Merge branch 'develop' into develop_v2 2016-11-25 10:49:28 +01:00
Xavier J
97c2be07ea Change wording submit and receive action 2016-11-25 10:46:08 +01:00
Xavier J
d09a47ae23 First iteration navbar tableau de bord 2016-11-23 15:21:42 +01:00
JC
37b5e3fc48 Up limit for export form 200 to 400 2016-11-23 11:29:56 +01:00
JC
750d81e70b Working on css for dossier#show body 2016-11-22 17:32:00 +01:00
JC
3a82725cbd Fix css for download dossiers buttons 2016-11-21 16:49:59 +01:00
JC
ef9adf52cb Loading variables from controller to get several uniq layout to display 2016-11-21 16:45:12 +01:00
Xavier J
647eaa4ba8 Merge branch 'develop' into develop_v2
# Conflicts:
#	Gemfile.lock
#	db/schema.rb
2016-11-17 16:55:41 +01:00
Julien Portalier
96ca5113f7 Flux de commentaires par champs 2016-11-15 18:36:20 +01:00
Xavier J
d7fdf22abb First fixed 2016-11-14 17:33:45 +01:00
Xavier J
68951c3a53 Add locales dynamics (opensimplif) 2016-11-03 16:46:26 +01:00
Xavier J
1376372c9e Revert "Active degraded mode if insee is disabled"
This reverts commit 6044c120c5.
2016-11-01 22:56:58 +01:00
Xavier J
6044c120c5 Active degraded mode if insee is disabled 2016-10-30 22:59:57 +01:00
Xavier J
8fb76d1a6e Add type de champ Engagement 2016-10-27 13:43:10 +02:00
Xavier J
d455b6f12d Fix bug follower render (opensimplf) 2016-10-26 16:06:01 +02:00
Xavier J
6f40424979 Change wording "Valider le dossier" to "Déclarer complet" 2016-10-19 11:23:34 +02:00
Xavier J
3c400da89d Add individual information on resume page for gestionnaire 2016-10-12 14:21:54 +02:00
Xavier J
8409b660cf Ordered piece justificative 2016-10-07 15:16:03 +02:00
Xavier J
52bac4f3f9 Add automatically values on individual form if user is logged with FranceConnect 2016-10-06 11:45:26 +02:00
Xavier J
8ade790a81 Add gender on individual form 2016-10-06 11:21:07 +02:00
Xavier J
8160d4d0df User can be add siret when is procedure at the attribut individual and individual_with_siret 2016-10-05 14:28:10 +02:00
Xavier J
77dadd1db5 Fix bug 2016-10-03 14:36:07 +02:00
Xavier J
9628041bfe Fix html_safe description recap dossier 2016-10-03 14:19:16 +02:00
Xavier J
9332c0f6ed Fix brakeman test 2016-09-16 16:29:34 +02:00
Xavier J
0c9fea1c14 User can invite other user to edit his dossier 2016-09-14 16:36:01 +02:00
Xavier J
60b94fc41b Specialize Invite object 2016-09-13 15:54:26 +02:00
Xavier J
0ac23f6d96 User can invite other User 2016-09-13 12:17:56 +02:00
Xavier J
a69433e8de User can be begin without SIRET 2016-08-30 11:18:43 +02:00
Guillaume Lazzara
09236f32aa Add 'refuser' and 'classer sans suite' buttons 2016-08-25 17:46:26 +02:00
Guillaume Lazzara
0120ce2a32 Add an action to set a dossier as 'recu'. 2016-08-25 15:22:08 +02:00
Xavier J
b16c5d7bea Renate site web link on etape 1 page. 2016-08-24 15:51:16 +02:00
Xavier J
c700701b36 Add lien_site_web attr and lien_notice attr 2016-08-24 12:14:25 +02:00
Xavier J
42943aad19 Explicit the use of lien_demarche attr 2016-08-24 11:40:53 +02:00
Xavier J
1a92382259 - Add new status for a dossier : received, refused and without_continuation
- Add new and rename tabs on gestionnaire all dossiers view
/!\ WARNING : One test does not pasted. He will be corrected in the next commit
2016-08-11 15:27:35 +02:00
Xavier J
d6b9ebde9a User can access at the summary tab of comments files 2016-08-08 13:34:26 +02:00
Xavier J
7d0bcfc35f Delete utilisation of "nom_projet" attribut (no delete in database) 2016-07-19 16:10:50 +02:00
Xavier J
9221a0bb26 Add tab to group all commentaires files in one (for gestionnaire) 2016-07-18 18:48:59 +02:00
Xavier J
382c8d8700 Add minim preparation for dossier uniq page 2016-07-18 09:37:22 +02:00
Guillaume Lazzara
e5002dbb11 Introduce permanent and customizable procedure url 2016-06-24 16:41:44 +02:00
Xavier J
cc8d2ef4ee New UI and UX for the dossier initialization 2016-06-20 13:57:57 +02:00
Xavier J
866565495d Delete default description in dossier 2016-06-13 12:03:05 +02:00
Xavier J
fb2eeddf97 Revert guest can be upload new document on dossier 2016-04-19 14:08:09 +02:00
Xavier J
8812ba2507 Fix brakeman information 2016-03-24 17:49:44 +01:00
Xavier J
6d5a3e6256 User and Guest can be upload new documents on our recapitulative dossier page. 2016-03-22 17:36:36 +01:00
Xavier J
eeaefdcc79 Add reference to user who upload a cerfa or a piece justificative 2016-03-17 17:33:38 +01:00
Xavier J
bb79aca58a Add historic for piece justificative 2016-03-17 14:50:10 +01:00
Xavier J
4b7e6426b3 Gestionnaire can have the history of cerfa updated on dossier show page 2016-03-16 15:34:35 +01:00
Xavier J
4993abf5f2 Create fonction content_url to make public download link for cerfa and pj 2016-02-26 13:59:03 +01:00
Guillaume Lazzara
b58f88d9bf Do not display cerfa information in dossier description 2016-02-19 16:59:39 +01:00
Xavier J
850f4366c8 Add type de champ checkbox (boolean) 2016-02-18 15:36:09 +01:00
Xavier J
20a41ef172 Use gem bootstrap-wysihtml5 on textarea 2016-02-18 11:56:54 +01:00
Xavier J
a20daa2ea2 Adapt print properties on Gestionnaire dossier show 2016-02-12 15:39:14 +01:00
Xavier J
e2a896d0b0 Gestionnaire can invite an email contact to participate at a dossier 2016-02-08 18:16:18 +01:00
Guillaume Lazzara
e20de3dba9 First attempt 2016-02-02 18:37:38 +01:00
Xavier J
72043dbe56 Display cadastre on map if present on database 2016-01-18 14:45:08 +01:00
Xavier J
ad300319f4 Rename CERFA to Formulaire 2016-01-08 14:58:22 +01:00
Xavier J
afd6d443f3 fix show information mandataire social on dossier page 2016-01-06 17:12:03 +01:00
Xavier J
cf248f198f Add an information on gestionnaire view if the user's file is a mandataire social of the enterprise 2016-01-06 14:54:00 +01:00
Xavier J
cf6b3e955a Add Downloader url for gestionnaire 2016-01-05 16:27:31 +01:00
Xavier J
3c18882407 Create facade for dossier into user and gestionnaire views 2015-12-24 15:10:20 +01:00
Xavier J
563e739958 Minor fix bug 2015-12-17 12:53:43 +01:00
Xavier J
d8253be4e5 - Into views, replace words :
- Gestionnaire by Accompagnateur
	- Entreprise by Organisation
- Add procedure libelle on user dossier show page
2015-12-15 17:46:05 +01:00
Xavier J
a2a5d63c0d Display RNA information on partial dossier entreprise information 2015-12-11 12:36:44 +01:00
Xavier J
9f9e8ca176 Fix bug : QP not appears on mini carte in infos_dossier page 2015-12-08 11:32:29 +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
92d57db91d - migrate page show to edit for procedure admin
- create new page show for procedure admin
2015-12-04 16:17:35 +01:00
Tanguy PATTE
9473232e14 remove fake attestation fiscale 2015-12-02 10:59:03 +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
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
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
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
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
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
d53c43a7b0 Ajout du bouton traité pour les gestionnaires 2015-10-09 12:05:07 +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
e63409ddfd FAKE pièce justificative 2015-10-08 16:07:01 +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
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
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
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