DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
8917 commits 2 branches 1166 tags 85 MiB
Commit graph

5113 commits

Author SHA1 Message Date
Vini75
7f1b34926f
link to entreprisedatagouv.fr on user 2019-09-24 15:55:06 +02:00
Vini75
606c084914
Add link to entreprises datagouv.fr 2019-09-24 15:49:25 +02:00
Paul Chavard
da4523612a Update graphql schema 2019-09-24 10:47:21 +02:00
Paul Chavard
5a7e415474 Put graphql behind a feature flag 2019-09-24 10:47:21 +02:00
Paul Chavard
eb7aba18e6 Add dossier champs and annotations types 2019-09-24 10:47:21 +02:00
Paul Chavard
1c10718c11 Add messages and avis types 2019-09-24 10:47:21 +02:00
Paul Chavard
8928eaba11 Add demarche champs and annotations types 2019-09-24 10:47:21 +02:00
Paul Chavard
bf6fbbf2b6 Add graphql end point 2019-09-24 10:47:21 +02:00
Paul Chavard
5a7eb734ff Dump graphql schema for reference 2019-09-24 10:47:21 +02:00
Paul Chavard
ba683a107c Add authorizations to root queries 2019-09-24 10:47:21 +02:00
Paul Chavard
a7fc4df09b Resolve models and types 2019-09-24 10:47:21 +02:00
Paul Chavard
e06051bc96 Add graphql root types 2019-09-24 10:47:21 +02:00
Paul Chavard
52e84f2ffe Add graphql object types 2019-09-24 10:47:21 +02:00
Paul Chavard
9bb52dfb8c Add graphql base types 2019-09-24 10:47:21 +02:00
Paul Chavard
d2fdaacb5d Add Api::V2::Schema 2019-09-24 10:47:21 +02:00
Paul Chavard
2e854f2ac3 Add graph loading scopes to Dossier and Procedure 2019-09-24 10:47:21 +02:00
Nicolas Bouilleaud
e962fb26e0 Allow sorting Dossiers by “has notifications” in traites 
fixes #4351
 2019-09-24 09:37:42 +02:00
Nicolas Bouilleaud
00b1aa0ea1 Disable turbolinks for links to Stats pages 
This is a workaround for #350
 2019-09-23 14:25:04 +02:00
Nicolas Bouilleaud
f74fde3f80 Avoid sending notification emails about archived dossiers 2019-09-20 11:06:33 +02:00
Nicolas Bouilleaud
a2131d0fcc Don’t unfollow when archiving 
It was slightly broken in two ways:
- it doesn’t make other instructeurs unfollow the dossier
- if the dossier is unarchived, instructeurs don’t refollow automatically.
 2019-09-20 11:06:33 +02:00
Nicolas Bouilleaud
769621de46 Explicitly pass the “state” param in notifications_*_procedure methods 2019-09-20 11:06:33 +02:00
Nicolas Bouilleaud
8a06c01f13 Reorder methods in instructeur.rb 
Move token stuff together, out of notification-related stuff.
 2019-09-20 10:48:08 +02:00
Nicolas Bouilleaud
4f0871dab0 Use a single query in dossiers_id_with_notifications (instead of four) 
This is used in /procedures#show and /procedures#index, to display badges on the “suivis” and “traités” tabs of each procedure. Rails cache helps when it’s the exact same query, but it’s not the case for different tabs.

I’m not certain it’ll be a visible performance improvement but it shouldn’t hurt.
 2019-09-20 09:45:59 +02:00
simon lehericey
faddbc23ef Eager load procedure: :groupe_instructeurs for export 2019-09-19 12:30:12 +02:00
simon lehericey
a2f82ab8be Add groupe_instructeur_label to export v2 2019-09-19 12:30:12 +02:00
simon lehericey
f577484aa2 Add groupe_instructeur_label to export v1 2019-09-19 12:30:12 +02:00
simon lehericey
3bc20bdb06 Procedure.routee? 2019-09-19 12:30:12 +02:00
simon lehericey
8660d4af30 Instructeur: only export its dossiers 2019-09-19 12:24:40 +02:00
Paul Chavard
f4d4a896a0
Merge pull request #4342 from tchak/revert-proxy 
Revert "Upload through proxy"
 2019-09-19 09:14:32 +02:00
Paul Chavard
6533ec420b Revert "Upload through proxy" 
This reverts commit 91815ad709.
 2019-09-19 09:13:41 +02:00
simon lehericey
e2acb0a946 ProcedurePresentation: can use groupe instructeur 2019-09-18 15:51:02 +02:00
simon lehericey
f5bbc9e2f9 InstructeurProcedureShow: show dossier for all the gi involved 2019-09-18 15:51:02 +02:00
simon lehericey
9b16bd2037 Dossier: retrieve all dossiers for a procedure 2019-09-18 15:51:02 +02:00
simon lehericey
21577a0f0b Instructeur: dedup procedures with multiple gi 2019-09-18 15:51:02 +02:00
Paul Chavard
8fcf1353f3 Remove duplicated attachments 2019-09-17 18:12:53 +02:00
simon lehericey
dec42e4886 Instructeur procedure index: show stats by procedure 
Also sum the count from differents groupe_instructeur from the same procedure
 2019-09-17 17:19:14 +02:00
Paul Chavard
91815ad709 Upload through proxy 2019-09-17 17:04:52 +02:00
Pierre de La Morinerie
4b883a57bf stylesheets: make the actions bar sticky 2019-09-17 16:58:11 +02:00
Pierre de La Morinerie
1f8f38f492 stylesheets: align the buttons vertically 2019-09-17 16:58:11 +02:00
Pierre de La Morinerie
974c1b1150 stylesheets: move the dossier floating bar CSS to dossier_edit.scss 
forms.scss is supposed to be for generic elements.
 2019-09-17 16:58:11 +02:00
pedong
09a0f21cac use same look with .champs-editor.buttons 2019-09-17 16:58:11 +02:00
pedong
d2a78abc3a [fix #3975] set buttons floating in dossier page 2019-09-17 16:58:11 +02:00
Nicolas Bouilleaud
0c98f29d59 Move the cached procedure stats queries to a ProcedureStatsConcern 2019-09-17 16:43:48 +02:00
Nicolas Bouilleaud
06d60cd943 Cache requests in procedures/stats 2019-09-17 16:43:48 +02:00
Nicolas Bouilleaud
3e2985b305 First attempt at procedure stats 
fixes #3945, #3946, #3948
 2019-09-17 16:43:48 +02:00
Nicolas Bouilleaud
543f9894c1 Make sure the “commencer” link uses the proper test path 2019-09-17 16:30:48 +02:00
Nicolas Bouilleaud
c26a701a17 Refactor and redesign publish modal 
* remove the autocomplete menu
* use ujs to pre-validate the procedure
* tweak the UI
 2019-09-17 16:30:48 +02:00
Nicolas Bouilleaud
bd1e0aba38 Add Procedure path suggestion 2019-09-17 16:30:48 +02:00
Nicolas Bouilleaud
8806eab8d6 Properly validate Procedure.lien_site_web is set when publishing 2019-09-17 16:30:48 +02:00
Nicolas Bouilleaud
00c37eccb3 Simplify procedure.path and publish event 
* Get rid of the “reopen” event, merge it with “publish” (it’s the same code)
* Remove the “availability” states; “available with brouillon” makes no sense since the brouillons path are always uuids
* Instead of checking if publish can happen, just try it and handle the errors
 2019-09-17 16:30:48 +02:00
Nicolas Bouilleaud
99f986b815 Cleanup Procedure retrieval in “Commencer” 
Make sure to only fetch active (brouillons or published) procedures.
 2019-09-17 16:30:48 +02:00
Nicolas Bouilleaud
92e6032115 Remove path availability dead code when creating/editing a procedure 
There’s no “path” field anymore in the Procedure form, it can only be set when publishing.
 2019-09-17 16:30:48 +02:00
Nicolas Bouilleaud
b9968b76b0 Remove “avec_lien” helpers now that Procedure.path cannot be nil 2019-09-17 16:30:48 +02:00
Nicolas Bouilleaud
8fa630d2bb Remove Gestionnaire.visible_procedures 
It is actually the same thing as Gestionnaire.procedures. It already included the procedures with paths as well as the archived procedures, and in production, there were no Gestionnaire for who procedures was returning a different result than visible_procedures (expect for two baddata brouillon procedures with a nil path).

In addition, Procedure.path is now nonnull, which means the Procedure.avec_lien scope is pointless.

Finally, the current spec showed that the only procedure not visible to the gestion was the one he was not assigned to.
 2019-09-17 16:30:48 +02:00
Nicolas Bouilleaud
e9c6ed80e4 Migration: Index and make Procedure.path nonnull 2019-09-17 16:30:48 +02:00
maatinito
ae34e48624 [fix #4311] Unable to reinvite admin 2019-09-17 16:15:04 +02:00
clemkeirua
949a0c21e6 gestion des 2 formats de bouton monavis 2019-09-17 13:39:45 +02:00
Paul Chavard
ff2b6ca3ea Fix service controller 2019-09-17 12:37:37 +02:00
Paul Chavard
8a691d534a Fix AdministrateurUsageStatisticsService 2019-09-17 12:37:37 +02:00
Paul Chavard
adfa80142a Cleanup application_controller and current_user 2019-09-17 12:37:37 +02:00
Paul Chavard
88842918f9 Prepare to drop columns 2019-09-17 12:37:37 +02:00
Paul Chavard
3eeebd62eb Use built in active_storage helper 2019-09-17 11:11:08 +02:00
simon lehericey
acb99609ba Move defaut_groupe_instructeur as has_one and eager_load 2019-09-16 15:57:07 +02:00
simon lehericey
afa0237349 remove logo n+1 2019-09-16 15:48:19 +02:00
Paul Chavard
b97cbd3402 Serialize champ repetition for tags 
closes #4272
 2019-09-12 17:23:18 +02:00
Paul Chavard
3b8d3b7967 Add Style/CollectionMethods to rubocop 2019-09-12 14:48:18 +02:00
simon lehericey
82bef0f651 use notifications_per_procedure properly 2019-09-11 20:49:48 +02:00
Pierre de La Morinerie
503c393a87 helpscout: use replies_sent to compute contact rate 
The `conversations_count` we previously used counts replies, but also
all conversations that were tagged or re-tagged during the month – with
made counting the actual work spent on user support brittle.

Counting the replies is a better estimation of what we get.

Unfortunately this also removes the filtering-by-tag feature. To
mitigate this, the reports are now scoped to a specific mailbox. This
allows to create extra mailboxes for conversations that should't be
counted in the stats.
 2019-09-11 17:26:10 +02:00
Paul Chavard
c370c2f475 Cleanup FlipFlop 2019-09-10 23:52:44 +02:00
Paul Chavard
65e227c44b Migrate to flipper 2019-09-10 16:10:14 +02:00
clemkeirua
feb9c32537 search attachments inside bloc repetables 2019-09-10 15:30:44 +02:00
Paul Chavard
347f03d2a9 Redirect to pdf attachement old name if not attached 2019-09-10 15:06:47 +02:00
Paul Chavard
3eb3ae001e Rename “Passé en construction le” to 'Déposé le' for clarity 2019-09-10 14:59:10 +02:00
Chaïb Martinez
dd6c6bfe7a mailers: add a NO_REPLY address to transactional emails 2019-09-10 13:37:28 +02:00
Pierre de La Morinerie
aa1cf6788b mailers: turn revert_to_instruction into a notification email 2019-09-10 13:29:06 +02:00
pedong
a7d3bbb8cc Del SIRET in service for API 2019-09-10 11:06:28 +02:00
pedong
25596ca2f2 [fix #4181] add service to procedure API 2019-09-10 11:06:28 +02:00
Paul Chavard
d8402fbd2c Remove last reference to commentaire.file 2019-09-10 10:49:12 +02:00
Paul Chavard
434210de2e Ignore to be removed columns 2019-09-10 10:49:12 +02:00
Paul Chavard
7ffb98e616 Remove carrierwave uploaders 2019-09-10 10:49:12 +02:00
Pierre de La Morinerie
2724f4667b groupe_instructeur: unsassign instructeurs on group destroy 
Fix #4282
 2019-09-09 17:29:29 +02:00
clemkeirua
6849fd6afe change le texte de la messagerie selon le type d'utilisateur 2019-09-09 16:25:02 +02:00
Pierre de La Morinerie
c26da5ec37 mailers: prevent the signature from being auto-linked 
Some emails clients (Gmail or Mail.app) may turn the signature into
a clickable link.

This can distract users, and make them think we are a good point of
contact (where they should contact their administration or use the
website directly instead).
 2019-09-09 11:43:57 +02:00
Chaïb Martinez
9f60365500 [fix #4266] Add 'Revenir sur le site de mon administration' on commencer page 2019-09-03 15:46:25 +02:00
simon lehericey
6a83adf336 StatController: work by groupe_instructeur 2019-09-03 06:47:02 +02:00
simon lehericey
ad7ef6c739 Link assign_to and procedure by groupe_instructeur 2019-09-03 06:47:02 +02:00
simon lehericey
4da12ed3e8 User/DossierController: dossier are linked to default group by default 2019-09-03 06:47:02 +02:00
simon lehericey
d582af0962 Fix Instructeur Procedure Index 2019-09-03 06:47:02 +02:00
simon lehericey
d0bfb62fec Procedure Factory: use procedure.new_dossier 2019-09-03 06:47:02 +02:00
simon lehericey
3cc8f0c792 Link Dossier and GroupeInstructeur 2019-09-03 06:47:02 +02:00
simon lehericey
a82d49aa60 Procedure: save procedure while cloning 
This is required to be able to assign the administrateur.instructeur to the defaut_groupe_instructeur of the new procedure
 2019-09-02 11:41:12 +02:00
simon lehericey
31cb056351 Procedure: remove direct instructeurs access 
Add shortcut for the spec to assign instructeurs directly to the defaut groupe
 2019-09-02 11:41:12 +02:00
simon lehericey
b541ef0b41 Procedure has many instructeurs with defaut_groupe_instructeur 2019-09-02 11:41:12 +02:00
simon lehericey
ba24958035 Procedure add missing_instructeurs? 2019-09-02 11:41:12 +02:00
simon lehericey
64d28dba2f cleaning : use missing_steps 2019-09-02 11:41:12 +02:00
simon lehericey
85499365a0 Instructeur has_many procedures through groupe_instructeur 2019-09-02 11:41:12 +02:00
simon lehericey
25991c2892 Assign a procedure assign a group as well 2019-09-02 11:41:12 +02:00
simon lehericey
97884c4349 Link AssignTo et GroupeInstructeur 2019-09-02 11:41:12 +02:00
simon lehericey
115d91387c A procedure has a default groupe instructeur 2019-09-02 11:41:12 +02:00
simon lehericey
f296318072 Create GroupeInstructeur 2019-09-02 11:41:12 +02:00
clemkeirua
c2916e9d05 remove possibility to create carte with parcelle agricole 2019-08-29 16:01:35 +02:00
Paul Chavard
3c6b35d720 Fix attestation preview 2019-08-28 16:33:51 +02:00
benjaminhenkel
2b510a15a2 Update _informations.html.haml 2019-08-28 15:02:44 +02:00
benjaminhenkel
73d643d1be Update flash message for test demarche 2019-08-28 14:54:17 +02:00
clemkeirua
4032fc61e3 move to only one pipedrive account 2019-08-28 12:16:25 +02:00
Paul Chavard
0ecf5b47eb Call ActiveStorage::Filename.to_s 2019-08-28 11:01:58 +02:00
Paul Chavard
64dccbab5c Only rename logo param if it is present 2019-08-28 11:01:58 +02:00
Paul Chavard
15148a4fe1 Fix invalid characters in repetition champs sheet_name for xls export 2019-08-28 10:47:58 +02:00
Paul Chavard
5edbc08542 Render attesation apercu inline 2019-08-27 17:44:02 +02:00
Paul Chavard
32563c3675 Redirect to active_storage files when available 2019-08-27 17:43:33 +02:00
Paul Chavard
a19b10b118 Migrate attestation files to active_storage 2019-08-27 17:42:52 +02:00
clemkeirua
188e0fd6b2 removed ask_birthday for new procedures & dossiers 2019-08-27 15:32:17 +02:00
maatinito
ae059dc029 Corrected placeholder on champ carte 2019-08-27 15:13:10 +02:00
simon lehericey
7b9b90a3e0 [fix #4238] When the token does not exist, redirect to home page without sending a new link 2019-08-27 15:01:46 +02:00
Chaïb Martinez
5f20d657d0 Add target blank 
[fix #3536]

Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-08-27 10:45:26 +02:00
Chaïb Martinez
7640911ab9 Remove sign up form sign in 
Add link to sign up help

Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-08-27 10:45:26 +02:00
Paul Chavard
d02e0fc556 Fix and test migrate_procedure_logo task 2019-08-22 11:28:03 +02:00
Paul Chavard
cc35a04e26 Migrate procedure logo to active_storage 2019-08-21 11:15:00 +02:00
Paul Chavard
6215ccb3d7 Fix carte initialize 2019-08-21 10:48:49 +02:00
Paul Chavard
b7b46e9a82 Improve clone of procedure attachements 2019-08-20 17:30:44 +02:00
Philémon
0528026631 retrait d'un s 
par souci de cohérence entre "satisfaction usagerø" et "contact usagerø" :) 
la bise!
 2019-08-20 13:53:24 +02:00
Philémon
e6e0f5ed31 changement de wording 
changement de wording "Connectez-vous pour donner votre avis" > "Cliquez ici pour donner votre avis", ça permet de clarifier (sinon les usagers peuvent penser que c'est le lien pour se connecter à ds (/sign_in).
c'est le fruit de discussion avec des admin :)
 2019-08-20 13:53:24 +02:00
simon lehericey
b7f8bb2fea Simplify ip_service 2019-08-20 13:29:29 +02:00
simon lehericey
c1a622efa1 Add User.create_or_promote_to_administrateur 2019-08-20 12:20:12 +02:00
simon lehericey
01a91e68ca Simply avis controller 2019-08-20 12:20:12 +02:00
simon lehericey
98a24bea51 Simplify invite_instructeur 2019-08-20 12:20:12 +02:00
simon lehericey
97d0855d47 add User.create_or_promote_to_instructeur 2019-08-20 12:20:12 +02:00
simon lehericey
e913b01c52 fix_manager_reset_password 2019-08-20 12:12:20 +02:00
simon lehericey
ebe871819d Fix admin deletion by an administration 2019-08-20 12:01:36 +02:00
Paul Chavard
e9ba7700d4 Remove commentaire file uploader 2019-08-20 10:24:13 +02:00
simon lehericey
80cb8b87fe Keep only the FC logic and use devise for the rest 2019-08-16 16:48:22 +02:00
simon lehericey
9c715b2969 SessionController: new User in view 2019-08-16 16:48:22 +02:00
simon lehericey
416a07d2dd SessionView: simplify 2019-08-16 16:48:22 +02:00
simon lehericey
27085af9b5 SessionController: remove remember_me 
It is somehow taken care by warden
 2019-08-16 16:48:22 +02:00
simon lehericey
002510d5cb SessionController: remove complicated try_to_authenticate 2019-08-16 16:48:22 +02:00
simon lehericey
67cc2c1a87 SessionController: remove instructeur_signed_in? 2019-08-16 16:48:22 +02:00
simon lehericey
a3b9bf90d4 SessionController: remove useless code 
- the redirection of a locked user is made by the sign_in method
- because of the paranoid mode it displays the devise.failure.invalid error message
 2019-08-16 16:48:22 +02:00
simon lehericey
1b14d85c77 Rerender if wrong credentials 2019-08-16 16:48:22 +02:00
simon lehericey
dab1519b8c Remove credenticals synchronisation logic 2019-08-16 11:35:19 +02:00
simon lehericey
58ecf18390 ActivateController: add tests and clean a bit 2019-08-16 11:22:36 +02:00
simon lehericey
d5ddd182a7 remove useless session views 2019-08-14 18:04:26 +02:00
simon lehericey
972b6793f7 Remove useless sessions_controller 2019-08-14 18:04:26 +02:00
simon lehericey
149b0b5797 Fix Sign out 2019-08-14 16:58:50 +02:00
simon lehericey
e3e6bc7689 ! NEED JOB REBOOT Move remind activation logic to user 2019-08-14 16:34:50 +02:00
simon lehericey
d0ac1c3301 Fix manager invite administrateur 2019-08-14 16:34:50 +02:00
simon lehericey
c380d807ab Spec: sign_in with administrateur.user 2019-08-14 15:08:14 +02:00
simon lehericey
1b38d4071d temporary remove password complexity check 2019-08-14 15:06:16 +02:00
simon lehericey
4142acf8d3 Replace administrateur devise methods in app 2019-08-14 15:06:16 +02:00
simon lehericey
840be2408e Remove administrateur devise methods 2019-08-14 15:06:15 +02:00
simon lehericey
81f44fa76b Link user and administrateur 2019-08-14 15:06:15 +02:00
Paul Chavard
e68d2cf5e2 Enable champ repetition for all 2019-08-14 12:53:51 +01:00
Paul Chavard
9eaf14968f Enable export v2 for all 2019-08-14 12:53:51 +01:00
Paul Chavard
0969b1f85f Enable email_login_token for all gestionnaires 2019-08-14 12:53:51 +01:00
Pierre de La Morinerie
182a9a5df2 service: remove the mandatory SIRET field 2019-08-14 10:38:36 +02:00
Paul Chavard
ef66defcd1 Fix invite instructeur from manager 2019-08-13 20:12:46 +01:00
Pierre de La Morinerie
4e9895c11b app: mark the contact forms as not sensitive to trusted tokens 
Instructeurs waiting for a confirmation token should be able to
access the contact form (especially to ask for help).

Fix #4198
 2019-08-13 19:48:11 +02:00
Paul Chavard
86b9ed2079 Run load scripts after ujs responces 2019-08-13 17:03:55 +01:00
simon lehericey
8fa3c9e4f7 Fix expert invitation 2019-08-13 15:15:16 +02:00
simon lehericey
5fdac38cb2 Fix instructeur invitation 2019-08-13 15:15:16 +02:00
simon lehericey
efd793f266 AdminProcedureController: fix self assignation as instructeur 2019-08-13 15:15:16 +02:00
simon lehericey
ad31822a68 Spec: sign_in with instructeur.user 2019-08-13 15:15:16 +02:00
simon lehericey
47b7dc368b Remove or fix now nonsense code 2019-08-13 15:15:16 +02:00
simon lehericey
c8a7bde5e0 Replace instructeur devise methods in app 2019-08-13 15:15:16 +02:00
simon lehericey
a84e07a376 Remove instructeur devise methods 2019-08-13 15:15:16 +02:00
simon lehericey
dd4ffb926c Link user and instructeur 2019-08-13 15:15:16 +02:00
simon lehericey
e3fd1cc33a Remove weird switch_devise_profile_service 2019-08-13 15:15:16 +02:00
Pierre de La Morinerie
79784089a4 dossiers: refresh the whole header actions bar on status change 
This ensure the other state-dependant buttons get updated to–like the
"Follow" or "Archive" button.

Fix #4186
 2019-08-13 15:07:22 +02:00
Pierre de La Morinerie
3a37c1eeae dossiers: rename .mixed-buttons-bar to .header-actions 2019-08-13 15:07:22 +02:00
Pierre de La Morinerie
219f690b96 dossiers: move header actions to a partial 2019-08-13 15:07:22 +02:00
simon lehericey
5bda753735 Remove all devise route and controller for instructeur and administrateur 2019-08-13 14:13:48 +02:00
simon lehericey
a4b9eecded Remove unused devise session controller 2019-08-13 14:13:48 +02:00
benjaminhenkel
6ed5cd6feb navbar: improve wording, and allow two-lines layout 2019-08-13 12:26:11 +02:00
benjaminhenkel
efb7883bd1 Update _monavis.html.haml 2019-08-12 16:54:00 +02:00
simon lehericey
3fde2a6f70 Rename gestionnaire in code to instructeur 2019-08-12 13:47:01 +02:00
simon lehericey
6902f84b85 Brutally rename gestionnaire filename to instructeur 2019-08-12 13:47:01 +02:00
simon lehericey
bb8d65c6b4 Subtly rename admin/instructeurs to admin/assigns 2019-08-12 13:47:01 +02:00
simon lehericey
7ac243ac44 Use proper token to find the administrateur ... how can it works otherwise ? 2019-08-12 13:43:03 +02:00
simon lehericey
7e78b7d62d Administrateur password, remove one level of indirection 2019-08-12 13:43:03 +02:00
clemkeirua
6c56fc73d7 used new constant for genders 2019-08-01 20:46:58 +02:00
clemkeirua
1e6847bc6f introduce constants for M./Mme 2019-08-01 17:42:32 +02:00
clemkeirua
d7105cb6f8 added spec for dossier#update_with_france_connect 2019-08-01 17:42:32 +02:00
clemkeirua
707e8a0004 dossier_controller#new uses info from FC if any 2019-08-01 17:42:32 +02:00
maatinito
8d3e3baabc #3928 administrator new & edit pwd pages 2019-08-01 17:12:14 +02:00
maatinito
220b38ad2a #3928 different pwd edit page for administrators 2019-08-01 17:12:14 +02:00
maatinito
3bf32b6d43 #3928 redesign of password panel (complexity bar & explanation) 2019-08-01 17:12:14 +02:00
maatinito
0b0ef8a318 #3928 Zxcvbn service to compute password complexity 2019-08-01 17:12:14 +02:00
Paul Chavard
02904f55b1 Fix champ policy 2019-08-01 16:41:53 +02:00
Paul Chavard
b8d3e4c41b Fix attestation url for dossiers with no attestation 2019-08-01 15:53:50 +02:00
Paul Chavard
c75e39884e Save selection utilisateur as geo area 2019-08-01 11:38:09 +02:00
clemkeirua
f5d3818e3c remove unnecessary retransition methods 2019-08-01 10:40:08 +02:00
Keirua
2f82dd9a3d improve typography and texts 
Co-Authored-By: Nicolas Bouilleaud <nico@bou.io>
 2019-08-01 10:29:51 +02:00
clemkeirua
38b48f4217 transition from accepte to instruction as superadmin 2019-08-01 10:29:51 +02:00
Paul Chavard
b266915892 Add repetitions to api 2019-08-01 10:04:35 +02:00
Paul Chavard
fba195c0b5 Add attestation url to dossier on api 2019-07-31 18:30:40 +02:00
Paul Chavard
6cfad01d12 Stop using Flipflop as switch for weekly_overview 2019-07-31 15:15:09 +02:00
Paul Chavard
25db21467d Stop using Flipflop as switch for Fog 2019-07-31 15:15:09 +02:00
Paul Chavard
6f3fde21f2
Merge pull request #4139 from Keirua/fix/confirm-on-delete-champ 
#4137 - Ajout d'un confirm à la suppression d'un champ
 2019-07-31 12:31:44 +02:00
Paul Chavard
fc75580a3c Start using pundit 2019-07-30 18:09:28 +02:00
Paul Chavard
8c72470a6c Add default etablissement champ name 2019-07-30 17:17:36 +02:00
Paul Chavard
ab1170bcfc Fix export dossier n+1 query 2019-07-30 17:17:36 +02:00
Paul Chavard
5a9468aa95 Fix repetition data export 2019-07-30 17:17:36 +02:00
Pierre de La Morinerie
02a5234bde lib: remove FileSizeValidator 
It was only used by the PieceJustificative model.
 2019-07-30 16:11:17 +02:00
Pierre de La Morinerie
65e7489b4f uploaders: remove PieceJustificativeUploader 2019-07-30 16:11:17 +02:00
Pierre de La Morinerie
95e24392f9 models: remove old pieces justificatives 2019-07-30 16:11:17 +02:00
Pierre de La Morinerie
ea1c8ea7e3 models: remove associations to old pieces justificatives 2019-07-30 16:11:17 +02:00
Pierre de La Morinerie
f6a1c7ded3 manager: remove support for old pj 2019-07-30 16:11:17 +02:00
Pierre de La Morinerie
0da0a2b446 model: remove support for cloning procedures with old pj 2019-07-30 16:11:17 +02:00
Pierre de La Morinerie
f69f325236 api: remove export of old pieces justificatives 2019-07-30 16:11:17 +02:00
Pierre de La Morinerie
e975fe4ade tasks: remove task to migrate old pieces justificatives 2019-07-30 16:11:17 +02:00
Pierre de La Morinerie
0018f36b44 gestionnaire: remove UI for filtering pieces justificatives 2019-07-30 16:11:16 +02:00
Pierre de La Morinerie
f825f62ce5 dossier: remove UI for viewing old pieces justificatives 2019-07-30 16:11:16 +02:00
Pierre de La Morinerie
5502f2e42e dossier: remove UI for uploading old pieces justificatives 2019-07-30 16:11:16 +02:00
Pierre de La Morinerie
0c4cb3b498 admin: remove UI for managing old pj 2019-07-30 16:11:16 +02:00
Nicolas Bouilleaud
7205f4da9e L'enfer du Nord Paris-Roubaix (Tour de France, Tour de France) 2019-07-30 14:47:48 +02:00
pedong
9438f962c5 add alert for account is locked 2019-07-29 17:48:44 +02:00
pedong
0ed9c4cbd4 add check access_locked? when login 2019-07-29 17:48:44 +02:00
pedong
8d03a6747c add lockable to User, Gestionnaire, administration, Administrateur 2019-07-29 17:48:44 +02:00
Nicolas Bouilleaud
b066ccbc89 Make sure Procedure.path is not null in our data 2019-07-29 13:53:33 +02:00
Pierre de La Morinerie
bcd5182446 dossier: hide the draft explanation when already submitted 2019-07-29 10:54:19 +02:00
Pierre de La Morinerie
e99edda7b1 dossiers: hide the Edit button on the actual edit page 
Otherwise the "Edit" button may be confused for a "Save" button.
 2019-07-29 10:49:49 +02:00
Pierre de La Morinerie
7b345365fd dossiers: fix the layout of the Edit button 2019-07-29 10:45:49 +02:00
Pierre de La Morinerie
f1838f3767 dossiers: fix edit button being visible on locked dossiers 
Fix #4143
 2019-07-29 10:41:58 +02:00
clemkeirua
314b0f5dc0 fix tests 2019-07-25 17:15:19 +02:00
clemkeirua
6f47655301 rendu lien_site_web obligatoire au moment de la publication 2019-07-25 15:46:04 +02:00
clemkeirua
6b19432d47 deplacement de l'URL qui envoie vers la procédure 2019-07-25 15:46:04 +02:00
Pierre de La Morinerie
2174172e34 admin: display CTA buttons in emails preview 2019-07-25 12:25:50 +02:00
Pierre de La Morinerie
1c837eb901 mailers: improve wording of transactional emails and default templates 2019-07-25 12:25:50 +02:00
Pierre de La Morinerie
8313752663 mailers: add CTA to templated emails 2019-07-25 12:25:50 +02:00
Pierre de La Morinerie
6195ee41f3 mailers: add CTA to new_draft email 2019-07-25 12:25:50 +02:00
Pierre de La Morinerie
45c62cefb2 helpers: add vertical_margin helper for mailers 2019-07-25 12:25:50 +02:00
Pierre de La Morinerie
2c612f6448 helpers: add variants to mailer_round_button 2019-07-25 12:25:50 +02:00
Pierre de La Morinerie
3abb0a1c44 helpers: prevent information leakage from round_button links 2019-07-25 12:25:50 +02:00
clemkeirua
2ff6958ad6 better spacing 2019-07-25 11:40:46 +02:00
clemkeirua
a9708bff5d ajout d'infos pratiques pour aller chercher son siret 2019-07-25 11:39:16 +02:00
Pierre de La Morinerie
079ac3da33 invite: signal that the message is optional 2019-07-25 11:10:49 +02:00
clemkeirua
caa90613fd ajout d'un confirm à la suppression d'un champ 2019-07-25 10:46:40 +02:00
Chaïb Martinez
14192916f1 Add edit dossier link 
[fix #4114]

Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-24 12:21:35 +02:00
pedong
4a0873c5af add quote show the message invite 2019-07-23 19:05:56 +02:00
pedong
0f957ec77b [fixe #3974] add message for invite mail 2019-07-23 18:54:58 +02:00
Chaïb Martinez
ff395b8c4b Add a triggered message in chat box for new admins 😎 
Remove useless text
[fix #4052]

Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-23 17:08:35 +02:00
clemkeirua
af436500fd better button 2019-07-23 16:11:15 +02:00
clemkeirua
f166077f5e ajout d'un bouton de suppression des admin dans le manager 2019-07-23 16:11:15 +02:00
Pierre de La Morinerie
858b093314 mailers: use the standard view mechanism to render notifications 
Instead of rendering a view as a template, consider the view as a normal
view.
 2019-07-23 14:53:50 +02:00
Pierre de La Morinerie
5bbcd600fb mailers: extract more of the template to partials 
This will allow to re-use these partials in other emails
 2019-07-23 14:53:32 +02:00
Pierre de La Morinerie
45abb6ebc2 mailers: move default templates to a specific subdirectory 
It makes more understandable that they are templates (and not views
rendered directly by Rails).
 2019-07-22 16:22:20 +02:00
Pierre de La Morinerie
dbe03d4f74 suivi: remove link to stats dashboard 
The dashboard is currently private–and it currently contains sensitive
informations that are hard to filter out.
 2019-07-22 11:49:09 +02:00
Pierre de La Morinerie
af6172d0e8 suivi: explain how to disable tracking 2019-07-22 11:48:28 +02:00
clemkeirua
50ddf723b0 garde le bandeau bleu de navigation après MAJ 2019-07-22 10:27:33 +02:00
clemkeirua
2e107babfb meilleures marges monavis 2019-07-18 17:39:06 +02:00
clemkeirua
d62740c198 extraction de la taille max des fichiers dans une constante 2019-07-18 17:19:39 +02:00
clemkeirua
f7842fa4bd ajout d'un message lorsque le dossier fait plus de 50Mo 2019-07-18 16:39:59 +02:00
Pierre de La Morinerie
3c0ba5e698 emails: improve wording of the messagerie nudge 2019-07-18 12:38:13 +02:00
Pierre de La Morinerie
f88d7c28fa emails: add a "Read message" button to the new answer email 2019-07-18 12:38:13 +02:00
Pierre de La Morinerie
630ae06542 emails: sign the new answer email as the administration 2019-07-18 12:38:13 +02:00
Pierre de La Morinerie
8b80c48679 emails: use the notification template for more messages 
This allow to display the procedure logo and contact footer
at the bottom of these emails.
 2019-07-18 12:38:13 +02:00
Pierre de La Morinerie
b157d860d2 emails: adjust notification footer for dossiers without messagerie 2019-07-18 12:38:13 +02:00
Pierre de La Morinerie
37c93e634e emails: clarify the notify_new_draft action 2019-07-18 12:38:13 +02:00
clemkeirua
ee8a1092e4 extracted MonAvisEmbedValidator 2019-07-17 18:04:32 +02:00
clemkeirua
91d10c0cf7 added navbar for mon avis 2019-07-17 18:04:32 +02:00
clemkeirua
6d43465ee5 renammed into monavis_embed 2019-07-17 18:04:32 +02:00
clemkeirua
8d2c5cfa14 validation par regex 2019-07-17 18:04:32 +02:00
clemkeirua
d8b63cd4c9 added 'monavis' inside the procedure and for users 2019-07-17 18:04:32 +02:00
Pierre de La Morinerie
727702ad4b emails: mention the procedure name in the email title 2019-07-17 15:01:19 +02:00
Pierre de La Morinerie
71dfb38787 emails: improve typography of titles 2019-07-17 15:01:19 +02:00
Pierre de La Morinerie
bc42c90fe5 emails: make signature more compact 2019-07-17 14:55:55 +02:00
Pierre de La Morinerie
bd39eb3453 emails: remove dead code 2019-07-17 14:55:55 +02:00
clemkeirua
7eeddc0b79 using a shared example + scoped to state TERMINE 2019-07-17 11:53:16 +02:00
clemkeirua
b8fa567c81 ajout du tag 'lien document justificatif' 2019-07-17 11:53:16 +02:00
Pierre de La Morinerie
d86030fb76 dossier: add a reply icon near to "Reply to message" button 2019-07-17 11:43:21 +02:00
Pierre de La Morinerie
b4fe6e236e messagerie: improve the textarea placeholder 2019-07-17 11:43:21 +02:00
Pierre de La Morinerie
92dd91a31b messagerie: add a reply button next to the latest message 2019-07-17 11:43:21 +02:00
Pierre de La Morinerie
09efd06dff forms: add a focus indicator to focused fields 2019-07-17 11:43:21 +02:00
Pierre de La Morinerie
80efe27ff2 pj migration: retry when changing the content type fails 2019-07-16 17:51:29 +02:00
Pierre de La Morinerie
a8354bd103 dossiers: unify deletion of dossiers between manager and user 
The code paths for deleting a dossier were different, depending on
whether the dossier was deleted by the user, or from the Manager.

This commit unifies the two code paths into one.

This has the effect of:

- An operation log is now recorded when an user deletes its own dossier;
- Gestionnaires are now notified even when the dossier is deleted from
  the Manager;
- The `support:delete_user_account` task now requires the email address
  of the author.
 2019-07-16 16:22:20 +02:00
clemkeirua
25f81f1d3c download a dossier as zip with all attachments 2019-07-16 09:11:25 +02:00
Pierre de La Morinerie
76335511c8 omniauth: protect against CSRF 
See https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284
 2019-07-15 18:16:00 +02:00
Pierre de La Morinerie
36eca3d059 dossier: rename the "Submit" action 2019-07-15 17:18:28 +02:00
Pierre de La Morinerie
862b08427b status_overview: remove extraneous line 2019-07-15 15:55:25 +02:00
Pierre de La Morinerie
d9c01c0af6 status_overview: improve wording 2019-07-15 15:45:16 +02:00
Benjamin-Doberset
8ea8e52431 Update _status_overview.html.haml 2019-07-15 15:45:16 +02:00
Pierre de La Morinerie
077082c381 dossier: improve estimated delay wording 2019-07-15 15:27:22 +02:00
Benjamin-Doberset
77d825ae63 Update _estimated_delay.html.haml 2019-07-15 15:27:22 +02:00
Chaïb Martinez
5cb6ba2f3b Fix tests 
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-15 12:10:56 +02:00
Chaïb Martinez
3f9f67eb78 admin: fix the "Valider" button being hidden by Crisp 
Fix #4021

Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-15 12:10:56 +02:00
Chaïb Martinez
d968e7e6bd Add some admin usage info for contextual help with crisp 
Fix #4052

Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-15 12:10:56 +02:00
Chaïb Martinez
04e204c740 Minor text fix 
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-15 12:10:56 +02:00
Chaïb Martinez
535d032b73 Send URL page view to Crisp to trigger contextual help 
Fix #4052

Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-15 12:10:56 +02:00
Pierre de La Morinerie
d5f360c85f manager: fix the deletion email not being sent 
When deleting a dossier from the manager, the deletion notification
email was not being sent. This is because the returned object from
`Dossier#hide!` was invalid.
 2019-07-15 10:01:16 +02:00
Pierre de La Morinerie
619f663e1a procedure: remove individual_with_siret column 2019-07-11 15:57:46 +02:00
Pierre de La Morinerie
a047ee356b procedure: remove expects_multiple_submissions column 2019-07-11 15:57:46 +02:00
clemkeirua
6838e69986 ajout de textes explicatifs pour les instructeurs 2019-07-11 15:48:00 +02:00
Pierre de La Morinerie
35c3795f56 dossier: make messagerie available on archived procedures 
An Admin may archive a procedure to make it unavailable to
the general public, but before all dossiers are handled. In this case,
the messagerie needs to be available.

Fix #4089
 2019-07-11 15:37:04 +02:00
Pierre de La Morinerie
10065df8ce champs: put champ label in numeric fields validation messages 
Replaces

> La valeur du champ doit être un nombre entier (sans chiffres après
> la virgule)

by

> La valeur du champ « Nombre de parents » doit être un nombre entier
> (sans chiffres après la virgule)
 2019-07-11 15:12:48 +02:00
simon lehericey
768a298c2d Same for go back in instruction 2019-07-11 12:50:15 +02:00
simon lehericey
5f39d3eac8 Fix bug when instruction repasse en construction twice 2019-07-11 12:50:15 +02:00
simon lehericey
6de1e2ec58 Fix bug when an instructeur closes a dossier already closed 2019-07-11 12:50:15 +02:00
Pierre de La Morinerie
fdca7c025a procedure: ignore :expects_multiple_submissions on the correct model 2019-07-11 12:14:25 +02:00
Pierre de La Morinerie
c2c9b19b3b procedure: remove individual_with_siret 
It isn't used anymore (see #3077)
 2019-07-11 11:58:21 +02:00
Pierre de La Morinerie
7ca3d5fce2 procedure: select for_individual by default 2019-07-10 18:47:34 +02:00
Pierre de La Morinerie
9616df192d procedure: use the model value for checking the radio buttons 
Previously `checked: true` forced the checked status, disregarding the
actual value of the model.

Fix #4080
 2019-07-10 18:47:28 +02:00
Paul Chavard
3cb39c2840 Refactor message attachements to use active_storage 2019-07-10 15:35:29 +02:00
Pierre de La Morinerie
03fc555edf profile: send an email when the account is already taken 2019-07-10 11:31:09 +02:00
Pierre de La Morinerie
80074d6d82 profile: improve layout and wording of the confirmation message 2019-07-10 11:31:09 +02:00
Pierre de La Morinerie
f8a1911625 profile: display profile page even for single-role users 2019-07-10 11:31:09 +02:00
benjaminhenkel
c36b884adf Update _state_button.html.haml 
changement faute d'orthographe
 2019-07-10 10:41:13 +02:00
simon lehericey
f6c402deec better default value for linked_drop_down_list 2019-07-10 10:21:34 +02:00
clemkeirua
d29be1fe41 suppression de redouane de Pipedrive 2019-07-09 17:29:25 +02:00
clemkeirua
4c9846dcd1 Mise à jour du mail d'activation admin 2019-07-09 17:29:25 +02:00
clemkeirua
1f3015e24f suppression de camille de la liste pipedrive 2019-07-09 17:29:25 +02:00
Pierre de La Morinerie
06afc3890f france_connect: raise an error if some validation error occurs 
If a validation error occurs in `find_or_create`, an object without `id`
will be returned–and the code will crash soon after.

Ensure that we crash immediately, so that we can report the root cause
(the validation error) instead of a seemingly-unrelated crash later.
 2019-07-09 15:50:28 +02:00
Pierre de La Morinerie
6b27ac8514 france_connect: make existing user lookup case-insensitive 
Fix #4053
 2019-07-09 15:50:28 +02:00
Pierre de La Morinerie
ecfccae6f0 dossiers: remove support for Dossier#expects_multiple_submissions 2019-07-09 14:50:11 +02:00
Pierre de La Morinerie
d77a5552b7 dossiers: allow to start a new dossier after submitting one 2019-07-09 14:44:36 +02:00
Pierre de La Morinerie
b5ed74c09d dossiers: always allow to create a new dossier 
Turns out this is confusing for users (some UI elements are present for
some procedures, but not for others).

Better enable it for everyone.
 2019-07-09 14:44:30 +02:00
simon lehericey
ea79b9a595 typo: use ’ 2019-07-09 11:55:17 +02:00
simon lehericey
d36f6ebcd7 [fix #1709] A user can change its email 2019-07-09 11:55:17 +02:00
simon lehericey
d68d2be798 Profil: accessible to all roles 2019-07-09 11:55:17 +02:00
clemkeirua
39f72a2be3 courbage d'apostrophes 2019-07-09 10:59:42 +02:00
clemkeirua
44fa210e34 changement du choix particulier/entreprise lors de creation d'une procedure 2019-07-09 10:59:42 +02:00
Paul Chavard
ad0a74ea7c Fix dates in dossiers export 2019-07-09 10:02:08 +02:00
Pierre de La Morinerie
422f4b9cdb dossiers_controller: warn properly when instructing a dossier twice 
Fix #4055
 2019-07-08 17:58:45 +02:00
Nicolas Bouilleaud
930fd345de Validate messagerie_available? when creating a new Commentaire 
Commentaires bu Users and Gestionnaire need the messagerie to be available; Automatic system Commentaires can be created anytime.

This reintroduces Commentaire validation that was introduced in #3979 and disabled in #4018
 2019-07-08 16:13:43 +02:00
Nicolas Bouilleaud
3f439ac07a Add Commentaire.is_sent_by_system? and .is_sent_by(someone) 
And use it in CommentaireHelper and in the _message_icon and _message_issuer partials
 2019-07-08 16:06:44 +02:00
Nicolas Bouilleaud
2abd93d360 Display the full User email in Commentaires 
* Only redact gestionnaires’ emails
* Also, rename Commentaire.sender to Commentaire.redacted_email
 2019-07-08 16:06:44 +02:00
Nicolas Bouilleaud
3bf19de124 Remove Commentaire::columns override 
It was used for a cleanup migration a long time ago (see #233, #3033, #3043)
 2019-07-08 16:06:44 +02:00
Nicolas Bouilleaud
7e98213829 Pass the signed-in user as the commentaire author from /contact 2019-07-08 16:06:44 +02:00
Nicolas Bouilleaud
72fd5d250f Respect dossier.messagerie_available? in SupportController (/contact) 2019-07-08 16:06:44 +02:00
Nicolas Bouilleaud
12008728d2 Actually respect dossier.messagerie_available? in _messagerie.html.haml 
instead of dossier.archived?

(fixup after #3979)
 2019-07-08 16:06:44 +02:00
Chaïb Martinez
c43b0c00db minor text change [fix #4050] 
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-08 14:46:47 +02:00
Chaïb Martinez
94d340d25c Remove phone number 
Add chat link

Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-08 14:32:55 +02:00
Chaïb Martinez
0fdae2456b We will not quibble 
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-08 14:20:49 +02:00
Nicolas Bouilleaud
4d73275bab Drop Procedure.administrateur_id 2019-07-04 17:01:12 +02:00
maatinito
fee3ef8f4f A4 output and allows large logos (headers) to take the whole width of the page 2019-07-03 15:31:34 -10:00
Paul Chavard
05987223db Avoid crashing when demarche have no service 2019-07-03 17:18:44 +02:00
Paul Chavard
e582ff729c Add aasm to dossiers state 2019-07-03 13:37:27 +02:00
Mathieu Magnin
10d3ba10f2 Before save copy body in rich_body 2019-07-03 13:15:49 +02:00
Mathieu Magnin
d13b7f953f Migrate mail body to ActionText 2019-07-03 13:15:49 +02:00
Mathieu Magnin
b34f8fbe3d Add ActionText 2019-07-03 13:15:49 +02:00
simon lehericey
4b154983fb Landing: voir les démarches -> comment trouver ma démarche 2019-07-03 12:59:09 +02:00
Paul Chavard
860588b216 Upgrade javascript dependencies and add actiontext 2019-07-03 11:42:25 +02:00
simon lehericey
522d7684ea dossier state button in red when refused 2019-07-02 18:40:20 +02:00
simon lehericey
c7e10fc43f Manager: remove repasser_en_instruction 2019-07-02 18:40:20 +02:00
simon lehericey
b2c987ff0d [fix #3683] Dossier: add repasser_en_instruction! 2019-07-02 18:40:20 +02:00
simon lehericey
b79220e711 UI 2019-07-02 18:35:47 +02:00
Paul Chavard
8cb6b348a4
Update app/views/gestionnaires/procedures/_download_dossiers.html.haml 
Co-Authored-By: Nicolas Bouilleaud <nico@bou.io>
 2019-07-02 14:52:56 +02:00
Paul Chavard
fb0ef15e3c Export dossiers v2 2019-07-02 14:20:29 +02:00
Paul Chavard
46c1bbbc6f Official support for declarative demarches 2019-07-02 14:12:26 +02:00
Nicolas Bouilleaud
bd666a53af Reallow automatic Commentaires for archived/closed Dossier 2019-07-01 11:59:29 +02:00
Nicolas Bouilleaud
3fee1c7644 Fix UpdateAdministrateurUsageStatisticsJob not being properly scheduled 2019-07-01 11:14:26 +02:00
Chaïb Martinez
e7b868c16f Bug fix 
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-01 11:13:36 +02:00