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

672 commits

Author SHA1 Message Date
Martin
a3c6a2c46f correctif(dolist): utilise des liens vers les logos des procedures plutôt que des attachements.inlined 2023-08-14 13:09:05 +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
Eric Leroy-Terquem
bbb3823212 db(routing): remove routing criteria name column 2023-08-02 18:25:37 +02:00
Paul Chavard
0f6188a542 chore(annotate): remove model comments 2023-08-02 11:43:23 +02:00
Eric Leroy-Terquem
16c0a2cb73 db(routing): ignore routing criteria name column 2023-08-01 16:59:22 +02:00
Eric Leroy-Terquem
cdbaf987c0 db(routing): remove migrated champ routage columns 2023-08-01 16:59:22 +02:00
Paul Chavard
08f0184700 fix(procedure): accept dpo emails with accents 2023-07-18 15:16:31 +02:00
Colin Darie
8c210e6fc7
feat(admin): config sva/svr 2023-07-11 10:01:45 +02:00
Colin Darie
bb4a6e22ce
chore(schema): +procedures#sva_svr 2023-07-11 10:01:45 +02:00
Paul Chavard
7136c96a36 feat(procedure): validate external links 2023-07-06 10:27:43 +02:00
Paul Chavard
a43c3fd19d feat(procedure): add lien_notice_error and lien_dpo_error 2023-07-06 10:27:43 +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
c82727120c feat(DB): ignore migrated_champ_routage_columns 2023-07-03 14:58:45 +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
3a667d39ba refactor(routing): rollback Procedure#instructeurs_self_management? 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
Colin Darie
7023284726
Merge pull request #9195 from colinux/job-declarative-dossier-unit 
Jobs: traite en isolation les dossiers bloqués de démarches déclaratives
 2023-06-19 14:44:59 +00:00
Lisa Durand
f4e33c068b
Merge pull request #9121 from demarches-simplifiees/add-detail-on-PJ-on-description-procedure-page 
[Refonte page accueil demarche] Ajouter les infos concernant les PJ
 2023-06-15 12:52:50 +00:00
Paul Chavard
10524643fb fix(hack): fix and test hack for procedures using groupe instructeur api 2023-06-14 19:24:58 +01:00
Colin Darie
17f5fb4a51
refactor(declarative): process dossier in job isolation 2023-06-14 12:06:22 +02:00
Lisa Durand
4b6d18608e split pj in two lists regarding to conditionnal 2023-06-13 11:00:16 +02:00
Lisa Durand
d2f91a6405 add list of PJ in procedure description 2023-06-13 10:58:05 +02:00
Colin Darie
ec244f1a94
fix(procedure): auto_archive_on must be in future 2023-06-01 16:49:52 +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
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
Lisa Durand
7340206f81 rollback - add just one new field and use actual description field 2023-05-24 11:31:24 +02:00
Lisa Durand
b6cc35df68 fix specs 2023-05-23 10:34:03 +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
Lisa Durand
7e39e8113b feedback PR Colin 2023-05-16 17:54:37 +02:00
Lisa Durand
f2cf3188d7 empty invalid fields to allow clone procedure 2023-05-16 10:59:17 +02:00
Paul Chavard
f485f144fc chore(procedure): log dossiers before reset 2023-05-15 10:21:54 +02:00
simon lehericey
26fa5de790 avoid reset 2023-05-12 11:31:34 +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
LeSim
d0bb759d3d
Merge pull request #8997 from demarches-simplifiees/add_defaut_procedure_for_new_admin 
ETQ admin, je veux avoir une première démarche pré remplie lorsque j'arrive sur ds
 2023-05-09 16:38:55 +00: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
simon lehericey
9c8020b05c feat(admin): add initiation procedure for a new admin 2023-05-03 15:08:21 +02:00
Colin Darie
d31016973c
chore(schema): model annotations accordingly to schema 2023-05-03 11:35:31 +02:00
simon lehericey
0934a672fe fix: defaut_groupe_instructeur for a cloned procedure from another admin without a group with default label 2023-04-26 10:52:31 +02:00
Colin Darie
f7880352f0
Merge pull request #8941 from mfo/US/fixed-dossier-stalled-auto-processing 
correctif(procedure.declarative): ETQ administrateur d'une procedure declarative, certains de mes dossiers restent en construction [ex: l'object storage est down, le dossier reste bloqué]
 2023-04-22 16:13:01 +00:00
Martin
9dec6f1611 correctif(procedure.declarative): ETQ administrateur d'une procedure declarative, certains de mes dossiers restent en construction [ex: l'object storage est down, le dossier reste bloqué] 2023-04-21 15:45:45 +02:00
Colin Darie
2775158052
Merge pull request #8943 from tchak/fix-dossier-can-create-new-dossiers 
ETQ usager, je peux créer de nouveaux dossiers sur la démarche qui remplace la démarche fermée
 2023-04-21 13:18:43 +00:00
simon lehericey
a202a57988 fix: defaut_groupe_instructeur_id for a cloned procedure 2023-04-21 12:20:50 +02:00
Paul Chavard
52d63a1b02 fix(dossier): user can create new dossiers when closed procedure is replaced 2023-04-21 11:18:27 +01: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
Paul Chavard
ce466d072a feat(manager): display procedure state and unpublished date 2023-04-19 19:59:54 +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
simon lehericey
9c6af921e5 Use has_one defaut_procdre to avoid before destroy prepend 2023-04-19 13:52:42 +02:00
simon lehericey
95ab81fd1c feat(routing): use procedure.defaut_groupe_instructeur_id to find defaut_groupe_instructeur 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
e9649b667e
chore(rubocop): fix Rails/IgnoredColumnsAssignment 2023-04-19 12:55:14 +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
7054c2d9ef fix(demarche): always reset outside of transactions 2023-04-13 11:05:38 +02:00
simon lehericey
f6948cfd5e feat(routing): record first groupe as default_groupe_instructeur 2023-04-13 10:36:42 +02:00
Eric Leroy-Terquem
cade677355 feat(db): add defaut_groupe_instructeur_id column to procedures 2023-04-13 10:36:42 +02:00
simon lehericey
3f55fddcef feat(routing): ui side: prevent tdc deletion if used for routing 2023-04-13 10:28:52 +02:00
LeSim
b003fd8be8
Merge pull request #8774 from E-L-T/add-routing-to-groupe-instructeurs 
Add routing rules to groupe instructeurs
 2023-03-31 10:16:51 +00:00
Martin
21701a1e37 patch(demarche.lien_demarche): ignore cette colonne pr la supprimer plus tard 2023-03-31 09:57:27 +02:00
simon lehericey
1592006f63 feat(procedure): defaut_group_instructeur is the first created 2023-03-30 10:51:20 +02:00
Colin Darie
d6887f8aa4 fix(procedure): clone reset estimated_dossiers_count 2023-03-07 19:11:30 +01:00
Christophe Robillard
9ff88db48c publish only some opendata procedures for datagouv 
- only published or closed procedures
- only procedures with flag opendata
- only procedures with 4 or more dossiers
- only procedures without word "mail" in lien_site_web
- only procedures without word "intra" in lien_site_web
 2023-02-28 17:02:08 +01:00
Christophe Robillard
bd92291f8a cache dossiers count 2023-02-21 10:06:07 +01:00
Paul Chavard
c0ad7853cb fix(administrateur): procedure page n+1 2023-02-16 11:29:21 +01:00
Colin Darie
e626eb69ce feat(admin): import groupe instructeurs csv when procedure is closed 2023-02-09 11:17:13 +01:00
Kara Diaby
984ef67827 Prend en compte uniquement les procédures publiées dans les propositions de tags 2023-02-06 17:03:51 +01:00
Colin Darie
eb9cd90ee8 chore(schema): +procedure#estimated_duration_visible 2023-02-01 11:02:55 +01:00
Kara Diaby
b18d76dff6 Ne prend pas en compte les tags sur les démarches en brouillon 2023-01-24 14:53:27 +01:00
simon lehericey
528b2c2b88 fix(procedure): valid juridique on create and publication 2023-01-11 14:05:17 +01:00
simon lehericey
bd3fbbce49 add schema and annotation 2023-01-11 11:19:24 +01:00
Sébastien Carceles
20136b7ac8
feat(demarche): create and prefill a dossier with POST request (#8233) 
* add base controller for public api

* add dossiers controller with basic checks

* create the dossier

* ensure content-type is json

* prefill dossier with given values

* mark a dossier as prefilled

When a dossier is prefilled, it's allowed not to have a user.

Plus, we add a secure token to the dossier, which we will need later to set a
user after sign in / sign up.

* set user as owner of an orphan prefilled dossier

When a visitor comes from the dossier_url answered by the public api,
the dossier is orphan:
- when the user is already authenticated: they become the owner
- when the user is not authenticated: they can sign in / sign up / france_connect
and then they become the owner

So here is the procedure:
- allow to sign in / sign up / france connect when user is unauthenticated
- set dossier ownership when the dossier is orphan
- check dossier ownership when the dossier is not
- redirect to brouillon path when user is signed in and owner

* mark the dossier as prefilled when it's prefilled
(even with a GET request, because it will be useful later on, for
exmample in order to cleanup the unused prefilled dossiers)

* system spec: prefilling dossier with post request
 2023-01-03 14:46:10 +01:00
Christophe Robillard
11a18516b2 remove feature flag zonage 2022-12-21 09:02:16 +01:00
Sébastien Carceles
0a10a08c21
feat(demarche): describe procedure prefilling (#8187) 
* feat(demarche): description

Show the description of an opendata procedure (published or draft),
with help about how to prefill a dossier for this procedure.

Co-authored-by: Damien Le Thiec <damien.lethiec@gmail.com>
 2022-12-19 11:32:09 +00:00
Paul Chavard
9149e0fcd7 feat(revision): allow more dossiers to rebase 2022-12-14 17:42:27 +01:00
Paul Chavard
ed4d5cb36a refactor(demarche): make declarative demarche processing syncroneous 2022-12-06 11:41:25 +01:00
Colin Darie
0014ce4b91 chore(schema): +procedures#piece_justificative_multiple 2022-12-05 10:47:10 +01:00
Colin Darie
91f4971df2 feat(champ): has_one_attached => has_many_attached piece_justificative_file 2022-12-05 10:47:10 +01:00
Paul Chavard
1fb051c3cc refactor(attestation_template): remove unused code 2022-11-29 19:36:56 +01:00
Paul Chavard
a760e0a698 feat(demarche): enable revisions for all 2022-11-24 17:35:33 +01:00
Paul Chavard
234975b806 feat(graphql): expose groupe_instructeur state and update mutation 2022-11-24 14:33:29 +01:00
Paul Chavard
c73b650f85 feat(attestation): validate attestation tags 2022-11-23 12:26:26 +01:00
Paul Chavard
cafda4f6f0 refactor(attestation_template): move to procedure 2022-11-23 12:26:26 +01:00
Paul Chavard
29bdd82b59 refactor(procedure): types_de_champ -> active_revision.types_de_champ_public 2022-11-17 13:54:14 +01:00
Paul Chavard
e6288c39f2 refactor(dossier): champs -> champs_public 2022-11-10 22:44:39 +00:00
Paul Chavard
95f65900d3 refactor(active_storage): no download on clone 2022-11-10 12:25:55 +00:00
Paul Chavard
5e87539d6d fix(groupe_instructeur): add explicit order to groupe_instructeurs 2022-11-09 10:56:40 +00:00
Eric Leroy-Terquem
aca2775874 remove routee? method 2022-11-04 12:03:44 +01:00
Eric Leroy-Terquem
5578115acf update routee? method 2022-11-04 12:03:43 +01:00
Eric Leroy-Terquem
110953e450 constraint logic to active groups 2022-11-04 12:03:43 +01:00
Paul Chavard
33fc8a45ab feat(emails): show email errors on procedure page 2022-11-04 09:08:41 +00:00
Paul Chavard
dd4c1f2fac feat(emails): validate tags in notification emails 2022-11-04 09:08:41 +00:00
Kara Diaby
661e5f78ac model 2022-11-02 10:19:43 +01:00
simon lehericey
52b7886961 fix(clone): on procedure clone, discard integrity error 2022-11-01 10:17:24 +01:00
Paul Chavard
8cf9aec0f7 refactor(procedure): expose procedure tags on model 2022-10-31 19:50:25 +01:00
Kara Diaby
492c7f377f migration 2022-10-21 19:13:12 +02:00
Eric Leroy-Terquem
c6082ded09 no select for usager if only one groupe_instructeur 2022-10-13 19:49:32 +02:00
Paul Chavard
7f1dd49bdc chore(flipper): always use feature_enabled? helper 2022-10-12 14:14:30 +02:00
Eric Leroy-Terquem
1177d861f4 add validation on routing_criteria_name 2022-10-10 09:48:11 +02:00
Martin
6752da40a9 test(procedure.direction): can we drop this column ? 2022-10-07 18:39:17 +02:00
simon lehericey
ceaf8ebbe7 fix: orphan tdc due to reset_draft 2022-10-07 17:44:30 +02:00
krichtof
44018a86de a procedure without zone is finally valid 2022-10-07 16:59:12 +02:00
Christophe Robillard
272c8cae09 cannot publish a procedure if no zones 2022-10-07 10:48:35 +02:00
Christophe Robillard
bdcb451d3c procedure publiee must have one zone at least 2022-10-07 10:48:35 +02:00
Christophe Robillard
bffd9d61a9 add habtm between procedures and zones 2022-10-07 10:48:34 +02:00
Martin
a256dfbaa0 fix(spec): missed a failed spec previously. sorry 2022-10-06 15:34:29 +02:00
mfo
8a3550cda4
Merge pull request #7860 from mfo/US/procedure-duree-up-to-manager 
feat(procedure.max_duree_conservation_dossiers_dans_ds): make it more flexible
 2022-10-06 11:36:50 +02:00
Martin
883ba8717f clean(procedure.columns): :durees_conservation_required, :cerfa_flag, :test_started_at 2022-10-05 18:03:49 +02:00
Martin
405a885160 feat(procedure.max_duree_conservation_dossiers_dans_ds): make it more flexible 2022-10-05 17:27:09 +02:00
Paul Chavard
462cc41caa refactor(block): use block? instead of repetition? 2022-09-29 17:49:14 +02:00
Christophe Robillard
9a9330159c choose zone options with correct label 
label of the zone is the one available when the procedure has been published (or at the creation if the procedure has not been published)
 2022-09-26 16:58:53 +02:00
Colin Darie
6a4a9c8e03 fix(cron/procedure-declarative): don't auto accept a dossier still in degraded mode 2022-09-22 16:26:14 +02:00
Paul Chavard
c05bc61c99 fix(revisions): improuve changes information display 2022-09-07 13:52:44 +02:00
Martin
5f2b290407 feat(Procedure.clone): reset subject.duree_conservation_dossiers_dans_ds when procedure.duree_conservation_etendue_par_ds was extended. only extends it on demand otherwise admin could clone old procedure with higher duree_conservation_dossiers_dans_ds 2022-08-31 14:56:00 +02:00
Martin
6e31decc2d feat(Procedure.clone): stop cloning procedure service which is confusing for some administrateurs 2022-08-31 14:56:00 +02:00
Martin
2f5528398f feat(manager#outdated_procedure): allow super admin to enable procedure_expires_when_termine_enabled for old procedure 
revew(typo): various typo, tx christophe :-)

fix(spec): due to typo fixes
 2022-08-24 13:10:48 +02:00
Paul Chavard
48a4e8bec5 chore(db): remove already dropped ignored columns 2022-08-02 15:24:52 +02:00
Martin
05b6b462b6 feat(new_max_duree_conservation): make it configurable for other instances 2022-07-18 14:08:53 +02:00
Martin
24c8dc5829 feat(procedure.duree_conservation_dossiers_dans_ds): decrease max duree_conservation_dossiers_dans_ds from 36 to 12 2022-07-18 14:08:53 +02:00
Paul Chavard
4d48055158 feat(tags): expose used_type_de_champ_tags 2022-07-07 23:23:17 +02:00
Christophe Robillard
e2348aa8f1 rename publiques scope to opendata 2022-07-06 17:59:03 +02:00
Christophe Robillard
b56706b6b8 add scope publiques for procedures 2022-07-06 17:59:03 +02:00
Paul Chavard
fb37f8c5a8 fix(dossier): fix some reset draft changes edge cases 2022-07-06 16:52:12 +02:00
Paul Chavard
9b45dcea3f feat(demarche): add possibility to reset draft revision 2022-07-06 14:18:01 +02:00
Christophe Robillard
6dd27ec7ed reset opendata to true when procedure is cloned by another admin 2022-06-23 14:11:09 +02:00
Christophe Robillard
ea59f5f260 add opendata boolean attribute for procedure 
when opendata is set to true, it means that descriptive's procedure can be
public
when opendata is set to false, ti means that descriptive's can not be
public, because the procedure is only available for public servants, not
citizens.
 2022-06-23 14:11:09 +02:00
simon lehericey
9596dac508 force resync types_de_champ and types_de_champ_public/private 2022-06-17 14:54:21 +02:00
Kara Diaby
d58ecb3fcc Lors de la restauration d'une démarche supprimée, met sur les dossiers liés hidden_by_administration_at à nil 2022-06-10 12:33:47 +02:00
Kara Diaby
d2bd2ffcbe controller 2022-06-08 14:38:17 +02:00
Kara Diaby
60eed4ec01 model 2022-06-02 15:48:11 +02:00
Paul Chavard
462b2618a4 feat(procedure): move new children to new parent in transaction 2022-06-01 09:33:39 +02:00
Paul Chavard
c0a253078c fix(revision): fix clone démarches with repetitions 2022-05-31 13:28:56 +02:00
Paul Chavard
6f98def288 refactor(revision): remove old code 2022-05-31 08:58:53 +02:00
Kara Diaby
36aff57f24 model 2022-05-26 12:45:05 +02:00
Paul Chavard
b635952b2f refactor(revision): types_de_champ for export 2022-05-23 18:36:18 +02:00
Paul Chavard
b6ea44f7e7 refactor(revision): remove type_de_champ#revision_id 2022-05-17 11:31:49 +02:00
Paul Chavard
6adb3f7a3a fix(revision): fix migrate_parent! 2022-05-12 10:40:41 +02:00
Kara Diaby
d187b7e881 model 2022-05-10 16:16:16 +02:00
simon lehericey
4ec5b418cb fix create_new_revision 2022-05-06 12:37:59 +02:00
Martin
3737311390 feat(procedure.procedure_expires_when_termine_enabled): enable by default, allow contributor to choose the default settings of this flag using an env var during migration. ie: DEFAULT_PROCEDURE_EXPIRES_WHEN_TERMINE_ENABLED=true|false 
feat(administrateurs/procedures#show): warning/alert when procedure_expires_when_termine_enabled is not true on current procedure

feat(administrateur/procedure#update): after an update redirect to procedure show: suggested by: https://ux.stackexchange.com/questions/55291/after-updating-form-should-redirect-back-to-form-itself-or-to-the-show-page-or-b and confirmed by Olivier

clean(Flipper.archive_zip_globale): no more in use, so remove all occurences

Update app/views/administrateurs/procedures/_suggest_expires_when_termine.html.haml

Co-authored-by: Pierre de La Morinerie <kemenaran@gmail.com>

Update app/views/administrateurs/procedures/_suggest_expires_when_termine.html.haml

Co-authored-by: Pierre de La Morinerie <kemenaran@gmail.com>

Update app/views/administrateurs/procedures/_suggest_expires_when_termine.html.haml

Co-authored-by: Pierre de La Morinerie <kemenaran@gmail.com>

Update spec/views/administrateurs/procedures/show.html.haml_spec.rb

Co-authored-by: Pierre de La Morinerie <kemenaran@gmail.com>

fix(review): typo, why ena?, who knows

fix(env.example.optional): add missing DEFAULT_PROCEDURE_EXPIRES_WHEN_TERMINE_ENABLED
 2022-05-05 13:07:11 +02:00
simon lehericey
37e01ea399 re introduce revision_types_de_champ 2022-05-04 13:16:12 +02:00
simon lehericey
ea361643be types_de_champ -> types_de_champs_public 2022-05-03 11:05:24 +02:00
Martin
be090a1bec feat(administrateur/procedure#create): allow admin to add a lien to the DPO, allow user to consult link to dpo. enhance spec on _procedure_footer.html 
Update spec/views/users/_procedure_footer.html.haml_spec.rb

Co-authored-by: Pierre de La Morinerie <kemenaran@gmail.com>
 2022-04-27 15:09:02 +02:00
Paul Chavard
23b60c87e9 fix(procedure): cloned procedure should not have auto_archive_on 
fix #7149
 2022-04-22 10:48:31 +02:00
simon lehericey
23707d6033 ignore file not found error when cloning procedure 2022-04-14 13:46:16 +02:00
Paul Chavard
706c648be8 refactor(procedure): remove unused code 2022-04-05 09:42:23 +02:00
Paul Chavard
c530399eac feat(procedure): display revisions diffs 2022-03-17 10:26:38 +01:00
Paul Chavard
54b559364a feat(dossier): replace discarded with visible_by_administration 2022-03-10 14:29:40 +01:00
Pierre de La Morinerie
a645c5781d models: delete AdministrateursProcedure when destroying Procedure 2022-03-08 09:20:34 +01:00
Martin
85a588541b feat(dossier_submitted_message): add a new system to customize the standby page (/merci) after an user created his folder. this is a basic feature that will come with more options asap 
wip(dossier_created_hook): add tile to administrateurs/procedure#show in order to crud dossier_created_hook

refactor(css.utilities): remove merge helpers.scss within utils.scss (same purpose). use scss each for spacer modifiers

refactor(dossiers/_merci.html): extract partial _merci so we can re-use it in preview of dossier_created_hook.

feat(wip): current progress
 2022-02-25 14:01:18 +01:00
Paul Chavard
2d396fcfb7 feat(dossier): rebase dossiers en construction and en instruction 2022-02-18 17:08:38 +01:00