31f29f0bc5
Resolve merge conflicts
2024-04-16 12:43:07 +02:00
0bc9fff825
test still failing with error saying column phonenumber of relation users does not exist
2024-04-16 12:01:40 +02:00
25f93e8a89
fix typing
2024-04-16 12:01:40 +02:00
4e0d8e4def
fix userNormalizerTest by adding clock in the construct of UserNormalizer
2024-04-16 12:01:40 +02:00
1ecc825945
Correct 2 phpstan errors, condition is always true and wrong typing
2024-04-16 12:01:40 +02:00
addc623add
php style fixer
2024-04-16 12:01:37 +02:00
1b96deb4ee
try to fix userRenderTest: mock not working
2024-04-16 11:55:54 +02:00
f510acd170
add back the annotation to edit accompanying period work for referrers
2024-04-16 11:55:54 +02:00
835409cb94
work on userRenderTest
2024-04-16 11:55:54 +02:00
2121b3ef28
Add at_date to userRender for rendering the text
2024-04-16 11:55:54 +02:00
6c9101c167
Adapt the rendering of user in accompanyingPeriodWork list and item templates
2024-04-16 11:55:54 +02:00
b46883fe36
Implement clockInterface in renderString method
2024-04-16 11:55:54 +02:00
8d58805abd
work on user render test
2024-04-16 11:55:54 +02:00
c3a799cb7d
work on test logic
2024-04-16 11:55:54 +02:00
bc683b28d6
update normalizers to take into account referrerHistory logic for accompanying period work
2024-04-16 11:55:50 +02:00
d91b1a70bf
work on userRender test
2024-04-16 11:52:58 +02:00
853014d8d2
remove attempt to adjust accompanyingperiod work for display of user job and service at specific date
2024-04-16 11:52:58 +02:00
ad6154a1e4
Implement 'at date' for concerned groups in activity
2024-04-16 11:52:58 +02:00
50c04382ef
Adjust view template for aside activity
2024-04-16 11:52:58 +02:00
d62e9ce269
Implement 'at date' for display of service and user job in accompanying period work entities (for twig templates) -> vue component still to fix
2024-04-16 11:52:58 +02:00
2149ef1cb4
Implement 'at date' for display of service and user job in aside activities entities
2024-04-16 11:52:58 +02:00
d15fbadd27
Implement 'at date' for display of service and user job in calendar entities
2024-04-16 11:52:58 +02:00
fbbf421d8b
Handle DateTime type for activity while DateTimeImmutable is expected
2024-04-16 11:52:58 +02:00
fe695f1a14
Implement 'at date' in user render component for activities
2024-04-16 11:52:58 +02:00
d0ec6f9819
Improve naming for 'at date' in user render component
2024-04-16 11:52:54 +02:00
4091efc72e
Update bundles version to 2.18.2
2.18.2
2024-04-12 12:58:23 +02:00
b577bd7123
Merge branch '250-fix-import-postal-codes' into 'master'
...
Resolve "Import postal codes"
Closes #250
See merge request Chill-Projet/chill-bundles!672
2024-04-12 10:54:15 +00:00
dbb9feb129
rector correction: cast value to string
2024-04-12 12:35:52 +02:00
e8b95f8491
Add changie for fix import postal codes
2024-04-11 16:45:43 +02:00
8de37a9ef3
Fix import of postal codes. URL changed + names of keys
2024-04-11 16:45:22 +02:00
8fd6986c47
Release 2.18.1
2.18.1
2024-03-26 22:10:18 +01:00
807f1b4aa1
Fix layout in admin document generation
...
A layout issue in the admin document generation has been fixed, particularly in the ChillDocGeneratorBundle. Unnecessary elements such as table headers and multiple entity data rows in DocGeneratorTemplate have been removed, simplifying the view page and improving its performance.
2024-03-26 22:10:01 +01:00
f3002631ea
Release 2.18.0
2.18.0
2024-03-26 18:10:18 +01:00
9e667d4de4
Merge branch '268-improve-ux-when-configuring-documents' into 'master'
...
Improve admin UX for configuration of document template (document generation)
Closes #268
See merge request Chill-Projet/chill-bundles!670
2024-03-26 17:06:49 +00:00
fc88a5f40d
Improve admin UX for configuration of document template (document generation)
2024-03-26 17:06:49 +00:00
9ff7aef3fc
Merge branch '267-Fix-the-join-with-the-user-list' into 'master'
...
Fix the join in the user list (admin): show only current user job
Closes #267
See merge request Chill-Projet/chill-bundles!669
2024-03-20 12:34:13 +00:00
4f08019618
Fix the join in the user list (admin): show only current user job
2024-03-20 12:45:08 +01:00
2a58330832
Update v2.17.0.md: add missing changie line
2024-03-19 20:46:50 +00:00
a2cea3df02
Release 2.17.0
2.17.0
2024-03-19 21:00:38 +01:00
9ac43ecf5b
Merge branch '238-custom-column-export-person' into 'master'
...
Liste des usagers: permettre d'ajouter des colonnes custom
Closes #238
See merge request Chill-Projet/chill-bundles!668
2024-03-19 19:59:38 +00:00
f78f5e8419
Fix cs with php-cs-fixer version 3.52
2024-03-19 20:49:39 +01:00
ccf3324bc2
Refactor ListPersonHelper and ListPerson to simplify process and allow to add customization of fields
2024-03-19 20:49:39 +01:00
dfe780f0f5
Merge branch '258-centers-parcours-export' into 'master'
...
In the accompanying period list, add person's centers and duration
Closes #258
See merge request Chill-Projet/chill-bundles!661
2024-03-14 21:35:00 +00:00
dd056efa0d
In the accompanying period list, add person's centers and duration
2024-03-14 21:35:00 +00:00
18c0b6a47f
Merge branch '259-Génération-de-document-avoir-un-comportement-coherent' into 'master'
...
Fix activity filter inconsistency in document generation
Closes #259
See merge request Chill-Projet/chill-bundles!667
2024-03-14 20:25:59 +00:00
df0afcd228
Fix activity filter inconsistency in document generation
...
This commit resolves issue 259 where the filtering of activities differed within the document generation and in the list of activities for an accompanying period. This amendment to the Chill Activity Bundle ensures consistent behavior. Additionally, new test methods and query adjustments were applied to the ActivityACLAwareRepository for better functionality.
2024-03-14 21:16:05 +01:00
d66933c8b5
Merge branch '264-repair-loading-languages' into 'master'
...
Fix the command which load language
Closes #264
See merge request Chill-Projet/chill-bundles!666
2024-03-14 15:12:30 +00:00
0ff51b0a5c
Force new parameter to be readonly in LoadAndUpdateLanguagesCommand constructor
2024-03-14 15:05:30 +00:00
d7f4895248
Fix the command which load language
...
The command load the languages in the configured languages in chill's configuration.
2024-03-14 15:46:32 +01:00
7aee722957
Merge branch '237-filter-evaluations-between-dates' into 'master'
...
Resolve "Nouveau filtre: Filtrer les actions ayant reçu une nouvelle évaluation créée entre deux dates"
Closes #237
See merge request Chill-Projet/chill-bundles!663
2024-03-08 10:37:44 +00:00