Commit graph

11865 commits

Author SHA1 Message Date
simon lehericey
d419508b68
fix: reduce a join query size 2024-04-15 10:34:39 +02:00
simon lehericey
120eb4253c
data: add naive maintenance task to cold storage dol 2024-04-15 10:16:14 +02:00
mfo
cb2dd3dd3a
Merge pull request #10314 from mfo/US/enhance-a11y-on-carte-champs
ETQ Usager je souhaite que le champ carte soit plus accessible
2024-04-14 13:25:06 +00:00
mfo
d4e8227827
Merge pull request #10312 from mfo/US/ensure-dsfr-style-on-some-champs
ETQ usager, je veux que tous les champs aient un style DSFR
2024-04-12 13:41:16 +00:00
mfo
3e89921683
Merge pull request #10315 from mfo/US/drop-usage-of-invalid-aria
ETQ usager : pas d'`aria-invalid`
2024-04-12 11:55:58 +00:00
mfo
f1935eb7a0
Merge pull request #10318 from mfo/US/better-error-messages
ETQ Usager, je souhaite avoir des messages d'erreur homogènes et comprehensibles
2024-04-12 11:55:39 +00:00
mfo
b9907ac9ce
fix(Champ.rnf): add missing fr-input dsfr class name
Co-authored-by: Corinne Durrmeyer <corinne@inseo.fr>
2024-04-12 12:01:00 +02:00
mfo
1989c3e75b
fix(Champ.carte): add missing label to search input instead of placeholder
Co-authored-by: Corinne Durrmeyer <corinne@inseo.fr>
2024-04-12 11:56:34 +02:00
mfo
d7cacde727
feat(champ.aria): do not use aria-invalid from time to time [standardization]
Co-authored-by: Corinne Durrmeyer <corinne@inseo.fr>
2024-04-12 11:54:09 +02:00
mfo
35c92ee906
feat(champs.errors.format): better format for error below champs
Co-authored-by: Corinne Durrmeyer <corinne@inseo.fr>
2024-04-12 11:50:43 +02:00
mfo
938f5043a4
feat(champs.validation): standardize champ error messages 2024-04-12 11:39:43 +02:00
mfo
d8a8fb53ce
feat(Champ.carte): some error style on carte 2024-04-12 10:59:42 +02:00
mfo
a052341c93
fix(Champ.address): add missing fr-select dsfr class name 2024-04-12 10:45:37 +02:00
mfo
626f3780f6
fix(Champ.commune): add missing fr-select dsfr class name 2024-04-12 10:45:24 +02:00
mfo
c22438fb75
feat(Champ.annuaire_education): add missing fr-input class name 2024-04-12 10:45:12 +02:00
Eric Leroy-Terquem
84ab6d08b8
feat(routing): make assignment mode auto when all dossiers are reaffected to defaut groupe. so that all dossiers can be re routed 2024-04-12 10:27:21 +02:00
mfo
4773d9ebad
feat(Champ.repetition): hide destroy button of first repetition row when the repetition is mandatory 2024-04-12 09:29:00 +02:00
Colin Darie
a93a4cd5ce
chore: specific 422 error page 2024-04-11 18:19:32 +02:00
Colin Darie
5b98fd7c6d
chore: generic customized error page 2024-04-11 18:19:31 +02:00
Colin Darie
5d23b37f59
chore: custom dynamic & static 500 pages 2024-04-11 18:19:30 +02:00
Colin Darie
7dcd4ba538
feat: customized page 404 2024-04-11 18:19:29 +02:00
Paul Chavard
4d90b1f662
Merge pull request #10303 from colinux/update-admin-transfer-copy
ETQ admin: améliore le style de la page oubliée "Envoyer une copie de ma démarche"
2024-04-11 14:48:42 +00:00
Eric Leroy-Terquem
1e50223267
Merge pull request #10293 from demarches-simplifiees/re-router-tous-les-dossiers-d-une-demarche
ETQ tech je peux relancer le routage pour tous les dossiers en construction d'une démarche
2024-04-11 13:27:43 +00:00
simon lehericey
bda9c4b455
fix: drop unused column and fk procedure_revisions.attestation_template_id which block procedure.destroy 2024-04-11 13:38:38 +02:00
simon lehericey
ab4a6b1c7d
fix: rescue and sentry log procedure.purge_discarded to avoid blowing up the whole job 2024-04-11 13:22:37 +02:00
Colin Darie
efc1b2201a style(admin): Envoyer une copie form in dsfr 2024-04-11 12:52:03 +02:00
Paul Chavard
fe508c0a73
Merge pull request #10302 from tchak/ignore-attestation_template_id
chore(db): ignore attestation_template_id
2024-04-11 10:30:37 +00:00
Paul Chavard
2de2d8af45
Merge pull request #10301 from demarches-simplifiees/more_work_on_city_address
Tech: simplifie le code address dans les champs commune
2024-04-11 10:15:47 +00:00
Paul Chavard
d5b08d2ebb
Merge pull request #10298 from mfo/US/fix-move-after
ETQ Admin, quand je deplace les champs apres d'autre champ, ne pas griser le champs precedent
2024-04-11 10:07:35 +00:00
Paul Chavard
ceae749746 chore(db): ignore attestation_template_id 2024-04-11 12:03:06 +02:00
simon lehericey
124433b781
refactor: commune_champ 2024-04-11 11:57:18 +02:00
simon lehericey
c77b66feef
refactor: api_geo_services raises if wrong dep or city code 2024-04-11 11:56:53 +02:00
Paul Chavard
4cdaef3a08
Merge pull request #10300 from tchak/chore-stable_id-task
fix(stable_id): recursive job to fill stable_ids
2024-04-11 09:53:56 +00:00
LeSim
e7f31e4d49
Merge pull request #10297 from demarches-simplifiees/fix_dossier_operation_log_move_to_cold_storage
Tech: améliore la performance du job du stockage a froid des traces fonctionnelles
2024-04-11 09:47:37 +00:00
Paul Chavard
9bfc4119b1 fix(stable_id): recursive job to fill stable_ids 2024-04-11 11:45:03 +02:00
Lisa Durand
5b3277bb31
Merge pull request #10270 from demarches-simplifiees/ux-remove-icon-file-in-tableau-instructeur-ldu
ETQ instructeur, j'ai une colonne vide s'il n'y a pas les checkbox des actions multiples
2024-04-11 09:25:26 +00:00
mfo
45d45c0d05
feat(type_de_champ_editor): allow admin to move champ after previous champ. useless but better a11y 2024-04-11 11:00:08 +02:00
simon lehericey
34fae2831f
refactor: add dol_move_batch job which are enqueued by the cron 2024-04-11 10:58:34 +02:00
Colin Darie
dfbe53dcc5
fix(cron): really schedule jobs on sidekiq instead of running them 2024-04-10 18:03:47 +02:00
simon lehericey
344f0d2c80
fix: graphql new normalization 2024-04-10 10:57:37 +02:00
simon lehericey
5567570d74
more robust normalization 2024-04-10 10:57:37 +02:00
Lisa Durand
758673a355
Merge pull request #10280 from demarches-simplifiees/ux-improve-usager-filter-dropdown-ldu
[UX] Améliorer les filtres d'un dossier sur le tableau de bord d'un usager
2024-04-10 07:18:55 +00:00
Eric Leroy-Terquem
51312b178e
task(routing): reroute dossiers en construction 2024-04-09 17:17:49 +02:00
simon lehericey
23060da306
fix: do not url encode error message in sentry 2024-04-09 14:25:17 +02:00
simon lehericey
92ba1a12ce
chore: use space instead of tab 2024-04-09 14:25:17 +02:00
simon lehericey
f55328c15d
fix: maintenance task to backfill city_name 2024-04-09 11:44:11 +02:00
Colin Darie
4bbe136987
Merge pull request #10283 from demarches-simplifiees/fix-main-menu-a11y
Remplacement de l'attribut `aria-current="page"` par `aria-current="true"` lorsque le lien concerne un ensemble de pages
2024-04-09 08:57:09 +00:00
Colin Darie
c7d2caf1b7
Merge pull request #10266 from demarches-simplifiees/fix-a11y-contact-page
Amélioration de l'accessibilité de la page de contact.
2024-04-09 08:17:24 +00:00
Colin Darie
6e9bae4f0c
Merge pull request #10289 from colinux/fix-preferred-domain
Tech: n'assigne pas le domaine préféré à l'inscription/connexion si la feature n'est pas activée
2024-04-09 08:15:32 +00:00
Colin Darie
3c7018fd31 fix: don't set preferred domain on signup/signin unless feature is enabled 2024-04-09 10:04:18 +02:00
Colin Darie
25892f594c
fix(jobs): don't enqueue crons to default adapter anymore 2024-04-08 18:27:31 +02:00
Lisa Durand
09d4ed760f add missing views and change position for notif 2024-04-08 12:10:00 +02:00
Paul Chavard
df8ad3f709 fix(adresse): fallback to city name if commune not found 2024-04-08 11:49:37 +02:00
Paul Chavard
707d3980c0
Merge pull request #10171 from tchak/fix-perf-filters
perf(filter): we query by stable_id - no need to check type_de_champ private attribute
2024-04-08 09:24:54 +00:00
Corinne Durrmeyer
fd54c15144
feat(fix-aria-current-mainmenu) : Transform aria-current='page' into aria-current='true' when the current link targets several pages - fix #8559 #8135 2024-04-08 11:22:44 +02:00
Lisa Durand
e2d83d87d2 change wording in usager filter and target css to combobox component 2024-04-08 10:41:39 +02:00
LeSim
12406643d9
Merge pull request #10268 from demarches-simplifiees/sidekiq_cron
Tech: déplace les cron job sur sidekiq
2024-04-08 08:32:06 +00:00
LeSim
6855213435
Merge pull request #10273 from demarches-simplifiees/discard_champ_fetch_job_on_not_found
Tech:  supprime les fetch_external_data_job lorsque le champ correspond n'existe plus
2024-04-08 08:13:06 +00:00
LeSim
22830fd7f6
Merge pull request #10275 from demarches-simplifiees/fix_api_entreprise_status
Tech: corrige le mécanisme de surveillance des fournisseurs d entreprise.api.gouv.fr
2024-04-08 08:08:38 +00:00
Paul Chavard
c5c671f391
Merge pull request #10234 from tchak/type-de-champ-paths
feat(champ): add paths to type_de_champ
2024-04-08 08:07:30 +00:00
simon lehericey
e82a8787d5
dirty fix: avoid changing preferred domain 2024-04-05 15:26:12 +02:00
Paul Chavard
ce95fe1794
Merge pull request #10255 from demarches-simplifiees/fix-move-after-edit-list
ETQ Administrateur : Amélioration de l'accessibilité et de l'ergonomie de la liste d'édition du formulaire "déplacer après"
2024-04-05 11:39:55 +00:00
Paul Chavard
80b3f0c0b3 fix(champ): no validate on hidden champs 2024-04-05 13:24:57 +02:00
simon lehericey
2e2f4706c5
deduplicate and add error management 2024-04-05 12:30:43 +02:00
simon lehericey
42f0b87c39
remove api_up? 2024-04-05 12:27:54 +02:00
simon lehericey
7b33963a67
add and use api_djepva_up? 2024-04-05 12:27:26 +02:00
simon lehericey
e994738a2e
add and use api_insee_up? 2024-04-05 12:26:44 +02:00
simon lehericey
ac695a2151
fix: discard DeserializationError on fetch external data job 2024-04-05 10:42:44 +02:00
Corinne Durrmeyer
a46286f9df
feat(improve-contact-page-a11y) : Add missing h2 to footer 2024-04-05 09:35:28 +02:00
Corinne Durrmeyer
339dd7ef98
feat(improve-contact-page-a11y) : Add missing lang attributes - fix #6772 2024-04-05 09:35:22 +02:00
Paul Chavard
742e6f4a92 perf(filter): we query by stable_id - no need to check type_de_champ private attribute 2024-04-04 19:01:47 +02:00
Paul Chavard
282ce1322c fix(stats): more accurat stats about deleted dossiers 2024-04-04 19:00:48 +02:00
Paul Chavard
81c325f938 chore(task): another attempt to backfill stable_id 2024-04-04 17:55:38 +02:00
Lisa Durand
5155049873 remove column with checkbox if no batch actions 2024-04-04 17:17:03 +02:00
simon lehericey
42af5a9149
make cron_job work with both delayed_job and sidekiq 2024-04-04 16:38:38 +02:00
Paul Chavard
38a703034e feat(champ): expose paths 2024-04-04 16:13:23 +02:00
Corinne Durrmeyer
8039464541
feat(improve-contact-page-a11y) : Replace %span.mandatory * with AsteriskMandatoryComponent 2024-04-04 14:53:51 +02:00
Corinne Durrmeyer
9dab2afc11
feat(improve-contact-page-a11y) : Replace 'All fields are mandatory.' with 'Fields marked by an asterisk are mandatory' - fix #10264 2024-04-04 14:53:51 +02:00
Corinne Durrmeyer
5523dd4b35
feat(improve-contact-page-a11y) : Remove useless <h2> around paragraphs - fix #8212 #10264 2024-04-04 14:53:51 +02:00
Paul Chavard
9593e8825f chore(browser): be more agressive about browser deprecation 2024-04-04 13:53:41 +02:00
Colin Darie
c005991470
Merge pull request #10230 from demarches-simplifiees/fix-alert-for-closed-procedures-in-dossiers-list
Correctif : affiche correctement le lien vers la page de fermeture dans la liste des dossiers
2024-04-04 09:44:55 +00:00
Colin Darie
8af3f07181
Merge pull request #10231 from colinux/fix-gouv-fr-banner
Tech: petites corrections pour le .gouv
2024-04-04 09:02:03 +00:00
Eric Leroy-Terquem
8d7c078f92
fix(dossiers list): display link correctly 2024-04-04 09:44:37 +02:00
Corinne Durrmeyer
1cd552c79f
feat(move_after_edit_list) : Add new line at end of file to avoid lint error 2024-04-04 09:39:40 +02:00
Colin Darie
0c4a4c8764
Merge pull request #10232 from demarches-simplifiees/redirect-fermeture-to-commencer-if-procedure-not-closed
Correctif: redirige la page fermeture vers la page commencer si la démarche n'est pas fermée
2024-04-04 07:34:23 +00:00
Colin Darie
df59503ab7
Merge pull request #10224 from colinux/mail-host
Tech (mailers): `from`, liens et application en respectent le preferred domain du destinataire
2024-04-04 07:25:43 +00:00
LeSim
3f54d46f19
Merge pull request #10258 from demarches-simplifiees/fix_strange_locale
tech: verifie que la locale est disponible
2024-04-03 07:11:12 +00:00
simon lehericey
fc8d5adf2f
fix: avoid buggy locale from user 2024-04-02 21:53:56 +02:00
Colin Darie
8c0375fe6f
chore: easier to test .gouv / new host using APP_HOST 2024-04-02 19:36:39 +02:00
Colin Darie
033b2fa63d
chore(banner): easier with hardcoded .gouv.fr name 2024-04-02 19:36:37 +02:00
Colin Darie
d5515fca33
fix(banner): not closed form tag broke JS 2024-04-02 19:36:35 +02:00
Colin Darie
95e80d6ce3
fix(layout): header text alignemnt 2024-04-02 19:25:46 +02:00
Colin Darie
36fc535386
refactor(mailer): for devise mailer set locale in dedicated action 2024-04-02 19:25:44 +02:00
Colin Darie
172aeec3dc
chore(mail): replace textual logo with simple logo + application name as text 2024-04-02 18:47:53 +02:00
Colin Darie
df198a8946
style(mailer): big button in dsfr style 2024-04-02 18:47:51 +02:00
Colin Darie
68ee4a3404
feat(mail): use contextualized Current.application_name 2024-04-02 18:47:48 +02:00
Colin Darie
8b9d4c87f7
refactor(mailer): more thread safe defaults tweaks 2024-04-02 18:47:47 +02:00
Colin Darie
21991d7253
feat(mail): link with hosts for recipient for user mailer 2024-04-02 18:47:46 +02:00
Colin Darie
5bf580b6ac
feat(mail): link with hosts for recipient for notification mailer 2024-04-02 18:47:45 +02:00
Colin Darie
f8a9e72aa2
feat(mail): from and link with host for recipient in dossier_mailer 2024-04-02 18:47:44 +02:00
Colin Darie
3512e071d3
feat(mail): devise mailer respect user preferred host for any mail 2024-04-02 18:47:43 +02:00
Colin Darie
d14fe83261
feat(mail): devise confirmation instructions respect user preferred host 2024-04-02 18:47:41 +02:00
Paul Chavard
0006a12aea
Update app/models/dossier.rb
Co-authored-by: LeSim <mail@simon.lehericey.net>
2024-04-02 18:09:29 +02:00
Paul Chavard
7cf1cdb47b fix(champ): do not expose champs without row_id in repetitions 2024-04-02 17:51:57 +02:00
Corinne Durrmeyer
84f0165520
feat(move_after_edit_list) : Remove useless aria attribute - fix #10254 2024-04-02 17:23:25 +02:00
Corinne Durrmeyer
d54bac71bf
feat(move_after_edit_list) : Improve the "move after" edit list - fix #10206 2024-04-02 17:23:25 +02:00
Corinne Durrmeyer
a5a7e880eb
feat(move_after_edit_list) : Correct a typo - fix #10254 2024-04-02 17:23:25 +02:00
LeSim
2ea45d5dba
Merge pull request #10251 from colinux/exports-reduce-memory
Tech (exports): télécharge les PJ > 10mb en chunks pour ne pas les mettre en mémoire
2024-04-02 14:48:33 +00:00
Colin Darie
fe12df1892
Merge pull request #10252 from demarches-simplifiees/more_log_to_adresse_controller
Tech: ajoute des metadata pour débugger un pb sur l'adresse controller
2024-04-02 14:16:37 +00:00
Paul Chavard
94aef62e87
Merge pull request #10253 from tchak/chore-task-stable-id
chore(task): reduce batch size of fill stable id task
2024-04-02 14:10:22 +00:00
Paul Chavard
61a6f0b382
Merge pull request #10243 from demarches-simplifiees/small_job_fixes
Tech: petites corrections pour éviter les réessais inutile sur les jobs de mail et de rnf
2024-04-02 14:09:55 +00:00
Paul Chavard
792bf47658 chore(task): reduce batch size of fill stable id task 2024-04-02 15:55:44 +02:00
Colin Darie
e23e2d9c31
perf(export): download in chunks files >= 10 mb 2024-04-02 15:54:46 +02:00
simon lehericey
57927a3783
chore: more log to address controller errors 2024-04-02 15:47:11 +02:00
mfo
b245d9b063
Merge pull request #10220 from demarches-simplifiees/fix-drop-down-missing-hint
ETQ usager : Champ choix multiple, ajouter une aide a a la saisie
2024-04-02 09:28:34 +00:00
mfo
84f0891a8b
Merge pull request #10245 from demarches-simplifiees/US/fix-attestation-link
correctif(lien.attestation): ETQ expert, je souhaite avoir accès à l'attestation même si je ne suis pas instructeur
2024-04-02 08:14:37 +00:00
mfo
e40ef51f61
Merge pull request #10247 from colinux/fix-export-memory-leak
Tech: fix memory leak pendant le téléchargement des PJ des exports
2024-04-02 08:14:28 +00:00
mfo
3a895fbd4a
tech(review): add a guard clause to prevent missing pdf, enhance specs 2024-04-02 10:04:22 +02:00
simon lehericey
8405c83c12
fix: do not retry rnf bad request 2024-04-02 10:00:07 +02:00
simon lehericey
dd6c558541
fix: discard deserialization error as there are raised from AR not found 2024-04-02 10:00:06 +02:00
mfo
4da36531d4
Merge pull request #10242 from demarches-simplifiees/US/fix-decimal-number-validator
Correctif(annotations privées): ETQ instructeur, je ne pouvais modifier une annotation quand un usager avait saisi des valeur de champs incorrectes
2024-04-02 07:13:07 +00:00
Colin Darie
f9af570cab perf(export): fix memory leak after large files downloads 2024-04-01 20:03:35 +02:00
Paul Chavard
13005b0a4a fix(dossier): enqueue jobs after commit 2024-04-01 19:00:25 +02:00
Paul Chavard
5d302fb6ac refactor(dossier): extract aasm callbacks in to a concern 2024-04-01 18:55:08 +02:00
mfo
e08aa7d28b
wip(validates): prefill and validate_champ_value? on all other missing validation checks 2024-04-01 07:36:14 +02:00
mfo
284a10e235
fix(Champs::EngagementJuridiqueChamp): validates Champs::EngagementJuridiqueChamp respecting it's validation context. 2024-04-01 07:18:14 +02:00
mfo
ff527517c9
fix(Champs::CiviliteChamp): validates Champs::CiviliteChamp respecting it's validation context. 2024-04-01 07:18:14 +02:00
mfo
94ea16c894
fix(Champs::BooleanChamp): validates Champs::BooleanChamp respecting it's validation context. 2024-04-01 07:18:14 +02:00
mfo
d7f152f4af
fix(Champs::PhoneChamp): validates Champs::PhoneChamp respecting it's validation context. 2024-04-01 07:18:14 +02:00
mfo
374d763084
fix(Champs::IntegerNumberChamp): validates Champs::IntegerNumberChamp respecting it's validation context. 2024-04-01 07:18:13 +02:00
mfo
fd5faad31f
fix(Champs::PaysChamp): validates Champs::PaysChamp respecting it's validation context. Also do not save value when external_id/code can't be found by lookup 2024-04-01 07:18:13 +02:00
mfo
04f3b6a844
fix(Champs::DecimalNumberChamp): validates Champs::DecimalNumberChamp respecting it's validation context 2024-04-01 07:07:11 +02:00
Martin
2944a0c2c3
fix(expert.attestation.url): was pointing to attestation_instructeur_dossier_path, so did not worked when expert was not instructeur. use active_storage_link, secured enough because served to authenticated users as well as expiring link 2024-03-30 06:20:11 +01:00
Paul Chavard
46c5830306
Merge pull request #10238 from demarches-simplifiees/fix-mailbox-missing-link
ETQ usager : ajout d'un lien vers la messagerie dans les dossiers en attente de correction
2024-03-28 16:56:17 +00:00
Paul Chavard
3c336c437a chore(task): optimize maintenance task 2024-03-28 17:35:17 +01:00
Corinne Durrmeyer
d5af837872 feat(messagerie_missing_link): Add link to messaging system in the alert block - fix #10198 2024-03-28 11:55:09 +01:00
Eric Leroy-Terquem
78530f9823
fix(fermeture): redirect to commencer if procedure not closed 2024-03-27 12:16:04 +01:00
Lisa Durand
65b8f6881a
Merge pull request #10143 from demarches-simplifiees/float-too-many-decimal-ldu
ETQ admin, je veux que le champ nombre décimal ne prenne que 3 chiffres après la virgule
2024-03-27 10:05:35 +00:00
Lisa Durand
a3ab6dd257 add validation on decimal max 3 digits after coma 2024-03-27 10:55:10 +01:00
mfo
465de75e6b
Merge pull request #10215 from demarches-simplifiees/US/catch-oomed-jobs
tech(export_job): sometimes ExportJob are OOMed, in those cases jobs are stuck and never retried. release lock and increase attempts
2024-03-27 09:34:46 +00:00
Kara Diaby
bfc68f8377
Merge pull request #10216 from demarches-simplifiees/dark_mode_admin_mails
ETQ Admin, je souhaite voir l'éditeur de mail adapté au dark mode
2024-03-26 20:04:21 +00:00
Corinne Durrmeyer
ba290110e5 feat(multiple_drop_down_list): Replace blank option 2024-03-26 15:39:27 +01:00
Martin
be47152096 tech(export_job): sometimes ExportJob are OOMed, in those cases jobs are stuck and never retried. release lock and increase attemps 2024-03-26 15:29:04 +01:00
Corinne Durrmeyer
ab6a76ad46 feat(multiple_drop_down_list) : Add missing space - fix #10185 2024-03-26 15:27:59 +01:00
Colin Darie
d161589e2f fix(api-entreprise): Context is not defined in jobs 2024-03-26 12:45:28 +01:00
Paul Chavard
06d81dcfaf
Merge pull request #10169 from tchak/refactor-champ-public_id
fix(champ): use public_id in views
2024-03-26 10:31:13 +00:00
Paul Chavard
6ad0b901b6 fix(champ): use public_id in views 2024-03-26 11:23:23 +01:00
Kara Diaby
8da7ff7eaa editeur mail administrateur : adaptation pour le dark mode 2024-03-26 11:14:17 +01:00
Paul Chavard
b02ba1e909 feat(textarea): autoresize textareas 2024-03-25 19:53:29 +01:00
Colin Darie
b3d2ca1486
Merge pull request #10203 from colinux/dev-warn-visible
Tech: bannière indiquant staging / env de test plus visible
2024-03-25 17:31:03 +00:00