Commit graph

1181 commits

Author SHA1 Message Date
Xavier J
333ea9a610 Merge commit '99248a75a02710899e7ee2ecbcb3b304620cb721' into develop 2017-02-07 17:54:21 +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
aa88fad777 Sync password after login 2017-02-07 16:56:21 +01:00
Mathieu Magnin
6444aa5be6 Use has_one instead of scope 2017-02-06 16:52:57 +01:00
Mathieu Magnin
749baedf43 Replace administration with services instructeurs 2017-02-01 18:05:58 +01:00
Mathieu Magnin
6bf3b9edf8 Fix test : do not send notification if commentaire is not saved 2017-02-01 17:16:08 +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
9266cf0feb Disable scrollwheel zoom on map 2017-02-01 10:31:45 +01:00
Mathieu Magnin
ef9012cd82 Add lien cerfa vierge in the modification popup 2017-01-31 17:58:44 +01:00
Mathieu Magnin
37d31fae7b Rename formulaire to formulaire de demande 2017-01-31 11:45:29 +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
Mathieu Magnin
99248a75a0 Add accompagnateurs emails in export 2017-01-26 17:54:04 +01:00
Mathieu Magnin
b40193e7b5 New customizable mail : mail_validated, new balise --lien_dossier-- 2017-01-26 12:12:52 +01:00
Mathieu Magnin
2bc5ee88f7 Change controller name according to model name, add simple_form 2017-01-24 15:53:42 +01:00
Mathieu Magnin
482ca2a317 Add a mail_template decorator 2017-01-24 11:58:09 +01:00
Mathieu Magnin
0e5c90cb0c Real index and edit for mail_templates 2017-01-24 10:19:42 +01:00
JC
4880101202 Fixing nomethoderror for opensimplif 2017-01-23 17:18:57 +01:00
Mathieu Magnin
7e24adbca0 Add mail preview and small fix 2017-01-23 15:49:19 +01:00
Mathieu Magnin
c41c36b4d1 Fix typo 2017-01-19 12:07:55 +01:00
Mathieu Magnin
52bf1d1ea2 Fix typos 2017-01-19 11:58:38 +01:00
Mathieu Magnin
2e3cb7a861 Cleaning HAML 2017-01-18 15:34:03 +01:00
Mathieu Magnin
d5e4f45d7d Add xray-rails in dev mode 2017-01-18 13:59:14 +01:00
Xavier J
154e4f3c10 Refacto check_invite! after registration for User. 2017-01-13 11:19:29 +01:00
Xavier J
f5f5ef1a0d Badge count invites by dossiers 2017-01-12 17:02:30 +01:00
Xavier J
42359eff15 Fix rake tasks 2017-01-11 17:36:28 +01:00
Xavier J
6612e56da2 Mask section left panel is user does not have any dossier 2017-01-11 15:22:24 +01:00
Xavier J
a6b10ba2df Active protect on change dossier state tool with admin email verification 2017-01-10 17:34:55 +01:00
Xavier J
bc71754e87 Add tool change dossier state 2017-01-10 17:29:38 +01:00
Xavier J
04ee25dc7d Fix bug post commentaire invite 2017-01-10 16:25:05 +01:00
Xavier J
8f5ad1af35 Fix bug procedure_path does not exist 2017-01-10 15:27:40 +01:00
Xavier J
12af46a22a Fix invite dossier validated recapitulative show 2017-01-10 15:04:13 +01:00
Xavier J
672ad55651 Fix FranceConnect connexion routing 2017-01-10 11:03:12 +01:00
Xavier J
23df8a2348 - Ajust TPS for OpenSimplif
- Create /simplifcations routes for OpenSimplifController
2017-01-09 17:12:11 +01:00
Xavier J
29c7c8f498 Fix bug @liste sélection in DossierListGestionnaireService 2017-01-09 12:26:41 +01:00
Xavier J
32378405ed Fix smart listing usage with new admin list presentation 2017-01-09 12:00:39 +01:00
Xavier J
c815ec5e82 Add tab for follow dossier in gestionnaire dashboard 2017-01-05 19:07:01 +01:00
Xavier J
ab02fe48c3 Force state dossier in files lists on gestionnaire board 2017-01-05 18:01:53 +01:00
Xavier J
b48726427d Fix bug with procedure_filter loop redirections 2017-01-05 12:44:15 +01:00
Xavier J
99e6749c96 Fix invite to access a files 2017-01-04 18:03:03 +01:00
JC
45042d0200 Catching case for empty dossiers, cannot download them while locked on procedure, third fix making good condition about empty dossiers 2017-01-03 15:50:44 +01:00
JC
2670a9db0e Catching case for empty dossiers, cannot download them while locked on procedure 2017-01-03 15:15:20 +01:00
JC
e7ef58dc9a Catching case for empty dossiers, cannot download them while locked on procedure 2017-01-03 15:14:39 +01:00
Xavier J
54bcc829c0 Fix commentaire PJ bug 2017-01-03 15:12:49 +01:00
Xavier J
6f31a4d7b7 Fix logo TPS with 2017-01-03 14:53:56 +01:00
Xavier J
8d4656cf89 Fix features dossiers edition spec 2017-01-03 12:53:27 +01:00
Xavier J
2750319f77 Fix some tests 2017-01-03 11:32:21 +01:00
Xavier J
02d7dfb1dc Add News on footer 2017-01-03 10:47:07 +01:00
Xavier J
5eeb91ec60 Delete last GithubRelease 2017-01-03 10:43:04 +01:00
Xavier J
cbb5737fdf new demo link on home page 2017-01-03 10:40:09 +01:00
Xavier J
fbeb503d9e Reactive Beta Headband 2017-01-03 10:26:47 +01:00
Xavier J
2e04760d10 Reactive Github version on home page 2017-01-03 10:24:58 +01:00
Xavier J
c122a64237 Ajust count notification for procedure left panel in back office gestionnaire 2017-01-02 18:27:01 +01:00
Xavier J
70fcaf281f New landing page 2017-01-02 18:07:04 +01:00
JC
ac85392454 Css for index dossier count, using method in dossier model to get unreaded notification count 2017-01-02 16:45:03 +01:00
JC
620a8559dd Changing css for index dossier counting, wording 2017-01-02 16:07:25 +01:00
Xavier J
a680eaed1c Change word « Commentaire » to « Message » into Mailer
Add not reply at this mail.
2017-01-02 15:29:46 +01:00
JC
442dd5b7b6 Adding facade dossiers_unread_notifications (last) 2017-01-02 15:25:06 +01:00
Xavier J
9ed1fc5125 Change libelle message header section 2017-01-02 15:23:05 +01:00
Xavier J
c8e4a347ae Change CSS header section construction form 2017-01-02 15:20:05 +01:00
Xavier J
bfbe57d533 Add method « Dossier with unread notifications » for DossierListFacade 2017-01-02 15:10:53 +01:00
JC
983cec659b Adding dossiers suivis modifiés to tease informations about new notifications for gestionnaire 2017-01-02 14:39:27 +01:00
JC
dc0d206d88 Changing dossier en cours, for dossiers suivis, in dossier index 2017-01-02 14:17:30 +01:00
JC
b9e2c52c0b Removed left pannel information about notifications in index 2017-01-02 14:16:05 +01:00
JC
57d8b4b242 Centered buttons for receveid dossiers 2017-01-02 14:10:45 +01:00
JC
c2e8f7ba31 Fix case for submitted dossiers, notification font awsome 2017-01-02 14:06:51 +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
3ad0d1e9cd Add css for received dossier, show up to gestionnaire 3 buttons green, orange, red to switch dossier in final states 2017-01-02 11:24:21 +01:00
JC
c4f231d04e Layout for dossier show/index notifications fa (icon) 2017-01-02 10:51:12 +01:00
Xavier J
4a1a23d1d7 Add per page link for smart listing User, Admin and Accompagnateur for follow files 2017-01-02 10:48:47 +01:00
JC
e131442084 Adding fa to notfications types in dossier show 2017-01-02 10:36:32 +01:00
Xavier J
bfe9211f03 Change size wysihtml5 box 2017-01-02 10:34:31 +01:00
Xavier J
b929190cf5 Disabled Client JS Action Cable 2017-01-02 10:25:47 +01:00
Xavier J
2bf0cc907b Add alert for bad connexion with unified connexion 2017-01-02 09:38:49 +01:00
Xavier J
39bab7ac6f Changer render ‘show’ for redirect_to 2017-01-02 09:34:28 +01:00
JC
aa2d2ad924 No notification message, when gestionnaire on index 2016-12-28 12:20:34 +01:00
JC
77e30e233c margin action block in left pannel 2016-12-28 12:10:27 +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
Xavier J
12edb06a02 Merge branch 'notifications' into develop 2016-12-27 16:03:33 +01:00
Xavier J
e7b7652388 Fix some tests 2016-12-27 15:50:45 +01:00
JC
fb737df463 Both index and show have notification on there left pannels 2016-12-27 15:26:49 +01:00
Xavier J
7ee555a120 Disabled broadcasting 2016-12-27 15:05:19 +01:00
Xavier J
c01132c788 Delete old attr in database 2016-12-27 11:57:34 +01:00
Xavier J
4d765d3b46 Past all notification to read when gestionnaire is on back office dossier show 2016-12-27 11:23:19 +01:00
JC
cea14845d2 Start backoffice dossier index menu, enable switch between procedures and notifications in left-pannel 2016-12-27 11:15:24 +01:00
Xavier J
e37012dce6 Add badge for new files in procedure list for gestionnaire 2016-12-27 11:06:09 +01:00
Xavier J
2e13cb6818 Get gestionnaire unread notifications for his follows files 2016-12-27 10:57:21 +01:00
Xavier J
ce5bf8d622 Initialize fonction « unread_notifications » in DossierListFacade 2016-12-27 10:47:23 +01:00
Xavier J
4e6adf5bc3 Fix some tests 2016-12-26 18:37:27 +01:00
JC
9788118229 Adapt listing for notifications, according champ or pieces 2016-12-26 17:59:08 +01:00
JC
f0d0bfc427 Listing updated champs, saving only champs changed 2016-12-26 17:55:31 +01:00
JC
45d5177d52 Prepend notification message for champs and piece_justificative 2016-12-26 17:36:12 +01:00
Xavier J
153c472ef6 Add notifications into procedure list on back office report 2016-12-26 17:25:59 +01:00
JC
02ce392ff3 No notifications result in displayed message 2016-12-26 17:24:40 +01:00
JC
42915979da Notifications are shown in backoffice dossier show, limit 5 2016-12-26 17:18:45 +01:00
Xavier J
48451553b9 Change invites autorisation in commentaire model 2016-12-26 14:45:42 +01:00
Xavier J
9a0a391c40 Exclude notification for dossier state draft and for accompagnateur comments 2016-12-26 14:38:00 +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
33362d1a52 Add notification for submitted state 2016-12-26 11:57:08 +01:00
Xavier J
33c1a12b84 Add notification for champs 2016-12-26 11:47:51 +01:00
Xavier J
e5768b6798 Add notification for piece justificative 2016-12-26 11:42:02 +01:00
Xavier J
6ed91073c4 Add notification for cerfa 2016-12-26 11:33:12 +01:00
Xavier J
5eaa2941ad Move commentaire creation to model 2016-12-26 11:08:53 +01:00
JC
4c9c898a69 Feature test about clonning procedures 2016-12-26 10:56:57 +01:00
Xavier J
263d85ccee Merge branch 'develop' into notifications
# Conflicts:
#	app/views/backoffice/dossiers/_list.html.haml
2016-12-26 10:53:05 +01:00
Xavier J
31653ff553 Add everywhere col-sm-X and col-xs-X 2016-12-23 16:58:06 +01:00
JC
2908460c16 Feature test for gestionnaire, index and show (only filtering not tested) 2016-12-23 14:46:50 +01:00
Xavier J
c533bb0a88 TEST : First implementation of notification with Action Cable : alert message 2016-12-22 22:27:02 +01:00
Xavier J
f98bb90f08 Bootstrap Action Cable and Unicorn 2016-12-22 21:49:31 +01:00
Xavier J
07495ff9ba Ajust UI for notifications 2016-12-22 21:25:55 +01:00
Xavier J
54fbe367c0 Add notifications when user post a comment 2016-12-22 20:40:23 +01:00
Xavier J
ce5b75a0b9 Merge branch 'develop' into notifications 2016-12-22 12:25:30 +01:00
Xavier J
e25ae6dea0 Fix CSS 2016-12-22 12:24:59 +01:00
Xavier J
044d258c69 Merge branch 'develop' into notifications 2016-12-22 11:59:34 +01:00
Xavier J
02fd5a2939 Fix tests 2016-12-22 11:55:24 +01:00
Xavier J
9eb6ed3a7c Add champs private in procédure information page 2016-12-22 11:50:03 +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
727c263f72 - Fix bug prévisualisation header
- Fix bug header section visualization
2016-12-22 10:36:18 +01:00
Xavier J
a681564b39 Add notification table and model 2016-12-21 17:26:31 +01:00
Xavier J
b952b0239c Update landing page 2016-12-21 15:54:23 +01:00
Xavier J
78bba67995 Fix bug who does not saved Individual information 2016-12-21 15:39:41 +01:00
Xavier J
626e42b067 Fix search animation 2016-12-21 14:36:49 +01:00
Xavier J
e98fc64bcb Fix display bug with scrollbar into UI 2016-12-21 14:00:50 +01:00
Xavier J
20a4febecc Adapt UI list for procedure list in admin interface. 2016-12-21 11:26:33 +01:00
Xavier J
decde2ee6c Fix bug publish procedure with same path 2016-12-21 11:00:05 +01:00
JC
646fc37daf Adding feature tests for Accompagnateur, continue on page features, then on dossier show 2016-12-20 17:26:54 +01:00
Xavier J
90804c8a33 Add tests for individual information saving but TEST FAILED 2016-12-20 17:02:36 +01:00
Xavier J
927d977541 Add tests and validator for individual model. 2016-12-20 17:01:16 +01:00
Xavier J
e258118825 Reactive cartographie 2016-12-20 14:48:09 +01:00
Xavier J
83444ab54c Catch error 500 for quartier prioritaire 2016-12-20 12:27:53 +01:00
JC
39a023b3e2 Features tests about user: index of dossiers, sorting and using pagination 2016-12-20 11:58:29 +01:00
Xavier J
d67d32e3c2 Fix bug get_position when établissement is nil 2016-12-20 11:35:16 +01:00
Xavier J
addeaab744 Review UI procedure construction for Administrateur 2016-12-19 19:07:57 +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
f1ae1d8dea Change render « show » by redirect_to backoffice_dossier_path(id) in dossier controller POST action 2016-12-19 17:11:26 +01:00
Xavier J
d4790f8277 Fix root controller bugs 2016-12-19 16:54:41 +01:00
Xavier J
0563ae1090 Fix CSS for default data block Infos 2016-12-19 16:31:18 +01:00
Xavier J
80c9165f08 Delete death code Model/Dossier 2016-12-19 16:02:35 +01:00
Xavier J
907ac0f56c Delete death code 2016-12-19 15:55:11 +01:00
Xavier J
2fccbbf4f0 Delete un-use code 2016-12-19 15:08:00 +01:00
Xavier J
5791206a45 Delete old code 2016-12-19 14:27:50 +01:00
Xavier J
ee82e7fa8a Add ProcedureController tests 2016-12-16 17:15:13 +01:00
Xavier J
33bfe4a29c Delete un-use code 2016-12-16 14:40:41 +01:00
Xavier J
f627957869 Add ChampDecorator tests 2016-12-16 14:40:20 +01:00
Xavier J
e85cb4c24b Delete features unified_login 2016-12-16 14:39:17 +01:00
Xavier J
d9dfff3b6a Refacto invite dossier facades 2016-12-16 14:09:05 +01:00
Xavier J
f21f151c9c Add test for GeoAPI driver lib 2016-12-16 10:42:34 +01:00
Xavier J
fb16d4582d Delete un-user code in DossierDecorator 2016-12-16 09:43:59 +01:00
Xavier J
3c11bef503 Delete un-use code DossiersDecorator 2016-12-16 09:39:21 +01:00
Xavier J
02ec901777 Add CommentaireDecorator test 2016-12-16 09:38:43 +01:00
Xavier J
4de9ce4ac2 Delete devise User unused controller 2016-12-15 15:39:18 +01:00
Xavier J
0a1a5613db Add tests for administration controller 2016-12-15 15:09:50 +01:00
Xavier J
bc4e3860be Fix all tests 2016-12-14 18:41:33 +01:00
JC
4f7bcba8a3 Adding feature test for procedure_creation 2016-12-14 17:15:10 +01:00
JC
22a59123c1 Adding launchy to put save_and_open_page in capybara specs, fixing many red tests by removing/changing expectations according to new UI. Need to pursue on spec/features/backoffice/flux_de_commentaires_spec.rb (not priority), and spec/controllers/root_controller_spec.rb (unkonw) 2016-12-13 16:11:11 +01:00
Xavier J
dff90d2cf7 Merge branch 'develop' into develop_v2 2016-12-13 14:26:00 +01:00
Xavier J
ec83b397f7 Fix bug invite downcase 2016-12-13 14:22:54 +01:00
Xavier J
7bf58388fa Update landing page 2016-12-07 18:08:06 +01:00
Xavier J
414a701b03 Dynamic switch button (User, Gestionnaire, Administrateur) 2016-12-07 18:00:27 +01:00
JC
e228f20684 Adding white back to some views 2016-12-07 17:55:42 +01:00
Xavier J
72ebacf3cc Remove admin connection link on user connection page 2016-12-07 17:38:19 +01:00
Xavier J
1c2b2010d1 Synchronised password when user or gestionnaire change this 2016-12-07 17:35:45 +01:00
Xavier J
7cb2e80a3d Sync credentials between user, gestionnaire and administrateur account 2016-12-07 17:24:01 +01:00
Xavier J
d282d7bbea Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-12-07 17:03:45 +01:00
Xavier J
715f086957 Can connect admin with user session path 2016-12-07 17:03:36 +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
JC
5915a2b7d5 Delete pop menu for sign_out, also count dossiers on user side 2016-12-07 16:27:43 +01:00
Xavier J
3153eeaf01 Fix bug empty 2016-12-07 15:53:26 +01:00
Xavier J
6f731f700f Fix description view for champs and private champs 2016-12-07 15:44:28 +01:00
JC
16bdd1666b Fix display in projet-name 2016-12-07 15:19:49 +01:00
JC
6f019f9a0f Time to launch on staging 2016-12-07 14:44:10 +01:00
Xavier J
dc8e936ee5 Landing page TPS V2 progression 2016-12-07 14:39:06 +01:00
JC
5c93920f74 Mutualize all informations in dossier_show partial, now work on css 2016-12-07 13:58:00 +01:00
Xavier J
746d69796e Remove has-error class on admin views 2016-12-07 11:51:26 +01:00
JC
004e8de3f9 Ok, big css work now 2016-12-06 16:29:52 +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
9bf475e1f3 Creating test environnement with new procedure showing each stage, I'll rework each screen till end of new user process 2016-12-06 13:24:39 +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
Xavier J
30d5323d7e New UI for description dossier in user view 2016-12-05 19:30:58 +01:00
Xavier J
9f4e4a6b65 New UI for procédure list on admin view 2016-12-05 18:11:18 +01:00
Xavier J
04e01981e8 Fix authorized routes on show dossier 2016-12-05 17:37:13 +01:00
Xavier J
4c2dd0ede1 Fix out of ranch error on search 2016-12-05 16:57:40 +01:00
JC
461fe22a91 Fixing css on left_pannel for centering infos 2016-12-05 16:37:18 +01:00
JC
0451ae0540 Using css truncation with overflow: hidden; 2016-12-05 16:33:09 +01:00
JC
1449a1dc19 Reworked en-cours css for dossiers#index user side, counting exact 'en cours' dossiers 2016-12-05 16:23:13 +01:00
Xavier J
cc532f74f9 Fix redirection routes for gestionnaires and users with double devise profile 2016-12-05 16:17:24 +01:00