mfo
284bdc5b2b
clean(deadcode): their is no column for avis.label. so clean this one
2024-09-24 20:47:09 +02:00
mfo
0cbb296e7d
Merge pull request #10864 from mfo/US/fix-export-template-with-lots-of-types-de-champs
...
correctif: ETQ instructeur, j'aimerais pouvoir modifier mes modèles d'export, meme sur des démarches avec beaucoup de champs
2024-09-24 16:37:37 +00:00
mfo
b117bc9774
fix(export_template#preview): avoid 414 responses, using get method is not a good option for procedure with a lot of types_de_champ, otherwise we reach http get size limit
2024-09-24 18:07:18 +02:00
Lisa Durand
e1d9ea2a66
Merge pull request #10859 from demarches-simplifiees/improve-dossier-transfer-ldu
...
Améliorer le mail si un usager sans compte DS reçoit un transfert de dossier
2024-09-24 13:49:45 +00:00
Colin Darie
f700024df0
Merge pull request #10862 from colinux/fix-sva-with-complex-pending-corrections
...
ETQ usager: corrige la date prévisionnelle SVA lorsqu'il y a un mélange de demandes de corrections résolues et en attente
2024-09-24 12:35:26 +00:00
Colin Darie
99534ef834
Merge pull request #10812 from colinux/date-last-updated-at-tag
...
ETQ admin, créé les balises "date de mise à jour" du dossier et "date prévisionnelle SVA/SVR"
2024-09-24 12:21:07 +00:00
Colin Darie
b50d42fbb4
fix(sva): when there were resolved corrections and a pending correction
2024-09-24 12:48:09 +02:00
Lisa Durand
463e3e1538
improve email wording for transfert with DS account
2024-09-24 11:31:00 +02:00
Colin Darie
2b07826202
fix(sva): add sva/svr decision date tag for relevant template emails
...
Closes #10033
2024-09-24 11:28:18 +02:00
Colin Darie
861f7359b1
feat(attestation): support last champ updated at as tag
...
closes #9825
2024-09-24 11:28:17 +02:00
mfo
ee19268720
fix(typo): mailerS
2024-09-24 11:24:02 +02:00
Colin Darie
655e4be0e7
Merge pull request #10858 from colinux/attestation-v2-better-v1-ording
...
ETQ admin, explique mieux que l'attestation v1 reste fonctionnelle alors que j'ai accès à la v2
2024-09-24 08:35:09 +00:00
Mathieu Magnin
af0692163b
Merge pull request #10839 from demarches-simplifiees/fix-10837
...
ETQ Administrateur, si j'oublie de renseigner le SIRET de mon service, je souhaite recevoir un message d'erreur explicite pour m'alerter.
2024-09-24 08:31:47 +00:00
Colin Darie
e7f5217211
chore(attestation): improve wording about v1/v2 switch
2024-09-24 10:18:00 +02:00
mfo
12ef66c2b0
Merge pull request #10847 from mfo/US/clean-db
...
amélioration : ETQ tech je souhatie que ma base de donnée ne stock pas de donnée inutile
2024-09-24 08:12:09 +00:00
mfo
a71e83dabe
clean(db): remove ignored column
2024-09-24 10:04:04 +02:00
mfo
0cfa9d6719
fix(batch): this is a hotfix, please be nice we just want to allow our
...
infra to deal with BatchOperation when their is a big load
2024-09-24 09:34:37 +02:00
Eric Leroy-Terquem
7625ec5c8f
fix(manager): can add to super admin both roles of administrator and instructor if he is already one of them
2024-09-24 09:05:38 +02:00
mfo
5b268fff29
Merge pull request #10855 from mfo/US/fix-resolve
...
ETQ administrateur je ne souhatie pas que mes usagers aient une demande de correction suite à un depot de dossier trop ancien
2024-09-24 06:48:41 +00:00
Paul Chavard
3e9a51d9b8
fix(combobox): don’t output undefined className
2024-09-23 21:49:24 +02:00
Paul Chavard
fb07a0ca54
fix(combobox): can copy past multiple values in restricted multi select combobox
2024-09-23 21:49:24 +02:00
mfo
9d46514467
fix(resolve_pending_correction): role back pending_correction for champs
...
without external_id
2024-09-23 21:15:14 +02:00
Paul Chavard
b5eb87de6a
fix(champ): improve row_id validation and remove it during export
2024-09-23 17:06:33 +02:00
mfo
b9f9255e32
Merge pull request #10825 from mfo/US/drop-other-unused-indices
...
amelioration ETQ tech/ops, on souhaite ne pas avoir d'index non utilisé (et plus maintenu) - bis
2024-09-23 13:17:23 +00:00
mfo
7adbdaa4de
tech(clean): unused index and column
2024-09-23 14:53:37 +02:00
Paul Chavard
95176b8a00
chore(maplibre): update
2024-09-23 14:45:36 +02:00
Paul Chavard
b1c0b4de20
Merge pull request #10840 from tchak/fix-pagination-links
...
fix some playwright specs
2024-09-23 12:27:54 +00:00
Paul Chavard
4ab9ef1f3f
Merge pull request #10842 from tchak/revert-du-revert-de-refactoring-champs
...
Revert "Revert "Merge pull request #10771 ""
2024-09-23 12:27:04 +00:00
Lisa Durand
f18b71a36b
remove invisible and unused transfer_all feature
2024-09-23 14:22:54 +02:00
mfo
d16a40b6aa
Merge pull request #10836 from mfo/US/fix-mistake-changing-dossier-repasser-en-construciton
...
ETQ administrateur, je ne souhaite pas voir des dossiers en instruction repasser en construction pour une donnée qui ne m'est pas necessaire
2024-09-23 11:54:56 +00:00
Colin Darie
6800205ffe
Merge pull request #10682 from demarches-simplifiees/a11y-fix-process-screen-1
...
Corrige les défaut d'accessibilité de la page d'accueil d'une démarche
2024-09-23 11:21:11 +00:00
Colin Darie
84fbb4c6ad
fix: heading level of france connect title depends on context
2024-09-23 13:11:13 +02:00
Lisa Durand
0272f79c6a
migration to remove hidden_at from dossiers
2024-09-23 10:58:36 +02:00
Paul Chavard
3429a72f53
fix(dossier): do not show repetitions in header sections summary
2024-09-23 10:51:38 +02:00
Paul Chavard
6254b50de9
Revert "Revert "Merge pull request #10771 from tchak/refactor-champs-revert""
...
This reverts commit 10a1ae5534
2024-09-23 10:21:07 +02:00
Paul Chavard
e4ac781b54
fix(rnf): remove deprecated status attribute
2024-09-20 16:58:51 +02:00
Mathieu Magnin
e9b5c4a615
[ #10837 ] Add an explicit message when SIRET is not valid on service
2024-09-20 15:44:46 +02:00
Paul Chavard
356dae446c
fix(spec): make pagination links clickable
2024-09-20 15:24:41 +02:00
Corinne Durrmeyer
d79fb43635
Add forgotten hint
2024-09-20 15:07:43 +02:00
Corinne Durrmeyer
6e960d2b21
Remove useless attributes
2024-09-20 15:07:16 +02:00
Corinne Durrmeyer
6f7e7f43d6
Password complexity : Adds component vocalization for ATs
2024-09-20 14:32:17 +02:00
mfo
3b3c845b2e
fix(fix_champs_commune_having_value_but_not_external_id): only asks for update for dossier en construction
2024-09-20 14:30:42 +02:00
mfo
ada5ceeeec
fix(data): revert pending_correction for champs commune not having external_id, was a mistake. mine
2024-09-20 11:54:11 +02:00
Mathieu Magnin
a11fb0081e
Add opendata attribute on manager
2024-09-20 11:30:12 +02:00
mfo
cd8c55b161
Merge pull request #10814 from demarches-simplifiees/fix-10813
...
[bug] Ne pas afficher de 500 quand value_json d'un champ SIRET est nil
2024-09-19 15:22:45 +00:00
Corinne Durrmeyer
2c69f93edd
Remove time slot from telephone link
2024-09-19 14:15:58 +02:00
Corinne Durrmeyer
c950925a57
Distinguish links from content
2024-09-19 14:15:54 +02:00
Corinne Durrmeyer
acdd259e1d
Uniform title with link content
2024-09-19 14:15:51 +02:00
Corinne Durrmeyer
019b1e389f
Add missing h2 to footer
2024-09-19 14:15:51 +02:00
Corinne Durrmeyer
aa0e469dc5
Replace h2 with h3 in france connect component
2024-09-19 14:15:51 +02:00
Corinne Durrmeyer
5d6c97eb2f
Replace p.fr-callout__text with div to avoid unauthorised nesting
2024-09-19 14:15:51 +02:00
Corinne Durrmeyer
b301ad9109
Hide decorative content from TA
2024-09-19 14:15:51 +02:00
Corinne Durrmeyer
3962c24892
Empty alt attribute for decorative images
2024-09-19 14:15:50 +02:00
simon lehericey
10a1ae5534
Revert "Merge pull request #10771 from tchak/refactor-champs-revert"
...
This reverts commit c902061ebfb4ed11c788
2024-09-19 11:09:01 +02:00
Lisa Durand
5b31aca888
improve transfer mail for user without account
2024-09-18 17:19:26 +02:00
LeSim
6b322d61ca
Merge pull request #10776 from demarches-simplifiees/ac_2fa
...
ETQ Instructeur, je dois utiliser le 2fa pour le fournisseur d'identité Agent Connect / Mon Compte Pro
2024-09-18 12:48:39 +00:00
LeSim
d32124d732
Merge pull request #10807 from demarches-simplifiees/slow_drop_down_cleaning
...
Tech: simplification de la logique des champs listes
2024-09-18 12:46:15 +00:00
Lisa Durand
3d50f9363f
Merge pull request #10741 from demarches-simplifiees/secu-improve-complexity-password-ldu
...
[sécu] Améliorer la complexité des mots de passe pour tous les users
2024-09-18 12:40:17 +00:00
simon lehericey
05238912cf
record amr for stat
2024-09-18 14:40:12 +02:00
simon lehericey
363f70a3fc
add feature flipping, just in case
2024-09-18 14:40:11 +02:00
simon lehericey
cd2d772cd0
feature(agent_connect_2fa): add intermediate pages to improve UX
2024-09-18 14:40:11 +02:00
simon lehericey
6f5135a6b2
refactor: extract agent_connect logout_url to a agent_connect_service
2024-09-18 14:40:11 +02:00
simon lehericey
1706feec3d
feature(agent_connect_2fa): do not log AC/MonComptePro agent without 2fa
2024-09-18 14:40:10 +02:00
simon lehericey
5f25756ae2
ask for amr (Authentication Methods References)
2024-09-18 14:40:10 +02:00
simon lehericey
1e9982927a
add identity_provider id scope
2024-09-18 14:40:10 +02:00
simon lehericey
c0fe06ceb7
refactor: simplify ZxcvbnService
2024-09-18 12:57:58 +02:00
Lisa Durand
214a0daca1
small wording adjustment
2024-09-18 12:57:51 +02:00
LeSim
c89e60d5fa
Merge pull request #10793 from demarches-simplifiees/remove_virtual_attribute_in_code
...
Tech: retire la protection contre les colonnes virtuelles
2024-09-18 08:38:20 +00:00
simon lehericey
061c9cc6f3
remove default empty value in drop_down_list
2024-09-18 10:26:00 +02:00
simon lehericey
51e192939c
pack drop_down stuff together
2024-09-18 10:08:12 +02:00
simon lehericey
85684e3bea
homogenize render? if not options
2024-09-18 10:08:12 +02:00
simon lehericey
f1a606da6d
one less indirection
2024-09-18 10:08:12 +02:00
simon lehericey
b3ad237fa1
simplify drop_down_list_value
2024-09-18 10:08:12 +02:00
simon lehericey
2f64fe5e4c
one less indirection
2024-09-18 10:08:12 +02:00
simon lehericey
f046f31dcc
remove_disabled_options
2024-09-18 10:08:11 +02:00
Mathieu Magnin
bfb7b59033
[ #10813 ] When value_json of champ SIRET is nil do not crash
2024-09-17 19:05:36 +02:00
Colin Darie
39ebaadf03
Merge pull request #10811 from colinux/fix-stats-nav-bar
...
ETQ usager, pas d'erreur sur la page stats quand je viens de la page commencer (à cause de la navbar)
2024-09-17 16:05:24 +00:00
mfo
1e0391c9dc
Merge pull request #10806 from mfo/US/fix-number-not-number-in-filters
...
Correctif: ETQ instructeur, la recherche par numéro de dossier ne doit accepter que des numero
2024-09-17 14:39:08 +00:00
Colin Darie
79a1d9b99d
fix(navbar): never fail request on broken navbar logic
2024-09-17 16:18:16 +02:00
Colin Darie
b68b340d81
fix(stats): nav bar profile logic when fallbacking on referer context without request
2024-09-17 15:59:24 +02:00
Lisa Durand
1d0be04f2a
Merge pull request #10809 from demarches-simplifiees/design-improve-fc-email-page-ldu
...
[Design] Amelioration du design de la page de confirmation du mail de France Connect
2024-09-17 13:47:02 +00:00
Eric Leroy-Terquem
969706163b
Merge pull request #10641 from demarches-simplifiees/move-image-treatment-to-jobs
...
Technique : déplace les traitements d‘images côté jobs
2024-09-17 13:43:51 +00:00
mfo
ebb51e8128
fix(filters): filter by dossier should only accept number
2024-09-17 15:18:23 +02:00
Lisa Durand
edc4f826f2
small design improvement for FC email page
2024-09-17 15:01:01 +02:00
Mathieu Magnin
8384be12a0
Fix missing expiration after refacto
2024-09-17 14:26:06 +02:00
Paul Chavard
3fef831524
move child? method for clarity
2024-09-17 10:29:34 +02:00
Paul Chavard
54132df77d
dossier(champ): validate presence of row_ids
2024-09-17 10:29:34 +02:00
Paul Chavard
33e502234e
refactor(dossier loader): simplify all the things
2024-09-17 10:29:34 +02:00
Paul Chavard
2ba356bc68
cleanup(prefill): remove unused validation
2024-09-17 10:29:34 +02:00
Paul Chavard
c94d1b7eea
cleanup: more concistent methods usage
2024-09-17 10:29:34 +02:00
Paul Chavard
a474cf4590
refactor(attestation): unspecified_champs_for_dossier based on types_de_champ
2024-09-17 10:29:34 +02:00
Paul Chavard
54926db89b
refactor(champ): more concistent champ_for_update usage
2024-09-17 10:29:34 +02:00
Paul Chavard
988025ba69
refactor(champs): validate only champs in current revision
2024-09-17 10:29:34 +02:00
Paul Chavard
df83322f0c
refactor(apiv1): use dossier preloader on api v1
2024-09-17 10:29:34 +02:00
Paul Chavard
ed4fbc887a
refactor(dossier): remove unused scopes
2024-09-17 10:29:34 +02:00
Paul Chavard
3817f334c9
refactor(repetition): use less champs and public_id methods
2024-09-17 10:29:34 +02:00
Mathieu Magnin
b4ed11c788
Merge pull request #10800 from demarches-simplifiees/fix-10798
...
[#10798 ] ETQ Superadmin, je veux savoir sur le Manager si une démarche a un jeton d'api entreprise configuré
2024-09-17 07:59:59 +00:00
Mathieu Magnin
7ace670010
[ #10798 ] fix tests
2024-09-17 09:47:46 +02:00
mfo
36247a4b6d
Merge pull request #10770 from demarches-simplifiees/US/fix-timeouting-task-fixing-champs-commune
...
ETQ operateur DS, je souhaite pouvoir corriger les champs de type commune ayant de la bad data
2024-09-17 07:17:47 +00:00
Paul Chavard
9924b2d640
Merge pull request #10804 from tchak/better_drop_down_other_option
...
Drop down other label set to 'Enter another option' instead of 'Other'
2024-09-16 15:12:14 +00:00
Paul Chavard
34a05d0bf0
Merge pull request #10462 from demarches-simplifiees/can-filter-from-repetition-content
...
ETQ instructeur je peux filtrer à partir du contenu d'un bloc répétable
2024-09-16 14:59:05 +00:00
Paul Chavard
e7bc7c4783
feat(procedure): can filter from repetion content
2024-09-16 16:46:49 +02:00
mfo
7bbf04b9b5
Merge pull request #10774 from mfo/US/fix-PG-NumericValueOutOfRange
...
correctif: ETQ instructeur, si j'ai essayé de filtrer mes dossiers par numéro et que j'ai saisi un numero superieur à 2147483647, ma page ne doit pas planter
2024-09-16 14:43:59 +00:00
Christian Lautier
17bbc474ff
Drop down other label set to 'Enter another option' instead of 'Other'
2024-09-16 16:41:46 +02:00
mfo
18137b176c
fix(fix_champs_commune_having_value_but_not_external_id_task): timeouting despite classic pattern to find all champs for a specific type. lighten request by selecting only :id and processing batches
2024-09-16 16:38:46 +02:00
mfo
6af07dd721
data(fix): backfill invalid procedure presentation filters having a value greater than pg max integer
2024-09-16 16:36:02 +02:00
mfo
4bd518f85e
Merge pull request #10802 from mfo/US/fix-rnf-with-removed-fondation
...
Correctif: ETQ usager/instructeur, je souhaite pouvoir visualiser les dossiers ayant un champ fondation dont celle ci a ete supprimé du registre
2024-09-16 13:48:05 +00:00
Paul Chavard
e9009025f6
Merge pull request #10736 from demarches-simplifiees/fix-notif-to-instructeurs-when-import
...
Correctif: lors de l‘import en masse d'instructeurs, les nouveaux instructeurs reçoivent un lien pour vérifier leur email
2024-09-16 13:31:33 +00:00
Lisa Durand
030bfa6651
disable submit button on page loading
2024-09-16 15:28:15 +02:00
Lisa Durand
22e06bc5eb
change password complexity library and setup
2024-09-16 15:28:14 +02:00
Lisa Durand
71e03203aa
add password complexity for expert
2024-09-16 15:23:43 +02:00
Lisa Durand
766a5608bb
remove unused views
2024-09-16 15:23:43 +02:00
Lisa Durand
00a155b896
add password complexity for instructeur, user and password change
2024-09-16 15:23:43 +02:00
mfo
e2ec5118f4
fix(champs.rnf): some foundations was removed from the registry. lucky us [or good archi ? :D], we kept api data
2024-09-16 14:24:40 +02:00
Paul Chavard
f5fdef0600
fix(api-entreprise): save libelle_commune_etranger and libelle_pays_etranger in db
2024-09-16 12:55:59 +02:00
Colin Darie
58037f21cd
Merge pull request #10778 from colinux/sharerd-controller-nav-bar-profile
...
UX: améliore la détection du type de profile utilisé pour la nav bar
2024-09-16 08:01:03 +00:00
Mathieu Magnin
539853255d
Missing frozen_string_literal
2024-09-13 16:52:42 +02:00
Mathieu Magnin
ce22adf811
[ #10798 ] Indicate in manager if api_entreprise_token is present / valid / expired
2024-09-13 16:47:31 +02:00
Paul Chavard
f00ba04fb9
graphql(playground): fix acl
2024-09-13 14:28:13 +02:00
mfo
7a78fdc913
fix(normalized_address): should not raise an error for addresses without code postal
2024-09-13 11:19:05 +02:00
simon lehericey
bc7d91751d
Revert "fix: ignore virtual data in column initialization"
...
This reverts commit 4289aa2cf5
2024-09-13 11:00:08 +02:00
Mathieu Magnin
d8a0adc6ed
Merge pull request #10772 from demarches-simplifiees/fix-10751
...
ETQ Instructeur, jamais connecté, je ne veux pas recevoir 10 mails si j'ai été ajouté à 10 groupes
2024-09-13 08:08:16 +00:00
Colin Darie
8dfddba433
Merge pull request #10584 from colinux/attestation-render-list
...
ETQ admin, améliore l'affichage de champ choix multiple et répétitions dans les attestations v2
2024-09-12 14:40:32 +00:00
Lisa Durand
697e2328e3
Merge pull request #10777 from demarches-simplifiees/improve-wording-reset-link-pwd-ldu
...
ETQ usager, améliore la page après envoi du mot de passe oublié
2024-09-12 14:37:48 +00:00
Colin Darie
f6744adbde
fix: never show 'guest' profile name
...
it's just a hack to tell we don't known the actual profile
2024-09-12 10:00:19 +02:00
Colin Darie
d566186954
fix: coherent nav bar profile for super admins
2024-09-12 10:00:19 +02:00
Colin Darie
16e1daac9b
fix(recherche): respects nav bar profile context
2024-09-12 10:00:18 +02:00
Colin Darie
0309e0f6b2
refactor(profile): generalize profile from referrer or for user
2024-09-12 10:00:18 +02:00
Mathieu Magnin
a99fae168c
[ #10751 ] Allow sending a new invitation if the user's previous one has expired
2024-09-11 18:45:15 +02:00
Mathieu Magnin
790177c758
[ #10751 ] Only send the first invitation mail to the instructeur if email is not verified (from admin controller)
2024-09-11 18:45:15 +02:00
Mathieu Magnin
d7811fca40
[ #10751 ] Only send the first invitation mail to the instructeur if email is not verified
2024-09-11 18:45:15 +02:00
Colin Darie
b5c024cca5
Merge pull request #10768 from colinux/disable-admin-hide-instructeur-toggle
...
ETQ tech c'est finalement par le manager qui définit si le flag pour masquer l'email des instructeurs
2024-09-11 15:29:06 +00:00
Colin Darie
0201feec65
feat(manager): can hide instructeurs email from procedure
2024-09-11 17:20:58 +02:00
Colin Darie
b987688d19
refactor: disable auto hide instructeurs toggle by admin
2024-09-11 17:20:57 +02:00
Colin Darie
09cafdb15f
Merge pull request #10745 from colinux/helpscout-delete-old-customers
...
ETQ opérateur, je supprime les contacts HS > 2 ans
2024-09-11 15:19:33 +00:00
Lisa Durand
966c110df8
add strong tags to highlight email and application name
2024-09-11 15:26:58 +02:00
Lisa Durand
abbbb09180
make reset link page clearer
2024-09-11 11:41:11 +02:00
mfo
02bbf26d3f
feat(ProcedurePresentation): validates that ProcedurePresentation.filters using a value casted as an integer [search by id] is not out of pg integer range
2024-09-10 17:47:50 +02:00
Colin Darie
6240d54fd4
fix: unbreakable space for better look in filters
2024-09-10 12:36:13 +02:00
Colin Darie
40b5eb5ea7
fix: typo region => région
2024-09-10 12:29:53 +02:00
simon lehericey
4289aa2cf5
fix: ignore virtual data in column initialization
2024-09-09 16:37:22 +02:00
Colin Darie
ab3139c2ed
Merge pull request #10680 from demarches-simplifiees/a11y-fix-demarche-header
...
Refonte du menu d'aide
2024-09-09 14:17:50 +00:00
mfo
5ab57a32ce
Merge pull request #10762 from mfo/US/export-when-tdc-change
...
Correctif, ETQ instructeur exportant mes dossiers, je souhaite retrouver la valeur saisie par les usagers quand les types de champ ont changés de type mais que les données restent compatible
2024-09-09 09:26:42 +00:00
mfo
7ec17ff7f5
fix(dossier.export): should not use default value when types_de_champ changed to a similar one
2024-09-09 11:00:01 +02:00
Colin Darie
7c30ab87bc
Merge pull request #10712 from colinux/rails-7-finalize-defaults
...
Rails 7.0 : finalise la migration des defaults
2024-09-09 08:08:27 +00:00
Colin Darie
977e47fa74
Merge pull request #10757 from mfo/US/fix-required-dossier-link-with-missing-dossier
...
correct: ETQ administrateur, je souhaite que les types de champ liens vers un dossier pointent vers un dossier valide si ils sont obligatoire
2024-09-09 07:28:48 +00:00
Colin Darie
6e9fb7f247
Merge pull request #10740 from colinux/debug-email-verified
...
ETQ tech et super-admin, je veux voir rapidement si un user a son email verifié
2024-09-09 07:23:32 +00:00
Colin Darie
5d4cafc18f
Merge pull request #10722 from colinux/migrates-otp-secrets
...
Tech: task pour copier les secrets OTP vers les encrypted attributes
2024-09-09 07:08:30 +00:00
Colin Darie
1515e67651
Merge pull request #10760 from demarches-simplifiees/fix_unverified_admin_email
...
ETQ Administrateur, je peux recevoir des mails lorsque je valide mon compte depuis le mail d'invitation
2024-09-09 07:07:26 +00:00
Mathieu Magnin
71d43078ee
Merge pull request #10743 from demarches-simplifiees/fix-10742
...
ETQ instructeur mon adresse email est automatiquement vérifiée quand je me connecte par AgentConnect
2024-09-06 14:26:54 +00:00
