8438 Commits

Author SHA1 Message Date
1de853a88b fix count appointment indicator 2022-08-18 10:58:05 +02:00
3eb07121ce filters added 2022-08-18 10:57:15 +02:00
05fd35cfb4 all indicators added 2022-08-18 10:56:22 +02:00
62562cc57e rename querybuilder calendar 2022-08-17 17:37:05 +02:00
dfbaaef778 add average duration indicator calendar 2022-08-17 17:36:42 +02:00
3c5d533c58 first indicator for calendar exports 2022-08-17 16:04:46 +02:00
5060906591 more attempts to make dynamic form work 2022-08-17 16:03:58 +02:00
01f6eb1a8f fix merge conflict in translations 2022-08-17 11:57:46 +02:00
27c2fb1c1f merge with 111_exports 2022-08-17 11:56:22 +02:00
fb18d9fb56 exports: improve activity translations 2022-08-16 17:12:35 +02:00
b2c1c0ec76 add filter residential address at thirdparty of category 2022-08-16 16:19:39 +02:00
42122f5832 exports: use Declarations in activity exports 2022-08-16 15:37:54 +02:00
8093c532d1 exports: overwrite activity translations 2022-08-16 15:30:12 +02:00
2c53f92a2e small refactorisations 2022-08-16 15:13:47 +02:00
4c91bf5084 household position aggregator for person 2022-08-16 15:07:03 +02:00
c2c409998b exports: precise translation when acp filters/aggreg are combined with others 2022-08-16 14:52:53 +02:00
bde623e806 add second indicator for person exports 2022-08-16 10:47:36 +02:00
a9e83d3dc8 delete double translations 2022-08-16 10:42:13 +02:00
afbedf3a4a Merge branch '111_exports' into social_action_exports 2022-08-16 10:19:04 +02:00
4e12684f98 add condition on join clause to improve combined Filters/Aggregators 2022-08-11 18:09:25 +02:00
619ae4e458 improve social work actions translations 2022-08-11 17:43:20 +02:00
b03950d0f7 improve translations for treating agent 2022-08-11 17:33:58 +02:00
f7993eaf2b remove ACP_SHARED Declaration 2022-08-11 17:17:52 +02:00
d27c52b526 Split Job and Scope Aggregators 2022-08-11 17:13:24 +02:00
312a23e91f split ReferrerAggregator 2022-08-11 16:57:44 +02:00
93eb9220a7 split ReferrerFilter, logiquement ce sont des filtres différents 2022-08-11 16:41:15 +02:00
b614149fab translations chain 2022-08-11 16:39:54 +02:00
c45ef7d74f exports: fix initiateQuery to always begin from acp entity 2022-08-11 15:05:08 +02:00
12cae472d6 Merge branch '111_exports' into social_action_exports 2022-08-11 14:08:33 +02:00
b8d187c82b exports evaluation: fix root query from acp 2022-08-11 14:04:15 +02:00
6e467a62d4 exports: simplify with querybuilder method to getRootAlias 2022-08-11 12:04:41 +02:00
70488a935d exports: test if a join is already loaded
when a specific join has to be shared between combined filters/aggregators, we need to check if it has been already loaded.
we cannot load it into indicator because result is wrong
2022-08-11 12:01:54 +02:00
18c17818f6 exports: add ChildrenNumber Aggregator 2022-08-10 17:17:29 +02:00
bc5d610f80 exports: add on_date parameter on Composition Filter/Aggregator 2022-08-10 16:50:59 +02:00
c693dfde66 a same join() in filter and aggregator make error if we combine them 2022-08-10 16:33:05 +02:00
3463ff8e2e exports: add Composition Filter and Aggregator in Household exports 2022-08-10 16:25:38 +02:00
3f4d4497af exports: add new countHousehold export 2022-08-10 14:35:38 +02:00
0c2c364eb6 trying to get dynamic form to work 2022-08-10 13:58:51 +02:00
8efbf02f64 exports: add new MaxDate Filter for evaluation 2022-08-10 10:57:32 +02:00
208d625258 merge conflict resolved 2022-08-10 10:37:19 +02:00
6eddb420cc fix nationality aggregator 2022-08-10 10:36:32 +02:00
3c451209c7 fix nationality aggregator 2022-08-10 10:35:32 +02:00
955d4a9e7a exports: add new EvaluationType Filter and Aggregator 2022-08-10 10:21:05 +02:00
20949fdb5c Merge branch '111_exports' into social_action_exports 2022-08-10 10:05:26 +02:00
2c7a128348 vendee filters and aggregators moved to root folder 2022-08-09 16:49:38 +02:00
97ec921a0a small adjustments 2022-08-09 16:15:27 +02:00
5b4b7473c5 residential address at user filter done 2022-08-09 16:14:41 +02:00
6010559936 translations added 2022-08-09 16:14:17 +02:00
a3cae28613 residential address at thirdparty filter : not done! 2022-08-09 16:14:01 +02:00
9a2af662c0 use translatablestringhelper 2022-08-09 16:13:24 +02:00