Compare commits

..

2381 Commits

Author SHA1 Message Date
5774c8fbb6 deps: force doctrine/orm on 2.13.5 2022-12-30 00:56:42 +01:00
b41cd1429c deps: restrict doctrine/orm below 2.14 2022-12-30 00:52:39 +01:00
a1b36107c0 Deps: prevent upgrading to new version of doctrine/orm 2022-12-30 00:51:26 +01:00
bbd2599e7e Fixed: [cron] store the last store of executed tasks correctly 2022-12-27 00:09:45 +01:00
5aa59aa0ff Deploy: upgrade chill bundles and adapt skeleton 2022-12-24 15:40:17 +01:00
351df930a1 DX: Fix CS 2022-12-23 13:36:32 +01:00
c8127a1d9d Fixed: ensure to execute Refresh Address To Geographical Unit Cronjob even during the day 2022-12-23 13:36:23 +01:00
f12f640cb4 Fixed: use correct comparison of body in makeFetch 2022-12-23 11:32:31 +01:00
4da9b6587d DX: remove console comment in file Person.vue 2022-12-23 11:30:40 +01:00
0fec753118 Merge branch 'cire16' into 'master'
Cire issue #16 : fix some stuffs for staging cire instance

See merge request Chill-Projet/chill-bundles!467
2022-12-22 18:51:33 +00:00
4d3d9db1b3 Fixed: Fix map center on opening or editing address 2022-12-22 19:29:56 +01:00
ce17f5f5c0 Fixed: [vue][add-address] fix map center when editing existing address (corrections post review)
52512e45fc (note_1205935758)
2022-12-22 11:31:44 +01:00
6a14c2b9b3 Fixed: [vue][add-address] fix map center when editing existing address
https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/674
2022-12-22 11:31:27 +01:00
ad94c7bcb7 DX: Fix CS and type hinting 2022-12-22 11:22:49 +01:00
3ca2811494 Feature: set parameters for add_address as global
The parameter `window.addaddress` is now global and can be reached to all page. This ensure backward compatibility.
2022-12-22 11:22:24 +01:00
1bc7221315 Feature: Set defaults values for add_address configuration
The default values were not set at the root of the array config. This create a default value to the array config
2022-12-22 11:21:05 +01:00
7a1cc9b076 Merge remote-tracking branch 'origin/master' into cire16 2022-12-22 10:22:58 +01:00
f7fa9c31f3 Merge branch '29-person-modal-on-the-fly-add-center' into 'master'
Resolve "La modale "on the fly" pour créer une personne ne fonctionne pas: il manque le centre"

Closes #29

See merge request Chill-Projet/chill-bundles!468
2022-12-21 16:34:52 +00:00
fa237bf27b Fix: missing translation of validation of center 2022-12-21 17:27:15 +01:00
64e65d08fe Fix: [center denormalizer] do not throw an error if deserializing a null center 2022-12-21 17:27:14 +01:00
1f58acd871 Feature: [person][creation] Add center field to OnTheFly/Person 2022-12-21 17:27:11 +01:00
b06a76784a Feature: [person][creation] api for listing availables centers for person creation 2022-12-21 17:25:23 +01:00
1585a73974 DX: [authorization helper] Create an authorization helper with current user already available
See https://gitlab.com/Chill-Projet/chill-bundles/-/issues/14
2022-12-21 17:25:22 +01:00
ba261ddeb9 Fixed: show list of workflow, event if some accompanying course document associated to a workflow are deleted 2022-12-14 13:52:37 +01:00
58ede06dfe Fixed: show list of workflow, event if some social action associated to a workflow are deleted 2022-12-14 13:46:31 +01:00
2dec6a017d Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-12-13 14:43:03 +01:00
fb42cb1baf Merge branch '25-bug-composition' 2022-12-13 14:42:10 +01:00
ae1df1f47a Fixed: [zone admin] fix edit link in composition index template 2022-12-13 14:41:54 +01:00
f2cbd7f4a3 Merge branch '30-add-cron-system' into 'master'
Handle cron within chill-bundle code

Closes #30

See merge request Chill-Projet/chill-bundles!472
2022-12-13 12:45:49 +00:00
d41dc7035c Doc: doc for CronJobManagerInterface 2022-12-12 23:29:03 +01:00
23d7d1c8f0 Doc: doc for installation and cronjob, and addresses 2022-12-12 22:49:50 +01:00
acfa3d6849 Fixed: [cronjob command] force command name 2022-12-12 22:49:30 +01:00
0bfb5c617e Doc: [cronjob manager] Doc for implementing cronjob 2022-12-12 22:48:57 +01:00
17461aa21e Fixed: [cronjob manager] Fix execution of one single job 2022-12-12 22:21:46 +01:00
7d469df62a Feature: CronJob for refreshing materialized view association between address and geographical unit 2022-12-12 21:17:03 +01:00
204ebd4415 Feature: bootstrap dependency injection for CronJobManager and create a command 2022-12-12 21:16:27 +01:00
b789250b8d Feature: bootstrap dependency injection for CronJobManager 2022-12-12 21:15:58 +01:00
1ebdcd1530 Feature: create table for CronJobExecution 2022-12-12 21:15:32 +01:00
e93458f943 Fixes: Fix doctrine annotation and repository for CronJobExecution 2022-12-12 21:15:05 +01:00
ceee5e7eea Feature: [cron] Create an interface for CronManagerInterface 2022-12-12 21:14:33 +01:00
e0c9e12008 Feature: [cron] Create a cron job to refresh materialized view address - geographical unit association 2022-12-12 14:35:46 +01:00
4fcfe3f5d2 Feature: [cron] Create a cron manager 2022-12-12 14:02:19 +01:00
333e524136 Merge branch 'calendar/finalization' into testing 2022-12-12 13:50:58 +01:00
3c85b5ca92 Fixed: a bug for range generatoion during week-end
The range generator failed during week-end, because no range is selected (lastStart and endDate is null).

with this commit, the rangeGenerator may return null instead of an array, which means no sms will be send.
2022-12-12 13:09:31 +01:00
aca81122d5 Merge branch 'calendar/finalization' into testing 2022-12-08 13:42:25 +01:00
efe494d61f handle package version from within chill bundles 2022-12-07 15:42:39 +01:00
c050c42a27 Fixed: [My Calendar Ranges] fix use of legacy mode in vue createI18n 2022-12-07 14:15:52 +01:00
6309877a14 Fixed: [relationship graph] fix layout of button to add a link (upgrade bootstrap) 2022-12-07 12:18:35 +01:00
8d19e8d7af Fixed: Fix padding inside top right menus 2022-12-07 12:00:31 +01:00
34c97769a6 Fixed: Fix modal layout with bootstrap upgrade 2022-12-07 12:00:14 +01:00
a10aae2100 Deploy: update webpack config for postcss loader and ckeditor 2022-12-06 22:27:27 +01:00
516e4e5f47 Fixed: fix the loading of bootstrap
See https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/690
2022-12-06 21:25:35 +01:00
531b49a536 Merge branch '111_exports_suite' into calendar/finalization 2022-12-06 21:21:01 +01:00
5328bee262 Fixed: [SocialAction] Fix the loading of evaluations associated to a SocialActions 2022-12-06 10:17:49 +01:00
060d5d5ca3 Merge remote-tracking branch 'origin/master' into 111_exports_suite 2022-12-05 20:52:33 +01:00
368136ea57 Feature: [activity][list] Fix list for activities and refactor list with an helper 2022-12-05 18:26:01 +01:00
d080dfda9a DX: Fix CS 2022-12-05 18:26:01 +01:00
88fb48e2be Fixed: let the aggregator "Activity by type" be shown again 2022-12-05 18:26:01 +01:00
feb760a97b Merge branch 'calendar/finalization' into testing 2022-11-29 16:08:05 +01:00
e97a04ab54 Feature: [Calendar doc] Pick document to generate inside the edit/new form 2022-11-29 15:27:36 +01:00
c16454214d Merge branch 'calendar/finalization' into testing 2022-11-28 21:38:35 +01:00
be5f87348b Feature: [CalendarDoc] pick template for generating calendar directly in list 2022-11-28 21:37:17 +01:00
e71bb5d77b Merge branch 'calendar/finalization' into testing 2022-11-28 14:54:26 +01:00
6cac298724 Feature: [Calendar doc] show an alert when document is linked to a previous datetime version of the calendar 2022-11-28 14:40:33 +01:00
39f410dc8f Feature: [Calendar doc] complete CRUD for associating documents within Calendar 2022-11-28 14:33:06 +01:00
fc15b85d11 DX: [accompanying period] refactor the getCenters method
Use more portable spl_object_hash for listing different centers
2022-11-28 12:24:10 +01:00
74673380aa Fixed: [calendar] refactor ACL on calendar 2022-11-28 12:22:58 +01:00
72ae6fb2cd merge calendar/finalization into testing: fix conflicts 2022-11-28 09:33:24 +01:00
a73dca5efe Feature: [calendar] show the number of calendars ignored by the date filter, in the list 2022-11-25 17:27:42 +01:00
8cbfe16c24 DX: Fix cs 2022-11-25 17:02:57 +01:00
9b32ce53c8 Fixed: [calendar] add a return path to calendar doc
See https://gitlab.com/Chill-Projet/chill-bundles/-/issues/23
2022-11-25 17:02:12 +01:00
788b1e9eeb Fixed: [calendar] Fix picking calendar document templating, when adding document in person context 2022-11-25 16:51:41 +01:00
57e1786b99 Fixed: [calendar] Always show filter of calendars in list 2022-11-25 16:50:56 +01:00
6eb23c6073 Feature: [calendar] add proper location on short message text for next rendez-vous 2022-11-25 16:28:00 +01:00
b6e3baa5dc DX: fix cs 2022-11-25 16:04:40 +01:00
02a7074218 Fixed: [calendar] Do not require scope when adding calendar roles 2022-11-25 15:57:50 +01:00
593caec851 Merge remote-tracking branch 'origin/111_exports_suite' into calendar/finalization 2022-11-25 15:29:17 +01:00
9913938c1b show x instead of 1 or 0 for boolean field in export 2022-11-25 14:19:22 +01:00
7c8ac8cfcb Merge branch '111_exports_suite' into testing 2022-11-25 14:17:16 +01:00
3ebf3ae148 fix activity list export for linked with person 2022-11-25 14:16:44 +01:00
24833be681 take into account null value in formatter 2022-11-25 14:15:56 +01:00
6777cf7225 household can be null in budget abstractElement 2022-11-24 13:01:55 +01:00
3b9e6d2742 fix z-index of dropdown menus 2022-11-24 11:12:01 +01:00
390da7c641 Merge branch 'testing' of gitlab.com:Chill-Projet/chill-bundles into testing 2022-11-21 11:11:57 +01:00
d3e784de15 DX: fix cs 2022-11-20 21:28:07 +01:00
d35dacf562 Fixed: [budget] Fix voter on household's budget 2022-11-20 21:27:19 +01:00
cd54fdd13f Feature: [activity] automatically add a person to an activity, if
created in the person context

See https://gitlab.com/Chill-Projet/chill-bundles/-/issues/28
2022-11-18 16:12:49 +01:00
448d93cd02 Fixed: [address] Add missing window.addaddress in person create page, and third party create and update page 2022-11-18 16:11:03 +01:00
8894491dac #16 fix error with vue_activity component in person context (when accompanyingPeriod is null) 2022-11-17 21:43:03 +01:00
999e9e8553 Feature: [workflow] do not subscribe user on notification for each step
automatically
2022-11-17 19:17:30 +01:00
3ca46efd2c #16 pass default variables to add-address component when it is called from another vue component 2022-11-17 19:02:07 +01:00
e90782500b #16 add default value for config variables 2022-11-16 23:10:11 +01:00
0f159281ba Merge branch '111_exports_suite' into testing 2022-11-16 22:53:38 +01:00
15c304b1d1 Feature: [rolling date] do not show the fixed date input, unless the fixed date value is picked 2022-11-16 22:52:30 +01:00
53980dd757 #16 replace hardcoded country and map_center in vue add-address by symfony config yaml variables 2022-11-16 22:30:05 +01:00
c1261f63e7 Merge branch 'testing' of gitlab.com:Chill-Projet/chill-bundles into testing 2022-11-16 18:41:42 +01:00
80f6b7d330 cs fix 2022-11-16 18:41:26 +01:00
56a7833858 #16 Fix html5 widget for ChillDateTimeType 2022-11-16 17:44:48 +01:00
318d6b6d4e Fixed: remaining options not linked with PickRollingDateType 2022-11-16 14:58:08 +01:00
d0e1f31ec7 Fixed: [saved exports] Fix a test in list when no export ungrouped 2022-11-16 14:58:08 +01:00
15871db7fd Fixed: [saved exports] Transform null strings into blank strings, and add validation 2022-11-16 14:58:08 +01:00
00bf7bf299 DX: fix construct of ReferrerScopeAggregator in test 2022-11-16 14:58:07 +01:00
dafd715efd Merge branch '111_exports_suite' into testing 2022-11-16 14:32:54 +01:00
928869666c #16 fix errors and some design regressions in eventBundle 2022-11-16 13:09:59 +01:00
9623a35e6f #16 EventBundle participation (fix errors and improve ux) 2022-11-16 10:57:06 +01:00
d58aad4624 improve savedExport translation 2022-11-15 22:08:15 +01:00
a39f547907 fix flex-bloc look in exports list and saved exports 2022-11-15 22:01:35 +01:00
0e661784b0 DX: fix construct of ReferrerScopeAggregator in test 2022-11-15 18:17:58 +01:00
fc607d6a0e DX: improve import command + help for address-ref-from-best-addresses 2022-11-15 16:16:52 +01:00
2f765a3aa5 Merge branch 'testing' of gitlab.com:Chill-Projet/chill-bundles into testing 2022-11-15 13:44:14 +01:00
9ad3bbc1b4 Fixed: fix typo in workflows 2022-11-15 11:58:26 +00:00
f144663877 Fixed: Fix typo in message for activity 2022-11-15 11:46:32 +00:00
434ef075da Feature: Add geographical unit name and ref ids in list, associated to address 2022-11-14 17:06:39 +01:00
2db778c4a4 fix chill-bundles#25 RollingDate bad expression 2022-11-14 16:18:04 +01:00
2178485e5e Merge branch '111_exports_suite' of gitlab.com:Chill-Projet/chill-bundles into 111_exports_suite 2022-11-14 16:12:30 +01:00
e767557216 csfixer 2022-11-14 16:03:04 +01:00
68bfb082fc chill-bundles#25: replace ChillDateType by PickRollingDateType
batch/serial replacing
untested
2022-11-14 15:43:02 +01:00
1f3dd00d81 improve flex positionning for list exports cards 2022-11-14 15:43:02 +01:00
f633fabf79 Merge branch '111_exports_suite' into testing 2022-11-14 14:23:49 +01:00
cf6430ae9b Feature: Adapt geographical unit filters and aggregator to use the materialized view, instead of geographical computation (improve performance) 2022-11-14 14:22:48 +01:00
d3ba11f521 Feature: Store location of each address contained in geographical units in a materialized view 2022-11-14 14:21:03 +01:00
f3401faea1 Merge branch '111_exports_suite' into testing 2022-11-14 11:29:26 +01:00
ec9555ec84 Merge branch 'exports/apply-person-modifier-on-course' into '111_exports_suite'
Apply persons filters and aggregators on accompanying course

See merge request Chill-Projet/chill-bundles!466
2022-11-14 10:22:48 +00:00
a68422e0e8 Features: [export] Apply person filters and aggreators on Count Household 2022-11-14 11:21:16 +01:00
400770123a Features: [export] Apply person filters and aggreators on Count Evaluation 2022-11-14 10:46:13 +01:00
91e3588e76 Features: [export] Show also SocialIssue in the By Social Action aggregator 2022-11-10 21:17:48 +01:00
61f44396c5 Features: [export] Apply person filters and aggreators on Count Social Works export 2022-11-10 15:51:46 +01:00
8e44f20535 Features: [export] Remove old unnecessary filters for person with accompanying period
Those filters applyed on persons and allowed to select person which has a new, closing, or active accompanying period. But this is deprecated: there are now a dedicated Export for that ( CountPersonWithAccompanyingCourse)
2022-11-10 15:21:56 +01:00
a7c44830d2 Features: [export] Filter "persons who do not have a household composition" 2022-11-10 15:11:45 +01:00
a942a24596 Fixes: [export] fixes filters by household composition, and apply them on persons directly 2022-11-09 20:46:15 +01:00
826a975fbe Features: apply all the filters and aggregators concerning person on accompanying courses 2022-11-09 16:20:24 +01:00
c1df8084a6 DX: Add DQL function LEAST and GREATEST 2022-11-09 15:48:20 +01:00
c22135f101 Feature: [export] apply all filters valid for person on accompanying course 2022-11-09 14:50:22 +01:00
a2e1228c09 Merge branch 'testing' of gitlab.com:Chill-Projet/chill-bundles into testing 2022-11-09 11:39:28 +01:00
11f0cac86e Merge branch '111_exports_suite' into testing 2022-11-09 10:47:07 +01:00
9dba5965f6 Merge branch '21-save-exports' into '111_exports_suite'
Allow to save exports

See merge request Chill-Projet/chill-bundles!465
2022-11-09 09:44:07 +00:00
be38251a13 Feature: [saved export] Switch between list of export and saved export thanks to nav at the list's top 2022-11-08 19:59:43 +01:00
43791badd5 Feature: [saved export] Edit and delete saved exports 2022-11-08 19:24:22 +01:00
79e9906a05 Feature: [saved export] Générate a report from a saved export 2022-11-08 18:02:26 +01:00
aec4c52567 Feature: [saved export] First list of saved exports 2022-11-08 16:57:49 +01:00
ccb2cd0295 Feature: [saved export] Create a "saved export" 2022-11-08 10:20:38 +01:00
8aeeab9e6b Feature: Apply rolling "open between dates filters" (accompanying period) 2022-11-07 21:18:56 +01:00
48da6d0a92 Feature: Apply rolling date on StepAggregator 2022-11-07 21:11:20 +01:00
50db96ffbc Fix validation of fixed date 2022-11-07 18:20:34 +01:00
86be95ac43 Feature: [export] Add a rolling date on Acp "by step" filter 2022-11-07 18:20:22 +01:00
8159f91e25 DX: create interface for RollingDateConverterInterface 2022-11-07 18:19:35 +01:00
0756bec580 DX: fix cs 2022-11-07 18:07:26 +01:00
4e3c93cdd3 DX: Add validation to PickRolingDateType
It is not possible to pick a fixed date when not setting a fixed date
2022-11-07 17:56:30 +01:00
c7f740d5d7 DX: Add rolling date converter + unit test 2022-11-07 17:42:00 +01:00
5489178e4b DX: Create a RollingDate data transfer object and Form type 2022-11-07 14:06:47 +01:00
3b96ac3ef3 DX: fixed double declaration of AsideActivity 2022-11-07 11:43:21 +01:00
df4f5e7cf8 Fixed: [export] improve memory footprint for filter by Geographical Unit 2022-11-07 11:31:23 +01:00
82d9ab8ca6 DX: [export] review on CreatorFilter, CreatorJobAggregator, CreatorJobFilter 2022-11-07 11:31:23 +01:00
c05637bc72 evaluations aggregators 2022-11-07 11:31:23 +01:00
d450f06286 filters and aggregator aside activity 2022-11-07 11:31:23 +01:00
3b68997c69 Feature: [export][evaluation] Group evaluation by start date 2022-11-07 11:31:23 +01:00
17e8e1964d Feature: [export][evaluation] Adding group by evaluation having end date 2022-11-07 11:31:23 +01:00
bf5ecd25de Feature: [export][evaluation] filter by current evaluation (without any end date) 2022-11-07 11:31:23 +01:00
9fa3a72cb4 Feature: [export][evaluation] add by end date filter 2022-11-07 11:31:23 +01:00
f10a448ae9 DX: prevent collision in parameter name in evaluation / by start date filter 2022-11-07 11:31:23 +01:00
9bfc184f70 Feature: [export][work] Group by current action 2022-11-07 11:31:23 +01:00
2e60b6735a DX: more cs 2022-11-07 11:31:23 +01:00
2ee362bfd5 Feature: [export][action] Filter 'active' action: which does not have an end date 2022-11-07 11:31:23 +01:00
b42e1a9a05 Feature: [export][activity] Add an aggregator to group by sent / received 2022-11-07 11:31:21 +01:00
055acbf43c DX: more code style fixes 2022-11-07 11:30:51 +01:00
5655f953d7 Feature: [export] group accompanying period by number of actions 2022-11-07 11:30:51 +01:00
e6553e71ee Feature: [export] filter accompanying period which has no action - work 2022-11-07 11:30:51 +01:00
7f9e8c5a7b Feature: [export] add aggregator by "number of activity" for acp 2022-11-07 11:30:51 +01:00
f3a3cab801 DX: review for hasNoActivityFilter 2022-11-07 11:30:51 +01:00
d6b358cfa1 Fixed: fix date's type in DateType input, and prevent collision on
parameter name
2022-11-07 11:30:51 +01:00
abd79df8cd count aside activity 2022-11-07 11:30:51 +01:00
dc38e5927c voter aside activity created 2022-11-07 11:30:51 +01:00
18406e83a1 creator job aggregator 2022-11-07 11:30:51 +01:00
6687742e23 DX: simplify creatorJobFilter 2022-11-07 11:30:51 +01:00
2767075be7 Feature: [export] Finalize HasTemporaryLocation filter on accompanying
course
2022-11-07 11:30:51 +01:00
371a7dc05c Fixed: handle null value in SentReceivedAggregator 2022-11-07 11:30:51 +01:00
63129a3b8c setup aside activity export 2022-11-07 11:30:14 +01:00
8ea29e8ec4 add translations creator filters 2022-11-07 11:30:14 +01:00
2bdc06397e creator job filter 2022-11-07 11:30:14 +01:00
edd9aaa475 comment out builder method 2022-11-07 11:30:14 +01:00
5695564723 fix code style 2022-11-07 11:30:13 +01:00
fc9689e881 DX: repairs code style, and psalm types 2022-11-07 11:29:09 +01:00
75f69859e6 fix psalm errors 2022-11-07 11:29:09 +01:00
b5a9dac62e Feature: [export] Add a list of accompanying periods 2022-11-07 11:29:09 +01:00
bf58c5d59c Feature: [export] add a list of people having an accompanying period 2022-11-07 11:29:09 +01:00
8a395bf108 DX: ensure that the return type is correct in ListPersonHelper 2022-11-07 11:29:09 +01:00
1ed367e079 Fixed: [export][acl][Social issue filter] fix type for retrieving data from form 2022-11-07 11:29:09 +01:00
e3801d54b4 DX: Refactor ListPerson to extract methods linked to label and select 2022-11-07 11:29:09 +01:00
4c9cdb7b8c Fixed: [list person] fix list person and add new fields 2022-11-07 11:29:09 +01:00
2096e175d4 Fixed: [export][list person] use address from household for person list 2022-11-07 11:29:09 +01:00
781253a854 Fixed: correctly show datetime in spreadsheet list 2022-11-07 11:29:09 +01:00
c396635163 acp creator filter 2022-11-07 11:29:09 +01:00
eeb84d5cfb php csfixes 2022-11-07 11:29:09 +01:00
fc2f8d33e1 correct namespace and use statements 2022-11-07 11:29:09 +01:00
a69965345f correct config file 2022-11-07 11:29:09 +01:00
226f172970 SentReceivedAggregator (in activity) 2022-11-07 11:29:09 +01:00
6d0622aa38 HasNoActivityFilter (in activity) 2022-11-07 11:29:09 +01:00
0e553594a0 CurrentEvaluationsFilter 2022-11-07 11:29:09 +01:00
f714c7206c ByEndDateFilter evaluation 2022-11-07 11:29:09 +01:00
42012dbad2 ByStartDateFilter evaluation 2022-11-07 11:29:09 +01:00
bc41910a39 HasNoReferrer filter 2022-11-07 11:29:09 +01:00
a18870c91e Evaluation HavingEndDate Aggregator 2022-11-07 11:29:09 +01:00
68ebf8303c remove ByMaxDateFilter (evaluation) 2022-11-07 11:29:09 +01:00
9e89302aa4 SocialWork: Current actions filter + aggregator 2022-11-07 11:29:09 +01:00
2e52729806 acp HasNoAction Filter (UNTESTED) 2022-11-07 11:29:09 +01:00
afb5ebc077 define queryKey in 11 aggregators 2022-11-07 11:29:09 +01:00
f751d2e9ab create 13 new export/filters/aggregators in Person and AsideActivity Bundles
* minor corrections on last commit
* modify related files (declaration, messages.fr, repository)
* yaml service declaration
2022-11-07 11:29:09 +01:00
13d6e4587a Create 16 new filters/aggregators in Bundles: Vendée, Person, Activity
Basic file creation, with methods, namespace, and title translation
2022-11-07 11:29:09 +01:00
6fd75a175f Fixed: [export] improve memory footprint for filter by Geographical Unit 2022-11-03 13:59:16 +01:00
03e765f811 DX: [export] review on CreatorFilter, CreatorJobAggregator, CreatorJobFilter 2022-11-03 12:39:19 +01:00
d3f03fb27c evaluations aggregators 2022-11-02 20:06:03 +01:00
481be32997 filters and aggregator aside activity 2022-11-02 20:02:46 +01:00
4524240ad8 Merge branch '111_exports_suite' of gitlab.com:Chill-Projet/chill-bundles into 111_exports_suite 2022-11-02 18:39:11 +01:00
0255f12fa9 Feature: [export][evaluation] Group evaluation by start date 2022-11-02 16:42:23 +01:00
4ca10ce38d Feature: [export][evaluation] Adding group by evaluation having end date 2022-11-02 16:26:56 +01:00
f0b2ec1348 Feature: [export][evaluation] filter by current evaluation (without any end date) 2022-11-02 16:17:10 +01:00
2d40c38c88 Feature: [export][evaluation] add by end date filter 2022-11-02 15:56:48 +01:00
d8104c4443 DX: prevent collision in parameter name in evaluation / by start date filter 2022-11-02 15:08:04 +01:00
63d38e35f7 Feature: [export][work] Group by current action 2022-11-02 14:55:12 +01:00
9c3533d106 count aside activity 2022-11-02 14:42:44 +01:00
e07d2ab467 voter aside activity created 2022-11-02 14:41:59 +01:00
cda25d3459 DX: more cs 2022-11-02 14:40:17 +01:00
1bf7f9945c Feature: [export][action] Filter 'active' action: which does not have an end date 2022-11-02 14:39:36 +01:00
9cf06c147f Feature: [export][activity] Add an aggregator to group by sent / received 2022-11-02 14:25:52 +01:00
60f93f7f12 DX: more code style fixes 2022-11-02 14:06:10 +01:00
c872ca7204 Feature: [export] group accompanying period by number of actions 2022-11-02 14:05:16 +01:00
51ac4e0938 Feature: [export] filter accompanying period which has no action - work 2022-11-02 13:44:04 +01:00
24873f0cc2 Feature: [export] add aggregator by "number of activity" for acp 2022-11-02 13:33:33 +01:00
84e5be6a60 DX: review for hasNoActivityFilter 2022-11-02 13:21:26 +01:00
5acf2a1986 creator job aggregator 2022-11-02 13:17:03 +01:00
094a912e42 Fixed: fix date's type in DateType input, and prevent collision on
parameter name
2022-11-02 13:15:40 +01:00
f40aa89d08 Merge branch '111_exports_suite' of gitlab.com:Chill-Projet/chill-bundles into 111_exports_suite 2022-11-02 13:14:50 +01:00
50e2f4a147 setup aside activity export 2022-11-02 13:14:38 +01:00
be215bd135 DX: simplify creatorJobFilter 2022-11-02 13:05:12 +01:00
be75cdce55 Feature: [export] Finalize HasTemporaryLocation filter on accompanying
course
2022-11-02 12:56:13 +01:00
e46b285d3e Fixed: handle null value in SentReceivedAggregator 2022-11-02 12:56:13 +01:00
17a7b053cf DX: remove unused variable 2022-11-02 12:56:13 +01:00
32cdf56fbd add translations creator filters 2022-11-02 12:00:29 +01:00
749facb9b0 creator job filter 2022-11-02 11:55:36 +01:00
edd1557f35 comment out builder method 2022-11-02 11:32:55 +01:00
3059935305 merge conflict fixed 2022-11-02 11:20:11 +01:00
355436aa82 acp creator filter 2022-11-02 11:15:54 +01:00
8d4ec5d675 fix code style 2022-11-02 11:12:55 +01:00
c20b561de5 Merge branch 'exports/listes_2022' into '111_exports_suite'
Repairs and add new lists in exports

See merge request Chill-Projet/chill-bundles!464
2022-11-02 09:54:13 +00:00
acc9523ff5 DX: repairs code style, and psalm types 2022-11-02 10:52:49 +01:00
afa6dfd77c fix psalm errors 2022-11-02 10:52:49 +01:00
c331f94201 fix cs 2022-11-02 10:52:49 +01:00
6ffe99a2be Feature: [export] Add a list of accompanying periods 2022-11-02 10:52:49 +01:00
d75ec92417 Feature: [export] add a list of people having an accompanying period 2022-11-02 10:52:49 +01:00
4e55f1ede7 DX: ensure that the return type is correct in ListPersonHelper 2022-11-02 10:52:49 +01:00
cf7d0c1bdb Fixed: [export][acl][Social issue filter] fix type for retrieving data from form 2022-11-02 10:52:49 +01:00
f4c3997e55 DX: Refactor ListPerson to extract methods linked to label and select 2022-11-02 10:52:49 +01:00
f434cc5c02 Fixed: [list person] fix list person and add new fields 2022-11-02 10:52:49 +01:00
333c305eef Fixed: [export][list person] use address from household for person list 2022-11-02 10:52:49 +01:00
4af261a366 Fixed: correctly show datetime in spreadsheet list 2022-11-02 10:52:49 +01:00
1228a0323c php csfixes 2022-11-02 10:28:52 +01:00
dc149c7fd5 correct namespace and use statements 2022-11-02 10:26:44 +01:00
7dc34cb357 correct config file 2022-11-02 10:15:08 +01:00
ed04c276c2 SentReceivedAggregator (in activity) 2022-10-31 16:18:10 +01:00
f8b5078997 HasNoActivityFilter (in activity) 2022-10-31 16:10:24 +01:00
68b9c171a6 CurrentEvaluationsFilter 2022-10-31 15:54:41 +01:00
791ea25e4f ByEndDateFilter evaluation 2022-10-31 15:51:35 +01:00
e3846829e1 ByStartDateFilter evaluation 2022-10-31 15:46:29 +01:00
d48474bbc9 HasNoReferrer filter 2022-10-31 15:32:34 +01:00
05f9a83bed Evaluation HavingEndDate Aggregator 2022-10-31 15:15:35 +01:00
441c5c8da7 remove ByMaxDateFilter (evaluation) 2022-10-31 14:58:25 +01:00
a0fc9d4de5 SocialWork: Current actions filter + aggregator 2022-10-31 11:43:41 +01:00
8527c19073 acp HasNoAction Filter (UNTESTED) 2022-10-31 11:19:21 +01:00
fe120086c7 define queryKey in 11 aggregators 2022-10-28 16:59:11 +02:00
f1fb77187f create 13 new export/filters/aggregators in Person and AsideActivity Bundles
* minor corrections on last commit
* modify related files (declaration, messages.fr, repository)
* yaml service declaration
2022-10-28 16:48:09 +02:00
43d9ba1ba5 Create 16 new filters/aggregators in Bundles: Vendée, Person, Activity
Basic file creation, with methods, namespace, and title translation
2022-10-28 13:07:24 +02:00
77a6e92f69 fix if condition in CalendarController + phpStan error 2022-10-26 11:08:37 +02:00
e1b6fb2db1 Merge branch 'master' into testing 2022-10-25 10:17:25 +02:00
2a4a4a80b1 change name of échange to activité 2022-10-25 10:11:42 +02:00
2e44689549 Merge branch 'calendar/finalization' into testing 2022-10-24 11:12:49 +02:00
aae1fbf7e6 Merge branch '111_exports_suite' into calendar/finalization 2022-10-24 11:10:44 +02:00
81c73f6acf Merge branch 'master' into 111_exports_suite 2022-10-24 11:06:12 +02:00
5bd6281154 Merge branch 'calendar/refactor-calendar-on-person' into 'calendar/finalization'
[Calendar] repairs the calendar for creation in Person file

See merge request Chill-Projet/chill-bundles!463
2022-10-24 07:57:03 +00:00
823d27ed8a Merge branch 'calendar/docgen-add-generation' into 'calendar/finalization'
[Calendar] Generate document associate with calendar

See merge request Chill-Projet/chill-bundles!462
2022-10-24 07:56:44 +00:00
307fdfd0ba Merge branch 'person-docgen-context-with-3party' into 'master'
Feature: [person][docgen] Add a title to document in person docgen

See merge request Chill-Projet/chill-bundles!461
2022-10-24 07:56:02 +00:00
7efa95efab Fixed: [calendar] do not show link to document if no document configured 2022-10-21 13:46:17 +02:00
bc1a7c1d7b Feature: [calendar] allow to create and generate calendar by person 2022-10-21 13:24:02 +02:00
43dcb46d38 Feature: [calendar] associate a calendar with a person: update schema 2022-10-21 11:28:59 +02:00
c04e408d9d DX: [calendar] simplify menu builder injection deps 2022-10-21 11:08:31 +02:00
2c5fa82380 Feature: [calendar] Add button to generate document immediatly after saving the calendar 2022-10-21 10:40:51 +02:00
55095ee6ac Feature: [calendar] show documents in layout of list (and move sms info) 2022-10-21 10:17:58 +02:00
6ae03806b4 Feature: [calendar][docgen] controller and UI to generate a document from a calendar 2022-10-20 22:33:23 +02:00
e107e39ffd Fixed: when counting doc generator template by entity, take 'active'
into account
2022-10-20 22:32:21 +02:00
63f3010395 Feature: [calendar][docgen] generation context for Calendar 2022-10-20 22:31:59 +02:00
2b1d9cabff Feature: [calendar] associate document with calendar 2022-10-20 21:36:30 +02:00
1ec3e176fb Merge branch 'master' into calendar/docgen-add-generation 2022-10-20 13:34:21 +02:00
9f4cf4ea88 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-10-20 09:56:23 +02:00
e91d2c9e93 complete chill documentation about csfixer and phpstan 2022-10-20 09:55:42 +02:00
b580bda2fb DX: [calendar] docgen normalization on Calendar entity 2022-10-19 22:02:43 +02:00
83ba813160 Feature: [docgen] order document template by name in list and in admin 2022-10-19 17:56:10 +02:00
0cbe12a32c DX: [dql] add a function JSON_EXTRACT
This might be used to sort lines which contains translatable string.
2022-10-19 17:44:36 +02:00
2a782044e6 DX: [docgen] add more test for docgenObjectNormalizer and AccompanyingPeriodResourceNormalizer 2022-10-19 17:11:10 +02:00
719256913c Feature: [docgen] Add a new variable createdAtDate, which contains date
without date and time

This is useful when generating a letter, to fill the today's date in the
letter's header.
2022-10-19 16:07:12 +02:00
ea5f8c9d08 Feature: [docgen][person] add a new context to generate document with a
third party

This allow to prepare, for instance, mail (letters) to a thirdparty
about a Person
2022-10-19 14:16:59 +02:00
1b5d5a28fd DX: [main] Validation phone number: add some parameters for debugging 2022-10-19 14:16:20 +02:00
31f048b8e8 Feature: [person][docgen] Add a title to document in person docgen
context
2022-10-19 14:12:47 +02:00
2f9b56dcd5 Feature: [export][acp] group courses by household composition 2022-10-18 21:43:33 +02:00
530c778d8c DX: [person][household composition] create interface for repositories 2022-10-18 21:42:39 +02:00
7b3fcad251 Feature: [export][activity] Filter activities by users scope and job 2022-10-18 16:27:49 +02:00
a7ade9dac4 DX: use tags iterator to inject aggregators, filters and export during ExportManager's construct
Squashed commit of the following:

commit dc2bbc8f4da24549a1d42feb3b453af9f79ab2ff
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Tue Oct 18 10:40:14 2022 +0200

    Fixes: remove iterator_to_array on formatter, which causes a PHP crashes

commit 4ce56a01a7
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 17 17:41:14 2022 +0200

    DX: use tags and dependency injection to build ExportManager
2022-10-18 16:27:49 +02:00
a5c7934b76 Merge branch '664_or_translation' into 111_exports_suite 2022-10-18 15:33:49 +02:00
a7a921ee4d batch replacing ', ou' in filters 2022-10-18 15:25:43 +02:00
93713f2ac2 Merge branch '641_issues_with_children' into '111_exports_suite'
Issue641, improve query,  issues and actions with descendants

See merge request Chill-Projet/chill-bundles!460
2022-10-18 12:50:35 +00:00
9eb451e359 cs fixer 2022-10-18 14:37:33 +02:00
8928664f87 Merge branch '111_exports_suite' into 641_issues_with_children 2022-10-17 18:16:30 +02:00
531e05fc3a DX: fix tests to find ancestor to all SocialAction and SocialIssue 2022-10-17 17:54:50 +02:00
32ddc5465c review: fix stuffs on socialAction and socialIssue filters:
* filters call static entity method
* add renderString option to manage add_children
* add tests on new entity method getDescendantsWithThisFor..()
* rename function in repository
* rename 'Select2..' classes by 'Pick..' and replace all occurences
2022-10-17 17:31:17 +02:00
eb404404f9 Merge remote-tracking branch 'origin/111_exports_suite' into testing 2022-10-17 09:16:39 +02:00
50e12375f8 Feature: [export][activity] Group by users (participating) job and scope
on activity exports
2022-10-17 00:25:16 +02:00
4ed760949a Feature: [export][activity] Add filter and aggregator by users
(participating to the activity)
2022-10-16 23:56:25 +02:00
71f989f00e issue641: same for actions: take children, propose only associated and sort them by ordering 2022-10-16 20:06:18 +02:00
6b1155b9d8 issue641: don't list all children if parent is chosen
add mechanism to differenciate string in export
2022-10-16 20:05:22 +02:00
ccea6dd95c issue641: add descendants to selected in alterQuery 2022-10-16 19:38:13 +02:00
de7ba29853 issue641: form select2 list activated socialissues and sort by ordering 2022-10-16 19:38:13 +02:00
8d7b6fea71 issue641: remove method to add parents socialissues (bad understanding) 2022-10-16 19:38:13 +02:00
6d40ef279f issue641: simplify alterQuery where clause in concerned filters 2022-10-16 19:38:13 +02:00
a46c85d66c Fix nested forms problems with select2 FormTypes in issue 641 and 649
Select2UserLocationType.php is called in another context:
UserController call UserCurrentLocationType which instanciate new Select2UserLocationType.php FormType
2022-10-16 13:24:03 +02:00
3e5be50a87 fix some tests 2022-10-15 00:35:13 +02:00
dd0e2a169c Feature: [export][acp] use a date of computation for each filter and
aggregator linked with referrer
2022-10-15 00:17:04 +02:00
f1e92887fd Fixed: [export][person][by age] use lower maximum age if not set, to avoid postgresql error 2022-10-14 22:33:58 +02:00
c07cd2b715 Fixed: [export][activity] use createdBy property instead of user for
grouping or filtering by creator
2022-10-14 21:55:02 +02:00
cd3fc99b9a DX: extract interface for UserRepository 2022-10-14 21:42:55 +02:00
8b71e141cf Feature: [activity] track creation and update on activity 2022-10-14 21:06:21 +02:00
2ee4897db9 Feature: [export][acp] use the acp's step history to aggregate steps in StepAggregator 2022-10-14 21:04:58 +02:00
59e21b6819 Feature: [acp] record the step history of each accompanying period
Each time a step is changed on an history, a record is stored in a
dedicated table.

When the acp's opening date is moved, the first row is adapted to match the new opening's date. This
mechanisme does not work if the opening date is move beyon the first end
date (if any), nor on the closing date.
2022-10-14 14:36:40 +02:00
66f282e221 DX: fix an accompanying period might be null in an AccompanyingPeriodComment 2022-10-13 16:50:21 +02:00
75f6c8754e Feature: [export][acp] filter by acp which have an evaluation: use
select2
2022-10-13 15:32:09 +02:00
5a94ce49f1 [Feature] add active property to evaluation 2022-10-13 15:25:09 +02:00
a26029999f Merge branch '111_exports_suite' into testing 2022-10-12 11:30:52 +02:00
1ba9f0365f Merge branch 'master' into 111_exports_suite 2022-10-12 11:29:10 +02:00
d5efbd505c Feature: [export][acp] aggregator by course's duration 2022-10-12 11:04:36 +02:00
3a8640db43 DX: Add a DQL AGE function to calculate age between two dates 2022-10-12 11:03:51 +02:00
6f1ec00d3a Feature: [export] allow to choose between different granularity for DurationAggregator (acp) [wip] 2022-10-11 16:48:22 +02:00
aba3b33fd0 Feature: allow to filter courses by user's job #export #acp 2022-10-10 21:22:22 +02:00
2f77deaa60 fix cs 2022-10-10 20:53:49 +02:00
cbd7acebd5 Feature: allow to filter acp by scope of the user #export #acp 2022-10-10 20:52:35 +02:00
fce7c44907 Fix return value for initializeObject in ScopePickerTest 2022-10-10 20:52:35 +02:00
4834eadc18 Feature: do not show desactivated Scope in ScopePickerType 2022-10-10 20:52:35 +02:00
f74f67b5c6 Feature: add a variable active to Scope entity 2022-10-10 20:52:35 +02:00
832f043e25 Fixed: add scope to generated document ref #11 2022-10-10 20:52:35 +02:00
5acf7a81d7 DX: deprecated ProphecyTrait in favour of the one coming from Prophecy\PhpUnit package. 2022-10-10 20:52:35 +02:00
6f46d4c46a add scope to docs if required 2022-10-10 20:52:35 +02:00
f1fc6f9ab3 Fixed: usage of owner side / inversed side on SocialAction / Evaluation
In a ManyToMany relationship, doctrine does take care only of the owning
side of a relationship to inspect changes.

([see
documentation](https://www.doctrine-project.org/projects/doctrine-orm/en/current/reference/unitofwork-associations.html#important-concepts))

This commit mark as "internal" the methods add/removeSocialAction on the
inversed side (`Evaluation`) and let the methods add/removeEvaluation
on the owning side (`SocialAction`) update the inversed side.

The usage is also adapted into SocialWorkMetadata's importer.
2022-10-10 20:52:35 +02:00
c8c0c26ab9 php cs fixes, stan ok! 2022-10-10 20:52:35 +02:00
0e2740a4dd update changelog 2022-10-10 20:52:33 +02:00
0827cd4b02 query adjusted to fetch only active objectives for a social action 2022-10-10 20:52:08 +02:00
8f2e91d857 doc for PickPostalCode vue component 2022-10-10 20:52:08 +02:00
0c47d2cafd [Feature] show period's localisation (address) into reassign and regulation list 2022-10-10 20:52:08 +02:00
215d150103 [Dev] Add unit test to PickPostalCodeType 2022-10-10 20:52:08 +02:00
cf0252b469 [Feature] Prevent sending notification to user when bulk reassign 2022-10-10 20:52:08 +02:00
86cfd87d71 Feature: Allow to filter periods to reassign by postal code 2022-10-10 20:52:08 +02:00
0609fdee14 [workflow] Feature: allow user to retrieve the access link for the
workflow + show dest email for a workflow
2022-10-10 20:52:07 +02:00
nobohan
aa5094f196 [person] normalizer tests: php stan 2022-10-10 20:51:40 +02:00
nobohan
0aef6b1afb [person]: add origin and social issue normalizer tests + typo 2022-10-10 20:51:40 +02:00
nobohan
9d9aa0404f [person]: add new test for social action normalizer 2022-10-10 20:51:40 +02:00
5c6068e8a5 fix cs 2022-10-10 18:52:38 +02:00
9c709d4388 issue641: others filters use these new Select2...Type 2022-10-10 18:28:30 +02:00
c3f9ce1ea6 issue641: create 2 new Select2 formType (for actions and issues) 2022-10-10 18:28:30 +02:00
fd24ba618d Merge branch '111_exports_suite' of gitlab.com:Chill-Projet/chill-bundles into 111_exports_suite 2022-10-10 18:27:02 +02:00
963ec3c3e4 Merge branch '649_select2_forms' into 111_exports_suite 2022-10-10 18:03:50 +02:00
c41f9d8f5b fix missing service declaration + remove unused form method 2022-10-10 18:02:58 +02:00
5fd4e322d6 Merge branch '649_select2_forms' into 111_exports_suite 2022-10-10 16:14:09 +02:00
631111b0c7 rename UserCurrentLocationType to more generic Select2UserLocationType
NB: used 2 times, check that all works
2022-10-10 16:08:23 +02:00
7276cb971f issue649: new formType to use select2 with LocationTypeFilter 2022-10-10 15:59:16 +02:00
087270829e cleaning previous 2022-10-10 15:27:36 +02:00
999d4e2038 issue649: adapt existing UserCurrentLocationType to use select2 with AdministrativeLocationFilter 2022-10-10 15:27:22 +02:00
863a384a85 Merge branch '11-fix-scope-person-document' into 'master'
Resolve "Un document généré dans le contexte "personne" n'est pas enregistré"

Closes #11

See merge request Chill-Projet/chill-bundles!459
2022-10-10 12:27:17 +00:00
a8a206557b Fixed: add scope to generated document ref #11 2022-10-10 14:25:07 +02:00
877535ca4d DX: deprecated ProphecyTrait in favour of the one coming from Prophecy\PhpUnit package. 2022-10-10 14:25:07 +02:00
7df203633d add scope to docs if required 2022-10-10 14:25:07 +02:00
69704e5211 Fixed: usage of owner side / inversed side on SocialAction / Evaluation
In a ManyToMany relationship, doctrine does take care only of the owning
side of a relationship to inspect changes.

([see
documentation](https://www.doctrine-project.org/projects/doctrine-orm/en/current/reference/unitofwork-associations.html#important-concepts))

This commit mark as "internal" the methods add/removeSocialAction on the
inversed side (`Evaluation`) and let the methods add/removeEvaluation
on the owning side (`SocialAction`) update the inversed side.

The usage is also adapted into SocialWorkMetadata's importer.
2022-10-10 13:59:59 +02:00
629e4ab02d Merge branch 'atelier_tests' into '111_exports_suite'
Add tests which check that an alias do not disappears in filters / aggregators

See merge request Chill-Projet/chill-bundles!455
2022-10-10 10:41:41 +00:00
2229266347 Merge branch 'fix_fetch_action_objectives' into 'master'
Fix fetch action objectives

See merge request Chill-Projet/chill-bundles!444
2022-10-10 10:37:20 +00:00
ee08fd5877 Merge branch 'regulation-list-add-commune' into 'master'
Add postal code to filter regulation list

See merge request Chill-Projet/chill-bundles!457
2022-10-10 10:35:20 +00:00
8d3ff2f26e doc for PickPostalCode vue component 2022-10-10 10:34:48 +00:00
704e502beb Merge branch 'workflow-show-link' into 'master'
[workflow] Feature: allow user to retrieve the access link for the

See merge request Chill-Projet/chill-bundles!456
2022-10-10 10:29:19 +00:00
9e11448c5e Merge branch 'improve_normalizer_tests' into 'master'
Improve normalizer tests

See merge request Chill-Projet/chill-bundles!458
2022-10-10 10:28:57 +00:00
01acfeb58f Merge branch 'master' into 111_exports_suite 2022-10-08 01:37:24 +02:00
022f0a5e33 Fixed: the marital's status was shown to admin users - and was not editable 2022-10-08 01:36:37 +02:00
d055a286a8 Fix CS 2022-10-08 01:35:56 +02:00
61db0d6a28 DX: fix deprecation in dql custom function + add test 2022-10-08 01:34:20 +02:00
76aa9c7058 Fixed: do not store center in Person any more, the centerHistory is now fully in use 2022-10-08 01:11:54 +02:00
8cf166f7ea store an end date instead of a string when person is removed from a participation 2022-10-08 01:10:00 +02:00
6585662087 Fixed: fix the evaluation maxDateFilter to use correct alias
Some weird code is also removed in describeAction
2022-10-08 01:03:21 +02:00
5592e906f2 DX: remove fixed phpstan things 2022-10-08 01:02:32 +02:00
f64952a93e Merge branch 'master' into 111_exports_suite 2022-10-08 00:50:17 +02:00
6b5f746efc Remove deprecation of AuthorizationHelper::getReachableScope, as it is
widely used
2022-10-08 00:23:07 +02:00
nobohan
80052cc6c8 [person] normalizer tests: php stan 2022-10-07 10:47:55 +02:00
nobohan
4ca5fb9869 [person]: add origin and social issue normalizer tests + typo 2022-10-07 10:23:41 +02:00
d74decba74 DX: Fix cs 2022-10-06 23:57:45 +02:00
915ec0d428 DX: fix import in test 2022-10-06 23:57:26 +02:00
db28443008 Fixed: correct use of scopes 2022-10-06 23:57:02 +02:00
3a23e889e3 DX: fixed phpstan things 2022-10-06 23:43:28 +02:00
2fdb1dfb52 DX: more type hint for DirectExportInterface 2022-10-06 23:43:16 +02:00
07d15f0a68 DX: fixed complicated comparison to add a group by 2022-10-06 23:42:46 +02:00
1b1aaaa862 phpstan: fixed things 2022-10-06 23:24:59 +02:00
ca67170ad3 DX: do not loop on possible choices to display action 2022-10-06 23:24:38 +02:00
f5997e39cd DX: do not use complicated condtiion to add a group by 2022-10-06 23:24:07 +02:00
c7de95c635 DX: fix type hinting, code and some dev stuffs 2022-10-06 23:17:58 +02:00
5dbfb98906 DX: fix missing import during exception handling 2022-10-06 23:17:20 +02:00
1a8f8efa23 DX: remove call to deprecated method 2022-10-06 23:16:50 +02:00
7e1d07f1ff DX: add missing import for handling exception 2022-10-06 23:04:50 +02:00
17cdaf449e DX: remove unnecessary comparison 2022-10-06 23:02:47 +02:00
9ad9ef6758 DX: rename argument $qb to $query in export's, getResult method, and add missing return type and import
This name is the same as the implemented interface.
2022-10-06 22:56:34 +02:00
77800c21bb Fixed: missing import for handling LogicException 2022-10-06 22:45:58 +02:00
e518cf703d fix cs again 2022-10-06 22:45:07 +02:00
a41483be00 ACP ConfidentialFilter: Do not loop on choices to show the picked one 2022-10-06 22:44:31 +02:00
02330fcc75 ACP EmergencyFilter: Do not loop on choices to show the picked one 2022-10-06 22:42:35 +02:00
a324121f01 ACP IntensityFilter: Do not loop on choices to show the picked one 2022-10-06 22:39:00 +02:00
36590e7810 fix cs: mismatch header and strict type declaration 2022-10-06 22:25:45 +02:00
ba7adf59ff [Fixed] Add required import for exception handling 2022-10-06 22:25:45 +02:00
9699e2304a fix cs: declare type and license header mismatch 2022-10-06 22:25:43 +02:00
67104d15cd [Fixed] Add required import for exception handling 2022-10-06 22:22:08 +02:00
62386378fc [Feature] show period's localisation (address) into reassign and regulation list 2022-10-06 22:14:39 +02:00
dea217a670 [Dev] Add unit test to PickPostalCodeType 2022-10-06 22:06:45 +02:00
9aae36556b [Feature] Prevent sending notification to user when bulk reassign 2022-10-06 21:44:23 +02:00
f82bc02f8b Feature: Allow to filter periods to reassign by postal code 2022-10-06 20:53:29 +02:00
49731777b4 fix cs: declare type and license header mismatch 2022-10-06 20:51:44 +02:00
c6b78d1c0c Merge branch '111_exports_suite' of gitlab.com:Chill-Projet/chill-bundles into 111_exports_suite 2022-10-06 18:48:38 +02:00
c73bb10dce issue 644: Use Vue AddPersons picker to select users 2022-10-06 18:47:53 +02:00
nobohan
713b8357cd [person]: add new test for social action normalizer 2022-10-06 15:26:44 +02:00
7e65e97caf fix cs: header and declare strict type order 2022-10-06 10:21:16 +02:00
087375f648 Merge branch '111_exports_suite' into calendar/finalization 2022-10-06 09:31:43 +02:00
66af19c43d Merge branch 'master' into 111_exports_suite 2022-10-06 08:55:57 +02:00
b394d7247d fix cs: too much line before declaring strict type 2022-10-06 08:55:32 +02:00
fb7c6f0a9b fix cs: too much line before declaring strict type 2022-10-06 08:54:23 +02:00
445a8ac8c7 Merge branch 'master' into 111_exports_suite 2022-10-05 17:09:23 +02:00
67c3f3a840 fix cs with licencse header 2022-10-05 17:08:14 +02:00
845a4e9523 fix cs for doc [ci-skip] 2022-10-05 16:56:00 +02:00
63137c67f4 fix cs 2022-10-05 16:55:13 +02:00
dbf3780593 Merge branch '111_exports_suite' into testing 2022-10-05 15:47:25 +02:00
e4c450cd1b Fixed: typo in service name 2022-10-05 15:46:57 +02:00
642b1e43c8 fix cs 2022-10-05 15:30:55 +02:00
b20a75c2ee Merge branch '111_exports_suite' into testing 2022-10-05 15:28:51 +02:00
d95472ca9d Merge branch '111_exports_suite' into calendar/finalization 2022-10-05 15:28:37 +02:00
908419fbf8 Merge branch 'master' into 111_exports_suite 2022-10-05 15:26:18 +02:00
a967e1ed17 fix cs 2022-10-05 15:23:28 +02:00
58b1778544 Merge commit 'a90e87b1be8f278113b191816e88ad6619bf3101' into 111_exports_suite 2022-10-05 15:14:04 +02:00
c1d96af85f fix cs 2022-10-05 15:08:53 +02:00
71db287ded Merge branch '111_exports_suite' into testing 2022-10-05 14:57:55 +02:00
8a740a25da [Export] Feature: create a aggregator for referrer's main scope on
aggregator
2022-10-05 14:57:15 +02:00
491570a21c [export] Fixed: the scope aggregator (accompanying course) group by
period's scope (and the label didn't show this)

+ extract ScopeRepository and create ScopeRepositoryInterface
2022-10-05 14:56:36 +02:00
5f0a6f37b0 Merge branch '111_exports_suite' into testing 2022-10-05 10:43:35 +02:00
307ed4fb1b Merge branch '111_export_GeographicalUnit' into 111_exports_suite 2022-10-05 10:43:21 +02:00
fa1b5c4a02 Merge branch 'workflow-show-link' into testing 2022-10-05 10:23:08 +02:00
a90e87b1be more explanation for installation instructions 2022-10-05 10:22:30 +02:00
4388331b2f Merge branch '111_exports_suite' into testing 2022-10-05 10:21:42 +02:00
be6b5178cd Merge branch 'master' into 111_exports_suite 2022-10-05 10:16:05 +02:00
58a1af0c78 installation instructions 2022-10-05 09:58:18 +02:00
432acc0ace [export][person] Feature: add filter and aggregator by geographical unit on person 2022-10-04 22:17:16 +02:00
fc567868c1 [export][person] Feature: allow to filter accompanying period by
geographical unit
2022-10-04 15:07:07 +02:00
52435f5331 Feature: aggregator for accompanying course by geographical level 2022-10-04 10:25:34 +02:00
65f6712a15 Fixed: take layer into account for unicity of geographical unit's keys 2022-10-03 17:19:32 +02:00
9c3ac72426 Feature: Create a base importer for geographical units and add index 2022-10-03 15:45:42 +02:00
994160f28a Feature: add a proper entity for geographical unit layer 2022-10-03 13:50:10 +02:00
e1fda324a4 Merge branch '111_exports_suite' into 111_export_GeographicalUnit 2022-10-03 12:00:15 +02:00
9d1c38e978 Merge remote-tracking branch 'origin/testing' into testing 2022-10-03 09:31:44 +02:00
a95f0c538d Merge remote-tracking branch 'origin/master' into testing 2022-10-03 09:31:15 +02:00
99b261b1d7 [person][relations] Fixed: GET request had a body, this prevented to
load files
2022-09-30 17:36:52 +02:00
ffd1145cd0 [apimethods] Fixed: prevent makeFetch to add a null body on GET and HEAD
requests
2022-09-30 17:35:43 +02:00
d1b9400257 [person][relations] Fixed: GET request had a body, this prevented to
load files
2022-09-30 17:31:30 +02:00
fd0e541e3f [workflow] Feature: allow user to retrieve the access link for the
workflow + show dest email for a workflow
2022-09-29 22:09:49 +02:00
ccedebda90 Add new Abstract Filter Test to check qb aliases (for join clauses) 2022-09-29 20:48:56 +02:00
eb6efcefd8 Add new Abstract Aggregator Test to check qb aliases (for join clauses) 2022-09-29 20:48:56 +02:00
ab5ca48968 Merge branch '111_exports_suite' of gitlab.com:Chill-Projet/chill-bundles into 111_exports_suite 2022-09-29 20:48:00 +02:00
e737f20735 batch removing unused $request prophesise in Tests setup() 2022-09-29 20:46:18 +02:00
b7c2903815 keep prophecy when test get 'request_stack' 2022-09-29 20:46:18 +02:00
6bddd320fa Add Activity Export/Export missing tests 2022-09-29 20:46:18 +02:00
f5fb721ddd activity export export tests 2022-09-29 20:46:18 +02:00
2b8fe462ea repair Activity Aggregator Tests 2022-09-29 20:46:18 +02:00
8d1160d093 delete duplicate AggregatorTest 2022-09-29 20:46:18 +02:00
ac39baa5f5 Fixed: avoid the requirement to store person current center, which is a readonly entity 2022-09-29 18:21:14 +02:00
fdd537b18e Merge branch 'master' into testing 2022-09-29 10:53:48 +02:00
2309484692 Fixed: cascade persist the center history when a person is created 2022-09-28 17:21:39 +02:00
3feb5115a5 Merge remote-tracking branch 'origin/master' into 111_exports_suite 2022-09-28 15:53:43 +02:00
b777e9c819 Merge branch 'person-change-center-history' into '111_exports_suite'
Track the change of person's centers

See merge request Chill-Projet/chill-bundles!454
2022-09-28 13:52:55 +00:00
a91b35298a Do use the old name for the table, as it should exists when migrations are executed sequentially 2022-09-28 15:52:19 +02:00
32f252149b [export] Feature: rely on person's center history to build export's
query
2022-09-28 15:43:58 +02:00
1786fa838f Merge branch '111_exports_suite' into testing 2022-09-28 09:49:33 +02:00
f39b0ee002 [task] Feature: use the resolution of center with person's center
history
2022-09-27 16:09:09 +02:00
1386ae66de centerDispatchResolver added in construct - was missing 2022-09-27 15:35:45 +02:00
451f7f4230 [person][Search] Feature: use the current center history when searching
for person
2022-09-27 10:22:15 +02:00
49d2e98a1a [person] Feature: add a person's center history
The association between Person and Center is now stored in a dedicated
Entity: `PersonCenterHistory`, which have a date interval (start date
and endDate). The SQL counterpart is a table, with a constraint which
ensure that no person might be associated with two center at the same time.

For ease, a view is created to get the current center associated with
the person.

The dedicated migration creates also:

* indexes for a rapid search for person at current date;
* and populate the table from current data, setting the startdate to the
  person's creation date and time if any, `NOW()` unless.

The `Person` entity is also updated to use the information from the
PersonCenterHistory classes, but this commit does not yet delete the
`Center` column.
2022-09-26 21:11:01 +02:00
9f2ecff63e exports: ResidentialAddressAt ThirdParty/User Filter, improve query (issue637 et issue638) 2022-09-26 18:52:00 +02:00
78e00b8eba exports: improve translations 2022-09-26 17:40:58 +02:00
e3764f6f91 [export][person] Fixed: use left join on association between works and
goal/results
2022-09-26 17:02:28 +02:00
95f7622923 [Export][person] Fixed: error and more precision on household
composition

A filter and two aggregators create a join between composition and
household, but with a parameter at different date.

Each aggregator and filter now have a custom alias, to allow to set this
date parameter on each join.
2022-09-26 16:45:36 +02:00
2c46886e36 Fix use import and add a "not null" condition on travel time 2022-09-26 14:59:31 +02:00
58eb089d1c Fix use import and add a "not null" condition on travel time 2022-09-26 14:49:51 +02:00
6eff1962df Fix import and add a "not null" condition on duration time 2022-09-26 14:43:04 +02:00
75713af0e0 [export][person] fix alias name for person in CountPersonWithAccompanyingCourse export 2022-09-23 21:58:50 +02:00
6cdb3033db [export][person] Fixed: filter per person's age: use calculatio non year interval 2022-09-23 21:58:38 +02:00
7fe8d0837f [export][person] fix alias name for person in CountPersonWithAccompanyingCourse export 2022-09-23 21:55:00 +02:00
753d6ea481 [export][person] Fixed: filter per person's age: use calculatio non year interval 2022-09-23 21:51:26 +02:00
8cf25415ab Merge branch '111_exports_suite' into testing 2022-09-22 18:16:15 +02:00
89bdc76565 handle unknown in gender aggregator 2022-09-22 18:15:59 +02:00
743e0b9403 Merge branch '111_exports_suite' into testing 2022-09-22 16:58:47 +02:00
b9d4b5650b [Activity][Export] Fixed: use leftJoin on aggregators 2022-09-22 16:58:29 +02:00
4fe4f6a877 DXFeature: ClosingMotiveRepository implements correct interace 2022-09-22 14:02:00 +02:00
4631f04da6 Merge branch 'issue628' into 111_exports_suite 2022-09-22 13:49:00 +02:00
e487bdf7fd fix issue628 when result is null 2022-09-22 13:22:34 +02:00
37662a4187 batch replacing 'actacp' by 'acp' 2022-09-21 18:04:34 +02:00
97d6f35605 Merge branch '111_exports_suite' into testing 2022-09-21 17:31:13 +02:00
cf9b9b3c75 [person][export] Fixed: use left join for related entities in accompanying course aggregators 2022-09-21 17:30:00 +02:00
ca6fde934b [export][person] Fixed: fixed inconsistency in requestor query
A condition was not present in a subquery, causing to take all courses into account,
not the one concerned by the filter
2022-09-21 17:28:55 +02:00
01fb93e9e0 [export][activity] count activities only once if the activity is present
multiple times due to JOIN
2022-09-21 17:28:55 +02:00
4e82126bed [activity][export] Fixed: fixed inconsistencies with date filters 2022-09-21 17:28:55 +02:00
8b64933565 [activity][export]: Fixed: rename the alias for accompanying period, to
be suitable for usage with acp filters
2022-09-21 17:28:55 +02:00
683717e572 Merge branch '111_exports_suite' of gitlab.com:Chill-Projet/chill-bundles into 111_exports_suite 2022-09-21 14:34:04 +02:00
f763a1ed9f Merge branch '111_exports_tests_suite' into 111_exports_suite 2022-09-21 14:33:24 +02:00
3c8dbe56fc exports: create new aggregator tests + minor corrections in aggregators 2022-09-21 14:31:46 +02:00
7813f66935 Merge branch 'calendar/finalization' of gitlab.com:Chill-Projet/chill-bundles into calendar/finalization 2022-09-21 13:31:38 +02:00
9da410afb8 urgency and calendarrange exports 2022-09-21 13:31:24 +02:00
7ef84b9fd0 exports: create new aggregator test (untested) 2022-09-21 13:27:26 +02:00
8d7013b988 Merge branch 'calendar/finalization' of gitlab.com:Chill-Projet/chill-bundles into calendar/finalization 2022-09-21 12:46:03 +02:00
6405f2101f exports: add new tests for calendar aggregators (untested) 2022-09-21 12:45:31 +02:00
d62c09993f Merge branch 'calendar/finalization' of gitlab.com:Chill-Projet/chill-bundles into calendar/finalization 2022-09-21 12:26:29 +02:00
40b4fd00b0 Merge branch 'calendar/finalization' of gitlab.com:Chill-Projet/chill-bundles into calendar/finalization 2022-09-21 12:26:03 +02:00
2331e9ea0f Merge branch 'calendar/finalization' of gitlab.com:Chill-Projet/chill-bundles into calendar/finalization 2022-09-21 12:20:52 +02:00
e90ff67e33 add urgent property to calendar entity 2022-09-21 12:20:39 +02:00
27306015f4 exports: create new filter tests 2022-09-21 11:29:08 +02:00
c059b7700e Improve label for aliases in "Filter by Activity" and use of new-style
EntityRepository for ActivityType

* [activity][export] Feature: improve label for aliases in "Filter by activity type"
* [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
2022-09-21 11:11:33 +02:00
318009c9c8 exports: add new tests for calendar filters (untested) 2022-09-21 11:02:09 +02:00
5b3cd9eb20 report export test 2022-09-21 10:50:12 +02:00
eb112b8a85 exports: remove duplicate test
cfr commit 18a6a5a7eb
2022-09-21 10:33:49 +02:00
390009b395 export: create new filter tests 2022-09-21 10:17:53 +02:00
37dcbe92c0 export: fix translation 2022-09-21 10:17:53 +02:00
b25a1c3cbb correct import path with filter/aggr 2022-09-21 10:17:53 +02:00
d599792de8 enable commented filter (!?) 2022-09-21 10:17:06 +02:00
42c395ecc9 export: add logger to make feedback on deployed instances easier to debug 2022-09-20 19:09:20 +02:00
052c0e1969 [CS] remove dead code 2022-09-20 18:50:04 +02:00
a72acbe008 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-09-20 18:49:55 +02:00
ca732d89c3 Merge branch 'export_feedback' 2022-09-20 18:49:11 +02:00
5b5470c259 add logger to make prod feedback debug easier 2022-09-20 18:48:13 +02:00
59b22dbb6d [person][export] Fixed: rename the alias for accompanying_period to acp in filter associated with person 2022-09-20 17:02:35 +02:00
35a2d08267 Merge branch 'master' into 111_exports_suite 2022-09-20 16:37:33 +02:00
5af492b2db Merge remote-tracking branch 'origin/111_exports_suite' into testing 2022-09-20 12:18:00 +02:00
70c631b612 Merge remote-tracking branch 'origin/master' into testing 2022-09-20 12:15:29 +02:00
66f7ef8c51 prepare for beta2 release 2022-09-20 12:00:01 +02:00
cdb9d967ff [person] Feature: on evaluation, add an url field on the admin 2022-09-20 11:50:01 +02:00
29b24fa506 [Budget] Feature: allow to desactive resources and charges in the
configuration

A new key `active` (default `true`) allow to activate or desactivate the
line in the resource or charge.
2022-09-20 11:26:05 +02:00
4d192d748f [skeleton] we do not commit composer into repository 2022-09-20 10:03:05 +02:00
6bd0bcff6e Fix: Workflow: the notification is send when the user is added on first
step.

See https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/813
2022-09-19 21:27:07 +02:00
1869f44ec6 Merge branch '__111_action_goal_result' into 111_exports_suite 2022-09-19 13:55:16 +02:00
5b148f967f Merge branch 'feature/load-address-bano' into 'master'
Load addresses from bano and best address

See merge request Chill-Projet/chill-bundles!448
2022-09-19 11:51:21 +00:00
91af01336a fix goalResult aggregator 2022-09-19 13:51:03 +02:00
37d49e1123 fix goal aggregator error 2022-09-19 11:46:53 +02:00
d30ac75995 exports: create workAction goalResult aggregator 2022-09-19 11:22:41 +02:00
b13686bbf1 fix geom type in db: multipolygon 2022-09-19 09:07:49 +02:00
841eb57144 GeographicalUnit Filter: add join clauses 2022-09-19 09:07:49 +02:00
d907357748 Merge branch '__SocialWorkType_finish' into 111_exports_suite 2022-09-19 09:05:39 +02:00
8129739d27 test for postal code base importer 2022-09-17 10:59:04 +02:00
658e846120 add test for AddressReferenceBaseImporter 2022-09-17 10:44:26 +02:00
0f63548d5a import addresses and postal codes from bestaddress 2022-09-17 09:10:28 +02:00
84cda8845d Feature: command to load addresses from France from bano.openstreetmap.fr 2022-09-17 09:10:28 +02:00
9b3b9f2552 Fixed: possible unexisting variable 2022-09-17 09:10:28 +02:00
58ddf9038d Feature: load french postal code from laposte hexasmal open data 2022-09-17 09:10:28 +02:00
a9b354a6f5 Feature: add constraint to ensure postal code uniqueness and track creation and update of postal code 2022-09-17 09:10:28 +02:00
62ff4998a0 Fixed: annotation schema for ManyToMany relationship between Evaluation and SocialAction
Before this commit, the owning side of the relationship between Evaluation and SocialAction was declared twice.
2022-09-17 09:10:28 +02:00
d285e7f875 Merge branch '111_exports_acl' into '111_exports_suite'
Adapt ACL to allow the usage of global ACL

See merge request Chill-Projet/chill-bundles!452
2022-09-17 06:25:09 +00:00
d716e0c2c2 add missing roles and adapt role voter for exports houshold and activity 2022-09-17 08:23:28 +02:00
78ea990189 allow voter to handle export about Accompanying periods on Center 2022-09-17 08:23:28 +02:00
524123c701 [FIX] use AuthorizationHelperInterface instead of implementation in PickCenterType 2022-09-17 08:23:28 +02:00
38cb1fe357 [dev-feature] use an interface for describing CenterRepository (allow mocking in tests 2022-09-17 08:23:28 +02:00
e379d8adb5 [feature] use internal services to check for acl on exports 2022-09-17 08:23:28 +02:00
211a80e9be deprecate chill prophecy train in favor of prophecy-phpunit bridge 2022-09-17 08:23:28 +02:00
91a5db4c14 fix origin alias in qb 2022-09-15 16:07:00 +02:00
5dcd157bd0 export: move Vue component in ChillPersonBundle 2022-09-14 18:16:28 +02:00
fb60808dca export translations: improve title translations in filter/aggrs stack 2022-09-14 17:53:07 +02:00
fceab958bb comment logs 2022-09-14 15:01:28 +02:00
f07847e985 Merge branch '__SocialWorkTypeFilter' into 111_exports_suite 2022-09-14 14:58:35 +02:00
c7e88b3924 select action childrens when selecting parent 2022-09-14 14:57:43 +02:00
424c9239b7 App.vue: improve logs to understand algo 2022-09-14 14:57:23 +02:00
6c191f584f fix bug when member is non-positionné, case not taken into account in if-condition 2022-09-14 12:09:25 +00:00
b2e83892a7 update export alias conventions 2022-09-14 12:34:57 +02:00
478afc893b exports: fix alterQuery and DescribeAction in SocialWorkTypeFilter 2022-09-14 12:34:57 +02:00
4cb6e8e564 exports: fix buildForm in SocialWorkType Filter 2022-09-14 12:34:57 +02:00
9b1e464011 fix form error in App.vue (does not POST from step=export to step=formatter) 2022-09-14 12:33:14 +02:00
71f49db2f4 disable unstable filters/aggregators 2022-09-13 21:05:22 +02:00
6c29638fed exports: fix export_result cell if null (issue 628)
https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/628
2022-09-13 14:54:36 +02:00
18a6a5a7eb exports: move acp ActivityType filter in ChillActivityBundle 2022-09-13 13:27:24 +02:00
d85be8a92e update exports_alias_conventions 2022-09-13 13:09:40 +02:00
42ea1f5813 exports: better lisibility of exports index page 2022-09-13 12:41:03 +02:00
ef7a388f38 exports: fix resetDQLPart('from') issue (632)
https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/632
2022-09-13 12:38:33 +02:00
eafe68973a [bug] Temporary bypass Vue component 2022-09-08 14:35:48 +02:00
17494b3e9f Merge branch 'export_vue_multiselect' into 111_exports_suite 2022-09-08 14:27:58 +02:00
661e5458ee bam 2022-09-08 14:17:17 +02:00
236e89a6ae Merge branch 'calendar/finalization' of gitlab.com:Chill-Projet/chill-bundles into calendar/finalization 2022-09-08 13:31:46 +02:00
307280f595 Merge branch '111_exports_suite' of gitlab.com:Chill-Projet/chill-bundles into 111_exports_suite 2022-09-08 12:50:34 +02:00
d81afb89f2 Revert "rename files for coherence with naming elsewhere"
This reverts commit 5f2622d0d2.
2022-09-08 12:48:19 +02:00
0a0a692eae Revert "rename files for coherence with naming elsewhere"
This reverts commit ff5fab5f50.
2022-09-08 12:46:23 +02:00
8cf9bf4a5f Revert "add querybuilder method to repository"
This reverts commit ebfb030ba6.
2022-09-08 12:46:19 +02:00
b0d77a1656 Revert "adjust property name to make it work with changes calendar bundle"
This reverts commit 822b96f87f.
2022-09-08 12:46:15 +02:00
967c8c62d4 Revert "adjust property name to make it work with changes calendar bundle"
This reverts commit 12c37ddb2c.
2022-09-08 12:45:59 +02:00
25cc728f6d adjust translations 2022-09-08 12:30:22 +02:00
12c37ddb2c adjust property name to make it work with changes calendar bundle 2022-09-08 12:07:58 +02:00
822b96f87f adjust property name to make it work with changes calendar bundle 2022-09-08 12:07:58 +02:00
ebfb030ba6 add querybuilder method to repository 2022-09-08 12:05:08 +02:00
ff5fab5f50 rename files for coherence with naming elsewhere 2022-09-08 12:04:11 +02:00
5f2622d0d2 rename files for coherence with naming elsewhere 2022-09-08 12:04:11 +02:00
712c7bc492 add actionRender in construct, it was missing 2022-09-08 12:04:11 +02:00
2e3f977f3d adjust property name to make it work with changes calendar bundle 2022-09-08 11:59:44 +02:00
5c2b2105b2 exports: improve formatter twig template (when multiple order rows) 2022-09-08 11:47:41 +02:00
a817b0bf4c exports: re-enable all modifiers stack with shared filters/aggrs 2022-09-08 11:31:23 +02:00
48548e020f adjust property name to make it work with changes calendar bundle 2022-09-08 11:30:19 +02:00
d0d7c0babf adjust property name to make it work with changes calendar bundle 2022-09-08 11:25:50 +02:00
c1c472f546 Merge branch 'calendar/finalization' of gitlab.com:Chill-Projet/chill-bundles into calendar/finalization 2022-09-08 11:20:36 +02:00
3822f68574 add querybuilder method to repository 2022-09-08 11:20:27 +02:00
f00e01d44e rename files for coherence with naming elsewhere 2022-09-08 11:17:13 +02:00
2127fb2b54 rename files for coherence with naming elsewhere 2022-09-08 11:08:34 +02:00
f10ec3991d exports: put breadcrumb in an include, add a link to go back to the list 2022-09-08 11:04:38 +02:00
283de2cab8 add actionRender in construct, it was missing 2022-09-08 11:03:20 +02:00
f92ac05ed7 Merge branch '111_exports_suite' into calendar/finalization 2022-09-08 10:19:53 +02:00
e550d64fd4 change class reference 2022-09-08 10:17:22 +02:00
4aaf75a1a4 merge 111_exports_suite into testing branch 2022-09-08 10:03:21 +02:00
1dcff2f23c exports: add condition with distinct alias on join clauses 2022-09-07 21:40:53 +02:00
81359877c4 exports: add condition with distinct alias on join clauses (wip) 2022-09-07 19:45:41 +02:00
3851e65777 fix errors with Role type 2022-09-07 13:38:13 +02:00
482abd3980 remove dump 2022-09-07 12:23:38 +02:00
0f0ec10857 fix rst syntax 2022-09-07 12:18:07 +02:00
d9e602247e fix errors with Role type 2022-09-07 11:09:03 +02:00
9db43f1de3 remove trailing dumps 2022-09-07 10:37:22 +02:00
674629e2bf comment out exports that are not yet ready 2022-09-07 10:37:01 +02:00
8efb874742 merge exports branch into calendar branch 2022-09-07 10:11:43 +02:00
1b8b99d5ce Merge remote-tracking branch 'origin/social_action_exports' into 111_exports_suite
# Conflicts:
#	src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
2022-09-07 10:08:39 +02:00
32c600c155 Merge branch '__geounitstat' into 111_exports_suite (but disable GeoUnit Filter/Aggr) 2022-09-07 10:00:15 +02:00
d3a0c4c283 exports tests: move tests in sub-folder, adapt namespace + fix errors 2022-09-06 16:27:49 +02:00
e42d6c2d77 Merge branch 'master' into testing 2022-09-06 15:33:27 +02:00
da2d68a45d [documentation] new how-to to switch into branch, and add info about gitlab tokens 2022-09-06 15:25:15 +02:00
29cc589bf2 exports: add a new GeographicalUnitStat aggregator 2022-09-06 15:07:28 +02:00
eedfa60bea Merge remote-tracking branch 'origin/111_exports_suite' into 111_exports_suite 2022-09-06 15:04:22 +02:00
1c92f58b3b Merge branch 'tests/fixes-2022-09-05' into 111_exports_suite 2022-09-06 15:02:36 +02:00
d4f3ec368c Merge remote-tracking branch 'origin/social_action_exports' into 111_exports_suite 2022-09-06 14:49:17 +02:00
d245afb009 correct identification of from() 2022-09-06 14:41:40 +02:00
648ec68cfb export SocialWorkTypeFilter: create dynamic Form Action-goal-result
- initiate new Vue component
- cleaning buildForm in Filter
- add HiddenType with ModelTransformer
- use ObjectToIdTransformer in HiddenType fields
- setting mount() and teleport
- list fetch url in api.js
- html/bootstrap form structure
- add Multiselect actionType
- i18n import
- add multiselect for goals and results
- add and remove options in multiselect (wip)
- fix basic vue add/remove element from data store
- vue cleaning
- add ids in value hiddenFields
- adapt Filter in AlterQuery (wip)
- improve code lisibility
2022-09-06 14:24:06 +02:00
3295031bcd marital status filter 2022-09-06 10:04:59 +02:00
75bdc335e5 remove usage of deprecated Role into Export 2022-09-05 17:26:36 +02:00
c442529799 fix cs 2022-09-05 14:49:07 +02:00
c4f0ad01d3 disable/comment buildForm in SocialWorkType Filter 2022-09-05 12:37:00 +02:00
8688e4d502 complete maritalStatusFilter 2022-09-05 11:51:17 +02:00
374ad43df6 exports: cleaning code 2022-09-01 10:11:53 +02:00
cae9dddac4 exports: fix acp requestor aggregator 2022-08-31 17:58:37 +02:00
436f1d6c61 exports: add new requestor aggregator 2022-08-31 15:28:11 +02:00
d86b86487f fix some remarks in 111_export review 2022-08-31 15:27:03 +02:00
bee5336c1d fix translation with calendar exports 2022-08-31 15:26:28 +02:00
6dbee02d82 Merge branch 'master' into social_action_exports 2022-08-30 13:23:41 +02:00
7eb75b709c Merge branch '111_exports' into social_action_exports 2022-08-30 13:17:37 +02:00
72b5fcf998 minor changes 2022-08-30 13:14:40 +02:00
nobohan
bf44b6b90d export: geographical unit filter 2022-08-29 16:22:36 +02:00
nobohan
81f04d0184 export: add a geographical unit entity (migration file) 2022-08-29 15:34:33 +02:00
nobohan
f99f6d5240 export: add a geographical unit entity 2022-08-29 15:21:05 +02:00
b5139ec460 exports: improve activity DateAggregator
- put orderby at the end
- addSelect with TO_CHAR() function (cancel EXRACT())
- uniformize addSelect cases
- orderBy with variable
- improve getLabels
2022-08-25 14:58:25 +02:00
f5baa2c152 exports: DurationAggregator with approximative(*) date interval
(*) for more precise, we need dql interval function
2022-08-25 13:49:12 +02:00
e1ec2dc25c exports: DurationAggregator: test qb addSelect for compute date interval 2022-08-25 13:49:12 +02:00
2c151c2ec9 exports: add new duration aggregator (wip) 2022-08-25 13:49:12 +02:00
cf642d2783 month year aggregator working 2022-08-25 13:08:24 +02:00
f3ceee7485 Merge branch '111_exports' into social_action_exports 2022-08-25 09:28:01 +02:00
9854fb0664 cancel reason aggregator + start of monthYearAggregator 2022-08-25 09:27:30 +02:00
7173e4be4a exports: fix activity DateAggregator; add customs DQL Date/Time functions 2022-08-24 15:44:18 +02:00
52902e905a exports: test all activity filters/aggregators and fix errors 2022-08-24 11:36:54 +02:00
dea7982ca8 exports: add activity linked_to_acp new aggregators (wip) 2022-08-22 19:04:48 +02:00
c4944cce17 exports: move activity old aggregators in PersonAggregators folder 2022-08-22 17:12:33 +02:00
f8f17a6a06 exports: move activity old filters in PersonFilters folder 2022-08-22 13:37:20 +02:00
95ea3bf30e refactor builder form in a filter 2022-08-22 13:29:22 +02:00
248d56e598 exports: add activity linked_to_acp new filters 2022-08-22 13:28:50 +02:00
9af620ece5 fix translations 2022-08-22 10:17:44 +02:00
4a1615afd5 export, fix merge translations 2022-08-22 10:02:38 +02:00
2bf5e934e9 merge 111_exports 2022-08-18 12:19:01 +02:00
03d098e5e1 aggregators added - monthYearAggregator not finished 2022-08-18 12:15:30 +02:00
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
e357899d78 Merge branch 'social_action_exports' into 111_exports 2022-08-17 17:48:43 +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
d04d758f27 exports: activityDate filter enable to activity linked to acl 2022-08-17 17:14:24 +02:00
c199bb5534 exports: activity improve translations 2022-08-17 17:02:21 +02:00
26cd677501 exports: activity new indicators works + improve translations 2022-08-17 16:07:20 +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
c17036fcda exports: fix activitytype filter/aggregator appliedTo activity_person and too activity_acl 2022-08-17 15:28:51 +02:00
c09c7a9615 exports: add new modifiers declarations to split filter/aggregators between activities linked to person <> acp 2022-08-17 14:58:20 +02:00
df9a5071c7 exports: display group as a breadcrumb in template
add a private method in controller which could be moved maybe in ExportManager
2022-08-17 14:56:24 +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
d9b668e614 exports: create new activity linked to acp exports indicators + title/descr/groups translations 2022-08-17 11:44:15 +02:00
57d00df460 exports: split namespace between activity linked to person <> acp 2022-08-17 10:12:29 +02:00
94cee14a11 exports: complete modifiers 2022-08-17 09:50:35 +02:00
4ebe064538 exports: improve translations 2022-08-17 09:49:33 +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
93d0fbead5 exports: create new indicator to count evaluations 2022-08-09 16:06:32 +02:00
72a5a6cd27 hop 2022-08-09 15:22:05 +02:00
b8bb0b1209 exports: improve translations 2022-08-09 15:11:01 +02:00
ed1dde4713 exports: share referrer aggregator 2022-08-09 11:30:42 +02:00
f817ca9671 exports: add a new intensity aggregator 2022-08-09 11:11:53 +02:00
5940e2c0b7 exports: add new Confidential and Emergency Aggregators 2022-08-08 17:39:53 +02:00
ace2cb6151 exports: add new AdministrativeLocation aggregator 2022-08-08 16:59:03 +02:00
ec7325ebbd exports: add a new ClosingMotive aggregator 2022-08-08 16:36:01 +02:00
643f37509f exports: share Scope and Job Aggregators 2022-08-08 16:12:34 +02:00
fcd7ae3b8d exports: add new aggregators for acp 2022-08-08 15:22:56 +02:00
f37e7cf393 moving files into separate folders for better overview 2022-08-04 14:49:48 +02:00
faef81a90b moving files into separate folders for better overview 2022-08-04 14:25:23 +02:00
95006b9643 exports: use Declarations for each applyOn 2022-08-04 14:12:25 +02:00
2f8bafa2e2 exports: split yaml services accompanying_period and accompanying_course
* the 3 old filters are applyOn person -> move it in PersonFilters
* there is a conditionnal option to enable them -> split yaml files
2022-08-04 12:46:06 +02:00
25e008f3e2 Merge branch '111_exports' into social_action_exports 2022-08-04 12:17:59 +02:00
43d45a5d04 tests: fix missing use statement 2022-08-04 11:30:52 +02:00
ea1a53ed37 tests: add missing FilterTest 2022-08-04 11:30:41 +02:00
28599adf48 tests on new ActiveOnDate and ActiveOneDayBetweenDates filters 2022-08-04 09:07:45 +02:00
e3743d3593 tests new filters ReferrerFilter and OpenBetweenDatesFilter (wip.. test failed) 2022-08-04 09:07:45 +02:00
2413c986ed exports: add a new GeographicUnitStat Filter (wip) 2022-08-04 09:07:45 +02:00
6921e4a40d exports: add new RequestorFilter 2022-08-03 20:13:29 +02:00
ac0c221267 start activity exports adaptations and new additions 2022-08-03 16:48:33 +02:00
32bb868b2b start with person aggregators 2022-08-03 16:21:57 +02:00
2ff346d7d8 Merge branch '111_exports' into social_action_exports 2022-08-03 15:22:32 +02:00
9e2ef9eae6 fix redundant referrerFilter 2022-08-03 15:18:22 +02:00
cfd590442f moving files into separate folders for better overview 2022-08-03 15:15:52 +02:00
cf7cf664a9 person filters added 2022-08-03 14:35:55 +02:00
ebb6ee4a41 agefilter added for persons 2022-08-02 15:07:56 +02:00
c72dc83c06 adjust countperson to make it work again 2022-08-02 13:44:28 +02:00
ea12c60154 more aggregator tests 2022-08-02 12:31:29 +02:00
40d92d11fc renaming aggregator job and scope for generic use 2022-08-02 11:30:30 +02:00
28dc99ff3f tests added for filters and some aggregators 2022-08-02 11:24:08 +02:00
20c1a287d8 merge with 111_export 2022-08-02 11:23:28 +02:00
6e439adce2 export new administrative location filter 2022-08-01 16:50:02 +02:00
4794e5e7b5 export new ActivityTypeFilter 2022-08-01 15:45:31 +02:00
bc2209319a export new EvaluationFilter 2022-08-01 14:32:11 +02:00
b511517a0f export new SocialActionFilter 2022-08-01 12:45:04 +02:00
758c56482b exports: add new ActiveOnDate filter 2022-08-01 11:30:32 +02:00
c401e34d63 exports: add new ActiveOneDayBetweenDates filter 2022-08-01 11:16:17 +02:00
7677b8aaa0 exports: add new OpenBetweenDates filter 2022-07-31 21:01:12 +02:00
dd06a262a2 remove commented unused 2022-07-31 19:22:39 +02:00
c1f578a811 exports: add new referrer filter, with mechanism to use it in acp or acpw context 2022-07-29 12:13:32 +02:00
635fe819a6 rename more generic for use in other exports 2022-07-28 15:57:02 +02:00
d59a22597d Merge branch '111_exports' into social_action_exports 2022-07-28 15:47:59 +02:00
8fdb2747ac Merge branch 'master' into social_action_exports 2022-07-28 15:45:46 +02:00
e6b66216ae actiontype, goal, and result aggregators created 2022-07-28 15:44:17 +02:00
d6b3ba48c0 fix the possibility to filter with multiple jobs or scopes 2022-07-28 12:05:42 +02:00
13b15f5057 renaming of class to avoid confusion 2022-07-28 11:24:36 +02:00
5c7513acd7 rename translations chains 2022-07-28 10:53:54 +02:00
8085fe2c17 referrer scope aggregator for social work actions 2022-07-27 21:25:13 +02:00
562a5678ef referrer job aggregator for social work actions 2022-07-27 21:19:13 +02:00
30501a68e3 referrer aggregator 2022-07-27 21:07:05 +02:00
b9186ed6e0 tests: write a simple Export test for new indicators + fix depreciation with BrowserKit client
cfr: https://symfony.com/doc/4.4/components/browser_kit.html#creating-a-client
2022-07-27 18:39:58 +02:00
5c82ccc49d user scope and job filter on socialwork actions 2022-07-27 17:08:50 +02:00
455a50d292 Merge branch 'social_action_exports' of gitlab.com:Chill-Projet/chill-bundles into social_action_exports 2022-07-27 16:05:04 +02:00
a40e2de91d rename filters to avoid confusion 2022-07-27 16:04:40 +02:00
357c7db5f1 rename filters to avoid confusion 2022-07-27 16:02:11 +02:00
ab2b2bc235 some advancements on dynamic socialaction filter 2022-07-27 15:50:56 +02:00
287d8f546b add simple test file for each new filter 2022-07-27 14:26:14 +02:00
8bbca12487 fix ProphecyTrait in AbstractFilter to use it with each filter 2022-07-27 14:23:21 +02:00
3dabd031f4 fix tests failed in exports 2022-07-27 14:23:21 +02:00
232cf96cb2 tests: write a simple Filter test for EmergencyFilter 2022-07-27 14:23:21 +02:00
cb42b68c33 filter for agents traitants 2022-07-26 15:46:16 +02:00
d5d38053cd renaming of export to avoid confusion + start of agent traitant filter 2022-07-26 14:43:21 +02:00
b12e5e78b6 reorganize into separate config file 2022-07-26 13:18:15 +02:00
a15c88dd35 merge 111 branch into this one 2022-07-26 11:57:54 +02:00
5f329101e1 title changed back to longer version 2022-07-26 11:44:20 +02:00
3a73af4fd0 Merge branch 'social_action_exports' of gitlab.com:Chill-Projet/chill-bundles into social_action_exports 2022-07-26 11:42:29 +02:00
9798cb8a09 due to excel limit, title can not exceed 31 characters 2022-07-26 11:41:16 +02:00
5ba8c4babc fixes to make count social actions export work 2022-07-26 11:22:17 +02:00
a06a2c9592 start of social actions export 2022-07-26 10:41:24 +02:00
ef827a1322 revert stepFilter to uniq selection
(cfr ddac410b2e)
2022-07-25 18:24:24 +02:00
e728c00671 exports: create intensity filter 2022-07-25 16:51:58 +02:00
da224ea4bc exports: create emergency filter 2022-07-25 16:35:36 +02:00
ddac410b2e exports: fix choice forms builder with multiple selections 2022-07-25 16:20:14 +02:00
43bedc41a7 exports: create confidential filter 2022-07-25 15:42:51 +02:00
ef5b3b24e4 exports: create closingmotive filter 2022-07-25 14:47:08 +02:00
057617c1cb separate accompanying_period exports in yaml service definition 2022-07-25 14:04:23 +02:00
e56520f4b1 exports: create origin filter 2022-07-25 12:36:22 +02:00
04ca61be81 rename data attribute 2022-07-25 12:35:35 +02:00
bf0ca7b777 exports: fix logic in userScope and userJob filter 2022-07-25 11:51:23 +02:00
fdd83de233 Merge branch '605_load-bootstrap' into 'master'
issue 605: improve the way chill loads bootstrap module

See merge request Chill-Projet/chill-bundles!446
2022-07-25 08:27:16 +00:00
97e8b3c9c1 fix yarn/webpack error when compiling
(correction on commit 340310be62)
2022-07-25 09:56:15 +02:00
5744a68f5f issue 605: remove old scratch sass framework 2022-07-22 14:13:16 +02:00
ddd0aeb7b4 issue 605: improve the way chill loads bootstrap module
custom variables are loaded before bootstrap variables, custom maps are loaded after
2022-07-22 14:08:43 +02:00
d5d3866122 fix conflict with where clause in indicator ; initiate a filter test 2022-07-20 23:17:05 +02:00
0d38d4df40 social issues filter: improve render with parents, add parents in where clause 2022-07-20 19:33:42 +02:00
bb22317eb1 exports: add new social issues filter (wip) 2022-07-20 16:38:46 +02:00
b608976326 exports: add new step filter 2022-07-20 13:47:15 +02:00
7f1dadc136 user scope/job filters: improve translation in csv 2022-07-20 11:24:13 +02:00
ff8a32a321 user scope filter: change query (TO CHECK) 2022-07-20 11:23:03 +02:00
d7c1498882 english corrected 2022-07-19 14:20:38 +00:00
70f118011b exports: add a new user job filter 2022-07-19 15:04:57 +02:00
da556248d4 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-07-19 13:05:58 +02:00
881e608c87 exports: add a new user scope filter 2022-07-18 18:45:02 +02:00
80df7b2f72 update changelog 2022-07-18 16:37:34 +02:00
e6caeecc50 add composition type to admin menu 2022-07-18 16:36:13 +02:00
juminet
8651d3232a Merge branch 'issue612_add_field_accperiodresource_doc_gen' into 'master'
Issue612 add field accperiodresource doc gen

See merge request Chill-Projet/chill-bundles!445
2022-07-18 13:43:43 +00:00
nobohan
d55ba36619 [person] add comment field to accompanying period resource docgen 2022-07-18 15:39:00 +02:00
2911cb5063 master merged into branch 2022-07-18 15:05:34 +02:00
62dc909708 php cs fixes, stan ok! 2022-07-18 14:51:40 +02:00
99154eaa99 changelog updated 2022-07-18 14:42:41 +02:00
b28677fac9 delete quitter et repositionner buttons from enfant hors menage 2022-07-18 14:39:24 +02:00
34923df43c exports avg_accompanying_course_duration with closingdate parameter 2022-07-18 14:38:48 +02:00
6272000588 update changelog 2022-07-18 12:53:20 +02:00
de4cd60b3d query adjusted to fetch only active objectives for a social action 2022-07-18 12:52:02 +02:00
903ac2ff69 exports: init sum_accompanying_course_duration (replace list_accompanying_course) 2022-07-14 14:42:53 +02:00
3d0dd46ea5 fix count_accompanying_course query: no centers, not count DRAFT courses 2022-07-14 14:27:55 +02:00
e323937405 Temporarily disable ACL on new exports 2022-07-14 10:26:26 +02:00
2f42b9411a which acl is CONFIDENTIAL_CRUD ? 2022-07-13 14:19:12 +02:00
fe595860f2 replace 'hideLabel' form option by 'fullWidth'
sometimes we want fullWidth and display label
2022-07-13 13:36:20 +02:00
bda203d11d add accompanying courses exports in a group 2022-07-13 10:41:30 +02:00
3cdcccc037 add activity exports in a group 2022-07-13 10:32:27 +02:00
2ce145cace wip.. setting acl for new accompanying course exports 2022-07-13 10:14:54 +02:00
ec38dc4d21 add person exports in a group 2022-07-13 10:14:54 +02:00
85796c2271 CS 2022-07-12 18:16:04 +02:00
83ee3c7cfd fixed: add required type-hinting to AccompanyingPeriodComment, necessary
for docgen rendering
2022-07-12 18:15:16 +02:00
8809abedf6 fixed: rendering of course in list of courses by household 2022-07-12 18:14:25 +02:00
28ed09b9d9 exports: add 2 new exports for accompanying courses 2022-07-12 15:18:37 +02:00
56bed12886 exports: fix errors and depreciations 2022-07-12 14:19:50 +02:00
e9fca1288a exports: fix errors and depreciations 2022-07-12 13:07:48 +02:00
9fa3d596bb split title and description for list activity export 2022-07-12 13:06:29 +02:00
5896a77ae9 Fixed: use CenterResolver where cases when center is resolved differently 2022-07-12 11:10:18 +02:00
11d1b26efc fixed: unable to create a course (due to method change in activity entity) 2022-07-12 10:44:40 +02:00
3782cf35ff Merge branch 'master' into testing 2022-07-11 20:03:37 +02:00
5f6c11bde9 Feature: show comment in #docgen generation for accompanying periods 2022-07-11 19:56:59 +02:00
b3da9611ce Fixed: do not show postal code created by users in the list of postal codes 2022-07-11 19:37:32 +02:00
ba8a80a202 Fixed: test for userjob associated to course in Regulation list 2022-07-11 19:32:19 +02:00
6998043159 Fixed: do not allow to create activities when no rights to do it
The ACTIVITY_FULL role does not give anymore the roles
CHILL_ACTIVITY_CREATE_PERSON and CHILL_ACTIVITY_CREATE_ACCOMPANYING_COURSE.

Tags: #BC
2022-07-11 19:31:24 +02:00
ce17c15d41 fixed: ACL in activity creations and edition 2022-07-11 18:24:48 +02:00
93560a62ef Feature: an activity has the same scope as an accompanying period, if it exists 2022-07-11 17:36:59 +02:00
3785e5096e Merge branch 'master' into fix_activity_rights 2022-07-11 17:17:35 +02:00
3748eb99c6 Fixed: add an exclude constraint to ensure on db side that there is only one step waiting for a transition 2022-07-11 17:10:40 +02:00
c69af351cc fixed: do not show disabled jobs in list of jobs from the api 2022-07-11 16:20:48 +02:00
692c2bdac0 fixed: do not show disabled users in list of users from the api 2022-07-11 16:11:45 +02:00
6bcc28b4bb feature: hide course when the period is not active for the user, in search results and list of periods for a person 2022-07-11 15:57:38 +02:00
a79a2b6ee9 fixed: warning message "usagers du parcours" does show only for current
members for a course
2022-07-11 15:26:04 +02:00
09b2c9a14e fixed: do not show same person twice if persons are members simultaneously 2022-07-11 15:11:35 +02:00
4ef48216ed fixed: do not allow to create a course or see a houshold from the search result, if the user does not have any rights to do it 2022-07-11 13:54:12 +02:00
16fed67dd0 fixed: do not allow to edit a course through the "warning" button on the course's index page 2022-07-11 13:45:52 +02:00
87a9d48bdf feature: allow to not check mainPerson, person1 or person2 when generating a document 2022-07-11 13:39:07 +02:00
f3ca01fd88 cs: fix 2022-07-11 13:34:10 +02:00
5962d3f233 fixed: query for index in PersonDocumentACLAwareRepository 2022-07-11 12:57:21 +02:00
ab08dab88a fixed: voter and permissions in accompanying course document 2022-07-11 12:57:08 +02:00
68c1833584 fixed: CS 2022-07-11 12:56:48 +02:00
191b8ecf81 fixed: query for index in PersonDocumentACLAwareRepository 2022-07-11 12:56:34 +02:00
e7ba42de1f fixed: voter and permissions in accompanying course document 2022-07-11 12:55:02 +02:00
ef9a155cc1 bootstrap styles in export section 2022-07-11 11:09:46 +02:00
3bb8b713d1 fixed: migration of databse with address on same day fails 2022-07-11 03:32:43 +02:00
8b145ebc11 fixed: migration of databse with address on same day fails 2022-07-11 03:32:15 +02:00
722cf789ec remove dump mesages 2022-07-11 01:13:17 +02:00
cec1588e91 Merge branch 'master' into calendar/finalization 2022-07-10 22:00:19 +02:00
94c258e914 fixed: narrow search on postal code with an 'AND' clause instead of 'OR' clause 2022-07-10 22:00:04 +02:00
1fff90d3a7 Merge remote-tracking branch 'origin/master' into calendar/finalization 2022-07-10 20:45:19 +02:00
1d8f25e2c8 use the date parameter in deprecated method getLastAddress 2022-07-08 15:04:06 +02:00
b4b67c6f0d Merge branch 'event_bundle_sf4' into 'master'
Event bundle sf4

See merge request Chill-Projet/chill-bundles!439
2022-07-08 10:21:31 +00:00
340310be62 bootstrap styles in export section 2022-07-07 16:08:34 +02:00
nobohan
9978e76a87 fix activity rights (WIP) 2022-07-07 15:25:17 +02:00
7b64269bb5 fix show/hide in exports filter + better styles 2022-07-07 15:20:50 +02:00
3da26a4d45 fix rst syntax 2022-07-07 12:51:59 +02:00
5662609c23 doc for install and synchronization 2022-07-07 12:48:20 +02:00
57277e5b87 deprecate move status, which is not in use 2022-07-07 10:41:33 +02:00
f72c0576ef check for user email before writing msgraph metadata 2022-07-06 21:36:37 +02:00
c8028b8e60 set correct duration for subscribing to remote calendar 2022-07-06 17:09:04 +02:00
nobohan
36e35f2e8f [event] refactor admin for event bundle 2022-07-06 13:36:20 +02:00
989c4e90e5 enable show_hide on export pages 2022-07-05 16:39:48 +02:00
fcac977d13 existing exports, better translations 2022-07-05 15:46:43 +02:00
2b5accaeac override export activity translations 2022-07-05 13:42:32 +02:00
nobohan
389f014d36 [event] fix deprecation (typing) 2022-07-05 10:18:07 +02:00
135b385c11 fix rust indent 2022-07-04 17:29:45 +02:00
nobohan
3cf8609e8f [event] fix deprecation (type missing) 2022-07-04 17:20:03 +02:00
c82e128c5c Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-07-04 16:32:20 +02:00
3ddab4f6e2 documente un souci avec docker lors de l'installation de chill 2022-07-04 16:32:12 +02:00
nobohan
31e1bfdf80 export: cast role as string in PickCenterType 2022-07-04 16:19:03 +02:00
2400bd48d1 fix instruction for installing in dev 2022-07-04 12:46:49 +02:00
c841821ed4 fix loading calendar range fixtures (3) 2022-07-03 22:19:26 +02:00
8830b6dc23 fix loading calendar range fixtures (2) 2022-07-03 22:18:21 +02:00
accee53f5a fix loading calendar range fixtures 2022-07-03 22:11:32 +02:00
20b70f9eed fix typing and package deps to satisfy DI compilation 2022-07-03 21:31:57 +02:00
d375abf593 display locals calendar events in Calendar app 2022-07-03 18:30:00 +02:00
7d281ea50f fix error in handling remove range message 2022-07-02 15:19:50 +02:00
e5aada5561 add locals on MyCalendar app 2022-07-02 15:13:02 +02:00
2d71ba9078 remove existing calendars from proxy remote 2022-07-02 14:42:54 +02:00
3df06e1eba add api endpoint for listing calendars 2022-07-02 14:31:27 +02:00
26a0ba4756 count events on remote calendars 2022-07-01 23:36:30 +02:00
a604902074 add planning view for calendar app 2022-07-01 18:23:46 +02:00
8bbd3b01d9 Add a mention on next calendars on search results 2022-07-01 18:01:42 +02:00
3dcec5d44a layout for filter on the list page 2022-07-01 15:16:21 +02:00
f513749780 fix cs 2022-07-01 15:05:13 +02:00
93c5e83454 add validation on calendar 2022-07-01 15:05:03 +02:00
9c1324e9ec fix transform to activity 2022-07-01 14:09:46 +02:00
87403e509f recreate calendar range when an event is deleted 2022-07-01 13:43:30 +02:00
0276ec1bc7 fix compilation errors in production 2022-07-01 13:19:02 +02:00
2a6974610f associate location on ms calendar remote 2022-07-01 12:12:48 +02:00
014e281d13 add sms on calendar list 2022-06-30 21:40:40 +02:00
18be028a87 display location in calendar list 2022-06-30 20:24:33 +02:00
a5b5eea146 use the location from the calendar range, when associating a range with the calendar 2022-06-30 20:05:28 +02:00
71b6b158ba fix list of locations in calendar 2022-06-30 19:38:32 +02:00
d87c6305fd improve some layout on create calendar 2022-06-30 18:36:02 +02:00
64d7c1fe99 remove unused files 2022-06-30 17:41:56 +02:00
4aa8436399 finalization of my calendar ranges 2022-06-30 17:40:43 +02:00
nobohan
c76f2a81c9 [main] cast uniqid arg to string in ExportController 2022-06-30 07:37:27 +02:00
nobohan
f48e197e0b [main] fix deprecations for Export/PickCenterType 2022-06-30 07:29:33 +02:00
9e93e2a3f9 edit location on existing ranges 2022-06-29 23:47:12 +02:00
adad4313a6 handle remote events 'isAllDay' and fix cs 2022-06-29 15:29:22 +02:00
849e7158e4 adding location to ranges and more control on MyCalendarRanges 2022-06-29 15:28:37 +02:00
nobohan
f70e3b7997 quick fix: use Scope class instead of classname 2022-06-29 15:05:59 +02:00
809a0a38ab Merge branch 'master' into calendar/my-calendar-fixes-with-ts 2022-06-28 10:33:00 +02:00
66baf0391c Revert "only prefill agents traitants of action if parcours has a referrer, otherwise null"
This reverts commit 0943366d39.
2022-06-28 00:01:31 +02:00
4f81bffa67 add a test for relocking an existing lock 2022-06-27 23:57:42 +02:00
5432ce2b0f some fixes with wopi 2022-06-27 23:51:07 +02:00
03bc94178f re-implements document lock manager for wopi 2022-06-27 22:44:10 +02:00
13dae00a2c feature: copy ranges 2022-06-27 21:27:37 +02:00
b5d5338002 re-add feature to patch event 2022-06-27 16:32:09 +02:00
922c5c5f5c working with webpack 5 2022-06-27 15:28:35 +02:00
a9bc98738e fix weird bug with ts import 2022-06-27 14:51:48 +02:00
3ea630748a add feature add and delete range 2022-06-24 18:52:28 +02:00
bf536aab38 Merge branch 'translations_dutch' into 'master'
Dutch translations

See merge request Chill-Projet/chill-bundles!403
2022-06-24 15:59:10 +00:00
df593c7c7f Dutch translations 2022-06-24 15:59:10 +00:00
75b2f6419e working calendar ranges with a subset of features 2022-06-24 17:24:56 +02:00
a845fddf2e force authenticating on remote calendar 2022-06-24 15:08:10 +02:00
ca44ebccf3 first reactive calendar 2022-06-23 16:24:54 +02:00
nobohan
07f4aaa590 quick fix: address: only add coordinates to selected postcode if coordinates exist 2022-06-23 15:46:17 +02:00
d8f80f3d02 wip on app2 2022-06-23 12:26:48 +02:00
6b3b010631 wip debug 2022-06-21 17:30:50 +02:00
5a5958704b Merge remote-tracking branch 'origin/master' into calendar/my-calendar-fixes-with-ts 2022-06-21 17:28:21 +02:00
10095343ec handle lastUpdateTime for Wopi implementation
* get the last updated time from the stored object's storage
* improve perf on loading content from stored object's storage: keep the
response in cache
2022-06-20 21:22:02 +02:00
8c99fc0089 basic structure for using modules in stores and convert to TS 2022-06-20 09:50:40 +02:00
6c4f116e85 split store into multiple files 2022-06-17 18:04:57 +02:00
5c08abc2f6 Merge branch 'calendar/finalization' into calendar_changes 2022-06-17 17:29:05 +02:00
138d431786 fix duplication action in controller 2022-06-17 17:10:10 +02:00
03d64995d9 Merge remote-tracking branch 'origin/calendar/synchro-msgraph' into calendar/finalization 2022-06-17 17:04:37 +02:00
59e24ff39d Merge remote-tracking branch 'origin/master' into calendar/finalization 2022-06-17 16:53:56 +02:00
b7c3300884 Merge branch 'calendar/synchro-msgraph' into calendar/finalization 2022-06-17 16:52:52 +02:00
1742dd4951 add return path after changing location, and select2 on picking user location 2022-06-17 13:34:05 +02:00
832da83b27 fix tests for person controller update 2022-06-16 21:35:05 +02:00
0cfad13720 fix normalization for null accompanying period docgen 2022-06-16 21:30:46 +02:00
dfb583fa8b fix cs 2022-06-16 15:37:59 +02:00
da9eba2618 add regulation list and basic regulation list query 2022-06-16 15:37:51 +02:00
8982697a73 add missing translation message 2022-06-15 17:46:28 +02:00
1bd00c3f4c fix editing thirdparty without date 2022-06-15 17:46:28 +02:00
7ac54a6c9f Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-06-15 16:06:15 +02:00
ccaf430b37 remove border from address 2022-06-15 16:06:06 +02:00
72ce5c716d remove border from address 2022-06-15 16:02:37 +02:00
86afe2f702 fix condition 2022-06-15 15:58:53 +02:00
f297548a3a adjust styling of address + button 2022-06-15 15:46:24 +02:00
d20d38e5f4 change icon house to map marker 2022-06-15 12:35:20 +02:00
3735f24e10 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-06-15 12:26:22 +02:00
4b5cdd471b fix showPane component for editing address 2022-06-15 11:55:49 +02:00
f339cf56d6 notify the referrer from an activity page or list 2022-06-14 21:24:50 +02:00
4592be3a8d improve syntax for the js fix 2022-06-14 21:24:50 +02:00
4e1d7278c6 change translation in twig template for creation of household in user create form 2022-06-14 17:33:12 +02:00
a26346859c change translation to add household for new user 2022-06-14 17:21:57 +02:00
a48b990c73 condition correction to fix display of addAddress btn in parcours and household tunnel 2022-06-14 17:15:33 +02:00
28c952521f command for sending bulk sms with tests 2022-06-14 01:15:58 +02:00
4c0fef4f44 send message from cli through ovh if configured 2022-06-13 21:39:29 +02:00
0943366d39 only prefill agents traitants of action if parcours has a referrer, otherwise null 2022-06-13 17:59:29 +02:00
4719a74307 constraint added to workflow transtion - cannot be null 2022-06-13 17:40:01 +02:00
72167b9e77 fix merge conflict 2022-06-13 16:38:37 +02:00
c14ae98130 fix merge conflict 2022-06-13 16:36:09 +02:00
83b928b0b0 fix merge conflict 2022-06-13 16:35:04 +02:00
f0187536c1 visual changes when option 'create household' is checked in user create form 2022-06-13 16:33:56 +02:00
fec27babbe visual changes when option 'create household' is checked in user create form 2022-06-13 15:35:35 +02:00
ceb0f741ef order of birthdate fields changed in advanced search 2022-06-13 15:05:18 +02:00
616be5cc8a bootstrap fake sms from cli 2022-06-13 14:01:07 +02:00
149d4c3846 changelog updated 2022-06-13 09:46:45 +02:00
9e4fd6183e more fixes for calendar syncs 2022-06-10 14:24:46 +02:00
c92077926e db constraint with unique remoteId if set, handle sync with tests 2022-06-10 00:26:24 +02:00
9a29532362 fix bux to quickly add names that exist of multiple parts to the namefield of a person or thirdparty 2022-06-09 18:31:38 +02:00
f149b24802 small fixes on sync from remote 2022-06-09 17:06:57 +02:00
6e48a042b3 prevent change when syncing from remote 2022-06-09 15:44:48 +02:00
64e07c54fa first bootstrap for handling calendar range sync frommsgraph 2022-06-09 15:17:42 +02:00
d95d97f8fe msgraph: subscription for users 2022-06-08 22:43:49 +02:00
e75b258e44 handling sync for calendar invite 2022-06-08 13:06:31 +02:00
c329862e96 fix loading for ms graph connector 2022-06-08 13:05:28 +02:00
fbf1c4365d fix typing of oauth2client methods 2022-06-08 12:56:04 +02:00
168aff81f4 fixes in template with new route and forms 2022-06-06 22:07:04 +02:00
fc7d2fcca3 fix cs 2022-06-06 17:50:21 +02:00
537fefee15 add private comment on calendar 2022-06-06 17:50:11 +02:00
dc22d18e6a remove timezone from calendar and calendar range 2022-06-06 17:49:51 +02:00
dab9204ec7 fix association mapping for many-to-many SocialAction <-> Evaluation 2022-06-06 17:37:01 +02:00
543d30acb9 display of calendar form 2022-06-06 17:11:43 +02:00
c31886fea3 calendar app: fix error on users on startup 2022-06-06 15:13:36 +02:00
6c3043f6fc some layout for calendar app 2022-06-03 15:25:36 +02:00
3a88ea0b0f answer vue component: use union type instead of enum 2022-06-03 14:39:35 +02:00
c804462f15 list calendar by period: date range and query acl aware 2022-06-01 23:04:59 +02:00
d9dfe75378 minor layout improvement show parcours btn in task 2022-06-01 15:43:01 +02:00
089c92d0ee layout of page calendar list 2022-06-01 12:34:07 +02:00
8d70562132 null error in task widget on homepage fixed 2022-06-01 11:37:29 +02:00
4217524e63 answer to invite: some layout 2022-06-01 11:25:45 +02:00
4fef8ec46e remove import of default variables bootstrap 2022-06-01 11:25:22 +02:00
83de518b45 update changelog 2022-06-01 11:08:20 +02:00
21bc472886 Merge branch 'master' of gitlab.com:chill-projet/chill-bundles 2022-06-01 11:05:17 +02:00
75490306a2 add pagination on workflow list page 2022-06-01 11:04:23 +02:00
76b49d22e7 module in ts to give an answer to calendar invite 2022-05-31 22:45:21 +02:00
f92cef02cf fix creating a new AccompanyingPeriodWorkEvaluationDocument when replacing the document (the workflow was lost) 2022-05-30 22:43:50 +02:00
a4e3ffbe27 fix cs 2022-05-30 22:41:47 +02:00
0849b2d5f4 docgen: fix title of origin 2022-05-30 21:16:40 +02:00
679d19e2a1 allow null values for private comment 2022-05-30 10:01:27 +02:00
840c7e1084 always import base bootstrap variable before customizing them 2022-05-28 01:58:49 +02:00
5dcf7000f1 Merge branch 'master' into calendar/synchro-msgraph 2022-05-28 01:45:33 +02:00
7fb0e44307 fix null value for calendar in private comments 2022-05-28 01:45:11 +02:00
ec536871aa Merge remote-tracking branch 'origin/master' into calendar/synchro-msgraph 2022-05-28 00:30:02 +02:00
1496ae34f8 preload course json for a faster display 2022-05-28 00:07:11 +02:00
b9c1dbd8c1 require weblink 2022-05-27 23:27:22 +02:00
bc288a2161 feature: add a link to create a notification to the referrer 2022-05-27 23:24:54 +02:00
c41ee1d9de add pagination on notification list 2022-05-27 22:47:32 +02:00
3ceda28994 Merge branch 'issue604_activity_list_documents' into 'master'
Issue604 activity list documents

See merge request Chill-Projet/chill-bundles!436
2022-05-27 20:35:03 +00:00
5d13a587df fix cs 2022-05-27 22:34:13 +02:00
d49859e474 change order for title in stored object 2022-05-27 22:32:06 +02:00
c9ea9112f1 do not add private comment into generated documents 2022-05-27 22:24:25 +02:00
3274ecfaec Merge remote-tracking branch 'origin/master' into issue604_activity_list_documents 2022-05-27 22:03:41 +02:00
dba4cfbb2d Merge branch 'issue603_add_closing_motive_course' into 'master'
person: add closing motive to closed acc course

See merge request Chill-Projet/chill-bundles!435
2022-05-27 20:00:58 +00:00
e6da1be5f5 Merge remote-tracking branch 'origin/master' into issue603_add_closing_motive_course 2022-05-27 21:57:19 +02:00
cb1108a25e Merge branch 'issue586_filiations' into 'master'
household filiations issues

See merge request Chill-Projet/chill-bundles!433
2022-05-27 19:51:20 +00:00
3efb4a4a5e Merge remote-tracking branch 'origin/master' into issue586_filiations 2022-05-27 21:49:21 +02:00
9511d6eaee Merge branch 'issue601_admin_social_work_social_action' into 'master'
admin: repair social action edit

See merge request Chill-Projet/chill-bundles!434
2022-05-27 14:42:03 +00:00
d4aba04a52 do not show action when editing goals 2022-05-27 16:41:38 +02:00
71a92a8b6b Merge remote-tracking branch 'origin/master' into issue601_admin_social_work_social_action 2022-05-27 16:37:03 +02:00
2cabe80bf6 Merge branch 'issue577_user_admin' into 'master'
main admin

See merge request Chill-Projet/chill-bundles!432
2022-05-27 14:35:59 +00:00
9680f7c01e remove deprecated notation for getting entity 2022-05-27 16:34:30 +02:00
3c8b2207c4 add civility in user docgen normalizer 2022-05-27 16:34:14 +02:00
7278a5f3fa fix strict typing and do not show link to edit password in user list 2022-05-27 16:24:55 +02:00
566c1c5380 Merge remote-tracking branch 'origin/master' into issue577_user_admin 2022-05-27 16:05:49 +02:00
af7df7029b Merge branch 'issue578_display_userjob' into 'master'
Issue578 display userjob

See merge request Chill-Projet/chill-bundles!430
2022-05-27 14:04:09 +00:00
4d0717690b Merge remote-tracking branch 'origin/master' into issue578_display_userjob 2022-05-27 16:00:16 +02:00
96a0b76e85 Merge branch 'issue589_private_comments' into 'master'
Issue589 private comments

See merge request Chill-Projet/chill-bundles!418
2022-05-27 13:59:19 +00:00
f3800ff38f fix issue with null comment and set correct variable name in signature 2022-05-27 15:58:51 +02:00
5e5a855578 fix cs 2022-05-27 15:48:50 +02:00
54a3e2b2ef Merge remote-tracking branch 'origin/master' into issue589_private_comments 2022-05-27 15:47:25 +02:00
014c460eef improvements on private comments 2022-05-27 15:40:08 +02:00
01f1605cb8 change indent of js files 2022-05-27 14:30:05 +02:00
1c79e25579 first component for pushing calendar answer 2022-05-27 14:29:10 +02:00
nobohan
0a4ef3ad22 php code style + upd CHANGELOG 2022-05-27 09:39:36 +02:00
nobohan
dbdf435721 docstore: safer display of form.title 2022-05-27 09:39:13 +02:00
nobohan
cdbb70b9c5 activity: add title to generated document 2022-05-27 09:32:51 +02:00
7c0bdc5abe some data in msgraph synchro and answer on calendar invite 2022-05-26 19:25:59 +02:00
59a64e9a62 wip: continue sync to remote 2022-05-26 00:10:25 +02:00
782436ee2e send first calendar on ms graph 2022-05-25 21:32:00 +02:00
nobohan
60c163ae9d storedObject: add title in form twig and in activity show 2022-05-25 17:30:26 +02:00
nobohan
e8cf7ae8e1 stored object: add has_title option to form type of StoredObject 2022-05-25 17:14:21 +02:00
nobohan
dea554ced4 storedObject: add title field on StoredObject entity 2022-05-25 16:32:52 +02:00
nobohan
5948ac5b2a [main] add a 'read more...' on comment embeddable when overflown 2022-05-25 14:18:38 +02:00
nobohan
af898cbd12 person: add closing motive to closed acc course 2022-05-25 13:27:29 +02:00
nobohan
8863157fc9 upd CHANGELOG 2022-05-25 11:47:02 +02:00
nobohan
2ac78a12db admin: fix adding of evaluation to social action 2022-05-25 11:46:03 +02:00
nobohan
bc410b02e7 admin: do not use disabled for form widget with collections, see https://github.com/symfony/symfony/issues/18998 2022-05-25 11:45:25 +02:00
nobohan
5ebaeeb4ba php cs fix 2022-05-25 10:38:09 +02:00
nobohan
4402d52de7 upd CHANGELOG 2022-05-25 10:35:15 +02:00
nobohan
d6f1aa53dc [admin]: add select2 to Goal form type entity fields 2022-05-25 10:34:24 +02:00
f962b7543f fix relation inside calendar, bootstrap messenger for handling create and update calendar entity 2022-05-25 10:22:30 +02:00
nobohan
da2c88c026 [admin] show/hide the user permissions group depending on config 2022-05-25 10:12:07 +02:00
b22f361368 fix cs 2022-05-24 23:04:24 +02:00
5ea12a581b calendar app: fix concerned groups 2022-05-24 22:56:08 +02:00
eb8b8c6939 calendar app: set mainUser and options for form 2022-05-24 22:45:43 +02:00
352b5b41b0 reformat to indentation 2 2022-05-24 16:22:05 +02:00
17778ab346 proxy: do not show calendar events when they are present in database 2022-05-23 23:34:33 +02:00
9dba558bef remove unused methods 2022-05-23 22:50:48 +02:00
00e87f8c75 set mainUser event if not set before 2022-05-23 22:50:33 +02:00
a5998ce99d handle moving an event 2022-05-23 22:43:19 +02:00
d8e7a7f1af allow to select a date on a calendar 2022-05-23 22:34:11 +02:00
d32a69a657 prevent loading users calendar multiple times when adding multiple users 2022-05-23 18:27:05 +02:00
00ef58301e remove logs 2022-05-23 17:59:56 +02:00
3fbdcdc431 calendar app: change mainUser if mainUser is selected 2022-05-23 17:59:21 +02:00
7dcd5be735 fixes for editing calendar 2022-05-23 17:30:40 +02:00
a025883a5d create event by selecting a calendar range 2022-05-23 16:48:17 +02:00
38c7c8de60 remove log messages 2022-05-23 15:07:58 +02:00
f825c69ce5 fetch remote calendar and show on FullCalendar frame 2022-05-23 15:00:32 +02:00
e2052fe71d set indent for js on two spaces [ci-skip] 2022-05-20 20:49:20 +02:00
a349089f3d change text color and remove unused consts 2022-05-20 20:44:55 +02:00
461fc1c41f add toggle button to show/add remote and ranges for each user in calendar 2022-05-20 20:40:24 +02:00
2b770036a5 fix behaviour of CalendarType in Controller and add field users to CalendarType 2022-05-20 19:44:28 +02:00
67fad5d764 create generic data transformer with get an object by id, and add test
for CalendarType
2022-05-20 19:26:21 +02:00
b6e0379583 fix cs and add EntityToIdTransformer 2022-05-20 15:52:13 +02:00
dba0e84781 calendar app: fix list for showing users and their colors (not in rgith place in page) 2022-05-18 13:33:56 +02:00
nobohan
a4210dd2c7 [main] allow hide permissions group list menu 2022-05-18 09:30:47 +02:00
nobohan
d8db8c0f8e upd CHANGELOG 2022-05-17 17:46:01 +02:00
b89edc29af calendar app: do not store events twice in vuex 2022-05-17 17:31:17 +02:00
nobohan
b13ac3a919 household filiations: fetch person info when unfolding person node 2022-05-17 17:24:17 +02:00
b50c51bc2a calendar items wit round-robin color 2022-05-17 17:16:48 +02:00
f68c69d443 refactor to use store for storing events 2022-05-17 16:57:31 +02:00
682dc2174e some style changes 2022-05-17 16:26:21 +02:00
c0f9bf35ac fix toggle to show or hide appointments 2022-05-17 16:05:00 +02:00
0c61edd0d6 everything changed to use store for faster re-render of calendar 2022-05-17 15:49:50 +02:00
9ceb66e2da refactor CalendarRange repository and available range action 2022-05-17 12:26:34 +02:00
8b1271a466 use groups annotation with Serializer prefix and serialize mainUser 2022-05-17 12:14:37 +02:00
d921f6c9e5 add true iso8601 format to date normalizer 2022-05-17 12:14:03 +02:00
85f00fdb28 refactor store in calendar 2022-05-16 17:20:15 +02:00
354c37ade2 fix issue when loading category 2022-05-16 15:33:02 +02:00
6144f2439a wip store mainUser in both store and input data with event 2022-05-16 15:30:35 +02:00
1eee8c6c49 fix issue when loading category 2022-05-16 15:28:05 +02:00
nobohan
cecfa1a18a main: allow creation of user without password 2022-05-16 14:07:34 +02:00
nobohan
f77031630f [main] allow hide change user password menu 2022-05-16 13:52:55 +02:00
a4caf733f1 fix error in commit 2022-05-16 13:12:40 +02:00
nobohan
8eef073988 [main] filter user jobs by active jobs 2022-05-16 11:49:36 +02:00
nobohan
380c55698c main: add civility to User 2022-05-16 11:28:37 +02:00
9dd463882c fix dfault in db for user::attributes 2022-05-13 17:23:10 +02:00
6edc9b25db Merge branch 'issue596_admin_user' into 'master'
Admin interface

See merge request Chill-Projet/chill-bundles!429
2022-05-13 14:13:09 +00:00
bb18082c3a fix type hinting 2022-05-13 16:07:33 +02:00
89a700ff61 fix cs 2022-05-13 16:05:38 +02:00
2a5bb28210 fix typo in tests 2022-05-13 16:05:08 +02:00
aec01df202 admin users: filter by name or email 2022-05-13 16:00:34 +02:00
a9df9f4880 add ordering on some social work + minor improves 2022-05-13 15:36:20 +02:00
b26fcc4566 Merge remote-tracking branch 'origin/master' into issue596_admin_user 2022-05-13 15:08:49 +02:00
9970212075 Merge branch 'issue576_address_show_more_if_no_address' into 'master'
addAddress: can add extra info even if noAddress

See merge request Chill-Projet/chill-bundles!423
2022-05-13 13:06:51 +00:00
fd935795e5 Merge remote-tracking branch 'origin/master' into issue576_address_show_more_if_no_address 2022-05-13 15:06:11 +02:00
52dd08e088 add default attributes for user 2022-05-13 14:51:02 +02:00
4be3efc619 work on create calendar 2022-05-13 13:49:24 +02:00
7859439f0b fix remote calendar compiler to allow to compile kernel without any configuration 2022-05-12 13:53:20 +02:00
c60a54eb39 WIP: create and edit calendar 2022-05-12 12:50:57 +02:00
f4b1a25a67 quick fixes to make calendar app work 2022-05-12 12:50:55 +02:00
0ec0708807 add voter for calendar 2022-05-12 12:49:32 +02:00
d150a8251b calendar range: remove on remote after removal in the database 2022-05-12 12:49:32 +02:00
dd13e631ac calendar range: update on remote after an unpdate 2022-05-12 12:49:32 +02:00
c892f7de7b prevent loop when posting calendarrange to remote and updating remoteId 2022-05-12 12:49:32 +02:00
e895da31d7 wip: synchro of calendar range 2022-05-12 12:49:32 +02:00
ba8a2327be fallback on schedule items when no access to calendar 2022-05-12 12:49:32 +02:00
38d828cf36 refactor access to calendar and use real userid 2022-05-12 12:49:32 +02:00
ee4a6e08fb refactor command to acquire admin consent 2022-05-12 12:49:32 +02:00
d570145385 refactor and rename classes 2022-05-12 12:49:32 +02:00
8abce5ab85 fix cs + read remote calendar based on user access 2022-05-12 12:49:32 +02:00
811798e23f wip: synchro 2022-05-12 12:49:32 +02:00
9935af0497 msgraph: add metadata to users to connect with default calendar 2022-05-12 12:49:32 +02:00
5331f1becc [wip] first impl for getting authorization for admin 2022-05-12 12:49:32 +02:00
a7ec843509 remote calendar: authenticate to ms graph api 2022-05-12 12:49:32 +02:00
0212193940 add null remote connector and basic interface 2022-05-12 12:49:32 +02:00
aecdfa6b12 reactive my calendar on new route 2022-05-12 12:49:32 +02:00
88784b7f7e copy ranges from one day to another fixed 2022-05-12 12:23:39 +02:00
c339f7a828 fix merge conflict 2022-05-11 21:31:08 +02:00
5ceddc747d start copy dates 2022-05-11 21:27:47 +02:00
3fb3df9db1 remove not necessary debug log 2022-05-11 19:40:28 +02:00
b98f4e2d76 fix construction of BadRequestHttpException 2022-05-11 19:39:36 +02:00
58fce9999d OnTheFly: do not show 'create adress and household' on edit action 2022-05-11 19:29:12 +02:00
49b1ca13f2 OnTheFly: fix error when updating person without changing civility 2022-05-11 19:25:07 +02:00
nobohan
6481f6a4c1 quick fix: safer way to add civility to body before PATCHing (AddPerson) 2022-05-11 17:04:17 +02:00
f8a9cafacb add today button again 2022-05-11 15:15:13 +02:00
ce78177ab7 only fetch data for view and adapt all callbacks for header buttons 2022-05-11 15:15:13 +02:00
7c693b7495 change height of calendar for better overview 2022-05-11 15:15:13 +02:00
6631e77df5 more changes to save modified, deleted new plages immediately 2022-05-11 15:15:13 +02:00
c77af0bc4a start refactoring 2022-05-11 15:15:13 +02:00
e28d17a131 ranges are immediately deleted as well as saved (needs refactoring) 2022-05-11 15:15:13 +02:00
2b1c3d1aff comment out console logs 2022-05-11 15:15:13 +02:00
f3444b6a58 change ranges to 15min instead of 30 + save new range immediately 2022-05-11 15:15:13 +02:00
nobohan
05088b5964 upd CHANGELOG 2022-05-11 12:14:46 +02:00
nobohan
f44b9ca05b admin: fix error when creating document category 2022-05-11 12:03:38 +02:00
nobohan
fa458c54ec admin: adapt social work form type and templates 2022-05-11 11:50:17 +02:00
nobohan
629dbb9137 admin: missing translations and css class 2022-05-11 11:30:08 +02:00
nobohan
97fd9c557c admin: tentative to add filterOrder (cleaning) 2022-05-11 10:06:44 +02:00
nobohan
f449dcbda1 admin: refine social work admin form 2022-05-10 18:06:29 +02:00
nobohan
b7ed658f96 admin: fix new document category 2022-05-10 17:01:09 +02:00
nobohan
f4652adbc2 admin: add fa icons to menu section title 2022-05-10 15:21:29 +02:00
nobohan
fde1d563c2 admin custom fields integration 2022-05-10 14:36:10 +02:00
nobohan
cb1bbe940f admin: docgen admin 2022-05-10 13:55:33 +02:00
nobohan
be27df1fd5 admin: remove obsolet header => true tag + php code fix 2022-05-10 11:46:17 +02:00
nobohan
0e8b73638f admin for aside activity 2022-05-10 10:40:06 +02:00
nobohan
c9b3bab508 admin sections for main bundle 2022-05-10 10:14:30 +02:00
nobohan
0f735c5749 admin sections for person bundle 2022-05-10 08:44:29 +02:00
901b496030 quick fixes to make calendar app work 2022-05-09 18:01:09 +02:00
20e1feebf4 add voter for calendar 2022-05-09 18:00:54 +02:00
nobohan
1a764025e1 admin: admin section for thirdparty 2022-05-09 17:14:25 +02:00
nobohan
1c04a873c0 admin: admin section for docstore 2022-05-09 17:07:36 +02:00
nobohan
3f399296c8 admin: admin section for calendar 2022-05-09 16:53:22 +02:00
d1f87718d6 Merge remote-tracking branch 'origin/master' into calendar/finalization 2022-05-09 16:51:42 +02:00
nobohan
fd67f327ae admin menu: simplify header style 2022-05-09 16:30:20 +02:00
nobohan
0f319a1003 admin: reorganising activity menu and submenus 2022-05-09 16:22:17 +02:00
nobohan
63bfd25acb admin: homepage + style menu 2022-05-09 15:14:37 +02:00
cebdfdaa30 start refactoring 2022-05-06 17:38:08 +02:00
6453de32ec fix typo 2022-05-06 17:29:03 +02:00
3a115744fe add index to search postal code by reference 2022-05-06 17:14:21 +02:00
nobohan
24794c1285 admin: document category menu 2022-05-06 16:28:37 +02:00
5a1a33b6a4 ranges are immediately deleted as well as saved (needs refactoring) 2022-05-06 16:25:03 +02:00
28c0b8994b comment out console logs 2022-05-06 15:55:05 +02:00
9c070cd8ae change ranges to 15min instead of 30 + save new range immediately 2022-05-06 15:54:35 +02:00
nobohan
7cefce8305 admin: add ThirdParty admin 2022-05-06 15:51:29 +02:00
66c7504b22 Merge branch 'issue520_reference_address_update' into 'master'
Add new fields to AddressReference for update procedure

See merge request Chill-Projet/chill-bundles!395
2022-05-06 13:32:29 +00:00
nobohan
a4f2d47c46 admin: add CancelReason admin 2022-05-06 15:25:49 +02:00
31d076d49b fix search on address: do not take deleted one into account 2022-05-06 15:22:10 +02:00
189974d5e4 Merge remote-tracking branch 'origin/master' into issue520_reference_address_update 2022-05-06 14:47:15 +02:00
f55c06d5c5 Merge branch 'issue557_address_civility_in_form_person' into 'master'
Issue557 address and civility in form person

See merge request Chill-Projet/chill-bundles!410
2022-05-06 11:01:20 +00:00
6c246a0d38 allow to edit civility in onTheFly 2022-05-06 12:54:01 +02:00
6abbf9bf21 improves create a person with address
* validation: must have an address when 'create a form' is checked;
* minor improvements
2022-05-06 11:47:33 +02:00
64432bb08a Merge remote-tracking branch 'origin/master' into issue557_address_civility_in_form_person 2022-05-06 10:21:13 +02:00
nobohan
7907e4a050 admin: add household position and relation admin 2022-05-05 18:31:08 +02:00
nobohan
9ce7f10415 admin: add personresourcekind in the admin 2022-05-05 15:20:47 +02:00
nobohan
2fbdd169df admin: add AccompanyingPeriod Origin and closingMotive 2022-05-05 14:37:56 +02:00
nobohan
5daf09334b admin: admin section for social work related entities: SocialIssue, SocialAction, Goal, Result, Evaluation 2022-05-05 12:07:45 +02:00
nobohan
10aa727fb3 admin: reorganise person admin menu + fix marital status admin 2022-05-05 10:39:20 +02:00
nobohan
475e8adedc admin: merge admin user job 2022-05-05 10:20:04 +02:00
nobohan
54ced6ec3d admin: merge admin activity 2022-05-05 10:18:11 +02:00
nobohan
47f47ac017 admin: delete obsolet country controller 2022-05-05 10:11:12 +02:00
nobohan
ba495def7e admin: refactor templates and delete some show pages for Center, Scope, User, UserJob, PermissionsGroup 2022-05-05 09:47:17 +02:00
nobohan
b09d92eae8 admin: reorganise files according to conventions 2022-05-05 08:03:20 +02:00
nobohan
ab90f72c7e update conventions 2022-05-05 07:13:53 +02:00
nobohan
16d74eaa0c admin: reorganize twig templates and admin menu 2022-05-04 17:34:44 +02:00
10d0078716 add changelog 2022-05-04 15:16:13 +02:00
6567143ff5 update job if users assigns him/herself as referrer and job is not null 2022-05-04 15:14:17 +02:00
nobohan
e50e68a52b admin: add missing data_class option to form types 2022-05-04 14:09:10 +02:00
e19cac168b php csfixes 2022-05-04 13:00:46 +02:00
416a88b93d fix form and take null cases into account 2022-05-04 12:30:44 +02:00
784a725ce3 fix translation 2022-05-04 09:34:16 +02:00
2ef3a3362a merge master into branch 2022-05-04 09:31:22 +02:00
nobohan
3f256ad907 admin: update marital status 2022-05-03 19:03:58 +02:00
nobohan
76af733bc3 admin: add civility 2022-05-03 18:33:56 +02:00
nobohan
9808675455 upd CHANGELOG 2022-05-03 09:28:33 +02:00
nobohan
04f27cc555 admin: add menu for languages and countries section 2022-05-03 09:27:04 +02:00
a3c3834081 Merge branch 'issue534_bulk_reassign' into 'master'
Bulk reassign parcours

See merge request Chill-Projet/chill-bundles!398
2022-05-02 14:53:32 +00:00
nobohan
4c99abd6d3 Admin: Add country and languages to the admin 2022-05-02 16:51:41 +02:00
0e0e0799d1 translation added 2022-05-02 16:51:14 +02:00
02a8f5a863 Fix display privateComment in activity 2022-05-02 16:50:24 +02:00
ae624d25fc fix display of privateComment for action 2022-05-02 16:49:32 +02:00
14341b9768 fix cs 2022-05-02 16:44:26 +02:00
ee14cd268b add role to get acl on confidential periods 2022-05-02 16:44:02 +02:00
3122098447 remove privateCommentRender 2022-05-02 16:29:47 +02:00
065b10b877 fix somes validation and acompanying period voter 2022-05-02 16:22:25 +02:00
8113fddcb2 use pick dynamic user type for reassigning + layout stuffs 2022-05-02 15:37:23 +02:00
1b6e84262b add translation 2022-05-02 15:27:44 +02:00
acee0ade24 add merge method 2022-05-02 14:01:41 +02:00
c629dd79cb fix serialization - deserialization 2022-05-02 14:01:07 +02:00
0ec859e345 remove isset test on variable which always exists 2022-05-02 12:30:16 +02:00
eb2bc306f7 prevent duplicates in relationships data fixtures 2022-05-02 12:22:34 +02:00
nobohan
64d459466f activity admin: translations + remove label field for comment on admin activity type 2022-05-02 12:16:46 +02:00
372ec7c4b2 Merge remote-tracking branch 'origin/master' into issue534_bulk_reassign 2022-05-02 11:29:55 +02:00
0f6dc3d997 reactive my calendar on new route 2022-04-30 16:21:48 +02:00
f917be0958 type hinting param for psalm 2022-04-30 02:12:29 +02:00
6fd0ff7960 remove unusedfile 2022-04-30 02:12:15 +02:00
45d2e0c9cd Merge branch 'undeprecate/repository-by-fqdn-only' into 'master'
replace some entity shortcut by fqdn

See merge request Chill-Projet/chill-bundles!426
2022-04-30 00:07:49 +00:00
da3236425e rename namespace for family members bundle 2022-04-30 01:58:38 +02:00
79ac908631 remove a new set of unused files 2022-04-30 01:50:29 +02:00
8ba7a39335 fix conflicting doc between class Resource and resource 2022-04-30 01:46:14 +02:00
304c734f9b delete unused test fixtures app 2022-04-30 01:44:53 +02:00
dae383dbd9 fix some psalm errors 2022-04-30 01:34:23 +02:00
3f63bc803d desactivate test whilpage is not working 2022-04-30 01:03:35 +02:00
472bc3f35d add missing keys to blank docgen person normalization 2022-04-30 00:55:40 +02:00
27e74014ce replace fqdn in docstore bundle 2022-04-30 00:48:38 +02:00
f26d50a3a8 replace fqdn in customfields bundle 2022-04-30 00:46:48 +02:00
6da19b0135 replace fqdn in event bundle 2022-04-30 00:42:03 +02:00
d0cc0e775f replace fqdn in calendar bundle 2022-04-30 00:39:17 +02:00
4b9b27a8ef replace docrine shortcuts in activity bundle by fqdn 2022-04-30 00:37:26 +02:00
864e1eeabb replace more doctrine shortcuts by fqdn 2022-04-30 00:35:11 +02:00
a0392b9216 replace some entity shortcut by fqdn
* ChillPerson:Person
* ChillMain:Center
* ChillActivity:Activity
2022-04-30 00:20:18 +02:00
8ba51bafd0 fix loading report: use FQDN instead of entity shortcut 2022-04-30 00:06:58 +02:00
afdc32d416 fix loading report: use FQDN instead of entity shortcut 2022-04-30 00:00:52 +02:00
nobohan
de362dcad7 upd CHANGELOG 2022-04-29 22:04:36 +02:00
nobohan
2263e7be73 admin: order user job by id 2022-04-29 22:02:19 +02:00
nobohan
8d62ce46c6 admin: order user job type 2022-04-29 21:44:02 +02:00
nobohan
fabf23f1f0 admin: add custom template for userjob edit 2022-04-29 21:21:09 +02:00
nobohan
192ab02be2 upd CHANGELOG 2022-04-29 20:02:26 +02:00
nobohan
62d59e6037 address: show address extra info even if noAddress 2022-04-29 20:00:11 +02:00
nobohan
83a888a32d addAddress: can add extra info even if noAddress 2022-04-29 19:44:06 +02:00
e1fe2a396f Merge branch 'issue582_docgen_person' into 'master'
[person] more fields to PersonDocGenNormalizer

See merge request Chill-Projet/chill-bundles!422
2022-04-29 15:12:50 +00:00
99413cf328 fix cs 2022-04-29 17:04:55 +02:00
fedcf7272c Merge remote-tracking branch 'origin/master' into issue582_docgen_person 2022-04-29 16:59:19 +02:00
df4abd6661 Merge branch 'issue569_display_time' into 'master'
Display time for evaluation documents

See merge request Chill-Projet/chill-bundles!421
2022-04-29 14:56:37 +00:00
ad96319d97 use traits to handle createdAt/updatedAt and by on AccompanyingCourseEvaluationDocument 2022-04-29 16:53:17 +02:00
fcbf62f613 fix cs 2022-04-29 16:41:13 +02:00
cc139782b1 Merge remote-tracking branch 'origin/master' into issue569_display_time 2022-04-29 16:28:29 +02:00
770010ceb8 Add command to remove old draft accompanying periods 2022-04-29 15:51:54 +02:00
1e06926f6d Load relationships without gender in french fixtures 2022-04-29 14:11:32 +02:00
ed35822eb5 changelog: release 2022-04-29 14:10:41 +02:00
nobohan
671950708c [person] prevent circular references in PersonDocGenNormalizer 2022-04-29 10:54:56 +02:00
7a96671f35 Merge branch 'issue593_bug_addAddress' into 'master'
address: fix bug when editing address: update localisation and...

See merge request Chill-Projet/chill-bundles!419
2022-04-28 16:05:01 +00:00
6daee268bf Merge remote-tracking branch 'origin/master' into issue593_bug_addAddress 2022-04-28 17:46:42 +02:00
nobohan
4675525225 [person] add maritalStatusComment to PersonDocGenNormalizer 2022-04-28 17:34:53 +02:00
86a7bb5880 Merge branch 'issue566_commentaire_fonctionnalites' into 'master'
Issue566 commentaire fonctionnalites

See merge request Chill-Projet/chill-bundles!416
2022-04-28 15:33:06 +00:00
6eaa553d77 Merge remote-tracking branch 'origin/master' into issue566_commentaire_fonctionnalites 2022-04-28 17:13:54 +02:00
daa09e2df3 update changelog 2022-04-27 17:15:04 +02:00
09aa7ff631 change date to datetime for evaluation document 2022-04-27 17:13:38 +02:00
a28ac8f28c Merge branch 'issue561_avoid_search_address_with_undefined_city' into 'master'
avoid address reference search on undefined post code

See merge request Chill-Projet/chill-bundles!407
2022-04-27 13:30:34 +00:00
ea6a9b3e2d Merge remote-tracking branch 'origin/master' into issue561_avoid_search_address_with_undefined_city 2022-04-27 15:30:12 +02:00
a8527b6cbb Merge branch 'issue560_relationship_validation' into 'master'
person: add validation to relationship to avoid duplicate

See merge request Chill-Projet/chill-bundles!415
2022-04-27 13:28:21 +00:00
ad9ac8ec0a Merge remote-tracking branch 'origin/master' into issue560_relationship_validation 2022-04-27 15:00:02 +02:00
44f9601759 Merge branch 'fixes/fixes-phpstan-2022-04-27' into 'master'
Fixes/fixes phpstan 2022 04 27

See merge request Chill-Projet/chill-bundles!420
2022-04-27 12:53:31 +00:00
9244040d7b csfixes 2022-04-27 14:51:37 +02:00
467ae5f474 master merged into branch 2022-04-27 14:50:37 +02:00
aa356185a5 Merge remote-tracking branch 'origin/master' into issue561_avoid_search_address_with_undefined_city 2022-04-27 14:50:24 +02:00
9789c79402 use strict type comparison and replace use of BadRequestException by BadRequestHttpException 2022-04-27 14:46:43 +02:00
fa7850196f force using strict type on comparison 2022-04-27 14:46:08 +02:00
4794039250 declare properties used for cache 2022-04-27 14:45:42 +02:00
916e3ab02d ignore phpcs cache for phpstan 2022-04-27 14:31:59 +02:00
48daed26f9 replace BadRequestException by BadRequestHttpException 2022-04-27 14:31:39 +02:00
c56a125a78 privateComment for action (not working yet) 2022-04-27 11:52:01 +02:00
4dc56db018 show of activity adjusted for private comment 2022-04-27 11:51:32 +02:00
e878960da9 Private comment adjusted for rendez-vous 2022-04-27 11:51:18 +02:00
b2003c74a6 renderbox for private comments (not working yet) 2022-04-27 11:50:53 +02:00
27ce146aa0 Serializer made for privateComment 2022-04-27 11:50:32 +02:00
3ed2b36057 privateCommentType adjusted 2022-04-27 11:50:14 +02:00
e8dcb45abb remove dump 2022-04-27 11:49:31 +02:00
nobohan
6662e0fb5f upd CHANGELOG 2022-04-27 10:40:11 +02:00
nobohan
76549581e6 address: fix bug when editing address: update localisation and addressreferenceId + better update of the map in edition 2022-04-27 10:38:25 +02:00
f14c915502 Merge branch 'issue565_document_storedObject' into 'master'
storedObject: add validation in properties where it is used

See merge request Chill-Projet/chill-bundles!417
2022-04-27 07:01:06 +00:00
2e44926088 fix cs 2022-04-27 09:00:47 +02:00
fcec3af5a8 fix type for condition in ParticipationController 2022-04-27 08:45:22 +02:00
452c4b85c6 Merge remote-tracking branch 'origin/master' into issue565_document_storedObject 2022-04-27 08:43:35 +02:00
d5864027d6 Merge branch 'issue471_activity_socialissue-action' into 'master'
Activity: socialIssue and socialAction

See merge request Chill-Projet/chill-bundles!366
2022-04-26 19:22:54 +00:00
c2061110dd fix cs 2022-04-26 21:16:55 +02:00
b2fb86111d fix social action consistency 2022-04-26 21:12:31 +02:00
db6c4f15f8 Merge remote-tracking branch 'origin/master' into issue471_activity_socialissue-action 2022-04-26 20:29:07 +02:00
12231912d6 remove dead code 2022-04-26 20:27:24 +02:00
7b0c8d21ee sort properties alphabetically 2022-04-26 20:27:08 +02:00
37a198b860 PrivateCommentEmbeddable created and added to entities + datamapper 2022-04-26 20:21:33 +02:00
64b5de2c03 migrations deleted 2022-04-26 20:19:40 +02:00
f713b1ddc8 allow to edit encrypted documents 2022-04-26 17:46:25 +02:00
faf1559770 Merge branch 'master' into feat/add-document-encrypter-service 2022-04-26 14:52:13 +02:00
5a1ce399f6 fix creation of evaluation in js 2022-04-26 14:26:51 +02:00
505384c2a0 fix generation of document 2022-04-26 14:11:59 +02:00
a7654edefa add missing services 2022-04-26 14:11:28 +02:00
81689e3507 fix catching response 400 in relatorio driver 2022-04-26 14:11:04 +02:00
b891ba842d update changelog 2022-04-26 12:03:06 +02:00
3ceae0473d Merge remote-tracking branch 'origin/master' 2022-04-26 11:57:37 +02:00
8ba70b08c4 storedObject: remove traverse=true on assert valid 2022-04-26 09:54:49 +00:00
795a8e9daf Merge remote-tracking branch 'origin/master' 2022-04-26 11:54:01 +02:00
nobohan
3f47503528 storedObject: allow for null data in storedObject 2022-04-26 11:53:17 +02:00
Pol Dellaiera
81edaef062 Fix: Route name change. 2022-04-26 11:50:59 +02:00
Pol Dellaiera
dc48b4b9c7 Fix #581: Collabora / wopi: le bouton "imprimer" ne fonctionne pas. 2022-04-26 11:47:46 +02:00
2684345981 voter updates 2022-04-26 11:34:49 +02:00
51d1e5422b remove unnecessary code 2022-04-26 10:27:45 +02:00
064286aa2f private comment for action. still needs (de)normalization 2022-04-26 09:52:00 +02:00
e72a2004d7 Merge remote-tracking branch 'origin/master' into feat/add-document-encrypter-service 2022-04-26 09:37:30 +02:00
329fb05db0 Merge branch 'issue571_ordering_socialactions' into 'master'
Ordering social actions

See merge request Chill-Projet/chill-bundles!412
2022-04-25 20:14:59 +00:00
75250402c8 fix ordering of social actions 2022-04-25 22:14:36 +02:00
e5209ca6d9 do not make a loop to normalizer for a native php object 2022-04-25 22:14:23 +02:00
4512b94293 Merge remote-tracking branch 'origin/master' into issue571_ordering_socialactions 2022-04-25 21:35:16 +02:00
217f95472b Merge branch 'issue574_accordeon_parcours' into 'master'
Accordeon for closed parcours in person search results

See merge request Chill-Projet/chill-bundles!413
2022-04-25 19:34:49 +00:00
b7abf6b6bf Merge remote-tracking branch 'origin/master' into issue571_ordering_socialactions 2022-04-25 21:30:48 +02:00
c39fa1c49b remove legacy folded/unfolded style requirements for showing label on accordion 2022-04-25 21:27:56 +02:00
81c8d0ec77 move extension of accordion bootstrap to dedicated file 2022-04-25 21:23:41 +02:00
72012a70d9 button "closed" with same layout than in course header 2022-04-25 21:23:12 +02:00
916560c522 list with period: full sentences in translation component 2022-04-25 21:21:38 +02:00
57d6240cd1 Merge remote-tracking branch 'origin/master' into issue574_accordeon_parcours 2022-04-25 20:46:57 +02:00
2d460adc4d Merge branch 'issue568_agents_traitants' into 'master'
Display agents traitants

See merge request Chill-Projet/chill-bundles!411
2022-04-25 17:30:18 +00:00
d155c76013 Merge remote-tracking branch 'origin/master' into issue568_agents_traitants 2022-04-25 19:22:52 +02:00
529a9e5f58 fix notification counter on entity 2022-04-25 16:34:49 +02:00
2b837e0445 Merge branch 'issue545_datepicker' into 'master'
Fix datepicker

See merge request Chill-Projet/chill-bundles!405
2022-04-25 14:19:36 +00:00
4279acc2f8 convert date for new household 2022-04-25 16:11:42 +02:00
8fb3870ca0 remove dead code 2022-04-25 15:59:35 +02:00
171cc79a4a Add private comment to rendez-vous 2022-04-25 15:47:51 +02:00
79fa030323 add private comment input field to edit form 2022-04-25 15:47:13 +02:00
b36fd57e4f Add private comment options to activity type (visibility + label) 2022-04-25 15:46:55 +02:00
ff72b28861 Revert "private comment added to activity"
This reverts commit 1f2638626c.
2022-04-25 14:52:28 +02:00
1f2638626c private comment added to activity 2022-04-25 14:43:44 +02:00
nobohan
5ae6c6397c storedObject: add validation in properties where it is used 2022-04-25 13:52:49 +02:00
nobohan
f8410de569 person: correct relationship no duplicate validator 2022-04-25 11:34:17 +02:00
nobohan
3ad8223949 person: add unique index on table relationship to avoid duplicate fromperson_id/toperson_id pairs - typo cs fixer 2022-04-25 11:24:29 +02:00
nobohan
111906c2b9 person: add unique index on table relationship to avoid duplicate fromperson_id/toperson_id pairs 2022-04-25 11:23:28 +02:00
f5efb07e3c csfixes 2022-04-25 10:32:02 +02:00
79e46c7fe8 changelog updated 2022-04-25 10:30:44 +02:00
09503768f5 unpin comment is possible + delete and edit by all users that can edit period 2022-04-25 10:29:26 +02:00
41ff21ee23 update changelog with last release 2022-04-25 09:38:36 +02:00
30bb2e8393 Merge remote-tracking branch 'origin/master' into issue545_datepicker 2022-04-25 09:37:35 +02:00
ca166655da changelog updated 2022-04-22 18:05:47 +02:00
8f69f852b9 fix merge conflict 2022-04-22 18:04:20 +02:00
6747cad210 add amount of closed periods in accordeon message 2022-04-22 18:02:59 +02:00
0cbcd91c3f closed periods in accordeon + styling 2022-04-22 17:49:57 +02:00
nobohan
63dacb9ebb upd CHANGELOG 2022-04-22 17:24:29 +02:00
nobohan
5acd49357e person: add validation on relationship between person 2022-04-22 17:22:56 +02:00
d757e07dfc macro added + closed parcours displayed in accordeon 2022-04-22 17:22:46 +02:00
92c04c545f csfixes 2022-04-22 17:15:02 +02:00
f681e50167 role added to voter, but no check yet 2022-04-22 17:14:27 +02:00
9c428f989c final touches to controller 2022-04-22 17:14:11 +02:00
ef84576903 fix merge conflict 2022-04-22 16:51:21 +02:00
12df38d32d infinite loop bug on flush 2022-04-22 16:49:54 +02:00
084d77c8f4 new user is assigned, but crash on flush() 2022-04-22 16:49:54 +02:00
2646fa5b65 redo bulk assign 2022-04-22 16:49:54 +02:00
81bff2bb76 trying to get selected periods to be caught after form submit 2022-04-22 16:49:54 +02:00
291d340aa0 change view btn to edit btn 2022-04-22 16:49:54 +02:00
38a26f0bc1 beginning of ACL added 2022-04-22 16:49:54 +02:00
18025012a8 selected periods are not coming through in POST. Value not valid 2022-04-22 16:49:35 +02:00
805b9dc0df attempts to submit reassign form 2022-04-22 16:49:35 +02:00
9f064784f2 first commit 2022-04-22 16:49:35 +02:00
nobohan
07ea2b771c person: add validation to relationship to avoid duplicate 2022-04-22 16:37:21 +02:00
83dd8f810c Merge branch 'notification/deferring-sending-notification-to-terminate' into 'master'
Notification/deferring sending notification to terminate

See merge request Chill-Projet/chill-bundles!414
2022-04-22 10:48:18 +00:00
bd0b45b4dd fix cs 2022-04-22 12:47:50 +02:00
6dbe8068ae update changelog 2022-04-22 12:31:33 +02:00
19561c63cb do not persist if no notification is scheduled 2022-04-22 12:31:23 +02:00
354f130e9e use NotificationPersister into PersonMoveEventSubscriber 2022-04-22 12:12:50 +02:00
2d9af8f8c0 period: fix method hasPreviousUser and create method isChangedUser, and use it in Notification 2022-04-22 12:12:30 +02:00
f7d9551dc1 fix cs 2022-04-22 11:41:38 +02:00
abc3caee00 AccompanyingPeriod: fix method hasPreviousUser 2022-04-22 11:40:29 +02:00
33f93d484d deferring the sending of notification to kernel.terminate: prepare 2022-04-22 11:34:41 +02:00
8470604b8f macro added + closed parcours displayed in accordeon 2022-04-21 22:06:22 +02:00
b85e6aae3f csfixes 2022-04-21 21:22:18 +02:00
a4baf89a6a social actions ordered in store 2022-04-21 21:05:32 +02:00
0a05dcd753 add ordering to serialization 2022-04-21 20:49:54 +02:00
nobohan
3ed562e5d9 person: create a person with address and attribute the household to the create ousehold button 2022-04-21 18:23:47 +02:00
c6be7955fd remove save button datepicker parcours. set timeout 2022-04-21 13:59:45 +02:00
e246ccbcd9 [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error 2022-04-20 18:34:29 +02:00
44b537f05e [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older 2022-04-20 18:34:27 +02:00
0fd23c61a1 Wording changed when user is not associated to household 2022-04-20 17:19:20 +02:00
6cad0be181 Ignore thirdparty for socialaction created via activity 2022-04-20 17:08:27 +02:00
9a0eb1c74c Renaming of tabs and removal of social actions tab 2022-04-20 16:33:05 +02:00
a70c561596 Number of parcours of user displayed in blue pill 2022-04-20 16:23:08 +02:00
daa3eabd43 Change wording for save document button 2022-04-20 16:12:58 +02:00
b24de76d77 display agents traitants 2022-04-20 15:16:26 +02:00
92d394b669 changelog updated 2022-04-20 14:22:35 +02:00
c17d20f945 comment out success message parcours start date 2022-04-20 14:18:24 +02:00
be77c3729b take empty date strings into account 2022-04-20 14:09:28 +02:00
ad1e7b576c remove success toast for parcours startdate + take empty string values into account for action dates 2022-04-20 13:58:45 +02:00
bf0578b6d7 [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older 2022-04-20 13:49:47 +02:00
0ce23230da fix evaluation datepickers in edit 2022-04-20 13:32:51 +02:00
8b7404e531 Email on designation: allow raw characters
As the content-type of the email is text/plain, we should not escape
special character.

Add the raw filter on string which will be escaped by twig.
2022-04-20 13:05:11 +02:00
bc550ea42a updating openingdate parcours fixed 2022-04-20 12:14:19 +02:00
65e6471a02 fix datepicker for social action edit form.
still a problem with the display of already set evaluation dates... need to be transformed to correct format to display
2022-04-20 12:14:19 +02:00
de9d2aa885 fix datepicker for householdmember editor 2022-04-20 12:14:19 +02:00
66ab38c60f prefill startdate with now 2022-04-20 12:14:19 +02:00
8882c99f5a fix datepicker for social action 2022-04-20 12:14:19 +02:00
8512a5e1bc person list with period: use sameas twig operator instead of using '==' operator to introduce requestor 2022-04-20 11:24:20 +02:00
7f97215fe9 activity form: keep the same order for attendee field between edit and new form 2022-04-20 10:03:58 +02:00
6427fc64cd invert 'incoming' and 'receiving' 2022-04-20 10:00:48 +02:00
26d5bf03bd add order by on document list 2022-04-20 10:00:48 +02:00
nobohan
f2c60cfd20 php code style fix 2022-04-20 08:52:15 +02:00
nobohan
7a6aa6edcb upd CHANGELOG 2022-04-20 08:51:00 +02:00
nobohan
bad5506b98 person: create a person with address (and household without position (remove required position for household member) 2022-04-19 18:01:25 +02:00
nobohan
c214c2f4a4 household: safe display of household members without positions 2022-04-19 17:09:10 +02:00
Pol Dellaiera
7048f670ed Fix #552: Return AccessDeniedException when trying to access a document and user is not logged in. 2022-04-19 15:45:47 +02:00
c757fa068a Translations added for error message in parcours 2022-04-19 15:21:23 +02:00
ebc4ec0d7c updating openingdate parcours fixed 2022-04-19 15:09:25 +02:00
nobohan
4bc8da9655 person: create a person with address (php form) 2022-04-19 14:56:41 +02:00
69394df89b infinite loop bug on flush 2022-04-19 14:02:47 +02:00
nobohan
84038c0ff2 person: Add checkobox for adding address in AddPerson - css 2022-04-19 13:17:40 +02:00
nobohan
584111b5f7 person: Add checkobox for adding address in AddPerson 2022-04-19 11:39:08 +02:00
nobohan
355c5cf8fd person: add address when creating person in AddPerson: fix POSTing household 2022-04-19 09:54:42 +02:00
nobohan
57ed90a696 person: post an address when creating a person 2022-04-15 13:41:47 +02:00
nobohan
bea019e9bc household: API endpoint for posting a household 2022-04-15 12:23:16 +02:00
nobohan
ae45f5f40b person: add address when creating a person 2022-04-15 11:11:41 +02:00
nobohan
946ae31d11 upd CHANGELOG 2022-04-14 21:47:51 +02:00
nobohan
4009f3ffda php code fix 2022-04-14 21:47:38 +02:00
nobohan
7d3239d6d6 person: fix adding civility to a person with OnTheFly form 2022-04-14 21:37:16 +02:00
nobohan
7a2151f23a AddPerson: add civility when creating a person 2022-04-14 18:04:36 +02:00
nobohan
c1ec2933e5 person: create a new person: add a civility field 2022-04-14 17:08:44 +02:00
617473f6a5 notification - grant access by key - temporarily disable email verification due to character escaping in email 2022-04-14 01:36:01 +02:00
124a6a58fc fix cs 2022-04-14 01:13:16 +02:00
afa38e9dd5 addresses: add constraint in database to avoid error later 2022-04-14 01:11:39 +02:00
a52f29bb78 accompanyingWorkEditor: add label on form document title 2022-04-14 01:11:14 +02:00
b95ff337b6 add more time duration for aside activities 2022-04-14 00:41:15 +02:00
92a169be1e Merge branch 'issue541_change_moving_date' into 'master'
household address: add a form for editing the validFrom date

See merge request Chill-Projet/chill-bundles!402
2022-04-13 22:11:34 +00:00
e6d59bc837 fix cs 2022-04-14 00:11:15 +02:00
31731c6f44 Merge remote-tracking branch 'origin/master' into issue541_change_moving_date 2022-04-14 00:04:30 +02:00
86ec020f80 fixes on address valid from edit for household 2022-04-14 00:02:57 +02:00
07351e2946 Merge branch 'issue543_double_click_household' into 'master'
householdmemberseditor: fix composition type bug

See merge request Chill-Projet/chill-bundles!406
2022-04-13 21:37:41 +00:00
405694a0b4 Merge remote-tracking branch 'origin/master' into issue541_change_moving_date 2022-04-13 23:30:51 +02:00
bad39364c2 Merge remote-tracking branch 'origin/master' into issue543_double_click_household 2022-04-13 23:26:38 +02:00
c0b39e4e7c Merge branch 'notifications/allow-to-send-to-email' into 'master'
Notifications/allow to send to email

See merge request Chill-Projet/chill-bundles!409
2022-04-13 21:25:35 +00:00
f98b35f009 Merge remote-tracking branch 'origin/master' into issue543_double_click_household 2022-04-13 23:20:23 +02:00
8770188d54 update changelog 2022-04-13 23:18:50 +02:00
35c7d55b8c fix cs 2022-04-13 23:17:16 +02:00
2a53fb9341 show email adresses on notification list 2022-04-13 23:16:02 +02:00
e7f0cd50c9 controller to grant access to notification by access key 2022-04-13 23:05:38 +02:00
a41d6cf744 notification: send an email to addressesEmails 2022-04-13 22:50:32 +02:00
24d28b0a52 notification: alter form type to add and remove email addresses 2022-04-13 22:11:01 +02:00
4425f2ad49 fix type for Notification email addresses 2022-04-13 21:43:41 +02:00
a8db07a383 notification / add email: fix entity Notification 2022-04-13 21:33:18 +02:00
ef9fd80ad5 update schema to send to emails 2022-04-13 18:02:11 +02:00
e6169ddffa Merge branch 'docgen/improve-context-courses' into 'master'
docgen: some fixes and improvements

See merge request Chill-Projet/chill-bundles!408
2022-04-13 07:53:43 +00:00
ccf7c885bb fix normalization for phonenumber on person when phonenumber is null 2022-04-13 09:44:21 +02:00
01c571ab06 fix path to table 2022-04-11 21:04:36 +02:00
69b2dce7ee docgen/budget: add comment for each budget line (resource and charge)
The comments are cocatenated by lines of each type, and separated by a
`|`
2022-04-11 18:11:20 +02:00
910245f855 update changelog 2022-04-11 17:45:57 +02:00
7fbb3dfd07 docgen: add more persons choices in person1, person2 and mainPerson
Allow to pick amongst:

* requestor (if person)
* resources of course (if person)
* resources of person (if person)
2022-04-11 17:43:31 +02:00
9765bc5663 fix cs 2022-04-11 17:12:59 +02:00
bb65909bfa add docgen context for a list of activities in a course 2022-04-11 16:52:11 +02:00
03b0a8766e remove dumps 2022-04-08 19:12:11 +02:00
5eea202586 fix adding sibling action 2022-04-08 19:04:13 +02:00
a78c62789c if parent in collection replace with child, problem, sibling isn't added 2022-04-08 18:56:37 +02:00
68671e297c Merge branch 'issue471_activity_socialissue-action' of gitlab.com:Chill-Projet/chill-bundles into issue471_activity_socialissue-action 2022-04-08 13:24:49 +02:00
c3179da320 new user is assigned, but crash on flush() 2022-04-08 12:13:19 +02:00
2a32284471 redo bulk assign 2022-04-08 09:56:57 +02:00
4257a918f3 fix error when search pattern is empty 2022-04-08 00:11:08 +02:00
7ffb3dc74f task: fix route name 2022-04-07 23:49:32 +02:00
0f926e9dfe allow to display pinned comment in item of accompanying course list 2022-04-07 22:40:20 +02:00
fc55567a64 update changelog 2022-04-07 22:12:13 +02:00
009030b5fb notification list: move action buttons outside of the toggle 2022-04-07 21:59:02 +02:00
6e1cabc8fc fix detecting of non-read notification 2022-04-07 21:55:04 +02:00
572c602387 filter users which are disabled 2022-04-07 21:47:56 +02:00
26a4577420 order query for location and add pagination in list 2022-04-07 21:08:11 +02:00
nobohan
c0ee51068c avoid address reference search on undefined post code 2022-04-07 16:55:54 +02:00
f09870931c switch to using getDescendantsWithThis() 2022-04-07 16:11:00 +02:00
ea21f2d9c4 improvement, but still not correct 2022-04-07 16:11:00 +02:00
d81a41bb17 Test added for activity-social action and social issue 2022-04-07 16:11:00 +02:00
7851d9956e csfixes 2022-04-07 16:11:00 +02:00
f35479e4d2 fix logic in activity entity 2022-04-07 16:11:00 +02:00
432b105be5 update changelog 2022-04-07 16:11:00 +02:00
988b67bd4b logic added to only keep youngest descendant. works for issue, seems not to for action 2022-04-07 16:11:00 +02:00
f64409e5e6 allow every person which has part for a workflow to see the workflow page 2022-04-07 16:06:26 +02:00
a1baf99294 able to see the workflow if the evaluation document has been deleted 2022-04-07 15:54:53 +02:00
d9bb18e042 hardcode the list of supported mime types for edition with collabora 2022-04-07 15:37:17 +02:00
00a6ef0598 fix creating of accompanying period work 2022-04-07 11:05:34 +02:00
nobohan
c03e38f4ff upd CHANGELOG 2022-04-07 10:47:14 +02:00
nobohan
f9bcc5b1e9 householdmemberseditor: fix composition type bug 2022-04-07 10:45:46 +02:00
56340b44d5 trying to get selected periods to be caught after form submit 2022-04-07 10:24:14 +02:00
934a066910 remove error disappearing from phpstan 2022-04-06 22:40:09 +02:00
095afb90c7 AddPerson search: fix aborting query when the query is altered by user 2022-04-06 21:47:01 +02:00
645549ae34 effectively filter on all words in third party search 2022-04-06 21:45:49 +02:00
02b12c097d change view btn to edit btn 2022-04-06 16:53:26 +02:00
nobohan
d34462d849 php code fix 2022-04-06 15:34:11 +02:00
nobohan
c65a73604d upd CHANGELOG 2022-04-06 15:33:07 +02:00
nobohan
6a4edd000f household address: add max date for changing the validFrom date 2022-04-06 15:31:17 +02:00
nobohan
017b7bca87 address: handle cases when null street and streetnumber are given 2022-04-06 15:14:51 +02:00
612d053892 fix phpstan and phpcs 2022-04-06 13:59:05 +02:00
8edc68859e do not allow to freeze a document 2022-04-06 13:41:34 +02:00
a4afe73efe take into account system notification in counter and fix hardcoded user id 2022-04-06 13:35:24 +02:00
2b67f105f7 Merge branch 'issues521_531_540' into 'master'
issues graphiques 521 531 540

See merge request Chill-Projet/chill-bundles!399
2022-04-06 10:43:29 +00:00
95b114a144 do not show button to send notification on draft courses 2022-04-06 12:42:12 +02:00
5477a70c84 add ACL around creation of work in course 2022-04-06 12:41:50 +02:00
7d69ec6d6b Merge remote-tracking branch 'origin/master' into issues521_531_540 2022-04-06 12:29:11 +02:00
17594b58ab Merge branch 'issue548_notifs_buttons' into 'master'
notification toggle read: correct js syntax

See merge request Chill-Projet/chill-bundles!404
2022-04-06 10:24:27 +00:00
cddd3c20c8 Merge remote-tracking branch 'origin/master' into issue548_notifs_buttons 2022-04-06 12:16:23 +02:00
25a37974e5 Merge branch 'issues522_523' into 'master'
activity: add spacing between buttons + better alignment

See merge request Chill-Projet/chill-bundles!397
2022-04-06 10:08:59 +00:00
066afc07a8 update changelog 2022-04-06 12:08:44 +02:00
56c3f05ec9 Merge remote-tracking branch 'origin/master' into issues522_523 2022-04-06 12:04:54 +02:00
1907beaf6e Merge branch 'change_interlocuteurs_display' into 'master'
Change display of interlocuteurs (parcours)

See merge request Chill-Projet/chill-bundles!396
2022-04-06 10:01:26 +00:00
37c04d3f12 update changelog 2022-04-06 12:00:49 +02:00
a7fbce0add Merge remote-tracking branch 'origin/master' into change_interlocuteurs_display 2022-04-06 11:59:18 +02:00
e663bae5c4 fix datepicker for social action edit form.
still a problem with the display of already set evaluation dates... need to be transformed to correct format to display
2022-04-06 11:26:04 +02:00
ad6a68487c fix datepicker for householdmember editor 2022-04-06 11:24:01 +02:00
nobohan
88f377778c upd CHANGELOG 2022-04-06 09:28:57 +02:00
nobohan
d6deaeb324 notification unread: correct class 2022-04-06 09:26:14 +02:00
nobohan
f2744fba43 notification toggle read: correct js syntax 2022-04-05 22:28:35 +02:00
72a62a3a1b prefill startdate with now 2022-04-05 16:03:07 +02:00
bcde4497cc fix datepicker for social action 2022-04-05 15:56:02 +02:00
nobohan
c3731ae2db address reference: add filtering by deletedAt 2022-04-05 10:21:14 +02:00
nobohan
ddce7603ad household address: add condition for minimum value for vaildFrom date 2022-04-02 10:53:54 +02:00
nobohan
3a3eb68288 household address: add a form for editing the validFrom date 2022-04-01 16:17:04 +02:00
a4ece21f2b in household, force validTo of address to be NULL 2022-04-01 15:06:00 +02:00
c7762dd6d2 fix trimming for email in person / thirdparty 2022-03-31 12:51:53 +02:00
f47fb17b8d fix denormalization of invalid dates 2022-03-31 12:48:27 +02:00
51dc255be5 fix phonenumber denormalization when null value is given 2022-03-31 12:48:27 +02:00
6ddbb79157 format phonenumber in third party normalization 2022-03-31 12:48:27 +02:00
dcddf4b3f1 trim email 2022-03-31 10:24:58 +02:00
e027958c63 Merge branch 'fix-tests-2022-03-30' into 'master'
Fix tests 2022 03 30

See merge request Chill-Projet/chill-bundles!400
2022-03-30 20:20:03 +00:00
034a416612 fix test which fails randomly 2022-03-30 22:02:45 +02:00
63cdc97c47 fix phpstan errors on ThirdPartyRender 2022-03-30 21:52:43 +02:00
ae10a8bd1c fix post action on api controller: too many argument 2022-03-30 21:51:39 +02:00
eb2bad0f47 docgen normalization budget: fix budget when person is null 2022-03-30 21:35:02 +02:00
bc43d8bae5 force type on Person entity 2022-03-30 21:01:17 +02:00
83dfe530e9 household editor: handle case when the person is repositionned in the
same household, and the person is already in a position "without
household"
2022-03-30 17:00:07 +02:00
c477996acf fix cs 2022-03-30 16:43:16 +02:00
36b1f05524 do not launch PersonMoveEvent when moving to the same household 2022-03-30 16:42:57 +02:00
dae9d48574 really do not show thirdparty which are not active 2022-03-30 15:26:45 +02:00
9812710cd0 do not show duplicate menu entry temporarily 2022-03-30 15:08:34 +02:00
3b083c31e7 add tests for moving to not share position in another household 2022-03-30 12:57:16 +02:00
1b567327b7 fix normalisation for phonenumber in person entity 2022-03-30 12:37:18 +02:00
nobohan
1d6d8dc002 accompanyingcourse work: add ACL rights for create and edit buttons 2022-03-30 12:01:35 +02:00
38e92ee981 fix cs 2022-03-30 11:58:17 +02:00
e433b6a42b Do not dispatch PersonMoveEvent if moving to a position not sharing
household
2022-03-30 11:57:43 +02:00
df24d085ca Household members editor: leave household when repositionning to same
household, not sharing household
2022-03-30 11:53:06 +02:00
nobohan
f29ead4961 accompanying course: fix display bug in accompanying course resume 2022-03-30 11:26:19 +02:00
nobohan
b361ab2d74 workflow: add div for delete workflow form 2022-03-30 11:10:23 +02:00
de4f65fede change strategy for searching: use the AND between words, instead of OR 2022-03-29 12:42:17 +02:00
ed1ddbe53d beginning of ACL added 2022-03-28 17:06:29 +02:00
818370f037 selected periods are not coming through in POST. Value not valid 2022-03-28 16:46:39 +02:00
nobohan
10fcd4f732 accompanying course: evaluation documents: align buttons 2022-03-28 15:12:16 +02:00
nobohan
bc8709f9a1 activity: add spacing between buttons + better alignment 2022-03-28 14:30:49 +02:00
3d6745e535 display of interlocuteurs changed to flex-table to prevent cut-off of information 2022-03-28 12:00:13 +02:00
961c0a867c workflow notification display block for social action item 2022-03-28 11:42:24 +02:00
f5327fe8ab trailing guillemet removed 2022-03-28 11:25:07 +02:00
6f270188f7 buttons made sticky for parcours documents 2022-03-28 11:22:42 +02:00
5895334244 update changelog 2022-03-25 17:23:14 +01:00
1812592d43 fix create person on the fly 2022-03-25 17:22:10 +01:00
3babbe5e84 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-25 17:06:06 +01:00
632ea710c8 budget menu entry placed in different order 2022-03-25 17:05:41 +01:00
7963076505 attempts to submit reassign form 2022-03-25 16:59:05 +01:00
bdcb135adb re-introduce link to create user 2022-03-25 15:48:30 +01:00
nobohan
58f1984c77 Add new fields to AddressReference for update procedure 2022-03-25 15:14:13 +01:00
3b93d2c0a5 Merge remote-tracking branch 'origin/master' 2022-03-25 14:28:18 +01:00
f24b2931dd Merge branch 'issue585_canEditWopiDocument' into 'master'
Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported

See merge request Chill-Projet/chill-bundles!394
2022-03-25 13:04:24 +00:00
c1e972963f invert condition with key infos 2022-03-25 14:03:43 +01:00
ce2e05464f Merge remote-tracking branch 'origin/master' into issue585_canEditWopiDocument 2022-03-25 13:48:46 +01:00
dbe0c9097f Merge branch 'issue533_notification_for_workflow_bug' into 'master'
correct notification for workflow display bug

See merge request Chill-Projet/chill-bundles!393
2022-03-25 12:39:46 +00:00
e68c12e0e7 fix cs 2022-03-25 13:39:27 +01:00
c99a967fb9 slightly improvve the render box for workflow in notification 2022-03-25 13:35:52 +01:00
d11eebefae fix some authorization check in menu 2022-03-25 13:11:03 +01:00
b423821ae9 check existence of form before using it 2022-03-25 13:10:40 +01:00
f2ae183682 first commit 2022-03-25 13:01:33 +01:00
7a0234adb2 Merge remote-tracking branch 'origin/master' into issue533_notification_for_workflow_bug 2022-03-25 12:45:29 +01:00
nobohan
f36fc0ba60 upd CHANGELOG 2022-03-25 11:46:57 +01:00
nobohan
cff126953e Accompanying course evaluation documents: disable the WOPI edit link if no keyInfos 2022-03-25 11:45:13 +01:00
nobohan
89064f55a1 Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported 2022-03-25 11:36:51 +01:00
f69dab5ca5 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-25 11:09:23 +01:00
259cdd34c4 fix validation person resource 2022-03-25 11:07:12 +01:00
nobohan
9dca42e242 correct notification for workflow display bug 2022-03-25 10:44:15 +01:00
nobohan
248e4e93ed quick fix: change style of input field for document title in AccompanyingCourseWork documents 2022-03-25 10:16:48 +01:00
nobohan
db2bf1e98e quick fix: change style of input field for document title in AccompanyingCourseWork documents 2022-03-25 10:15:33 +01:00
ea66db07a4 fix cs 2022-03-24 22:10:07 +01:00
5f35a42fe3 allow phonumber helper to format null value 2022-03-24 22:09:12 +01:00
e82b2bd10a fix personcontent / content switch in some pages 2022-03-24 20:54:34 +01:00
ad4f400262 Merge remote-tracking branch 'origin/master' 2022-03-24 20:53:40 +01:00
866bcec114 Merge remote-tracking branch 'origin/master' 2022-03-24 20:53:10 +01:00
367188b03d Merge branch 'issue491_thirdparty_edit_modal' into 'master'
Thirdparty: fix edit modal + add firstname

See merge request Chill-Projet/chill-bundles!379
2022-03-24 18:33:31 +00:00
dd4d463c42 fix bug when setting civility to null in on the fly 2022-03-24 19:32:53 +01:00
1031f0d40e thirdparty: firstname after name in form 2022-03-24 19:18:48 +01:00
5d7943f871 index firstname in database 2022-03-24 19:06:53 +01:00
d0c34c0206 set empty thridparty.firstname to a string 2022-03-24 18:51:29 +01:00
726b8f0e3c Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal 2022-03-24 18:44:42 +01:00
5d4149db35 Merge remote-tracking branch 'origin/issue491_thirdparty_edit_modal' into issue491_thirdparty_edit_modal 2022-03-24 18:41:22 +01:00
f04474c82f Merge branch 'issue494_activity_field_visibility' into 'master'
Activity display fields based on ActivityType + show error message

See merge request Chill-Projet/chill-bundles!376
2022-03-24 17:29:38 +00:00
156398caba Merge remote-tracking branch 'origin/master' into issue494_activity_field_visibility 2022-03-24 18:25:03 +01:00
ae3091f620 Merge branch 'issue469_budget' into 'master'
Adapt BudgetBundle to Vendee

See merge request Chill-Projet/chill-bundles!357
2022-03-24 17:23:26 +00:00
84f9fdba28 add budget to docgen 2022-03-24 18:22:49 +01:00
531f940b65 add a debug feature in docgenerator template controller 2022-03-24 18:22:36 +01:00
d907f3f11b desactivate calculator in current budget for household 2022-03-24 16:29:13 +01:00
02409d4992 Merge remote-tracking branch 'origin/master' into issue469_budget 2022-03-24 16:22:52 +01:00
771b6a59a5 Merge branch 'issue519_filiation_create_person' into 'master'
Add person to filiation

See merge request Chill-Projet/chill-bundles!392
2022-03-24 14:08:54 +00:00
2e336ac874 update case when the person was already on the graph 2022-03-24 15:07:46 +01:00
a61c9553e1 csfixes 2022-03-24 11:42:16 +01:00
3243a7e0a2 fix merge conflict in changelog 2022-03-24 11:41:02 +01:00
06cc84a21f conditional statements to allow for personne moral creation and edit 2022-03-24 11:40:06 +01:00
688914906d merge firstname branch 2022-03-24 11:13:07 +01:00
f9d87876f2 Merge remote-tracking branch 'origin/master' into issue519_filiation_create_person 2022-03-24 11:12:56 +01:00
7df70cab98 allow a user/referrer to see his own courses, even if the scope is not his own 2022-03-24 10:58:43 +01:00
287ea80be9 Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal 2022-03-24 10:56:51 +01:00
dc3d88a1ef final fix to make current civility and profession values visible in edit form 2022-03-24 10:56:28 +01:00
cba6394823 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-24 09:10:53 +01:00
eea0711a04 autowire sectionmenu service 2022-03-24 09:10:32 +01:00
949bdfd993 add missing property (phpstanerror) 2022-03-23 22:59:45 +01:00
3067da5d24 fix tests for removing temporarily resources on person 2022-03-23 22:56:45 +01:00
546c925224 Enforce a limit for search results when searching through api 2022-03-23 22:51:45 +01:00
d7b5944c5f temporarily desactivate resources for docgen 2022-03-23 22:51:45 +01:00
aa234e0749 activity annexe button made sticky 2022-03-23 17:33:23 +01:00
506118b3f1 edit and create of thirdparty pers physique is possible, but current civility and profession don't display yet in edit form 2022-03-23 16:10:02 +01:00
52a78902f7 Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal 2022-03-23 15:53:55 +01:00
e89489fde9 update changelog 2022-03-23 15:04:52 +01:00
a7be9c0a83 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-23 14:59:44 +01:00
6331d8fd3e validation fix for person ressource 2022-03-23 14:59:30 +01:00
nobohan
eb6790b17d quick fix: missing translation 2022-03-23 14:58:09 +01:00
61f010f5ad Merge branch 'issue507_conditional_menu_entries' into 'master'
Options added for section menu entries

See merge request Chill-Projet/chill-bundles!391
2022-03-23 13:23:32 +00:00
30fd36b741 forgotten translation added 2022-03-23 14:16:38 +01:00
91aacb91cc merge master into branch 2022-03-23 14:07:26 +01:00
73c17febd9 remove inter database reference 2022-03-23 00:05:36 +01:00
99dc9dd4a8 handle case when user is null in comment embeddable 2022-03-22 23:36:02 +01:00
c5ffca22ff ease docgen normlisation for resources 2022-03-22 22:37:19 +01:00
89e7eb85ff fix cs 2022-03-22 22:36:01 +01:00
98d5de29b0 translations added 2022-03-22 16:09:03 +01:00
4939c8c8e4 changelog updated 2022-03-22 15:50:31 +01:00
8d5c66dc40 person can be added to filiation graph and relationship created 2022-03-22 15:49:25 +01:00
02571bf727 switch to using getDescendantsWithThis() 2022-03-22 13:45:20 +01:00
2c6cbeb8ca minor fix in vue component to update thirdparty firstname 2022-03-22 11:30:33 +01:00
13a7d791a1 fixes to allow for firstname value of null 2022-03-22 11:07:26 +01:00
ae555fed00 migration executed down and new one created to allow firstname nullable 2022-03-22 11:07:05 +01:00
6d65009987 Merge remote-tracking branch 'origin/master' 2022-03-21 18:05:38 +01:00
386e88387d Merge branch 'issue560_ACCent_parcours_household' into 'master'
Create parcours from within household context

See merge request Chill-Projet/chill-bundles!390
2022-03-21 17:05:00 +00:00
22473d6547 Merge remote-tracking branch 'origin/master' into issue560_ACCent_parcours_household 2022-03-21 18:01:26 +01:00
e7b4f1a54f Merge branch 'issues546_553_554_documents_acc_period_activity' into 'master'
issues553_554_documents_activity

See merge request Chill-Projet/chill-bundles!389
2022-03-21 17:00:21 +00:00
1f6565d2ef add return path when creating an activity 2022-03-21 17:59:41 +01:00
e838a82556 Merge remote-tracking branch 'origin/master' into issues546_553_554_documents_acc_period_activity 2022-03-21 17:35:10 +01:00
eebca7b0f1 Merge branch 'issue517_extend_document_to_person_vendee' into 'master'
commentembeddable: add a condition for the early return in normalisation

See merge request Chill-Projet/chill-bundles!388
2022-03-21 16:33:23 +00:00
169d4dc41c finalize normalization on ressources 2022-03-21 17:33:01 +01:00
9e063180bf forgotten translation 2022-03-21 16:37:14 +01:00
5b0b15f395 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-21 16:23:16 +01:00
736d43e756 translation fixed 2022-03-21 16:23:06 +01:00
b4add2de95 Merge remote-tracking branch 'origin/master' into issue517_extend_document_to_person_vendee 2022-03-21 16:20:03 +01:00
37a8928e41 remove dump 2022-03-21 16:19:27 +01:00
0a0243eb85 Merge branch 'issue511_document_evaluations' into 'master'
AccompanyingCourseWorkEdit: replace document by a new one, fix deleting

See merge request Chill-Projet/chill-bundles!384
2022-03-21 15:17:34 +00:00
a6c7c1d997 fix tests for user 2022-03-21 16:17:19 +01:00
c7caa2ba76 addpersons component, doesnt hear emitted event... 2022-03-21 16:13:02 +01:00
2ce8b1110d allow to change color for asyncupload button 2022-03-21 16:13:02 +01:00
11d57094e8 fix cs 2022-03-21 15:22:40 +01:00
704392a729 do not add referrer if user is null (fix condition) 2022-03-21 15:21:29 +01:00
efeda81e05 do not add referrer if user is null 2022-03-21 15:17:33 +01:00
ae5940eb48 Merge remote-tracking branch 'origin/master' into issue511_document_evaluations 2022-03-21 15:00:40 +01:00
638ae3315f Merge branch 'issue509_parcours_referent' into 'master'
Reassign parcours of absent user

See merge request Chill-Projet/chill-bundles!387
2022-03-21 13:58:33 +00:00
ac9e55e2fc fix methods for accompanying period repository acl aware
* add method to interface
* delegate ACL to another method
2022-03-21 14:54:01 +01:00
293efc03b4 fixes for reasign list
* use existing method in UserRepository and use a method instead of
building a query outside of the repository;
* use renderString to render users
* fix building of filter form (add $data). This make the use of the
method "get" instead of post
2022-03-21 13:35:14 +01:00
f084078cf2 Merge remote-tracking branch 'origin/master' into issue509_parcours_referent 2022-03-21 12:59:24 +01:00
c8a66f008e Merge branch 'issue502_user_in_actions' into 'master'
Issue502 referres in AccompanyingPeriodWork

See merge request Chill-Projet/chill-bundles!381
2022-03-21 11:55:24 +00:00
b6b6c25b3b adapt queries for listing near recents evaluation and work on homepage, taking care of referrers 2022-03-21 12:54:50 +01:00
cb35aed202 use remove-items UI api for listing referrers 2022-03-21 12:45:20 +01:00
eebe1d669a first commit 2022-03-21 12:39:33 +01:00
8f462da627 fix cs 2022-03-21 12:32:46 +01:00
3aaecc8630 set creator as referrer for works 2022-03-21 12:32:40 +01:00
9b97b03d42 csfixes 2022-03-21 12:16:49 +01:00
bdb07a3a05 options added to create person or parcours and to access global history 2022-03-21 12:10:03 +01:00
2fda5b751b Merge remote-tracking branch 'origin/master' into issue502_user_in_actions 2022-03-21 11:53:21 +01:00
ddb048daca Merge branch 'issue479_admin_user' into 'master'
user admin

See merge request Chill-Projet/chill-bundles!372
2022-03-21 10:47:43 +00:00
ac42de7863 Merge branch 'fix-test-2022-03-21' 2022-03-21 11:46:48 +01:00
2c55cfe1dc by default, translate menu items 2022-03-21 11:41:16 +01:00
3ba3498892 Merge remote-tracking branch 'origin/master' into issue479_admin_user 2022-03-21 11:36:28 +01:00
99276dc41c fix cs 2022-03-21 11:35:50 +01:00
fced8ef4b7 try to fix test with null id 2022-03-21 11:34:54 +01:00
247f1879e3 Merge remote-tracking branch 'origin/master' into issue471_activity_socialissue-action 2022-03-21 11:16:19 +01:00
a06a0788c1 csfixes 2022-03-21 10:22:28 +01:00
5a8291dc87 merge master into branch 2022-03-21 10:21:59 +01:00
15af0203ff add menu entry in section menu 2022-03-21 10:21:12 +01:00
7006196691 csfixes 2022-03-21 09:54:53 +01:00
5cbe14464d fix in view template to display firstname + lastname in title if it exists 2022-03-21 09:53:59 +01:00
2463a492c8 merge master into branch 2022-03-21 09:40:39 +01:00
72f69f0f82 changelog updated 2022-03-19 12:11:49 +01:00
a2daeff384 csfixes 2022-03-19 12:10:47 +01:00
caaa25ef8e controller action to create parcours from within household + link added in template 2022-03-19 12:08:20 +01:00
ff5aeaae17 translation changed in action evaluation section 2022-03-19 11:32:16 +01:00
184a664bf9 english text translated in thirdparty view page 2022-03-19 11:25:56 +01:00
nobohan
dbc604d84a AccompanyingCourseWorkEdit: download existing documents 2022-03-18 17:02:35 +01:00
nobohan
9c353669ea activity: fix delete button for documents 2022-03-18 16:11:09 +01:00
8d92cc0ba7 remove history from menus, temporarily 2022-03-18 15:40:01 +01:00
nobohan
215b859725 activity: hide delete button from asyncupload and add delete buttons from chill collection 2022-03-18 15:25:45 +01:00
da67fa4c4f fix role for creating activity in person 2022-03-18 14:33:05 +01:00
5b4c3ae9b3 Merge branch 'issue503_workflow_document_template' into 'master'
Workflow document template

See merge request Chill-Projet/chill-bundles!382
2022-03-18 13:24:40 +00:00
fdb36ab047 add document title to workflow EvaluationDocument handler 2022-03-18 14:18:47 +01:00
a1b1e6bb17 Merge remote-tracking branch 'origin/master' into issue503_workflow_document_template 2022-03-18 14:01:43 +01:00
nobohan
73dd97f7d3 upd CHANGELOG 2022-03-18 13:58:20 +01:00
bfd51c6615 allow downloads in LO editor 2022-03-18 13:55:33 +01:00
nobohan
b84e161399 quick fix css class in acc period evaluation form, issue client 557 2022-03-18 12:35:14 +01:00
nobohan
3b8c329ff6 upd CHANGELOG 2022-03-17 19:08:13 +01:00
nobohan
e7299bac4a person: add person ressource to person docgen normaliser 2022-03-17 19:07:11 +01:00
Marc Ducobu
80d518e4af Merge branch 'fixdataimportcp4digits' into 'master'
Fix pbm importing CP from France on 4 digits

See merge request Chill-Projet/chill-bundles!386
2022-03-17 17:44:39 +00:00
Marc Ducobu
730762d1c6 Merge branch 'master' into fixdataimportcp4digits 2022-03-17 18:37:00 +01:00
Marc Ducobu
288f0dbf69 Fix pbm importing CP from France on 4 digits 2022-03-17 18:34:55 +01:00
Marc Ducobu
2c02150b1a Use CS Fixer 2022-03-17 18:29:16 +01:00
nobohan
5e0a693108 commentembeddable: add a condition for the early return in normalisation 2022-03-17 17:51:25 +01:00
72ba2c6bca paginator added + phpcsfixes 2022-03-17 14:13:21 +01:00
6adb647ccc changelog updated 2022-03-17 12:31:44 +01:00
97731b0a9b controller + template made to list confirmed parcours for a specific user 2022-03-17 12:28:00 +01:00
Marc Ducobu
1e63d00767 Fix pbm importing CP from France on 4 digits 2022-03-16 16:27:17 +01:00
6151d0ce54 fix name suggestion badges underneath input fields 2022-03-16 12:32:54 +01:00
9551e10d2b improvement, but still not correct 2022-03-16 11:55:19 +01:00
387b7c2fbd first commit 2022-03-16 11:36:46 +01:00
39ba21f308 merge master into branch 2022-03-16 11:36:07 +01:00
Pol Dellaiera
22755de1dd fix: Remove PrependExtensionInterface.
It is now handled by `chill_main` bundle.
2022-03-15 13:45:07 +01:00
Pol Dellaiera
3d7fcd99a8 fix: Remove console.log. 2022-03-15 13:45:07 +01:00
Pol Dellaiera
35d723e5fb refactor: Use StoredObjectManager. 2022-03-15 13:45:07 +01:00
Pol Dellaiera
62af980ea5 feat: Add new StoredObjectManager service.
To read and write onto `StoredObject` document using a common interface.
2022-03-15 13:41:38 +01:00
Pol Dellaiera
8abed67e1c refactor: Return a string instead of a resource. 2022-03-15 09:40:32 +01:00
Pol Dellaiera
b8992b8eeb misc: Update interface doc. 2022-03-15 09:40:32 +01:00
Pol Dellaiera
6ddbf35a7b misc: Add return types. 2022-03-15 09:40:32 +01:00
Pol Dellaiera
325ab0daf3 chore: Update composer.json files. 2022-03-15 09:40:32 +01:00
1a783e1881 Merge branch 'issue495_AccPeriodWorkEval_circular_reference' into 'master'
AccompanyingPeriodWorkEvaluation: fix circular reference when serialising

See merge request Chill-Projet/chill-bundles!383
2022-03-14 20:48:37 +00:00
d04f5a527b remove link to action on homepage, in evaluation list 2022-03-14 21:46:21 +01:00
f51279e83e fix saving maxDate when denormalizing object 2022-03-14 21:46:01 +01:00
90bebbad7d fix normalization for docgen 2022-03-14 21:27:21 +01:00
nobohan
82052f5d70 AccompanyingCourseWorkEdit: fix setting title of document with a fresh upload 2022-03-14 15:13:21 +01:00
nobohan
369397bf4f upd CHANGELOG 2022-03-14 14:42:53 +01:00
c61577edda Merge remote-tracking branch 'origin/master' into issue495_AccPeriodWorkEval_circular_reference 2022-03-14 14:42:24 +01:00
nobohan
1beae4d713 AccompanyingCourseWorkEdit: download existing documents 2022-03-14 14:42:04 +01:00
352302b7aa merge master into branch 2022-03-14 13:51:43 +01:00
01b60f334a Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal 2022-03-14 13:43:39 +01:00
0546a43d63 changelog updated 2022-03-14 13:41:32 +01:00
5c68879509 fix doctrine annotation to make it comply with cs 2022-03-14 13:41:11 +01:00
9d844f6692 Merge branch 'issue505_create_household_composition' into 'master'
Issue505 create household composition

See merge request Chill-Projet/chill-bundles!378
2022-03-14 12:40:15 +00:00
28509f651d fix button and acl in household composition list 2022-03-14 13:39:33 +01:00
b590444375 Merge remote-tracking branch 'origin/master' into issue505_create_household_composition 2022-03-14 13:35:43 +01:00
873258fc84 update button person ressource creation 2022-03-14 13:35:03 +01:00
7988becc45 Merge branch 'issue504_person_ressource_create' into 'master'
Separate create page person resource

See merge request Chill-Projet/chill-bundles!377
2022-03-14 12:33:42 +00:00
45c4a7ae64 Merge remote-tracking branch 'origin/master' into issue504_person_ressource_create 2022-03-14 13:30:32 +01:00
05803787a9 Merge branch 'issue493_order_parcours' into 'master'
Issue493 order parcours

See merge request Chill-Projet/chill-bundles!375
2022-03-14 12:28:33 +00:00
33acc645ea Merge remote-tracking branch 'origin/master' into issue493_order_parcours 2022-03-14 13:27:26 +01:00
0ce787701f Merge branch 'fix_blur_toggle' into 'master'
finding solution for toggle button position

See merge request Chill-Projet/chill-bundles!374
2022-03-14 12:26:25 +00:00
e9cacbb74a add comment for future refactorisation 2022-03-14 13:26:07 +01:00
a2f8f7ae43 add badge on third party in residential address list 2022-03-14 13:18:41 +01:00
a49c53772e Merge remote-tracking branch 'origin/master' into fix_blur_toggle 2022-03-14 13:15:05 +01:00
1adccdb06e Merge branch 'issue489_address_onTheFly' into 'master'
Address history onTheFly for linked person

See merge request Chill-Projet/chill-bundles!373
2022-03-14 12:14:08 +00:00
22d593fc12 Merge remote-tracking branch 'origin/master' into issue489_address_onTheFly 2022-03-14 13:12:53 +01:00
de7ec6fa54 Merge branch 'issue477_autosave_comment_parcours' into 'master'
Issue477 autosave comment parcours

See merge request Chill-Projet/chill-bundles!370
2022-03-14 12:12:07 +00:00
90948e5513 Merge remote-tracking branch 'origin/master' into issue477_autosave_comment_parcours 2022-03-14 13:11:53 +01:00
bd79391efc fix autosave of comment 2022-03-14 13:04:29 +01:00
4ea72f7d9d csfixes 2022-03-14 11:49:58 +01:00
96e38a8a6d eventlistener added to capitalize names correctly 2022-03-14 11:49:01 +01:00
09e6872724 firstname added to onthefly for child or contact 2022-03-14 11:48:39 +01:00
f44f9d356b migration adjusted to have actual empty string instead of '' 2022-03-14 11:16:58 +01:00
nobohan
9f0ab5aee7 upd CHANGELOG 2022-03-14 10:43:28 +01:00
nobohan
6eac6044cd AccompanyingCourseWorkEdit: replace document by a new one (working now) 2022-03-14 10:42:16 +01:00
a24cd693e3 firstname field added to twig form for child or contact types 2022-03-14 10:23:47 +01:00
f63aab327d Merge branch 'issue480_bug_householdrenderbox' into 'master'
bugfix when position of member is null

See merge request Chill-Projet/chill-bundles!365
2022-03-14 08:58:52 +00:00
0c9499dd58 Merge remote-tracking branch 'origin/master' into issue480_bug_householdrenderbox 2022-03-14 09:53:23 +01:00
00787adf2b firstname property added to thirdparty + canonicalize function adapted 2022-03-14 09:35:22 +01:00
nobohan
dbe186547f AccompanyingCourseWorkEdit: replace document by a new one 2022-03-13 22:31:26 +01:00
nobohan
13f0b8610c quick fix: missing translation in Task 2022-03-11 16:37:26 +01:00
nobohan
f9e8bf4f2d upd CHANGELOG 2022-03-11 10:22:09 +01:00
nobohan
44e93dd5f8 AccompanyingPeriodWorkEvaluation: fix circular reference when serialising 2022-03-11 10:20:42 +01:00
nobohan
ee8f331de4 Revert "AccompanyingPeriodWorkEvaluation: fix circular reference when serialising"
This reverts commit 99f8aeb6cd.
2022-03-11 10:18:14 +01:00
nobohan
99f8aeb6cd AccompanyingPeriodWorkEvaluation: fix circular reference when serialising 2022-03-11 10:01:20 +01:00
nobohan
fc1fe7c277 php cs fix 2022-03-10 18:14:57 +01:00
nobohan
a8b6609dbf comment in accompanying course: add loader + fix when resetting to empty string 2022-03-10 18:12:42 +01:00
nobohan
ded2ac7d48 accompanyiing period comment: fix removing of comment 2022-03-10 17:01:52 +01:00
nobohan
16a0dc4621 fix role for AccPeriod Comment API 2022-03-10 16:46:10 +01:00
nobohan
ba668d3b9d upd CHANGELOG 2022-03-10 16:27:03 +01:00
nobohan
690a443bdb fix code style for AccompanyingPeriodWork - referrers 2022-03-10 16:25:05 +01:00
nobohan
137eb184d0 accompanying period work: display referrers in the list of work 2022-03-10 16:18:59 +01:00
0a2730540e lost text removed plus condition to editing file uncommented 2022-03-10 14:45:43 +01:00
9284a4bc29 ACL added and buttons to download and edit document 2022-03-10 14:30:19 +01:00
nobohan
f2edc1ef0c set constrint ondelete for comment in AccompanyingPeriod 2022-03-10 14:23:00 +01:00
bf2d9acc5a correction of template, display title linked to workflow doc 2022-03-10 14:03:37 +01:00
2628e58ea0 document title added + concerned users 2022-03-10 12:28:17 +01:00
nobohan
da650fa1f2 AccompanyingPeriodWork: add doctrine event listener to add logged user to referrers collection 2022-03-10 10:53:40 +01:00
nobohan
55a65ee6e9 accompanyingPeriodWork: add referrer in vuejs form 2022-03-10 10:32:20 +01:00
nobohan
492c22d1b7 AccompanyingPeriodWork: add referrers field 2022-03-10 08:40:11 +01:00
e153fa34e9 merge master into branch 2022-03-09 20:48:30 +01:00
d272e1398c fix merge conflict in changelog 2022-03-09 20:45:42 +01:00
9457926a35 fix merge conflict 2022-03-09 20:43:31 +01:00
8ff80ac65e changelog updated 2022-03-09 20:42:48 +01:00
3d1ded8b1c position of toggle button improved (differentation between twig and vue) + fix fa-eye-slash in vue component 2022-03-09 20:41:24 +01:00
c611f35cd6 finding solution for toggle button position 2022-03-09 20:41:24 +01:00
f79cfda74a update changelog 2022-03-09 20:31:02 +01:00
ff4b90835e show current civility and profession in edit form + fix saving of edited information 2022-03-09 20:29:38 +01:00
d5501bcfbd remove console logs to avoid mess in the console 2022-03-09 20:07:41 +01:00
fb1552f6b7 update changelog and csfixes 2022-03-09 14:07:41 +01:00
e28da7e99b create-edit composition placed in separate page to avoid confusion 2022-03-09 14:06:18 +01:00
4b899d337a changelog updated 2022-03-09 13:36:26 +01:00
d6933fce35 add contact button color changed 2022-03-09 13:35:55 +01:00
aefd09693b position of toggle button improved (differentation between twig and vue) + fix fa-eye-slash in vue component 2022-03-09 12:10:33 +01:00
8555277827 changelog updated 2022-03-09 11:06:10 +01:00
6f58a9a8bb separate create page 2022-03-09 11:06:00 +01:00
b02739cc3c phonenumber placeholder removed 2022-03-09 09:35:47 +01:00
b8d9d59d76 condition added to display thirdparty centers or not 2022-03-09 09:19:29 +01:00
nobohan
ba52e95253 display error messages above form when creating new Location 2022-03-08 17:21:49 +01:00
nobohan
2e69dbb7c9 upd CHANGELOG 2022-03-08 17:06:58 +01:00
13d579dc33 add 'for' in macro workflow breadcrumb 2022-03-08 17:06:30 +01:00
nobohan
efcc602d53 Activity form: add required class name on required field built with vue 2022-03-08 16:09:22 +01:00
ee82bd2867 change personne to usager and & to ET 2022-03-08 16:03:59 +01:00
nobohan
fcc5d3d349 Activity: small fixes on displaying social Issues and social Actions hidden fields 2022-03-08 15:41:03 +01:00
af3b761208 evaluationWorkDocument: fill title with document is generated 2022-03-08 14:41:25 +01:00
23e61ac6a7 fixes stan errors 2022-03-08 11:43:47 +01:00
e4ae495a3f add empty lines on addresses when address is empty 2022-03-08 11:43:47 +01:00
ec99bc95fa add itemMeta variable for course list 2022-03-08 11:43:47 +01:00
nobohan
b68b43118b update CHANGELOG 2022-03-08 11:38:40 +01:00
nobohan
db95e935d9 order accompanying period by opening date in search person 2022-03-08 11:37:08 +01:00
nobohan
dc5ff53a57 order accompanying course by openingDate for Household 2022-03-08 11:21:59 +01:00
nobohan
50a2de1559 order accompanying course by openingDate for Person 2022-03-08 11:20:06 +01:00
d18ab5cf49 fix display of email in person renderbox if null or empty string 2022-03-08 11:00:31 +01:00
1860478aea finding solution for toggle button position 2022-03-08 09:48:17 +01:00
nobohan
17e83deb55 User admin: put pagination 2022-03-08 09:46:41 +01:00
16be28681a Test added for activity-social action and social issue 2022-03-07 15:13:47 +01:00
388b666b5d person badge changed to include onTheFly + changelog updated 2022-03-07 14:36:44 +01:00
nobohan
9b06ccc3e6 user admin: use flex-table and flex-bloc in twig 2022-03-07 11:13:11 +01:00
efbd9b0185 do not allow to remove doc or evaluations if workflow is associated 2022-03-07 00:30:53 +01:00
b2a61071bf create voter which blocks deletion if a workflow exists 2022-03-07 00:30:53 +01:00
f0849eeef5 Merge branch 'issue484_link_household' into 'master'
add current household link to person banner

See merge request Chill-Projet/chill-bundles!369
2022-03-06 21:58:37 +00:00
c7f2eedd4b Merge remote-tracking branch 'origin/master' into issue484_link_household 2022-03-06 22:57:12 +01:00
ab74478afc Merge branch 'issue478_remove_localisation' into 'master'
fix parcours localisation

See merge request Chill-Projet/chill-bundles!368
2022-03-06 21:56:04 +00:00
f88d0ee19e Merge remote-tracking branch 'origin/master' into issue478_remove_localisation 2022-03-06 22:54:48 +01:00
727480d6d1 Merge branch 'issue472_filter_job_user_in_set_referrer' into 'master'
assign User to undispatched acc period: filter users by job type

See merge request Chill-Projet/chill-bundles!367
2022-03-06 21:52:43 +00:00
af79ffd544 Merge remote-tracking branch 'origin/master' into issue472_filter_job_user_in_set_referrer 2022-03-06 22:40:14 +01:00
80aee185a7 Merge branch 'url_in_accompanyingPeriodWork_evaluations' into 'master'
Url in accompanying period work evaluations

See merge request Chill-Projet/chill-bundles!364
2022-03-06 21:37:27 +00:00
7afada5dad fix cs 2022-03-06 22:36:38 +01:00
739c7e9a77 Merge remote-tracking branch 'origin/master' into url_in_accompanyingPeriodWork_evaluations 2022-03-06 22:33:16 +01:00
03471a74fe fix creating alt phonenumber 2022-03-06 22:28:33 +01:00
44ed2e44e0 another way to fix phonenumber and telephone in third party / OnTheFly 2022-03-06 22:16:48 +01:00
68aa80269f rebase onto master 2022-03-04 17:29:36 +01:00
2012df512c merge conflict fixed 2022-03-04 17:27:26 +01:00
1c21b80703 csfixes 2022-03-04 17:25:37 +01:00
25fe105590 fix logic in activity entity 2022-03-04 17:25:37 +01:00
b6e530fec6 update changelog 2022-03-04 17:25:37 +01:00
4ef2274803 logic added to only keep youngest descendant. works for issue, seems not to for action 2022-03-04 17:25:22 +01:00
3352999862 rebase onto master 2022-03-04 17:23:37 +01:00
5605813826 Update changelog 2022-03-04 17:22:27 +01:00
72795240b9 Add current household link in person banner 2022-03-04 17:22:06 +01:00
d0772fc306 Add email to twig personRenderBox 2022-03-04 17:08:41 +01:00
nobohan
def90893de upd CHANGELOG 2022-03-04 15:12:11 +01:00
nobohan
4b692edd7d accompanying course comment: autosave the comment 2022-03-04 15:09:50 +01:00
nobohan
6472c554ed accompanying course comment: more tentative to delete the comment 2022-03-04 14:22:25 +01:00
nobohan
f04118218d accompanying course comment: tentative to delete the comment 2022-03-04 13:56:03 +01:00
nobohan
cde6e8f368 accompanying course: allow PATCH on a comment entity 2022-03-04 13:01:01 +01:00
474fffcbb5 changelog updated 2022-03-04 12:08:00 +01:00
0333e79b0a csfixes 2022-03-04 12:07:29 +01:00
7c043e9d85 fix logic in activity entity 2022-03-04 12:06:53 +01:00
nobohan
6d46efa610 accompanying course: fix posting of pinned comment 2022-03-04 11:53:27 +01:00
nobohan
84f2e1c72a Accompanying Period: set cascade persist on pinnedComment 2022-03-04 10:34:47 +01:00
nobohan
1c1dec1f5b upd CHANGELOG 2022-03-04 08:46:32 +01:00
nobohan
3ff9291580 assign User to undsipatched acc period: filter users by job type 2022-03-04 08:46:32 +01:00
9265a15427 Update changelog 2022-03-03 21:12:00 +01:00
6d3b88aee9 Add current household link in person banner 2022-03-03 21:09:50 +01:00
827c85ac56 fix parcours localisation 2022-03-03 20:37:12 +01:00
nobohan
7b52a10943 upd CHANGELOG 2022-03-03 17:21:54 +01:00
nobohan
187c9d82b6 assign User to undsipatched acc period: filter users by job type 2022-03-03 16:37:58 +01:00
214ef09fe7 update changelog 2022-03-03 16:29:35 +01:00
892be42580 update changelog 2022-03-03 16:28:31 +01:00
18694a34cf logic added to only keep youngest descendant. works for issue, seems not to for action 2022-03-03 16:24:37 +01:00
e9236875d2 quick fix for phonenumber alt on person 2022-03-03 15:44:30 +01:00
db4b0b104b Merge branch 'issue464_document_on_person' into 'master'
Person Document generation

See merge request Chill-Projet/chill-bundles!360
2022-03-03 14:27:53 +00:00
4ad65b616d fix tests for person json normalizer and residential address stuff 2022-03-03 15:20:21 +01:00
nobohan
c5eac09478 php cs fix on migration 2022-03-03 15:17:05 +01:00
nobohan
a88e052eb6 upd CHANGELOG 2022-03-03 15:12:47 +01:00
nobohan
568a1d95f4 AccompanyingCourseWorkEdit: add url to vuejs form 2022-03-03 15:10:05 +01:00
9769aa1386 fix loading of residential address form type 2022-03-03 15:07:45 +01:00
bf4a3a2c91 add id to docgen normalization fo a person 2022-03-03 15:01:14 +01:00
3df2335cf4 Merge remote-tracking branch 'origin/master' into issue464_document_on_person 2022-03-03 14:42:06 +01:00
1c7c217d1c Merge branch 'issue470_location_in_activity_validation' into 'master'
activity: do not override location if already exist (when validating new activity)

See merge request Chill-Projet/chill-bundles!363
2022-03-03 13:40:43 +00:00
f0e41f839f fix error when context is a string in personJsonNormalizer 2022-03-03 14:39:20 +01:00
nobohan
349db2142d person: add url field to SocialWork Evaluation entity + populate with http title values 2022-03-03 14:39:00 +01:00
34b3c6fa32 bugfix when position of member is null 2022-03-03 14:15:20 +01:00
b1c0e18e51 Merge remote-tracking branch 'origin/master' into issue470_location_in_activity_validation 2022-03-03 13:59:44 +01:00
6edf0bcb3b fix delete links in documents 2022-03-03 13:57:00 +01:00
6171b3411f fix creation of document when overriding center resolver 2022-03-03 13:07:36 +01:00
86bf0115dd fix condition when empty phonenumber 2022-03-03 13:05:01 +01:00
19cad9a7a4 do not update names after person update 2022-03-03 12:43:04 +01:00
a736c2a67e fix migrations 2022-03-03 12:32:38 +01:00
636f92b168 Revert "add migrations files"
This reverts commit 7f5a91fc49.
2022-03-03 12:10:25 +01:00
nobohan
1b66941746 upd CHANGELOG 2022-03-03 12:05:55 +01:00
nobohan
dca17c409b activity: do not override location if already exist (when validating new activity) 2022-03-03 12:03:22 +01:00
7f5a91fc49 add migrations files 2022-03-03 11:42:43 +01:00
3ab71c8a2e update chill-app with migrations for budget 2022-03-03 11:12:30 +01:00
fdf1911c15 fix default config 2022-03-03 11:07:02 +01:00
ba24abf788 fix cs 2022-03-03 10:56:36 +01:00
076728bf5f enable chilld budget bundle in test app 2022-03-03 10:55:25 +01:00
0833bb49ca fixes for budgets 2022-03-03 10:37:10 +01:00
nobohan
23fd4be2e5 upd CHANGELOG 2022-03-03 10:17:29 +01:00
nobohan
4406016f82 code fix for PersonContext 2022-03-03 10:17:16 +01:00
ac12e75714 Merge remote-tracking branch 'origin/master' into issue469_budget 2022-03-02 22:01:28 +01:00
d50d68aa86 Merge branch 'issue439_residential_address_otf' into 'master'
residential address in OnTheFly

See merge request Chill-Projet/chill-bundles!350
2022-03-02 20:58:19 +00:00
fccac80222 Merge remote-tracking branch 'origin/master' into issue439_residential_address_otf 2022-03-02 21:53:17 +01:00
bf70d344bf remove missing error on phpstan 2022-03-02 21:45:14 +01:00
d0591d0351 Merge branch '20-update-telephone-type-new-approach' into 'master'
fix: Use `odolbeau/phone-number-bundle` for formatting phone number type fields.

See merge request Chill-Projet/chill-bundles!322
2022-03-02 20:39:52 +00:00
c83d6d392f [docgen/template] do not list template wich are inactive
See https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/473
2022-03-02 21:35:16 +01:00
09ca1ec6bb fix phstan error 2022-03-02 21:23:05 +01:00
970431197f display phonenumber in tel link 2022-03-02 21:19:44 +01:00
9fdd9da486 display phonenumber and mobilenumber in search results 2022-03-02 21:10:37 +01:00
b9eee51de6 fix cs 2022-03-02 21:02:58 +01:00
c0ec64e4be add leadiing country code while seraching numbers 2022-03-02 21:02:32 +01:00
74a84e42a6 update changelog and csfixes 2022-03-02 19:24:33 +01:00
595ddf5b6f fix display of thirdparty contact badges in twig template 2022-03-02 19:20:26 +01:00
abe183fd10 fix position of toggle button
so it doesn't cover content or falls outside box
2022-03-02 19:11:34 +01:00
9a0883eb5f Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-02 18:08:16 +01:00
663295d436 fix edit name of thirdparty 2022-03-02 18:07:55 +01:00
9f9986d367 Merge branch 'issue475_bug_graphique' 2022-03-02 17:38:20 +01:00
db37527f72 try to resolve bug with flot-button.bottom placement (2) 2022-03-02 17:36:24 +01:00
6171a221b2 fix cs 2022-03-02 16:59:20 +01:00
1312fd0941 allow psalm to fail 2022-03-02 16:41:53 +01:00
c1832d39f1 remove fixed phpstan issue 2022-03-02 16:40:50 +01:00
3756631595 fix some psalm issues 2022-03-02 16:39:36 +01:00
969f0b8aeb Display of budget result 2022-03-02 16:38:55 +01:00
8b37f008e6 csfixes 2022-03-02 16:38:31 +01:00
a7a933c7a7 fix test for phonenumber update: desactivate temporarily 2022-03-02 16:32:28 +01:00
15bc3e62d3 fix cs 2022-03-02 16:29:21 +01:00
5ce62f5458 phonenumber helper: remove unused method and fix tests 2022-03-02 16:27:55 +01:00
283b378291 fix template bug 2022-03-02 16:19:17 +01:00
3e30684198 normalization on 3party phone 2022-03-02 16:19:02 +01:00
c2e284682f phonenumber on 3party: twig stuffs 2022-03-02 16:13:17 +01:00
5407dbfc98 form for third party telephone 2022-03-02 16:05:08 +01:00
fa23bfd7d5 fix upgrade formula for phonenumber 2022-03-02 16:02:23 +01:00
09de7cbf7d allow null values on phonenumber in location and person 2022-03-02 15:53:39 +01:00
6a3c8017f0 upgrade phonenumber on 3party: migrations 2022-03-02 15:50:01 +01:00
9bb149fb02 added missing translations + further adjustment templates 2022-03-02 15:44:49 +01:00
eb6ec8a4af apply phonenumber on locations 2022-03-02 15:08:16 +01:00
c8c2c4c859 phonenumber type for form 2022-03-02 15:01:04 +01:00
7bd93e53c2 fix formatting upgrade clause 2022-03-02 14:23:50 +01:00
5d6f3de694 normalize phonenumber in person docgen normalizer 2022-03-02 14:22:12 +01:00
3eb826d422 default value for Phonenumbers 2022-03-02 14:21:53 +01:00
e9ffdb1f03 fix cs 2022-03-02 14:11:47 +01:00
f4f488dad1 normalization of phonenumber 2022-03-02 14:10:48 +01:00
2a9f1dc238 restore templating class 2022-03-02 13:51:19 +01:00
8482c8ffa7 update app 2022-03-02 13:50:35 +01:00
54ad7a4b8f restore showing phonenumber 2022-03-02 13:48:48 +01:00
ed4cf67e79 set carrier code parameter and lint existing phonenmubers 2022-03-02 13:01:01 +01:00
550168fd7c Merge branch 'issue475_bug_graphique' 2022-03-02 13:00:51 +01:00
8470430c57 try to resolve bug with flot-button.bottom placement 2022-03-02 13:00:23 +01:00
5dc117037d change label styling for view of resource/charge (suggestion) 2022-03-02 12:02:49 +01:00
7f1083aa40 Use select2 field 2022-03-02 12:02:16 +01:00
900adc7105 improvements templates 2022-03-02 11:44:10 +01:00
0648154ba1 remove comments 2022-03-02 11:43:55 +01:00
86de8137e4 restyling layout of table 2022-03-02 11:42:54 +01:00
a9415488dd Merge branch 'list_documents_page' 2022-03-02 09:55:16 +01:00
8945703785 fix template mistakes 2022-03-02 09:53:51 +01:00
9f90cc8fe1 Merge remote-tracking branch 'origin/master' into 20-update-telephone-type-new-approach 2022-03-01 16:55:33 +01:00
nobohan
d6d7edf25d Add doc generation for PersonDocument form 2022-03-01 16:14:21 +01:00
7b17dc692e Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-01 16:14:00 +01:00
e5f7120733 Merge branch 'list_documents_page' 2022-03-01 16:13:20 +01:00
1a05ffab96 fix flex item-col placement for documents list 2022-03-01 16:13:11 +01:00
aad7a21bc3 Merge branch 'list_documents_page' 2022-03-01 16:09:10 +01:00
ae0bf7bfd7 fix flex item-col placement for documents list 2022-03-01 16:08:52 +01:00
d2ecc5d3a3 Merge branch 'issue442_toggle_emergency' into 'master'
Toggle emergency only by referrer

See merge request Chill-Projet/chill-bundles!331
2022-03-01 15:02:01 +00:00
22aefca5c9 Merge remote-tracking branch 'origin/issue442_toggle_emergency' into issue442_toggle_emergency 2022-03-01 15:58:20 +01:00
cce790f2f8 add validator which force confidential course to keep a referrer 2022-03-01 15:55:18 +01:00
nobohan
84478c651e Person: remove useless serialisation groups 2022-03-01 15:54:36 +01:00
nobohan
88e9a96e0e Person document generation: clean build Admin form + add household and relations groups 2022-03-01 15:51:34 +01:00
cefa304fb5 mixup colors fixed. color of resource to be discusses still 2022-03-01 15:49:37 +01:00
nobohan
a187bac7b0 DocGeneratorTemplateController: fix in case there is no public form 2022-03-01 15:48:32 +01:00
83760cc980 Merge remote-tracking branch 'origin/master' into issue469_budget 2022-03-01 15:42:59 +01:00
2b108d0d70 update changelog 2022-03-01 15:32:47 +01:00
f5accb827c fix inline address -> reopen issue462 2022-03-01 15:27:18 +01:00
nobohan
4543c411e7 quick fix: remove duplicate email info in PersonRenderBox.vue 2022-03-01 15:24:44 +01:00
nobohan
7aefa5014c Add docgen:read group on Person + 2 fields in PersonContext admin form 2022-03-01 15:17:17 +01:00
nobohan
d163783ed3 Person Document: add a PersonContext class 2022-03-01 15:17:17 +01:00
4536f30da2 Merge branch 'list_documents_page' 2022-03-01 15:11:01 +01:00
8764aacd92 fix confusion between document dates 2022-03-01 15:03:21 +01:00
8b8f6027cc Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency 2022-03-01 14:52:56 +01:00
6769752c26 merge with master 2022-03-01 14:40:14 +01:00
nobohan
5695bb0e9e add missing key in v-for loop 2022-03-01 14:36:47 +01:00
nobohan
48a32f2403 residential address: filter by person in the repository 2022-03-01 14:36:22 +01:00
695b9d5bea merge with master 2022-03-01 14:32:03 +01:00
f38cfb4b28 adjustments templates 2022-03-01 14:30:12 +01:00
nobohan
a7240e8cc6 PersonJsonNormalizer: fix circular reference with residential address 2022-03-01 14:15:39 +01:00
67948f7f3a styles in scss with webpack 2022-03-01 14:00:14 +01:00
52d8776fbb Merge branch 'list_documents_page' 2022-03-01 11:34:07 +01:00
0d38cae217 fix macro metadata + fix merge conflicts from branch ux_corrections 2022-03-01 11:33:33 +01:00
d6bad9e030 reorganization of templates 2022-03-01 11:07:53 +01:00
Pol Dellaiera
b146f17d2f Update twig function isEditable. 2022-03-01 09:58:57 +01:00
df675cd757 Merge branch 'issue463' into 'master'
issue 463: add delete button on draft periods page

See merge request Chill-Projet/chill-bundles!361
2022-03-01 08:50:23 +00:00
ecc2e390f7 Merge remote-tracking branch 'origin/master' into issue463 2022-03-01 09:48:19 +01:00
c3e0b3b708 Merge branch 'issue458_ChillCollectionType' into 'master'
ChillCollectionType: fix bug when adding 2 new items in an empty collection

See merge request Chill-Projet/chill-bundles!359
2022-03-01 08:47:01 +00:00
449a6a1b4e Merge remote-tracking branch 'origin/master' into issue458_ChillCollectionType 2022-03-01 09:28:44 +01:00
eb874a15a6 Merge branch 'issue366_modal_thirdparty' into 'master'
Thirdparty renderbox improvements

See merge request Chill-Projet/chill-bundles!356
2022-03-01 08:24:54 +00:00
3b26466a6c remove duplicate key in thirdparty serializer 2022-02-28 20:07:13 +01:00
a6ac6ee6d8 fix merge conflicts 2022-02-28 19:47:22 +01:00
a59994355b fix merge conflict 2022-02-28 17:14:37 +01:00
06c279627a Merge remote-tracking branch 'origin/master' into workflow/fixes-2022-02 2022-02-28 16:29:57 +01:00
1e146f542e try to fix some things 2022-02-28 16:09:52 +01:00
cdd21c94c6 Merge remote-tracking branch 'origin/master' into issue439_residential_address_otf 2022-02-28 15:11:50 +01:00
Pol Dellaiera
30cdcb0836 serializer update 2022-02-28 15:01:26 +01:00
Pol Dellaiera
29308110ea Templating 2022-02-28 15:01:26 +01:00
Pol Dellaiera
18c57d532c Update Person entity fixup 2022-02-28 15:01:26 +01:00
Pol Dellaiera
b814e812b6 Update migrations. 2022-02-28 15:01:26 +01:00
Pol Dellaiera
dbbbd99788 Use PhoneNumber form type. 2022-02-28 15:01:26 +01:00
Pol Dellaiera
47676c67ff Add doctrine phone_number type. 2022-02-28 15:01:26 +01:00
Pol Dellaiera
7ad78fbce1 remove regex 2022-02-28 15:01:26 +01:00
Pol Dellaiera
37e38436a8 Try to add placeholder 2022-02-28 15:01:24 +01:00
Pol Dellaiera
e1b3719746 Tests 2022-02-28 15:00:56 +01:00
Pol Dellaiera
68a64aa67f fixup PhoneNumberHelper 2022-02-28 15:00:55 +01:00
Pol Dellaiera
d780d95157 work in progress 2022-02-28 15:00:55 +01:00
Pol Dellaiera
4822acb6fb fix: Use odolbeau/phone-number-bundle for formatting phone number type fields.
There is no need to use the bundle, we could have used the library instead. However, this idea is to switch to that bundle at some point.
2022-02-28 15:00:55 +01:00
260ce8ba17 issue 463: add delete button on draft periods page 2022-02-28 14:47:35 +01:00
822f0aa737 fix cs 2022-02-28 14:38:25 +01:00
e10a6b4bf2 Merge branch 'issue441_enfant_confie' 2022-02-28 14:37:38 +01:00
8e1f3a5cc0 Merge branch 'issue345_internal_thirdparty_contact' into 'master'
Add contact to thirdparty from within modal

See merge request Chill-Projet/chill-bundles!284
2022-02-28 13:28:13 +00:00
31ec6c70ef fix cs 2022-02-28 14:27:31 +01:00
cd84700400 Merge branch 'ux_corrections' 2022-02-28 14:23:54 +01:00
08fa1edbee Merge remote-tracking branch 'origin/master' into issue345_internal_thirdparty_contact 2022-02-28 14:22:52 +01:00
15d9593d0f design correction on list documents page 2022-02-28 14:22:15 +01:00
010afded18 order civilities 2022-02-28 13:56:52 +01:00
c12f633829 fixes 2022-02-28 13:52:41 +01:00
fb6f0c316e update changelog 2022-02-28 12:22:17 +01:00
b1ed263c4e add email in personrenderbox 2022-02-28 12:18:58 +01:00
846e487e27 fix display of address in renderbox 2022-02-28 12:13:58 +01:00
72a9183ca8 fix in case of no profession 2022-02-28 12:04:05 +01:00
fe89704672 Merge remote-tracking branch 'origin/master' into issue345_internal_thirdparty_contact 2022-02-28 11:39:16 +01:00
93d023007e Merge branch 'issue388_order_social_issues' into 'master'
person: rewrite social issue api controller for ordering

See merge request Chill-Projet/chill-bundles!323
2022-02-28 10:38:24 +00:00
8bf179934d update psalm to ignore new error (sorry) 2022-02-28 11:37:03 +01:00
24c79cc4b1 fix merge conflicts 2022-02-28 10:20:29 +01:00
f93282d657 fix cs 2022-02-28 10:13:00 +01:00
18c0e6a6bf template adjustments for household members 2022-02-28 10:12:40 +01:00
3a602385cc Merge remote-tracking branch 'origin/master' into issue388_order_social_issues 2022-02-28 09:51:40 +01:00
26373e5d23 template adjustments for household members 2022-02-28 09:47:47 +01:00
cb4c3b46b9 fix creating two workflow on accompanying period work 2022-02-27 03:03:29 +01:00
abb81bf45f remove console log 2022-02-27 02:44:01 +01:00
a9694da557 add workflow on evaluationdocument in UI 2022-02-27 02:38:08 +01:00
nobohan
d205939361 ChillCollectionType: fix bug when adding 2 new items in an empty collection 2022-02-25 17:52:20 +01:00
deadeb341e more template adjustments 2022-02-25 17:45:50 +01:00
274c6115cc index templates fixed for display of past and future budgets 2022-02-25 17:01:24 +01:00
416665f209 translations added 2022-02-25 17:01:04 +01:00
f60f927549 Fix budget voter for use with household 2022-02-25 16:40:27 +01:00
2e59c1415b csfixes plus changelog updated 2022-02-25 16:24:25 +01:00
d852477c51 Add budget of household members to overview page of household budget 2022-02-25 16:20:52 +01:00
f8d5f13a88 add methods to get budgetResources and budgetCharges in person entity 2022-02-25 16:20:07 +01:00
af0d7765ff fixes for adding evaluation document 2022-02-25 16:13:31 +01:00
c1f5730c4d Merge remote-tracking branch 'origin/issue466_file_upload' into workflow/fixes-2022-02 2022-02-25 15:40:38 +01:00
da019a146a finalize handling workflow for evaluation document 2022-02-25 15:40:23 +01:00
nobohan
4bd50d0148 fix code style for AccompanyingPeriodWorkEvaluation 2022-02-25 15:31:24 +01:00
nobohan
1826b20b40 upd CHANGELOG 2022-02-25 15:26:08 +01:00
356d1a7133 fix usage of workflow handler title in show workflow page 2022-02-25 15:18:01 +01:00
nobohan
2cc7473276 more tentative to correct AccPeriodWorkEvaluationDenormalizer 2022-02-25 15:06:16 +01:00
nobohan
2ea5c4b0c7 fix error when using AccPeriodWorkEvaluationDenormalizer 2022-02-25 14:58:11 +01:00
432cce280b simplify showing title of workflow, and add handler for evaluationDocument 2022-02-25 14:02:36 +01:00
530297bc67 csfixes 2022-02-25 13:59:05 +01:00
c416f1ef6d fix bug to resolve onthefly component within thirdparty renderbox 2022-02-25 13:58:17 +01:00
3a5e956e49 updated changelog 2022-02-25 13:20:46 +01:00
5cf4013a99 cs fixes 2022-02-25 13:12:25 +01:00
16cca07e12 throw 403 error instead of 422 and display toast message 2022-02-25 13:11:30 +01:00
nobohan
aae360d6ab AccCourseWorkEdit: remove documents in vuejs form 2022-02-25 12:45:18 +01:00
bf25740098 list for workflows: previous and old workflows 2022-02-25 12:43:04 +01:00
18836f312a fix cs 2022-02-25 12:11:05 +01:00
2b257cc402 improve title rendering on workflows 2022-02-25 12:09:53 +01:00
nobohan
289d79e011 AccCourseWorkEdit: fix setting title on documents 2022-02-25 11:52:04 +01:00
b7d6d69101 list workflow on index pages 2022-02-25 11:51:28 +01:00
nobohan
15487cd84c Add AccompanyingPeriodWorkEvaluationDenormalizer 2022-02-25 11:10:14 +01:00
fc5a893b00 template fixes and controller fixes for household budget 2022-02-25 10:30:37 +01:00
92a6fed521 phpstan fixes 2022-02-25 09:48:33 +01:00
051ed19f97 cs-fixes 2022-02-25 09:29:28 +01:00
1479e2ae9a entity workflow: handle sending an access key by email 2022-02-24 21:53:05 +01:00
nobohan
1ab4f997ba AccompanyingPeriodWork: add title in vue AccPeriodWorkEvaluationDocument form 2022-02-24 17:38:29 +01:00
nobohan
24b11f609d AccompanyingPeriodWork: add title on AccPeriodWorkEvaluationDocument 2022-02-24 16:11:29 +01:00
c4e0b68ebe change block personcontent to content more consistent with other templates and less need for if-statements 2022-02-24 15:59:13 +01:00
f8ec0f85e5 property household added to entity 2022-02-24 15:49:47 +01:00
ed33514aee Voter adapted for use within vendee 2022-02-24 15:49:28 +01:00
0d96c1f12d Repositories adapted for use with person or household 2022-02-24 15:49:04 +01:00
0fcf21bd35 Controllers adjusted for use with person or household 2022-02-24 15:48:39 +01:00
9065ec40b1 Menu entry added household menu 2022-02-24 15:47:58 +01:00
8f6ab15621 migrations 2022-02-24 15:46:22 +01:00
fd69ae3d4a Translation folder renamed to translation in accordance to other bundles 2022-02-24 15:46:08 +01:00
81b42ef99a templates adjusted to allow use for person and household 2022-02-24 15:45:35 +01:00
c546d23421 scss file added plus config webpack
still missing something, because doesn't work yet
2022-02-24 15:44:37 +01:00
nobohan
0661eb8701 accompanyingCourseWork: add documents to vue form 2022-02-24 15:24:58 +01:00
nobohan
c073ec14c8 doc store bundle: add groups and correct denormalisation 2022-02-24 15:22:28 +01:00
nobohan
bf26092764 chilldocstore: add normalizer for StoredObject- correct typo 2022-02-24 14:56:16 +01:00
nobohan
e035a6fd94 chilldocstore: add normalizer for StoredObject 2022-02-24 14:54:56 +01:00
ff1ff8f5bb workflow: allow a user to get access to validation step by an access key 2022-02-24 12:17:13 +01:00
nobohan
3f43574371 docstore: use API entrypoint for storing storedObject in AddAsyncUpload.vue 2022-02-24 12:11:34 +01:00
nobohan
b1390f4e9b docstore: add swagger documentation 2022-02-24 11:20:11 +01:00
nobohan
fd29a4ce65 docstore: add api entrypoint POST for stored object 2022-02-24 11:18:11 +01:00
nobohan
4655892815 AddAsyncupload: translations and options 2022-02-24 10:04:06 +01:00
e46220ff72 [Household - list members during membership] avoid to show two membersship with the same person 2022-02-24 09:45:46 +01:00
nobohan
f19a090549 AddAsyncUpload.vue: add asyncupload form 2022-02-24 09:05:16 +01:00
08f9819453 add accessKey to entity workflow step 2022-02-23 18:33:29 +01:00
7067d4b5bd Attempt to make voter work 2022-02-23 18:07:54 +01:00
de0be15fff Added budget link to household menu + created controller file
no content for controller yet
2022-02-23 18:07:38 +01:00
b56d8c2956 fix delete workflow 2022-02-23 17:53:18 +01:00
nobohan
5f71b46bb7 tentative to add asyncupload into modal 2022-02-23 17:21:35 +01:00
fd16222c51 translations folder moved 2022-02-23 17:20:19 +01:00
185d1dbf49 Styling view page 2022-02-23 17:16:26 +01:00
576f46f845 styling of index page
style needs to be moved to correct file and changed scss
2022-02-23 15:58:06 +01:00
nobohan
154f976762 DocStore bundle: create a vue component for uploading document 2022-02-23 15:46:21 +01:00
d5477e94b1 fix merge conflicts 2022-02-23 14:55:43 +01:00
67ae506bb5 Testing to see what still works, minor changes 2022-02-23 14:53:37 +01:00
5a514cf2db Moving migration folder and adding migration 2022-02-23 14:53:01 +01:00
1fdc994c0a adding budget to person menu 2022-02-23 14:52:37 +01:00
35aa05fb97 change namespaces, removing AMLI 2022-02-23 14:52:04 +01:00
70c7b1385e change namespaces, removing AMLI 2022-02-23 11:24:24 +01:00
d486f2ddfc fix styling of confidential toggle button in renderboxes 2022-02-23 10:46:25 +01:00
fc5ca30df0 Merge branch 'issue366_modal_thirdparty' of gitlab.com:Chill-Projet/chill-bundles into issue366_modal_thirdparty 2022-02-23 10:24:42 +01:00
0601fa0142 changelog updated 2022-02-23 10:24:24 +01:00
fffed6e3f6 Attempt to add on-the-fly for parent badge
Error: failed to resolve component on-the-fly
2022-02-23 10:24:01 +01:00
ffe4dd4a98 add delete feature for entityWorkflow (wip) 2022-02-23 10:08:11 +01:00
cc4dfdb042 style adjustment 2022-02-22 15:24:14 +01:00
fd0ca3b29d style adjustment + if contact display qualité 2022-02-22 15:18:38 +01:00
daab42109b style adjustment 2022-02-22 15:07:40 +01:00
ab5bb3963b Add qualité in personsuggestion 2022-02-22 15:06:31 +01:00
262bb13b6c Adding fonction in personrenderbox 2022-02-22 15:05:43 +01:00
5d530aaae9 Fix confidential toggle bug 2022-02-22 15:04:53 +01:00
nobohan
f0e6bfc6c6 update CHANGELOG 2022-02-22 12:57:16 +01:00
nobohan
d4283a0b94 social issue api controller: correct orderBy query 2022-02-22 12:53:47 +01:00
nobohan
568c4b60ef merge master into issue388 2022-02-22 12:47:56 +01:00
nobohan
736ca2272b fix unused imports 2022-02-22 12:44:40 +01:00
nobohan
88059884ec fix unused imports 2022-02-22 12:40:46 +01:00
nobohan
ce1d213082 [person] order social issues: remove custom controller and order only by 'ordering' 2022-02-22 12:36:04 +01:00
nobohan
71f3a3403c php code fix for Enfant Confie 2022-02-22 12:12:53 +01:00
nobohan
fbeda163f0 update CHANGELOG 2022-02-22 12:07:56 +01:00
nobohan
08c1bb7992 remove useless registerForAuyoconfiguration 2022-02-22 11:11:41 +01:00
nobohan
2f7b237c4c PersonJsonNormalizer interface: remove functions 2022-02-22 11:08:38 +01:00
nobohan
665027085d move DenormalizerAwareInterface and NormalizerAwareInterface from the interface to the class 2022-02-22 11:05:18 +01:00
nobohan
2618003177 personRenderBox: correct addition of suffixText 2022-02-22 10:48:14 +01:00
8f597eb254 update changelog 2022-02-21 17:40:09 +01:00
775d223be2 fix cs 2022-02-21 17:30:33 +01:00
3849776511 Merge remote-tracking branch 'origin/master' into kill_small_issues 2022-02-21 17:29:37 +01:00
cb3301bcef Merge remote-tracking branch 'origin/master' into thirdparty/redirect-to-parent-when-child-is-viewed 2022-02-21 17:27:20 +01:00
8d74566eac update changelog 2022-02-21 17:20:15 +01:00
4a03c2aa43 Merge remote-tracking branch 'origin/master' into issue447_pickCivilityType 2022-02-21 17:19:21 +01:00
292d56cfbe email added to person renderbox 2022-02-21 16:38:55 +01:00
b41e016a6d Merge branch 'issue366_modal_thirdparty' of gitlab.com:Chill-Projet/chill-bundles into issue366_modal_thirdparty 2022-02-21 16:38:35 +01:00
0a2e2301a9 document ThirdParty type and categories [ci-skip] 2022-02-21 15:25:46 +01:00
874c90e0e0 start to display profession/fonction of thirdparty 2022-02-21 14:30:30 +01:00
bb8898a4ec Merge branch 'course_add_event_on_person_move' into 'master'
Course add event on person move

See merge request Chill-Projet/chill-bundles!333
2022-02-21 12:29:43 +00:00
213da59b0b fix test failing due to microseconds difference 2022-02-21 13:22:35 +01:00
4e9879ba92 update changelog 2022-02-21 12:49:19 +01:00
0690704391 Merge remote-tracking branch 'origin/master' into course_add_event_on_person_move 2022-02-21 12:46:10 +01:00
610b861345 fix test on PersonAddressMoveEvent::personChangeAddress 2022-02-21 12:44:43 +01:00
b7f8ba4385 fix cs 2022-02-21 00:52:40 +01:00
a923a1f135 update changelog [ci-skip] 2022-02-21 00:41:50 +01:00
0d804dd817 3party: redirect to parent when child is opened in view mode 2022-02-21 00:39:02 +01:00
4f4b1bfbaa PersonAddressMove: fix tests, address history on household, and household::getMembersOnRange 2022-02-21 00:12:57 +01:00
caa63ea97a PersonAddressMoveEvent on household move (wip) 2022-02-19 14:04:51 +01:00
8675bb65c1 PersonMoveEventSubscriber: handle case when the move is before the last
locationHistory, but the move affects "now"
2022-02-19 10:27:44 +01:00
104af6d9b5 allow null value in end date in location history 2022-02-19 09:43:20 +01:00
2f2d4493ae Merge remote-tracking branch 'origin/master' into course_add_event_on_person_move 2022-02-19 09:31:00 +01:00
2d23068354 start to display profession/fonction of thirdparty 2022-02-18 17:07:53 +01:00
b65dacca72 bugfix onthefly thirdparty edit form
phonenumber was interchanged with telephone. Editing phonenumber was therefore not possible
2022-02-18 16:25:13 +01:00
265c8b776b bugfix in resourceItem
when address is null it gave an error and modal wouldn't close
2022-02-18 16:25:13 +01:00
4920c8b28b Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-02-18 15:59:54 +01:00
4f9acf3174 use correct translatorInterface instead of deprecated one 2022-02-18 15:59:36 +01:00
962957409b use correct translatorInterface instead of deprecated one 2022-02-18 15:51:52 +01:00
0b4d79fd5e display only last three actions in parcours resume 2022-02-18 15:51:00 +01:00
0efd3d2af3 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-02-18 14:46:55 +01:00
nobohan
02e5a1158d Create 3rd paerty contact: close modal after creation and check for errors 2022-02-18 14:44:19 +01:00
cfe32828a4 csfixes 2022-02-18 14:38:09 +01:00
nobohan
ca6bfea51f Create 3rd party contact: fix adding civility and profession to payload 2022-02-18 14:17:39 +01:00
nobohan
8c7da5f80c Merge branch 'master' into issue345_internal_thirdparty_contact 2022-02-18 11:22:51 +01:00
nobohan
57175e1c0b upd CHANGELOG 2022-02-18 09:18:09 +01:00
nobohan
c5d2953ecb php code fix for Residential Address 2022-02-18 09:15:13 +01:00
ee8044b857 Merge branch 'workflow/fix-sending-notifications' into 'master'
workflow: fix sending notifications

See merge request Chill-Projet/chill-bundles!347
2022-02-17 22:40:53 +00:00
1fda56b5f7 Merge remote-tracking branch 'origin/master' into workflow/fix-sending-notifications 2022-02-17 23:34:20 +01:00
ca79da2f9b Merge branch 'issue434_endDate_enfantHorsMenage' into 'master'
Add end date field for enfant hors menage

See merge request Chill-Projet/chill-bundles!341
2022-02-17 22:33:47 +00:00
c90e6231f9 Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage 2022-02-17 23:31:14 +01:00
e86fa41180 Merge branch 'issue448_search_3rd_party' into 'master'
thirdparty search: add where clause for searching into children

See merge request Chill-Projet/chill-bundles!344
2022-02-17 22:28:25 +00:00
ebea4b7008 Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage 2022-02-17 23:25:07 +01:00
9565464489 Merge branch 'homepage/add-workflow' into 'master'
add workflow on widget homepage

See merge request Chill-Projet/chill-bundles!343
2022-02-17 22:19:25 +00:00
05f83bf566 Merge remote-tracking branch 'origin/master' into issue448_search_3rd_party 2022-02-17 23:16:41 +01:00
673d0c1e53 Merge branch 'issue422_and_others_on_AddPersons' into 'master'
addPersons improvements

See merge request Chill-Projet/chill-bundles!340
2022-02-17 22:15:43 +00:00
fe35a29fb8 homepage vue / my workflow: replace "document" by object type 2022-02-17 23:12:14 +01:00
53d51fea2f Merge remote-tracking branch 'origin/master' into issue422_and_others_on_AddPersons 2022-02-17 22:51:52 +01:00
caaebd593b misc fixes for Thirdparty / addPerson
* set default values for ThirdParty in ThirdParty.vue
* set correct value for binding with phone (telephone instead of
phonenumber)
* add validation on ThirdParty/denomination: at least two characters, no
Null value
2022-02-17 22:42:52 +01:00
672fa48140 Merge branch 'issue415_filter_suggested_entities_by_close_participations' into 'master'
accompanying course: filter suggested entities by open participations

See merge request Chill-Projet/chill-bundles!339
2022-02-17 20:46:03 +00:00
a9aeea234c Merge remote-tracking branch 'origin/master' into issue415_filter_suggested_entities_by_close_participations 2022-02-17 21:45:43 +01:00
1683685f6b Merge branch 'issue465_display_person_resources' into 'master'
Display more info for person ressources

See merge request Chill-Projet/chill-bundles!338
2022-02-17 20:38:32 +00:00
e4aac56f2d Merge remote-tracking branch 'origin/master' into issue415_filter_suggested_entities_by_close_participations 2022-02-17 21:35:18 +01:00
d6990349d8 PersonResource: add link to person or 3party in the associated person or
3party part

There was a mismatch between "opening a resource to see the resource
details" and "see the associated person/3party details". On the previous location,
the user would expect to open the resource details, and not the person
details.
2022-02-17 21:28:27 +01:00
9ac2f7e359 Merge branch 'issue476_activity_fix_concerned_group' into 'master'
activity: can click through the cross icon for removing person in concerned group + fix duplicate display

See merge request Chill-Projet/chill-bundles!337
2022-02-17 20:22:04 +00:00
f86c0353a2 Merge remote-tracking branch 'origin/master' into issue465_display_person_resources 2022-02-17 21:17:40 +01:00
0a289e1edd Merge remote-tracking branch 'origin/master' into issue476_activity_fix_concerned_group 2022-02-17 21:11:45 +01:00
c2c5bec0e5 in period notification, handle case when period referrer is null 2022-02-17 21:08:55 +01:00
68bfca8a1f Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency 2022-02-17 20:04:45 +01:00
nobohan
6e1b95aa60 residential address: show residential address or info in PersonRenderBox + add ThirdPartyText 2022-02-17 18:05:34 +01:00
nobohan
baf9b6e1ae residential address: correct normalization 2022-02-17 18:04:50 +01:00
nobohan
c302f2dcf9 PersonRenderBox: add residential address 2022-02-17 16:29:51 +01:00
nobohan
24fc7a216b person: add current residential address in normalizer 2022-02-17 15:42:37 +01:00
nobohan
2926965400 move residentialAddress entity to the ChillPerson bundle 2022-02-17 15:08:12 +01:00
nobohan
341177aa5e fix conflict in CHANGELOG 2022-02-17 14:22:55 +01:00
56923aa1b8 use statement added to fix CI 2022-02-17 10:04:56 +01:00
62f54a3c27 changelog updated 2022-02-17 09:57:39 +01:00
64e9461586 'ressources' changed to 'personnes ressources' plus order in menu changed 2022-02-17 09:57:29 +01:00
5e01eebd25 'gabarit' changed to 'modèle' 2022-02-17 09:57:02 +01:00
bae2a385aa notification word 'one' changed to number 2022-02-17 09:56:41 +01:00
9861e3fe1c csfixes 2022-02-17 09:43:49 +01:00
95b2fcead7 update changelog [ci-skip] 2022-02-16 21:58:49 +01:00
45beb27f83 fix sending notifications 2022-02-16 21:54:37 +01:00
nobohan
b992bde41d Created an interface for PersonJsonNormalizer 2022-02-16 21:09:27 +01:00
20104f1b3b implementation in thirdpartyType 2022-02-16 16:58:37 +01:00
25264447bc csfixes 2022-02-16 16:56:02 +01:00
c1036a3627 fix getParent() 2022-02-16 16:54:55 +01:00
f1a9a872bb creation of CivilityPicker and attempt to implement -> still error 2022-02-16 16:38:53 +01:00
df322d7ebb creation of CivilityPicker and attempt to implement -> still error 2022-02-16 16:37:13 +01:00
nobohan
56a4fd3fa0 Person: add suffixText in PersonText.vue 2022-02-16 16:20:08 +01:00
nobohan
02716a6a93 PersonRender: adapt twig template to suffixText 2022-02-16 15:55:26 +01:00
d4534b56a0 bugfix listing mes parcours for user 2022-02-16 15:28:08 +01:00
nobohan
81b7b49170 ChillEntityRenderExtension: change the way the service in constructed by using tags 2022-02-16 15:23:32 +01:00
c8922a6a82 minor correction 2022-02-16 14:26:00 +01:00
cdf0bb30c9 display of correct message for 403 error fixed + translation 2022-02-16 14:25:34 +01:00
e4793e1a77 minor fixes 2022-02-16 13:52:20 +01:00
8347ddd5be bugfix if there is no address edit of resourceItem was not possible 2022-02-16 13:51:51 +01:00
12412e05a7 removal double entry 2022-02-16 13:33:45 +01:00
nobohan
dd99c35e35 upd CHANGELOG 2022-02-16 11:24:30 +01:00
nobohan
9d651a70e9 merge last AddPerson branch 2022-02-16 11:23:21 +01:00
b0d50d315c Merge conflict in changelog fixed 2022-02-16 10:56:44 +01:00
41bddf2db6 return interchange of name and text back to how it was before -> solves one bug recreates the other 2022-02-16 10:55:44 +01:00
769700fe83 comment removed 2022-02-16 10:55:44 +01:00
433ccb1fc4 bugfix of double civility abbreviation after edit 2022-02-16 10:55:44 +01:00
145c1d59e9 bugfix emit saveFormOnTheFly and add newly created contact to suggestion list immediately 2022-02-16 10:55:44 +01:00
ae8cc0f700 attempt to not include parent address 2022-02-16 10:55:24 +01:00
a764da3e99 changelog updated 2022-02-16 10:55:05 +01:00
8f92f79f85 placeholders for civility and profession 2022-02-16 10:55:05 +01:00
f093765d03 correction for POST phonenumber and email 2022-02-16 10:55:05 +01:00
c44d962ba8 only show addcontact button for personne morale 2022-02-16 10:55:05 +01:00
20d22b726c possible to add a contact to a thirdparty 2022-02-16 10:55:05 +01:00
8fa2f0e7ad small corrections 2022-02-16 10:54:42 +01:00
604c7f385e further attempts to do POST of thirdparty contact, passing parent id causes problems + civility and profession fk's are not saved on POST 2022-02-16 10:54:42 +01:00
1a07c9d71a v-model added so data is taken from the form for all fields + modal title correction 2022-02-16 10:54:20 +01:00
f7e287d415 onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet 2022-02-16 10:54:04 +01:00
b16cc2dc27 translations added 2022-02-16 10:53:34 +01:00
188447fc10 use correct button 2022-02-16 10:48:23 +01:00
b920bf6d22 parent id added to thirdparty data 2022-02-16 10:47:59 +01:00
32ff54e130 v-model added so data is taken from the form for all fields + modal title correction 2022-02-16 10:47:59 +01:00
02c09687a4 onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet 2022-02-16 10:47:13 +01:00
3b1fc4aacb translations added 2022-02-16 10:46:57 +01:00
bf9469d538 endpoints created for profession and civility for use in vue component 2022-02-16 10:46:35 +01:00
c2dec360b1 unsaved changes 2022-02-16 10:46:06 +01:00
dc7422bf56 unsaved changes 2022-02-16 10:46:06 +01:00
89edf508f5 button added to add contact to personne morale (styling not correct yet) + opening of onTheFly thirdparty, but conditions and parameters not yet correct 2022-02-16 10:46:06 +01:00
nobohan
50410d190f replace PersonRender by PersonRenderInterface 2022-02-16 10:38:58 +01:00
nobohan
b54e076ca0 PersonRenderInterface: remove methods 2022-02-16 10:27:34 +01:00
2ab7556ac3 Add workflows tab to dashboard 2022-02-16 10:26:00 +01:00
3d38da7b37 Add workflow notifications to the dashboard 2022-02-16 10:25:18 +01:00
056d5a3f98 Remove counter from 'mes parcours' 2022-02-16 10:24:05 +01:00
17612afd87 fix phpstan issues 2022-02-16 00:08:06 +01:00
0a4913f341 handle event PersonMoveEvent on Period 2022-02-15 23:52:15 +01:00
nobohan
3aa12d2e8c [person] Add a PersonRenderInterface 2022-02-15 17:48:54 +01:00
a6504366b4 Fix to display message in toast when user is forbidden to do something
Translation does not work
2022-02-15 14:34:40 +01:00
4e83e7905a Validation of confidential toggle added to accompanyingPeriod validator 2022-02-15 14:22:41 +01:00
nobohan
96b1854fef php code style fix 2022-02-15 13:57:02 +01:00
nobohan
489473806f upd CHANGELOG 2022-02-15 13:41:59 +01:00
nobohan
f5bc8dca5e thirdparty search: adapt pertinence select clause for searching into children 2022-02-15 13:39:46 +01:00
nobohan
bc99c85802 thirdparty search: add where clause for searching into children 2022-02-15 13:16:04 +01:00
385664e2bc fix merge conflict 2022-02-15 10:01:01 +01:00
1658fee090 test on members editor post move + listen for event (wip) 2022-02-15 00:23:01 +01:00
b9dbb1916a migration for history, and create history location on each change 2022-02-14 23:03:40 +01:00
nobohan
99afd2e830 OnTheFly: set a dynamic default 2022-02-14 22:03:11 +01:00
861f461bc5 workflow context for accompanying course document: ensure persons are represented as an array in json 2022-02-14 20:19:56 +01:00
b6c118a0c8 add informations to workflow normalization 2022-02-14 20:02:24 +01:00
89d3ab38f0 add endpoint to list workflows 2022-02-14 20:02:07 +01:00
441704dc29 first impl of event (WIP) 2022-02-14 18:29:11 +01:00
8ee451c6e0 fixes 2022-02-14 18:00:09 +01:00
nobohan
785e690404 On-the-fly: remove dead code: the logic of patching a person/thirdparty is now in the component in 2022-02-14 16:48:33 +01:00
nobohan
2fcd7a21a4 Accompanying course: can edit requestor in case no address 2022-02-14 16:47:35 +01:00
nobohan
d5c1591205 Accompanying course: remove unnecessary console.log 2022-02-14 16:15:38 +01:00
nobohan
7895699ef3 stronger client-side validation of addresses: also validate when initForm 2022-02-14 15:47:21 +01:00
nobohan
bd9963e65f Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber) 2022-02-14 15:00:57 +01:00
df61fbff12 merge conflicts resolved 2022-02-14 14:55:47 +01:00
844650b685 fix sending notification when unsetting a referrer from a period
When the user removes the referrer, a notification was send to a `null`
addressee, which causes an unhandled exception.
2022-02-14 14:22:33 +01:00
nobohan
a7a1f699bb AddPersons: fix regression bug when editing a person/thirdparty without query 2022-02-14 14:13:06 +01:00
nobohan
229a91ddf0 Accompanying course: treat vuejs warning by refactoring + delete unused v-model 2022-02-14 13:59:49 +01:00
68d0c66402 fix cs 2022-02-14 13:48:47 +01:00
c2a132a40b Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency 2022-02-14 13:40:23 +01:00
nobohan
94729a66ca AddPersons: add suggestion of name when creating new person or thirdparty 2022-02-14 12:22:02 +01:00
bd05315de3 csfixes 2022-02-14 12:02:32 +01:00
d254a9e14a add endDate field in HouseholdMember form for enfant hors menage 2022-02-14 12:02:15 +01:00
nobohan
1c3f6c7c1e AddPersons: allow creation of person or thirdparty depending on allowed types 2022-02-14 11:12:37 +01:00
nobohan
f8888462f1 addPersons: allow creation of person or thirdparty only (no users) 2022-02-14 10:23:49 +01:00
nobohan
4e2be091cd Merge branch 'issue415_filter_suggested_entities_by_close_participations' of gitlab.com:Chill-Projet/chill-bundles into issue415_filter_suggested_entities_by_close_participations 2022-02-11 17:41:50 +01:00
nobohan
40a1726ca7 upd CHANGELOG 2022-02-11 17:41:39 +01:00
nobohan
fc9deb8ba8 accompanying course: filter suggested entities by open participations 2022-02-11 17:41:12 +01:00
nobohan
b1993dbf22 accompanying course: filter suggested entities by open participations 2022-02-11 17:37:45 +01:00
973644c62d csfixes 2022-02-11 17:07:47 +01:00
b9af54892b changelog updated 2022-02-11 17:04:15 +01:00
f9154233e4 using renderbox and adjusting style + show button if person or thirdparty 2022-02-11 17:02:31 +01:00
nobohan
aa7da2559c [activity] correct associated persons by considering only open participations 2022-02-11 16:48:15 +01:00
753a007172 translation added for kind of resource 2022-02-11 16:32:28 +01:00
nobohan
01a3af694a activity: can click through the cross icon for removing person in concerned group 2022-02-11 15:49:49 +01:00
50b7df1f4a adding thirdparty info 2022-02-11 15:16:28 +01:00
bb93cb23a7 fix handling of address 2022-02-11 12:09:42 +01:00
57a88845dc Merge remote-tracking branch 'origin/master' into issue388_order_social_issues 2022-02-11 10:54:37 +01:00
3532e9dd8c changelog updated 2022-02-09 18:22:28 +01:00
fddb74f107 toggleConfidential reset to what it was before 2022-02-09 18:05:55 +01:00
ee817b1d62 url's and method changed for toggleIntensity and toggleConfidential 2022-02-09 17:56:53 +01:00
a399804094 Endpoint created + swagger documentation + controller action 2022-02-09 17:38:35 +01:00
05e9f118d7 Corrections voter + entity property intensity, not emergency 2022-02-09 17:18:45 +01:00
7aad5be29f Toggle_emergency variable added to voter 2022-02-09 17:08:29 +01:00
41b0dd50bd emergency property write permission removed from entity 2022-02-09 17:07:58 +01:00
4de2cbe807 return interchange of name and text back to how it was before -> solves one bug recreates the other 2022-02-09 09:53:15 +01:00
bc2d4c1066 Merge remote-tracking branch 'origin/issue433_email_addPerson' into issue345_internal_thirdparty_contact 2022-02-04 11:09:51 +01:00
298b597dd0 comment removed 2022-02-04 10:50:59 +01:00
481456a038 Merge conflicts fixed 2022-02-04 10:25:46 +01:00
nobohan
2c94811c8f person: social issue api controller: add onPostIndexBuildQuery 2022-02-01 17:01:19 +01:00
nobohan
eb32b13bcc person: rewrite social issue api controller for ordering 2022-02-01 16:49:14 +01:00
b87f14255d bugfix of double civility abbreviation after edit 2022-01-24 14:44:53 +01:00
0f2cbbe553 bugfix emit saveFormOnTheFly and add newly created contact to suggestion list immediately 2022-01-24 14:24:56 +01:00
256c5688a0 attempt to not include parent address 2022-01-19 16:51:21 +01:00
6460007aa1 changelog updated 2022-01-19 12:18:09 +01:00
f84e088e7b placeholders for civility and profession 2022-01-19 12:14:37 +01:00
b8e16d2929 correction for POST phonenumber and email 2022-01-19 11:06:07 +01:00
88fc5e94fa only show addcontact button for personne morale 2022-01-19 11:00:53 +01:00
4431428c26 possible to add a contact to a thirdparty 2022-01-19 10:57:31 +01:00
724ce8c9af small corrections 2022-01-19 09:57:19 +01:00
a31b74e0e5 further attempts to do POST of thirdparty contact, passing parent id causes problems + civility and profession fk's are not saved on POST 2022-01-17 12:00:22 +01:00
47615e2e5d merge conflicts fixed 2022-01-14 16:13:35 +01:00
475585c5e7 use correct button 2022-01-14 09:30:00 +01:00
a2e086be75 add a chill button "tpchild", to create on-the-fly thirdparty (kind=child) 2022-01-14 09:30:00 +01:00
e6cf1994b0 parent id added to thirdparty data 2022-01-14 09:30:00 +01:00
bea0b69858 v-model added so data is taken from the form for all fields + modal title correction 2022-01-14 09:30:00 +01:00
95547e961e onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet 2022-01-14 09:28:19 +01:00
c4a859f2d2 translations added 2022-01-14 09:27:36 +01:00
a39bd79930 endpoints created for profession and civility for use in vue component 2022-01-14 09:27:06 +01:00
424d0533b8 unsaved changes 2022-01-14 09:27:06 +01:00
5a7d187a10 unsaved changes 2022-01-14 09:27:06 +01:00
dc8dd6a423 button added to add contact to personne morale (styling not correct yet) + opening of onTheFly thirdparty, but conditions and parameters not yet correct 2022-01-14 09:27:06 +01:00
006e8cdc27 minor bug fix for view page of thirdparty property 'types' -> 'thirdPartyTypes' 2022-01-14 09:27:06 +01:00
cf4f6f06e9 use correct button 2022-01-13 17:58:30 +01:00
e467820345 add a chill button "tpchild", to create on-the-fly thirdparty (kind=child) 2022-01-13 17:53:32 +01:00
416a1c4e4d parent id added to thirdparty data 2022-01-13 16:36:54 +01:00
1febfc11e5 v-model added so data is taken from the form for all fields + modal title correction 2022-01-13 16:30:52 +01:00
a288fdf12d resolve merge conflict 2022-01-13 14:40:37 +01:00
6a3f17962b onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet 2022-01-13 14:35:53 +01:00
3860adc435 translations added 2022-01-13 14:34:28 +01:00
65daf2d0cf endpoints created for profession and civility for use in vue component 2022-01-13 14:33:57 +01:00
9bf41bbd34 unsaved changes 2022-01-12 17:41:58 +01:00
de7de22492 unsaved changes 2022-01-12 17:40:36 +01:00
ea66fb4c37 button added to add contact to personne morale (styling not correct yet) + opening of onTheFly thirdparty, but conditions and parameters not yet correct 2022-01-12 17:38:24 +01:00
c1232037a9 minor bug fix for view page of thirdparty property 'types' -> 'thirdPartyTypes' 2022-01-12 13:52:26 +01:00
75eb6414ce test set back to what it was otherwise error 2021-12-02 15:38:27 +01:00
5e7445a4fe stylefix 2021-12-02 15:31:38 +01:00
c527b1b3cf validation attempt with assert\callback: still doesn't work 2021-12-02 15:31:08 +01:00
acacef936c changelog updated and stylefix 2021-12-02 12:49:33 +01:00
f971dc05eb test written, but the validation expression is not yet correct 2021-12-02 12:33:10 +01:00
9aba4ea8f6 first commit 2021-11-29 14:06:22 +01:00
2964 changed files with 81709 additions and 66016 deletions

View File

@@ -18,3 +18,8 @@ max_line_length = 80
[COMMIT_EDITMSG]
max_line_length = 0
[*.{js, vue, ts}]
indent_size = 2
indent_style = space

4
.gitignore vendored
View File

@@ -1,4 +1,5 @@
.composer/*
composer
composer.phar
composer.lock
docs/build/
@@ -22,3 +23,6 @@ docs/build/
/.php-cs-fixer.cache
/.idea/
/.psalm/
node_modules/*

View File

@@ -29,6 +29,7 @@ variables:
REDIS_URL: redis://redis:6379
# change vendor dir to make the app install into tests/apps
COMPOSER_VENDOR_DIR: tests/app/vendor
DEFAULT_CARRIER_CODE: BE
stages:
- Composer install
@@ -78,6 +79,7 @@ psalm_tests:
image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
script:
- bin/grumphp run --tasks=psalm
allow_failure: true
artifacts:
expire_in: 30 min
paths:

View File

@@ -1,15 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
/** @var \drupol\PhpCsFixerConfigsPhp\Config\Php73 $config */
$config = require __DIR__ . '/tests/app/vendor/drupol/php-conventions/config/php73/php_cs_fixer.config.php';
$config

View File

@@ -11,9 +11,238 @@ and this project adheres to
## Unreleased
<!-- write down unreleased development here -->
* [person][export] Fixed: rename the alias for `accompanying_period` to `acp` in filter associated with person
* [activity][export] Feature: improve label for aliases in "Filter by activity type"
* [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
* [person][export] Fixed: some inconsistency with date filter on accompanying courses
* [person][export] Fixed: use left join for related entities in accompanying course aggregators
* [workflow] Feature: allow user to copy and send manually the access link for the workflow
* [workflow] Feature: show the email addresses that received an access link for the workflow
## Test releases
### 2.0.0-beta2
* [workflow]: Fixed: the notification is sent when the user is added to the first step.
* [budget] Feature: allow to desactivate some charges and resources, adding an `active` key in the configuration
* [person] Feature: on Evaluation, allow to configure an URL from the admin
### 2022-06
* [workflow]: added pagination to workflow list page
* [homepage_widget]: null error on tasks widget fixed
* [person-thirdparty]: fix quick-add of names that consist of multiple parts (eg. De Vlieger) within onthefly modal person/thirdparty
* [search]: Order of birthdate fields changed in advanced search to avoid confusion.
* [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
* [household]: Reposition and cut button for enfant hors menage have been deleted (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/620)
* [admin]: Add crud for composition type in admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/611)
* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
## Test releases
### 2022-05-30
* fix creating a new AccompanyingPeriodWorkEvaluationDocument when replacing the document (the workflow was lost)
### 2022-05-27
* [storedobject] add title field on StoredObject entity + use it in activity documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
* [main] add a "read more..." on comment embeddable when overflown (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
* [person] add closing motive to closed acc course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/603)
* [person] household filiation: fetch person info when unfolding person (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/586)
* [admin] repair edit of social action in the admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/601)
* [admin]: add select2 to Goal form type entity fields (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/702)
* [main] allow hide permissions group list menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
* [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
* [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
* [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
* [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
* [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
* [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
* [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)
* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
### 2022-05-06
* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
### 2021-04-29
* [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
* Load relationships without gender in french fixtures
* Add command to remove old draft accompanying periods
* [parcours]: If users assings him/herself as referrer and job is not null. Update parcours job (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/578)
### 2021-04-28
* [address] fix bug when editing address: update location and addressreferenceId + better update of the map in edition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/593)
* [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561)
* [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560)
* [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565)
* [parcours]: Comments can be unpinned + edit/delete for all users that are allowed to edit parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/566)
### 2021-04-26
* [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568)
* [Person_search] Closed parcours shown within an accordeon that can be opened/closed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/574)
### 2021-04-24
* [notification email on course designation] allow raw string in email content generation
* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
* [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634)
* [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572)
* [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570)
* [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573)
* [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943)
* [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older
* [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error
* [Notifications] delay the sending of notificaiton to kernel.terminate
* [Notifications / Period user change] fix the sending of notification when user changes
* [Activity form] invert 'incoming' and 'receiving' in Activity form
* [Activity form] keep the same order for 'attendee' field in new and edit form
* [list with period] use "sameas" test operator to introduce requestor in list
* [notification email on course designation] allow raw string in email content generation
* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
* [evaluation_document] changing date to datetime in order to display the time at which document was created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/569)
### 2021-04-13
* [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
* [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
* [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);
* [docgen] add a new context with a list of activities in course
* [docgen] add a comment in budget lines
* [notifications] allow to send a notification to an email address. The address receive an access link
* [adresses] add constraints in database to avoid errors later: postcode not null, and validfrom <= validto
* [accompanying work editor] add a label on document title input
### 2021-04-07
* notification list: move action buttons outside of the toggle
* fix detecting of non-read notification
* filter users which are disabled in search user api
* order query for location and add pagination in list
* allow every person which has part for a workflow to see the workflow page
* able to see the workflow if the evaluation document has been deleted
* hardcode the list of supported mime types for edition with collabora
* list of accompanying course: allow to see the pinned comment in list_item
### 2021-04-06
* [main] notification toggle read: correct js syntax for compilation in production (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/548)
* [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535)
* [activity] espace entre les boutons pour supprimer les documents
### continuous release in February and March
* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
* [person] Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported and if no keyInfos
(https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/585)
* [activity] display error messages above the form in creating a new location (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/481)
* [activity] show required field in activity edit/new by an asterix in the vuejs fields (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/494)
* [ACL] fix allow to see the course, event if the scope'course does not contains the scope's user
* [search] enforce limit of results for fetching rsults by search api https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/576
* [activity] Fix delete button for document (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/554)
* [activity] Add return path the document generation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/553)
* [person] add person ressource to person docgen normaliser (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/517)
* [person] AccompanyingCourseWorkEdit: fix deleting evaluation documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/546)
* [person] AccompanyingCourseWorkEdit: download existing documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/512)
* [person] AccompanyingCourseWorkEdit: replace document by a new one (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/511)
* [person] AccompanyingPeriodWork: add referrers to work, add doctrine event listener to add logged user to referrers collection and display a referrers list in work list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/502)
* [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
* [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
* [parcours] autosave of the pinned comment for draft accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/477)
* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
* [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
* [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)
* [activity] do not override location if already exist (when validating new activity) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/470)
* [parcours] Toggle emergency/intensity only by referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
* [docstore] Add an API entrypoint for StoredObject (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
* [person] Add the possibility of uploading existing documents to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
* [person] Add title to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
* [person] Order social issues by the field "ordering" (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/388)
* [Person/Household list] when listing other simultaneous members of an household, exclude the members on person, not on members (avoid to show two membersship with the same person)
* [draft periods] add a delete button (if acl granted) on each draft period listed on draft period page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/463)
* [Person] Display suffixText in RenderPerson, PersonText.vue, RenderPersonBox.vue (was made for displaying "enfant confie") (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/441)
* [budget]: budget enabled for persons and households (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/469)
* [person] residential address: show residential address or info in PersonRenderBox, refactor Residential Address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/439)
* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
* [documents] Improve flex-table item-col placement when long buttons and long metadata
* [thirdparty] Fix display of multiple contact badges so they wrap onto next line (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/482)
* [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue)
* [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
* [template] do not list inactive templates (for doc generator)
* [household] bugfix if position of member is null, renderbox no longer throws an error (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/480)
* [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
* [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
* [activity] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
* [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
* [address] person badge in address history changed to open OnTheFly with all person info (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/489)
* [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
* [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
* [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
* [person_resource] separate create page created to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/504)
* [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
* [thirdparty] For contacts show current civility/profession in edit form + fix saving of edited information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/491)
* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
* [thirdparty] add firstname field to thirdparty 'child' or 'contact' types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/508)
* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
* [parcours] List of parcours for a specific user so they can be reassigned in case of absence (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/509)
* [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
* [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
* [filiation] Possible to add person (or create onthefly) to add to filiation graph + add relation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/519)
* [household] Within parcours listing page of household add create button (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/560)
* [person_resource] bugfix when adding thirdparty or freetext resource + prevent personOwner themselves to be added. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/526)
* [aside_activity] style correction + sticky-form create button (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/529)
* [budget] order within the menu adjusted (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/592)
* [onthefly] fix create person. Bug was noticed in filiation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/591)
* [parcours] Create document buttons made sticky (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/532)
* [person] Trailing guillemet removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/530)
* [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537)
* [onthefly] trim trailing whitespace in email of person and thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/542)
* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
## Test releases
### test release 2022-02-21
* [notifications] Word 'un' changed to number '1' for notifications in user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/483)
* [documents] 'gabarit' changed to 'modèle' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/405)
* [person_resources] Menu name and order changed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/460)
* workflow: fix sending notifications
* [thirdparty] Extend the thirdparty search to thirdparty children (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/448)
* [person]: AddPersons: allow creation of person or thirdparty only (no users) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
* [person]: AddPersons: allow creation of person or thirdparty depending on allowed types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
* [person]: AddPersons: add suggestion of name when creating new person or thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
* [main] Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber)
* [main] Address: stronger client-side validation of addresses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/449)
* [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415)
[activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
[activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
* [person_resources]: Renderboxes used to display person/thirdparty info (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/465)
* [Household]: Add end date in HouseholdMember form for 'enfant hors menage' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/434)
* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
* [parcours]: Order social activities and only display most recent three in parcours resumé (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/481)
* [3party]: 3party: redirect to parent when contact (child) is opened in view page
* [parcours / addresses]: launch an event when a person change address (either through changing household or because the household is associated to a new address). If the person is localising a course, the course location go back to a temporarily address.
* [thirdparty]: address/phonenumber/email/fonction displayed in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/401)
* [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465)
* [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460)
### test release 2022-02-14
* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
@@ -22,13 +251,14 @@ and this project adheres to
* [person] accompanying course work: fix on-the-fly update of thirdParty
* fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
* [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
* [person] accompanying course work: fix on-the-fly update of thirdParty
* [person] accompanying course work: fix on-the-fly update of thirdParty
* [on-the-fly] close modal only after validation
* [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
* change order for accompanying course work list
* [parcours]: Mes parcours brouillon added to user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/440)
* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
* [person]: style fix in parcours listing per person. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/432)
* [parcours]: Only the referrer can toggle the intensity of the parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
* [household]: display address of current household (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/415)
* ajoute un ordre dans les localisation (api)
* [pick entity]: fix translations in modal (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/419)
@@ -38,7 +268,8 @@ and this project adheres to
* [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
* [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
### test release 2021-02-01
@@ -59,6 +290,9 @@ and this project adheres to
* [AddAddress] disable multiselect search, and rely only on most pertinent Cities and Street computed backend
* [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
### test release 2021-01-31
@@ -265,6 +499,7 @@ and this project adheres to
* add an endpoint for checking permissions. See https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/232
* [activity] for a new activity: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
* [calendar] for a new rdv: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
* [period] Validation added when period is confidential and confirmed -> user cannot be null.
## Test releases

View File

@@ -2,7 +2,14 @@
en cours de rédaction
## Translations
Par bundle, toutes les traductions des pages twig se trouvent dans un seul fichier `translations/messages.fr.yaml`.
## Emplacement des fichiers
Les controllers, form type & templates twig sont placés à la racine des dossiers `Controller`, `Form` & `Ressources/views`, respectivement. Pour les pages Admin, on ne les mets plus dans des sous-dossiers Admin.
## Assets: nommage des entrypoints
Trois types d'entrypoint:
@@ -146,19 +153,20 @@ Ces règles n'ont pas toujours été utilisées par le passé. Elles sont souhai
Les routes sont nommées de cette manière:
`chill_bundle_entite_action`
`chill_(api|crud)_bundle_(api)_entite_action`
1. d'abord chill_ (pour tous les modules chill)
2. ensuite une string qui est identique, par bundle
3. si le point est un point d'api (json), alors ajouter la string `api`
4. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
5. ensuite une action (`list`, `view`, `edit`, `new`, ...)
2. ensuite `crud` ou `api`, optionnel, automatiquement ajouté si la route est générée par la configuration
3. ensuite une string qui indique le bundle (`main`, `person`, `activity`, ...)
4. ensuite, `api`, si la route est une route d'api.
5. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
6. ensuite une action (`list`, `view`, `edit`, `new`, ...)
Le fait d'indiquer `api` en 3 permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
Le fait d'indiquer `api` en quatrième position permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
Si les points 4 et 5 sont inexistants, alors ils sont remplacés par d'autres éléments de manière à garantir l'unicité de la route, et sa bonne compréhension.
### URL
### Nommage des URL
Les URL respectent également une convention:
@@ -219,6 +227,14 @@ Les éléments suivants devraient se trouver dans la liste:
Ces éléments peuvent être entrecoupés de l'identifiant d'une entité. Dans ce cas, cet identifiant se place juste après l'entité auquel il se rapporte.
#### Pour les URL de l'espace Admin
Même conventions que dans les autres pages html de l'application, **mais `admin` est ajouté en deuxième position**. Soit:
`/{_locale}/admin/bundle/entity/{id}/action`
## Règles UI chill
### Titre des pages

View File

@@ -10,18 +10,21 @@
"require": {
"php": "^7.4",
"champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290",
"champs-libres/wopi-bundle": "dev-master#59b468503b9413f8d588ef9e626e7675560db3d8",
"champs-libres/wopi-lib": "dev-master#0e1da19bb6de820080b8651867a7e475be590060",
"champs-libres/wopi-bundle": "dev-master#6dd8e0a14e00131eb4b889ecc30270ee4a0e5224",
"champs-libres/wopi-lib": "dev-master#8615f4a45a39fc2b6a98765ea835fcfd39618787",
"doctrine/doctrine-bundle": "^2.1",
"doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/orm": "^2.7",
"doctrine/orm": "2.13.5",
"erusev/parsedown": "^1.7",
"graylog2/gelf-php": "^1.5",
"knplabs/knp-menu-bundle": "^3.0",
"knplabs/knp-time-bundle": "^1.12",
"knpuniversity/oauth2-client-bundle": "^2.10",
"league/csv": "^9.7.1",
"nyholm/psr7": "^1.4",
"ocramius/package-versions": "^1.10",
"ocramius/package-versions": "^1.10 || ^2",
"odolbeau/phone-number-bundle": "^3.6",
"ovh/ovh": "^3.0",
"phpoffice/phpspreadsheet": "^1.16",
"ramsey/uuid-doctrine": "^1.7",
"sensio/framework-extra-bundle": "^5.5",
@@ -32,8 +35,10 @@
"symfony/expression-language": "^4.4",
"symfony/form": "^4.4",
"symfony/framework-bundle": "^4.4",
"symfony/http-foundation": "^4.4",
"symfony/intl": "^4.4",
"symfony/mailer": "^5.4",
"symfony/messenger": "^5.4",
"symfony/mime": "^5.4",
"symfony/monolog-bundle": "^3.5",
"symfony/security-bundle": "^4.4",
@@ -43,9 +48,11 @@
"symfony/translation": "^4.4",
"symfony/twig-bundle": "^4.4",
"symfony/validator": "^4.4",
"symfony/web-link": "*",
"symfony/webpack-encore-bundle": "^1.11",
"symfony/workflow": "^4.4",
"symfony/yaml": "^4.4",
"thenetworg/oauth2-azure": "^2.0",
"twig/extra-bundle": "^3.0",
"twig/intl-extra": "^3.0",
"twig/markdown-extra": "^3.3",
@@ -93,7 +100,8 @@
"autoload-dev": {
"psr-4": {
"App\\": "tests/app/src/",
"Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
"Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
"Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
}
},
"config": {
@@ -102,7 +110,8 @@
"ergebnis/composer-normalize": true,
"ocramius/package-versions": true,
"phpro/grumphp": true,
"phpstan/extension-installer": true
"phpstan/extension-installer": true,
"roave/you-are-using-it-wrong": true
},
"bin-dir": "bin",
"optimize-autoloader": true,

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\PersonBundle\Export\Filter;
use Chill\MainBundle\Export\ExportElementValidatedInterface;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\PersonBundle\Export\Export;
use Chill\MainBundle\Export\ExportInterface;
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Query;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Role\Role;
class CountPerson implements ExportInterface
{
@@ -73,9 +72,9 @@ class CountPerson implements ExportInterface
return ['export_result'];
}
public function getResult($qb, $data)
public function getResult($query, $data)
{
return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
}
public function getTitle()
@@ -106,9 +105,9 @@ class CountPerson implements ExportInterface
return $qb;
}
public function requiredRole()
public function requiredRole(): string
{
return new Role(PersonVoter::STATS);
return PersonVoter::STATS;
}
public function supportsModifiers()

View File

@@ -0,0 +1,93 @@
.. Copyright (C) 2014-2023 Champs Libres Cooperative SCRLFS
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
A copy of the license is included in the section entitled "GNU
Free Documentation License".
.. _cronjob:
Cron jobs
*********
Some tasks must be executed regularly: refresh some materialized views, remove old data, ...
For this purpose, one can programmatically implements a "cron job", which will be scheduled by a specific command.
The command :code:`chill:cron-job:execute`
==========================================
The command :code:`chill:cron-job:execute` will schedule a task, one by one. In a classical implementation, it should
be executed every 15 minutes (more or less), to ensure that every task can be executed.
.. warning::
This command should not be executed in parallel. The installer should ensure that two job are executed concurrently.
How to implements a cron job ?
==============================
Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
.. code-block:: php
namespace Chill\MainBundle\Service\Something;
use Chill\MainBundle\Cron\CronJobInterface;
use Chill\MainBundle\Entity\CronJobExecution;
use DateInterval;
use DateTimeImmutable;
class MyCronJob implements CronJobInterface
{
public function canRun(?CronJobExecution $cronJobExecution): bool
{
// the parameter $cronJobExecution contains data about the last execution of the cronjob
// if it is null, it should be executed immediatly
if (null === $cronJobExecution) {
return true;
}
if ($cronJobExecution->getKey() !== $this->getKey()) {
throw new UnexpectedValueException();
}
// this cron job should be executed if the last execution is greater than one day, but only during the night
$now = new DateTimeImmutable('now');
return $cronJobExecution->getLastStart() < $now->sub(new DateInterval('P1D'))
&& in_array($now->format('H'), self::ACCEPTED_HOURS, true)
// introduce a random component to ensure a roll of task execution when multiple instances are hosted on same machines
&& mt_rand(0, 5) === 0;
}
public function getKey(): string
{
return 'arbitrary-and-unique-key';
}
public function run(): void
{
// here, we execute the command
}
}
How are cron job scheduled ?
============================
If the command :code:`chill:cron-job:execute` is run with one or more :code:`job` argument, those jobs are run, **without checking that the job can run** (the method :code:`canRun` is not executed).
If any :code:`job` argument is given, the :code:`CronManager` schedule job with those steps:
* the tasks are ordered, with:
* a priority is given for tasks that weren't never executed;
* then, the tasks are ordered, the last executed are the first in the list
* then, for each tasks, and in the given order, the first task where :code:`canRun` return :code:`TRUE` will be executed.
The command :code:`chill:cron-job:execute` execute **only one** task.

View File

@@ -10,17 +10,17 @@
Exports
*******
Export is an important issue for the Chill software : users should be able to :
Export is an important issue within the Chill software : users should be able to :
- compute statistics about their activity ;
- list "things" which make part of their activities.
- list "things" which are a part of their activities.
The `main bundle`_ provides a powerful framework to build custom queries with re-usable parts across differents bundles.
.. contents:: Table of content
:local:
.. seealso::
.. seealso::
`The issue where this framework was discussed <https://git.framasoft.org/Chill-project/Chill-Main/issues/9>`_
Provides some information about the pursued features and architecture.
@@ -32,37 +32,37 @@ Concepts
Some vocabulary: 3 "Export elements"
------------------------------------
Four terms are used for this framework :
Four terms are used for this framework :
exports
provides some basic operation on the date. Two kind of exports are available :
Exports
provide some basic operation on the data. Two kinds of exports are available :
- computed data : it may be "the number of people", "the number of activities", "the duration of activities", ...
- list data : it may be "the list of people", "the list of activity", ...
- list data : it may be "the list of people", "the list of activities", ...
filters
The filters make a filter on the date: it removes some information the user doesn't want to introduce in the computation done by export. In other word, filters make a filter...
Filters
The filters create a filter on the data: it removes some information the user doesn't want to introduce in the computation done by the export.
Example of filter: "people under 18 years olds", "activities between the 1st of June and the 31st December", ...
Example of a filter: "people under 18 years olds", "activities between the 1st of June and the 31st December", ...
aggregators
The aggregator aggregates the data into some group (some software use the term 'bucket').
Aggregators
The aggregator aggregates the data into some group (some software use the term 'bucket').
Example of aggregator : "group people by gender", "group people by nationality", "group activity by type", ...
Example of an aggregator : "group people by gender", "group people by nationality", "group activity by type", ...
formatters
The formatters format the data into a :class:`Symfony\Component\HttpFoundation\Response`, which will be returned "as is" by the controller to the web client.
Formatters
The formatters format the data into a :class:`Symfony\Component\HttpFoundation\Response`, which will be returned "as is" by the controller to the web client.
Example of formatter: "format data as CSV", "format data as ods spreadsheet", ...
Example of a formatter: "format data as CSV", "format data as an ods spreadsheet", ...
Anatomy of an export
---------------------
An export may be explained as a sentence, where each part of this sentence refers to one or multiple exports element. Examples :
An export can be thought of as a sentence where each part of this sentence refers to one or multiple export elements. Examples :
**Example 1**: Count the number of people having at least one activity in the last 12 month, and group them by nationality and gender, and format them in a CSV spreadsheet.
Here :
Here :
- *count the number of people* is the export part
- *having at least one activity* is the filter part
@@ -72,10 +72,10 @@ Here :
Note that :
- aggregators, filters, exports and aggregators are cross-bundle. Here the bundle *activity* provides a filter which apply on an export provided by the person bundle ;
- there may exists multiple aggregator or filter for one export. Currently, only one export is allowed.
- Aggregators, filters, exports and formatters are cross-bundle. Here the bundle *activity* provides a filter which is applied on an export provided by the person bundle ;
- Multiple aggregator or filter for one export may exist. Currently, only one export is allowed.
The result might be :
The result might be :
+-----------------------+----------------+---------------------------+
| Nationality | Gender | Number of people |
@@ -89,9 +89,9 @@ The result might be :
| France | Female | 150 |
+-----------------------+----------------+---------------------------+
**Example 2**: Count the average duration of an activity with type "meeting", which occurs between the 1st of June and the 31st of December, group them by week, and format the data in a OpenDocument spreadsheet.
**Example 2**: Count the average duration of an activity with type "meeting", which occurs between the 1st of June and the 31st of December, group them by week, and format the data in an OpenDocument spreadsheet.
Here :
Here :
- *count the average duration of an activity* is the export part
- *activity with type meeting* is a filter part
@@ -102,7 +102,7 @@ Here :
The result might be :
+-----------------------+----------------------+
| Week | Number of activities |
| Week | Number of activities |
+=======================+======================+
| 2015-10 | 10 |
+-----------------------+----------------------+
@@ -116,77 +116,77 @@ The result might be :
Authorization and exports
-------------------------
Exports, filters and aggregators should not make see data the user is not allowed to see.
Exports, filters and aggregators should not show data the user is not allowed to see within the application.
In other words, developers are required to take care of user authorization for each export.
It should exists a special role that should be granted to users which are allowed to build exports. For more simplicity, this role should apply on center, and should not requires special circles.
There should be a specific role that grants permission to users who are allowed to build exports. For more simplicity, this role should apply on a center, and should not require special circles.
How does the magic works ?
How does the magic work ?
===========================
To build an export, we rely on the capacity of the database to execute queries with aggregate (i.e. GROUP BY) and filter (i.e. WHERE) instructions.
An export is an SQL query which is initiated by an export, and modified by aggregators and filters.
.. note::
.. note::
**Example**: Count the number of people having at least one activity in the last 12 month, and group them by nationality and gender
1. The report initiate the query
1. The report initiates the query
.. code-block:: SQL
SELECT count(people.*) FROM people
2. The filter add a where and join clause :
2. The filter adds a where and join clause :
.. code-block:: SQL
SELECT count(people.*) FROM people
RIGHT JOIN activity
SELECT count(people.*) FROM people
RIGHT JOIN activity
WHERE activity.date IS BETWEEN now AND 6 month ago
3. The aggregator "nationality" add a GROUP BY clause and a column in the SELECT statement:
3. The aggregator "nationality" adds a GROUP BY clause and a column in the SELECT statement:
.. code-block:: sql
SELECT people.nationality, count(people.*) FROM people
RIGHT JOIN activity
WHERE activity.date IS BETWEEN now AND 6 month ago
SELECT people.nationality, count(people.*) FROM people
RIGHT JOIN activity
WHERE activity.date IS BETWEEN now AND 6 month ago
GROUP BY nationality
4. The aggregator "gender" do the same job as the nationality aggregator : it adds a GROUP BY clause and a column in the SELECT statement :
4. The aggregator "gender" does the same job as the nationality aggregator : it adds a GROUP BY clause and a column in the SELECT statement :
.. code-block:: sql
SELECT people.nationality, people.gender, count(people.*)
FROM people RIGHT JOIN activity
WHERE activity.date IS BETWEEN now AND 6 month ago
SELECT people.nationality, people.gender, count(people.*)
FROM people RIGHT JOIN activity
WHERE activity.date IS BETWEEN now AND 6 month ago
GROUP BY nationality, gender
Each filter, aggregator and filter may collect parameters from the user by providing a form. This form is appended to the export form. Here is an example.
Each filter, aggregator and filter may collect parameters from the user through a form. This form is appended to the export form. Here is an example.
.. figure:: /_static/screenshots/development/export_form-fullpage.png
The screenshot show the export form for ``CountPeople`` (Nombre de personnes). The filter by date of birth is checked (*Filtrer par date de naissance de la personne*), which allow to show a subform, which is provided by the :class:`Chill\PersonBundle\Export\Filter\BirthdateFilter`. The other filter, which are unchecked, does not show the subform.
The screenshot shows the export form for ``CountPeople`` (Nombre de personnes). The filter by date of birth is checked (*Filtrer par date de naissance de la personne*), which triggers a subform, which is provided by the :class:`Chill\PersonBundle\Export\Filter\BirthdateFilter`. The other unchecked filter does not show the subform.
Two aggregators are also checked : by Country of birth (*Aggréger les personnes par pays de naissance*, corresponding class is :class:`Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator`, which also open a subform. The aggregator by gender (*Aggréger les personnes par genre*) is also checked, but there is no corresponding subform.
Two aggregators are also checked : by Country of birth (*Aggréger les personnes par pays de naissance*, the corresponding class is :class:`Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator`, which also triggers a subform. The aggregator by gender (*Aggréger les personnes par genre*) is also checked, but there is no corresponding subform.
The Export Manager
------------------
The Export manager (:class:`Chill\MainBundle\Export\ExportManager` is the central class which register all exports, aggregators, filters and formatters.
The Export manager (:class:`Chill\MainBundle\Export\ExportManager` is the central class which registers all exports, aggregators, filters and formatters.
The export manager is also responsible for orchestrating the whole export process, producing a :class:`Symfony\FrameworkBundle\HttpFoundation\Request` to each export request.
The export manager is also responsible for orchestrating the whole export process, producing a :class:`Symfony\FrameworkBundle\HttpFoundation\Request` for each export request.
The export form step
--------------------
The form step allow to build a form, aggregating different parts of the module.
The form step allows you to build a form, combining different parts of the module.
The building of forms is separated between different subform, which are responsible for rendering their part of the form (aggregators, filters, and export).
The building of forms is split into different subforms, where each one is responsible for rendering their part of the form (aggregators, filters, and export).
.. figure:: /_static/puml/exports/form_steps.png
:scale: 40%
@@ -194,12 +194,12 @@ The building of forms is separated between different subform, which are responsi
The formatter form step
-----------------------
The formatter form is processed *after* the user filled the export form. It is built the same way, but receive in parameters the data entered by the user on the previous step (i.e. export form). It may then adapt it accordingly (example: show a list of columns selected in aggregators).
The formatter form is processed *after* the user filled the export form. It is built the same way, but receives the data entered by the user on the previous step as parameters (i.e. export form). It may then adapt it accordingly (example: show a list of columns selected in aggregators).
Processing the export
---------------------
The export process may be explained by this schema :
The export process can be explained by this schema :
.. figure:: /_static/puml/exports/processing_export.png
:scale: 40%
@@ -219,20 +219,20 @@ This is an example of the ``CountPerson`` export :
:language: php
:linenos:
* **Line 36**: the ``getType`` function return a string. This string will be used to find the aggregtors and filters which will apply to this export.
* **Line 41**: a simple description to help user to understand what your export does.
* **Line 36**: the ``getType`` function returns a string. This string will be used to find the aggregtors and filters which will apply to this export.
* **Line 41**: a simple description to help users understand what your export does.
* **Line 46**: The title of the export. A summary of what your export does.
* **Line 51**: The list of roles requires to execute this export.
* **Line 51**: The list of roles required to execute this export.
* **Line 56**: We initiate the query here...
* **Line 59**: We have to filter the query with centers the users checked in the form. We process the $acl variable to get all ``Center`` object in one array
* **Line 63**: We create the query, with a query builder.
* **Line 74**: We simply returns the result, but take care of hydrating the results as an array.
* **Line 103**: return the list of formatters types which are allowed to apply on this filter
* **Line 59**: We have to filter the query with centers the users checked in the form. We process the $acl variable to get all ``Center`` objects in one array
* **Line 63**: We create the query with a query builder.
* **Line 74**: We return the result, but make sure to hydrate the results as an array.
* **Line 103**: return the list of formatter types which are allowed to be applied on this filter
Filters
-------
This is an example of the *filter by birthdate*. This filter ask some information in a form (`buildForm` is not empty), and this form must be validated. To performs this validations, we implement a new Interface: :class:`Chill\MainBundle\Export\ExportElementValidatedInterface`:
This is an example of the *filter by birthdate*. This filter asks some information through a form (`buildForm` is not empty), and this form must be validated. To perform this validation, we implement a new Interface: :class:`Chill\MainBundle\Export\ExportElementValidatedInterface`:
.. literalinclude:: /_static/code/exports/BirthdateFilter.php
:language: php

View File

@@ -34,6 +34,7 @@ As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the fram
Useful snippets <useful-snippets.rst>
manual/index.rst
Assets <assets.rst>
Cron Jobs <cronjob.rst>
Layout and UI
**************

View File

@@ -32,7 +32,7 @@ Then, render the pagination using the dedicated twig function.
{% block title 'Item list'|trans %}
{% block personcontent %}
{% block content %}
<table>

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\MyBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\HealthBundle\Controller;
use Chill\HealthBundle\Security\Authorization\ConsultationVoter;

View File

@@ -156,7 +156,7 @@ This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the p
It proposes 1 new block :
* personcontent
* content
* where to display the information of the person

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\MainBundle\DependencyInjection;
use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\MainBundle\DependencyInjection;
use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\PersonBundle\Widget;
use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\PersonBundle\Widget;
use Chill\MainBundle\Security\Authorization\AuthorizationHelper;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\PersonBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;

View File

@@ -14,6 +14,14 @@
Installation & Usage
####################
.. toctree::
:maxdepth: 2
prod.rst
load-addresses.rst
prod-calendar-sms-sending.rst
msgraph-configure.rst
Requirements
************
@@ -21,31 +29,74 @@ Requirements
- This project use `docker <https://docker.com>`_ to be run. As a developer, use `docker-compose <https://docs.docker.com/compose/overview/>`_ to bootstrap a dev environment in a glance. You do not need any other dependencies ;
- Make is used to automate scripts.
Installation in development mode
********************************
Installation
************
If you plan to run chill in production:
1. install it locally first, and check if everything is ok on your local machine;
2. once ready, build the image from your local machine, and deploy them.
If you want to develop some bundles, the first step is sufficient (until you deploy on production).
1. Get the code
===============
Clone or download the chill-app project and `cd` into the main directory.
Clone or download the chill-skeleton project and `cd` into the main directory.
.. code-block:: bash
git clone https://gitlab.com/Chill-Projet/chill-app.git
git clone https://gitlab.com/Chill-Projet/chill-skeleton-basic.git
cd chill-app
As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.
2. Prepare your variables
=========================
2. Prepare composer to download the sources
===========================================
Have a look at the variable in ``.env.dist`` and in ``app/config/parameters.yml.dist`` and check if you need to adapt them. If they do not adapt with your need, or if some are missing:
As you are running in dev, you must configure an auth token for getting the source code.
1. copy the file as ``.env``: ``cp .env.dist .env``
.. warning
If you skip this part, the code will be downloaded from dist instead of source (with git repository). You will probably replace the source manually, but the next time you will run ```composer update```, your repository will be replaced and you might loose something.
1. Create a personal access token from https://gitlab.com/-/profile/personal_access_tokens, with the `read_api` scope.
2. add a file called ```.composer/auth.json``` with this content:
.. code-block:: json
{
"gitlab-token": {
"gitlab.com": "glXXX-XXXXXXXXXXXXXXXXXXXX"
}
}
2. Prepare your variables and environment
=========================================
Copy ```docker-compose.override.dev.yml``` into ```docker-compose.override.yml```
.. code-block:: bash
cp docker-compose.override.dev.template.yml docker-compose.override.yml
2. Prepare your variables and docker-compose
============================================
Have a look at the variable in ``.env`` and check if you need to adapt them. If they do not adapt with your need, or if some are missing:
1. copy the file as ``.env.local``: ``cp .env .env.local``
2. you may replace some variables inside ``.env``
Prepare also you docker-compose installation, and adapt it to your needs:
1. If you plan to deploy on dev, copy the file ``docker-compose.override.dev.template.yml`` to ``docker-compose.override.yml``.
2. adapt to your needs.
**Note**: If you intend to use the bundle ``Chill-Doc-Store``, you will need to configure and install an openstack object storage container with temporary url middleware. You will have to configure `secret keys <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html#secret-keys>`_.
3. Run the bootstrap script
@@ -60,10 +111,32 @@ This script can be run using `make`
This script will :
1. force docker-compose to, eventually, pull the base images and build the image used by this project ;
2. run an install script to download `composer <https://getcomposer.org>`_ ;
2. run an install script to download `composer <https://getcomposer.org>`_ ;
3. install the php dependencies
4. build assets
.. warning::
The script will work only if the binary ``docker-compose`` is located into your ``PATH``. If you use ``compose`` as a docker plugin,
you can simulate this binary by creating this file at (for instance), ``/usr/local/bin/docker-compose`` (and run ``chmod +x /usr/local/bin/docker-compose``):
.. code-block:: bash
#!/bin/bash
/usr/bin/docker compose "$@"
.. note::
In some cases it can happen that an old image (chill_base_php or chill_php) stored in the docker cache will make the script fail. To solve this problem you have to delete the image and the container, before the make init :
.. code-block:: bash
docker-compose images php
docker rmi -f chill_php:prod
docker-compose rm php
4. Start the project
====================
@@ -76,13 +149,20 @@ This script will :
.. code-block:: bash
make migrate
# mount into to container
./docker-php.sh
# and load fixtures
bin/console doctrine:migrations:migrate
Chill will be available at ``http://localhost:8001.`` Currently, there isn't any user or data. To add fixtures, run
.. code-block:: bash
docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load --purge-with-truncate
# mount into to container
./docker-php.sh
# and load fixtures
bin/console doctrine:fixtures:load --purge-with-truncate
There are several users available:
@@ -91,7 +171,8 @@ There are several users available:
The password is always ``password``.
Now, read `Operations` below.
Now, read `Operations` below. For running in production, read `prod_`.
Operations
**********
@@ -99,7 +180,7 @@ Operations
Build assets
============
run those commands:
run those commands:
.. code-block:: bash
@@ -111,8 +192,8 @@ How to execute the console ?
.. code-block:: bash
# if a container is running
docker-compose exec --user $(id -u) php bin/console
# if not
./docker-php.sh
# if not
docker-compose run --user $(id -u) php bin/console
How to create the database schema (= run migrations) ?
@@ -121,8 +202,9 @@ How to create the database schema (= run migrations) ?
.. code-block:: bash
# if a container is running
docker-compose exec --user $(id -u) php bin/console doctrine:migrations:migrate
# if not
./docker-php.sh
bin/console doctrine:migrations:migrate
# if not
docker-compose run --user $(id -u) php bin/console doctrine:migrations:migrate
@@ -139,8 +221,9 @@ How to load fixtures ? (development mode only)
.. code-block:: bash
# if a container is running
docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load
# if not
./docker-php.sh
bin/console doctrine:fixtures:load
# if not
docker-compose run --user $(id -u) php bin/console doctrine:fixtures:load
How to open a terminal in the project
@@ -149,8 +232,8 @@ How to open a terminal in the project
.. code-block:: bash
# if a container is running
docker-compose exec --user $(id -u) php /bin/bash
# if not
./docker-php.sh
# if not
docker-compose run --user $(id -u) php /bin/bash
How to run composer ?
@@ -159,21 +242,22 @@ How to run composer ?
.. code-block:: bash
# if a container is running
docker-compose exec --user $(id -u) php ./composer.phar
# if not
docker-compose run --user $(id -u) php ./composer.phar
./docker-php.sh
composer
# if not
docker-compose run --user $(id -u) php composer
How to access to PGADMIN ?
==========================
Pgadmin is installed with docker-compose.
Pgadmin is installed with docker-compose, and is available **only if you uncomment the appropriate lines into ``docker-compose.override.yml``.
You can access it at ``http://localhost:8002``.
Credentials:
- login: admin@chill.social
- password: password
- login: from the variable you set into ``docker-composer.override.yml``
- password: same :-)
How to run tests ?
==================
@@ -182,30 +266,72 @@ Tests reside inside the installed bundles. You must `cd` into that directory, do
**Note**: some bundle require the fixture to be executed. See the dedicated _how-tos_.
Exemple, for running test inside `main` bundle:
Exemple, for running unit test inside `main` bundle:
.. code-block:: bash
# mount into the php image
docker-compose run --user $(id -u) php /bin/bash
./docker-php.sh
# cd into main directory
cd vendor/chill-project/main
cd vendor/chill-project/chill-bundles
# download deps
php ../../../composer.phar install
git submodule init
git submodule update
composer install
# run tests
/vendor/bin/phpunit
bin/phpunit src/Bundle/path/to/your/test
Or for running tests to check code style and php conventions with csfixer and phpstan:
.. code-block:: bash
# run code style fixer
bin/grumphp run --tasks=phpcsfixer
# run phpstan
bin/grumphp run --tasks=phpstan
.. note::
To avoid phpstan block your commits:
.. code-block:: bash
git commit -n ...
To avoid phpstan block your commits permanently:
.. code-block:: bash
./bin/grumphp git:deinit
How to run webpack interactively
================================
Executing :code:`bash docker-node.sh` will open a terminal in a node container, with volumes mounted.
Build the documentation API
===========================
How to switch the branch for chill-bundles, and get new dependencies
====================================================================
A basic configuration of `sami <https://github.com/FriendsOfPhp/Sami>`_ is embedded within the project.
During development, you will switch to new branches for chill-bundles. As long as the dependencies are equals, this does not cause any problem. But sometimes, a new branch introduces a new dependency, and you must download it.
A configuration file for `phpDocumentor <https://www.phpdoc.org>`_ is present.
.. warning::
Ensure that you have gitlab-token ready before updating your branches. See above.
In order to do that without pain, use those steps:
0. Ensuire you have a token, set
1. at the app's root, update the ``composer.json`` to your current branch:
.. code-block:: json
{
"require": {
"chill-bundles": "dev-<my-branch>@dev"
}
2. mount into the php container (``./docker-php.sh``), and run ``composer update``
Error `An exception has been thrown during the rendering of a template ("Asset manifest file "/var/www/app/web/build/manifest.json" does not exist.").` on first run
====================================================================================================================================================================
@@ -219,8 +345,9 @@ Currently, to run this software in production, the *state of the art* is the fol
1. Run the software locally and tweak the configuration to your needs ;
2. Build the image and store them into a private container registry. This can be done using :code:`make build-and-push-image`.
To be sure to target the correct container registry, you have to adapt the values ``IMAGE_NGINX`` and ``IMAGE_PHP`` date in the ``.env`` file.
To be sure to target the correct container registry, you have to adapt the image names into your ``docker-compose.override.yml`` file.
3. Push the image on your registry, or upload them to the destination machine using ``docker image save`` and ``docker image load``.
3. Run the image on your production server, using docker-compose or eventually docker stack. You have to customize the variable set in docker-compose.
See also the :ref:`running-production-tips-and-tricks` below.
@@ -252,7 +379,7 @@ It is worth having an eye on the configuration of logstash container.
Design principles
*****************
Why the DB URL is set in environment, and not in parameters.yml ?
Why the DB URL is also set in environment, and not in .env file ?
=================================================================
Because, at startup, a script does check the db is up and, if not, wait for a couple of seconds before running ``entrypoint.sh``. For avoiding double configuration, the configuration of the PHP app takes his configuration from environment also (and it will be standard in future releases, with symfony 4.0).

View File

@@ -0,0 +1,50 @@
.. _addresses:
Addresses
*********
Chill can store a list of geolocated address references, which are used to suggest address and ensure that the data is correctly stored.
Those addresses may be load from a dedicated source.
In France
=========
The address are loaded from the `BANO <https://bano.openstreetmap.fr/>`_. The postal codes are loaded from `the official list of
postal codes <https://datanova.laposte.fr/explore/dataset/laposte_hexasmal/information/>`_
.. code-block:: bash
# first, load postal codes
bin/console chill:main:postal-code:load:FR
# then, load all addresses, by departement (multiple departement can be loaded by repeating the departement code
bin/console chill:main:address-ref-from-bano 57 54 51
In Belgium
==========
Addresses are prepared from the `BeST Address data <https://www.geo.be/catalog/details/ca0fd5c0-8146-11e9-9012-482ae30f98d9>`_.
Postal code are loaded from this database. There is no need to load postal codes from another source (actually, this is strongly discouraged).
The data are prepared for Chill (`See this repository <https://gitea.champs-libres.be/Chill-project/belgian-bestaddresses-transform/releases>`_).
One can select postal code by his first number (:code:`1xxx` for postal codes from 1000 to 1999), or a limited list for development purpose.
.. code-block:: bash
# load postal code from 1000 to 3999:
bin/console chill:main:address-ref-from-best-addresse 1xxx 2xxx 3xxx
# load only an extract (for dev purposes)
bin/console chill:main:address-ref-from-best-addresse extract
# load full addresses (discouraged)
bin/console chill:main:address-ref-from-best-addresse full
.. note::
There is a possibility to load the full list of addresses is discouraged: the loading is optimized with smaller extracts.
Once you load the full list, it is not possible to load smaller extract: each extract loaded **after** will not
delete the addresses loaded with the full extract (and some addresses will be present twice).

View File

@@ -0,0 +1,320 @@
Configure Chill for calendar sync and SSO with Microsoft Graph (Outlook)
========================================================================
Chill offers the possibility to:
* authenticate users using Microsoft Graph, with relatively small adaptations;
* synchronize calendar in both ways (`see the user manual for a large description of the feature <https://gitea.champs-libres.be/Chill-project/manuals>`_).
Both can be configured separately (synchronising calendars without SSO, or SSO without calendar). When calendar sync is configured without SSL, the user's email address is the key to associate Chill's users with Microsoft's ones.
Configure SSO
-------------
On Azure side
*************
Configure an app with the Azure interface, and give it the name of your choice.
Grab the tenant's ID for your app, which is visible on the main tab "Vue d'ensemble":
.. figure:: ./saml_login_id_general.png
This the variable which will be named :code:`SAML_IDP_APP_UUID`.
Go to the "Single sign-on" ("Authentication unique") section. Choose "SAML" as protocol, and fill those values:
.. figure:: ./saml_login_1.png
1. The :code:`entityId` seems to be arbitrary. This will be your variable :code:`SAML_ENTITY_ID`;
2. The url response must be your Chill's URL appended by :code:`/saml/acs`
3. The only used attributes is :code:`emailaddress`, which must match the user's email one.
.. figure:: ./saml_login_2.png
You must download the certificate, as base64. The format for the download is :code:`cer`: you will remove the first and last line (the ones with :code:`-----BEGIN CERTIFICATE-----` and :code:`-----END CERTIFICATE-----`), and remove all the return line. The final result should be something as :code:`MIIAbcdef...XyZA=`.
This certificat will be your :code:`SAML_IDP_X509_CERT` variable.
The url login will be filled automatically with your tenant id.
Do not forget to provider user's accesses to your app, using the "Utilisateurs et groupes" tab:
.. figure:: ./saml_login_appro.png
You must know have gathered all the required variables for SSO:
.. code-block::
SAML_BASE_URL=https://test.chill.be # must be
SAML_ENTITY_ID=https://test.chill.be # must match the one entered
SAML_IDP_APP_UUID=42XXXXXX-xxxx-xxxx-xxxx-xxxxxxxxxxxx
SAML_IDP_X509_CERT: MIIC...E8u3bk # truncated
Configure chill app
*******************
* add the bundle :code:`hslavich/oneloginsaml-bundle`
* add the configuration file (see example above)
* configure the security part (see example above)
* add a user SAML factory into your src, and register it
.. code-block:: yaml
# config/packages/hslavich_onelogin.yaml
parameters:
saml_base_url: '%env(resolve:SAML_BASE_URL)%'
saml_entity_id: '%env(resolve:SAML_ENTITY_ID)%'
saml_idp_x509cert: '%env(resolve:SAML_IDP_X509_CERT)%'
saml_idp_app_uuid: '%env(resolve:SAML_IDP_APP_UUID)%'
hslavich_onelogin_saml:
# Basic settings
idp:
entityId: 'https://sts.windows.net/%saml_idp_app_uuid%/'
singleSignOnService:
url: 'https://login.microsoftonline.com/%saml_idp_app_uuid%/saml2'
binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
singleLogoutService:
url: 'https://login.microsoftonline.com/%saml_idp_app_uuid%/saml2'
binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
x509cert: '%saml_idp_x509cert%'
sp:
entityId: '%saml_entity_id%'
assertionConsumerService:
url: '%saml_base_url%/saml/acs'
binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST'
singleLogoutService:
url: '%saml_base_url%/saml/'
binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
privateKey: ''
# Optional settings.
baseurl: '%saml_base_url%/saml'
strict: true
debug: true
security:
nameIdEncrypted: false
authnRequestsSigned: false
logoutRequestSigned: false
logoutResponseSigned: false
wantMessagesSigned: false
wantAssertionsSigned: false
wantNameIdEncrypted: false
requestedAuthnContext: true
signMetadata: false
wantXMLValidation: true
signatureAlgorithm: 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256'
digestAlgorithm: 'http://www.w3.org/2001/04/xmlenc#sha256'
contactPerson:
technical:
givenName: 'Tech User'
emailAddress: 'techuser@example.com'
support:
givenName: 'Support User'
emailAddress: 'supportuser@example.com'
organization:
en:
name: 'Example'
displayname: 'Example'
url: 'http://example.com'
.. code-block:: yaml
# config/security.yaml
# merge this with other existing configurations
security:
providers:
saml_provider:
# Loads user from user repository
entity:
class: Chill\MainBundle\Entity\User
property: username
firewalls:
default:
# saml part:
saml:
username_attribute: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress
# weird behaviour in dev environment... configuration seems different
# username_attribute: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name
# Use the attribute's friendlyName instead of the name
use_attribute_friendly_name: false
user_factory: user_from_saml_factory
persist_user: true
check_path: saml_acs
login_path: saml_login
logout:
path: /saml/logout
.. code-block:: php
// src/Security/SamlFactory.php
namespace App\Security;
use Chill\MainBundle\Entity\User;
use Hslavich\OneloginSamlBundle\Security\Authentication\Token\SamlTokenInterface;
use Hslavich\OneloginSamlBundle\Security\User\SamlUserFactoryInterface;
class UserSamlFactory implements SamlUserFactoryInterface
{
public function createUser(SamlTokenInterface $token)
{
$attributes = $token->getAttributes();
$user = new User();
$user->setUsername($attributes['http://schemas.microsoft.com/identity/claims/displayname'][0]);
$user->setLabel($attributes['http://schemas.microsoft.com/identity/claims/displayname'][0]);
$user->setPassword('');
$user->setEmail($attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'][0]);
$user->setAttributes($attributes);
return $user;
}
}
Configure sync
--------------
The sync processe might be configured in the same app, or into a different app.
The synchronization processes use Oauth2.0 for authentication and authorization.
.. note::
Two flows are in use:
* we authenticate "on behalf of a user", to allow users to see their own calendar or other user's calendar into the web interface.
Typically, when the page is loaded, Chill first check that an authorization token exists. If not, the user is redirected to Microsoft Azure for authentification and a new token is grabbed (most of the times, this is transparent for users).
* Chill also acts "as a machine", to synchronize calendars with a daemon background.
One can access the configuration using this screen (it is quite well hidden into the multiple of tabs):
.. figure:: ./oauth_app_registration.png
You can find the oauth configuration on the "Securité > Autorisations" tab, and click on "application registration" (not translated).
Add a redirection URI for you authentification:
.. figure:: ./oauth_api_authentification.png
The URI must be "your chill public url" with :code:`/connect/azure/check` at the end.
Allow some authorizations for your app:
.. figure:: ./oauth_api_autorisees.png
Take care of the separation between autorization "on behalf of a user" (déléguée), or "for a machine" (application).
Some explanation:
* Users must be allowed to read their user profile (:code:`User.Read`), and the profile of other users (:code:`User.ReadBasicAll`);
* They must be allowed to read their calendar (:code:`Calendars.Read`), and the calendars shared with them (:code:`Calendars.Read.Shared`);
The sync daemon must have write access:
* the daemon must be allowed to read all users and their profile, to establish a link between them and the Chill's users: (:code:`Users.Read.All`);
* it must also be allowed to read and write into the calendars (:code:`Calendars.ReadWrite.All`)
* for sending invitation to other users, the permission (:code:`Mail.Send`) must be granted.
At this step, you might choose to accept those permissions for all users, or let them do it by yourself.
Grab your client id:
.. figure:: ./oauth_api_client_id.png
This will be your :code:`OAUTH_AZURE_CLIENT_ID` variable.
Generate a secret:
.. figure:: ./oauth_api_secret.png
This will be your :code:`OAUTH_AZURE_CLIENT_SECRET` variable.
And get you azure's tenant id, which is the same as the :code:`SAML_IDP_APP_UUID` (see above).
Your variables will be:
.. code-block::
OAUTH_AZURE_CLIENT_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
OAUTH_AZURE_CLIENT_TENANT=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
OAUTH_AZURE_CLIENT_SECRET: 3-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Then, configure chill:
Enable the calendar sync with microsoft azure:
.. code-block:: yaml
# config/packages/chill_calendar.yaml
chill_calendar:
remote_calendars_sync:
microsoft_graph:
enabled: true
and configure the oauth client:
.. code-block:: yaml
# config/packages/knp_oauth2_client.yaml
knpu_oauth2_client:
clients:
azure:
type: azure
client_id: '%env(OAUTH_AZURE_CLIENT_ID)%'
client_secret: '%env(OAUTH_AZURE_CLIENT_SECRET)%'
redirect_route: chill_calendar_remote_connect_azure_check
redirect_params: { }
tenant: '%env(OAUTH_AZURE_CLIENT_TENANT)%'
url_api: 'https://graph.microsoft.com/'
default_end_point_version: '2.0'
You can now process for the first api authorization on the application side, (unless you did it in the Azure interface), and get a first token, by using :
:code:`bin/console chill:calendar:msgraph-grant-admin-consent`
This will generate a url that you can use to grant your app for your tenant. The redirection may fails in the browser, but this is not relevant: if you get an authorization token in the CLI, the authentication works.
Run the processes to synchronize
--------------------------------
The calendar synchronization is processed using symfony messenger. It seems to be intersting to configure a queue (in the postgresql database it is the most simple way), and to run a worker for synchronization, at least in production.
The association between chill's users and Microsoft's users is done by this cli command:
.. code-block::
bin/console chill:calendar:msgraph-user-map-subscribe
This command:
* will associate the Microsoft's user metadata in our database;
* and, most important, create a subscription to get notification when the user alter his calendar, to sync chill's event and ranges in sync.
The subscription least at most 3 days. This command should be runned:
* at least each time a user is added;
* and, at least, every three days.
In production, we advise to run it at least every day to get the sync working.

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

View File

@@ -0,0 +1,27 @@
Send short messages (SMS) with calendar bundle
==============================================
To activate the sending of messages, you should run this command on a regularly basis (using, for instance, a cronjob):
.. code-block:: bash
bin/console chill:calendar:send-short-messages
A transporter must be configured for the message to be effectively sent.
Configure OVH Transporter
-------------------------
Currently, this is the only one transporter available.
For configuring this, simply add this config variable in your environment:
```env
SHORT_MESSAGE_DSN=ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz
```
In order to generate the application key, secret, and consumerKey, refers to their `documentation <https://docs.ovh.com/gb/en/api/first-steps-with-ovh-api/>`_.
Before to be able to send your first sms, you must enable your account, grab some credits, and configure a sender. The service_name is an internal configuration generated by OVH.

View File

@@ -0,0 +1,63 @@
.. Copyright (C) 2014-2019 Champs Libres Cooperative SCRLFS
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
A copy of the license is included in the section entitled "GNU
Free Documentation License".
.. _prod:
Installation for production
###########################
An installation use these services, which are deployed using docker containers:
* a php-fpm image, which run the Php and Symfony code for Chill;
* a nginx image, which serves the assets, and usually proxy the php requests to the fpm image;
* a redis server, which stores the cache, sessions (this is currently hardcoded in the php image), and some useful keys (like wopi locks);
* a postgresql database. The use of postgresql is mandatory;
* a relatorio service, which transform odt templates to full documents (replacing the placeholders);
Some external services:
* (required) an openstack object store, configured with `temporary url <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html>` configured (no openstack users is required). This is currently the only way to store documents from chill;
* a mailer service (SMTP)
* (optional) a service for verifying phone number. Currently, only Twilio is possible;
* (optional) a service for sending Short Messages (SMS). Currently, only Ovh is possible;
The `docker-compose.yaml` file of chill app is a basis for a production install. The environment variable in the ```.env``` and ```.env.prod``` should be overriden by environment variables, or ```.env.local``` files.
This should be adapted to your needs:
* The image for php and nginx apps are pre-compiled images, with the default configuration and bundle. If they do not fullfill your needs, you should compile your own images.
.. TODO:
As the time of writing (2022-07-03) those images are not published yet.
* Think about how you will backup your database. Some adminsys find easier to store database outside of docker, which might be easier to administrate or replicate.
Cron jobs
=========
The command :code:`chill:cron-job:execute` should be executed every 15 minutes (more or less).
This command should never be executed concurrently. It should be not have more than one process for a single instance.
Post-install tasks
==================
- import addresses. See :ref:`addresses`.
Tweak symfony messenger
=======================
Calendar sync is processed using symfony messenger.
You can tweak the configuration
Going further:
* Configure the saml login and synchronisation with Outlook api

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

View File

@@ -0,0 +1,63 @@
Entity,Join,Attribute,Alias
AccompanyingPeriod::class,,,acp
,AccompanyingPeriodWork::class,acp.works,acpw
,AccompanyingPeriodParticipation::class,acp.participations,acppart
,Location::class,acp.administrativeLocation,acploc
,ClosingMotive::class,acp.closingMotive,acpmotive
,UserJob::class,acp.job,acpjob
,Origin::class,acp.origin,acporigin
,Scope::class,acp.scopes,acpscope
,SocialIssue::class,acp.socialIssues,acpsocialissue
,User::class,acp.user,acpuser
AccompanyingPeriodWork::class,,,acpw
,AccompanyingPeriodWorkEvaluation::class,acpw.accompanyingPeriodWorkEvaluations,workeval
,User::class,acpw.referrers,acpwuser
,SocialAction::class,acpw.socialAction,acpwsocialaction
,Goal::class,acpw.goals,goal
,Result::class,acpw.results,result
AccompanyingPeriodParticipation::class,,,acppart
,Person::class,acppart.person,partperson
AccompanyingPeriodWorkEvaluation::class,,,workeval
,Evaluation::class,workeval.evaluation,eval
Goal::class,,,goal
,Result::class,goal.results,goalresult
Person::class,,,person
,Center::class,person.center,center
,HouseholdMember::class,partperson.householdParticipations,householdmember
,MaritalStatus::class,person.maritalStatus,personmarital
,VendeePerson::class,,vp
,VendeePersonMineur::class,,vpm
ResidentialAddress::class,,,resaddr
,ThirdParty::class,resaddr.hostThirdParty,tparty
ThirdParty::class,,,tparty
,ThirdPartyCategory::class,tparty.categories,tpartycat
HouseholdMember::class,,,householdmember
,Household::class,householdmember.household,household
,Person::class,householdmember.person,memberperson
,,memberperson.center,membercenter
Household::class,,,household
,HouseholdComposition::class,household.compositions,composition
Activity::class,,,activity
,Person::class,activity.person,actperson
,AccompanyingPeriod::class,activity.accompanyingPeriod,acp
,Person::class,activity_person_having_activity.person,person_person_having_activity
,ActivityReason::class,activity_person_having_activity.reasons,reasons_person_having_activity
,ActivityType::class,activity.activityType,acttype
,Location::class,activity.location,actloc
,SocialAction::class,activity.socialActions,actsocialaction
,SocialIssue::class,activity.socialIssues,actsocialssue
,ThirdParty::class,activity.thirdParties,acttparty
,User::class,activity.user,actuser
,User::class,activity.users,actusers
,ActivityReason::class,activity.reasons,actreasons
,Center::class,actperson.center,actcenter
ActivityReason::class,,,actreasons
,ActivityReasonCategory::class,actreason.category,actreasoncat
Calendar::class,,,cal
,CancelReason::class,cal.cancelReason,calcancel
,Location::class,cal.location,calloc
,User::class,cal.user,caluser
VendeePerson::class,,,vp
,SituationProfessionelle::class,vp.situationProfessionelle,vpprof
,StatutLogement::class,vp.statutLogement,vplog
,TempsDeTravail::class,vp.tempsDeTravail,vptt
1 Entity Join Attribute Alias
2 AccompanyingPeriod::class acp
3 AccompanyingPeriodWork::class acp.works acpw
4 AccompanyingPeriodParticipation::class acp.participations acppart
5 Location::class acp.administrativeLocation acploc
6 ClosingMotive::class acp.closingMotive acpmotive
7 UserJob::class acp.job acpjob
8 Origin::class acp.origin acporigin
9 Scope::class acp.scopes acpscope
10 SocialIssue::class acp.socialIssues acpsocialissue
11 User::class acp.user acpuser
12 AccompanyingPeriodWork::class acpw
13 AccompanyingPeriodWorkEvaluation::class acpw.accompanyingPeriodWorkEvaluations workeval
14 User::class acpw.referrers acpwuser
15 SocialAction::class acpw.socialAction acpwsocialaction
16 Goal::class acpw.goals goal
17 Result::class acpw.results result
18 AccompanyingPeriodParticipation::class acppart
19 Person::class acppart.person partperson
20 AccompanyingPeriodWorkEvaluation::class workeval
21 Evaluation::class workeval.evaluation eval
22 Goal::class goal
23 Result::class goal.results goalresult
24 Person::class person
25 Center::class person.center center
26 HouseholdMember::class partperson.householdParticipations householdmember
27 MaritalStatus::class person.maritalStatus personmarital
28 VendeePerson::class vp
29 VendeePersonMineur::class vpm
30 ResidentialAddress::class resaddr
31 ThirdParty::class resaddr.hostThirdParty tparty
32 ThirdParty::class tparty
33 ThirdPartyCategory::class tparty.categories tpartycat
34 HouseholdMember::class householdmember
35 Household::class householdmember.household household
36 Person::class householdmember.person memberperson
37 memberperson.center membercenter
38 Household::class household
39 HouseholdComposition::class household.compositions composition
40 Activity::class activity
41 Person::class activity.person actperson
42 AccompanyingPeriod::class activity.accompanyingPeriod acp
43 Person::class activity_person_having_activity.person person_person_having_activity
44 ActivityReason::class activity_person_having_activity.reasons reasons_person_having_activity
45 ActivityType::class activity.activityType acttype
46 Location::class activity.location actloc
47 SocialAction::class activity.socialActions actsocialaction
48 SocialIssue::class activity.socialIssues actsocialssue
49 ThirdParty::class activity.thirdParties acttparty
50 User::class activity.user actuser
51 User::class activity.users actusers
52 ActivityReason::class activity.reasons actreasons
53 Center::class actperson.center actcenter
54 ActivityReason::class actreasons
55 ActivityReasonCategory::class actreason.category actreasoncat
56 Calendar::class cal
57 CancelReason::class cal.cancelReason calcancel
58 Location::class cal.location calloc
59 User::class cal.user caluser
60 VendeePerson::class vp
61 SituationProfessionelle::class vp.situationProfessionelle vpprof
62 StatutLogement::class vp.statutLogement vplog
63 TempsDeTravail::class vp.tempsDeTravail vptt

View File

@@ -0,0 +1,74 @@
# Export conventions
Add condition with distinct alias on each export join clauses (Indicators + Filters + Aggregators)
These are alias conventions :
| Entity | Join | Attribute | Alias |
|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:---------------------------------------|
| AccompanyingPeriod::class | | | acp |
| | AccompanyingPeriodWork::class | acp.works | acpw |
| | AccompanyingPeriodParticipation::class | acp.participations | acppart |
| | Location::class | acp.administrativeLocation | acploc |
| | ClosingMotive::class | acp.closingMotive | acpmotive |
| | UserJob::class | acp.job | acpjob |
| | Origin::class | acp.origin | acporigin |
| | Scope::class | acp.scopes | acpscope |
| | SocialIssue::class | acp.socialIssues | acpsocialissue |
| | User::class | acp.user | acpuser |
| | AccompanyingPeriopStepHistory::class | acp.stepHistories | acpstephistories |
| AccompanyingPeriodWork::class | | | acpw |
| | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations | workeval |
| | User::class | acpw.referrers | acpwuser |
| | SocialAction::class | acpw.socialAction | acpwsocialaction |
| | Goal::class | acpw.goals | goal |
| | Result::class | acpw.results | result |
| AccompanyingPeriodParticipation::class | | | acppart |
| | Person::class | acppart.person | partperson |
| AccompanyingPeriodWorkEvaluation::class | | | workeval |
| | Evaluation::class | workeval.evaluation | eval |
| Goal::class | | | goal |
| | Result::class | goal.results | goalresult |
| Person::class | | | person |
| | Center::class | person.center | center |
| | HouseholdMember::class | partperson.householdParticipations | householdmember |
| | MaritalStatus::class | person.maritalStatus | personmarital |
| | VendeePerson::class | | vp |
| | VendeePersonMineur::class | | vpm |
| | CurrentPersonAddress::class | person.currentPersonAddress | currentPersonAddress (on a given date) |
| ResidentialAddress::class | | | resaddr |
| | ThirdParty::class | resaddr.hostThirdParty | tparty |
| ThirdParty::class | | | tparty |
| | ThirdPartyCategory::class | tparty.categories | tpartycat |
| HouseholdMember::class | | | householdmember |
| | Household::class | householdmember.household | household |
| | Person::class | householdmember.person | memberperson |
| | | memberperson.center | membercenter |
| Household::class | | | household |
| | HouseholdComposition::class | household.compositions | composition |
| Activity::class | | | activity |
| | Person::class | activity.person | actperson |
| | AccompanyingPeriod::class | activity.accompanyingPeriod | acp |
| | Person::class | activity\_person\_having\_activity.person | person\_person\_having\_activity |
| | ActivityReason::class | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity |
| | ActivityType::class | activity.activityType | acttype |
| | Location::class | activity.location | actloc |
| | SocialAction::class | activity.socialActions | actsocialaction |
| | SocialIssue::class | activity.socialIssues | actsocialssue |
| | ThirdParty::class | activity.thirdParties | acttparty |
| | User::class | activity.user | actuser |
| | User::class | activity.users | actusers |
| | ActivityReason::class | activity.reasons | actreasons |
| | Center::class | actperson.center | actcenter |
| | Person::class | activity.createdBy | actcreator |
| ActivityReason::class | | | actreasons |
| | ActivityReasonCategory::class | actreason.category | actreasoncat |
| Calendar::class | | | cal |
| | CancelReason::class | cal.cancelReason | calcancel |
| | Location::class | cal.location | calloc |
| | User::class | cal.user | caluser |
| VendeePerson::class | | | vp |
| | SituationProfessionelle::class | vp.situationProfessionelle | vpprof |
| | StatutLogement::class | vp.statutLogement | vplog |
| | TempsDeTravail::class | vp.tempsDeTravail | vptt |

View File

@@ -24,6 +24,7 @@ parameters:
- "/spec/"
- "/var/"
- "/vendor/"
- "/tests/app"
# Psalm
tasks.psalm.blocking: true

67
package.json Normal file
View File

@@ -0,0 +1,67 @@
{
"name": "chill",
"version": "2.0.0",
"devDependencies": {
"@alexlafroscia/yaml-merge": "^4.0.0",
"@apidevtools/swagger-cli": "^4.0.4",
"@babel/core": "^7.20.5",
"@babel/preset-env": "^7.20.2",
"@ckeditor/ckeditor5-build-classic": "^35.3.2",
"@ckeditor/ckeditor5-dev-utils": "^31.1.13",
"@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.13",
"@ckeditor/ckeditor5-markdown-gfm": "^35.3.2",
"@ckeditor/ckeditor5-theme-lark": "^35.3.2",
"@ckeditor/ckeditor5-vue": "^4.0.1",
"@symfony/webpack-encore": "^4.1.0",
"@tsconfig/node14": "^1.0.1",
"bindings": "^1.5.0",
"bootstrap": "^5.0.1",
"chokidar": "^3.5.1",
"fork-awesome": "^1.1.7",
"jquery": "^3.6.0",
"node-sass": "^8.0.0",
"popper.js": "^1.16.1",
"postcss-loader": "^7.0.2",
"raw-loader": "^4.0.2",
"sass-loader": "^13.0.0",
"select2": "^4.0.13",
"select2-bootstrap-theme": "0.1.0-beta.10",
"style-loader": "^3.3.1",
"ts-loader": "^9.3.1",
"typescript": "^4.7.2",
"vue-loader": "^17.0.0",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1"
},
"dependencies": {
"@fullcalendar/core": "^5.11.0",
"@fullcalendar/daygrid": "^5.11.0",
"@fullcalendar/interaction": "^5.11.0",
"@fullcalendar/list": "^5.11.0",
"@fullcalendar/timegrid": "^5.11.0",
"@fullcalendar/vue3": "^5.11.1",
"@popperjs/core": "^2.9.2",
"dropzone": "^5.7.6",
"es6-promise": "^4.2.8",
"leaflet": "^1.7.1",
"masonry-layout": "^4.2.2",
"mime": "^3.0.0",
"swagger-ui": "^4.15.5",
"vis-network": "^9.1.0",
"vue": "^3.2.37",
"vue-i18n": "^9.1.6",
"vue-multiselect": "3.0.0-alpha.2",
"vue-toast-notification": "^2.0",
"vuex": "^4.0.0"
},
"browserslist": [
"Firefox ESR"
],
"scripts": {
"dev-server": "encore dev-server",
"dev": "encore dev",
"watch": "encore dev --watch",
"build": "encore production --progress"
},
"private": true
}

View File

@@ -5,16 +5,6 @@ parameters:
count: 1
path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$currentHouseholdParticipationAt\\.$#"
count: 3
path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$relation\\.$#"
count: 1
path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
-
message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:\\$work\\.$#"
count: 1
@@ -25,11 +15,6 @@ parameters:
count: 1
path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Household\\\\MembersEditorFactory\\:\\:\\$validator\\.$#"
count: 2
path: src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
-
message: "#^Variable variables are not allowed\\.$#"
count: 4
@@ -40,11 +25,6 @@ parameters:
count: 1
path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
-
message: "#^Undefined variable\\: \\$choiceSlug$#"
count: 1
path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
message: "#^Undefined variable\\: \\$choiceSlug$#"
count: 1

File diff suppressed because it is too large Load Diff

View File

@@ -10,31 +10,11 @@ parameters:
count: 1
path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
-
message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getDescription\\(\\) should return string but return statement is missing\\.$#"
count: 1
path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
-
message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getTitle\\(\\) should return string but return statement is missing\\.$#"
count: 1
path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
message: "#^Only booleans are allowed in &&, mixed given on the right side\\.$#"
count: 3
path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
count: 2
path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
count: 3
@@ -250,21 +230,11 @@ parameters:
count: 1
path: src/Bundle/ChillMainBundle/Entity/Address.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillMainBundle/Entity/User.php
-
message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
count: 1
path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
@@ -295,11 +265,6 @@ parameters:
count: 3
path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
-
message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
count: 1
path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 2
@@ -325,11 +290,6 @@ parameters:
count: 1
path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
@@ -360,26 +320,6 @@ parameters:
count: 6
path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 2
path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 2
path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
@@ -470,18 +410,8 @@ parameters:
count: 1
path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
-
message: "#^Method Chill\\\\ThirdPartyBundle\\\\Search\\\\ThirdPartySearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
count: 1
path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php

View File

@@ -3,6 +3,7 @@ parameters:
paths:
- src/
excludePaths:
- .php_cs*
- docs/
- src/Bundle/*/Tests/*
- src/Bundle/*/tests/*

View File

@@ -40,6 +40,9 @@
<testsuite name="DocGeneratorBundle">
<directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
</testsuite>
<testsuite name="WopiBundle">
<directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>
</testsuite>
</testsuites>
<listeners>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="v4.15.0@a1b5e489e6fcebe40cb804793d964e99fc347820">
<files psalm-version="4.18.0.0">
<file src="src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php">
<UndefinedClass occurrences="4">
<code>'ChillActivityBundle:ActivityReasonCategory'</code>
@@ -47,6 +47,11 @@
<code>Activity[]|array</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php">
<DuplicateClass occurrences="1">
<code>AppKernel</code>
</DuplicateClass>
</file>
<file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php">
<MissingFile occurrences="1">
<code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
@@ -164,72 +169,18 @@
<code>type</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/CountActivityTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/ListActivityTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/StatActivityDurationSumTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="1">
<code>\Chill\PersonBundle\Export\Filter\PersonHavingActivityBetweenDateFilter</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<TooFewArguments occurrences="2"/>
<UndefinedDocblockClass occurrences="1">
<code>Prophecy\Prophet</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="1">
<code>type</code>
</UndefinedDocblockClass>
@@ -254,11 +205,6 @@
<code>$asideActivityCategory</code>
</ParamNameMismatch>
</file>
<file src="src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php">
<InvalidStaticInvocation occurrences="3">
<code>$calculator::getAlias()</code>
@@ -288,11 +234,6 @@
<code>'ChillCalendarBundle:Calendar'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php">
<UndefinedClass occurrences="1">
<code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
@@ -397,10 +338,6 @@
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="4">
<code>type</code>
<code>type</code>
@@ -408,61 +345,6 @@
<code>type</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php">
<UndefinedClass occurrences="1">
<code>'ChillDocStoreBundle:AccompanyingCourseDocument'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php">
<UndefinedClass occurrences="3">
<code>'ChillDocStoreBundle:DocumentCategory'</code>
@@ -470,11 +352,6 @@
<code>'ChillDocStoreBundle:DocumentCategory'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php">
<UndefinedClass occurrences="1">
<code>'ChillDocStoreBundle:PersonDocument'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillDocStoreBundle/Entity/Document.php">
<UndefinedDocblockClass occurrences="1">
<code>\Chill\PersonBundle\Entity\user</code>
@@ -570,9 +447,6 @@
<InvalidParamDefault occurrences="1">
<code>type</code>
</InvalidParamDefault>
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="8">
<code>'ChillEventBundle:Event'</code>
<code>'ChillEventBundle:Event'</code>
@@ -588,10 +462,6 @@
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>'ChillMainBundle:Scope'</code>
</UndefinedClass>
@@ -891,11 +761,6 @@
<code>OptionsResolverInterface</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Notification/Mailer.php">
<UndefinedDocblockClass occurrences="1">
<code>\Symfony\Component\Mailer\Exception\TransportExceptionInterface</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Pagination/PageGenerator.php">
<UndefinedVariable occurrences="1">
<code>$current</code>
@@ -924,11 +789,6 @@
<code>$onlyEnabled</code>
</ParamNameMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php">
<DuplicateClass occurrences="1">
<code>AppKernel</code>
</DuplicateClass>
</file>
<file src="src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php">
<MissingFile occurrences="1">
<code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
@@ -1056,158 +916,15 @@
</UndefinedClass>
</file>
<file src="src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="1">
<code>type</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php">
<MethodSignatureMismatch occurrences="2">
<code>protected function tearDown()</code>
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="40">
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>Prophecy\Prophet</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php">
<UndefinedClass occurrences="1">
<code>CenterType</code>
</UndefinedClass>
<UndefinedDocblockClass occurrences="1">
<code>CenterType</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="1">
<code>unknown</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php">
<UndefinedDocblockClass occurrences="1">
<code>unknown</code>
@@ -1412,20 +1129,6 @@
<code>OptionsResolverInterface</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php">
<UndefinedClass occurrences="6">
<code>$qb</code>
<code>$qb</code>
<code>$qb</code>
<code>QueryBuilder</code>
<code>SocialAction</code>
<code>SocialAction</code>
</UndefinedClass>
<UndefinedVariable occurrences="2">
<code>$action</code>
<code>$orderBy</code>
</UndefinedVariable>
</file>
<file src="src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php">
<DuplicateClass occurrences="1">
<code>AppKernel</code>
@@ -1505,33 +1208,13 @@
</ParamNameMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="2">
<code>AccompanyingPeriodRepository</code>
<code>stdClass</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php">
<InvalidThrow occurrences="1"/>
<MethodSignatureMismatch occurrences="3">
<code>public function setUp()</code>
<code>public function tearDown()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="3">
<code>'ChillMainBundle:Center'</code>
<code>'ChillPersonBundle:AccompanyingPeriod\ClosingMotive'</code>
@@ -1543,40 +1226,19 @@
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>User</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php">
<InvalidScope occurrences="1">
<code>$this</code>
</InvalidScope>
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>'ChillPersonBundle:Person'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public static function tearDownAfterClass()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="2">
<code>'ChillMainBundle:Country'</code>
<code>'ChillPersonBundle:Person'</code>
@@ -1586,140 +1248,25 @@
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="2">
<code>'ChillMainBundle:Country'</code>
<code>'ChillPersonBundle:Person'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>'ChillPersonBundle:Person'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>'ChillPersonBundle:Person'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php">
<AssignmentToVoid occurrences="1">
<code>$participationL</code>
</AssignmentToVoid>
<NullReference occurrences="1">
<code>getEndDate</code>
</NullReference>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php">
<UndefinedClass occurrences="1">
@@ -1820,20 +1367,13 @@
<code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
</MissingFile>
</file>
<file src="src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php">
<InvalidParamDefault occurrences="1">
<code>type</code>
</InvalidParamDefault>
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="29">
<UndefinedDocblockClass occurrences="31">
<code>$client</code>
<code>$client</code>
<code>$client</code>
<code>$client</code>
<code>$client</code>
@@ -1865,16 +1405,7 @@
<code>type</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php">
<UndefinedClass occurrences="1">
<code>Exception</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="3">
<code>type</code>
<code>type</code>
@@ -1882,10 +1413,6 @@
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
</UndefinedClass>
@@ -1958,11 +1485,6 @@
<code>CacheItempPoolInterface</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php">
<UndefinedClass occurrences="1">
<code>$taggedService-&gt;getClass()::getKey()</code>
@@ -1988,11 +1510,6 @@
<code>$thirdParty</code>
</ParamNameMismatch>
</file>
<file src="src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php">
<UndefinedDocblockClass occurrences="6">
<code>$object</code>

View File

@@ -6,6 +6,7 @@
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config tests/app/vendor/vimeo/psalm/config.xsd"
errorBaseline="psalm-baseline.xml"
cacheDirectory="./.psalm"
>
<projectFiles>
<directory name="src" />
@@ -13,4 +14,15 @@
<directory name="./tests/" />
</ignoreFiles>
</projectFiles>
<!-- suppress error around parameter bags - see https://github.com/symfony/symfony/issues/45609#issuecomment-1056816975 -->
<!-- maybe to desactivate with php 8.1 ? -->
<issueHandlers>
<UndefinedDocblockClass>
<errorLevel type="suppress">
<referencedClass name="UnitEnum" />
</errorLevel>
</UndefinedDocblockClass>
</issueHandlers>
</psalm>

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Controller;
use Chill\ActivityBundle\Entity\Activity;
@@ -17,10 +17,12 @@ use Chill\ActivityBundle\Form\ActivityType;
use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
use Chill\ActivityBundle\Repository\ActivityRepository;
use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
use Chill\ActivityBundle\Repository\ActivityTypeRepository;
use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
use Chill\MainBundle\Repository\LocationRepository;
use Chill\MainBundle\Repository\UserRepositoryInterface;
use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -40,7 +42,6 @@ use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Serializer\SerializerInterface;
use function array_key_exists;
@@ -54,7 +55,9 @@ final class ActivityController extends AbstractController
private ActivityTypeCategoryRepository $activityTypeCategoryRepository;
private ActivityTypeRepository $activityTypeRepository;
private ActivityTypeRepositoryInterface $activityTypeRepository;
private CenterResolverManagerInterface $centerResolver;
private EntityManagerInterface $entityManager;
@@ -70,9 +73,11 @@ final class ActivityController extends AbstractController
private ThirdPartyRepository $thirdPartyRepository;
private UserRepositoryInterface $userRepository;
public function __construct(
ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
ActivityTypeRepository $activityTypeRepository,
ActivityTypeRepositoryInterface $activityTypeRepository,
ActivityTypeCategoryRepository $activityTypeCategoryRepository,
PersonRepository $personRepository,
ThirdPartyRepository $thirdPartyRepository,
@@ -82,7 +87,9 @@ final class ActivityController extends AbstractController
EntityManagerInterface $entityManager,
EventDispatcherInterface $eventDispatcher,
LoggerInterface $logger,
SerializerInterface $serializer
SerializerInterface $serializer,
UserRepositoryInterface $userRepository,
CenterResolverManagerInterface $centerResolver
) {
$this->activityACLAwareRepository = $activityACLAwareRepository;
$this->activityTypeRepository = $activityTypeRepository;
@@ -96,6 +103,8 @@ final class ActivityController extends AbstractController
$this->eventDispatcher = $eventDispatcher;
$this->logger = $logger;
$this->serializer = $serializer;
$this->userRepository = $userRepository;
$this->centerResolver = $centerResolver;
}
/**
@@ -179,14 +188,15 @@ final class ActivityController extends AbstractController
{
$view = null;
[$person, $accompanyingPeriod] = $this->getEntity($request);
$entity = $this->activityRepository->find($id);
if (null === $entity) {
throw $this->createNotFoundException('Unable to find Activity entity.');
}
$accompanyingPeriod = $entity->getAccompanyingPeriod();
$person = $entity->getPerson();
if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
$view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
$accompanyingPeriod = $entity->getAccompanyingPeriod();
@@ -197,7 +207,7 @@ final class ActivityController extends AbstractController
// $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
$form = $this->createForm(ActivityType::class, $entity, [
'center' => $entity->getCenter(),
'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
'role' => new Role('CHILL_ACTIVITY_UPDATE'),
'activityType' => $entity->getActivityType(),
'accompanyingPeriod' => $accompanyingPeriod,
@@ -220,6 +230,9 @@ final class ActivityController extends AbstractController
$this->entityManager->persist($entity);
$this->entityManager->flush();
$params = $this->buildParamsToUrl($person, $accompanyingPeriod);
$params['id'] = $entity->getId();
if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
return $this->redirectToRoute(
'chill_docgenerator_generate_from_template',
@@ -227,15 +240,13 @@ final class ActivityController extends AbstractController
'template' => $form->get('gendocTemplateId')->getData(),
'entityClassName' => Activity::class,
'entityId' => $entity->getId(),
'returnPath' => $this->generateUrl('chill_activity_activity_edit', $params),
]
);
}
$this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
$params = $this->buildParamsToUrl($person, $accompanyingPeriod);
$params['id'] = $entity->getId();
return $this->redirectToRoute('chill_activity_activity_show', $params);
}
@@ -352,6 +363,7 @@ final class ActivityController extends AbstractController
if ($person instanceof Person) {
$entity->setPerson($person);
$entity->getPersons()->add($person);
}
if ($accompanyingPeriod instanceof AccompanyingPeriod) {
@@ -364,7 +376,7 @@ final class ActivityController extends AbstractController
if ($request->query->has('activityData')) {
$activityData = $request->query->get('activityData');
if (array_key_exists('durationTime', $activityData)) {
if (array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
$durationTimeInMinutes = $activityData['durationTime'];
$hours = floor($durationTimeInMinutes / 60);
$minutes = $durationTimeInMinutes % 60;
@@ -383,26 +395,36 @@ final class ActivityController extends AbstractController
}
}
if (array_key_exists('personsId', $activityData)) {
if (array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
foreach ($activityData['personsId'] as $personId) {
$concernedPerson = $this->personRepository->find($personId);
$entity->addPerson($concernedPerson);
}
}
if (array_key_exists('professionalsId', $activityData)) {
if (array_key_exists('professionalsId', $activityData) && $activityType->getThirdPartiesVisible() > 0) {
foreach ($activityData['professionalsId'] as $professionalsId) {
$professional = $this->thirdPartyRepository->find($professionalsId);
$entity->addThirdParty($professional);
}
}
if (array_key_exists('location', $activityData)) {
if (array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
foreach ($activityData['usersId'] as $userId) {
$user = $this->userRepository->find($userId);
if (null !== $user) {
$entity->addUser($user);
}
}
}
if (array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
$location = $this->locationRepository->find($activityData['location']);
$entity->setLocation($location);
}
if (array_key_exists('comment', $activityData)) {
if (array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
$comment = new CommentEmbeddable();
$comment->setComment($activityData['comment']);
$comment->setUserId($this->getUser()->getid());
@@ -414,7 +436,7 @@ final class ActivityController extends AbstractController
$this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);
$form = $this->createForm(ActivityType::class, $entity, [
'center' => $entity->getCenter(),
'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
'role' => new Role('CHILL_ACTIVITY_CREATE'),
'activityType' => $entity->getActivityType(),
'accompanyingPeriod' => $accompanyingPeriod,
@@ -444,6 +466,9 @@ final class ActivityController extends AbstractController
'template' => $form->get('gendocTemplateId')->getData(),
'entityClassName' => Activity::class,
'entityId' => $entity->getId(),
'returnPath' => $this->generateUrl('chill_activity_activity_edit', [
'id' => $entity->getId(),
]),
]
);
}

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Controller;
use Chill\ActivityBundle\Entity\ActivityReasonCategory;
@@ -54,7 +54,7 @@ class ActivityReasonCategoryController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -75,7 +75,7 @@ class ActivityReasonCategoryController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
$entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
'entities' => $entities,
@@ -105,7 +105,7 @@ class ActivityReasonCategoryController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -125,7 +125,7 @@ class ActivityReasonCategoryController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Controller;
use Chill\ActivityBundle\Entity\ActivityReason;
@@ -54,7 +54,7 @@ class ActivityReasonController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -75,7 +75,7 @@ class ActivityReasonController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
$entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->findAll();
return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
'entities' => $entities,
@@ -105,7 +105,7 @@ class ActivityReasonController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -125,7 +125,7 @@ class ActivityReasonController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReason entity.');

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Controller;
use Chill\MainBundle\CRUD\Controller\CRUDController;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Controller;
use Chill\MainBundle\CRUD\Controller\CRUDController;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Controller;
use Chill\MainBundle\CRUD\Controller\CRUDController;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\DataFixtures\ORM;
use Chill\ActivityBundle\Entity\Activity;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\DataFixtures\ORM;
use Chill\ActivityBundle\Entity\Activity;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\DataFixtures\ORM;
use Chill\ActivityBundle\Entity\ActivityReason;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\DataFixtures\ORM;
use Chill\ActivityBundle\Entity\ActivityReasonCategory;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\DataFixtures\ORM;
use Chill\ActivityBundle\Entity\ActivityType;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\DataFixtures\ORM;
use Chill\ActivityBundle\Entity\ActivityTypeCategory;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\DataFixtures\ORM;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\DependencyInjection;
use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
@@ -61,8 +61,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
ActivityVoter::FULL => [
ActivityVoter::CREATE_PERSON,
ActivityVoter::CREATE_ACCOMPANYING_COURSE,
ActivityVoter::DELETE,
ActivityVoter::UPDATE,
],

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;

View File

@@ -1,22 +1,27 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Entity;
use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
use Chill\DocStoreBundle\Entity\StoredObject;
use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
use Chill\MainBundle\Entity\Center;
use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
use Chill\MainBundle\Entity\HasCenterInterface;
use Chill\MainBundle\Entity\HasScopeInterface;
use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
use Chill\MainBundle\Entity\HasCentersInterface;
use Chill\MainBundle\Entity\HasScopesInterface;
use Chill\MainBundle\Entity\Location;
use Chill\MainBundle\Entity\Scope;
use Chill\MainBundle\Entity\User;
@@ -35,6 +40,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Annotation\SerializedName;
use Symfony\Component\Validator\Constraints as Assert;
/**
* Class Activity.
@@ -53,8 +59,12 @@ use Symfony\Component\Serializer\Annotation\SerializedName;
* getUserFunction="getUser",
* path="scope")
*/
class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface, TrackCreationInterface, TrackUpdateInterface
{
use TrackCreationTrait;
use TrackUpdateTrait;
public const SENTRECEIVED_RECEIVED = 'received';
public const SENTRECEIVED_SENT = 'sent';
@@ -93,6 +103,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
/**
* @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
* @Assert\Valid(traverse=true)
*/
private Collection $documents;
@@ -132,6 +143,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
*/
private ?Collection $persons = null;
/**
* @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
*/
private PrivateCommentEmbeddable $privateComment;
/**
* @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
* @Groups({"docgen:read"})
@@ -191,6 +207,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
{
$this->reasons = new ArrayCollection();
$this->comment = new CommentEmbeddable();
$this->privateComment = new PrivateCommentEmbeddable();
$this->persons = new ArrayCollection();
$this->thirdParties = new ArrayCollection();
$this->documents = new ArrayCollection();
@@ -231,11 +248,22 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
{
if (!$this->socialActions->contains($socialAction)) {
$this->socialActions[] = $socialAction;
$this->ensureSocialActionConsistency();
}
return $this;
}
/**
* Add a social issue.
*
* Note: the social issue consistency (the fact that only yougest social issues
* are kept) is processed by an entity listener:
*
* @see{\Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener}
*
* @return $this
*/
public function addSocialIssue(SocialIssue $socialIssue): self
{
if (!$this->socialIssues->contains($socialIssue)) {
@@ -286,13 +314,17 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
* get the center
* center is extracted from person.
*/
public function getCenter(): ?Center
public function getCenters(): iterable
{
if ($this->person instanceof Person) {
return $this->person->getCenter();
return [$this->person->getCenter()];
}
return null;
if ($this->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
return $this->getAccompanyingPeriod()->getCenters() ?? [];
}
return [];
}
public function getComment(): CommentEmbeddable
@@ -357,7 +389,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
if (null !== $this->accompanyingPeriod) {
$personsAssociated = [];
foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
foreach ($this->accompanyingPeriod->getOpenParticipations() as $participation) {
if ($this->persons->contains($participation->getPerson())) {
$personsAssociated[] = $participation->getPerson();
}
@@ -387,6 +419,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return [];
}
public function getPrivateComment(): PrivateCommentEmbeddable
{
return $this->privateComment;
}
public function getReasons(): Collection
{
return $this->reasons;
@@ -397,6 +434,19 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return $this->scope;
}
public function getScopes(): iterable
{
if (null !== $this->getAccompanyingPeriod()) {
return $this->getAccompanyingPeriod()->getScopes();
}
if (null !== $this->getPerson()) {
return [$this->scope];
}
return [];
}
public function getSentReceived(): string
{
return $this->sentReceived;
@@ -573,6 +623,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return $this;
}
public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
{
$this->privateComment = $privateComment;
return $this;
}
public function setReasons(?ArrayCollection $reasons): self
{
$this->reasons = $reasons;
@@ -631,4 +688,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return $this;
}
private function ensureSocialActionConsistency(): void
{
$ancestors = SocialAction::findAncestorSocialActions($this->getSocialActions());
foreach ($ancestors as $ancestor) {
$this->removeSocialAction($ancestor);
}
}
}

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Entity;
use Doctrine\ORM\Mapping as ORM;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Entity;
use Doctrine\ORM\Mapping as ORM;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Entity;
use Doctrine\Common\Collections\ArrayCollection;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
@@ -167,6 +167,16 @@ class ActivityType
*/
private int $personVisible = self::FIELD_REQUIRED;
/**
* @ORM\Column(type="string", nullable=false, options={"default": ""})
*/
private string $privateCommentLabel = '';
/**
* @ORM\Column(type="smallint", nullable=false, options={"default": 1})
*/
private int $privateCommentVisible = self::FIELD_OPTIONAL;
/**
* @ORM\Column(type="string", nullable=false, options={"default": ""})
*/
@@ -416,6 +426,16 @@ class ActivityType
return $this->personVisible;
}
public function getPrivateCommentLabel(): string
{
return $this->privateCommentLabel;
}
public function getPrivateCommentVisible(): int
{
return $this->privateCommentVisible;
}
public function getReasonsLabel(): string
{
return $this->reasonsLabel;
@@ -496,6 +516,11 @@ class ActivityType
return $this->userVisible;
}
public function hasCategory(): bool
{
return null !== $this->getCategory();
}
/**
* Is active
* return true if the type is active.
@@ -688,6 +713,20 @@ class ActivityType
return $this;
}
public function setPrivateCommentLabel(string $privateCommentLabel): self
{
$this->privateCommentLabel = $privateCommentLabel;
return $this;
}
public function setPrivateCommentVisible(int $privateCommentVisible): self
{
$this->privateCommentVisible = $privateCommentVisible;
return $this;
}
public function setReasonsLabel(string $reasonsLabel): self
{
$this->reasonsLabel = $reasonsLabel;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Entity;
use Doctrine\ORM\Mapping as ORM;

View File

@@ -1,14 +1,14 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\EntityListener;
use Chill\ActivityBundle\Entity\Activity;
@@ -66,9 +66,6 @@ class ActivityEntityListener
$newAction->addPerson($person);
}
foreach ($associatedThirdparties as $thirdparty) {
$newAction->setHandlingThierparty($thirdparty);
}
$this->em->persist($newAction);
$this->em->flush();
}

View File

@@ -0,0 +1,68 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
use Chill\ActivityBundle\Entity\Activity;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
class ByActivityNumberAggregator implements AggregatorInterface
{
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data): void
{
$qb
->addSelect('(SELECT COUNT(activity.id) FROM ' . Activity::class . ' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
->addGroupBy('activity_by_number_aggregator');
}
public function applyOn(): string
{
return Declarations::ACP_TYPE;
}
public function buildForm(FormBuilderInterface $builder): void
{
// No form needed
}
public function getLabels($key, array $values, $data)
{
return static function ($value) {
if ('_header' === $value) {
return '';
}
if (null === $value) {
return '';
}
return $value;
};
}
public function getQueryKeys($data): array
{
return ['activity_by_number_aggregator'];
}
public function getTitle(): string
{
return 'Group acp by activity number';
}
}

View File

@@ -0,0 +1,82 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\MainBundle\Repository\UserRepositoryInterface;
use Chill\MainBundle\Templating\Entity\UserRender;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
class ByCreatorAggregator implements AggregatorInterface
{
private UserRender $userRender;
private UserRepositoryInterface $userRepository;
public function __construct(
UserRepositoryInterface $userRepository,
UserRender $userRender
) {
$this->userRepository = $userRepository;
$this->userRender = $userRender;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
$qb->addSelect('IDENTITY(activity.createdBy) AS creator_aggregator');
$qb->addGroupBy('creator_aggregator');
}
public function applyOn(): string
{
return Declarations::ACTIVITY_ACP;
}
public function buildForm(FormBuilderInterface $builder)
{
// no form
}
public function getLabels($key, array $values, $data)
{
return function ($value): string {
if ('_header' === $value) {
return 'Created by';
}
if (null === $value) {
return '';
}
$u = $this->userRepository->find($value);
return $this->userRender->renderString($u, []);
};
}
public function getQueryKeys($data): array
{
return ['creator_aggregator'];
}
public function getTitle(): string
{
return 'Group activity by creator';
}
}

View File

@@ -0,0 +1,87 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
use Chill\PersonBundle\Templating\Entity\SocialActionRender;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class BySocialActionAggregator implements AggregatorInterface
{
private SocialActionRender $actionRender;
private SocialActionRepository $actionRepository;
public function __construct(
SocialActionRender $actionRender,
SocialActionRepository $actionRepository
) {
$this->actionRender = $actionRender;
$this->actionRepository = $actionRepository;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
$qb->leftJoin('activity.socialActions', 'actsocialaction');
}
$qb->addSelect('actsocialaction.id AS socialaction_aggregator');
$qb->addGroupBy('socialaction_aggregator');
}
public function applyOn(): string
{
return Declarations::ACTIVITY_ACP;
}
public function buildForm(FormBuilderInterface $builder)
{
// no form
}
public function getLabels($key, array $values, $data)
{
return function ($value) {
if ('_header' === $value) {
return 'Social action';
}
if (null === $value) {
return '';
}
$sa = $this->actionRepository->find($value);
return $this->actionRender->renderString($sa, []);
};
}
public function getQueryKeys($data): array
{
return ['socialaction_aggregator'];
}
public function getTitle(): string
{
return 'Group activity by linked socialaction';
}
}

View File

@@ -0,0 +1,87 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class BySocialIssueAggregator implements AggregatorInterface
{
private SocialIssueRender $issueRender;
private SocialIssueRepository $issueRepository;
public function __construct(
SocialIssueRepository $issueRepository,
SocialIssueRender $issueRender
) {
$this->issueRepository = $issueRepository;
$this->issueRender = $issueRender;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
$qb->leftJoin('activity.socialIssues', 'actsocialissue');
}
$qb->addSelect('actsocialissue.id AS socialissue_aggregator');
$qb->addGroupBy('socialissue_aggregator');
}
public function applyOn(): string
{
return Declarations::ACTIVITY_ACP;
}
public function buildForm(FormBuilderInterface $builder)
{
// no form
}
public function getLabels($key, array $values, $data)
{
return function ($value): string {
if ('_header' === $value) {
return 'Social issues';
}
if (null === $value) {
return '';
}
$i = $this->issueRepository->find($value);
return $this->issueRender->renderString($i, []);
};
}
public function getQueryKeys($data): array
{
return ['socialissue_aggregator'];
}
public function getTitle(): string
{
return 'Group activity by linked socialissue';
}
}

View File

@@ -0,0 +1,87 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class ByThirdpartyAggregator implements AggregatorInterface
{
private ThirdPartyRender $thirdPartyRender;
private ThirdPartyRepository $thirdPartyRepository;
public function __construct(
ThirdPartyRepository $thirdPartyRepository,
ThirdPartyRender $thirdPartyRender
) {
$this->thirdPartyRepository = $thirdPartyRepository;
$this->thirdPartyRender = $thirdPartyRender;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('acttparty', $qb->getAllAliases(), true)) {
$qb->leftJoin('activity.thirdParties', 'acttparty');
}
$qb->addSelect('acttparty.id AS thirdparty_aggregator');
$qb->addGroupBy('thirdparty_aggregator');
}
public function applyOn(): string
{
return Declarations::ACTIVITY_ACP;
}
public function buildForm(FormBuilderInterface $builder)
{
// no form
}
public function getLabels($key, array $values, $data)
{
return function ($value): string {
if ('_header' === $value) {
return 'Accepted thirdparty';
}
if (null === $value) {
return '';
}
$tp = $this->thirdPartyRepository->find($value);
return $this->thirdPartyRender->renderString($tp, []);
};
}
public function getQueryKeys($data): array
{
return ['thirdparty_aggregator'];
}
public function getTitle(): string
{
return 'Group activity by linked thirdparties';
}
}

View File

@@ -0,0 +1,89 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\MainBundle\Repository\ScopeRepository;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class CreatorScopeAggregator implements AggregatorInterface
{
private ScopeRepository $scopeRepository;
private TranslatableStringHelper $translatableStringHelper;
public function __construct(
ScopeRepository $scopeRepository,
TranslatableStringHelper $translatableStringHelper
) {
$this->scopeRepository = $scopeRepository;
$this->translatableStringHelper = $translatableStringHelper;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('actcreator', $qb->getAllAliases(), true)) {
$qb->leftJoin('activity.createdBy', 'actcreator');
}
$qb->addSelect('IDENTITY(actcreator.mainScope) AS creatorscope_aggregator');
$qb->addGroupBy('creatorscope_aggregator');
}
public function applyOn(): string
{
return Declarations::ACTIVITY_ACP;
}
public function buildForm(FormBuilderInterface $builder)
{
// no form
}
public function getLabels($key, array $values, $data)
{
return function ($value): string {
if ('_header' === $value) {
return 'Scope';
}
if (null === $value) {
return '';
}
$s = $this->scopeRepository->find($value);
return $this->translatableStringHelper->localize(
$s->getName()
);
};
}
public function getQueryKeys($data): array
{
return ['creatorscope_aggregator'];
}
public function getTitle(): string
{
return 'Group activity by creator scope';
}
}

View File

@@ -0,0 +1,124 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Doctrine\ORM\QueryBuilder;
use RuntimeException;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
class DateAggregator implements AggregatorInterface
{
private const CHOICES = [
'by month' => 'month',
'by week' => 'week',
'by year' => 'year',
];
private const DEFAULT_CHOICE = 'year';
private TranslatorInterface $translator;
public function __construct(
TranslatorInterface $translator
) {
$this->translator = $translator;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
$order = null;
switch ($data['frequency']) {
case 'month':
$fmt = 'YYYY-MM';
break;
case 'week':
$fmt = 'YYYY-IW';
break;
case 'year':
$fmt = 'YYYY'; $order = 'DESC';
break; // order DESC does not works !
default:
throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
}
$qb->addSelect(sprintf("TO_CHAR(activity.date, '%s') AS date_aggregator", $fmt));
$qb->addGroupBy('date_aggregator');
$qb->addOrderBy('date_aggregator', $order);
}
public function applyOn(): string
{
return Declarations::ACTIVITY_ACP;
}
public function buildForm(FormBuilderInterface $builder)
{
$builder->add('frequency', ChoiceType::class, [
'choices' => self::CHOICES,
'multiple' => false,
'expanded' => true,
'empty_data' => self::DEFAULT_CHOICE,
'data' => self::DEFAULT_CHOICE,
]);
}
public function getLabels($key, array $values, $data)
{
return static function ($value) use ($data): string {
if ('_header' === $value) {
return 'by ' . $data['frequency'];
}
if (null === $value) {
return '';
}
switch ($data['frequency']) {
case 'month':
case 'week':
//return $this->translator->trans('for week') .' '. $value ;
case 'year':
//return $this->translator->trans('in year') .' '. $value ;
default:
return $value;
}
};
}
public function getQueryKeys($data): array
{
return ['date_aggregator'];
}
public function getTitle(): string
{
return 'Group activity by date';
}
}

View File

@@ -0,0 +1,89 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\MainBundle\Repository\LocationTypeRepository;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class LocationTypeAggregator implements AggregatorInterface
{
private LocationTypeRepository $locationTypeRepository;
private TranslatableStringHelper $translatableStringHelper;
public function __construct(
LocationTypeRepository $locationTypeRepository,
TranslatableStringHelper $translatableStringHelper
) {
$this->locationTypeRepository = $locationTypeRepository;
$this->translatableStringHelper = $translatableStringHelper;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('actloc', $qb->getAllAliases(), true)) {
$qb->leftJoin('activity.location', 'actloc');
}
$qb->addSelect('IDENTITY(actloc.locationType) AS locationtype_aggregator');
$qb->addGroupBy('locationtype_aggregator');
}
public function applyOn(): string
{
return Declarations::ACTIVITY_ACP;
}
public function buildForm(FormBuilderInterface $builder)
{
// no form
}
public function getLabels($key, array $values, $data)
{
return function ($value): string {
if ('_header' === $value) {
return 'Accepted locationtype';
}
if (null === $value) {
return '';
}
$lt = $this->locationTypeRepository->find($value);
return $this->translatableStringHelper->localize(
$lt->getTitle()
);
};
}
public function getQueryKeys($data): array
{
return ['locationtype_aggregator'];
}
public function getTitle(): string
{
return 'Group activity by locationtype';
}
}

View File

@@ -1,59 +1,59 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Export\Aggregator;
use Chill\ActivityBundle\Repository\ActivityTypeRepository;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Closure;
use Doctrine\ORM\Query\Expr\Join;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Role\Role;
use function in_array;
class ActivityTypeAggregator implements AggregatorInterface
{
public const KEY = 'activity_type_aggregator';
protected ActivityTypeRepository $activityTypeRepository;
protected ActivityTypeRepositoryInterface $activityTypeRepository;
protected TranslatableStringHelperInterface $translatableStringHelper;
public function __construct(
ActivityTypeRepository $activityTypeRepository,
ActivityTypeRepositoryInterface $activityTypeRepository,
TranslatableStringHelperInterface $translatableStringHelper
) {
$this->activityTypeRepository = $activityTypeRepository;
$this->translatableStringHelper = $translatableStringHelper;
}
public function addRole()
public function addRole(): ?string
{
return new Role(ActivityStatsVoter::STATS);
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
// add select element
$qb->addSelect(sprintf('IDENTITY(activity.type) AS %s', self::KEY));
if (!in_array('acttype', $qb->getAllAliases(), true)) {
$qb->leftJoin('activity.activityType', 'acttype');
}
// add the "group by" part
$qb->addSelect(sprintf('IDENTITY(activity.activityType) AS %s', self::KEY));
$qb->addGroupBy(self::KEY);
}
public function applyOn()
public function applyOn(): string
{
return 'activity';
return Declarations::ACTIVITY;
}
public function buildForm(FormBuilderInterface $builder)
@@ -71,6 +71,10 @@ class ActivityTypeAggregator implements AggregatorInterface
return 'Activity type';
}
if (null === $value) {
return '';
}
$t = $this->activityTypeRepository->find($value);
return $this->translatableStringHelper->localize($t->getName());
@@ -86,23 +90,4 @@ class ActivityTypeAggregator implements AggregatorInterface
{
return 'Aggregate by activity type';
}
/**
* Check if a join between Activity and another alias.
*
* @param Join[] $joins
* @param string $alias the alias to search for
*
* @return bool
*/
private function checkJoinAlreadyDefined(array $joins, $alias)
{
foreach ($joins as $join) {
if ($join->getAlias() === $alias) {
return true;
}
}
return false;
}
}

View File

@@ -1,39 +1,43 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Export\Aggregator;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\MainBundle\Repository\UserRepository;
use Chill\MainBundle\Templating\Entity\UserRender;
use Closure;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Role\Role;
class ActivityUserAggregator implements AggregatorInterface
{
public const KEY = 'activity_user_id';
private UserRender $userRender;
private UserRepository $userRepository;
public function __construct(
UserRepository $userRepository
UserRepository $userRepository,
UserRender $userRender
) {
$this->userRepository = $userRepository;
$this->userRender = $userRender;
}
public function addRole()
public function addRole(): ?string
{
return new Role(ActivityStatsVoter::STATS);
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
@@ -47,7 +51,7 @@ class ActivityUserAggregator implements AggregatorInterface
public function applyOn(): string
{
return 'activity';
return Declarations::ACTIVITY;
}
public function buildForm(FormBuilderInterface $builder)
@@ -57,15 +61,18 @@ class ActivityUserAggregator implements AggregatorInterface
public function getLabels($key, $values, $data): Closure
{
// preload users at once
$this->userRepository->findBy(['id' => $values]);
return function ($value) {
if ('_header' === $value) {
return 'activity user';
return 'Activity user';
}
return $this->userRepository->find($value)->getUsername();
if (null === $value) {
return '';
}
$u = $this->userRepository->find($value);
return $this->userRender->renderString($u, []);
};
}

View File

@@ -0,0 +1,86 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\MainBundle\Repository\UserRepositoryInterface;
use Chill\MainBundle\Templating\Entity\UserRender;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class ActivityUsersAggregator implements AggregatorInterface
{
private UserRender $userRender;
private UserRepositoryInterface $userRepository;
public function __construct(UserRepositoryInterface $userRepository, UserRender $userRender)
{
$this->userRepository = $userRepository;
$this->userRender = $userRender;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('actusers', $qb->getAllAliases(), true)) {
$qb->leftJoin('activity.users', 'actusers');
}
$qb
->addSelect('actusers.id AS activity_users_aggregator')
->addGroupBy('activity_users_aggregator');
}
public function applyOn(): string
{
return Declarations::ACTIVITY;
}
public function buildForm(FormBuilderInterface $builder)
{
// nothing to add on the form
}
public function getLabels($key, array $values, $data)
{
return function ($value) {
if ('_header' === $value) {
return 'Activity users';
}
if (null === $value) {
return '';
}
$u = $this->userRepository->find($value);
return $this->userRender->renderString($u, []);
};
}
public function getQueryKeys($data)
{
return ['activity_users_aggregator'];
}
public function getTitle()
{
return 'Aggregate by activity users';
}
}

View File

@@ -0,0 +1,87 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Repository\UserJobRepositoryInterface;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorInterface
{
private TranslatableStringHelperInterface $translatableStringHelper;
private UserJobRepositoryInterface $userJobRepository;
public function __construct(UserJobRepositoryInterface $userJobRepository, TranslatableStringHelperInterface $translatableStringHelper)
{
$this->userJobRepository = $userJobRepository;
$this->translatableStringHelper = $translatableStringHelper;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('actusers', $qb->getAllAliases(), true)) {
$qb->leftJoin('activity.users', 'actusers');
}
$qb
->addSelect('IDENTITY(actusers.userJob) AS activity_users_job_aggregator')
->addGroupBy('activity_users_job_aggregator');
}
public function applyOn()
{
return Declarations::ACTIVITY;
}
public function buildForm(FormBuilderInterface $builder)
{
// nothing to add in the form
}
public function getLabels($key, array $values, $data)
{
return function ($value): string {
if ('_header' === $value) {
return 'Users \'s job';
}
if (null === $value) {
return '';
}
$j = $this->userJobRepository->find($value);
return $this->translatableStringHelper->localize(
$j->getLabel()
);
};
}
public function getQueryKeys($data): array
{
return ['activity_users_job_aggregator'];
}
public function getTitle()
{
return 'Aggregate by users job';
}
}

View File

@@ -0,0 +1,87 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Repository\ScopeRepositoryInterface;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\AggregatorInterface
{
private ScopeRepositoryInterface $scopeRepository;
private TranslatableStringHelperInterface $translatableStringHelper;
public function __construct(ScopeRepositoryInterface $scopeRepository, TranslatableStringHelperInterface $translatableStringHelper)
{
$this->scopeRepository = $scopeRepository;
$this->translatableStringHelper = $translatableStringHelper;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('actusers', $qb->getAllAliases(), true)) {
$qb->leftJoin('activity.users', 'actusers');
}
$qb
->addSelect('IDENTITY(actusers.mainScope) AS activity_users_main_scope_aggregator')
->addGroupBy('activity_users_main_scope_aggregator');
}
public function applyOn()
{
return Declarations::ACTIVITY;
}
public function buildForm(FormBuilderInterface $builder)
{
// nothing to add in the form
}
public function getLabels($key, array $values, $data)
{
return function ($value): string {
if ('_header' === $value) {
return 'Users \'s scope';
}
if (null === $value) {
return '';
}
$s = $this->scopeRepository->find($value);
return $this->translatableStringHelper->localize(
$s->getName()
);
};
}
public function getQueryKeys($data): array
{
return ['activity_users_main_scope_aggregator'];
}
public function getTitle()
{
return 'Aggregate by users scope';
}
}

View File

@@ -1,19 +1,19 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Export\Aggregator;
namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
use Chill\ActivityBundle\Repository\ActivityReasonRepository;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\MainBundle\Export\ExportElementValidatedInterface;
use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -23,11 +23,10 @@ use Doctrine\ORM\QueryBuilder;
use RuntimeException;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
use function array_key_exists;
use function count;
use function in_array;
class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
{
@@ -47,19 +46,19 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
$this->translatableStringHelper = $translatableStringHelper;
}
public function addRole()
public function addRole(): ?string
{
return new Role(ActivityStatsVoter::STATS);
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
// add select element
if ('reasons' === $data['level']) {
$elem = 'reasons.id';
$elem = 'actreasons.id';
$alias = 'activity_reasons_id';
} elseif ('categories' === $data['level']) {
$elem = 'category.id';
$elem = 'actreasoncat.id';
$alias = 'activity_categories_id';
} else {
throw new RuntimeException('The data provided are not recognized.');
@@ -68,29 +67,15 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
$qb->addSelect($elem . ' as ' . $alias);
// make a jointure only if needed
$join = $qb->getDQLPart('join');
if (
(
array_key_exists('activity', $join)
&& !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
)
|| (!array_key_exists('activity', $join))
) {
$qb->add(
'join',
[
'activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons'),
],
true
);
if (!in_array('actreasons', $qb->getAllAliases(), true)) {
$qb->innerJoin('activity.reasons', 'actreasons');
}
// join category if necessary
if ('activity_categories_id' === $alias) {
// add join only if needed
if (!$this->checkJoinAlreadyDefined($qb->getDQLPart('join')['activity'], 'category')) {
$qb->join('reasons.category', 'category');
if (!in_array('actreasoncat', $qb->getAllAliases(), true)) {
$qb->join('actreasons.category', 'actreasoncat');
}
}
@@ -104,9 +89,9 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
}
}
public function applyOn()
public function applyOn(): string
{
return 'activity';
return Declarations::ACTIVITY_PERSON;
}
public function buildForm(FormBuilderInterface $builder)
@@ -194,23 +179,4 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
->addViolation();
}
}
/**
* Check if a join between Activity and another alias.
*
* @param Join[] $joins
* @param string $alias the alias to search for
*
* @return bool
*/
private function checkJoinAlreadyDefined(array $joins, $alias)
{
foreach ($joins as $join) {
if ($join->getAlias() === $alias) {
return true;
}
}
return false;
}
}

View File

@@ -0,0 +1,83 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Aggregator;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Doctrine\ORM\QueryBuilder;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
class SentReceivedAggregator implements AggregatorInterface
{
private TranslatorInterface $translator;
public function __construct(TranslatorInterface $translator)
{
$this->translator = $translator;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data): void
{
$qb->addSelect('activity.sentReceived AS activity_sentreceived_aggregator')
->addGroupBy('activity_sentreceived_aggregator');
}
public function applyOn(): string
{
return Declarations::ACTIVITY;
}
public function buildForm(FormBuilderInterface $builder): void
{
// No form needed
}
public function getLabels($key, array $values, $data): callable
{
return function (?string $value): string {
if ('_header' === $value) {
return 'export.aggregator.activity.by_sent_received.Sent or received';
}
switch ($value) {
case null:
return '';
case 'sent':
return $this->translator->trans('export.aggregator.activity.by_sent_received.is sent');
case 'received':
return $this->translator->trans('export.aggregator.activity.by_sent_received.is received');
default:
throw new LogicException(sprintf('The value %s is not valid', $value));
}
};
}
public function getQueryKeys($data): array
{
return ['activity_sentreceived_aggregator'];
}
public function getTitle(): string
{
return 'export.aggregator.activity.by_sent_received.Group activity by sentreceived';
}
}

View File

@@ -0,0 +1,24 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export;
/**
* This class declare constants used for the export framework.
*/
abstract class Declarations
{
public const ACTIVITY = 'activity';
public const ACTIVITY_ACP = 'activity_linked_to_acp';
public const ACTIVITY_PERSON = 'activity_linked_to_person';
}

View File

@@ -0,0 +1,127 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
class AvgActivityDuration implements ExportInterface, GroupedExportInterface
{
protected EntityRepository $repository;
public function __construct(
EntityManagerInterface $em
) {
$this->repository = $em->getRepository(Activity::class);
}
public function buildForm(FormBuilderInterface $builder)
{
}
public function getAllowedFormattersTypes(): array
{
return [FormatterInterface::TYPE_TABULAR];
}
public function getDescription(): string
{
return 'Average activities linked to an accompanying period duration by various parameters.';
}
public function getGroup(): string
{
return 'Exports of activities linked to an accompanying period';
}
public function getLabels($key, array $values, $data)
{
if ('export_avg_activity_duration' !== $key) {
throw new LogicException("the key {$key} is not used by this export");
}
return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
}
public function getQueryKeys($data): array
{
return ['export_avg_activity_duration'];
}
public function getResult($query, $data)
{
return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
}
public function getTitle(): string
{
return 'Average activity linked to an accompanying period duration';
}
public function getType(): string
{
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$centers = array_map(static function ($el) {
return $el['center'];
}, $acl);
$qb = $this->repository->createQueryBuilder('activity');
$qb
->join('activity.accompanyingPeriod', 'acp')
->select('AVG(activity.durationTime) as export_avg_activity_duration')
->andWhere($qb->expr()->isNotNull('activity.durationTime'));
$qb
->andWhere(
$qb->expr()->exists(
'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
'
)
)
->setParameter('authorized_centers', $centers);
return $qb;
}
public function requiredRole(): string
{
return ActivityStatsVoter::STATS;
}
public function supportsModifiers(): array
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_ACP,
PersonDeclarations::ACP_TYPE,
];
}
}

View File

@@ -0,0 +1,128 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
{
protected EntityRepository $repository;
public function __construct(
EntityManagerInterface $em
) {
$this->repository = $em->getRepository(Activity::class);
}
public function buildForm(FormBuilderInterface $builder)
{
// TODO: Implement buildForm() method.
}
public function getAllowedFormattersTypes(): array
{
return [FormatterInterface::TYPE_TABULAR];
}
public function getDescription(): string
{
return 'Average activities linked to an accompanying period visit duration by various parameters.';
}
public function getGroup(): string
{
return 'Exports of activities linked to an accompanying period';
}
public function getLabels($key, array $values, $data)
{
if ('export_avg_activity_visit_duration' !== $key) {
throw new LogicException("the key {$key} is not used by this export");
}
return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
}
public function getQueryKeys($data): array
{
return ['export_avg_activity_visit_duration'];
}
public function getResult($query, $data)
{
return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
}
public function getTitle(): string
{
return 'Average activity linked to an accompanying period visit duration';
}
public function getType(): string
{
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$centers = array_map(static function ($el) {
return $el['center'];
}, $acl);
$qb = $this->repository->createQueryBuilder('activity');
$qb
->join('activity.accompanyingPeriod', 'acp')
->select('AVG(activity.travelTime) as export_avg_activity_visit_duration')
->andWhere($qb->expr()->isNotNull('activity.travelTime'));
$qb
->andWhere(
$qb->expr()->exists(
'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
'
)
)
->setParameter('authorized_centers', $centers);
return $qb;
}
public function requiredRole(): string
{
return ActivityStatsVoter::STATS;
}
public function supportsModifiers(): array
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_ACP,
PersonDeclarations::ACP_TYPE,
];
}
}

View File

@@ -0,0 +1,126 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
class CountActivity implements ExportInterface, GroupedExportInterface
{
protected EntityRepository $repository;
public function __construct(
EntityManagerInterface $em
) {
$this->repository = $em->getRepository(Activity::class);
}
public function buildForm(FormBuilderInterface $builder)
{
}
public function getAllowedFormattersTypes(): array
{
return [FormatterInterface::TYPE_TABULAR];
}
public function getDescription(): string
{
return 'Count activities linked to an accompanying period by various parameters.';
}
public function getGroup(): string
{
return 'Exports of activities linked to an accompanying period';
}
public function getLabels($key, array $values, $data)
{
if ('export_count_activity' !== $key) {
throw new LogicException("the key {$key} is not used by this export");
}
return static fn ($value) => '_header' === $value ? 'Number of activities linked to an accompanying period' : $value;
}
public function getQueryKeys($data): array
{
return ['export_count_activity'];
}
public function getResult($query, $data)
{
return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
}
public function getTitle(): string
{
return 'Count activities linked to an accompanying period';
}
public function getType(): string
{
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$centers = array_map(static function ($el) {
return $el['center'];
}, $acl);
$qb = $this->repository
->createQueryBuilder('activity')
->join('activity.accompanyingPeriod', 'acp');
$qb
->andWhere(
$qb->expr()->exists(
'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
'
)
)
->setParameter('authorized_centers', $centers);
$qb->select('COUNT(DISTINCT activity.id) as export_count_activity');
return $qb;
}
public function requiredRole(): string
{
return ActivityStatsVoter::STATS;
}
public function supportsModifiers(): array
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_ACP,
PersonDeclarations::ACP_TYPE,
];
}
}

View File

@@ -0,0 +1,165 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Export\Export\ListActivityHelper;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\MainBundle\Entity\Scope;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
use Chill\MainBundle\Export\ListInterface;
use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Form\FormBuilderInterface;
class ListActivity implements ListInterface, GroupedExportInterface
{
private EntityManagerInterface $entityManager;
private ListActivityHelper $helper;
private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper;
public function __construct(
ListActivityHelper $helper,
EntityManagerInterface $entityManager,
TranslatableStringExportLabelHelper $translatableStringExportLabelHelper
) {
$this->helper = $helper;
$this->entityManager = $entityManager;
$this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
}
public function buildForm(FormBuilderInterface $builder)
{
$this->helper->buildForm($builder);
}
public function getAllowedFormattersTypes()
{
return $this->helper->getAllowedFormattersTypes();
}
public function getDescription()
{
return ListActivityHelper::MSG_KEY . 'List activities linked to an accompanying course';
}
public function getGroup(): string
{
return 'Exports of activities linked to an accompanying period';
}
public function getLabels($key, array $values, $data)
{
switch ($key) {
case 'acpId':
return static function ($value) {
if ('_header' === $value) {
return ListActivityHelper::MSG_KEY . 'accompanying course id';
}
return $value ?? '';
};
case 'scopesNames':
return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY . 'course circles');
default:
return $this->helper->getLabels($key, $values, $data);
}
}
public function getQueryKeys($data)
{
return
array_merge(
$this->helper->getQueryKeys($data),
[
'acpId',
'scopesNames',
]
);
}
public function getResult($query, $data)
{
return $this->helper->getResult($query, $data);
}
public function getTitle()
{
return ListActivityHelper::MSG_KEY . 'List activity linked to a course';
}
public function getType()
{
return $this->helper->getType();
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$centers = array_map(static function ($el) {
return $el['center'];
}, $acl);
$qb = $this->entityManager->createQueryBuilder();
$qb
->distinct()
->from(Activity::class, 'activity')
->join('activity.accompanyingPeriod', 'acp')
->leftJoin('acp.participations', 'acppart')
->leftJoin('acppart.person', 'person')
->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
->andWhere(
$qb->expr()->exists(
'SELECT 1
FROM ' . PersonCenterHistory::class . ' acl_count_person_history
WHERE acl_count_person_history.person = person
AND acl_count_person_history.center IN (:authorized_centers)
'
)
)
// some grouping are necessary
->addGroupBy('acp.id')
->addOrderBy('activity.date')
->addOrderBy('activity.id')
->setParameter('authorized_centers', $centers);
$this->helper->addSelect($qb);
// add select for this step
$qb
->addSelect('acp.id AS acpId')
->addSelect('(SELECT AGGREGATE(acpScope.name) FROM ' . Scope::class . ' acpScope WHERE acpScope MEMBER OF acp.scopes) AS scopesNames')
->addGroupBy('scopesNames');
return $qb;
}
public function requiredRole(): string
{
return ActivityStatsVoter::LISTS;
}
public function supportsModifiers()
{
return array_merge(
$this->helper->supportsModifiers(),
[
\Chill\PersonBundle\Export\Declarations::ACP_TYPE,
]
);
}
}

View File

@@ -0,0 +1,128 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
class SumActivityDuration implements ExportInterface, GroupedExportInterface
{
protected EntityRepository $repository;
public function __construct(
EntityManagerInterface $em
) {
$this->repository = $em->getRepository(Activity::class);
}
public function buildForm(FormBuilderInterface $builder)
{
// TODO: Implement buildForm() method.
}
public function getAllowedFormattersTypes(): array
{
return [FormatterInterface::TYPE_TABULAR];
}
public function getDescription(): string
{
return 'Sum activities linked to an accompanying period duration by various parameters.';
}
public function getGroup(): string
{
return 'Exports of activities linked to an accompanying period';
}
public function getLabels($key, array $values, $data)
{
if ('export_sum_activity_duration' !== $key) {
throw new LogicException("the key {$key} is not used by this export");
}
return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
}
public function getQueryKeys($data): array
{
return ['export_sum_activity_duration'];
}
public function getResult($query, $data)
{
return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
}
public function getTitle(): string
{
return 'Sum activity linked to an accompanying period duration';
}
public function getType(): string
{
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$centers = array_map(static function ($el) {
return $el['center'];
}, $acl);
$qb = $this->repository
->createQueryBuilder('activity')
->join('activity.accompanyingPeriod', 'acp');
$qb->select('SUM(activity.durationTime) as export_sum_activity_duration')
->andWhere($qb->expr()->isNotNull('activity.durationTime'));
$qb
->andWhere(
$qb->expr()->exists(
'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
'
)
)
->setParameter('authorized_centers', $centers);
return $qb;
}
public function requiredRole(): string
{
return ActivityStatsVoter::STATS;
}
public function supportsModifiers(): array
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_ACP,
PersonDeclarations::ACP_TYPE,
];
}
}

View File

@@ -0,0 +1,128 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
{
protected EntityRepository $repository;
public function __construct(
EntityManagerInterface $em
) {
$this->repository = $em->getRepository(Activity::class);
}
public function buildForm(FormBuilderInterface $builder)
{
// TODO: Implement buildForm() method.
}
public function getAllowedFormattersTypes(): array
{
return [FormatterInterface::TYPE_TABULAR];
}
public function getDescription(): string
{
return 'Sum activities linked to an accompanying period visit duration by various parameters.';
}
public function getGroup(): string
{
return 'Exports of activities linked to an accompanying period';
}
public function getLabels($key, array $values, $data)
{
if ('export_sum_activity_visit_duration' !== $key) {
throw new LogicException("the key {$key} is not used by this export");
}
return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
}
public function getQueryKeys($data): array
{
return ['export_sum_activity_visit_duration'];
}
public function getResult($query, $data)
{
return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
}
public function getTitle(): string
{
return 'Sum activity linked to an accompanying period visit duration';
}
public function getType(): string
{
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$centers = array_map(static function ($el) {
return $el['center'];
}, $acl);
$qb = $this->repository
->createQueryBuilder('activity')
->join('activity.accompanyingPeriod', 'acp');
$qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration')
->andWhere($qb->expr()->isNotNull('activity.travelTime'));
$qb
->andWhere(
$qb->expr()->exists(
'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
'
)
)
->setParameter('authorized_centers', $centers);
return $qb;
}
public function requiredRole(): string
{
return ActivityStatsVoter::STATS;
}
public function supportsModifiers(): array
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_ACP,
PersonDeclarations::ACP_TYPE,
];
}
}

View File

@@ -1,26 +1,28 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Export\Export;
namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Repository\ActivityRepository;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
use Doctrine\ORM\Query;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Role\Role;
class CountActivity implements ExportInterface
class CountActivity implements ExportInterface, GroupedExportInterface
{
protected ActivityRepository $activityRepository;
@@ -41,7 +43,12 @@ class CountActivity implements ExportInterface
public function getDescription()
{
return 'Count activities by various parameters.';
return 'Count activities linked to a person by various parameters.';
}
public function getGroup(): string
{
return 'Exports of activities linked to a person';
}
public function getLabels($key, array $values, $data)
@@ -50,7 +57,7 @@ class CountActivity implements ExportInterface
throw new LogicException("the key {$key} is not used by this export");
}
return static fn ($value) => '_header' === $value ? 'Number of activities' : $value;
return static fn ($value) => '_header' === $value ? 'Number of activities linked to a person' : $value;
}
public function getQueryKeys($data)
@@ -58,45 +65,59 @@ class CountActivity implements ExportInterface
return ['export_count_activity'];
}
public function getResult($qb, $data)
public function getResult($query, $data)
{
return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
}
public function getTitle()
{
return 'Count activities';
return 'Count activities linked to a person';
}
public function getType()
public function getType(): string
{
return 'activity';
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$centers = array_map(static fn ($el) => $el['center'], $acl);
$qb = $this
->activityRepository
$qb = $this->activityRepository
->createQueryBuilder('activity')
->select('COUNT(activity.id) as export_count_activity')
->join('activity.person', 'person');
->join('activity.person', 'person')
->join('person.centerHistory', 'centerHistory');
$qb->select('COUNT(activity.id) as export_count_activity');
$qb
->where($qb->expr()->in('person.center', ':centers'))
->where(
$qb->expr()->andX(
$qb->expr()->lte('centerHistory.startDate', 'activity.date'),
$qb->expr()->orX(
$qb->expr()->isNull('centerHistory.endDate'),
$qb->expr()->gt('centerHistory.endDate', 'activity.date')
)
)
)
->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
->setParameter('centers', $centers);
return $qb;
}
public function requiredRole()
public function requiredRole(): string
{
return new Role(ActivityStatsVoter::STATS);
return ActivityStatsVoter::STATS;
}
public function supportsModifiers()
{
return ['person', 'activity'];
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_PERSON,
PersonDeclarations::PERSON_TYPE,
];
}
}

View File

@@ -1,29 +1,31 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Export\Export;
namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
use Chill\ActivityBundle\Entity\ActivityReason;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Repository\ActivityRepository;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\MainBundle\Export\ListInterface;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
use DateTime;
use Doctrine\DBAL\Exception\InvalidArgumentException;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Query;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Validator\Constraints\Callback;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
@@ -32,7 +34,7 @@ use function array_key_exists;
use function count;
use function in_array;
class ListActivity implements ListInterface
class ListActivity implements ListInterface, GroupedExportInterface
{
protected EntityManagerInterface $entityManager;
@@ -94,7 +96,12 @@ class ListActivity implements ListInterface
public function getDescription()
{
return 'List activities';
return 'List activities linked to a person description';
}
public function getGroup(): string
{
return 'Exports of activities linked to a person';
}
public function getLabels($key, array $values, $data)
@@ -117,7 +124,7 @@ class ListActivity implements ListInterface
return 'attendee';
}
return $value ? 1 : 0;
return $value ? 'X' : '';
};
case 'list_reasons':
@@ -180,12 +187,12 @@ class ListActivity implements ListInterface
public function getTitle()
{
return 'List activities';
return 'List activity linked to a person';
}
public function getType()
public function getType(): string
{
return 'activity';
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
@@ -203,10 +210,20 @@ class ListActivity implements ListInterface
$qb
->from('ChillActivityBundle:Activity', 'activity')
->join('activity.person', 'person')
->join('person.center', 'center')
->andWhere('center IN (:authorized_centers)')
->setParameter('authorized_centers', $centers);
->join('activity.person', 'actperson')
->join('actperson.centerHistory', 'centerHistory');
$qb->where(
$qb->expr()->andX(
$qb->expr()->lte('centerHistory.startDate', 'activity.date'),
$qb->expr()->orX(
$qb->expr()->isNull('centerHistory.endDate'),
$qb->expr()->gt('centerHistory.endDate', 'activity.date')
)
)
)
->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
->setParameter('centers', $centers);
foreach ($this->fields as $f) {
if (in_array($f, $data['fields'], true)) {
@@ -217,23 +234,23 @@ class ListActivity implements ListInterface
break;
case 'person_firstname':
$qb->addSelect('person.firstName AS person_firstname');
$qb->addSelect('actperson.firstName AS person_firstname');
break;
case 'person_lastname':
$qb->addSelect('person.lastName AS person_lastname');
$qb->addSelect('actperson.lastName AS person_lastname');
break;
case 'person_id':
$qb->addSelect('person.id AS person_id');
$qb->addSelect('actperson.id AS person_id');
break;
case 'user_username':
$qb->join('activity.user', 'user');
$qb->addSelect('user.username AS user_username');
$qb->join('activity.user', 'actuser');
$qb->addSelect('actuser.username AS user_username');
break;
@@ -244,7 +261,7 @@ class ListActivity implements ListInterface
break;
case 'type_name':
$qb->join('activity.type', 'type');
$qb->join('activity.activityType', 'type');
$qb->addSelect('type.name AS type_name');
break;
@@ -256,6 +273,11 @@ class ListActivity implements ListInterface
break;
case 'attendee':
$qb->addSelect('IDENTITY(activity.attendee) AS attendee');
break;
default:
$qb->addSelect(sprintf('activity.%s as %s', $f, $f));
@@ -267,13 +289,17 @@ class ListActivity implements ListInterface
return $qb;
}
public function requiredRole()
public function requiredRole(): string
{
return new Role(ActivityStatsVoter::LISTS);
return ActivityStatsVoter::LISTS;
}
public function supportsModifiers()
{
return ['activity', 'person'];
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_PERSON,
//PersonDeclarations::PERSON_TYPE,
];
}
}

View File

@@ -1,31 +1,34 @@
<?php
/**
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
namespace Chill\ActivityBundle\Export\Export;
namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Repository\ActivityRepository;
use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
use Chill\MainBundle\Entity\Center;
use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
use Doctrine\ORM\Query;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Role\Role;
/**
* This export allow to compute stats on activity duration.
*
* The desired stat must be given in constructor.
*/
class StatActivityDuration implements ExportInterface
class StatActivityDuration implements ExportInterface, GroupedExportInterface
{
public const SUM = 'sum';
@@ -59,8 +62,15 @@ class StatActivityDuration implements ExportInterface
public function getDescription()
{
if (self::SUM === $this->action) {
return 'Sum activities duration by various parameters.';
return 'Sum activities linked to a person duration by various parameters.';
}
throw new LogicException('this action is not supported: ' . $this->action);
}
public function getGroup(): string
{
return 'Exports of activities linked to a person';
}
public function getLabels($key, array $values, $data)
@@ -69,7 +79,7 @@ class StatActivityDuration implements ExportInterface
throw new LogicException(sprintf('The key %s is not used by this export', $key));
}
$header = self::SUM === $this->action ? 'Sum of activities duration' : false;
$header = self::SUM === $this->action ? 'Sum activities linked to a person duration' : false;
return static fn (string $value) => '_header' === $value ? $header : $value;
}
@@ -79,27 +89,29 @@ class StatActivityDuration implements ExportInterface
return ['export_stat_activity'];
}
public function getResult($qb, $data)
public function getResult($query, $data)
{
return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
}
public function getTitle()
{
if (self::SUM === $this->action) {
return 'Sum activity duration';
return 'Sum activity linked to a person duration';
}
throw new LogicException('This action is not supported: ' . $this->action);
}
public function getType()
public function getType(): string
{
return 'activity';
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$centers = array_map(
static fn (array $el): string => $el['center'],
static fn (array $el): Center => $el['center'],
$acl
);
@@ -111,20 +123,37 @@ class StatActivityDuration implements ExportInterface
$select = 'SUM(activity.durationTime) AS export_stat_activity';
}
return $qb->select($select)
$qb->select($select)
->join('activity.person', 'person')
->join('person.center', 'center')
->where($qb->expr()->in('center', ':centers'))
->setParameter(':centers', $centers);
->join('person.centerHistory', 'centerHistory');
$qb
->where(
$qb->expr()->andX(
$qb->expr()->lte('centerHistory.startDate', 'activity.date'),
$qb->expr()->orX(
$qb->expr()->isNull('centerHistory.endDate'),
$qb->expr()->gt('centerHistory.endDate', 'activity.date')
)
)
)
->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
->setParameter('centers', $centers);
return $qb;
}
public function requiredRole()
public function requiredRole(): string
{
return new Role(ActivityStatsVoter::STATS);
return ActivityStatsVoter::STATS;
}
public function supportsModifiers()
{
return ['person', 'activity'];
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_PERSON,
//PersonDeclarations::PERSON_TYPE,
];
}
}

View File

@@ -0,0 +1,269 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Export;
use Chill\ActivityBundle\Export\Declarations;
use Chill\ActivityBundle\Repository\ActivityPresenceRepositoryInterface;
use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\Helper\DateTimeHelper;
use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
use Chill\MainBundle\Export\Helper\UserHelper;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
use Doctrine\ORM\AbstractQuery;
use Doctrine\ORM\QueryBuilder;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use const SORT_NUMERIC;
class ListActivityHelper
{
public const MSG_KEY = 'export.list.activity.';
private ActivityPresenceRepositoryInterface $activityPresenceRepository;
private ActivityTypeRepositoryInterface $activityTypeRepository;
private DateTimeHelper $dateTimeHelper;
private LabelPersonHelper $labelPersonHelper;
private LabelThirdPartyHelper $labelThirdPartyHelper;
private TranslatableStringHelperInterface $translatableStringHelper;
private TranslatableStringExportLabelHelper $translatableStringLabelHelper;
private TranslatorInterface $translator;
private UserHelper $userHelper;
public function __construct(
ActivityPresenceRepositoryInterface $activityPresenceRepository,
ActivityTypeRepositoryInterface $activityTypeRepository,
DateTimeHelper $dateTimeHelper,
LabelPersonHelper $labelPersonHelper,
LabelThirdPartyHelper $labelThirdPartyHelper,
TranslatorInterface $translator,
TranslatableStringHelperInterface $translatableStringHelper,
TranslatableStringExportLabelHelper $translatableStringLabelHelper,
UserHelper $userHelper
) {
$this->activityPresenceRepository = $activityPresenceRepository;
$this->activityTypeRepository = $activityTypeRepository;
$this->dateTimeHelper = $dateTimeHelper;
$this->labelPersonHelper = $labelPersonHelper;
$this->labelThirdPartyHelper = $labelThirdPartyHelper;
$this->translator = $translator;
$this->translatableStringHelper = $translatableStringHelper;
$this->translatableStringLabelHelper = $translatableStringLabelHelper;
$this->userHelper = $userHelper;
}
public function addSelect(QueryBuilder $qb): void
{
$qb
->addSelect('activity.id AS id')
->addSelect('activity.date')
->addSelect('IDENTITY(activity.activityType) AS typeName')
->leftJoin('activity.reasons', 'reasons')
->addSelect('AGGREGATE(reasons.name) AS listReasons')
->leftJoin('activity.persons', 'actPerson')
->addSelect('AGGREGATE(actPerson.id) AS personsIds')
->addSelect('AGGREGATE(actPerson.id) AS personsNames')
->leftJoin('activity.users', 'users_u')
->addSelect('AGGREGATE(users_u.id) AS usersIds')
->addSelect('AGGREGATE(users_u.id) AS usersNames')
->leftJoin('activity.thirdParties', 'thirdparty')
->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesIds')
->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesNames')
->addSelect('IDENTITY(activity.attendee) AS attendeeName')
->addSelect('activity.durationTime')
->addSelect('activity.travelTime')
->addSelect('activity.emergency')
->leftJoin('activity.location', 'location')
->addSelect('location.name AS locationName')
->addSelect('activity.sentReceived')
->addSelect('IDENTITY(activity.createdBy) AS createdBy')
->addSelect('activity.createdAt')
->addSelect('IDENTITY(activity.updatedBy) AS updatedBy')
->addSelect('activity.updatedAt')
->addGroupBy('activity.id')
->addGroupBy('location.id');
}
public function buildForm(FormBuilderInterface $builder)
{
}
public function getAllowedFormattersTypes()
{
return [FormatterInterface::TYPE_LIST];
}
public function getLabels($key, array $values, $data)
{
switch ($key) {
case 'createdAt':
case 'updatedAt':
return $this->dateTimeHelper->getLabel($key);
case 'createdBy':
case 'updatedBy':
return $this->userHelper->getLabel($key, $values, $key);
case 'date':
return $this->dateTimeHelper->getLabel(self::MSG_KEY . $key);
case 'attendeeName':
return function ($value) {
if ('_header' === $value) {
return 'Attendee';
}
if (null === $value || null === $presence = $this->activityPresenceRepository->find($value)) {
return '';
}
return $this->translatableStringHelper->localize($presence->getName());
};
case 'listReasons':
return $this->translatableStringLabelHelper->getLabelMulti($key, $values, 'Activity Reasons');
case 'typeName':
return function ($value) {
if ('_header' === $value) {
return 'Activity type';
}
if (null === $value || null === $type = $this->activityTypeRepository->find($value)) {
return '';
}
return $this->translatableStringHelper->localize($type->getName());
};
case 'usersNames':
return $this->userHelper->getLabelMulti($key, $values, self::MSG_KEY . 'users name');
case 'usersIds':
case 'thirdPartiesIds':
case 'personsIds':
return static function ($value) use ($key) {
if ('_header' === $value) {
switch ($key) {
case 'usersIds':
return self::MSG_KEY . 'users ids';
case 'thirdPartiesIds':
return self::MSG_KEY . 'third parties ids';
case 'personsIds':
return self::MSG_KEY . 'persons ids';
default:
throw new LogicException('key not supported');
}
}
$decoded = json_decode($value);
return implode(
'|',
array_unique(
array_filter($decoded, static fn (?int $id) => null !== $id),
SORT_NUMERIC
)
);
};
case 'personsNames':
return $this->labelPersonHelper->getLabelMulti($key, $values, self::MSG_KEY . 'persons name');
case 'thirdPartiesNames':
return $this->labelThirdPartyHelper->getLabelMulti($key, $values, self::MSG_KEY . 'thirds parties');
case 'sentReceived':
return function ($value) {
if ('_header' === $value) {
return self::MSG_KEY . 'sent received';
}
if (null === $value) {
return '';
}
return $this->translator->trans($value);
};
default:
return function ($value) use ($key) {
if ('_header' === $value) {
return self::MSG_KEY . $key;
}
if (null === $value) {
return '';
}
return $this->translator->trans($value);
};
}
}
public function getQueryKeys($data)
{
return [
'id',
'date',
'typeName',
'listReasons',
'attendeeName',
'durationTime',
'travelTime',
'emergency',
'locationName',
'sentReceived',
'personsIds',
'personsNames',
'usersIds',
'usersNames',
'thirdPartiesIds',
'thirdPartiesNames',
'createdBy',
'createdAt',
'updatedBy',
'updatedAt',
];
}
public function getResult($query, $data)
{
return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
}
public function getType(): string
{
return Declarations::ACTIVITY;
}
public function supportsModifiers()
{
return [
Declarations::ACTIVITY,
];
}
}

View File

@@ -0,0 +1,95 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Entity\ActivityType;
use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\Query\Expr;
use Doctrine\ORM\QueryBuilder;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class ActivityTypeFilter implements FilterInterface
{
private ActivityTypeRepositoryInterface $activityTypeRepository;
private TranslatableStringHelperInterface $translatableStringHelper;
public function __construct(
ActivityTypeRepositoryInterface $activityTypeRepository,
TranslatableStringHelperInterface $translatableStringHelper
) {
$this->activityTypeRepository = $activityTypeRepository;
$this->translatableStringHelper = $translatableStringHelper;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('activity', $qb->getAllAliases(), true)) {
$qb->join(Activity::class, 'activity', Expr\Join::WITH, 'activity.accompanyingPeriod = acp');
}
$clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
$qb->andWhere($clause);
$qb->setParameter('selected_activity_types', $data['types']);
}
public function applyOn()
{
return Declarations::ACP_TYPE;
}
public function buildForm(FormBuilderInterface $builder)
{
$builder->add('accepted_activitytypes', EntityType::class, [
'class' => ActivityType::class,
'choices' => $this->activityTypeRepository->findAllActive(),
'choice_label' => function (ActivityType $aty) {
return
($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
.
$this->translatableStringHelper->localize($aty->getName());
},
'multiple' => true,
'expanded' => true,
]);
}
public function describeAction($data, $format = 'string'): array
{
$types = [];
foreach ($data['accepted_activitytypes'] as $aty) {
$types[] = $this->translatableStringHelper->localize($aty->getName());
}
return ['Filtered by activity types: only %activitytypes%', [
'%activitytypes%' => implode(', ', $types),
]];
}
public function getTitle(): string
{
return 'Filter accompanying course by activity type';
}
}

View File

@@ -0,0 +1,73 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Form\Type\PickUserDynamicType;
use Chill\MainBundle\Templating\Entity\UserRender;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
class ByCreatorFilter implements FilterInterface
{
private UserRender $userRender;
public function __construct(UserRender $userRender)
{
$this->userRender = $userRender;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
$qb
->andWhere(
$qb->expr()->in('activity.createdBy', ':users')
)
->setParameter('users', $data['accepted_users']);
}
public function applyOn(): string
{
return Declarations::ACTIVITY_ACP;
}
public function buildForm(FormBuilderInterface $builder)
{
$builder->add('accepted_users', PickUserDynamicType::class, [
'multiple' => true,
]);
}
public function describeAction($data, $format = 'string'): array
{
$users = [];
foreach ($data['accepted_users'] as $u) {
$users[] = $this->userRender->renderString($u, []);
}
return ['Filtered activity by creator: only %users%', [
'%users%' => implode(', ', $users),
]];
}
public function getTitle(): string
{
return 'Filter activity by creator';
}
}

View File

@@ -0,0 +1,83 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\FilterInterface;
use Chill\PersonBundle\Entity\SocialWork\SocialAction;
use Chill\PersonBundle\Form\Type\PickSocialActionType;
use Chill\PersonBundle\Templating\Entity\SocialActionRender;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class BySocialActionFilter implements FilterInterface
{
private SocialActionRender $actionRender;
public function __construct(SocialActionRender $actionRender)
{
$this->actionRender = $actionRender;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
$qb->join('activity.socialActions', 'actsocialaction');
}
$clause = $qb->expr()->in('actsocialaction.id', ':socialactions');
$qb->andWhere($clause)
->setParameter(
'socialactions',
SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions'])
);
}
public function applyOn(): string
{
return Declarations::ACTIVITY_ACP;
}
public function buildForm(FormBuilderInterface $builder)
{
$builder->add('accepted_socialactions', PickSocialActionType::class, [
'multiple' => true,
]);
}
public function describeAction($data, $format = 'string'): array
{
$actions = [];
foreach ($data['accepted_socialactions'] as $action) {
$actions[] = $this->actionRender->renderString($action, [
'show_and_children' => true,
]);
}
return ['Filtered activity by linked socialaction: only %actions%', [
'%actions%' => implode(', ', $actions),
]];
}
public function getTitle(): string
{
return 'Filter activity by linked socialaction';
}
}

View File

@@ -0,0 +1,83 @@
<?php
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\FilterInterface;
use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
use Chill\PersonBundle\Form\Type\PickSocialIssueType;
use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class BySocialIssueFilter implements FilterInterface
{
private SocialIssueRender $issueRender;
public function __construct(SocialIssueRender $issueRender)
{
$this->issueRender = $issueRender;
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
$qb->join('activity.socialIssues', 'actsocialissue');
}
$clause = $qb->expr()->in('actsocialissue.id', ':socialissues');
$qb->andWhere($clause)
->setParameter(
'socialissues',
SocialIssue::getDescendantsWithThisForIssues($data['accepted_socialissues'])
);
}
public function applyOn(): string
{
return Declarations::ACTIVITY_ACP;
}
public function buildForm(FormBuilderInterface $builder)
{
$builder->add('accepted_socialissues', PickSocialIssueType::class, [
'multiple' => true,
]);
}
public function describeAction($data, $format = 'string'): array
{
$issues = [];
foreach ($data['accepted_socialissues'] as $issue) {
$issues[] = $this->issueRender->renderString($issue, [
'show_and_children' => true,
]);
}
return ['Filtered activity by linked socialissue: only %issues%', [
'%issues%' => implode(', ', $issues),
]];
}
public function getTitle(): string
{
return 'Filter activity by linked socialissue';
}
}

Some files were not shown because too many files have changed in this diff Show More