121 Commits

Author SHA1 Message Date
9a5fd67842 Resolve "Afficher les noms des usagers et l'entité concerné par l'entité notifiée dans la liste des notifications" 2025-01-23 11:34:16 +00:00
f6387212cb Revert "Merge branch 'manage-translations' into 'master'"
This reverts commit cd99633d1554666eab7718e9b691b135e7cda28a, reversing
changes made to a9384bf734d7abdeb7b1221f86da624b88ab3ca5.
2024-11-27 17:54:11 +01:00
e340be512c Merge master into translations branch 2024-11-25 18:24:08 +01:00
760f74b386 Add translation keys from i18ns to yaml files 2024-10-08 13:25:09 +02:00
4587f66402 Add household info to activity exports 2024-08-30 08:57:27 +00:00
d60ba3ecb2
Merge remote-tracking branch 'origin/master' into 616_rapid-action 2024-06-12 16:45:43 +02:00
nobohan
33cba27dd4 Translations: Added translations for choices of durations (> 5 hours) 2024-06-04 21:24:58 +02:00
569aeeef87 Fix wrong translation of user job service -> métier 2024-02-26 12:23:11 +01:00
dab80a84d8 Merge branch '235-add-date-filter-course-by-activity' into 'master'
Add dates in the filter "filter course by activity type"

Closes #235

See merge request Chill-Projet/chill-bundles!632
2023-12-07 15:25:09 +00:00
fe54e51362
Add dates in the filter "filter course by activity type" 2023-12-04 18:17:00 +01:00
b17b2a8cfb
Export: add export "number of household associated with an activity" 2023-12-04 16:39:01 +01:00
af6bee2497
Export: add an export which count persons on activity 2023-11-15 13:25:08 +01:00
cbc83c0e63
Export: add grouping "group activity by person" (activites saved in person context) 2023-11-13 15:29:01 +01:00
27012d842d
Export: add an ActivityPresenceFilter 2023-11-13 15:29:01 +01:00
4112e59af4
Export: add an ActivityPresenceAggregator 2023-11-09 17:35:34 +01:00
bb1602934c
Fix "group activity by creator job" aggregator 2023-11-07 16:07:24 +01:00
83fe3ec3fc
Export: add a "filter activity by creator job" filter 2023-11-07 16:06:22 +01:00
54ae17a8d2
Fix label on some filters 2023-10-24 15:39:57 +02:00
5f805626f7
[export] sort filters and aggregators by title 2023-10-19 14:39:22 +02:00
981dc6a959
[export] add a filter and aggregator on accompanying periods: group by activity type (accompanying course having at least one activity from this type) 2023-10-19 10:33:56 +02:00
11fb9bcd0b
[export] add a filter and aggregator on activities: filter/group by persons taking part to the activity 2023-10-19 10:33:55 +02:00
adf1110340
Merge remote-tracking branch 'origin/master' into rector/rules-symfony 2023-10-17 09:29:33 +02:00
68d28f3e28
Fix filtres and scopes to take into account job and scope when the refferrer is add to the accompanying period work 2023-10-16 11:52:03 +02:00
fa3fc2c781 [export] fix activity filters/aggregators + tests: 'at' based on activity date 2023-10-03 19:43:16 +02:00
f025b0d184 [export] fix 4 job/scope filters in activity and acp 2023-10-03 19:42:03 +02:00
bea21d45fc [export] fix 2 job/scope aggregators in activity and acp 2023-10-03 19:40:23 +02:00
3aa10927d7 [export] fix 4 job/scope aggregators in activity and aside activity 2023-10-03 19:40:23 +02:00
9c436d5c69
Re-associate filters for export "count persons" 2023-09-28 14:32:58 +02:00
d10dc7344e
Fix label of ActivityTypeFilter 2023-09-26 17:59:05 +02:00
f3912e5544 Merge branch '129-export-filter-course-having-activity' into 'master'
[export] Add a filter "filter course having an activity between two dates"

Closes #129

See merge request Chill-Projet/chill-bundles!574
2023-07-12 16:20:18 +00:00
0950074121 Merge branch '128-export-group-activity-by-localisation' into 'master'
Feature: [export] allow to group activities by location

Closes #128

See merge request Chill-Projet/chill-bundles!573
2023-07-12 16:11:51 +00:00
8391dbe448 Merge branch 'issue719_filter_activities_version_2' into 'master'
Filter the list of activities

See merge request Chill-Projet/chill-bundles!563
2023-07-12 16:11:10 +00:00
1ae27152c2 Merge branch 'master' into 616_rapid-action 2023-07-12 15:38:51 +02:00
2882038efc
[export] Add a filter "filter course having an activity between two dates" 2023-07-11 16:00:40 +02:00
6065680e1e
Feature: [export] allow to group activities by location 2023-07-11 15:01:32 +02:00
f7c11d3567
Feature: Add filters on activity list 2023-06-23 12:27:18 +02:00
909d2dfb60
layout for rendering list 2023-06-13 15:00:16 +02:00
9324c33caf Merge branch 'master' into 616_rapid-action 2023-05-24 11:21:34 +02:00
01f2697b8d Merge branch 'admin-permissionsgroup-templates' into 'master'
Improve permissionsgroup page in admin templates

See merge request Chill-Projet/chill-bundles!504
2023-04-21 15:36:00 +00:00
034e2553bc Fix option with RoleWithoutScope distinction. Remove flag. 2023-04-18 21:13:24 +02:00
ec7f59fc03 UX [translations] batch replace 'activité' by 'échange' + check !
note: fix some others mistakes
2023-04-14 15:58:27 +02:00
83ce3b3e92 Use ⚑ char to mark roles without scopes 2023-04-14 15:28:43 +02:00
318a84e04d permissiongroup: complete translation, remove itself role in 'which implies' 2023-04-14 13:22:31 +02:00
91ba0c983d UX: improve admin > permissiongroup templates 2023-04-14 12:25:09 +02:00
a553dc9aab
UI: fix replacement Activité => échange in french translations 2023-04-12 18:18:08 +02:00
d04011ca07
Merge remote-tracking branch 'origin/master' into issue707_docgen_filter_activity_by_user 2023-04-12 13:49:37 +02:00
380ad2e2e6
UI: replace "période" by "parcours" in french 2023-04-03 18:54:11 +02:00
ee61d131ec
UI: Replace "personne" by usager in french translation 2023-03-31 14:58:07 +02:00
94a099c30c fix typo in échange gender 2023-03-31 12:29:00 +00:00
3ce6af4c36 FIX [translations] last fixes for translations créé instead of créée 2023-03-31 12:01:35 +02:00