Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity
10,125 Commits 144 Branches 99 Tags
Commit Graph

10125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Fastré
a21cefab31
Fix: last fixes for accompanying period work filters 
- avoid errors when the user inverse date from and date to (we correct them)
- allow the user to filter by multiple users
- do not show filter by types if only one action type
- more type-hinting in the $filter argument for AccompanyingPeriodWorkRepository::findByAccompanyingPeriodOpenFirst
 2023-07-14 09:23:23 +02:00
Julien Fastré
f2673d6c83
Merge remote-tracking branch 'origin/master' into issue120_filter_social_actions 2023-07-13 21:14:31 +02:00
Julien Fastré
18535ee85f
DX: remove dump message 2023-07-13 21:12:08 +02:00
Julien Fastré
aea6796ba1 Merge branch 'user_filter_tasks' into 'master' 
Filter on user within task list

See merge request Chill-Projet/chill-bundles!569
 2023-07-13 16:07:54 +00:00
Julien Fastré
872d5e8ebf
do not show filter by user on 'my tasks' page, and show different states 
dynamically
 2023-07-13 18:02:54 +02:00
Julien Fastré
c0901947ca
[filterOrder] show selected picked users in the results boxes 2023-07-13 17:36:05 +02:00
Julien Fastré
ea0e5dfa14
Merge remote-tracking branch 'origin/master' into user_filter_tasks 2023-07-13 16:13:14 +02:00
Julien Fastré
995e2dac80 Merge branch '126-addperson-thirdparty-api-search' into 'master' 
[AddPersons] redondance dans les résultats de recherche de tiers

See merge request Chill-Projet/chill-bundles!576
 2023-07-13 08:37:32 +00:00
Julien Fastré
28c41aaf85
fix the number of parameters in the query 2023-07-13 10:32:56 +02:00
Julien Fastré
1409a3b23a
update changelog 2023-07-13 10:27:29 +02:00
Julie Lenaerts
66e1047752 DX php cs fixer 2023-07-12 20:30:31 +02:00
Julie Lenaerts
7bee376718 DX phpstan fix and remove dump 2023-07-12 20:29:53 +02:00
Julie Lenaerts
6bc45bbca3 FEATURE [filter][actions] integrate user and dates filter into sql 2023-07-12 20:21:14 +02:00
Julien Fastré
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
Julien Fastré
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
Julien Fastré
94e9b75e40 Merge branch '125-list-person-on-course' into 'master' 
Feature: Add a list of peoples with the details of their accompanying courses

Closes #125

See merge request Chill-Projet/chill-bundles!572
 2023-07-12 16:11:39 +00:00
Julien Fastré
23c7a92546 Merge branch '118-design-filterOrder' into 'master' 
improve style of filterOrder box

See merge request Chill-Projet/chill-bundles!568
 2023-07-12 16:11:22 +00:00
Julien Fastré
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
Julie Lenaerts
e0758215ba FEATURE [repository] implement filter logic 2023-07-12 15:17:03 +02:00
Mathieu Jaumotte
efee2d8b44 cleaning 2023-07-12 10:53:12 +02:00
Mathieu Jaumotte
f3829d3390 adapt query to simplify join clauses (lightly improve perfs) 2023-07-12 10:50:17 +02:00
Mathieu Jaumotte
a2e705bd92 fixed: error with parent joins in thirdparty api search query 2023-07-12 10:38:11 +02:00
LenaertsJ
5a36a8660d Merge branch 'AMLI_fix_budget_calculator' into 'master' 
AMLIi fix budget calculator

See merge request Chill-Projet/chill-bundles!575
 2023-07-12 08:20:03 +00:00
Julie Lenaerts
f7d385eba1 DX add changie 2023-07-12 09:06:08 +02:00
Julie Lenaerts
edd66f6a6c FIX [budget][templates] reimplement display of all calculator results 2023-07-12 09:04:15 +02:00
Julie Lenaerts
ef1eb2031e Merge branch 'master' into user_filter_tasks 2023-07-12 07:53:21 +02:00
Julien Fastré
2882038efc
[export] Add a filter "filter course having an activity between two dates" 2023-07-11 16:00:40 +02:00
Julien Fastré
6065680e1e
Feature: [export] allow to group activities by location 2023-07-11 15:01:32 +02:00
Julien Fastré
88114e3ba6
Fixed: [filterOrder] refactor active filter helper to a dedicated class and fix loading of multiple entity choices 2023-07-11 14:17:02 +02:00
Mathieu Jaumotte
bf93c1ddb2 fix label color in active filters pills 2023-07-11 14:06:10 +02:00
Julien Fastré
0d365e16e5
add missing translations 2023-07-10 15:59:33 +02:00
Mathieu Jaumotte
802ff20b5c Merge branch '118-design-filterOrder' of gitlab.com:Chill-Projet/chill-bundles into 118-design-filterOrder 2023-07-10 15:55:18 +02:00
Mathieu Jaumotte
cdfe201574 render active filters like pills 2023-07-10 15:55:05 +02:00
Julien Fastré
43419f9f15
[filterOrder] fix error in method getActiveFilters when dealing with entityChoice with incorrect number of translation 2023-07-10 15:39:00 +02:00
Julien Fastré
39896ea6e2
[FilterOrder] add a method to get all the active filters 2023-07-10 15:26:54 +02:00
Julien Fastré
ca62c3fd0b
Merge remote-tracking branch 'origin/master' into 118-design-filterOrder 2023-07-10 11:51:39 +02:00
Julien Fastré
b3b84c5dc0
Merge branch 'issue719_filter_activities_version_2' into 118-design-filterOrder 2023-07-10 11:49:24 +02:00
Julien Fastré
6bdb3e9695
fix typo which prevent to apply a filter on activity types 2023-07-07 21:49:36 +02:00
Mathieu Jaumotte
20e64e8768 test filterOrder in an accordion 2023-07-07 15:41:29 +02:00
Julien Fastré
197d69ef4a
release v2.4.0 2.4.0 2023-07-07 13:21:22 +02:00
Julien Fastré
9423f4d055 Merge branch '124-sync-user-absence-ms-graph' into 'master' 
Feature: sync user absence with microsoft graph api

Closes #124

See merge request Chill-Projet/chill-bundles!571
 2023-07-07 11:07:08 +00:00
Julien Fastré
99d6e9e6b8 Merge branch 'accompanying_period_voter' into 'master' 
rights for reassigning and accessing confidential parcours

Closes #99 and #121

See merge request Chill-Projet/chill-bundles!483
 2023-07-07 11:06:37 +00:00
Julien Fastré
63f9bd5548
[export] Add ordering by person''s lastname or course opening date in list which concerns accompanying course or people 2023-07-07 12:42:32 +02:00
Julien Fastré
c8146ded17
Feature: add a list for people with their associated accompanying course 2023-07-07 12:36:24 +02:00
Mathieu Jaumotte
17d2b795b4 update changelog 2023-07-07 11:38:00 +02:00
Julien Fastré
7f30742fc3
Rename ListPersonWithAccompanyingPeriod to ListPersonHavingAccompanyingPeriod 2023-07-07 09:36:39 +02:00
Julien Fastré
56d9072abe
change id, to avoid collision between ListPersonHelper and ListAccompanyingPeriodHelper 2023-07-07 09:33:03 +02:00
Julien Fastré
7ccff61c25
Refactor ListAccompanyingPeriod to use a helper for most of the work 2023-07-07 09:17:36 +02:00
Julien Fastré
8929f4b8a3 Merge branch '116-course-index-link-action-to-view-if-closed' into 'master' 
Fixed: rights on the action list in accompanying period main's page

Closes #116

See merge request Chill-Projet/chill-bundles!566
 2023-07-06 20:05:25 +00:00
Julien Fastré
43b7139488
One more changie [ci-skip] 2023-07-06 22:01:45 +02:00