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

661 commits

Author SHA1 Message Date
Paul Chavard
4feda01b6f Show section numbers only if none of sections start with numbers 2021-04-06 10:45:16 +01:00
Paul Chavard
d59867c73b Exposer plus d’informations dans l’interface pour certains champs 2021-03-17 16:28:05 +01:00
Christophe Robillard
f47e2e62cd add button role to supprimer link 2021-03-17 11:31:51 +01:00
Paul Chavard
70500e3d56 Groupe instructeur selector default blank 2021-03-09 14:47:23 +01:00
Paul Chavard
600f49a0ff Hide groupe instructeur selector when routage is done via API 2021-03-04 11:06:04 +01:00
Christophe Robillard
b8097e782a rend accessible la selection multiple usager 
en remplaçant select2 par ComboMultipleDropdownList
 2021-02-16 16:47:14 +01:00
Judith
6d89a83d14 unused locales clean-up 2021-02-04 12:15:13 +01:00
Paul Chavard
df475dc306 Make siren_siret on annuaire education optional 2021-01-27 15:25:58 +01:00
Paul Chavard
1bba12dc3a Make some annuaire education fields optional 2021-01-27 12:51:59 +01:00
Christophe Robillard
d8aaba9975 update entreprise annuaire link 2021-01-25 19:50:32 +01:00
Paul Chavard
9f691dce4c Set external_id from combo search inputs 2021-01-15 11:50:02 +01:00
Paul Chavard
91be115c70 Add annuaire_education champ ui 2021-01-14 17:57:48 +01:00
Paul Chavard
3c6e30a326 Show titre identite link only once watermark is added 2020-12-10 16:50:03 +01:00
Christophe Robillard
23ae528c6b affiche Madame ou Monsieur 
mais continue à enregistrer en base Mme ou M.
 2020-12-08 21:30:54 +01:00
Christophe Robillard
30b9d603bd presente la civilite par ordre alphabétique 2020-12-08 17:29:07 +01:00
Christophe Robillard
12d1a5bece implement ComboPaysSearch 2020-12-08 13:09:08 +00:00
Paul Chavard
371179dc5b Watermark titres identite 2020-11-25 16:19:06 +01:00
clemkeirua
64c964bf5e fix broken nil values in france_connect_informatio 2020-11-11 15:40:44 +01:00
kara Diaby
c033ef0910 Ajoute a l'information de connexion France Connect dans les informations du dossier ainsi que sur la demande usager 2020-11-05 19:30:13 +01:00
kara Diaby
4b2e3b5be7 Revert "Merge pull request #5710 from betagouv/revert-5705-feat/5701" 
This reverts commit aae77c77b0, reversing
changes made to 4c2c5c630c.
 2020-11-05 19:30:13 +01:00
Kara Diaby
f78e0ced3a
Revert "feat 5701 - Ajoute l'information lorsqu'un usager s'authentifie via France Connect" 2020-10-30 18:28:08 +01:00
kara Diaby
e6c1a20329 Ajoute l'information lorsqu'un usager s'authentifie via France Connect 2020-10-30 17:28:54 +01:00
kara Diaby
7d157eac12 Modifie la description dans le champ titre identité 2020-10-30 14:17:09 +01:00
Paul Chavard
8a2f079acb Implement ComboAdresseSearch 2020-10-08 15:26:14 +02:00
Paul Chavard
b6c94a3758 Implement ComboCommunesSearch 2020-10-08 15:26:14 +02:00
Paul Chavard
4217dcd94b Implement ComboDepartementsSearch 2020-10-08 15:26:14 +02:00
Paul Chavard
2c7ee82d31 Implement ComboRegionsSearch 2020-10-08 15:26:14 +02:00
Paul Chavard
a55be55c6a Add mandatory * to secondary value 2020-09-29 14:33:27 +00:00
kara Diaby
cb4e91c405 Add iban type de champ 2020-09-23 15:56:26 +02:00
kara Diaby
5c68d75107 add titre_identite champ 2020-09-18 14:57:08 +02:00
Christophe Robillard
4b86586ca0 add aria-disclosure for all dropdown buttons 2020-09-15 18:12:26 +02:00
Paul Chavard
bbcdff0ccf Use IGN plan v2 and add MNHN data sources 2020-09-15 14:39:02 +02:00
Fabrice Gangler
1a43f888fb Feat: allow to disable France-Connect 
Refs: #5440
 2020-09-01 15:51:10 +02:00
Pierre de La Morinerie
0800bf68d0 views: allow unselecting all values from a multiple dropdown 
Currently, deselecting all values from a multiple dropdown rendered as
checkboxes doesn't have any effect when submitting the form (the
previous values are still there, instead of being deselected).

This is because unchecked checkboxes are not sent by the browser – so
the "empty selection" never gets sent.

Rails `form.check_box` usually works around this by inserting an empty
hidden checkbox element, that will be sent even if all others are
de-selected. But the documentation warns that this is not possible when
iterating over an array (rather than a model). Which is our case here.

To fix this, this commit uses `collection_check_boxes` instead. It will
insert the proper hidden checkboxes in all cases, and fix our use case.

See https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-collection_check_boxes
 2020-08-27 11:13:40 +02:00
Pierre de La Morinerie
96037069ff autosave: remove the repetition row after deletion 
Before, when autosaving a draft, removing a repetition row would
send `_destroy` inputs to the controller – but not remove the row
from the DOM. This led to the `_destroy` inputs being sent again
on the next autosave request, which made the controller raise
(because the row fields were already deleted before).

To fix this, we let the controller response remove the deleted
row(s) from the DOM.

Doing it using a controller response avoids the need to keep track
of operations on the Javascript side: the controller can easily
know which row was just deleted, and emit the relevant changes for
the DOM. This keeps the autosave requests robust: even if a request
is skipped (e.g. because of a network interruption), the next request
will still contain the relevant informations to succeed, and not let the
form in an unstable state.

Fix #5470
 2020-08-25 14:39:34 +02:00
Pierre de La Morinerie
4bba1f0660 views: add a "None" option to optional radio lists 
After clicking on a radio button option, it is impossible to revert to
the "None of the values selected" state.

However on non-mandatory fields, reverting to the no-selection value
should be possible.

To fix this, add an explicit "N/A" option.
 2020-08-25 11:42:30 +02:00
Pierre de La Morinerie
50f61ee37b views: remove "Select a value" text on radio lists 
This text:

- Isn't present on other form controls
- Should only be displayed if the field is mandatory anyway
 2020-08-25 11:42:30 +02:00
Christophe Robillard
abe62398b6 very light client-side validation for phone 2020-08-20 15:33:03 +02:00
Judith
206646f765 date champs: adding a placeholder for IE and Safari (which do not support the input type date) 2020-08-19 14:10:58 +00:00
Judith
c27b2da90b datetime type de champ: changed the years range from [1950;2100] to [to current year - 1; 
current year + 50] (or [entered_date; current_year + 50] if old date already entered) because:
The type_de_champ Datetime is used for close future dates and very close past dates (for accident declaration for ex.)
The select currently has a range from 1950 to 2100, so 70+ years not supposed to be used, leading to:
- many bad data entered (0000 or 1950 to not scroll)
- making it difficult for users to give the proper date (current date is lost in the middle of 149 others) so risk to be lazy and select a random one or genuinely make a mistake
 2020-08-13 13:41:45 +00:00
Christophe Robillard
eea5fd66ad corrige mise en forme commentaire 2020-08-10 17:36:23 +02:00
Kara Diaby
4afc07c677
Merge pull request #5403 from tchak/add-carte-ign 
Add carte ign
 2020-08-03 11:04:32 +02:00
jpoulvel
bf94cc021b
Merge pull request #5424 from betagouv/new_design_edit_attestation 
New design page admin/attestation_templates/edit
 2020-07-31 11:18:22 +02:00
Paul Chavard
4c87e547b3 Put IGN map behind a feature flag 2020-07-30 17:22:28 +02:00
Keirua
b3e98048f9
Merge pull request #5418 from betagouv/mise-en-avant-france-connect 
#5428 - France connect avant les boutons de login/signup
 2020-07-30 10:32:12 +02:00
jpoulvel
62e04a6ca9
Merge branch 'dev' into new_design_edit_attestation 2020-07-30 09:53:09 +02:00
Judith
b8a49e9012 creation of attachment_upload_helpers and integration in the code 2020-07-29 12:26:27 +02:00
clemkeirua
b8eea05163 ajout de traductions 2020-07-29 09:27:16 +02:00
clemkeirua
c07ce374a8 france connect avant les boutons de login/signup 2020-07-29 09:18:51 +02:00
clemkeirua
de1df85462 suppression du message d'alerte suite aux problèmes d'upload 2020-07-27 10:32:03 +02:00
clemkeirua
c1208add62 remplacement de demarches-simplifiees.fr par un paramètre dans les vues 2020-07-23 16:16:36 +02:00
clemkeirua
bc34905742 fix heading order by removing useless h4 2020-07-20 11:36:55 +02:00
Pierre de La Morinerie
d25e173f11 attachment: disable Delete button during request 
Prevent users from clicking the Delete button more than once.
 2020-06-29 12:28:53 +00:00
Paul Chavard
97f91513c8 Store drop_down_list values as jsonb 2020-06-25 13:14:17 +02:00
clemkeirua
6b3631dbfe extract rendering condition 2020-06-24 14:11:58 +02:00
clemkeirua
5c39f22417 seuil d'affichages des checbox/radio à 5 elements 2020-06-24 12:18:56 +02:00
clemkeirua
342129c893 display small multiple selects as checkboxes 2020-06-24 12:18:56 +02:00
clemkeirua
22fc4c4195 display small selects as radio buttons 2020-06-24 12:18:56 +02:00
Judith
af60b1dddc help_dropdown_procedure contains now a <button> and not a <div>, which makes it accessible for keyboard navigation 2020-06-18 11:17:39 +02:00
Judith
19e54a73b0 replacing ' with ’ in text 2020-06-16 14:39:27 +00:00
Judith
ef242649c6 homogenization of the mandatory-explanation 2020-06-16 14:39:27 +00:00
Paul Chavard
0c16a9b1a6 Remove quartiers_prioritaires and parcelles_agricoles from the geo areas list 2020-06-10 17:26:09 +02:00
Paul Chavard
711a80746d Display geo areas descriptions 2020-06-10 17:26:09 +02:00
Paul Chavard
83baa58aa6 Add editing flag to geo areas list 2020-06-09 18:45:45 +02:00
Christophe Robillard
95cca8e0d5 affiche les chiffres clés des 3 derniers bilans 2020-06-09 17:51:54 +02:00
Christophe Robillard
75b24fbad5 suffixe les libellés par ':' 2020-06-09 17:01:03 +02:00
Christophe Robillard
81fa1d0e89 utilise un ordre plus logique pour identite entreprise 
homogenise l'affichage des valeurs monétaires
elargit la colonne libellé
 2020-06-09 16:59:57 +02:00
Paul Chavard
901b6e23a8 Remove legacy carto 2020-06-04 16:03:23 +02:00
Christophe Robillard
23cc618dda export bilans for avis 2020-06-04 15:31:16 +02:00
Christophe Robillard
cf9d6ccf34 export bilans in ods and xlsx 2020-06-04 15:31:16 +02:00
Christophe Robillard
75a268aed6 show some info from bilans 2020-06-04 12:33:33 +02:00
kara Diaby
f104567619 Add 2 cards style for MapEditor + optim import gpx kml 2020-06-02 13:24:29 +02:00
Judith
d930124839 change procedure_auto_archive helper name and added a helper for 23 h 59 2020-05-28 13:22:02 +00:00
Judith
38eb60f2ac views: display auto-archive date on procedure description 2020-05-28 13:22:02 +00:00
Christophe Robillard
d4bb5d1f56 indique à l'usager les pièces ajoutées au dossier 
- attestation sociale
- attestation fiscale
- bilans bdf
 2020-05-18 16:01:13 +02:00
clemkeirua
9454017dd9 afficher le nom du service en alt si possible 2020-05-18 14:17:21 +02:00
Paul Chavard
d44df9cc2a Fix map apercu 2020-05-14 14:28:54 +02:00
Christophe Robillard
aab4bb81ee return bilan bdf csv for expert 2020-05-11 13:05:50 +02:00
Christophe Robillard
cad8245540 fix bilans bdf link 2020-05-11 13:05:50 +02:00
Paul Chavard
05e408225b Implement atomic operations on MapEditor 2020-05-06 16:46:14 +02:00
Christophe Robillard
733e282e76 fix identite entreprise view 2020-04-30 16:53:33 +02:00
Christophe Robillard
22e2c2e133 render csv bidf bilans 2020-04-30 16:15:16 +02:00
Paul Chavard
ef2d9e1138 Expose stable_id on champ 2020-04-30 15:49:31 +02:00
Christophe Robillard
59357f2100 show attestations sociales and fiscales only for instructeurs 2020-04-30 11:53:17 +02:00
Christophe Robillard
3ddb5a4cb4 store attestation fiscale and display 2020-04-30 11:39:54 +02:00
Christophe Robillard
158b4802ab store attestation sociale and display 2020-04-29 16:25:47 +02:00
kara Diaby
9aea1fffee Migrate the map editor to mapbox-gl with react component 2020-04-27 11:30:32 +02:00
Paul Chavard
9cb612bb3d Show area and length on champ carto selections utilisateur 2020-04-23 10:21:18 +02:00
Christophe Robillard
453adf3c74 instructeurs: affiche l'effectif moyen annuel n-1 2020-04-23 09:53:27 +02:00
Christophe Robillard
85d119fa4d n'affiche plus le code effectif 2020-04-23 09:53:27 +02:00
Christophe Robillard
a507359f5c précise source pour effectifs mensuels 2020-04-23 09:53:27 +02:00
Christophe Robillard
149b98007f add effectif mensuel to graphql api 2020-04-21 21:13:07 +02:00
Christophe Robillard
db3ef195ad fetch and show effectif mensuel 
- fetch and store effectif mensuel (at the creation of the dossier or
when updating a siret field

- show effectif mensuel only for instructeurs
 2020-04-21 14:22:11 +02:00
Paul Chavard
22604013d0 Expose multiple user selections on champ carte 2020-04-15 18:07:09 +02:00
kara Diaby
d18bc1c421 Improve the mapbox-gl support detection for older browsers 2020-04-09 11:01:20 +02:00
kara Diaby
56e9834389 Revert "Revert "Revert "Revert "feat/4893 - migrate the mapReader to mapbox-gl with react"""" 
This reverts commit 473ed00b6c.
 2020-04-09 11:01:20 +02:00
kara Diaby
473ed00b6c Revert "Revert "Revert "feat/4893 - migrate the mapReader to mapbox-gl with react""" 
This reverts commit fe0b3c2215.
 2020-04-07 18:14:07 +02:00
kara Diaby
fe0b3c2215 Revert "Revert "feat/4893 - migrate the mapReader to mapbox-gl with react"" 
This reverts commit 3e21b78142.
 2020-04-07 18:11:11 +02:00
Pierre de La Morinerie
3e21b78142
Revert "feat/4893 - migrate the mapReader to mapbox-gl with react" 2020-04-07 15:32:14 +02:00
kara Diaby
aa56cfd7a0 migrate map to mapbox-gl with a react component 2020-04-02 15:39:47 +02:00
Pierre de La Morinerie
6417c0d2c0 dossiers: allow auto upload of attachments 2020-03-31 13:09:44 +02:00
Pierre de La Morinerie
f895570b00 dossier: make the upload label a real label 2020-03-25 14:43:09 +01:00
Christophe Robillard
72783fd8fd replace status_badge partial by status_badge helper 2020-03-25 10:19:07 +01:00
clemkeirua
6d02e6e9e8 replaced helper has_html_label? with inheritance 2020-03-24 16:54:36 +00:00
clemkeirua
2ecb9cd5a2 rename .label-not-label class into .form-label 2020-03-24 16:54:36 +00:00
clemkeirua
1a58dd69c2 replace html labels with h2 elements 
Some elements should not be html labels, for example when they include sub-elements that contain labels (ex: a radio button that has a label on its own). Those are replaced with title elements
 2020-03-24 16:54:35 +00:00
clemkeirua
62591623f4 ajout d'un label invisible pour le champ secondaire d'un menu déroulant lié 2020-03-24 16:54:35 +00:00
clemkeirua
2e4f003ac8 ajout d'un fieldset sur le champ civilité 2020-03-24 16:54:35 +00:00
clemkeirua
6a24a9b84e ajout d'un fieldset sur les champs oui/non 2020-03-24 16:54:35 +00:00
Christophe Robillard
8e7f210216 affiche infos entreprise uniquement si diffusable 
le champ de type siret affiche les infos d'une entreprise dont les infos sont diffusables uniquement aux instructeurs
 2020-03-17 15:57:02 +00:00
Christophe Robillard
924702699f highlight routing criteria label when updated 2020-03-04 14:56:59 +01:00
kara Diaby
9287188904 Fix the thousand separator in order to copy/paste without space 2020-02-17 11:31:12 +01:00
Pierre de La Morinerie
838133477e form: don't display index if the libelle already starts with a number 2020-02-13 11:21:30 +01:00
Pierre de La Morinerie
f8ed7ec051 form: display index of section in header 2020-02-13 11:18:46 +01:00
Pierre de La Morinerie
e3ba2ed96c Revert "form: add number to section headers" 
This reverts commit f42977e40a.
 2020-02-12 13:54:44 +01:00
Pierre de La Morinerie
66112eb14e dossier: add a link to the incident post-mortem 2020-02-12 11:49:33 +01:00
Pierre de La Morinerie
d4574bade1 dossier: add a custom message for the dossier owner 2020-02-12 11:49:33 +01:00
Pierre de La Morinerie
7ba76c6658 dossier: add a notice when some attachments of the dossier were lost 
On the 22/01/2020, a technical error on the demarches-simplifees.fr
instance made us delete some files attached to some dossiers.

This PR adds a warning when browsing a dossier containing attachments
that were deleted.
 2020-02-12 11:49:33 +01:00
Pierre de La Morinerie
f42977e40a form: add number to section headers 2020-02-11 17:36:50 +01:00
Pierre de La Morinerie
2b47013798 form: improve the appearance of the repetitions header 2020-02-11 17:36:50 +01:00
Pierre de La Morinerie
005ff4bed5 form: fix the bottom margin of the siret element 2020-02-11 17:36:50 +01:00
Pierre de La Morinerie
2532091302 form: improve wording of repetition blocks controls 2020-02-11 17:36:50 +01:00
kara Diaby
805da59b99 add thousand separators to numbers (instructors page and pdf file) 2020-02-10 09:32:37 +01:00
Paul Chavard
08400cdd4c Poll for export readiness updates 2020-01-29 22:52:03 +01:00
Pierre de La Morinerie
6eaf0f7804 dossiers: fix the sticky bar on IE 11 
This allows IE 11 users to see the draft autosave indicator.

The layout on IE 11 is still buggy though - but it's better than
nothing.
 2020-01-28 15:20:30 +01:00
Pierre de La Morinerie
eb9388d59f dossier: ensure the routing dropdown must be selected 
A blank routing dropdown nullify the groupe_instructeur – which
also removes the link between the dossier and the procedure.

Fix #4717
 2020-01-28 14:58:34 +01:00
Paul Chavard
14295db9ad Revert "Revert "Merge pull request #4552 from tchak/champ-communes"" 
This reverts commit 4373cb22cb.
 2020-01-14 18:46:07 +01:00
clemkeirua
4373cb22cb Revert "Merge pull request #4552 from tchak/champ-communes" 
This reverts commit 4cec26f73a, reversing
changes made to 0ef25ef36c.
 2020-01-13 16:26:27 +01:00
Paul Chavard
4bbd16576b Add champ communes 2020-01-07 11:52:51 +01:00
Paul Chavard
22aa2d4ee0 Make all location champs autocomplete 2020-01-07 11:52:51 +01:00
Paul Chavard
e5f582d644 Afficher la description du champ répétable 
fix #4579
 2019-12-04 14:28:31 +01:00
clemkeirua
9e44af70b5 minor typo in textareas 2019-12-03 10:13:16 +01:00
Paul Chavard
7b947feae4 Rename demarche archivée to demarche close 2019-11-28 15:07:16 +01:00
Paul Chavard
2cf415dc41 Simplify React components loader 2019-11-28 14:45:40 +01:00
simon lehericey
054181a16f Champ Repetition has no label, thus it's displayed as a section 2019-11-21 15:34:59 +01:00
simon lehericey
bc85e9b7ec Use aria-describedby to link notice and input again 
https://www.w3.org/WAI/tutorials/forms/instructions/#using-aria-describedby
 2019-11-21 15:34:59 +01:00
simon lehericey
84b125d272 p cannot be included in label 
The main problem come from
%label{for: input_id}
  #{champ.libelle}
  %span.notice= string_to_html(champ.description)
%input

where string_to_html contains p tags

The proposed solution is
%label #{champ.libelle}
%p.notice
%input

It should be iso in the graphic sense.
 2019-11-21 15:34:59 +01:00
simon lehericey
d5da7916e5 Placeholder not allowed in date input 2019-11-21 15:34:59 +01:00
simon lehericey
f45ede7f44 href should not contain space 2019-11-21 15:34:59 +01:00
Pierre de La Morinerie
bff7892ba8 dossiers: autosave drafts 2019-11-21 14:00:06 +01:00
Pierre de La Morinerie
8b8a96abda dossiers: save draft by default (instead of submitting) 
Make the default behavior of `update_brouillon` be to update the draft,
instead of submitting the dossier.

This makes all requests made to `update_brouillon` without specifying
an extra `submit_draft` parameter to just save the draft. It will make
autosaving the draft easier and safer.
 2019-11-20 11:24:31 +01:00
Pierre de La Morinerie
03a7bc3d5a dossiers: give the edit form an unique id 2019-11-20 11:24:31 +01:00
simon lehericey
59d5cd7abc fix label > div by label > span 2019-11-19 15:14:06 +01:00
simon lehericey
45ff1fd697 Change span by div to fix Element p not allowed as child of element span 2019-11-19 15:14:06 +01:00
simon lehericey
4a5059ed34 Add alt='' to decorative image https://www.w3.org/WAI/tutorials/images/decorative/ 2019-11-19 15:14:06 +01:00
simon lehericey
9f6b9c5028 Make the help button accessible for keyboard 2019-11-19 15:14:06 +01:00
benjaminhenkel
2f6b1fa302 Maj message quand messagerie désactivée 2019-11-18 14:28:05 +01:00
simon lehericey
9c7feae0b2 RGAA fix : 9.1.2 Dans chaque page Web, la hiérarchie entre les titres (balises h ou balise possédant un role ARIA "heading" associé à une propriété aria-level) est-elle pertinente ? 2019-11-06 17:01:07 +01:00
simon lehericey
79968f12fb RGAA A : h4 => span in top dropdown item to respect title hierarchy (9.1.2) 2019-11-06 17:01:07 +01:00
Chaïb Martinez
47b177fd31 RGAA A : L'attribut alt est absent pour le logo des demarches 
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-11-06 16:50:10 +01:00
Pierre de La Morinerie
817662f7d9 procedure: move description to views/shared 
Now that the description is used not only in the layout, but also in the
procedure form, better to make it an official shared partial.
 2019-10-31 10:27:19 +01:00
Pierre de La Morinerie
2e0ef84941 images: rename 'attachment' icon to 'attached' 
This avoids conflicts with the 'attachment' component.
 2019-10-31 10:27:19 +01:00
Pierre de La Morinerie
1c61f2de58 views: refactor the attachment/edit view 
Make it more reusable, by:

- Renaming `attachment/update` to `attachment/edit`
- Refactoring the CSS styles into their own stylesheet
- Allow to specify the 'accept' option
 2019-10-31 10:27:19 +01:00
Pierre de La Morinerie
dc1f3b4220 champs: add a "plus" icon to the "Add row" button 2019-10-24 16:52:29 +02:00
Pierre de La Morinerie
906f0fc468 champs: fix margin of "Add row" button in the Preview 2019-10-24 16:52:29 +02:00
simon lehericey
18de25fac7 Display the dossier.groupe_instructeur.label on various screens 2019-10-17 15:48:14 +02:00
simon lehericey
b7434c3132 User can choose its gi 2019-10-17 15:48:14 +02:00
Paul Chavard
e7ed408e08 Auto-link valeur des champs 
closes #2865
 2019-10-07 21:20:24 +02:00
Nicolas Bouilleaud
650e973d0a Fix plural in entreprise(s).data.gouv.fr 2019-09-24 16:20:34 +02:00
Vini75
9968eb69c0
Adjust link to entreprisedatagouv 2019-09-24 16:14:23 +02:00
Vini75
606c084914
Add link to entreprises datagouv.fr 2019-09-24 15:49:25 +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
d2a78abc3a [fix #3975] set buttons floating in dossier page 2019-09-17 16:58:11 +02:00
Paul Chavard
d8402fbd2c Remove last reference to commentaire.file 2019-09-10 10:49:12 +02:00
clemkeirua
6849fd6afe change le texte de la messagerie selon le type d'utilisateur 2019-09-09 16:25:02 +02:00
maatinito
ae059dc029 Corrected placeholder on champ carte 2019-08-27 15:13:10 +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
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
maatinito
8d3e3baabc #3928 administrator new & edit pwd pages 2019-08-01 17:12:14 +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
bcd5182446 dossier: hide the draft explanation when already submitted 2019-07-29 10:54:19 +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
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
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
36eca3d059 dossier: rename the "Submit" action 2019-07-15 17:18:28 +02:00
Paul Chavard
3cb39c2840 Refactor message attachements to use active_storage 2019-07-10 15:35:29 +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
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
Paul Chavard
05987223db Avoid crashing when demarche have no service 2019-07-03 17:18:44 +02:00
Nicolas Bouilleaud
bd47bf2691 Disable Messagerie in archived Dossiers and procedures 
* Use the existing Dossier#messagerie_available? method
* Raise when attempting to build a Commentaire if not messagerie_available?
* Disable the Messagerie form if not messagerie_available?
* Add tests :)
* Tweak the Horaires formatting while we’re here.
 2019-07-01 09:39:39 +02:00
Paul Chavard
c5704fa22f Remove unused code from Commentaire 2019-06-25 17:04:29 +02:00
Pierre de La Morinerie
9ce92d5c3b champs: show attachment actions only when the atachment is persisted 
Fix #3961
 2019-06-20 11:03:08 +02:00
Pierre de La Morinerie
1a832388fe brouillon: clarify the "How to save" explanations 2019-06-17 11:12:26 +02:00
pedong
7ef1a558f4 change date format for all, use try_format_date of helper 2019-06-12 17:48:12 +02:00
simon lehericey
ee296f2b44 Use default format for date and datetime champ 2019-06-12 17:48:12 +02:00
pedong
abcd58c35d [fix #3710] date with letter 
Co-Authored-By: simon lehericey <mail@simon.lehericey.net>
 2019-06-12 17:48:12 +02:00
Paul Chavard
5a216b5583 Fix default button type 
fix #3924
 2019-06-04 17:59:02 +02:00
Paul Chavard
ff44b7a600 Refactor purge pj to be more generic 2019-05-29 15:54:51 +02:00
Paul Chavard
6797c01b69 Properly handle justificatif_motivation case 2019-05-22 14:11:08 +02:00
Paul Chavard
f6421e081a Refactor attachment view 2019-05-21 14:21:13 +02:00
Paul Chavard
42235e81b1 Use active storage load hook to extend blob 2019-05-16 20:43:01 +02:00
clemkeirua
b3956bc072 introduce virus scans 2019-05-07 08:54:29 +02:00
clemkeirua
4aab72be68 implementation du systeme de PJ de motivation 2019-05-07 08:54:29 +02:00
maatinito
2308b3bc5c [Fix 3827] Champ Pays: la ligne de tirets ne devrait pas être selectionnable 2019-05-06 14:55:29 +02:00
Paul Chavard
91f2d7d706 Remove deprecated virus_scan model 2019-05-03 11:07:19 +02:00
Paul Chavard
6e8b9cf668 Refactor piece_jointe template to avoid repetition 2019-05-02 15:58:09 +02:00
Pierre de La Morinerie
e06e32238c api_entreprise: display a specific error message on network errors 2019-05-02 11:24:38 +02:00
Philémon
d533abedbc Ajout rappel enregistrement nécessaire 2019-04-18 10:25:16 +02:00
Mathieu Magnin
052bd9a9fc [Fix #3682] Remove placeholder on textarea champ 2019-04-08 16:30:16 +02:00
Pierre de La Morinerie
28dcbcb85b auth: move the FranceConnect button to a partial 2019-04-03 16:08:09 +02:00
Mathieu Magnin
8525761332 Revert english dates 2019-04-02 14:38:47 +02:00
Mathieu Magnin
7ed1e5ac82 [Fix #3692] Add HTML5 validation to ensure SIRET length is 14 2019-03-28 18:03:53 +01:00
clemkeirua
0d71120f98 [fix #306] Possibilité de joindre un document à un avis 2019-03-28 15:45:14 +01:00
Pierre de La Morinerie
d267d782b8 help: add administration contact on /commencer pages 2019-03-28 11:36:24 +01:00
Pierre de La Morinerie
e6351b5b1c help: move all partials to shared/help 2019-03-28 11:36:24 +01:00
pedong
f82fdef45f [fix #3342] format letter for date SIRET 2019-03-27 16:10:54 +01:00
pedong
fb29d30826 [fix #3342] show date with format letter 2019-03-27 15:27:20 +01:00
Paul Chavard
69a51e3296 Save SIRET data on search 2019-03-19 16:22:42 +01:00
Frederic Merizen
a8ce11a4d2 Add rel=noopener to links with target=_blank 
http://support.detectify.com/customer/portal/articles/2792257-external-links-using-target-_blank-
 2019-03-05 18:25:26 +01:00
Mathieu Magnin
a977e098d5 [Fix #3495] add update identité button 2019-03-05 14:52:12 +01:00
Mathieu Magnin
4f70292aed [Fix #1874] Add update SIRET button on edit page 2019-03-05 14:39:15 +01:00
Paul Chavard
4aef77788a Include blank for regions and pays 
fix #3523
 2019-03-05 11:08:09 +01:00
Pierre de La Morinerie
066672803b pj_link: fix an exception when the scan is not associated yet 2019-02-21 16:00:33 +01:00
Pierre de La Morinerie
1f636e4d59 piece_justificative: toggle file upload control 2019-02-19 18:02:27 +01:00
Pierre de La Morinerie
ae5e8810a5 piece_justificative: style links as buttons, and improve layout 2019-02-19 18:02:27 +01:00
Pierre de La Morinerie
62ef02183c pj_link: add an "attachment" icon to the link 2019-02-19 18:02:27 +01:00
Paul Chavard
aad685bb79 Show preview with correct type de champ options 
fix #3439
 2019-02-19 16:37:42 +01:00
clemkeirua
8ae468e8c7 ajout de la date de depot pour l'instructeur 2019-02-19 12:00:36 +01:00
Mathieu Magnin
b2f5ff8690
Merge branch 'dev' into fix_3417_departement_with_empty_value 2019-02-18 17:35:53 +01:00
Pierre de La Morinerie
d1f514c7b0 dossier: make clear when files are being uploaded 2019-02-18 15:31:08 +01:00
pedong
034929632b [fix #3417] add emtpy value for departement 2019-02-14 15:24:12 +01:00
clemkeirua
fcce8bd98c affichage de la surface cadastrale dans les cartes 2019-02-14 10:55:44 +01:00
Paul Chavard
f5c9b55c59 Move remove row button to the right and show button on previews 2019-02-07 13:10:29 +01:00
Paul Chavard
a0a1ce11c8 Add repetition to apercu 2019-02-07 12:29:27 +01:00
Paul Chavard
a9a853b669 Fix and simplify linked-drop-down-list js 2019-02-05 16:48:26 +01:00
Paul Chavard
071448e1d9 Champ Repetition dossier editor 2019-02-04 16:19:07 +01:00
Paul Chavard
a4a421a91a Champ Repetition dossier display 2019-02-04 15:46:39 +01:00
Mathieu Magnin
86a2a426bb
Merge branch 'dev' into fix_3282_datatime_with_empty_value 2019-02-01 11:45:45 +01:00
Pierre de La Morinerie
934368616c form: remove the "Delete draft" button 
Draft can now be deleted from the dossiers list. This is the best place
to delete it (as it allow to clean the list) – and it is better than
asking the user if they want to delete a draft *precisely while they
are filling the form*.
 2019-01-28 18:17:38 +01:00
pedong
ec76ff820b [fix #3048] add pattern for the champs phone 2019-01-24 18:48:57 +01:00
pedong
358c08ec29 [fix #3282] add empty value for type_champ datatime 2019-01-24 14:57:21 +01:00
Pierre de La Morinerie
5719107cbc views: fix misnamed textarea template 2019-01-10 11:26:43 +01:00
gregoirenovel
b4781f7440 Make dossier link clickable for users in the Demande tab 2019-01-08 12:32:27 +01:00
gregoirenovel
cc07f0d701 Add a blank line to improve readability 2019-01-08 12:32:27 +01:00
gregoirenovel
e4f10a3d2d Order a case statement alphabetically 2019-01-08 12:32:26 +01:00
gregoirenovel
66c633a1e5 Mutualize some code 2019-01-08 12:32:26 +01:00
gregoirenovel
5014e3f4c1 Move the display logic directly into the carte champ partial 2019-01-08 12:32:26 +01:00
gregoirenovel
dbbe2866d5 Extract the siret champ view in a partial 2019-01-08 12:32:26 +01:00
gregoirenovel
c1ebae3ee8 Extract the textarea champ view in a partial 2019-01-08 12:32:26 +01:00
gregoirenovel
e6e67dab35 Extract multiple_drop_down_list champ view in a partial 2019-01-08 12:32:26 +01:00
gregoirenovel
81d6e193e5 Extract the piece_justificative champ view in a partial 2019-01-08 12:32:26 +01:00
gregoirenovel
c7f2293c15 Extract the dossier_link champ view in a partial 2019-01-08 12:32:26 +01:00
gregoirenovel
004cdd4c43 Add highlights to all champs 2019-01-08 12:32:26 +01:00
gregoirenovel
20ea577a66 Remove a case that can be handled by the general case 2019-01-08 12:32:26 +01:00
gregoirenovel
f9df32d72e Use c.to_s instead of value, to avoid confusion 2019-01-08 12:32:26 +01:00
gregoirenovel
f5a31be36a Remove the now useless #formatted_value method 2019-01-08 12:32:26 +01:00
gregoirenovel
9a2341c56c Remove the useless #for_display proxy method 2019-01-08 12:32:26 +01:00
gregoirenovel
2e6c91e9b0 Move #selected_options to the only relevant model 2019-01-08 12:32:26 +01:00
gregoirenovel
c4b9a0b79e Rename DropDownList#selected_options_without_decorator 2019-01-08 12:32:26 +01:00
Pierre de La Morinerie
be1567ecbd messages: improve wording of the "Send" button 2019-01-07 16:20:23 +01:00
Pierre de La Morinerie
46b4d3c46b messages: fix Send button being clipped on mobile screens 2019-01-07 16:20:23 +01:00
gregoirenovel
b41764ec03 Remove ChampDecorator 2019-01-03 12:08:25 +01:00
Paul Chavard
5d1c24f3d8 Add type de champ repetition models (with row) 2018-12-19 15:31:11 +01:00
Mathieu Magnin
5ab0853f1c Harmonize user champ pj purge route to gestionnaire 2018-12-14 11:38:59 +01:00
Mathieu Magnin
edf3eefa87 Fix Sentry 114, Instructeur can delete pj in private champs 2018-12-13 17:27:05 +01:00
simon lehericey
db6c86b242 DossierController: user can destroy pjs 2018-12-06 10:45:10 +01:00
Paul Chavard
a08f170dbd Assign users and gestionnaires to commentaires 
fix #2052
 2018-12-05 13:40:57 +01:00
Paul Chavard
e873b6a9c4 Expose selection utilisateur size on champ carte 2018-12-03 12:49:03 +01:00
Paul Chavard
c6ef30f3e1 Remove unused carto from instructeur interface 2018-11-27 16:11:25 +01:00
Paul Chavard
18815e88a3 Rename champ.zones to champ.geo_json 2018-11-20 10:53:14 +01:00
Paul Chavard
2462e42b53 Stop using legacy api carto after migration 2018-11-20 10:53:14 +01:00
Paul Chavard
074050a91a Add IntegerNumberChamp 2018-11-06 11:28:44 +01:00
Paul Chavard
45bfb2fd47 Add DecimalNumberChamp 2018-11-06 11:28:44 +01:00
Frederic Merizen
06a667f353 [Fix #2815] Ne pas parler de plusieur PJs quand il n'y en a qu'une 2018-10-30 11:19:17 +01:00
simon lehericey
3dad743d56 remove localtime as it uses server timezone 2018-10-26 10:10:20 +00:00
simon lehericey
f620e4aee2 DateTime.parse => Time.zone.parse 2018-10-26 10:10:20 +00:00
simon lehericey
13ffa61435 DateTime.now => Time.zone.now 2018-10-26 10:10:20 +00:00
Paul Chavard
c0344fc30e Fix procedures with multiple dossier link champs 2018-10-24 10:44:28 +02:00
Paul Chavard
5a8a4b393f Add RPG carte source 2018-10-23 18:13:44 +02:00
Paul Chavard
b40abaa133 Display carte champ value 2018-10-23 09:35:25 +02:00
Paul Chavard
4a097900d2 Implement carte champ editor 2018-10-23 09:35:25 +02:00
Paul Chavard
99e1a20d98 Add champ carte endpoint 2018-10-23 09:35:25 +02:00
Paul Chavard
f28cfdc779 Rename shared folder carto to carte 2018-10-23 09:35:25 +02:00
gregoirenovel
3a973999a3 [Ref #2738] Hide exercices if not gestionnaire 2018-10-17 15:07:29 +02:00
gregoirenovel
da4037b2fd Add a blank line 2018-10-17 12:24:00 +02:00
Paul Chavard
c63675461a Add new carto init code 2018-10-14 12:34:43 +02:00
Paul Chavard
5a2a18d8f1 Remove previous carto init code 2018-10-14 12:34:43 +02:00
Paul Chavard
e3e83b6021 Allow link to any dossier 2018-10-04 19:53:10 +02:00
Pierre de La Morinerie
cd938b4c36 dropdown: refactor to make the button an actual button 2018-09-27 17:43:08 +02:00
Pierre de La Morinerie
0995c8e5ad dossier: extract the invitation dropdown to a partial 2018-09-24 16:29:36 +02:00
gregoirenovel
09196d12c3 Open the notice in a new tab 2018-09-21 15:57:04 +02:00
gregoirenovel
2585485370 Move the dossier-edit class directly to the _edit.html.haml template 
So that when the partial included in
modifier.html.haml can also benefit from its
styling rules
 2018-09-21 10:35:20 +02:00
Paul Chavard
905a715e16 Fix dossier link 2018-09-20 16:05:40 +02:00
Paul Chavard
539f15af92 Fix new lines in confirm dialogs 2018-09-19 14:45:10 +02:00
Paul Chavard
55a9b31b93 Cleanup SIRET champ 2018-09-12 15:53:02 +02:00
gregoirenovel
f9230b85b2 Change CommentaireHelper#commentaire_is_from_me_class’s signature 2018-09-12 10:09:16 +02:00
gregoirenovel
c1bec7cf0b Pass the connected_user object instead of its email 2018-09-11 18:17:40 +02:00
gregoirenovel
94e5f856d3 Extract some CSS in a .message class 2018-09-08 10:12:28 +02:00
Paul Chavard
c49db4b5a4 Add a champs/dossier_link endpoint and use it to fetch dossier info 2018-09-07 19:41:33 +01:00
Paul Chavard
5dadaa1a8d Show brouillon tag on procedure names in user and instructeur lists 2018-09-07 11:21:50 +01:00
Pierre de La Morinerie
1da0321c26 messagerie: never display full sender email 
See #2307
 2018-09-07 12:02:26 +02:00
Pierre de La Morinerie
353ab812fc messagerie: fix 'Invité' label in message sender 2018-09-07 12:02:26 +02:00
Pierre de La Morinerie
211674435e messagerie: better format message dates 2018-09-07 12:02:26 +02:00
Pierre de La Morinerie
a6aac28b66 messagerie: move "Send" button to the right 2018-09-07 12:02:26 +02:00
Pierre de La Morinerie
6cd88db853 messagerie: make "Send" button primary 2018-09-07 12:02:26 +02:00
gregoirenovel
9c6a66ae75 Change the route for DossierController#modifier 
If we submit the form, and there’s an error, the
URL would be `/dossiers/:id`, therefore
`dossier_path(dossier)`, so the Résumé tab would
be active, not the messagerie tab. This change
prevents this behaviour.
 2018-09-07 11:30:00 +02:00
gregoirenovel
1341074325 Add DossierController#update 2018-09-07 10:19:10 +02:00
gregoirenovel
338ffb8b50 DossierController#update → #update_brouillon 2018-09-07 10:19:10 +02:00
gregoirenovel
be3b9382e5 Rename status partial to status_badge 2018-09-05 14:10:13 +02:00
Pierre de La Morinerie
63472f00e6 messagerie: generalize the current user email 2018-09-05 13:56:12 +02:00
Pierre de La Morinerie
4e2a5f0b9b messagerie: move templates to a shared location 2018-09-05 13:56:12 +02:00
gregoirenovel
b9a32633bb Rename a file with a more explicit filename 2018-09-05 10:09:59 +02:00
gregoirenovel
81e94ca631 Improve _status.html.haml 2018-09-05 10:09:59 +02:00
gregoirenovel
66af573ca4 Add a warning in the attachements part of the form 2018-08-31 00:10:16 +02:00
Frederic Merizen
37c45f0d29 [#2486] Always order champs 
to help activerecord cache the champs collection
 2018-08-30 14:13:32 +02:00
gregoirenovel
89af9c2b36 Remove extra blank lines 2018-08-30 13:16:14 +02:00
gregoirenovel
2d3b553e4d Use enum to the fullest with TypeDeChamp.type_champs 2018-08-29 17:31:08 +02:00
gregoirenovel
a86e3a3156 Don’t change a button’s text when disabled after click 2018-08-23 10:59:11 +02:00
Paul Chavard
e1f1827320 Replace typeahead with simpler autocomplete 2018-08-22 17:17:33 +02:00
Pierre de La Morinerie
2e762e268e views: add tab_item and active_tab_item helpers 2018-08-16 16:36:37 +02:00
Pierre de La Morinerie
86539413ee gestionnaire: move dossier partials to a shared location 2018-08-14 15:06:44 +02:00
Pierre de La Morinerie
1b7950058d dossier: add details résumé 2018-08-13 11:32:27 +02:00
Pierre de La Morinerie
1c02eca1be dossier: disable buttons without changing the label 2018-08-08 16:06:12 +02:00
Paul Chavard
8b79c32a55 Do not rely on javascript for form submits without direct upload 2018-08-07 16:58:49 +02:00
Pierre de La Morinerie
c8409ecb89 dossier: remove route hack for show 2018-08-07 12:15:38 +02:00
Pierre de La Morinerie
1cac0b80af invite: add button for invite someone to collaborate on a draft 2018-08-01 17:41:12 +02:00
Pierre de La Morinerie
0fa18c70bf form: extract the form header to its own partial 2018-08-01 17:41:11 +02:00
Pierre de La Morinerie
a399cef144 siret: make etablissement styled and visible 2018-07-30 17:49:00 +02:00
Pierre de La Morinerie
fcc7ffabcd siret: make validation error message red 2018-07-30 17:49:00 +02:00
Pierre de La Morinerie
0f1811dd4e dossier: add an button to delete a brouillon 2018-07-24 18:31:10 +02:00
gregoirenovel
ab2181ea13 [Fix #2280] Correct a typo 2018-07-20 10:23:34 +02:00
Paul Chavard
04821a6875 Disable Champ SIRET autocomplete for previews 2018-07-17 16:50:55 +02:00
Pierre de La Morinerie
0282994990 form: move the procedure notice link to a button 2018-07-11 17:13:18 +02:00
Mathieu Magnin
d113ca6ae4 Revert "Temporary fix to allow users to download files with extensions" 
This reverts commit 1fb1d92fe7.
 2018-07-11 15:46:22 +02:00
Pierre de La Morinerie
e5de401107 form: make the sample asterisk also red 2018-07-09 18:34:33 +02:00
Mathieu Magnin
1fb1d92fe7 Temporary fix to allow users to download files with extensions 2018-07-09 12:25:25 +02:00
gregoirenovel
bae4cd4f59 Fix a typo 2018-07-04 17:42:20 +02:00
Pierre de La Morinerie
f781399309 form: validate forms only when submitting dossier, not on draft saves 2018-07-02 12:30:27 +02:00
Mathieu Magnin
e694e7f9b9 [Fix #2145] When procedure is archived, usager should see a message explaining dossier submission is closed 2018-07-02 11:10:34 +02:00
Pierre de La Morinerie
0cebf60c46 [#1421] replace master/slave by primary/secondary 2018-06-27 17:02:46 +02:00
Frederic Merizen
dad3bc092b [#1421] linked dropdwon user view 2018-06-27 17:02:46 +02:00
Frederic Merizen
2f206af0d6 [#1421] Make label clickable for drop-down lists 2018-06-27 17:02:46 +02:00
Frederic Merizen
e99931527b [#1421] Move pays to PaysChamp 2018-06-19 15:20:01 +02:00
Frederic Merizen
0239f936d7 [#1421] Move departements to DepartementChamp 2018-06-19 15:20:01 +02:00
Frederic Merizen
5b59bce0b6 [#1421] Move regions to RegionChamp 2018-06-19 15:20:01 +02:00
Pierre de La Morinerie
426e61777c dossier: make the "Save changes" button title more meaningful 2018-06-19 13:46:43 +02:00
Pierre de La Morinerie
a4382ac198 dossiers: asterisque -> astérisque 2018-06-19 13:46:43 +02:00
Pierre de La Morinerie
3ba5d654ba editable_champs: move the label near the checkbox 2018-06-18 18:12:11 +02:00
Mathieu Magnin
6289a719ef Display virus scan status with pj champs 2018-06-12 15:12:39 +02:00
gregoirenovel
4e9565a5df Adds User#owns? 2018-05-31 14:39:43 +02:00
gregoirenovel
dc045bdefb [Fix #1808] Use &. where possible 2018-05-31 11:49:25 +02:00
Mathieu Magnin
cf36d7f1ed [Fix #1801] use the new string_to_html method 2018-05-24 18:05:41 +02:00
Paul Chavard
d99eed122d Use new models in controllers and views 2018-05-24 17:54:51 +02:00