DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
21830 commits 4 branches 1166 tags 84 MiB
Commit graph

3163 commits

Author SHA1 Message Date
simon lehericey
8c0d2bb8cb refactor: add request_logs methods 
it avoids having to change lograge.rb for adding an entry
 2023-11-08 17:49:09 +01:00
simon lehericey
a431287db0 chore: @current_user is set by authenticate_from_token 2023-11-08 16:50:09 +01:00
simon lehericey
daf1443b0c chore: remove duplicated private 2023-11-08 16:50:09 +01:00
krichtof
a6ea607e7a
Merge pull request #9566 from adullact/feature-ouidou/admin_creation_delegation_gestionnaire_page_children_management 
Feature ouidou/admin creation delegation gestionnaire page children management
 2023-11-08 15:13:10 +00:00
seb-by-ouidou
7a3a022ed4 feat: replace fail by flast alert 2023-11-08 13:54:40 +00:00
Lisa Durand
ac834b0c0a add confirmation page after publishing procedure for admin 2023-11-08 12:07:32 +01:00
Paul Chavard
a611852ebc
Merge pull request #9663 from tchak/legacy-browsers 
feat(traitement): add browser information
 2023-11-08 10:23:31 +00:00
Eric Leroy-Terquem
f7eeb21425
Merge pull request #9604 from demarches-simplifiees/etq-admin-je-peux-creer-une-regle-de-routage-de-plusieurs-lignes 
ETQ admin je peux créer une règle de routage de plusieurs lignes
 2023-11-08 08:28:34 +00:00
Paul Chavard
d93c624164 feat(traitement): add browser information 2023-11-08 00:09:38 +01:00
Paul Chavard
34a76d8afd feat(dossier): commune champ is an autocomplete now 2023-11-07 20:58:39 +01:00
Paul Chavard
b92ccc0a09 chore(adresse): improuve adresse data source 2023-11-07 20:58:39 +01:00
Eric Leroy-Terquem
4d95f49c82 chore(conditions): update controllers and routes 2023-11-06 15:25:45 +01:00
Lisa Durand
baaf4e3517
Merge pull request #9653 from demarches-simplifiees/fix-close-procedure-page 
[Fix] ETQ admin, je souhaite associer une démarche existante depuis le bouton "clore" du tableau de bord de la démarche
 2023-11-06 13:13:33 +00:00
Lisa Durand
be8303f1c4 feedback review - remove unused class and simplify method 2023-11-06 11:22:09 +01:00
Paul Chavard
026885ebcf feat(conditional): annotations can be conditioned by champs 2023-11-03 10:45:07 +00:00
Paul Chavard
99e22a8cbe log(graphql): log deprecated order argument usage 2023-11-02 15:01:34 +00:00
Paul Chavard
869d83dda9 feat(dossier): validate on change and revalidate on input 2023-10-31 17:52:00 +00:00
Lisa Durand
1de9130ab5 fix not displaying select on page close procedure and make the 2 buttons redirect to this page 2023-10-30 15:02:26 +01:00
krichtof
0daeca14e4
Merge pull request #9649 from demarches-simplifiees/9642-filter-dept 
En tant qu'admin, je peux filtrer les démarches par département
 2023-10-30 09:14:41 +00:00
krichtof
4a698f8264
Merge pull request #9616 from demarches-simplifiees/9525-remove-admin-from-manager 
ETQ superadmin, je peux supprimer un admin depuis le manager
 2023-10-27 12:21:23 +00:00
Christophe Robillard
ef4113f8f9 filter all demarches by departement 2023-10-27 14:15:03 +02:00
seb-by-ouidou
528c51cb5e feat: US4.3.9 children management 2023-10-26 10:46:18 +00:00
Paul Chavard
bd5356c9b6
Merge pull request #9565 from adullact/feature-ouidou/admin_creation_delegation_gestionnaire_page_group_gestionnaire_management 
Feature ouidou/admin creation delegation gestionnaire page group gestionnaire management
 2023-10-26 09:51:44 +00:00
mfo
ebea269f79
Merge pull request #9420 from mfo/US/chorus-tile 
amelioration(tuile.chorus): ETQ admin, je peux saisir le cadre budgetaire d'une demarche de subvention pour faciliter le rapprochement d'un export DS a un export Chorus
 2023-10-24 12:57:26 +00:00
mfo
0922e0987a review(maj): strip la valeur recherché sur les api chorus avant de le soumettre à l'API, et quelques maj de style 
Co-authored-by: Colin Darie <colin@darie.eu>
 2023-10-20 07:07:53 +02:00
Christophe Robillard
0b7d4452fd remove admin from manager 2023-10-19 09:14:44 +02:00
Martin
ecb3909e99 chorus(autocomplete): autocomplete sur le centre de cout, domaine fonctionnel, referentiel de programmation 2023-10-19 07:14:27 +02:00
Martin
87f435d2d3 amelioration(procedure.chorus): ajoute le form component pour le 'crud' du ChorusConfiguration 2023-10-19 07:14:27 +02:00
Martin
fea0cb1c60 amelioration(procedure.chorus): connecte la tuile a un controller basique ayant les ACL 2023-10-19 07:14:27 +02:00
Paul Chavard
29980ab130 fix(search): show a message if searching for deleted dossier 2023-10-18 12:55:10 +02:00
seb-by-ouidou
3c5e76e705 feat: US4.3 update and delete groupe gestionnaire 2023-10-18 09:51:04 +02:00
Martin
30bc4aa5d3 amelioration(champ.expression_reguliere): pas besoin d'executer la validation du champs expression reguliere dans controller, le validateur le fait sur le champ au moment de sauver le dossier avec le bon context 2023-10-16 08:53:52 +00:00
Kara Diaby
a26df43577 User : Ajoute le type de champ Expression régulière coté utilisateur 2023-10-16 08:53:52 +00:00
Kara Diaby
3b5bbb0779 Add new type de champ expression_reguliere with tests 2023-10-16 08:53:52 +00:00
Paul Chavard
89582d2e09 feat(dossier): use new combobox on champ adresse 2023-10-12 20:18:08 +02:00
seb-by-ouidou
ea7a5e6761 feat: US4.3.7.1 init manage gestionnaires of a group 2023-10-11 13:13:23 +00:00
seb-by-ouidou
d5637ac7aa feat: remove_gestionnaire 2023-10-11 09:38:42 +02:00
seb-by-ouidou
b100c8380e FEAT: init admins group 2023-10-11 09:38:42 +02:00
Colin Darie
2eabbebfba
Merge pull request #9586 from colinux/avis-perf 
Expert: accélère les pages de liste d'avis et d'affichage des dossiers
 2023-10-10 15:59:56 +00:00
Colin Darie
816a85800e
refactor(expert): preload dossier 2023-10-10 15:36:24 +02:00
Colin Darie
9985cdccec
refactor(expert): no n+1 user on avis index 2023-10-10 15:36:21 +02:00
LeSim
75d2ad9a4d
Merge pull request #9579 from demarches-simplifiees/previous_dossier 
ETQ usager, lorsque j'ai déjà des dossiers sur une procédure, la page de garde me donne de meilleurs liens
 2023-10-10 10:20:47 +00:00
krichtof
78058bc52a
Merge pull request #9550 from demarches-simplifiees/9542-reactivation-procedure 
ETQ admin, je suis averti que je ne peux pas réactiver une démarche tant que la date limite de dépôt de dossiers n'est pas dans le futur
 2023-10-10 09:45:51 +00:00
simon lehericey
6d550802db fix: 4 less queries 2023-10-10 11:28:29 +02:00
simon lehericey
9861f16a05 fix: avoid queries in the view 2023-10-10 11:28:29 +02:00
Colin Darie
5314af52f2
Merge pull request #9575 from colinux/exports-fix-dossiers-count 
ETQ instructeur: corrige le décompte du nombre de dossiers exportés une fois l'export généré
 2023-10-09 12:40:36 +00:00
Colin Darie
e3b05f7e20
Merge pull request #9556 from demarches-simplifiees/fix_conditionnal 
Administrateur : correction de l'affichage du bouton "logique conditionnelle" dans l'éditeur de champ
 2023-10-09 11:19:22 +00:00
Colin Darie
640f729413
feat(exports): persist instructeur requestor & dossiers count 2023-10-09 11:23:15 +02:00
Colin Darie
a2f18dff49 fix(pdf): preload dossier so PDF generation is much faster on big procedures 2023-10-03 18:29:55 +02:00
Colin Darie
28ebb045d8 fix(demande): preload dossier so page is much faster on big procedures 2023-10-03 18:07:20 +02:00
simon lehericey
564939e83a fix: allow conditional on first child of bloc based on the first champ 
The upper_coordinates were wrong in administrateur/type_de_champ_controller. The upper coordinates outside the bloc where missing.

with the following tdc:
- number
- bloc
  - text # this text can be conditioned by the number
 2023-10-03 15:17:50 +02:00
seb-by-ouidou
44b4b5d0ab feat: rename admins_group_manager to gestionnaire 2023-10-03 13:51:57 +02:00
seb-by-ouidou
e2f792b44b FEAT: init admins group 2023-10-03 13:51:57 +02:00
Christophe Robillard
ba56c79325 admin can't reactivate procedure if auto archive on past 2023-10-03 11:11:17 +02:00
Paul Chavard
619e545238
Merge pull request #9543 from colinux/fix-perf-instructeurs-home 
ETQ instructeur, la page de mes démarches est un peu plus rapide
 2023-09-29 17:51:55 +00:00
krichtof
428ae4a45a
Merge pull request #9507 from demarches-simplifiees/9449-signature-groupe-instructeur 
9449 ETQ instructeur ou admin, je peux apposer sur une attestation un tampon dédié à un groupe instructeur
 2023-09-29 14:20:46 +00:00
Colin Darie
04071073e5 refactor(instructeurs): faster procedures listing 2023-09-29 13:09:54 +02:00
Colin Darie
f942610d32
Merge pull request #9473 from demarches-simplifiees/create-export-page-V2-ldu 
[Export] Créer une page d'export et sortir les liens des dropdowns
 2023-09-28 17:15:31 +00:00
mfo
e1fe1188de
Merge pull request #9491 from mfo/US/better-error-summary 
amelioration(usagers.dossiers.erreurs): ETQ usager, lorsque je soumets un dossier avec des erreurs, le format des erreurs est au format du DSFR
 2023-09-28 17:01:09 +00:00
Martin
d8220395c8 amelioration(usagers.dossiers.erreurs): ETQ usager, lorsque je soumets un dossier avec des erreurs, le format des erreurs est au format du DSFR 
Update app/components/dossiers/errors_full_messages.rb
Update app/components/dossiers/errors_full_messages/errors_full_messages.html.haml

Co-authored-by: Colin Darie <colin@darie.eu>
 2023-09-28 17:50:47 +02:00
Colin Darie
d4198869fb
chore(exports): dropdown menu re-uses the same pending export or create a fresh one 
Pour permettre d'avoir des données fraiches dans un export tout
en conservant l'historique des exports,
la demande d'export depuis le menu créé toujours un nouvel export sauf:
- si un autre export identique est déjà en préparation
- si un autre export identique s'est terminé il y a moins de 5 minutes

Co-Authored-By: Lisa Durand <lisa.c.durand@gmail.com>
 2023-09-28 15:23:31 +02:00
Colin Darie
d9687f7418
chore(exports): minor wording improvements and clarifications 2023-09-28 12:35:26 +02:00
mfo
00a6d02d21
fix(exports): block exports page to super admins so they can't download exports 2023-09-28 12:35:23 +02:00
Colin Darie
3af93735a3
feat(exports): turbo poll for pending exports 2023-09-28 12:35:19 +02:00
Lisa Durand
58a143b2c7
improve wording and display for export page 2023-09-28 12:35:15 +02:00
Lisa Durand
282df1b44b
add link to export page in flash message for instructeur 2023-09-28 12:35:14 +02:00
Colin Darie
a867c9a998
feat(instructeurs): notification badge when a new export has been generated 
Co-Authored-By: Lisa Durand <lisa.c.durand@gmail.com>
 2023-09-28 12:35:13 +02:00
Colin Darie
edb030bb4c
refactor(exports): regenerating exports redirect (back) to exports page 
Co-Authored-By: Lisa Durand <lisa.c.durand@gmail.com>
 2023-09-28 12:35:11 +02:00
Colin Darie
fc66f4b05d
refactor(exports): drop useless exports relation dependency for exports dropdown 
Since the dropdown does not list download links anymore,
we don't have to pass them a dynamic exports list.

Co-Authored-By: Lisa Durand <lisa.c.durand@gmail.com>
 2023-09-28 12:35:08 +02:00
Colin Darie
82dd05c189
chore(exports): finders by groupe instructeurs compatible across exports components 
Co-Authored-By: Lisa Durand <lisa.c.durand@gmail.com>
 2023-09-28 12:35:07 +02:00
Lisa Durand
5a571a3535
create export page to list all the exports and remove links from the dropdown 2023-09-28 12:35:04 +02:00
Lisa Durand
a559bf54eb
Merge pull request #9517 from demarches-simplifiees/change-tabs-for-instructeur-dashboard-ldu 
[instructeur] Mettre en avant les démarches closes avec des dossiers à traiter
 2023-09-28 07:32:07 +00:00
Lisa Durand
91018d8f8f
Update app/controllers/instructeurs/procedures_controller.rb 
Co-authored-by: LeSim <mail@simon.lehericey.net>
 2023-09-27 16:51:07 +02:00
Lisa Durand
46e492496e
Update app/controllers/instructeurs/procedures_controller.rb 
Co-authored-by: LeSim <mail@simon.lehericey.net>
 2023-09-27 16:50:55 +02:00
Lisa Durand
a4c79e953b change 'published' tabs by 'en cours' to highlight closed procedure with 'en cours' files 2023-09-25 15:34:37 +02:00
Colin Darie
d231ec35f4 refactor(attestation): groupe instructeur add signature shared 
Co-Authored-By: Christophe Robillard <christophe.robillard@beta.gouv.fr>
 2023-09-22 10:24:16 +02:00
Colin Darie
4c7664d61c fix(admin): missing siret & service alert don't override action alert 
Co-Authored-By: Christophe Robillard <christophe.robillard@beta.gouv.fr>
 2023-09-22 10:24:16 +02:00
Colin Darie
934e86a465 refactor(attestation): groupe instructeur signature shared 
Co-Authored-By: Christophe Robillard <christophe.robillard@beta.gouv.fr>
 2023-09-22 10:24:16 +02:00
Christophe Robillard
c02e6f2a77 feat(groupe-instructeur): instructeur can add signature in attestation 2023-09-22 10:24:16 +02:00
Colin Darie
ad10335888 feat(groupe-instructeur): admin can preview signature in attestation 
Co-Authored-By: Christophe Robillard <christophe.robillard@beta.gouv.fr>
 2023-09-22 10:24:16 +02:00
Colin Darie
44578ba65c fix(attachment): keep direct_upload behavior in poll url 
Co-Authored-By: Christophe Robillard <christophe.robillard@beta.gouv.fr>
 2023-09-22 10:24:16 +02:00
Christophe Robillard
c121a8b2dc admin can add groupe_instructeur signature 2023-09-22 10:24:16 +02:00
Christophe Robillard
7529294845 fix: uninterlace only interlaced png 2023-09-22 10:24:16 +02:00
Christophe Robillard
46edaed6bc extract uninterlace_png method 2023-09-22 10:24:16 +02:00
seb-by-ouidou
d29bbf6d4f
Merge branch 'main' into feature-ouidou/existing_procedure_hidden_as_template 2023-09-21 15:53:38 +02:00
seb-by-ouidou
5b9423bab3 fix: remove hidden_at_as_template from filter 2023-09-21 13:50:23 +00:00
simon lehericey
4a17dec87b refactor procedure_controller 2023-09-20 14:11:10 +02:00
simon lehericey
40a15b9be4 refactor dossier_controller 2023-09-20 14:11:10 +02:00
simon lehericey
c248f96f31 fixup base controller 2023-09-20 14:11:10 +02:00
simon lehericey
118242dbd2 refactor api_controller 2023-09-20 14:11:09 +02:00
simon lehericey
2664c3671f api_tokens_controller: only use turbo 2023-09-20 14:11:09 +02:00
simon lehericey
9047c2a7de api_tokens_controller: extract become full_access 2023-09-20 14:11:09 +02:00
simon lehericey
9b440b6c44 api_tokens_controller: extract disallow_procedure 2023-09-20 14:11:09 +02:00
simon lehericey
2a109d3aa4 api_tokens_controller: use before_action set_api_token 2023-09-20 14:11:09 +02:00
simon lehericey
24fd12ed70 explicit about different contexts 2023-09-20 14:11:09 +02:00
simon lehericey
f434c6a6ad refactor: try base controller 2023-09-20 14:11:09 +02:00
simon lehericey
40ed59a231 rename find_and_verify => authenticate 2023-09-20 14:11:09 +02:00
simon lehericey
0b03ba4d68 remove v1/v2 api token logic 2023-09-20 14:11:09 +02:00
seb-by-ouidou
0d2cd0fe5d feat(procedure): hide as template 2023-09-19 11:21:27 +00:00
LeSim
e6f8400cfd
Merge pull request #9477 from demarches-simplifiees/can-route-from-epci-champ 
ETQ admin je peux router par département depuis le champ EPCI
 2023-09-19 08:21:26 +00:00
mfo
25d7333ac3
Update app/controllers/experts/avis_controller.rb 
Co-authored-by: Colin Darie <colin@darie.eu>
 2023-09-18 16:55:07 +02:00
Martin
aa10f23b43 correctif(expert.invite-autre-expert): ETQ expert, je ne pouvais pas demander d'autres avis d'expert 2023-09-18 16:23:42 +02:00
mfo
2e2782c8b0
Merge pull request #9478 from mfo/US/fix-manager-dossier-show 
correctif(manager#dossiers/show): ETQ superadmin, l'affichage d'un dossier pouvait timeouter car non préloadé
 2023-09-18 08:36:54 +00:00
Eric Leroy-Terquem
588143f9fd feat(routing): can create simple routing from epci tdc 2023-09-18 09:32:07 +02:00
Martin
720056e844 correctif(manager#dossiers/show): preload un dossier sur le manager 2023-09-15 11:34:20 +02:00
Eric Leroy-Terquem
0454d2066e
Merge pull request #9474 from demarches-simplifiees/can-route-from-commune-champ 
ETQ admin je peux router par département depuis un type de champ communes
 2023-09-15 08:18:24 +00:00
Lisa Durand
7311bcebb9
Merge pull request #9363 from demarches-simplifiees/dashboard-usager/make-search-work-with-procedure-filter 
[refonte usager] Tableau de bord - rendre recherche complémentaire avec filtre par procédure
 2023-09-13 12:55:42 +00:00
Eric Leroy-Terquem
370d853378 feat(routing): can create simple routing from communes tdc 2023-09-13 10:45:21 +02:00
Eric Leroy-Terquem
e255bb9929 refactor(routing): extract methods to create groups from tdcs 2023-09-13 10:22:00 +02:00
Eric Leroy-Terquem
c2beca7d6d feat(routing): can create simple routing from regions tdc 2023-09-13 10:22:00 +02:00
Kara Diaby
7472b17009 Autocomplete pour instructeurs qui veulent affecter un expert au dossier, avec tous les experts sollicités sur la démarche 2023-09-11 09:13:04 +00:00
krichtof
5aabce488b
Merge pull request #9425 from demarches-simplifiees/9356-service-gi 
ETQ Usager, je veux voir dans mon dossier les informations de contact de mon groupe instructeur
 2023-09-11 07:38:34 +00:00
Christophe Robillard
5b9fbf40ed fix: admin is redirected to admin groupe instructeur page 
after creating or editing groupe instructeur service
 2023-09-11 08:58:04 +02:00
Christophe Robillard
e9ff4292fa instructeur can destroy groupe instructeur service 2023-09-11 08:58:04 +02:00
Christophe Robillard
41b2c9355b instructeur can update contact information for groupe instructeur 2023-09-11 08:58:04 +02:00
Christophe Robillard
ba0d3fa678 instructeur can create contact information for groupe instructeur 2023-09-11 08:58:03 +02:00
Damien Le Thiec
be02dd965f Add link and query examples with identity prefill 2023-09-07 10:17:19 +02:00
simon lehericey
4cbb8e91f2 Workable draft prefill identity (no link or query help) 2023-09-07 10:17:19 +02:00
LeSim
d69636c411
Merge pull request #9230 from colinux/log-destroyed-dossiers 
Tech: log technique de la destruction de dossiers
 2023-09-06 14:17:57 +00:00
Colin Darie
20c7921abe
chore(log): log destroyed dossiers 2023-09-06 16:07:18 +02:00
Eric Leroy-Terquem
d0da808325 feat(routing): can add a routing rule with not_eq operator 2023-09-05 15:57:31 +02:00
Lisa Durand
f0821ce467 remove recherche action from user controller and route 2023-09-04 16:42:19 +02:00
Lisa Durand
5ff5923612 make dossiers search compatible with filter by procedure 2023-09-04 16:42:19 +02:00
Paul Chavard
3a54e44b57 fix(dossier): should refresh dossier footer when removing options from multiselect 2023-08-31 15:43:40 +02:00
LeSim
3e193675aa
Merge pull request #9392 from demarches-simplifiees/move-groupe-instructeur-validation-to-model 
Tech : déplace une validation sur le groupe d'instructeurs défaut du controleur au modèle
 2023-08-31 09:45:03 +00:00
Eric Leroy-Terquem
9978908195 fix(dossier): exclude brouillons from recherche 2023-08-30 14:12:19 +02:00
Martin
26045cdd5f amelioration(instructeur#activate_account): passage de la page de d'activation d'un compte instructeur au dsfr 2023-08-30 13:40:51 +02:00
mfo
62e5b1426a tech(review): des ameliorations sur le code merci a sim/colin 
Co-authored-by: LeSim <mail@simon.lehericey.net>
Co-authored-by: Colin Darie <colin@darie.eu>
 2023-08-30 13:40:51 +02:00
Martin
4974962abd amelioration(instructeur.connexion): ETQ instructeur, je peux redemander un lien de connexion securisé 2023-08-30 13:40:51 +02:00
Eric Leroy-Terquem
ca25788f07 feat(routing): use only department codes in routing rules 2023-08-29 15:50:42 +02:00
Eric Leroy-Terquem
8d0fffe44f refactor(type de champ): extract codes_and_names method 2023-08-29 15:50:42 +02:00
Eric Leroy-Terquem
2827db5263 feat(routing): can create simple routing from departements tdc 2023-08-29 15:50:42 +02:00
Eric Leroy-Terquem
5db4e733b5
Merge pull request #9408 from demarches-simplifiees/fix-public-logo-url 
Corrige l'url du logo public
 2023-08-29 12:50:15 +00:00
Eric Leroy-Terquem
5e5111d69b fix public logo url 2023-08-29 13:45:13 +02:00
Eric Leroy-Terquem
288fc84cbf feat(dossier): sort following instructeurs 2023-08-29 13:44:27 +02:00
Eric Leroy-Terquem
fc2c196cfa chore(groupe instructeur): move closed validation for defaut groupe to model 2023-08-21 16:31:54 +02:00
mfo
28de1a7453
Merge pull request #9396 from tchak/remove-piepdrive 
chore(pipedrive): remove pipedrive
 2023-08-14 09:26:50 +00:00
mfo
07b67679cc
Merge pull request #9376 from tchak/feat-public-logo 
feat(demarche): expose public logo url
 2023-08-14 08:36:16 +00:00
Martin
425d8867be amelioration(bulk_messages): ETQ instructeur, je peux envoyer un message aux usagers ayant un dossier en brouillon 2023-08-14 10:17:23 +02:00
Martin
05687e63ca amelioration(dossier.routage): assigne le groupe d'instructeur au moment de passer_en_construction! un dossier et ignore ce concept de pre-setter le groupe d'instructeur sur tout le reste de l'app 2023-08-14 10:17:23 +02:00
Paul Chavard
ca4066939c chore(pipedrive): remove pipedrive 2023-08-10 10:29:25 +02:00
Paul Chavard
b5f721912f fix(dossier): removing options from multiselect should update conditions 2023-08-03 17:05:42 +02:00
Lisa Durand
71f548dadb add usual traitement time on procedure description page 2023-08-02 14:28:20 +02:00
Paul Chavard
e9cb50d09c feat(api): add last_authenticated_at timestamp to api requests 2023-08-02 13:22:18 +02:00
Paul Chavard
7c3ca54e18 feat(demarche): expose public logo url 2023-08-01 15:31:49 +02:00
Eric Leroy-Terquem
7680d5093e feat(routing): create routing rule for dropdown other option 2023-07-27 15:42:43 +02:00
Eric Leroy-Terquem
4749b43697 refactor(routing): use drop_down_options 2023-07-27 15:42:26 +02:00
Christophe Robillard
ef7b0c7377 alert admin with procedures without service 2023-07-27 10:08:30 +02:00
Christophe Robillard
beaf5751bb alert admin with service without siret 2023-07-27 10:08:30 +02:00
Paul Chavard
8febb3d236
Merge pull request #9338 from demarches-simplifiees/user-dashboard/add-filter-by-procedure-outside-tabs 
[refonte usager] Tableau de bord - filtrer les dossiers par démarche
 2023-07-24 16:32:44 +00:00
Paul Chavard
8cdedded45 fix(dossiers): pluck procedure information for user dossiers 2023-07-24 16:48:05 +02:00
Paul Chavard
93d6bda4ed refactor: move submit en_construction logic to the model 2023-07-24 12:12:58 +02:00
Paul Chavard
a492d7f41e
Merge pull request #9337 from demarches-simplifiees/fix-procedure-query-for-instructeur-tabs 
[fix] Les demarches supprimées s'affichent encore dans l'onglet "en test" pour les instructeurs
 2023-07-24 09:11:01 +00:00
Lisa Durand
1290cf5f29 dont assign twice dossiers_visibles to make it clearer 2023-07-24 10:57:00 +02:00
Paul Chavard
312c792e0a refactor(instructeur): procedures tabs 2023-07-24 10:48:32 +02:00
Paul Chavard
03da5725d4
Merge pull request #9310 from demarches-simplifiees/feat-graphql-dossier-corrections 
API graphql: expose les demandes de corrections
 2023-07-21 22:00:42 +00:00
Paul Chavard
aa4865d566
Merge pull request #9332 from demarches-simplifiees/9062-flash-forbidden-access 
rend plus actionnable message d'erreur
 2023-07-21 14:49:05 +00:00
Colin Darie
5998cfe31f refactor(correction): rename kind => reason with default correction => incorrect 2023-07-21 16:45:47 +02:00
Lisa Durand
385d4b4fa5 fix search and add system spec 2023-07-20 17:13:22 +02:00
Lisa Durand
f89391eb7d fix deleted procedure that still display in draft tabs 2023-07-20 15:49:54 +02:00
Christophe Robillard
20d0585e31 rend plus actionnable message d'erreur 2023-07-19 18:16:04 +02:00
Lisa Durand
8ed1e97ee1 add filter by procedure for user for all tabs 2023-07-19 17:57:24 +02:00
simon lehericey
114bc9bd9b clean: remove unused var 2023-07-19 09:56:35 +02:00
Paul Chavard
1882f652d5 fix(dossier): do not create groupe instructeur assignements on brouillons 2023-07-18 16:54:00 +02:00
Paul Chavard
04160b5d44 chore(dossier_assignment): avoid n+1 queries 2023-07-18 16:54:00 +02:00
Eric Leroy-Terquem
7a95846cba feat(DossierAssignment): always add forced_groupe_instructeur when manual assignment 2023-07-18 16:54:00 +02:00
Eric Leroy-Terquem
0e58e10b82 refactor(DossierAssignment): move create_assignment to assign_to_groupe_instructeur 2023-07-18 16:54:00 +02:00
Eric Leroy-Terquem
96d17d03ec feat(DossierAssignment): create assignments when admin reaffect all dossiers 2023-07-18 16:54:00 +02:00
Eric Leroy-Terquem
082db0ed02 feat(DossierAssignment): create Assignment when admin reaffect dossiers 2023-07-18 16:54:00 +02:00
Eric Leroy-Terquem
488a932cd5 refactor(DossierAssignment): extract method create_assignment 2023-07-18 16:54:00 +02:00
Eric Leroy-Terquem
d6520249e1 feat(DossierAssignment): display groups labels in personnes impliquees view 2023-07-18 16:54:00 +02:00
Eric Leroy-Terquem
ac2043e920 feat(DossierAssignment): create assignment when manual assignment by instructeur 2023-07-18 16:54:00 +02:00
Lisa Durand
9bd6cea38d
Merge pull request #9313 from demarches-simplifiees/fix-dropdown-navbar-profile 
[fix] le dropdown pour les utilisateurs connectés
 2023-07-13 12:47:30 +00:00
Lisa Durand
77bdbf45bc
Merge pull request #9308 from demarches-simplifiees/add-tabs-for-instructeur-index-procedures 
ETQ instructeur mes démarches sont filtrées par onglet pour les retrouver plus facilement
 2023-07-13 08:49:23 +00:00
Lisa Durand
7b1b771b25 fix fropdown navbar profile 2023-07-12 18:07:10 +02:00
Lisa Durand
fced4194d6 add tabs to filter procedures on index for instructeur 2023-07-12 12:38:41 +02:00
Martin
ce9dbed663 amelioration(NotificationMailer): sort la creation des commentaire sur la messagerie du mailer [trop de prob possible sinon: au retry on dupliquait les commenaitres, si le mail foirait, on commentait pas etc...] 2023-07-11 15:11:40 +02:00
Colin Darie
6ce8428ac6
feat(sva): instructeur can flag a dossier as incomplete 2023-07-11 10:01:48 +02:00
Colin Darie
30df476791
fix(sva): ensure "en construction" + "en instruction" notifications when submitting at submission 
Pour le moment on conserve les 2 emails car l'email en construction
contient des informations spécifiques :
- l'attestation de dépôt
- potentiellement un contenu spécifique car il provient d'un template

Même remarque pour les démarches déclaratives.
 2023-07-11 10:01:47 +02:00
Colin Darie
afe373c6b4
feat(sva): transition to en_instruction when (re-)submitting a dossier 2023-07-11 10:01:46 +02:00
Colin Darie
8c210e6fc7
feat(admin): config sva/svr 2023-07-11 10:01:45 +02:00
Colin Darie
6cf9ea6459
Merge pull request #9256 from demarches-simplifiees/user-dashboard/change-design-from-table-to-tile-part-2 
[refonte usager] Tableau de bord - Changer design de tableau à tuiles
 2023-07-10 13:28:51 +00:00
Paul Chavard
d5820277c0 feat(cojo): add cojo type de champ 2023-07-10 14:57:34 +02:00
Paul Chavard
a9f431caa5 feat(dossier): implement champ polling 2023-07-10 14:57:34 +02:00
Lisa Durand
3d20ef6af9 remove specific partial for dossier transfers and use Dossier instead od DossierTransfer 2023-07-10 10:53:07 +02:00
Colin Darie
57fa4a6be9
fix(identite): warn user why he's redirected to identity path 2023-07-07 17:34:47 +02:00
Eric Leroy-Terquem
f959450477
Merge pull request #9244 from demarches-simplifiees/refactor-routing-update 
Tech : mise à jour du routage sans callback
 2023-07-04 09:39:00 +00:00
Eric Leroy-Terquem
1923eb7d23 feat(routing): filter with only one form 2023-07-04 10:04:55 +02:00
Eric Leroy-Terquem
1b5f3a67eb feat(routing): filter only groups to configure 2023-07-04 10:04:35 +02:00
Eric Leroy-Terquem
7598b0a513 remove previous routing sytem code 2023-07-03 14:58:45 +02:00
Eric Leroy-Terquem
b94e8edb67 refactor(routing): move toggle_routing to procedure model 2023-07-03 14:47:56 +02:00
Eric Leroy-Terquem
2eb3685d38 refactor(routing): do not disable instructeurs_self_management when reseting routing 2023-07-03 14:47:56 +02:00
Eric Leroy-Terquem
d6fea4ed95 refactor(routing): toggle routing when custom routing 2023-07-03 14:47:56 +02:00
Eric Leroy-Terquem
520050933e refactor(routing): toggle routing when simple routing 2023-07-03 14:47:56 +02:00
Eric Leroy-Terquem
f03d10e246 perf(routing): use instance variable of procedure 2023-07-03 14:47:56 +02:00
Eric Leroy-Terquem
5929c8354c refactor(routing): toggle routing when destroy group 2023-07-03 14:47:56 +02:00
Eric Leroy-Terquem
ebb48b0aec refactor(routing): toggle routing from controller 2023-07-03 14:47:56 +02:00
Lisa Durand
9338a73362 add possibility to override generated pj list by admin 2023-06-22 09:50:38 +02:00
Eric Leroy-Terquem
18054fe346 feat(routing): add view for dossier a reaffecter 2023-06-15 14:34:02 +02:00
Eric Leroy-Terquem
e7e702a574 feat(routing): add reaffecter_un_dossier 2023-06-15 14:34:01 +02:00
Colin Darie
f675d2d1a7
Merge pull request #9196 from colinux/fix-admin-publication-errors 
ETQ admin je veux voir les erreurs lorsque la (re-)publication échoue
 2023-06-14 09:56:46 +00:00
Paul Chavard
b3aeb46c1b fix(prefill): it should be possible to prefill a dossier on a test procedure 2023-06-14 09:14:12 +01:00
Colin Darie
889940af2a fix(administrateur): renders errors when publication fails 2023-06-13 19:11:59 +02:00
Eric Leroy-Terquem
5f1709f62d add a flash notice after reset draft 2023-06-13 09:34:48 +02:00
simon lehericey
44859b8217 fix(user dossiers index): do not crash with a deleted dossier and a discarded procedure 2023-06-12 13:57:28 +02:00
Paul Chavard
eac0e22c54 fix(carto): include champ carto modifications in fork diff and show submit button 2023-06-06 11:28:10 +02:00
Colin Darie
52c8553576
fix(dossier_correction): don't allow to save with a missing (invalid) commentaire 2023-06-02 16:18:33 +02:00
Colin Darie
734d88d80d
fix(pending-correction): wording alignement 2023-06-02 16:16:14 +02:00
Colin Darie
a32014d4fd
feat(correction): user can mark dossier en_construction as resolved 2023-06-02 16:16:14 +02:00
Colin Darie
8839ac7f76
fix(instructeur): pending_correction flag does not make messagerie unseen 2023-06-02 16:16:14 +02:00
Colin Darie
9565267170
feat(dossier): notify user by email about pending corrections 2023-06-02 16:16:13 +02:00
Colin Darie
ca3b127942
feat(instructeur): can flag a dossier as "pending corrections" 2023-06-02 16:16:12 +02:00
Eric Leroy-Terquem
6c188a867d run routing engine only at submit 2023-05-31 11:38:16 +02:00
simon lehericey
25ebfc4928 always set procedure.instructeurs_self_management_enabled to true when routing_enabled? 2023-05-31 11:38:16 +02:00
Eric Leroy-Terquem
692010fa32 destroy all groups but defaut 2023-05-31 11:38:16 +02:00
Eric Leroy-Terquem
526f70f9c0 add wizard 2023-05-31 11:38:16 +02:00
simon lehericey
01caa498d3 add simple_routing 2023-05-31 11:38:16 +02:00
simon lehericey
8b568c2035 add ajout 2023-05-31 11:38:16 +02:00
simon lehericey
6b3447d71b add options 2023-05-31 11:38:16 +02:00
simon lehericey
174f7a7c53 add one_groupe_management_component 2023-05-31 11:38:16 +02:00
simon lehericey
142ac9173d add groupes_search_component 2023-05-31 11:38:16 +02:00
Lisa Durand
a20ec44841
Merge pull request #9074 from demarches-simplifiees/add-more-info-on-procedure-description 
[Refonte page accueil demarche] Détailler la description pour plus de clarté pour l'usager
 2023-05-30 09:45:32 +00:00
simon lehericey
09d1649610 add groupe details to dossier 2023-05-26 14:10:54 +02:00
Lisa Durand
31969b290b create a new layout without procedure for login and use same layout full_screen without description for identite step 2023-05-25 16:15:31 +02:00
Lisa Durand
7340206f81 rollback - add just one new field and use actual description field 2023-05-24 11:31:24 +02:00
Paul Chavard
cf13b942e7
Merge pull request #9076 from colinux/fix-instructeurs-filter-avis 
ETQ instructeur je peux filtrer les dossiers par avis
 2023-05-24 08:05:07 +00:00
Paul Chavard
e1a25ee0e5 chore(sentry): read sentry release information from version file 2023-05-24 09:41:39 +02:00
Lisa Durand
6274594c70 add new layout to handle new full screen design 2023-05-23 16:49:37 +02:00
Eric Leroy-Terquem
00561999ec fix(type de champ): do not raise error if tdc already destroyed 2023-05-23 15:52:51 +02:00
Colin Darie
b1435e18a9
chore(sentry): set procedure id tag on instructeurs controller 2023-05-23 09:40:21 +02:00
Martin
d2e30911f7 bug(compteurs.avis.a.donner): ETQ expert, je ne souhaite pas avoir a donner un avis sur un dossier termine 2023-05-23 09:34:30 +02:00
Martin
1417d0e873 correctif(expert/avis#index): ETQ expert, je veux retrouver mes avis donnés sur des dossiers traités 2023-05-23 09:34:30 +02:00
Lisa Durand
4a51a9a351 add two more fields for procedure description what et and for_who 2023-05-22 15:36:48 +02:00
Martin
af19bbe8f5 correctif(users/dossiers/brouillon#submit): ETQ usager, je souhaite que chaque lien pointant vers une erreur de champ m'oriente sur le champ 2023-05-20 08:27:55 +02:00
Paul Chavard
a2e98f9065
Merge pull request #9051 from demarches-simplifiees/fix-bug-procedure-clone-validations 
[fix] Vider les champs invalides pour permettre de cloner une procedure
 2023-05-17 07:44:39 +00:00
Lisa Durand
7e39e8113b feedback PR Colin 2023-05-16 17:54:37 +02:00
Colin Darie
059dabb5ac fix(fork): don't fail when user submit twice en_construction (from 2 tabs) 2023-05-15 13:08:42 +02:00
simon lehericey
6148f24387 Revert "Merge pull request #9002 from tchak/feat-procedure-clone-preview-published" 
This reverts commit 7a6f46a8ad, reversing
changes made to 4513c52213.
 2023-05-12 11:29:11 +02:00
Colin Darie
79f450a422
Merge pull request #9021 from colinux/feat-en-construction-fork 
ETQ usager, je modifie et soumets à nouveau mon dossier “en construction"
 2023-05-10 19:46:40 +00:00
Colin Darie
b626714610
fix(dossier): submit en_construction render views in error with dossier origin 2023-05-09 18:49:53 +02:00
Colin Darie
ac43d78b08
feat(dossier): warn users currently editing their dossier en_construction during deploy they will need to refresh 2023-05-09 17:25:16 +02:00
Paul Chavard
71cfe094aa
fix(groupe_instructeur): always use assign_to_groupe_instructeur method 2023-05-09 17:23:23 +02:00
Paul Chavard
08a2a2c9aa
feat(dossier): fork dossier when editing en construction 2023-05-09 17:16:47 +02:00
Martin
386523019d amelioration(instructeurs/procedure#show): ETQ instructeur, je souhaite avoir les mêmes compteurs entreles pages listant mes demarches et la page pour visualiser une démarches 2023-05-09 13:59:49 +02:00
Lisa Durand
2b2d65de87
Merge pull request #8994 from demarches-simplifiees/add-simple-filter-for-usagers 
[refonte usager] Tableau de bord - Ajouter bouton filtres simples
 2023-05-09 08:06:15 +00:00
mfo
2374ced5d2
Merge pull request #8987 from mfo/US/link-to-errored-champs 
amelioration(dossier#submit_brouillon): ETQ usager, je souhaite pouvoir acceder aux champs en erreur facilement
 2023-05-09 07:06:36 +00:00
Paul Chavard
f563fb3269
Merge pull request #8990 from tchak/fix-limit-textarea-size 
ETQ administrateur, je veux pouvoir limiter le nombre de caractères dans les champs "texte long"
 2023-05-05 14:54:41 +00:00
Paul Chavard
fe041b4c6c fix(textarea): fix character limit option 2023-05-05 16:36:51 +02:00
Paul Chavard
471da7eb61 Revert "Revert "Merge pull request #8844 from demarches-simplifiees/feat/7739"" 
This reverts commit 909d726429.
 2023-05-05 16:36:51 +02:00
Paul Chavard
616188bfe3 feat(administrateur): when clone or preview procedure should use published revision if not the owned 2023-05-04 16:15:55 +02:00
Lisa Durand
c039414872 feedback PR review 2023-05-04 12:39:06 +02:00
Paul Chavard
88bb0cc532
Merge pull request #8989 from tchak/fix-presentation-filters 
ETQ Instructeur, je ne veux pas d'erreurs quand les filtres ne sont pas trouvés
 2023-05-04 08:45:56 +00:00
Colin Darie
93c08072ba fix(attestation): allow redirection to our static domain for attestation 2023-05-04 10:31:38 +02:00
Colin Darie
61ebb27e86
fix(redirect): allow other hosts when required 2023-05-03 11:35:31 +02:00
Nicolas Cavigneaux
940405cea8
fix: Avoid Brakeman warning about insecure redirect 2023-05-03 11:35:29 +02:00
Nicolas Cavigneaux
3aa6a5e28e
fix: url helper method calls for files 2023-05-03 11:35:28 +02:00
Martin
c8ab1e8e03 amelioration(dossier#submit_brouillon): ETQ usager, je souhaite pouvoir acceder aux champs en erreur facilement 2023-05-03 07:36:42 +02:00
Lisa Durand
24eca40f66 add from_depose_at filter 2023-05-02 10:32:38 +02:00
Lisa Durand
21ed6abcad add from_created_at filter 2023-05-02 09:37:03 +02:00
Paul Chavard
fc391fb553 fix(instructeur): no crash when filters not found 2023-05-01 11:34:11 +02:00
Paul Chavard
909d726429 Revert "Merge pull request #8844 from demarches-simplifiees/feat/7739" 
This reverts commit 04fbfa15b7, reversing
changes made to aac1cc7161.
 2023-04-28 16:08:24 +02:00
Lisa Durand
39f534b3d7 add states filter for usager 2023-04-28 15:28:04 +02:00
Kara Diaby
04fbfa15b7
Merge pull request #8844 from demarches-simplifiees/feat/7739 
Ajoute un compteur sur les champ texte
 2023-04-27 13:53:20 +00:00
Lisa Durand
aac1cc7161
Merge pull request #8971 from demarches-simplifiees/add-filter-for-usagers 
[fix] Pagination interface usager - onglets disparaissent si pas sur la page 1
 2023-04-27 13:46:15 +00:00
Paul Chavard
f9b8dac024 feat(champ): use new data-turbo-focus-group to manage focus on multiple drop down 2023-04-27 10:40:14 +02:00
Kara Diaby
f3f49941b6 Ajoute un compteur sur les champ de type textarea sur l'interface usager 2023-04-27 10:28:43 +02:00
Paul Chavard
cb752d1857 fix(dossier): do not bypass depositaire check on modifier path 2023-04-27 09:52:10 +02:00
LeSim
4c5e903673
Merge pull request #8887 from demarches-simplifiees/8839-filter-by-siret 
Filtrer les démarches par service
 2023-04-26 19:44:08 +00:00
Lisa Durand
74b28a995f paginate only dossiers that we display to fix empty tabs when not on page 1 2023-04-26 11:42:29 +02:00
Lisa Durand
26ff82dbe4 Merge branch 'main' of github.com:betagouv/demarches-simplifiees.fr into user-dashboard/add-alert-WIP-last-dossier 2023-04-25 13:01:40 +02:00
Martin
b5e6c3d02a correctif(instructeurs.annotations): pour un champ de type choix simple, l'ordre des parametres value, value_other doit etre respecté sinon le 'setters' Champs::DropDownListChamp.value= passe après le setter Champs::DropDownListChamp.value_other=, ce qui a pour effet de supprimer la value 2023-04-21 09:57:23 +02:00
Paul Chavard
586286cb08
Merge pull request #8916 from demarches-simplifiees/can-update-defaut-groupe-instructeur-2 
feat(routage): permet de changer le groupe par défaut
 2023-04-20 08:28:46 +00:00
simon lehericey
e64ac79f05 tech(refactor): much nicer code, thx LeSim 
root -> rooted_tree

depth_cach -> walk

smal refactor

comment

remove form for header_section

remove seen_at from header section

header_section: champ -> header_section

champ_subree: remove if not

remove root_depth use header_section_level_value instead

remove unused include

remove ChampTreeComponent

rename ChampsSubtreeComponent to SectionComponent

use TreeableConcern only in section component

remove fields_for_champ_component

champs -> tail

add split_section_champ helper

refactor(editable_champ::header_section): keep same interface everywhere

fix(repetition): add spec for SectionComponent on repetitions
 2023-04-20 08:22:02 +02:00
Martin
ad77b9321b amelioration(formulaire-usager): groupes les champs suivant un titre de section dans une balise html de type <fieldset> de sorte a améliorer l'accessibilite de la plateforme 2023-04-20 08:22:02 +02:00
Martin
b9faa26560 amelioration(editeur-de-champs): permet de choisir un niveau de titre (de 1 à 3) pour les champs de type Champs::HeaderSectionChamp. Gère les erreurs dans le cas ou un administrateur supprimerait un HeaderSection qui casserait l'ordre des titre [ex: titre 1,2,3. et l'admin supprime le titre 1 et il reste que 2,3]. 2023-04-20 08:22:02 +02:00
Paul Chavard
39ba03783a
Merge pull request #8928 from tchak/feat-api-public-stats 
ETQ citoyen, je voudrais avoir accès aux statistiques des démarches closes
 2023-04-19 19:11:34 +00:00
Paul Chavard
418d3b55d0 feat(stats): give access to stats on closed procedures 2023-04-19 18:31:58 +02:00
Paul Chavard
63b7a83689 feat(graphql): log dossier and procedure id on dossier fetch endoint 2023-04-19 18:00:08 +02:00
Colin Darie
9728493bda
Merge pull request #8924 from colinux/rubocop-upgrades 
Tech: update rubocop, active nouveaux cops Rails/*
 2023-04-19 13:37:10 +00:00
Eric Leroy-Terquem
aecd7559d2 feat(groupe instructeur): cannot disable default groupe instructeur 2023-04-19 13:52:42 +02:00
Eric Leroy-Terquem
09b05550ab feat(groupe instructeur): cannot delete defaut_groupe_instructeur 2023-04-19 13:52:42 +02:00
simon lehericey
3889bdac73 refactor(routing): remove unused routing_params 2023-04-19 13:52:42 +02:00
simon lehericey
b38470368b feat(routing): can change defaut groupe 2023-04-19 13:52:41 +02:00
Paul Chavard
8904516b85 chore(procedure): remove duplicate code 2023-04-19 13:00:37 +02:00
Colin Darie
bd8e8633e7
chore(rubocop): fix Rails/CompactBlank 2023-04-19 12:55:13 +02:00
Colin Darie
b273e7b67e
chore(rubocop): fix Rails/RootPathnameMethods and assimiled cops 2023-04-19 12:55:13 +02:00
github-merge-queue[bot]
a286af8a70
Merge pull request #8918 from tchak/graphql-add-error-codes 
ETQ intégrateur API, je voudrais avoir des codes d'erreur plus précis
 2023-04-19 09:00:32 +00:00
github-merge-queue[bot]
c439a286a8
Merge pull request #8902 from demarches-simplifiees/bug-disable-select-all-actions-multiples 
[bug] actions multiples > désactiver la checkbox select_all quand action en cours
 2023-04-18 21:52:21 +00:00
Paul Chavard
fbae6d941d feat(graphql): add error codes to graphql errors 2023-04-18 15:22:11 +02:00
Lisa Durand
c565ed415b change scope and alert location after UI modification 2023-04-18 12:03:10 +02:00
LeSim
c252748833
Merge pull request #8836 from demarches-simplifiees/improve-routing-rules-ux 
feat(routing): nicer and safer ?
 2023-04-17 08:23:15 +00:00
Paul Chavard
cb6875352e fix(dossier): désactiver la checkbox select_all quand action en cours 2023-04-14 17:41:22 +02:00
Lisa Durand
229ce67a5d
Add 'visible_by_user' - review PR 
Co-authored-by: Paul Chavard <paul.chavard@beta.gouv.fr>
 2023-04-14 10:10:22 +02:00
Paul Chavard
7054c2d9ef fix(demarche): always reset outside of transactions 2023-04-13 11:05:38 +02:00
simon lehericey
c02319aa56 feat(routing): reset value if target as changed 2023-04-13 10:28:53 +02:00
simon lehericey
e27e18fdaf refactor(routing): use selerialized logic in select value 2023-04-13 10:28:53 +02:00
simon lehericey
16565d099a refactor(routing): add groupe_instructeur helper 2023-04-13 10:28:52 +02:00
simon lehericey
8b832396a3 feat(routing): server side: prevent changing tdc type if used for routing 2023-04-13 10:28:52 +02:00
simon lehericey
c1f67499aa feat(routing): server side: prevent tdc deletion if used for routing 2023-04-13 10:28:52 +02:00
krichtof
78938b5a07 filter demarches by siret service 2023-04-12 18:53:57 +02:00