Commit graph

1073 commits

Author SHA1 Message Date
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
JC
bdd51ce02b Increased font-size for dossier id, user's dossiers#show 2016-12-05 16:11:36 +01:00
JC
94373094fa Adding default welcome message, default opening messages body while no commentaires 2016-12-05 16:01:13 +01:00
JC
c03de66137 Extract dynamics involved constant to fit with utils in fr/en 2016-12-05 15:30:21 +01:00
JC
17e5800487 Add feature flag OpenSimplif for comments per field 2016-12-05 15:24:07 +01:00
JC
5556775ee9 Adding right caret class to navbar options for right pannel modal, also changing callback from hover sign_out, to use mouseover instead 2016-12-05 15:14:39 +01:00
JC
df36b9bd35 Removing 'INDIVIDU' from entreprise default block, from both gestionnaire/user dossiers#show 2016-12-05 15:04:42 +01:00
JC
2e9de46a1c Fix js for sign_out hover displaying credentials, add hidden to tips div into left_pannel dossiers#show 2016-12-05 14:53:22 +01:00
JC
271ce62476 Adding logout information for sign_out hover, changing colors for links 2016-12-05 14:45:00 +01:00
JC
b698046e1e Adding layout for credentials, this dropdown is shown when you pass hover sign_out button. It display email informations about the current gestionnaire/user 2016-12-05 14:06:43 +01:00
Xavier J
92e8740ee3 New CGU left panel 2016-12-05 11:45:30 +01:00
JC
52631a39de Adding fixed-right css class for close btn on right pan (from dossiers#index, the cool one, for field selection) 2016-12-05 11:34:56 +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
bcc4c01b39 Expand search bar when clicked 2016-12-02 19:05:29 +01:00
Xavier J
1a3e23c6ef Change place lib repository 2016-12-02 17:03:52 +01:00
JC
27cc62ea1e Working on dossiers#show recapitulatif for users 2016-12-02 16:33:36 +01:00
Xavier J
0c90c2c122 Add unsupport navigator banner 2016-12-02 16:04:23 +01:00
JC
6b1c7b15ee Starting with dossiers#show as User 2016-12-02 12:06:01 +01:00
Xavier J
e4f63f366e Fix syntax 2016-12-02 12:00:22 +01:00
JC
4717d72dde Using active css class to display which procedure is selected on dossiers#index 2016-12-02 11:25:09 +01:00
JC
62f64d2bea Working on dossiers#show 2016-12-02 10:39:28 +01:00
Xavier J
418b5faa52 New user tableau de bord UI 2016-12-01 19:43:56 +01:00
Xavier J
d1bb453d0d Remove state :draft in all state list 2016-12-01 19:18:15 +01:00
Xavier J
ef5a005b35 Add switch button if devise account have user and gestionnaire role. 2016-12-01 18:35:51 +01:00
Xavier J
f96b87122b Fix controller spec 2016-12-01 18:05:49 +01:00
Xavier J
d2a221ee40 Fix admin log out navbar style 2016-12-01 13:21:56 +01:00
Xavier J
bca0292fc4 Connexion and sign out user navbar style 2016-12-01 13:01:00 +01:00
Xavier J
b779c71cb6 Gestionnaire sign out css 2016-12-01 12:37:56 +01:00
Xavier J
5c61733199 Display left panel only if layout file exist 2016-12-01 12:19:22 +01:00
Xavier J
0da13454f7 Merge branch 'develop' into develop_v2 2016-12-01 11:06:54 +01:00
Xavier J
5ab277dda9 Fix dropdown list partial render 2016-12-01 10:59:42 +01:00
Xavier J
c682387a39 First change connexion navbar 2016-12-01 10:54:25 +01:00
JC
4048855aa3 expand procedure list to full height 2016-11-30 13:42:19 +01:00
JC
aaf5273b12 Style on procedure elements 2016-11-30 13:36:44 +01:00
JC
06ee5726ed Fixing css on split-hr-left 2016-11-30 11:22:29 +01:00
Xavier J
ea18a6f7dd Ajust global css 2016-11-30 11:04:50 +01:00
JC
409ce10c65 Adding tips to left pannel for dossiers#show 2016-11-29 16:39:06 +01:00
JC
53f4c52435 Have limited display height for messages on dossiers#show 2016-11-29 16:26:06 +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
f823c8b748 marge and height upon search global input 2016-11-29 14:50:44 +01:00
JC
3772fee85f Dossier content displayed by default on dossiers#show 2016-11-29 14:46:09 +01:00
Xavier J
dddb8c193d mini fix css 2016-11-29 11:56:00 +01:00
Xavier J
1a90ed3fa3 Search input only for gestionnaire 2016-11-29 11:49:40 +01:00
Xavier J
2c96f15e93 Display search input on all pages 2016-11-29 11:45:30 +01:00
Xavier J
752ae24c9f New search UX 2016-11-29 09:56:11 +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
JC
fda8cac51c Finished navbar for dossiers#show, need body: construct dossier 2016-11-28 15:56:38 +01:00
JC
ceff884751 Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-11-28 15:22:11 +01:00
JC
cb5b6651d5 Working on navbar 2016-11-28 15:22:00 +01:00
Xavier J
b4fc5a6019 Fix filter popup place 2016-11-28 15:21:16 +01:00
Xavier J
fbfbe68295 Adapt JS smart listing 2016-11-28 14:43:46 +01:00
Xavier J
178f0f88c1 - Delete page « Tous les dossiers »
- Fix follow tab
2016-11-28 14:38:33 +01:00
Xavier J
f4b483976c Add default navbar and left panel 2016-11-28 10:15:11 +01:00
JC
74809b33ce Keep working on dossier Show, need actions to be in navbar, adjust flash messages too, then construct dossier 2016-11-25 16:25:54 +01:00
JC
ecb551e18d Prevent further clicks on submit buttons 2016-11-25 15:29:09 +01:00
JC
f978455642 Add commentaire joined files (pieces justificatives) direct into messages block 2016-11-25 15:01:03 +01:00
JC
d974040540 Starting left_pannel and navbar for dossiers show 2016-11-25 12:53:37 +01:00
Xavier J
e17c592ab4 Merge branch 'develop' into develop_v2 2016-11-25 12:48:14 +01:00
JC
87a8b68b36 Finished basic commentaire/messages block for dossiers show 2016-11-25 12:20:08 +01:00
Xavier J
8cc6229606 Change max-size for CERFA and PJ 2016-11-25 12:07:01 +01:00
JC
cab4e257cd Add new-action button to toggle default_block for messages 2016-11-25 11:25:33 +01:00
JC
1172987d8a Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-11-25 11:09:08 +01:00
JC
e6a01e9212 Got last message showed upon messages, adding condition to toggle out this last message on lick 2016-11-25 11:08:58 +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
JC
1c1942063b Counting messages 2016-11-25 10:11:11 +01:00
Xavier J
58df3c3a75 - Continue development Tableau de bord
- Optimize toggle block
2016-11-24 19:33:34 +01:00
JC
09fb3d4634 Pursuie over body animation with carets 2016-11-23 17:30:55 +01:00
JC
0b7020e065 Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-11-23 16:17:45 +01:00
JC
df794b9c89 Ok accordeon javascript upon header lines 2016-11-23 16:17:29 +01:00
JC
570b22c60f Add google_analytics partial in layout 2016-11-23 16:15:00 +01:00
Xavier J
d09a47ae23 First iteration navbar tableau de bord 2016-11-23 15:21:42 +01:00
JC
e35c1f8757 Up limit for export form 200 to 400 2016-11-23 11:31:00 +01:00
JC
37b5e3fc48 Up limit for export form 200 to 400 2016-11-23 11:29:56 +01:00
JC
966febca68 Centering show-block, need to merge css into develop°v2 2016-11-23 11:26:05 +01:00
JC
de9753ae69 Need to anime accordeon, and check if width + margin % is the solution 2016-11-23 10:59:48 +01:00
JC
750d81e70b Working on css for dossier#show body 2016-11-22 17:32:00 +01:00
JC
c5e0f0a780 Extract css for sign_in sign_out from navbar 2016-11-22 16:32:50 +01:00
JC
5ba1c85ca7 Change spec according to layout rendering service 2016-11-22 16:30:35 +01:00
JC
5b61d41030 layouts for dossiers show 2016-11-22 16:10:01 +01:00
JC
4f9bcdd225 Awsome struct to share layouts between controllers and there methods 2016-11-22 16:03:32 +01:00
Xavier J
7faf1705da Add service RenderPartial 2016-11-22 15:17:37 +01:00
JC
55eb8397d2 Fixing footer and push left to center on after wrap 2016-11-22 11:33:08 +01:00
JC
3627a18420 Set navbar options from before_action 2016-11-21 17:30:28 +01:00
JC
e9eeb0b4ba Sacrifice 1 bootstrap col unit to get disconnect preview (under ruban) 2016-11-21 16:57:42 +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
JC
2d355bd6a0 Working on left-pannel, include footer after main-container 2016-11-21 16:13:19 +01:00
JC
23ef3e896a Done with navbar 2016-11-21 15:31:03 +01:00
JC
0db63f33c0 Working on navbar, will put fake content to get css sizes 2016-11-21 15:04:16 +01:00
JC
b62587f9ab Split footer and flash messages in layouts 2016-11-21 14:19:15 +01:00
JC
f5ec476416 New application layout struct for pages 2016-11-21 14:12:59 +01:00
JC
200a99dbae Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-11-21 10:54:01 +01:00
JC
1fe76b8c3b Add google_analytics partial in layout 2016-11-21 10:53:50 +01:00
Xavier J
e95ba6b56c Merge branch 'develop' into develop_v2 2016-11-21 10:50:25 +01:00
XjulI1
46fa28322e Merge pull request #7 from sgmap/fix-backoffice-search-dossier-by-id
Fix: search dossier by id (backoffice)
2016-11-21 10:40:38 +01:00
Julien Portalier
426fd55f30 Fix: search dossier by id (backoffice) 2016-11-17 19:18:24 +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
Xavier J
8f012e3731 Add analytics 2016-11-17 12:30:39 +01:00
Xavier J
b4b2dafc7b Add reply_to for invite mailer 2016-11-17 12:17:59 +01:00
Xavier J
6e4ddcdbcf Fix test 2016-11-17 11:24:49 +01:00
Xavier J
d144047a50 Fix export data dossiers 2016-11-17 11:13:11 +01:00
XjulI1
926ae9d805 Merge pull request #6 from sgmap/per-champs-comment-flow
Flux de commentaires par champs
2016-11-17 10:52:18 +01:00
Xavier J
893bfaef40 Fix JS 2016-11-17 10:50:28 +01:00
Julien Portalier
8195a57f9c Fix: distinction des commentaires par champ
Les commentaires par champ sont distincts des commentaires généraux
(non attachés à un champ). Ils ne faut donc pas les afficher dans
les commentaires sous le récapitulatif du dossier.
2016-11-16 16:23:43 +01:00