Commit graph

1464 commits

Author SHA1 Message Date
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
f5f5ef1a0d Badge count invites by dossiers 2017-01-12 17:02:30 +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
bc71754e87 Add tool change dossier state 2017-01-10 17:29:38 +01:00
Xavier J
12af46a22a Fix invite dossier validated recapitulative show 2017-01-10 15:04:13 +01:00
Xavier J
23df8a2348 - Ajust TPS for OpenSimplif
- Create /simplifcations routes for OpenSimplifController
2017-01-09 17:12:11 +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
99e6749c96 Fix invite to access a files 2017-01-04 18:03:03 +01:00
Xavier J
6f31a4d7b7 Fix logo TPS with 2017-01-03 14:53:56 +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
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
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
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
Xavier J
12edb06a02 Merge branch 'notifications' into develop 2016-12-27 16:03:33 +01:00
JC
fb737df463 Both index and show have notification on there left pannels 2016-12-27 15:26:49 +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
ce5bf8d622 Initialize fonction « unread_notifications » in DossierListFacade 2016-12-27 10:47:23 +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
JC
a727c5146f Cannot have the right feature test about invites, both side User and Gestionnaire 2016-12-26 14:16:08 +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
044d258c69 Merge branch 'develop' into notifications 2016-12-22 11:59:34 +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
20a4febecc Adapt UI list for procedure list in admin interface. 2016-12-21 11:26:33 +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
e258118825 Reactive cartographie 2016-12-20 14:48:09 +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
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
0563ae1090 Fix CSS for default data block Infos 2016-12-19 16:31:18 +01:00
Xavier J
33bfe4a29c Delete un-use code 2016-12-16 14:40:41 +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
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
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
4c2dd0ede1 Fix out of ranch error on search 2016-12-05 16:57:40 +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
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
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
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
ef5a005b35 Add switch button if devise account have user and gestionnaire role. 2016-12-01 18:35:51 +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
3772fee85f Dossier content displayed by default on dossiers#show 2016-11-29 14:46:09 +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
JC
87a8b68b36 Finished basic commentaire/messages block for dossiers show 2016-11-25 12:20:08 +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
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
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
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
1fe76b8c3b Add google_analytics partial in layout 2016-11-21 10:53:50 +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
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
JC
c557038c38 Adding tooltip for dossiers export amount excess (200) 2016-11-16 11:12:04 +01:00
Julien Portalier
96ca5113f7 Flux de commentaires par champs 2016-11-15 18:36:20 +01:00
JC
23b928f160 Adding limit (200) for dossier exportation 2016-11-15 17:06:40 +01:00
Xavier J
6a261d125a New color for navbar 2016-11-15 14:10:43 +01:00
JC
0ac3c5fc86 Merging develop branch updated 2016-11-15 10:46:33 +01:00
Xavier J
d7fdf22abb First fixed 2016-11-14 17:33:45 +01:00
Xavier J
ec53f64a64 Fix bug tag received mailer 2016-11-14 11:03:17 +01:00
Xavier J
ec4b634f8a Change onglet presentation for gestionnaire. 2016-11-10 15:57:14 +01:00
JC
973570332f Implemented custom method to catch procedure_id while rendering data on each request format 2016-11-09 09:19:57 +01:00
Xavier J
9c863c7bff Fix bug go to dossier list tableau de bord 2016-11-08 19:03:21 +01:00
JC
23ee1cb21c Adding style for download link as dropdown menu, changing locales 2016-11-08 15:28:39 +01:00
XjulI1
9b9e2be8d8 Merge pull request #4 from sgmap/postgresql-full-text-search-2
PostgreSQL full text search
2016-11-08 15:17:57 +01:00
Xavier J
b44da7b43d Fix tests 2016-11-08 15:13:40 +01:00
Xavier J
f2a5d582b8 Change UX on dossier list (user and backoffice) to go on recap dossier. 2016-11-08 14:08:16 +01:00
JC
8dda0d3fb1 Okay... Add some conversion method to catch .ods write of number and boolean values -> as strings, passing on initial test for as_csv method 2016-11-08 11:48:36 +01:00
Xavier J
eb64e04aba Dynamic Page title 2016-11-08 10:57:15 +01:00
JC
fa767ad56f Config using default Serializers to generate both CSV and XLSX files from Dossier records, problem with ODS in gem -> github issue openned 2016-11-07 17:23:58 +01:00
Xavier J
5284df5ce0 Add page « Procédure terminée » 2016-11-07 17:08:33 +01:00
JC
20cab702f6 Merge remote-tracking branch 'origin/erase_params_filter' into click_outside_close_pan 2016-11-07 12:35:33 +01:00
JC
83ad08622f Adding js that check oustide click from div, adding rescue LOGO_NAME causing 500 2016-11-07 11:32:51 +01:00
JC
926d705806 Added js and button, only flushing input value from parent form 2016-11-07 10:30:45 +01:00
Julien Portalier
31272cf0f5 Fix: rebased off the develop branch (not master)
Remove textacular gem, drop `db/structure.sql` (no special indices)
and regenerates `db/schema.rb`
2016-11-04 17:14:09 +01:00
Xavier J
a08ded5322 Fix logo image_url 2016-11-03 17:29:59 +01:00
Xavier J
e10c218d3a Add dynamic logo (opensimplif) 2016-11-03 17:20:56 +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
b1788ef481 Fix apparition description on engagement champ 2016-10-28 12:14:26 +02:00
Xavier J
28811a0bda Change "En construction" state description. 2016-10-27 17:10:23 +02:00
Xavier J
a73339b12a Up max size for cerfa and PJ 2016-10-27 17:00:59 +02:00
Xavier J
88233b716c Fix smartlisting search back office 2016-10-27 14:25:08 +02: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
JC
c6f5a8b62d Adding button, method in controller, testing call 2016-10-25 17:39:53 +02:00
Xavier J
e1d70f4e4a Change count on administrations page 2016-10-25 12:11:11 +02:00
Xavier J
7674eb23f0 Add informations on administrations view 2016-10-25 12:02:51 +02:00
Xavier J
740b3650aa Restore select procedure for gestionnaire (opensimplif) 2016-10-24 16:00:03 +02:00
Xavier J
6c00b652e8 Disable state description (opensimplif) 2016-10-24 14:56:01 +02:00
Xavier J
a5ab7af0f8 Add private champs in tab preference list 2016-10-20 17:14:38 +02:00
Xavier J
a7166d306f Delete tab Nouveau A traiter and En cours d'étude for User and replace this only one call En construction 2016-10-19 17:25:24 +02:00
Xavier J
a781473b42 By default, mask all section in user form expect the first 2016-10-19 14:35:42 +02:00
Xavier J
6f40424979 Change wording "Valider le dossier" to "Déclarer complet" 2016-10-19 11:23:34 +02:00
Xavier J
de07d4437c adapt validated email for user 2016-10-19 10:51:40 +02:00
Julien Portalier
101bd68252 Add opensimplif feature flip to hide user/gestionnaire tabs 2016-10-18 15:52:14 +02:00
Julien Portalier
86e6dd0233 Hide gestionnaire login link (unified login) 2016-10-18 15:52:14 +02:00
Julien Portalier
7b9b236962 Add dossiers/mes dossiers in navbar 2016-10-18 14:25:16 +02:00
Xavier J
49e4d6a9d3 Gestionnaire can be filter on the specifics fields of the form when is on the folder list. 2016-10-14 12:02:39 +02:00
Xavier J
f1515616ff Add 3 new type de champs : Pays, Régions et Départements 2016-10-12 17:22:56 +02:00
Xavier J
7425a0be59 Disable publication (on UI) if procedure does not have gestionnaire 2016-10-12 14:35:39 +02:00
Xavier J
3c400da89d Add individual information on resume page for gestionnaire 2016-10-12 14:21:54 +02:00
Xavier J
e7637efc06 User can see enterprise informations in his resume view 2016-10-12 12:01:58 +02:00
Xavier J
1696d0a159 Possibilité d'afficher ou non une section pour un utilisateur. 2016-10-12 11:54:17 +02:00
Xavier J
8409b660cf Ordered piece justificative 2016-10-07 15:16:03 +02:00
Xavier J
ac971a805e Adapt search function at the PreferenceListDossier table 2016-10-07 14:58:45 +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
fd6b1f15a0 Purge all dossier with state draft 2016-10-05 17:12:45 +02:00
Xavier J
71de64e3ec User can save a draft dossier who does not see by the accompagnateur 2016-10-05 16:45:51 +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
aa3b1e974d Can create procédure individual with SIRET for later 2016-10-05 10:48:11 +02:00
Xavier J
52249f92b5 Add filter on gestionnaire dossier list 2016-10-04 19:19:03 +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
60ff939089 Fix bug select options blank 2016-10-03 12:43:05 +02:00
Xavier J
5f8c2549c1 delete max length on email procedure transfert 2016-10-03 12:25:07 +02:00
Xavier J
b3d454a53b Smart listing sorting is saved on dossier list 2016-09-27 17:26:49 +02:00
Xavier J
0f1236aa7a Fix test 2016-09-26 14:11:57 +02:00
Xavier J
ee9c38c0f8 Keep procedure filter when gestionnaire select on 2016-09-26 13:58:54 +02:00
Xavier J
9332c0f6ed Fix brakeman test 2016-09-16 16:29:34 +02:00
Xavier J
3014c4c539 Change word "Instruction" to "Examen" 2016-09-14 16:57:51 +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
f6ab83f8bd gestionnaire can be filter be procedure on dossier list tab 2016-09-09 17:29:21 +02:00
Xavier J
955c984a88 Gestionnaire can add specific attr on dossier list by procedure 2016-09-09 15:05:46 +02:00
Xavier J
62a0b84048 Filter by procedure is activated on route /backoffice/dossiers/procedure/:id 2016-09-08 16:21:54 +02:00
Xavier J
bb19982011 Change onglet url to dynamic gestion 2016-09-06 14:07:07 +02:00
Xavier J
d5ad256919 create route and controller to filter dossier view by procedure 2016-09-06 11:07:26 +02:00
Xavier J
a48299353e Fix html interpretation in ReceivedMail 2016-09-01 11:00:06 +02:00
Xavier J
f03733f3ff Mail for receive dossier is now send. 2016-09-01 10:27:22 +02:00
Xavier J
12ebab66cc Administrateur can be param the acknowledgement of delivery mail object and body. 2016-08-31 16:07:11 +02:00
Xavier J
d438e9a329 Ajust landing page 2016-08-30 14:14:18 +02:00
Xavier J
16c1fe31c1 Update CGU 2016-08-30 13:29:40 +02:00
Xavier J
f07606a373 IE 9 alert 2016-08-30 11:42:33 +02:00
Xavier J
a69433e8de User can be begin without SIRET 2016-08-30 11:18:43 +02:00
Xavier J
ed8da1552c Admin can be declare a procedure for individual people (no SIRET) 2016-08-29 12:07:30 +02:00
Xavier J
0eb2acb959 CGU 2016-08-29 11:02:02 +02:00
Xavier J
a179c372cf Ajust text 2016-08-26 09:17:31 +02:00
Guillaume Lazzara
db511b15a8 Fix typos in notification emails 2016-08-25 18:03:05 +02:00
Guillaume Lazzara
fc99dc65d6 Send notification emails when a dossier is closed. 2016-08-25 18:02:56 +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
e4cf25b677 Download all gestionnaire dossier with a button 2016-08-25 12:30:15 +02:00
Guillaume Lazzara
39df032c8c Translate type de champ values 2016-08-24 17:07:13 +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
5b0e01f117 delete filter procedure for gestionnaire 2016-08-22 16:36:25 +02:00
Xavier J
b661a2eb38 Updated test for new user status UI 2016-08-22 16:10:48 +02:00
Xavier J
19ee3af273 Ajusté warning staging text 2016-08-22 14:15:21 +02:00
Xavier J
7140d79f64 Warning platform staging 2016-08-22 14:00:34 +02:00
Xavier J
6adfcac5bf Add new state on User UI.
/!/ WARNING : No tests fix
2016-08-12 13:56:10 +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
85e7af840a Add drop down list on type champ list 2016-08-09 16:21:39 +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
480431ea01 Add on gestionnaire dossier view the private form 2016-08-08 12:52:30 +02:00
Xavier J
ddb64878c8 Refactor code for private type de champ 2016-08-04 12:06:46 +02:00
Xavier J
116dd0d94f Administrateur can be define private champs => same as typical champs 2016-08-03 18:19:56 +02:00
Xavier J
bce1b96fee Build default pref list dossier for new gestionnaire 2016-08-02 14:49:41 +02:00
Xavier J
a37320bae9 Add lateral panel to configure dossier list in back office 2016-08-01 18:10:32 +02:00
Xavier J
f6d3e2d780 Fix test welcome mailer 2016-07-26 15:05:24 +02:00
Xavier J
35a9d78d48 Fix bug welcome mailer 2016-07-26 14:23:39 +02:00
Xavier J
4e6d153893 Fix test 2016-07-22 12:25:23 +02:00
Xavier J
2ad816b6b3 Admin can be transfer a clone of a procédure at an other admin 2016-07-22 11:34:34 +02:00
Xavier J
e7830deefa Add header section on procédure champ 2016-07-20 11:38:19 +02:00
Xavier J
6796ec26e8 Add suivi tab for gestionnaire 2016-07-19 17:18:41 +02:00
Xavier J
127c9bb138 Add total followers on dossier list and followers list on dossier page for gestionnaire 2016-07-19 16:44: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
d26ae9539d An accompagnateur can be mark a dossier follow by us 2016-07-18 18:24:29 +02:00
Xavier J
5ba88aa31a Fix address type search 2016-07-18 11:23:03 +02:00
Xavier J
382c8d8700 Add minim preparation for dossier uniq page 2016-07-18 09:37:22 +02:00
Xavier J
23e582d597 Add type_de_champ yes/no 2016-07-12 15:25:26 +02:00
Guillaume Lazzara
e1f73f3bdc Fix path to procedure logo 2016-07-05 11:50:56 +02:00
Xavier J
721ea424ed Merge branch 'develop' of github.com:sgmap/tps into develop
# Conflicts:
#	app/views/admin/procedures/_modal_publish.html.haml
2016-06-30 14:17:33 +02:00
Xavier J
09c9d5ea76 async publication procedure 2016-06-30 12:33:43 +02:00
Guillaume Lazzara
582a368107 Code review related updates 2016-06-30 10:24:20 +02:00
Guillaume Lazzara
92a5100a09 Handle "réactiver" feature with permanent procedure url 2016-06-24 16:57:35 +02:00
Guillaume Lazzara
e5002dbb11 Introduce permanent and customizable procedure url 2016-06-24 16:41:44 +02:00
Xavier J
4355d4775a Add type de champ date
Add hour and minute on UI for datetime
2016-06-22 11:25:41 +02:00
Xavier J
1dcb29ec65 Add feature delete for draft procedure 2016-06-20 17:37:04 +02:00
Xavier J
86e26e520c Merge branches 'develop' and 'develop' of github.com:sgmap/tps into develop 2016-06-20 13:59:31 +02:00
Xavier J
cc8d2ef4ee New UI and UX for the dossier initialization 2016-06-20 13:57:57 +02:00
Guillaume Lazzara
7af7859334 Implement procedure cloning 2016-06-15 11:34:05 +02:00
Guillaume Lazzara
f58f9d27d9 Enable password reset for Gestionnaires 2016-06-14 15:36:37 +02:00
Xavier J
bbae7214c9 New UI for the map 2016-06-14 11:00:57 +02:00
Xavier J
866565495d Delete default description in dossier 2016-06-13 12:03:05 +02:00
Guillaume Lazzara
2791988da2 Add draft/publish status for procedure. 2016-06-09 17:49:48 +02:00
Xavier J
b987b86bd8 Add address input on carte view 2016-06-09 16:28:44 +02:00
Xavier J
54256b1e55 Add description champs on description page. 2016-06-09 14:18:28 +02:00
Xavier J
3c75fb27c4 Fix bug get Forbidden last version github 2016-06-09 12:23:50 +02:00
Xavier J
e72487bb28 Merge branch 'develop' of github.com:sgmap/tps into develop 2016-06-09 12:08:25 +02:00
Xavier J
23ab25396f Add type champs "Address" plug at the BAN 2016-06-09 12:08:18 +02:00
Guillaume Lazzara
1551b7ce21 Add ordering feature on piece justificative view 2016-06-08 16:45:37 +02:00
Xavier J
35a07aec87 Ajustement graphique navbar 2016-06-08 10:41:01 +02:00
Guillaume Lazzara
0314bc54dd Add 'mes procédures' link in navbar 2016-06-07 15:52:55 +02:00
Guillaume Lazzara
64d27e0088 Add 'mes dossiers' link in navbar 2016-06-07 15:16:35 +02:00
Xavier J
69f9c52b02 Preview procedure logo on edit procedure page for admin 2016-06-06 18:25:51 +02:00
Xavier J
e6b5698008 Add previsualization formulaire page for administrateur 2016-06-06 17:40:32 +02:00
Xavier J
ddeaf5abf3 Add type de champs civilite 2016-06-06 16:32:59 +02:00
Xavier J
3513b16888 Add type de champs email and phone 2016-06-06 16:17:19 +02:00
Xavier J
bb116a68dd Fix connexion view 2016-05-27 10:15:19 +02:00
Xavier J
811e771763 dynamic URL mail new assignment 2016-05-26 16:55:15 +02:00
Xavier J
92fc5af61c Admin can add new Accompagnateur directly on the procedure 2016-05-26 16:44:10 +02:00
Xavier J
4d1cb9ecfe Connexion page is contextualized with procedure title and description when is access with link. 2016-05-26 15:59:50 +02:00
Xavier J
6005dccc2b Delete Archive feature for User on his Dossier 2016-05-25 14:08:02 +02:00
Xavier J
1fcb33104d Administrateur can be assign accompagnateur on each of his procedure. 2016-05-24 16:39:39 +02:00
Xavier J
fe4d921997 Add accompagnateur tab on all procedure navbar 2016-05-20 15:36:38 +02:00
Xavier J
143a683303 Change management navbar procedure admin 2016-05-19 10:57:18 +02:00
Guillaume Lazzara
833d7790c2 Add support for remote OVH cloud storage 2016-05-13 16:08:51 +02:00
Xavier J
b15c2bbb2b New feature : User, Guest and Gestionnaire can be upload a document with theirs comments 2016-04-20 16:51:57 +02:00
Xavier J
fb2eeddf97 Revert guest can be upload new document on dossier 2016-04-19 14:08:09 +02:00
Xavier J
a8070cac6d Fix sort administrations admin list 2016-04-19 10:41:23 +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
5d13276446 Fiabilisation de la suppression des gestionnaires par un administrateur 2016-03-16 10:55:03 +01:00
Xavier J
bd61a459fb Add verification on user dossier description for champs mandatory 2016-03-15 17:17:56 +01:00
Xavier J
494f80afff Can be check TypeDeChamps with attribut mandatory 2016-03-15 11:23:25 +01:00
Xavier J
a612dc6021 Add features filter procedure for gestionnaire (not active on dossier list for now) 2016-03-14 14:23:09 +01:00
Xavier J
04c5432be1 Add libreoffice document on uploader 2016-03-14 10:22:27 +01:00
Xavier J
f4de0b8431 - Add resize on wysihtml5 bootstrap
- Add rich text on procedure description
- Ajust text on description dossier user form
2016-03-02 15:21:45 +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
Xavier J
36954c595e Add UI SuperAdmin 2016-02-23 16:51:24 +01:00
Xavier J
8021825ffe Delete docs links on landing page 2016-02-23 11:01:54 +01:00
Xavier J
be0ca863ef Update landing page 2016-02-22 15:51:07 +01:00
Xavier J
1a1a97f79c Ajust source code 2016-02-22 15:20:22 +01:00
Xavier J
c37fb9bb20 redirect to sign_up link if user 's email on invitation as no account on the platform 2016-02-22 10:34:25 +01:00
Guillaume Lazzara
973d6693e0 Demo sign-in page for administrateur 2016-02-19 17:27:14 +01:00
Guillaume Lazzara
b58f88d9bf Do not display cerfa information in dossier description 2016-02-19 16:59:39 +01:00
Guillaume Lazzara
15ac9f3f45 Code review: be more exhausitive regarding uploaded files mime type 2016-02-19 16:59:39 +01:00
Xavier J
0e1dac7d19 Fix test
Change name gestionnaire to accompagnateur on admin ui
2016-02-19 14:20:18 +01:00
Guillaume Lazzara
a643f34621 Handle upload file size limit in UI 2016-02-18 15:47:14 +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
51c145d2ce Update landing page :
- Release scrape on Github
- Add presentation video
- Add demonstration link for gestionnaire and user
2016-02-16 12:01:39 +01:00
Xavier J
419f74948a Demo sign_in page for users and gestionnaires 2016-02-15 17:13:16 +01:00
Xavier J
a20daa2ea2 Adapt print properties on Gestionnaire dossier show 2016-02-12 15:39:14 +01:00
Xavier J
61ee40aa76 test 1 2016-02-12 13:49:32 +01:00
Guillaume Lazzara
6b7d3e0ac1 Add gestionnaire deletion feature 2016-02-09 12:24:05 +01:00
Xavier J
dcd943a4b5 Add tab Invitation on user dossier index view 2016-02-09 12:23:31 +01:00
Guillaume Lazzara
b58b0de8b0 Add gestionnaire management 2016-02-09 11:01:10 +01:00
Guillaume Lazzara
2a2aef34db Add gestionnaire administration panel. 2016-02-09 11:01:10 +01:00
Xavier J
1aa5e7c397 Mask cerfa link procedure if is blank 2016-02-08 19:52:07 +01:00
Xavier J
a82899a43e Delete max length on comment area 2016-02-08 19:36:08 +01:00
Xavier J
5bb98a2863 Activation : reset user password 2016-02-08 19:32:18 +01:00
Xavier J
2b2a4c3f0a New landing page 2016-02-08 19:07:33 +01:00
Xavier J
e2a896d0b0 Gestionnaire can invite an email contact to participate at a dossier 2016-02-08 18:16:18 +01:00
Xavier J
01d71aa1cd Merge branch 'develop' into cerfa_flag 2016-02-04 11:03:49 +01:00
Xavier J
29b28557c7 fix test 2016-02-04 11:03:17 +01:00
Guillaume Lazzara
e20de3dba9 First attempt 2016-02-02 18:37:38 +01:00
Xavier J
30438df244 Add swagger-docs gem to generate ison swagger files 2016-02-02 18:11:44 +01:00
Xavier J
71adc70031 Change place of admin and gestionnaire link connexion 2016-02-01 18:28:12 +01:00
Xavier J
ec2b3b742c Upload landing page 2016-02-01 18:19:09 +01:00
Xavier J
7a61786814 Active landing page 2016-02-01 17:16:00 +01:00
Xavier J
1dd7288c70 Revert "Mask FranceConnect button on user sign in page"
This reverts commit dece5c857c.
2016-01-29 13:28:32 +01:00
Xavier J
dece5c857c Mask FranceConnect button on user sign in page 2016-01-29 11:51:19 +01:00
Xavier J
8ca2b53775 Merge branch 'franceconnect_local' into develop
# Conflicts:
#	app/assets/javascripts/application.js
2016-01-29 11:43:31 +01:00
Xavier J
eda863a7b2 Update landing page 2016-01-29 11:23:36 +01:00
Xavier J
1e3a7b1495 Start landing page 2016-01-29 10:52:06 +01:00
Xavier J
9daeafbad3 Footer 2016-01-28 17:16:37 +01:00
Xavier J
a161c1dcc4 Test to used franceconnect sources in local 2016-01-28 12:10:25 +01:00
Xavier J
4d812220fd - Add FranceConnectInformation table to make safe FranceConnect pivot identity.
- Adapt source code with the new table
2016-01-21 17:06:09 +01:00
Xavier J
d6e795df02 Activation du cadastre côté administrateur 2016-01-21 14:51:17 +01:00
Xavier J
0e496cb6ec Change include place for JS FranceConnect Kit 2016-01-20 15:50:28 +01:00
Xavier J
5beade4735 Add release link on user connexion page 2016-01-19 17:56:37 +01:00
Xavier J
a738128f4a Suppression de FCEntreprise 2016-01-19 17:40:45 +01:00
Xavier J
e8fd212d13 - Code review
- Delete Mandataires sociaux adapter
- Add function to get mandataires sociaux in Enterprise Adapter
2016-01-19 17:19:38 +01:00
Xavier J
72043dbe56 Display cadastre on map if present on database 2016-01-18 14:45:08 +01:00
Xavier J
2ce8e4734b Add get_cadastre on TPS carte page and display on leaflet map 2016-01-15 11:53:00 +01:00
Xavier J
82f6e21c86 Adapt FranceConnect Kit 2016-01-13 11:26:40 +01:00
Xavier J
312c1ee7a7 Add link for "Qu'est ce que FranceConnect?" 2016-01-12 15:03:52 +01:00
Xavier J
88ae6a74ab Fix franceconnect kit integration 2016-01-12 10:03:05 +01:00
Xavier J
110b4dc04f Fix https connection with FranceConnect kit 2016-01-11 17:45:13 +01:00
Xavier J
bbb06a235d Change Button FranceConnect Connection 2016-01-11 17:38:16 +01:00
Xavier J
5540a786db Disable FC Enterprise 2016-01-11 17:19:25 +01:00
Xavier J
a7af7e4a9f Add FranceConnect Kit 2016-01-11 17:05:21 +01:00
Xavier J
ad300319f4 Rename CERFA to Formulaire 2016-01-08 14:58:22 +01:00
Xavier J
7a2b935c04 User and Gestionnaire sort list 2016-01-08 11:39:04 +01:00
Xavier J
0d2bd17a9e Admin procedure sort list 2016-01-07 15:29:29 +01:00
Xavier J
47932890cc Add sort list on demo page 2016-01-07 11:41:03 +01:00
Xavier J
afd6d443f3 fix show information mandataire social on dossier page 2016-01-06 17:12:03 +01:00
Xavier J
7069acba4b Add détails on admin procedure informations page 2016-01-06 17:01:34 +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
4961f39a71 Add check password to connect with france connect particulier whereas a TPS account have the same email adresse 2016-01-05 12:18:00 +01:00
Xavier J
39b15e8b3d Refactor dossier decorators 2015-12-24 16:12:16 +01:00
Xavier J
9fb575ef8c Refactor procedure locked and retrieve management 2015-12-24 15:57:03 +01:00
Xavier J
e66daf3b95 Refactor procedure active and archived class 2015-12-24 15:22:07 +01:00
Xavier J
3c18882407 Create facade for dossier into user and gestionnaire views 2015-12-24 15:10:20 +01:00
Xavier J
9e0dfb593e Add FranceConnect Particulier
Reactivate FranceConnect Entreprise
2015-12-24 10:12:23 +01:00
Xavier J
c20f9a87e9 Front : Procedure can not be edited when at least one file with state other what draft is created by user 2015-12-21 14:40:28 +01:00
Xavier J
43779aafee Error 403 when admin would edit a procedure with at least one dossier 2015-12-21 12:02:53 +01:00
Xavier J
563e739958 Minor fix bug 2015-12-17 12:53:43 +01:00
Xavier J
ed8b4ff083 Add mailer submitted dossier. 2015-12-17 10:06:40 +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
Tanguy PATTE
789ea308ee Merge branch 'develop' of github.com:sgmap/tps into develop 2015-12-15 16:49:58 +01:00
Tanguy PATTE
d2978c4656 add api token in administrator's profile page 2015-12-15 16:49:48 +01:00
Xavier J
a24ff681fc - Send email when gestionnaire write a new commentaire
- Change url on mail => redirect on dossier recapitulative page
2015-12-15 15:33:21 +01:00
Xavier J
4aedf72631 Send email when user create new account 2015-12-15 15:17:12 +01:00
Xavier J
372011e4d6 NotificationMailer : dossier_validated 2015-12-15 11:41:50 +01:00
Xavier J
25937b2635 NotificationMailer : new answer 2015-12-15 11:02:07 +01:00
Xavier J
1652a747a1 Merge branch 'develop' of github.com:sgmap/tps into develop 2015-12-15 11:01:28 +01:00
Tanguy PATTE
cea90384e4 Merge branch 'develop' of github.com:sgmap/tps into develop
Conflicts:
	spec/views/users/dossiers/new_html.haml_spec.rb
2015-12-14 17:30:21 +01:00
Tanguy PATTE
cf99b30349 change banner for admin 2015-12-14 17:27:14 +01:00
Tanguy PATTE
9040d9407d add empty profile page 2015-12-14 17:25:35 +01:00
Xavier J
83871fc22f Reset password mail 2015-12-14 16:29:35 +01:00
Xavier J
a65f271a60 Add mailer Welcome 2015-12-14 16:09:20 +01:00
Xavier J
a2a5d63c0d Display RNA information on partial dossier entreprise information 2015-12-11 12:36:44 +01:00
Xavier J
d49e9fe75a admin can upload a logo for his procedure 2015-12-10 17:13:39 +01:00
Xavier J
8755ce2ab1 add euro flag to procedure object 2015-12-10 16:09:21 +01:00
Xavier J
f65c383623 Merge branch 'api_carto_dynamique' into develop 2015-12-09 11:16:28 +01:00
Xavier J
c2fbb246e7 beta tag 2015-12-08 18:34:43 +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
11596ade65 - QP not research if module_api_carto have not activated quartiers_prioritaires
- Carte page is not accessible if module_api_cart have not activated use_api_carto
2015-12-08 11:18:49 +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
Xavier J
49217a1b39 - add decorator for procedure and procedures
- add link to procedure on admin procedures list
2015-12-03 15:38:17 +01:00
Xavier J
515713b3fa Désactivation de France Connect 2015-12-03 15:09:22 +01:00
Xavier J
afaa6a5ac9 - delete route '/users/siret'
- delete route 'users/procedure'
- create route 'users/dossiers/new?procedure_id=:procedure_id'
- delete a part of unused code
- adapt demo page with new procedure URL
2015-12-03 12:00:22 +01:00
Xavier J
3e55d7ba3b - Delete routes 'users/dossiers/a_traiter - en_attente - termine' for user
- Add routes 'uses/dossiers/?liste=xxx' to reach at file lists for user
2015-12-02 18:03:52 +01:00
Xavier J
5cebb5b621 - Code review
- Delete routes 'users/dossiers/a_traiter - en_attente - termine' for user
- Add routes 'uses/dossiers/?liste=xxx' to reach at file lists for user
2015-12-02 16:52:09 +01:00
Xavier J
0478805501 Merge branch 'develop' of github.com:sgmap/tps into develop 2015-12-02 14:06:41 +01:00
Xavier J
a3df5a546d - add test on active tab for back office
- refactor code back office file list
- add decorator for select active tabs
2015-12-02 14:05:56 +01:00
Tanguy PATTE
9473232e14 remove fake attestation fiscale 2015-12-02 10:59:03 +01:00
Xavier J
141e23a381 Code review 2015-11-30 17:03:36 +01:00
Xavier J
da49c633dc Add tabs on view list file for users 2015-11-30 14:48:37 +01:00
Xavier J
f449be5c4e Add column Organisation on Demo page 2015-11-30 10:59:56 +01:00
Xavier J
54788c2499 New UI registration 2015-11-27 18:25:31 +01:00
Xavier J
6dd9c0c7ce Add procedure libelle on all edit page, above tabs 2015-11-27 17:25:22 +01:00
Xavier J
3eb990a611 Administrator can unarchived a procedure 2015-11-27 17:13:06 +01:00
Xavier J
7c3f322d6e Add tabs for administrateur procedures list 2015-11-27 16:23:02 +01:00
Xavier J
fe8504fd5e Inverse cancel and valid archive button on recapitulative file page for user 2015-11-27 16:00:34 +01:00
Xavier J
658262f1de Delete lost password demand 2015-11-27 15:55:18 +01:00
Xavier J
a79ecbba6d Add archive button on recapitulative page user dossier 2015-11-27 13:56:54 +01:00
Xavier J
b541e74422 Add procedure name on user dossier list 2015-11-27 11:09:45 +01:00
Xavier J
dd09a38bbb User can begin a new dossier with a procedure archived
Administrateur can see archived procedure
2015-11-27 10:39:05 +01:00
Xavier J
833752161f Add button archive on procedure 2015-11-26 18:41:41 +01:00
Xavier J
eed7232b8b Add badge on gestionnaire tabs 2015-11-26 16:31:53 +01:00
Xavier J
5e3bc1472c Add pagination for administrateur procedure 2015-11-26 16:00:12 +01:00
Xavier J
37ea69ec51 Add pagination for gestionnaire dossier
Fix test for user pagination
2015-11-26 15:47:31 +01:00
Xavier J
2eb01bdf42 Add paginate for user dossiers 2015-11-26 12:29:34 +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
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