mirror of
				https://gitlab.com/Chill-Projet/chill-bundles.git
				synced 2025-10-31 01:08:26 +00:00 
			
		
		
		
	Compare commits
	
		
			324 Commits
		
	
	
		
			issue357_f
			...
			workflow/i
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 3a98a316fe | |||
| 829bf01eca | |||
| 170ce2d51c | |||
| 971789d5cf | |||
| 72815e4b70 | |||
| 44183957b8 | |||
| 5f6cffa08a | |||
| 222dae3c32 | |||
| 08c13b8c98 | |||
| 1bc2500b28 | |||
| f648a9351b | |||
| ffe466a334 | |||
|  | 3978e7c959 | ||
|  | 2eb5c45a4d | ||
|  | fefe208260 | ||
| c14101714c | |||
| 8ec5636c57 | |||
| fba7060a91 | |||
| 6894fa7101 | |||
| 41fa1d9ca6 | |||
| f4bca2f410 | |||
| 6198891202 | |||
| c806c06279 | |||
| e04c02055c | |||
| ac5675933d | |||
| e7db71b0f3 | |||
|  | 1967fc4bed | ||
|  | befd5dac42 | ||
| 186b8847d9 | |||
| 90d0cbc3b1 | |||
| ac3d39b151 | |||
| efb5bd64b4 | |||
| 76a7b019eb | |||
| 230d73498e | |||
|  | a68a43adc0 | ||
|  | 5a75e38f33 | ||
| 1c02eb23fd | |||
| 1ba5df1280 | |||
| 73c4a5d39d | |||
| 0a58c43952 | |||
| a3b823d33f | |||
| de45555c5a | |||
| 0add020e57 | |||
| 84a76d2c76 | |||
| d88207132b | |||
| 932d0e86d9 | |||
| 671f1223b5 | |||
| 1a04d903fc | |||
| 125dd4d980 | |||
| 2ddab027ed | |||
| 1724400d7c | |||
| d1a0934bb1 | |||
| bc90664480 | |||
| 99dc7490cb | |||
| 5ac485e06e | |||
| dc184762d6 | |||
| 86e7b0f007 | |||
| fdafe7c82b | |||
| d285d84068 | |||
| da22532587 | |||
| b83ad77fd8 | |||
| 00ac6aa1b9 | |||
| 318c001904 | |||
| e2d406b97b | |||
|  | efff496f7a | ||
| fe4eaa92be | |||
| cb17a7e8a5 | |||
| ad4153a07e | |||
| e95093f144 | |||
| 59cdf07c7e | |||
| 292c9380ad | |||
| 701ad17299 | |||
| 7f41f14959 | |||
| fcd5fba13e | |||
| 2c57eab4d2 | |||
| 2cd51eed2e | |||
| 72e306b583 | |||
| 917dd49d07 | |||
| 71ca912749 | |||
| 4620e32b82 | |||
| 0cda5d637d | |||
| 646f39b9ed | |||
|  | 105fe16122 | ||
|  | 4d1a553474 | ||
| 5bfdee0c28 | |||
| ae33392ad0 | |||
| 0e0fe90277 | |||
| 792eafce72 | |||
| 616d01a6c9 | |||
|  | 21edc74ada | ||
| ab23290599 | |||
| 1a2e1eaf2a | |||
| feaee8a0b1 | |||
| 0a26e7f326 | |||
| ebf85d4e4d | |||
| 72cffd7a3d | |||
| 65418b17ce | |||
|  | 8432c215a3 | ||
|  | 87e1f8f077 | ||
|  | 33f393203e | ||
| 6aa1e136b4 | |||
| 10a9b6c909 | |||
| ce912e4405 | |||
| ab11d3e8b3 | |||
|  | 445fe0cee4 | ||
| 7c6c8de456 | |||
| 0378df42b6 | |||
| ad8d40cb1c | |||
| f4516f8369 | |||
| 5b25f82963 | |||
| 8720cc730e | |||
| 44d1535bfb | |||
| 8d663cdee6 | |||
| 7c8b08c3a7 | |||
| 6df570d96c | |||
| 3ce650eea6 | |||
| 6ef7d9b47b | |||
| af3847366b | |||
| d70f8aa712 | |||
| 14463dcd38 | |||
| b9c2d63a53 | |||
| 3fd4c6339a | |||
| 4d76de5f9f | |||
| 0a92ad905b | |||
| 7af7135971 | |||
| c70a4dc664 | |||
| dc0fae7549 | |||
| b38924cc3d | |||
| 58c4e37116 | |||
| 3656825d20 | |||
| 39a7cecd24 | |||
| 6d382f93e8 | |||
| 6e554e74ab | |||
| 4c125865cf | |||
| 12c68a4c9f | |||
| 66ac5c7435 | |||
| e4b46a188c | |||
| 7a78e8a6a7 | |||
| 4496836cb2 | |||
| 88d1fe24b4 | |||
| 0ea1708fe9 | |||
| a9b7cf93e9 | |||
| 5d36e56641 | |||
| f00dfad98e | |||
| 7943c22ae7 | |||
| d365fcea39 | |||
| 9f9f9d7881 | |||
| 20f814766c | |||
| ed00a882af | |||
| 5d7501d36e | |||
| ab5f9923a6 | |||
| 1a5e8b9d7b | |||
| f7f2bb0caa | |||
| bf7fcfa41a | |||
| 9056ea8449 | |||
| f0e349a2b0 | |||
| 2ccc6f1976 | |||
| cf041cf49e | |||
| 72d593e416 | |||
| 287dca07aa | |||
| 910f9a7e8e | |||
| 9457483a6b | |||
| 6d07168529 | |||
| 420f81ea24 | |||
| 416b62fc60 | |||
| ecae7dab44 | |||
| 126bd1a4eb | |||
| 450792e446 | |||
| ec155b1d67 | |||
| 02b2af7d51 | |||
| 0a6a2c968c | |||
| 4b188e2df6 | |||
| d6bf1988f6 | |||
| 94c9505c05 | |||
| 4a5a1440ff | |||
| b31cc460fa | |||
| 48c3432191 | |||
| 7b4405f6fe | |||
| ce3a74326d | |||
| 51ab013bd7 | |||
| 41a6366efe | |||
| c3c2fd30f0 | |||
| 1952e4aa5a | |||
| 1e1311b7c8 | |||
| fc1ed8b71e | |||
| 2144b247b3 | |||
| e4629ed599 | |||
| f27dca6fb5 | |||
| 8c27ec0720 | |||
| 8392e2e6bd | |||
| 963b0b1ed2 | |||
|  | 7513187a6d | ||
|  | 990fc0e484 | ||
| 8fce27a128 | |||
| 55c2c41cea | |||
| 0bd10b6dfa | |||
| 8cd01d4317 | |||
| 71293e3378 | |||
| cb58afa44a | |||
| 7b3e9cb490 | |||
| fb720a382f | |||
| a4bfa1cb16 | |||
| 502f2aceed | |||
|  | eb9cc0b63f | ||
|  | 7ee554b48d | ||
|  | 2e6d281bfc | ||
|  | 4b1bf7ce23 | ||
|  | 2d574fea2e | ||
| 0e2772336f | |||
| 320d11671a | |||
| 6ef5390a26 | |||
| dec26e2ba4 | |||
| 514d75fa5f | |||
| 0ac51da31a | |||
| 90d43b0bd3 | |||
| 5fe0790912 | |||
| ff66aa5590 | |||
| 8e2d3616b5 | |||
| c046824ea3 | |||
| a9b216b16b | |||
| f866eae581 | |||
|  | 21d4e49fce | ||
| 17b887160a | |||
| c7dbaae8d6 | |||
|  | 25ee11e4ff | ||
|  | df661fc7c4 | ||
|  | 6b78c06dfb | ||
| daff4e4200 | |||
| 53b3f98bba | |||
| 2b47868d88 | |||
| 54c2b92962 | |||
|  | d087f051f0 | ||
|  | b3edba3abe | ||
|  | 02d8ceba25 | ||
|  | 741043c177 | ||
| c42f62de4c | |||
| e23ef35b75 | |||
| eccc75aecf | |||
| 7e2fbf93f9 | |||
| 6ab8f95f7d | |||
| ad05b3bf05 | |||
| 1faa9812db | |||
| a786578cbe | |||
| c08bd76e4b | |||
| 20a4950c60 | |||
| cdbae1eade | |||
| 45f3bb00d6 | |||
| 2b9f0e5177 | |||
| fcf2ae364f | |||
| 92788ccdc0 | |||
| 84993ca05b | |||
| 972657b38e | |||
| b26d0905a3 | |||
| 4ab0a28f7d | |||
| 52009bd7c6 | |||
| 7acd6c7fc3 | |||
| f26cba415b | |||
| 8a2e588190 | |||
| d63d9c2f4e | |||
| dcdee1d6e3 | |||
| dd589af1be | |||
|  | ce594692b3 | ||
|  | 17076024f7 | ||
|  | 61607fee3d | ||
|  | 25ebeebdfb | ||
|  | 343b2a6f2f | ||
|  | d4efe81dbb | ||
|  | 9d6afc4bb2 | ||
| 2bdf116698 | |||
| 96dc711b4f | |||
| c736c2b5bb | |||
|  | d1918e4be0 | ||
| b3aca957ff | |||
| 03bd4d1942 | |||
|  | 040c5f8847 | ||
|  | 9b5990916f | ||
|  | 74e94637b9 | ||
|  | 216c035bac | ||
|  | 16c86daafb | ||
|  | 175fa7bf2f | ||
|  | 9f7f6e33e8 | ||
|  | 3471bdec0d | ||
| 409cd40460 | |||
| 2811e61439 | |||
| 2ff34688bb | |||
| 8133dd7385 | |||
|  | 256dab3739 | ||
| 532a751509 | |||
|  | f0a7565302 | ||
| 64c4f1ece2 | |||
|  | ad983d80d2 | ||
| 001e2f9622 | |||
| 58ac4b01ef | |||
| 6e4bfd45c6 | |||
| ff0b0678a5 | |||
| 3b56cc818b | |||
| 21d5f974eb | |||
| 59b2b07a21 | |||
| eaf9f72fdd | |||
| 169442decc | |||
| cf8e25e823 | |||
| 96b1f31665 | |||
| 2ad798c0bf | |||
| 7e932e838f | |||
| 41354097f3 | |||
| 9a3f35703b | |||
| 5423de3bd9 | |||
| 5e3d421b56 | |||
| 71ca033b08 | |||
|  | 2c774e814e | ||
| 3034ba411f | |||
| ce6e51df87 | |||
|  | 6843b4cb2a | ||
| dcbce270ad | |||
| 3f5a6c6b15 | |||
| d806551477 | |||
| 120ce40dbe | |||
| 22022e5143 | |||
| 20fcaa5428 | |||
| 819017112d | |||
| d7d7fb5693 | |||
| 650e0d79be | |||
| 0afccd12a9 | |||
| 7abe3e1b2d | 
							
								
								
									
										85
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										85
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -11,11 +11,92 @@ and this project adheres to | ||||
| ## Unreleased | ||||
|  | ||||
| <!-- write down unreleased development here --> | ||||
| * vuejs: add validation on required fields for AddPerson, Address and Location components | ||||
| * vuejs: treat 422 validation errors in locations and AddPerson components | ||||
| * renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche | ||||
| * renomme date de début en date d'ouverture dans le formulaire parcours | ||||
|  | ||||
|  | ||||
| ## Test releases | ||||
|  | ||||
| ### test release 2021-01-31 | ||||
|  | ||||
| [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.   | ||||
| * [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409) | ||||
| * [person] accompanying course: close modal when edit participation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420) | ||||
| * [person] accompanying course: treat validation error when editing on-the-fly entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420) | ||||
| * [activity] show activity attendee (présence) in the activity list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/412) | ||||
| * [activity] admin: change validation rule for social action visible field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/413) | ||||
| * [parcours]: component added to change the opening date of a parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/411) | ||||
| * [search]: listing of parcours display changed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/410) | ||||
| * [user]: page with accompanying periods to which is user is referent (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/408) | ||||
| * [person] age added to renderstring + renderbox/ vue component created to display person text (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/389) | ||||
| * [household member editor] allow to push to existing household | ||||
| * [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal | ||||
|  | ||||
|  | ||||
| ### test release 2021-01-28 | ||||
|  | ||||
| * [person] improve filiations vis graph: disable physics, use chill colors for persons-households-course, increase label of relations, remove labels on household arrows and other improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/286, https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/362) | ||||
| * [activity] Order activity by date and by id (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/364) | ||||
| * [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277) | ||||
| * [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165) | ||||
| * [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377) | ||||
| * [person] Add residential address entity, form and list for each person | ||||
| * [aside_activity]: dynamicUserPickerType used (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/399) | ||||
| * dispatching list | ||||
|  | ||||
|  | ||||
| ### test release 2021-01-26 | ||||
|  | ||||
| * [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406) | ||||
| * [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382) | ||||
| * [person ressources]: module added | ||||
|  | ||||
|  | ||||
| ### test release 2022-01-24 | ||||
|  | ||||
| * [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377) | ||||
| * [notification: formulaire création] descend la box avec la description dans le bas du formulaire | ||||
| * [notification for activity]: fix link to activity | ||||
| * [notification] add "URGENT" before accompanying course with emergency = true | ||||
| * [notification] add a "read more" button on system notification | ||||
| * [notification] add `[Chill]` in the subject of each notification, automatically | ||||
| * [notification] add a counter for notification in activity list and accompanying period list, and search results | ||||
| * [parcours] bugfix if deathdate is not defined (eg. for a thirdparty) parcours is still displayed. Gave error before. | ||||
| * [workflow] add breadcrumb to show steps | ||||
| * [popover] add popover html popup mechanism (used by workflow breadcrumb) | ||||
| * [templates] improve updatedBy macro in item metadatas | ||||
| * [parcours]: bug fix when comment is pinned all other comments remain in the collection (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/385) | ||||
| * [workflow]  | ||||
|   * add My workflow section with my opened subscriptions | ||||
|   * apply workflow on documents, accompanyingCourseWork and Evaluations | ||||
| * [wopi-link] a new vue component allow to open wopi link in a fullscreen chill-themed modal | ||||
|  | ||||
| ### test release 2022-01-19 | ||||
| * vuejs: add dead information on all on-the-fly person render boxes, in vis graph and other templates (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/271) | ||||
| * [thirdparty] fix bug in 3rd party view: types was replaced by thirdPartyTypes | ||||
| * [main] location form type: fix unmapped address field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/246) | ||||
| * [activity] fix wrong import of js assets for adding and viewing documents in activity (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/83 & https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/176) | ||||
| * [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380) | ||||
| * [forms] dynamic picker types for user/person/thirdparty types created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/386) | ||||
|  | ||||
| ### test release 2022-01-17 | ||||
|  | ||||
| * [main] Add editableByUser field to locationType entity, adapt the admin template and add this condition in the location-type endpoint (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/297) | ||||
| * [main] Add mainLocation field to User entity and add it in user form type | ||||
| * rewrite page which allow to select activity | ||||
| * [main] Add mainLocation field to User entity and add it in user form type | ||||
| * [course list in person context] show full username/label for ref | ||||
| * [accompanying period work] remove the possibility to  generate document from an accompanying period work | ||||
| * vuejs: add validation on required fields for AddPerson, Address and Location components | ||||
| * vuejs: treat 422 validation errors in locations and AddPerson components | ||||
| * [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380) | ||||
|  | ||||
| ## Test releases | ||||
| * vuejs: add validation on required fields for AddPerson, Address and Location components | ||||
| * vuejs: treat 422 validation errors in locations and AddPerson components | ||||
| * [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380) | ||||
|  | ||||
| ### test release 2022-01-12 | ||||
|  | ||||
| * fix thirdparty normalizer on telephone field: https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/322 | ||||
|   | ||||
| @@ -52,9 +52,6 @@ | ||||
|         "twig/string-extra": "^3.3", | ||||
|         "twig/twig": "^3.0" | ||||
|     }, | ||||
|     "conflict": { | ||||
|         "symfony/symfony": "*" | ||||
|     }, | ||||
|     "require-dev": { | ||||
|         "doctrine/doctrine-fixtures-bundle": "^3.3", | ||||
|         "drupol/php-conventions": "^5", | ||||
| @@ -71,23 +68,17 @@ | ||||
|         "symfony/var-dumper": "^4.4", | ||||
|         "symfony/web-profiler-bundle": "^4.4" | ||||
|     }, | ||||
|     "config": { | ||||
|         "bin-dir": "bin", | ||||
|         "optimize-autoloader": true, | ||||
|         "sort-packages": true, | ||||
|         "vendor-dir": "tests/app/vendor", | ||||
|         "allow-plugins": { | ||||
|             "composer/package-versions-deprecated": true, | ||||
|             "phpstan/extension-installer": true, | ||||
|             "ergebnis/composer-normalize": true, | ||||
|             "phpro/grumphp": true | ||||
|         } | ||||
|     "conflict": { | ||||
|         "symfony/symfony": "*" | ||||
|     }, | ||||
|     "autoload": { | ||||
|         "psr-4": { | ||||
|             "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle", | ||||
|             "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src", | ||||
|             "Chill\\BudgetBundle\\": "src/Bundle/ChillBudgetBundle", | ||||
|             "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle", | ||||
|             "Chill\\CustomFieldsBundle\\": "src/Bundle/ChillCustomFieldsBundle", | ||||
|             "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle", | ||||
|             "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle", | ||||
|             "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle", | ||||
|             "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle", | ||||
| @@ -96,9 +87,6 @@ | ||||
|             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle", | ||||
|             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle", | ||||
|             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle", | ||||
|             "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src", | ||||
|             "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle", | ||||
|             "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle", | ||||
|             "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src" | ||||
|         } | ||||
|     }, | ||||
| @@ -111,10 +99,10 @@ | ||||
|     "config": { | ||||
|         "allow-plugins": { | ||||
|             "composer/package-versions-deprecated": true, | ||||
|             "phpstan/extension-installer": true, | ||||
|             "ergebnis/composer-normalize": true, | ||||
|             "ocramius/package-versions": true, | ||||
|             "phpro/grumphp": true, | ||||
|             "ocramius/package-versions": true | ||||
|             "phpstan/extension-installer": true | ||||
|         }, | ||||
|         "bin-dir": "bin", | ||||
|         "optimize-autoloader": true, | ||||
| @@ -123,8 +111,8 @@ | ||||
|     }, | ||||
|     "scripts": { | ||||
|         "auto-scripts": { | ||||
|             "cache:clear": "symfony-cmd", | ||||
|             "assets:install %PUBLIC_DIR%": "symfony-cmd" | ||||
|             "assets:install %PUBLIC_DIR%": "symfony-cmd", | ||||
|             "cache:clear": "symfony-cmd" | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -1,3 +0,0 @@ | ||||
| add npm/yarn dependency in package.json : | ||||
|  | ||||
| "select2-bootstrap-theme": "0.1.0-beta.10", | ||||
| @@ -80,11 +80,6 @@ parameters: | ||||
| 			count: 1 | ||||
| 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php | ||||
|  | ||||
| 		- | ||||
| 			message: "#^Foreach overwrites \\$action with its value variable\\.$#" | ||||
| 			count: 1 | ||||
| 			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php | ||||
|  | ||||
| 		- | ||||
| 			message: "#^Foreach overwrites \\$action with its value variable\\.$#" | ||||
| 			count: 1 | ||||
|   | ||||
| @@ -30,36 +30,6 @@ parameters: | ||||
|             count: 2 | ||||
|             path: src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php | ||||
|  | ||||
|         - | ||||
|             message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#" | ||||
|             count: 1 | ||||
|             path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php | ||||
|  | ||||
|         - | ||||
|             message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:countBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#" | ||||
|             count: 1 | ||||
|             path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php | ||||
|  | ||||
|         - | ||||
|             message: "#^Undefined variable\\: \\$action$#" | ||||
|             count: 1 | ||||
|             path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php | ||||
|  | ||||
|         - | ||||
|             message: "#^Undefined variable\\: \\$limit$#" | ||||
|             count: 1 | ||||
|             path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php | ||||
|  | ||||
|         - | ||||
|             message: "#^Undefined variable\\: \\$offset$#" | ||||
|             count: 1 | ||||
|             path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php | ||||
|  | ||||
|         - | ||||
|             message: "#^Undefined variable\\: \\$orderBy$#" | ||||
|             count: 1 | ||||
|             path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php | ||||
|  | ||||
|         - | ||||
|             message: "#^Variable variables are not allowed\\.$#" | ||||
|             count: 4 | ||||
|   | ||||
| @@ -400,11 +400,6 @@ parameters: | ||||
| 			count: 1 | ||||
| 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php | ||||
|  | ||||
| 		- | ||||
| 			message: "#^Method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\QueryBuilder\\.$#" | ||||
| 			count: 1 | ||||
| 			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php | ||||
|  | ||||
| 		- | ||||
| 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#" | ||||
| 			count: 3 | ||||
|   | ||||
| @@ -31,6 +31,7 @@ use DateTime; | ||||
| use Doctrine\ORM\EntityManagerInterface; | ||||
| use InvalidArgumentException; | ||||
| use Psr\Log\LoggerInterface; | ||||
| use RuntimeException; | ||||
| use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; | ||||
| use Symfony\Component\EventDispatcher\EventDispatcherInterface; | ||||
| use Symfony\Component\Form\Extension\Core\Type\SubmitType; | ||||
| @@ -38,8 +39,8 @@ 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 Symfony\Component\Serializer\SerializerInterface; | ||||
| use function array_key_exists; | ||||
|  | ||||
| final class ActivityController extends AbstractController | ||||
| @@ -255,7 +256,7 @@ final class ActivityController extends AbstractController | ||||
|         if ($person instanceof Person) { | ||||
|             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person); | ||||
|             $activities = $this->activityACLAwareRepository | ||||
|                 ->findByPerson($person, ActivityVoter::SEE, 0, null); | ||||
|                 ->findByPerson($person, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']); | ||||
|  | ||||
|             $event = new PrivacyEvent($person, [ | ||||
|                 'element_class' => Activity::class, | ||||
| @@ -268,7 +269,7 @@ final class ActivityController extends AbstractController | ||||
|             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod); | ||||
|  | ||||
|             $activities = $this->activityACLAwareRepository | ||||
|                 ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE); | ||||
|                 ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']); | ||||
|  | ||||
|             $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig'; | ||||
|         } | ||||
| @@ -471,20 +472,21 @@ final class ActivityController extends AbstractController | ||||
|  | ||||
|     public function showAction(Request $request, int $id): Response | ||||
|     { | ||||
|         $view = null; | ||||
|         $entity = $this->activityRepository->find($id); | ||||
|  | ||||
|         [$person, $accompanyingPeriod] = $this->getEntity($request); | ||||
|         if (null === $entity) { | ||||
|             throw $this->createNotFoundException('Unable to find Activity entity.'); | ||||
|         } | ||||
|  | ||||
|         $accompanyingPeriod = $entity->getAccompanyingPeriod(); | ||||
|         $person = $entity->getPerson(); | ||||
|  | ||||
|         if ($accompanyingPeriod instanceof AccompanyingPeriod) { | ||||
|             $view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig'; | ||||
|         } elseif ($person instanceof Person) { | ||||
|             $view = 'ChillActivityBundle:Activity:showPerson.html.twig'; | ||||
|         } | ||||
|  | ||||
|         $entity = $this->activityRepository->find($id); | ||||
|  | ||||
|         if (null === $entity) { | ||||
|             throw $this->createNotFoundException('Unable to find Activity entity.'); | ||||
|         } else { | ||||
|             throw new RuntimeException('the activity should be linked with a period or person'); | ||||
|         } | ||||
|  | ||||
|         if (null !== $accompanyingPeriod) { | ||||
| @@ -493,8 +495,7 @@ final class ActivityController extends AbstractController | ||||
|             $entity->personsNotAssociated = $entity->getPersonsNotAssociated(); | ||||
|         } | ||||
|  | ||||
|         // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période | ||||
|         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity); | ||||
|         $this->denyAccessUnlessGranted(ActivityVoter::SEE, $entity); | ||||
|  | ||||
|         $deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod); | ||||
|  | ||||
|   | ||||
| @@ -12,7 +12,7 @@ declare(strict_types=1); | ||||
| namespace Chill\ActivityBundle\Entity; | ||||
|  | ||||
| use Chill\ActivityBundle\Validator\Constraints as ActivityValidator; | ||||
| use Chill\DocStoreBundle\Entity\Document; | ||||
| use Chill\DocStoreBundle\Entity\StoredObject; | ||||
| use Chill\MainBundle\Entity\Center; | ||||
| use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable; | ||||
| use Chill\MainBundle\Entity\HasCenterInterface; | ||||
| @@ -67,7 +67,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType") | ||||
|      * @Groups({"read"}) | ||||
|      * @Groups({"read", "docgen:read"}) | ||||
|      * @SerializedName("activityType") | ||||
|      * @ORM\JoinColumn(name="type_id") | ||||
|      */ | ||||
| @@ -75,16 +75,19 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence") | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     private ?ActivityPresence $attendee = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_") | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     private CommentEmbeddable $comment; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="datetime") | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     private DateTime $date; | ||||
|  | ||||
| @@ -100,6 +103,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="boolean", options={"default": false}) | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     private bool $emergency = false; | ||||
|  | ||||
| @@ -107,13 +111,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac | ||||
|      * @ORM\Id | ||||
|      * @ORM\Column(name="id", type="integer") | ||||
|      * @ORM\GeneratedValue(strategy="AUTO") | ||||
|      * @Groups({"read"}) | ||||
|      * @Groups({"read", "docgen:read"}) | ||||
|      */ | ||||
|     private ?int $id = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location") | ||||
|      * @groups({"read"}) | ||||
|      * @groups({"read", "docgen:read"}) | ||||
|      */ | ||||
|     private ?Location $location = null; | ||||
|  | ||||
| @@ -124,42 +128,45 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person") | ||||
|      * @Groups({"read"}) | ||||
|      * @Groups({"read", "docgen:read"}) | ||||
|      */ | ||||
|     private ?Collection $persons = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason") | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     private Collection $reasons; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope") | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     private ?Scope $scope = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="string", options={"default": ""}) | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     private string $sentReceived = ''; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction") | ||||
|      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction") | ||||
|      * @Groups({"read"}) | ||||
|      * @Groups({"read", "docgen:read"}) | ||||
|      */ | ||||
|     private Collection $socialActions; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue") | ||||
|      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue") | ||||
|      * @Groups({"read"}) | ||||
|      * @Groups({"read", "docgen:read"}) | ||||
|      */ | ||||
|     private Collection $socialIssues; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty") | ||||
|      * @Groups({"read"}) | ||||
|      * @Groups({"read", "docgen:read"}) | ||||
|      */ | ||||
|     private ?Collection $thirdParties = null; | ||||
|  | ||||
| @@ -170,12 +177,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User") | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     private User $user; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User") | ||||
|      * @Groups({"read"}) | ||||
|      * @Groups({"read", "docgen:read"}) | ||||
|      */ | ||||
|     private ?Collection $users = null; | ||||
|  | ||||
| @@ -191,7 +199,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac | ||||
|         $this->socialActions = new ArrayCollection(); | ||||
|     } | ||||
|  | ||||
|     public function addDocument(Document $document): self | ||||
|     public function addDocument(StoredObject $document): self | ||||
|     { | ||||
|         $this->documents[] = $document; | ||||
|  | ||||
| @@ -302,6 +310,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac | ||||
|         return $this->documents; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     public function getDurationMinute(): int | ||||
|     { | ||||
|         if (null === $this->durationTime) { | ||||
|             return 0; | ||||
|         } | ||||
|  | ||||
|         return (int) round(($this->durationTime->getTimestamp() + $this->durationTime->getOffset()) / 60.0, 0); | ||||
|     } | ||||
|  | ||||
|     public function getDurationTime(): ?DateTime | ||||
|     { | ||||
|         return $this->durationTime; | ||||
| @@ -402,6 +422,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac | ||||
|         return $this->travelTime; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     public function getTravelTimeMinute(): int | ||||
|     { | ||||
|         if (null === $this->travelTime) { | ||||
|             return 0; | ||||
|         } | ||||
|  | ||||
|         return (int) round(($this->travelTime->getTimestamp() + $this->travelTime->getOffset()) / 60.0, 0); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @deprecated | ||||
|      */ | ||||
| @@ -425,7 +457,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac | ||||
|         return $this->getEmergency(); | ||||
|     } | ||||
|  | ||||
|     public function removeDocument(Document $document): void | ||||
|     public function removeDocument(StoredObject $document): void | ||||
|     { | ||||
|         $this->documents->removeElement($document); | ||||
|     } | ||||
|   | ||||
| @@ -12,6 +12,7 @@ declare(strict_types=1); | ||||
| namespace Chill\ActivityBundle\Entity; | ||||
|  | ||||
| use Doctrine\ORM\Mapping as ORM; | ||||
| use Symfony\Component\Serializer\Annotation as Serializer; | ||||
|  | ||||
| /** | ||||
|  * Class ActivityPresence. | ||||
| @@ -31,11 +32,14 @@ class ActivityPresence | ||||
|      * @ORM\Id | ||||
|      * @ORM\Column(name="id", type="integer") | ||||
|      * @ORM\GeneratedValue(strategy="AUTO") | ||||
|      * @Serializer\Groups({"docgen:read"}) | ||||
|      */ | ||||
|     private ?int $id; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="json") | ||||
|      * @Serializer\Groups({"docgen:read"}) | ||||
|      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"}) | ||||
|      */ | ||||
|     private array $name = []; | ||||
|  | ||||
|   | ||||
| @@ -13,8 +13,10 @@ namespace Chill\ActivityBundle\Entity; | ||||
|  | ||||
| use Doctrine\ORM\Mapping as ORM; | ||||
| use InvalidArgumentException; | ||||
| use Symfony\Component\Serializer\Annotation as Serializer; | ||||
| use Symfony\Component\Serializer\Annotation\Groups; | ||||
| use Symfony\Component\Validator\Constraints as Assert; | ||||
| use Symfony\Component\Validator\Context\ExecutionContextInterface; | ||||
|  | ||||
| /** | ||||
|  * Class ActivityType. | ||||
| @@ -118,6 +120,7 @@ class ActivityType | ||||
|      * @ORM\Id | ||||
|      * @ORM\Column(name="id", type="integer") | ||||
|      * @ORM\GeneratedValue(strategy="AUTO") | ||||
|      * @Groups({"docgen:read"}) | ||||
|      */ | ||||
|     private ?int $id; | ||||
|  | ||||
| @@ -133,7 +136,8 @@ class ActivityType | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="json") | ||||
|      * @Groups({"read"}) | ||||
|      * @Groups({"read", "docgen:read"}) | ||||
|      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"}) | ||||
|      */ | ||||
|     private array $name = []; | ||||
|  | ||||
| @@ -190,7 +194,6 @@ class ActivityType | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="smallint", nullable=false, options={"default": 1}) | ||||
|      * @Assert\EqualTo(propertyPath="socialIssuesVisible", message="This parameter must be equal to social issue parameter") | ||||
|      */ | ||||
|     private int $socialActionsVisible = self::FIELD_INVISIBLE; | ||||
|  | ||||
| @@ -260,6 +263,23 @@ class ActivityType | ||||
|      */ | ||||
|     private int $userVisible = self::FIELD_REQUIRED; | ||||
|  | ||||
|     /** | ||||
|      * @Assert\Callback | ||||
|      * | ||||
|      * @param mixed $payload | ||||
|      */ | ||||
|     public function checkSocialActionsVisibility(ExecutionContextInterface $context, $payload) | ||||
|     { | ||||
|         if ($this->socialIssuesVisible !== $this->socialActionsVisible) { | ||||
|             if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) { | ||||
|                 $context | ||||
|                     ->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value') | ||||
|                     ->atPath('socialActionsVisible') | ||||
|                     ->addViolation(); | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get active | ||||
|      * return true if the type is active. | ||||
|   | ||||
| @@ -307,6 +307,7 @@ class ActivityType extends AbstractType | ||||
|                 'allow_add' => true, | ||||
|                 'button_add_label' => 'activity.Insert a document', | ||||
|                 'button_remove_label' => 'activity.Remove a document', | ||||
|                 'empty_collection_explain' => 'No documents', | ||||
|             ]); | ||||
|         } | ||||
|  | ||||
|   | ||||
| @@ -9,8 +9,9 @@ div.new-activity-select-type { | ||||
|       display: flex; | ||||
|       flex-direction: row; | ||||
|       flex-wrap: wrap; | ||||
|       justify-content: center; | ||||
|       justify-content: flex-start; | ||||
|       gap: 12px; | ||||
|       margin-bottom: 30px; | ||||
|  | ||||
|       div.bloc { | ||||
|          width: 200px; | ||||
| @@ -27,26 +28,28 @@ div.new-activity-select-type { | ||||
| // precise dashboard specific details | ||||
|  | ||||
| p.date-label { | ||||
|     display: inline-block; | ||||
|     margin: 0 0.5em 0 0; | ||||
|     font-weight: 700; | ||||
|     font-size: 18pt; | ||||
|    display: inline-block; | ||||
|    margin: 0 0.5em 0 0; | ||||
|    font-weight: 700; | ||||
|    font-size: 18pt; | ||||
| } | ||||
| div.dashboard, | ||||
| h4.badge-title, | ||||
| h3.badge-title, | ||||
| h2.badge-title { | ||||
|     ul.list-content { | ||||
|         font-size: 70%; | ||||
|         list-style-type: none; | ||||
|         padding-left: 0; | ||||
|         margin: 0; | ||||
|         li { | ||||
|             margin-bottom: 0.2em; | ||||
|             // exception: change bg color for action badges above dashboard | ||||
|             .bg-light { | ||||
|                 background-color: $chill-light-gray !important; | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|    ul.list-content { | ||||
|       font-size: 70%; | ||||
|       list-style-type: none; | ||||
|       padding-left: 0; | ||||
|       margin: 0; | ||||
|       li { | ||||
|          margin-bottom: 0.2em; | ||||
|          // exception: change bg color for action badges above dashboard | ||||
|          .bg-light { | ||||
|                background-color: $chill-light-gray !important; | ||||
|          } | ||||
|       } | ||||
|    } | ||||
| } | ||||
|  | ||||
| //// ACTIVITY SHOW AND FORM PAGES | ||||
|   | ||||
| @@ -1,45 +1,48 @@ | ||||
| <template> | ||||
|     <teleport to="#add-persons" v-if="isComponentVisible"> | ||||
|    <teleport to="#add-persons" v-if="isComponentVisible"> | ||||
|  | ||||
|         <div class="flex-bloc concerned-groups" :class="getContext"> | ||||
|             <persons-bloc | ||||
|                 v-for="bloc in contextPersonsBlocs" | ||||
|                 v-bind:key="bloc.key" | ||||
|                 v-bind:bloc="bloc" | ||||
|                 v-bind:blocWidth="getBlocWidth" | ||||
|                 v-bind:setPersonsInBloc="setPersonsInBloc"> | ||||
|             </persons-bloc> | ||||
|         </div> | ||||
|         <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0"> | ||||
|             <ul class="list-suggest add-items inline"> | ||||
|                 <li v-for="(p, i) in suggestedEntities" @click="addSuggestedEntity(p)" :key="`suggestedEntities-${i}`"> | ||||
|                     <span>{{ p.text }}</span> | ||||
|                 </li> | ||||
|             </ul> | ||||
|         </div> | ||||
|       <div class="flex-bloc concerned-groups" :class="getContext"> | ||||
|          <persons-bloc | ||||
|                v-for="bloc in contextPersonsBlocs" | ||||
|                v-bind:key="bloc.key" | ||||
|                v-bind:bloc="bloc" | ||||
|                v-bind:blocWidth="getBlocWidth" | ||||
|                v-bind:setPersonsInBloc="setPersonsInBloc"> | ||||
|          </persons-bloc> | ||||
|       </div> | ||||
|       <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0"> | ||||
|          <ul class="list-suggest add-items inline"> | ||||
|                <li v-for="(p, i) in suggestedEntities" @click="addSuggestedEntity(p)" :key="`suggestedEntities-${i}`"> | ||||
|                   <person-text v-if="p.type === 'person'" :person="p"></person-text> | ||||
|                   <span v-else>{{ p.text }}</span> | ||||
|                </li> | ||||
|          </ul> | ||||
|       </div> | ||||
|  | ||||
|         <add-persons | ||||
|             buttonTitle="activity.add_persons" | ||||
|             modalTitle="activity.add_persons" | ||||
|             v-bind:key="addPersons.key" | ||||
|             v-bind:options="addPersonsOptions" | ||||
|             @addNewPersons="addNewPersons" | ||||
|             ref="addPersons"> | ||||
|         </add-persons> | ||||
|       <add-persons | ||||
|          buttonTitle="activity.add_persons" | ||||
|          modalTitle="activity.add_persons" | ||||
|          v-bind:key="addPersons.key" | ||||
|          v-bind:options="addPersonsOptions" | ||||
|          @addNewPersons="addNewPersons" | ||||
|          ref="addPersons"> | ||||
|       </add-persons> | ||||
|  | ||||
|     </teleport> | ||||
|    </teleport> | ||||
| </template> | ||||
|  | ||||
| <script> | ||||
| import { mapState, mapGetters } from 'vuex'; | ||||
| import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'; | ||||
| import PersonsBloc from './ConcernedGroups/PersonsBloc.vue'; | ||||
| import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue'; | ||||
|  | ||||
| export default { | ||||
|    name: "ConcernedGroups", | ||||
|    components: { | ||||
|       AddPersons, | ||||
|       PersonsBloc | ||||
|       PersonsBloc, | ||||
|       PersonText | ||||
|    }, | ||||
|    data() { | ||||
|       return { | ||||
|   | ||||
| @@ -1,21 +1,29 @@ | ||||
| <template> | ||||
|    <li> | ||||
|       <span :title="person.text"> | ||||
|          <span class="chill_denomination" @click.prevent="$emit('remove', person)">{{ textCutted }}</span> | ||||
|          <span class="chill_denomination" @click.prevent="$emit('remove', person)"> | ||||
|             <person-text :person="person" :isCut="true"></person-text> | ||||
|          </span> | ||||
|       </span> | ||||
|    </li> | ||||
| </template> | ||||
|  | ||||
| <script> | ||||
| import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue'; | ||||
|  | ||||
|  | ||||
| export default { | ||||
|    name: "PersonBadge", | ||||
|    props: ['person'], | ||||
|    computed: { | ||||
|       textCutted() { | ||||
|          let more = (this.person.text.length > 15) ?'…' : ''; | ||||
|          return this.person.text.slice(0,15) + more; | ||||
|       } | ||||
|    components: { | ||||
|       PersonText | ||||
|    }, | ||||
|    // computed: { | ||||
|    //    textCutted() { | ||||
|    //       let more = (this.person.text.length > 15) ?'…' : ''; | ||||
|    //       return this.person.text.slice(0,15) + more; | ||||
|    //    } | ||||
|    // }, | ||||
|    emits: ['remove'], | ||||
| } | ||||
| </script> | ||||
|   | ||||
| @@ -41,6 +41,17 @@ | ||||
|                 </div> | ||||
|             {% endif %} | ||||
|  | ||||
|             {% if activity.attendee and t.attendeeVisible %} | ||||
|                 <div class="wl-row"> | ||||
|                     <div class="wl-col title"><h3>{{ 'Attendee'|trans }}</h3></div> | ||||
|                     <div class="wl-col list"> | ||||
|                         <p class="wl-item"> | ||||
|                             {{ activity.attendee.name|localize_translatable_string }} | ||||
|                         </p> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             {% endif %} | ||||
|  | ||||
|             {% if activity.sentReceived is not empty and t.sentReceivedVisible %} | ||||
|                 <div class="wl-row"> | ||||
|                     <div class="wl-col title"><h3>{{ 'Sent received'|trans }}</h3></div> | ||||
| @@ -143,9 +154,17 @@ | ||||
|     </div> | ||||
|  | ||||
|     <div class="item-row separator"> | ||||
|         <ul class="record_actions"> | ||||
|             {{ recordAction }} | ||||
|         </ul> | ||||
|         <div class="item-col item-meta"> | ||||
|             {% set notif_counter = chill_count_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) %} | ||||
|             {% if notif_counter.total > 0 %} | ||||
|                 {{ chill_counter_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) }} | ||||
|             {% endif %} | ||||
|         </div> | ||||
|         <div class="item-col"> | ||||
|             <ul class="record_actions"> | ||||
|                 {{ recordAction }} | ||||
|             </ul> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
| </div> | ||||
|   | ||||
| @@ -8,6 +8,7 @@ | ||||
|         action: 'show', displayBadge: true, | ||||
|         targetEntity: { name: type, id: entity.id }, | ||||
|         buttonText: entity|chill_entity_render_string, | ||||
|         isDead: entity.deathdate is defined and entity.deathdate is not null, | ||||
|         parent: parent | ||||
|     } %} | ||||
| {% endmacro %} | ||||
|   | ||||
| @@ -83,15 +83,15 @@ | ||||
|     {{ form_row(edit_form.comment) }} | ||||
| {% endif %} | ||||
|  | ||||
| {%- if edit_form.documents is defined -%} | ||||
|     {{ form_row(edit_form.documents) }} | ||||
| {% endif %} | ||||
|  | ||||
| {%- if edit_form.attendee is defined -%} | ||||
|     {{ form_row(edit_form.attendee) }} | ||||
| {% endif %} | ||||
|  | ||||
| {# TODO .. status #} | ||||
| {%- if edit_form.documents is defined -%} | ||||
|     {{ form_row(edit_form.documents) }} | ||||
| {% endif %} | ||||
|  | ||||
| <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div> | ||||
|  | ||||
| {% set person_id = null %} | ||||
| {% if entity.person %} | ||||
|   | ||||
| @@ -15,7 +15,7 @@ | ||||
|  | ||||
| {% block js %} | ||||
|     {{ parent() }} | ||||
|     {{ encore_entry_link_tags('mod_async_upload') }} | ||||
|     {{ encore_entry_script_tags('mod_async_upload') }} | ||||
|     <script type="text/javascript"> | ||||
|         window.addEventListener('DOMContentLoaded', function (e) { | ||||
|             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', | ||||
| @@ -24,10 +24,12 @@ | ||||
|         window.activity = {{ activity_json|json_encode|raw }}; | ||||
|     </script> | ||||
|     {{ encore_entry_script_tags('vue_activity') }} | ||||
|     {{ encore_entry_script_tags('mod_docgen_picktemplate') }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block css %} | ||||
|     {{ parent() }} | ||||
|     {{ encore_entry_link_tags('mod_async_upload') }} | ||||
|     {{ encore_entry_link_tags('vue_activity') }} | ||||
|     {{ encore_entry_link_tags('mod_docgen_picktemplate') }} | ||||
| {% endblock %} | ||||
|   | ||||
| @@ -30,7 +30,7 @@ | ||||
| {% endblock %} | ||||
|  | ||||
| {% block js %} | ||||
|     {{ encore_entry_link_tags('mod_async_upload') }} | ||||
|     {{ encore_entry_script_tags('mod_async_upload') }} | ||||
|     <script type="text/javascript"> | ||||
|         window.addEventListener('DOMContentLoaded', function (e) { | ||||
|             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', | ||||
| @@ -39,9 +39,11 @@ | ||||
|         window.activity = {{ activity_json|json_encode|raw }}; | ||||
|     </script> | ||||
|     {{ encore_entry_script_tags('vue_activity') }} | ||||
|     {{ encore_entry_script_tags('mod_docgen_picktemplate') }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block css %} | ||||
|     {{ encore_entry_link_tags('mod_async_upload') }} | ||||
|     {{ encore_entry_link_tags('vue_activity') }} | ||||
|     {{ encore_entry_link_tags('mod_docgen_picktemplate') }} | ||||
| {% endblock %} | ||||
|   | ||||
| @@ -1,58 +1,62 @@ | ||||
| {% macro recordAction(activity, context = null, person_id = null, accompanying_course_id = null) %} | ||||
|     {% if no_action is not defined or no_action == false %} | ||||
|         <li> | ||||
|             <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', { | ||||
|                 'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', | ||||
|                 'entityId': activity.id | ||||
|             }) }}">{{ 'notification.Notify'|trans }}</a> | ||||
|         </li> | ||||
|     {% endif %} | ||||
|     {% if context == 'person' and activity.accompanyingPeriod is not empty %} | ||||
|         {# | ||||
|             Disable person_id in following links, for redirect to accompanyingCourse context | ||||
|         #} | ||||
|         {% set person_id = null %} | ||||
|         {% set accompanying_course_id = activity.accompanyingPeriod.id %} | ||||
|         <li> | ||||
|             <a href="{{ chill_path_add_return_path('chill_activity_activity_list',{ | ||||
|                     'accompanying_period_id': accompanying_course_id | ||||
|                 }) }}" | ||||
|                 class="btn btn-primary" | ||||
|                 title="{{ 'See activity in accompanying course context'|trans }}"> | ||||
|                 <i class="fa fa-random fa-fw"></i> | ||||
|                 {{ 'Period number %number%'|trans({'%number%': accompanying_course_id}) }} | ||||
|             </a> | ||||
|         </li> | ||||
|     {% endif %} | ||||
|     <li> | ||||
|         <a href="{{ path('chill_activity_activity_show', {'id': activity.id, | ||||
|                 'person_id': person_id, | ||||
|                 'accompanying_period_id': accompanying_course_id | ||||
|             }) }}" | ||||
|             class="btn btn-show" | ||||
|             title="{{ 'Show'|trans }}"></a> | ||||
|     </li> | ||||
|     {% if no_action is not defined or no_action == false %} | ||||
|         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %} | ||||
|     {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %} | ||||
|         {% if no_action is not defined or no_action == false %} | ||||
|             <li> | ||||
|                 <a href="{{ path('chill_activity_activity_edit', {'id': activity.id, | ||||
|                         'person_id': person_id, | ||||
|                         'accompanying_period_id': accompanying_course_id | ||||
|                     }) }}" | ||||
|                     class="btn btn-update" | ||||
|                     title="{{ 'Edit'|trans }}"></a> | ||||
|                 <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', { | ||||
|                     'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', | ||||
|                     'entityId': activity.id | ||||
|                 }) }}"> | ||||
|                     <i class="fa fa-paper-plane fa-fw"></i> | ||||
|                     {{ 'notification.Notify'|trans }}</a> | ||||
|             </li> | ||||
|         {% endif %} | ||||
|         {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %} | ||||
|         {% if context == 'person' and activity.accompanyingPeriod is not empty %} | ||||
|             {# | ||||
|                 Disable person_id in following links, for redirect to accompanyingCourse context | ||||
|             #} | ||||
|             {% set person_id = null %} | ||||
|             {% set accompanying_course_id = activity.accompanyingPeriod.id %} | ||||
|             <li> | ||||
|                 <a href="{{ path('chill_activity_activity_delete', {'id': activity.id, | ||||
|                         'person_id': person_id, | ||||
|                 <a href="{{ chill_path_add_return_path('chill_activity_activity_list',{ | ||||
|                         'accompanying_period_id': accompanying_course_id | ||||
|                     }) }}" | ||||
|                     class="btn btn-delete" | ||||
|                     title="{{ 'Delete'|trans }}"></a> | ||||
|                     class="btn btn-primary" | ||||
|                     title="{{ 'See activity in accompanying course context'|trans }}"> | ||||
|                     <i class="fa fa-random fa-fw"></i> | ||||
|                     {{ 'Period number %number%'|trans({'%number%': accompanying_course_id}) }} | ||||
|                 </a> | ||||
|             </li> | ||||
|         {% endif %} | ||||
|         <li> | ||||
|             <a href="{{ path('chill_activity_activity_show', {'id': activity.id, | ||||
|                     'person_id': person_id, | ||||
|                     'accompanying_period_id': accompanying_course_id | ||||
|                 }) }}" | ||||
|                 class="btn btn-show" | ||||
|                 title="{{ 'Show'|trans }}"></a> | ||||
|         </li> | ||||
|         {% if no_action is not defined or no_action == false %} | ||||
|             {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %} | ||||
|                 <li> | ||||
|                     <a href="{{ path('chill_activity_activity_edit', {'id': activity.id, | ||||
|                             'person_id': person_id, | ||||
|                             'accompanying_period_id': accompanying_course_id | ||||
|                         }) }}" | ||||
|                         class="btn btn-update" | ||||
|                         title="{{ 'Edit'|trans }}"></a> | ||||
|                 </li> | ||||
|             {% endif %} | ||||
|             {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %} | ||||
|                 <li> | ||||
|                     <a href="{{ path('chill_activity_activity_delete', {'id': activity.id, | ||||
|                             'person_id': person_id, | ||||
|                             'accompanying_period_id': accompanying_course_id | ||||
|                         }) }}" | ||||
|                         class="btn btn-delete" | ||||
|                         title="{{ 'Delete'|trans }}"></a> | ||||
|                 </li> | ||||
|             {% endif %} | ||||
|         {% endif %} | ||||
|     {% endif %} | ||||
| {% endmacro %} | ||||
|  | ||||
|   | ||||
| @@ -48,7 +48,7 @@ | ||||
|                         <li class="associated-persons"> | ||||
|                             <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span> | ||||
|                             {% for p in activity.personsAssociated %} | ||||
|                                 <span class="badge-person">{{ p|chill_entity_render_box }}</span> | ||||
|                                 <span class="badge-person">{{ p|chill_entity_render_box({'addAgeBadge': true}) }}</span> | ||||
|                             {% endfor %} | ||||
|                         </li> | ||||
|                     </ul> | ||||
|   | ||||
| @@ -14,7 +14,7 @@ | ||||
| {% endblock %} | ||||
|  | ||||
| {% block js %} | ||||
|     {{ encore_entry_link_tags('mod_async_upload') }} | ||||
|     {{ encore_entry_script_tags('mod_async_upload') }} | ||||
|     <script type="text/javascript"> | ||||
|         window.addEventListener('DOMContentLoaded', function (e) { | ||||
|             chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', | ||||
|   | ||||
| @@ -25,7 +25,7 @@ | ||||
|                     'activityData': activityData | ||||
|                 }) }}"> | ||||
|  | ||||
|                     <div class="bloc btn btn-primary btn-lg btn-block"> | ||||
|                     <div class="btn btn-primary"> | ||||
|                         {{ activityType.name|localize_translatable_string }} | ||||
|                     </div> | ||||
|                 </a> | ||||
|   | ||||
| @@ -86,7 +86,7 @@ | ||||
| {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with { | ||||
|     'context': context, | ||||
|     'render': 'bloc', | ||||
|     'badge_person': 'true' | ||||
|     'badge_person': true | ||||
| } %} | ||||
|  | ||||
| <h2 class="chill-blue">{{ 'Activity data'|trans }}</h2> | ||||
| @@ -165,11 +165,7 @@ | ||||
|                 <dt class="inline">{{ 'Attendee'|trans }}</dt> | ||||
|                 <dd> | ||||
|                     {% if entity.attendee is not null %} | ||||
|                         {% if entity.attendee %} | ||||
|                             {{ 'present'|trans|capitalize }} | ||||
|                         {% else %} | ||||
|                             {{ 'not present'|trans|capitalize }} | ||||
|                         {% endif %} | ||||
|                         {{ entity.attendee.name|localize_translatable_string }} | ||||
|                     {% else %} | ||||
|                         <span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span> | ||||
|                     {% endif %} | ||||
| @@ -181,6 +177,13 @@ | ||||
|     </div> | ||||
| </div> | ||||
|  | ||||
| <div class="notification notification-list"> | ||||
|     {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %} | ||||
|     {% if notifications is not empty %} | ||||
|         {{ notifications|raw }} | ||||
|     {% endif %} | ||||
| </div> | ||||
|  | ||||
| {% set person_id = null %} | ||||
| {% if person %} | ||||
|     {% set person_id = person.id %} | ||||
| @@ -197,18 +200,21 @@ | ||||
|             {{ 'Back to the list'|trans }} | ||||
|         </a> | ||||
|     </li> | ||||
|     {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %} | ||||
|         <li> | ||||
|             <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"> | ||||
|             {{ 'Edit'|trans }} | ||||
|     <li> | ||||
|         <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}"> | ||||
|             {{ 'notification.Notify'|trans }} | ||||
|         </a> | ||||
|     </li> | ||||
|     {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %} | ||||
|         <li> | ||||
|             <a href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" | ||||
|                class="btn btn-update">{{ 'Edit'|trans }}</a> | ||||
|         </li> | ||||
|     {% endif %} | ||||
|     {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %} | ||||
|     <li> | ||||
|         <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete"> | ||||
|             {{ 'Delete'|trans }} | ||||
|         </a> | ||||
|         <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" | ||||
|            class="btn btn-delete" title="{{ 'Delete'|trans }}"></a> | ||||
|     </li> | ||||
|     {% endif %} | ||||
| </ul> | ||||
|   | ||||
| @@ -7,11 +7,13 @@ | ||||
| {% block js %} | ||||
|     {{ parent() }} | ||||
|     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} | ||||
|     {{ encore_entry_script_tags('mod_async_upload') }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block css %} | ||||
|     {{ parent() }} | ||||
|     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} | ||||
|     {{ encore_entry_link_tags('mod_async_upload') }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %} | ||||
| @@ -23,19 +25,5 @@ | ||||
| {% endblock content %} | ||||
|  | ||||
| {% block block_post_menu %} | ||||
|     <div class="post-menu pt-4"> | ||||
|  | ||||
|         <div class="d-grid gap-2"> | ||||
|             <a class="btn btn-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}"> | ||||
|                 <i class="fa fa-paper-plane fa-fw"></i> | ||||
|                 {{ 'notification.Notify'|trans }} | ||||
|             </a> | ||||
|         </div> | ||||
|  | ||||
|         {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %} | ||||
|         {% if notifications is not empty %} | ||||
|             {{ notifications|raw }} | ||||
|         {% endif %} | ||||
|  | ||||
|     </div> | ||||
| <div class="post-menu pt-4"></div> | ||||
| {% endblock %} | ||||
|   | ||||
| @@ -7,11 +7,13 @@ | ||||
| {% block js %} | ||||
|     {{ parent() }} | ||||
|     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} | ||||
|     {{ encore_entry_link_tags('mod_async_upload') }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block css %} | ||||
|     {{ parent() }} | ||||
|     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} | ||||
|     {{ encore_entry_link_tags('mod_async_upload') }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %} | ||||
| @@ -26,8 +28,7 @@ | ||||
|     <div class="post-menu pt-4"> | ||||
|  | ||||
|         <div class="d-grid gap-2"> | ||||
|             <a class="btn btn-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}"> | ||||
|                 <i class="fa fa-paper-plane fa-fw"></i> | ||||
|             <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}"> | ||||
|                 {{ 'notification.Notify'|trans }} | ||||
|             </a> | ||||
|         </div> | ||||
|   | ||||
| @@ -0,0 +1,220 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Service\DocGenerator; | ||||
|  | ||||
| use Chill\ActivityBundle\Entity\Activity; | ||||
| use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface; | ||||
| use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface; | ||||
| use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException; | ||||
| use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate; | ||||
| use Chill\DocGeneratorBundle\Service\Context\BaseContextData; | ||||
| use Chill\DocStoreBundle\Entity\Document; | ||||
| use Chill\DocStoreBundle\Entity\StoredObject; | ||||
| use Chill\DocStoreBundle\Repository\DocumentCategoryRepository; | ||||
| use Chill\MainBundle\Templating\TranslatableStringHelperInterface; | ||||
| use Chill\PersonBundle\Entity\AccompanyingPeriod; | ||||
| use Chill\PersonBundle\Entity\Person; | ||||
| use Chill\PersonBundle\Templating\Entity\PersonRender; | ||||
| use Doctrine\ORM\EntityManagerInterface; | ||||
| use Symfony\Bridge\Doctrine\Form\Type\EntityType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\CheckboxType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\TextType; | ||||
| use Symfony\Component\Form\FormBuilderInterface; | ||||
| use Symfony\Component\Serializer\Normalizer\NormalizerInterface; | ||||
| use Symfony\Contracts\Translation\TranslatorInterface; | ||||
|  | ||||
| class ActivityContext implements | ||||
|     DocGeneratorContextWithAdminFormInterface, | ||||
|     DocGeneratorContextWithPublicFormInterface | ||||
| { | ||||
|     private BaseContextData $baseContextData; | ||||
|  | ||||
|     private DocumentCategoryRepository $documentCategoryRepository; | ||||
|  | ||||
|     private EntityManagerInterface $em; | ||||
|  | ||||
|     private NormalizerInterface $normalizer; | ||||
|  | ||||
|     private PersonRender $personRender; | ||||
|  | ||||
|     private TranslatableStringHelperInterface $translatableStringHelper; | ||||
|  | ||||
|     private TranslatorInterface $translator; | ||||
|  | ||||
|     public function __construct( | ||||
|         DocumentCategoryRepository $documentCategoryRepository, | ||||
|         NormalizerInterface $normalizer, | ||||
|         TranslatableStringHelperInterface $translatableStringHelper, | ||||
|         EntityManagerInterface $em, | ||||
|         PersonRender $personRender, | ||||
|         TranslatorInterface $translator, | ||||
|         BaseContextData $baseContextData | ||||
|     ) { | ||||
|         $this->documentCategoryRepository = $documentCategoryRepository; | ||||
|         $this->normalizer = $normalizer; | ||||
|         $this->translatableStringHelper = $translatableStringHelper; | ||||
|         $this->em = $em; | ||||
|         $this->personRender = $personRender; | ||||
|         $this->translator = $translator; | ||||
|         $this->baseContextData = $baseContextData; | ||||
|     } | ||||
|  | ||||
|     public function adminFormReverseTransform(array $data): array | ||||
|     { | ||||
|         return $data; | ||||
|     } | ||||
|  | ||||
|     public function adminFormTransform(array $data): array | ||||
|     { | ||||
|         return [ | ||||
|             'mainPerson' => $data['mainPerson'] ?? false, | ||||
|             'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'), | ||||
|             'person1' => $data['person1'] ?? false, | ||||
|             'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'), | ||||
|             'person2' => $data['person2'] ?? false, | ||||
|             'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'), | ||||
|         ]; | ||||
|     } | ||||
|  | ||||
|     public function buildAdminForm(FormBuilderInterface $builder): void | ||||
|     { | ||||
|         $builder | ||||
|             ->add('mainPerson', CheckboxType::class, [ | ||||
|                 'required' => false, | ||||
|                 'label' => 'docgen.Ask for main person', | ||||
|             ]) | ||||
|             ->add('mainPersonLabel', TextType::class, [ | ||||
|                 'label' => 'main person label', | ||||
|                 'required' => true, | ||||
|             ]) | ||||
|             ->add('person1', CheckboxType::class, [ | ||||
|                 'required' => false, | ||||
|                 'label' => 'docgen.Ask for person 1', | ||||
|             ]) | ||||
|             ->add('person1Label', TextType::class, [ | ||||
|                 'label' => 'person 1 label', | ||||
|                 'required' => true, | ||||
|             ]) | ||||
|             ->add('person2', CheckboxType::class, [ | ||||
|                 'required' => false, | ||||
|                 'label' => 'docgen.Ask for person 2', | ||||
|             ]) | ||||
|             ->add('person2Label', TextType::class, [ | ||||
|                 'label' => 'person 2 label', | ||||
|                 'required' => true, | ||||
|             ]); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param Activity $entity | ||||
|      */ | ||||
|     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void | ||||
|     { | ||||
|         $options = $template->getOptions(); | ||||
|         $persons = $entity->getPersons(); | ||||
|  | ||||
|         foreach (['mainPerson', 'person1', 'person2'] as $key) { | ||||
|             if ($options[$key] ?? false) { | ||||
|                 $builder->add($key, EntityType::class, [ | ||||
|                     'class' => Person::class, | ||||
|                     'choices' => $persons, | ||||
|                     'choice_label' => function (Person $p) { | ||||
|                         return $this->personRender->renderString($p, []); | ||||
|                     }, | ||||
|                     'multiple' => false, | ||||
|                     'expanded' => true, | ||||
|                     'label' => $options[$key . 'Label'], | ||||
|                 ]); | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array | ||||
|     { | ||||
|         if (!$entity instanceof Activity) { | ||||
|             throw new UnexpectedTypeException($entity, Activity::class); | ||||
|         } | ||||
|         $options = $template->getOptions(); | ||||
|  | ||||
|         $data = []; | ||||
|         $data = array_merge($data, $this->baseContextData->getData()); | ||||
|         $data['activity'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => Activity::class, 'groups' => 'docgen:read']); | ||||
|  | ||||
|         $data['course'] = $this->normalizer->normalize($entity->getAccompanyingPeriod(), 'docgen', ['docgen:expects' => AccompanyingPeriod::class, 'groups' => 'docgen:read']); | ||||
|         $data['person'] = $this->normalizer->normalize($entity->getPerson(), 'docgen', ['docgen:expects' => Person::class, 'groups' => 'docgen:read']); | ||||
|  | ||||
|         foreach (['mainPerson', 'person1', 'person2'] as $k) { | ||||
|             if ($options[$k]) { | ||||
|                 $data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', [ | ||||
|                     'docgen:expects' => Person::class, | ||||
|                     'groups' => 'docgen:read', | ||||
|                     'docgen:person:with-household' => true, | ||||
|                     'docgen:person:with-relations' => true, | ||||
|                 ]); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         return $data; | ||||
|     } | ||||
|  | ||||
|     public function getDescription(): string | ||||
|     { | ||||
|         return 'docgen.A basic context for activity'; | ||||
|     } | ||||
|  | ||||
|     public function getEntityClass(): string | ||||
|     { | ||||
|         return Activity::class; | ||||
|     } | ||||
|  | ||||
|     public function getFormData(DocGeneratorTemplate $template, $entity): array | ||||
|     { | ||||
|         return [ | ||||
|             'activity' => $entity, | ||||
|         ]; | ||||
|     } | ||||
|  | ||||
|     public static function getKey(): string | ||||
|     { | ||||
|         return self::class; | ||||
|     } | ||||
|  | ||||
|     public function getName(): string | ||||
|     { | ||||
|         return 'docgen.Activity basic'; | ||||
|     } | ||||
|  | ||||
|     public function hasAdminForm(): bool | ||||
|     { | ||||
|         return true; | ||||
|     } | ||||
|  | ||||
|     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool | ||||
|     { | ||||
|         $options = $template->getOptions(); | ||||
|  | ||||
|         return $options['mainPerson'] || $options['person1'] || $options['person2']; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param Activity $entity | ||||
|      */ | ||||
|     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void | ||||
|     { | ||||
|         $doc = new StoredObject(); | ||||
|         // TODO push document to remote | ||||
|  | ||||
|         $this->em->persist($doc); | ||||
|  | ||||
|         $entity->addDocument($doc); | ||||
|     } | ||||
| } | ||||
| @@ -29,9 +29,13 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface; | ||||
| final class ActivityVoterTest extends KernelTestCase | ||||
| { | ||||
|     use PrepareActivityTrait; | ||||
|  | ||||
|     use PrepareCenterTrait; | ||||
|  | ||||
|     use PreparePersonTrait; | ||||
|  | ||||
|     use PrepareScopeTrait; | ||||
|  | ||||
|     use PrepareUserTrait; | ||||
|  | ||||
|     /** | ||||
|   | ||||
| @@ -32,3 +32,8 @@ services: | ||||
|         autowire: true | ||||
|         autoconfigure: true | ||||
|         resource: '../Validator/Constraints/' | ||||
|  | ||||
|     Chill\ActivityBundle\Service\DocGenerator\: | ||||
|         autowire: true | ||||
|         autoconfigure: true | ||||
|         resource: '../Service/DocGenerator/' | ||||
|   | ||||
| @@ -76,7 +76,7 @@ activity: | ||||
|     Insert a document: Insérer un document | ||||
|     Remove a document: Supprimer le document | ||||
|     comment: Commentaire | ||||
|  | ||||
| No documents: Pas de documents | ||||
|  | ||||
| #timeline | ||||
| '%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"' | ||||
| @@ -228,3 +228,7 @@ See activity in accompanying course context: Voir l'activité dans le contexte d | ||||
| You get notified of an activity which does not exists any more: Cette notification ne correspond pas à une activité valide. | ||||
| you are not allowed to see it details: La notification fait référence à une activité à laquelle vous n'avez pas accès. | ||||
| This is the minimal activity data: Activité n° | ||||
|  | ||||
| docgen: | ||||
|     Activity basic: Echange | ||||
|     A basic context for activity: Contexte pour les échanges | ||||
|   | ||||
| @@ -20,3 +20,4 @@ For this type of activity, you must add at least one social action: Pour ce type | ||||
|  | ||||
| # admin | ||||
| This parameter must be equal to social issue parameter: Ce paramètre doit être égal au paramètre "Visibilité du champs Problématiques sociales" | ||||
| The socialActionsVisible value is not compatible with the socialIssuesVisible value: Cette valeur du paramètre "Visibilité du champs Actions sociales" n'est pas compatible avec la valeur du paramètre "Visibilité du champs Problématiques sociales" | ||||
| @@ -32,6 +32,8 @@ final class AsideActivityController extends CRUDController | ||||
|     { | ||||
|         $asideActivity = new AsideActivity(); | ||||
|  | ||||
|         $asideActivity->setAgent($this->getUser()); | ||||
|  | ||||
|         $duration = $request->query->get('duration', '300'); | ||||
|         $duration = DateTime::createFromFormat('U', $duration); | ||||
|         $asideActivity->setDuration($duration); | ||||
|   | ||||
| @@ -14,9 +14,9 @@ namespace Chill\AsideActivityBundle\Form; | ||||
| use Chill\AsideActivityBundle\Entity\AsideActivity; | ||||
| use Chill\AsideActivityBundle\Entity\AsideActivityCategory; | ||||
| use Chill\AsideActivityBundle\Templating\Entity\CategoryRender; | ||||
| use Chill\MainBundle\Entity\User; | ||||
| use Chill\MainBundle\Form\Type\ChillDateType; | ||||
| use Chill\MainBundle\Form\Type\ChillTextareaType; | ||||
| use Chill\MainBundle\Form\Type\PickUserDynamicType; | ||||
| use DateInterval; | ||||
| use DateTime; | ||||
| use DateTimeImmutable; | ||||
| @@ -68,22 +68,10 @@ final class AsideActivityFormType extends AbstractType | ||||
|         ]; | ||||
|  | ||||
|         $builder | ||||
|             ->add( | ||||
|                 'agent', | ||||
|                 EntityType::class, | ||||
|                 [ | ||||
|                     'label' => 'For agent', | ||||
|                     'required' => true, | ||||
|                     'class' => User::class, | ||||
|                     'data' => $this->storage->getToken()->getUser(), | ||||
|                     'query_builder' => static function (EntityRepository $er) { | ||||
|                         return $er->createQueryBuilder('u')->where('u.enabled = true'); | ||||
|                     }, | ||||
|                     'attr' => ['class' => 'select2 '], | ||||
|                     'placeholder' => 'Choose the agent for whom this activity is created', | ||||
|                     'choice_label' => 'username', | ||||
|                 ] | ||||
|             ) | ||||
|             ->add('agent', PickUserDynamicType::class, [ | ||||
|                 'label' => 'For agent', | ||||
|                 'required' => true, | ||||
|             ]) | ||||
|             ->add( | ||||
|                 'date', | ||||
|                 ChillDateType::class, | ||||
|   | ||||
| @@ -1,5 +1,15 @@ | ||||
| {% extends '@ChillMain/Admin/layout.html.twig' %} | ||||
|  | ||||
| {% block js %} | ||||
|     {{ parent() }} | ||||
|     {{ encore_entry_script_tags('mod_pickentity_type') }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block css %} | ||||
|     {{ parent() }} | ||||
|     {{ encore_entry_link_tags('mod_pickentity_type') }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block title %} | ||||
| {% include('@ChillMain/CRUD/_new_title.html.twig') %} | ||||
| {% endblock %} | ||||
| @@ -8,4 +18,5 @@ | ||||
| {% embed '@ChillMain/CRUD/_new_content.html.twig' %} | ||||
|     {% block content_form_actions_save_and_show %}{% endblock %} | ||||
| {% endembed %} | ||||
| {% endblock %} | ||||
| {% endblock %} | ||||
|  | ||||
|   | ||||
| @@ -17,7 +17,7 @@ | ||||
|                             <select class="form-select" v-model="template"> | ||||
|                                 <option disabled selected value="">{{ $t('choose_a_template') }}</option> | ||||
|                                 <template v-for="t in templates"> | ||||
|                                     <option  v-bind:value="t.id">{{ t.name.fr }}</option> | ||||
|                                     <option v-bind:value="t.id">{{ t.name.fr || 'Aucun nom défini' }}</option> | ||||
|                                 </template> | ||||
|                             </select> | ||||
|                             <button v-if="canGenerate" class="btn btn-update btn-sm change-icon" type="button" @click="generateDocument"><i class="fa fa-fw fa-cog"></i></button> | ||||
| @@ -48,6 +48,7 @@ export default { | ||||
|             required: true, | ||||
|         }, | ||||
|         templates: { | ||||
|             type: Array, | ||||
|             required: true, | ||||
|         }, | ||||
|         // beforeMove execute "something" before | ||||
| @@ -73,7 +74,11 @@ export default { | ||||
|             return true; | ||||
|         }, | ||||
|         getDescription() { | ||||
|             return this.templates.find(t => t.id === this.template).description || ''; | ||||
|             let desc = this.templates.find(t => t.id === this.template); | ||||
|             if (null === desc) { | ||||
|                 return ''; | ||||
|             } | ||||
|             return desc.description || ''; | ||||
|         }, | ||||
|     }, | ||||
|     methods: { | ||||
|   | ||||
| @@ -0,0 +1,61 @@ | ||||
| {% import "@ChillDocStore/Macro/macro.html.twig" as m %} | ||||
|  | ||||
| <div class="flex-table accompanying_course_work-list"> | ||||
|     <div class="item-bloc document-item bg-chill-llight-gray"> | ||||
|         <div class="row justify-content-center my-4"> | ||||
|             <div class="col-2"> | ||||
|                 <i class="fa fa-4x fa-file-text-o text-success"></i> | ||||
|             </div> | ||||
|             <div class="col-8"> | ||||
|                 <h3>{{ document.title }}</h3> | ||||
|                 <small>{{ document.object.type }}</small> | ||||
|              | ||||
|                 {% if document.description is not empty %} | ||||
|                     <blockquote class="chill-user-quote mt-2"> | ||||
|                         {{ document.description }} | ||||
|                     </blockquote> | ||||
|                 {% endif %} | ||||
|          | ||||
|             </div> | ||||
|         </div> | ||||
|     </div> | ||||
| </div> | ||||
|  | ||||
| {% set freezed = false %} | ||||
| {% for step in entity_workflow.stepsChained %} | ||||
|     {% if loop.last %} | ||||
|         {% if step.previous is not null and step.previous.freezeAfter == true %} | ||||
|             {% set freezed = true %} | ||||
|         {% endif %} | ||||
|     {% endif %} | ||||
| {% endfor %} | ||||
|  | ||||
| {% if display_action is defined and display_action == true %} | ||||
|     <ul class="record_actions"> | ||||
|         <li> | ||||
|             {{ m.download_button(document.object, document.title) }} | ||||
|         </li> | ||||
|         <li> | ||||
|         {% if not freezed %} | ||||
|             {% set button = { | ||||
|                 'changeIcon': 'fa-unlock', | ||||
|             } %}{# | ||||
|                 'changeClass'   string | ||||
|                 'noText'        boolean | ||||
|             #} | ||||
|             {# vue component #} | ||||
|             <span | ||||
|                 data-module="wopi-link" | ||||
|                 data-wopi-url="{{ path('chill_wopi_file_edit', {'fileId': document.object.uuid}) }}" | ||||
|                 data-doc-title="{{ document.title|e('html_attr') }}" | ||||
|                 data-doc-type="{{ document.object.type|e('html_attr') }}" | ||||
|                 data-button="{{ button|json_encode }}" | ||||
|             ></span> | ||||
|         {% else %} | ||||
|             <a class="btn btn-update change-icon disabled" href="#" title="{{ 'workflow.freezed document'|trans }}"> | ||||
|                 <i class="fa fa-lock me-2"></i>{{ 'Update document'|trans }} | ||||
|             </a> | ||||
|         {% endif %} | ||||
|         </li> | ||||
|     </ul> | ||||
| {% endif %} | ||||
| @@ -0,0 +1,19 @@ | ||||
| {% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as m %} | ||||
|  | ||||
| <div class="flex-grow-1 {% if add_classes is defined %}{{ add_classes }}{% else %}h2{% endif %}"> | ||||
|     <div> | ||||
|         {% if concerne is defined and concerne == true %} | ||||
|             <span class="item-key">{{ 'Concerne'|trans }}: </span> | ||||
|         {% endif %} | ||||
|      | ||||
|         {{ 'workflow.Document (n°%doc%)'|trans({'%doc%': document.id}) }} | ||||
|      | ||||
|         {% if description is defined and description == true %} | ||||
|             {{ ' — ' ~ document.title }} | ||||
|         {% endif %} | ||||
|     </div> | ||||
|      | ||||
|     {% if breadcrumb is defined and breadcrumb == true %} | ||||
|         {{ m.breadcrumb(_context) }} | ||||
|     {% endif %} | ||||
| </div> | ||||
| @@ -6,61 +6,72 @@ | ||||
|  | ||||
| {% block title %} | ||||
| 	{# {{ 'Detail of document of %name%'|trans({ '%name%': accompanyingCourse|chill_entity_render_string } ) }} #} | ||||
| {% endblock %} | ||||
|  | ||||
|  | ||||
| {% block js %} | ||||
| 	{{ parent() }} | ||||
| 	{{ encore_entry_script_tags('mod_async_upload') }} | ||||
|     {{ 'Document %title%' | trans({ '%title%': document.title }) }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block css %} | ||||
|     {{ parent() }} | ||||
|     {{ encore_entry_link_tags('mod_async_upload') }} | ||||
|     {{ encore_entry_link_tags('mod_entity_workflow_pick') }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block content %} | ||||
|  | ||||
| 	<h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1> | ||||
|  | ||||
| 	<dl class="chill_view_data"> | ||||
| 		<dt>{{ 'Title'|trans }}</dt> | ||||
| 		<dd>{{ document.title }}</dd> | ||||
|  | ||||
| <div class="document-show"> | ||||
|     <h1>{{ block('title') }}</h1> | ||||
|      | ||||
|     <dl class="chill_view_data"> | ||||
|         <dt>{{ 'Title'|trans }}</dt> | ||||
|         <dd>{{ document.title }}</dd> | ||||
|          | ||||
|         {% if document.category is not null %} | ||||
|             <dt>{{ 'Category'|trans }}</dt> | ||||
|             <dd>{{ document.category.name|localize_translatable_string }}</dd> | ||||
|         {% endif %} | ||||
|          | ||||
|         <dt>{{ 'Description' | trans }}</dt> | ||||
|         <dd> | ||||
|             {% if document.description is empty %} | ||||
|                 <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span> | ||||
|             {% else %} | ||||
|                 <blockquote class="chill-user-quote"> | ||||
|                     {{ document.description|chill_markdown_to_html }} | ||||
|                 </blockquote> | ||||
|             {% endif %} | ||||
|         </dd> | ||||
|     </dl> | ||||
|      | ||||
|     <ul class="record_actions sticky-form-buttons"> | ||||
|         <li class="cancel"> | ||||
|             <a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel"> | ||||
|                 {{ 'Back to the list' | trans }} | ||||
|             </a> | ||||
|         </li> | ||||
|         <li> | ||||
|             {{ m.download_button(document.object, document.title) }} | ||||
|         </li> | ||||
|         {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %} | ||||
|             <li> | ||||
|                 <a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}" class="btn btn-edit"> | ||||
|                     {{ 'Edit' | trans }} | ||||
|                 </a> | ||||
|             </li> | ||||
|         {% endif %} | ||||
|         {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %} | ||||
|         {% if workflows_frame is not empty %} | ||||
|             <li> | ||||
|                 {{ workflows_frame|raw }} | ||||
|             </li> | ||||
|         {% endif %} | ||||
|     </ul> | ||||
| </div> | ||||
| {% endblock %} | ||||
|   | ||||
| {% block block_post_menu %} | ||||
|     <div class="post-menu pt-4"></div> | ||||
| {% endblock %} | ||||
|  | ||||
| 		<dt>{{ 'Description' | trans }}</dt> | ||||
| 		<dd> | ||||
| 			{% if document.description is empty %} | ||||
| 				<span class="chill-no-data-statement">{{ 'Any description'|trans }}</span> | ||||
| 			{% else %} | ||||
| 				<blockquote class="chill-user-quote"> | ||||
| 					{{ document.description|chill_markdown_to_html }} | ||||
| 				</blockquote> | ||||
| 			{% endif %} | ||||
| 		</dd> | ||||
|  | ||||
| 	</dl> | ||||
|  | ||||
| 	<ul class="record_actions"> | ||||
| 		<li class="cancel"> | ||||
| 			<a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel"> | ||||
| 				{{ 'Back to the list' | trans }} | ||||
| 			</a> | ||||
| 		</li> | ||||
|  | ||||
| 		<li> | ||||
| 			{{ m.download_button(document.object, document.title) }} | ||||
| 		</li> | ||||
|  | ||||
| 		{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %} | ||||
| 			<li> | ||||
| 				<a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}" class="btn btn-edit"> | ||||
| 					{{ 'Edit' | trans }} | ||||
| 				</a> | ||||
| 			</li> | ||||
| 		{% endif %} | ||||
| 	{% endblock %} | ||||
| {% block js %} | ||||
|     {{ parent() }} | ||||
|     {{ encore_entry_script_tags('mod_async_upload') }} | ||||
|     {{ encore_entry_script_tags('mod_entity_workflow_pick') }} | ||||
| {% endblock %} | ||||
| @@ -0,0 +1,74 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\DocStoreBundle\Workflow; | ||||
|  | ||||
| use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument; | ||||
| use Chill\MainBundle\Entity\Workflow\EntityWorkflow; | ||||
| use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface; | ||||
| use Doctrine\ORM\EntityManagerInterface; | ||||
| use Doctrine\ORM\EntityRepository; | ||||
|  | ||||
| class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandlerInterface | ||||
| { | ||||
|     private EntityRepository $repository; | ||||
|  | ||||
|     /** | ||||
|      * TODO: injecter le repository directement. | ||||
|      */ | ||||
|     public function __construct(EntityManagerInterface $em) | ||||
|     { | ||||
|         $this->repository = $em->getRepository(AccompanyingCourseDocument::class); | ||||
|     } | ||||
|  | ||||
|     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingCourseDocument | ||||
|     { | ||||
|         return $this->repository->find($entityWorkflow->getRelatedEntityId()); | ||||
|     } | ||||
|  | ||||
|     public function getRoleShow(EntityWorkflow $entityWorkflow): ?string | ||||
|     { | ||||
|         return null; | ||||
|     } | ||||
|  | ||||
|     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string | ||||
|     { | ||||
|         return '@ChillDocStore/AccompanyingCourseDocument/_workflow.html.twig'; | ||||
|     } | ||||
|  | ||||
|     public function getTemplateData(EntityWorkflow $entityWorkflow, array $options = []): array | ||||
|     { | ||||
|         return [ | ||||
|             'entity_workflow' => $entityWorkflow, | ||||
|             'document' => $this->getRelatedEntity($entityWorkflow), | ||||
|         ]; | ||||
|     } | ||||
|  | ||||
|     public function getTemplateTitle(EntityWorkflow $entityWorkflow, array $options = []): string | ||||
|     { | ||||
|         return '@ChillDocStore/AccompanyingCourseDocument/_workflow.title.html.twig'; | ||||
|     } | ||||
|  | ||||
|     public function getTemplateTitleData(EntityWorkflow $entityWorkflow, array $options = []): array | ||||
|     { | ||||
|         return $this->getTemplateData($entityWorkflow, $options); | ||||
|     } | ||||
|  | ||||
|     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool | ||||
|     { | ||||
|         return $entityWorkflow->getRelatedEntityClass() === AccompanyingCourseDocument::class; | ||||
|     } | ||||
|  | ||||
|     public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool | ||||
|     { | ||||
|         return true; | ||||
|     } | ||||
| } | ||||
| @@ -27,3 +27,8 @@ services: | ||||
|     autoconfigure: true | ||||
|     tags: | ||||
|       - { name: chill.role } | ||||
|  | ||||
|   Chill\DocStoreBundle\Workflow\: | ||||
|       resource: './../Workflow/' | ||||
|       autoconfigure: true | ||||
|       autowire: true | ||||
|   | ||||
| @@ -9,6 +9,7 @@ Create new document: Créer un nouveau document | ||||
| New document for %name%: Nouveau document pour %name% | ||||
| Editing document for %name%: Modification d'un document pour %name% | ||||
| Edit Document: Modification d'un document | ||||
| Update document: Modifier le document | ||||
| Existing document: Document existant | ||||
| No document to download: Aucun document à télécharger | ||||
| 'Choose a document category': Choisissez une catégorie de document | ||||
|   | ||||
| @@ -31,6 +31,7 @@ use Chill\MainBundle\Security\Resolver\ScopeResolverInterface; | ||||
| use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface; | ||||
| use Chill\MainBundle\Templating\Entity\CompilerPass as RenderEntityCompilerPass; | ||||
| use Chill\MainBundle\Templating\UI\NotificationCounterInterface; | ||||
| use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface; | ||||
| use Symfony\Component\DependencyInjection\ContainerBuilder; | ||||
| use Symfony\Component\HttpKernel\Bundle\Bundle; | ||||
|  | ||||
| @@ -56,6 +57,8 @@ class ChillMainBundle extends Bundle | ||||
|             ->addTag('chill_main.notification_handler'); | ||||
|         $container->registerForAutoconfiguration(NotificationCounterInterface::class) | ||||
|             ->addTag('chill.count_notification.user'); | ||||
|         $container->registerForAutoconfiguration(EntityWorkflowHandlerInterface::class) | ||||
|             ->addTag('chill_main.workflow_handler'); | ||||
|  | ||||
|         $container->addCompilerPass(new SearchableServicesCompilerPass()); | ||||
|         $container->addCompilerPass(new ConfigConsistencyCompilerPass()); | ||||
|   | ||||
| @@ -24,6 +24,7 @@ class LocationTypeApiController extends ApiController | ||||
|         $query->andWhere( | ||||
|             $query->expr()->andX( | ||||
|                 $query->expr()->eq('e.availableForUsers', "'TRUE'"), | ||||
|                 $query->expr()->eq('e.editableByUsers', "'TRUE'"), | ||||
|                 $query->expr()->eq('e.active', "'TRUE'"), | ||||
|             ) | ||||
|         ); | ||||
|   | ||||
| @@ -13,13 +13,19 @@ namespace Chill\MainBundle\Controller; | ||||
|  | ||||
| use Chill\MainBundle\Entity\Notification; | ||||
| use Chill\MainBundle\Entity\User; | ||||
| use Chill\MainBundle\Pagination\PaginatorFactory; | ||||
| use Chill\MainBundle\Repository\NotificationRepository; | ||||
| use Chill\MainBundle\Security\Authorization\NotificationVoter; | ||||
| use Chill\MainBundle\Serializer\Model\Collection; | ||||
| use Chill\MainBundle\Serializer\Model\Counter; | ||||
| use Doctrine\ORM\EntityManagerInterface; | ||||
| use RuntimeException; | ||||
| use Symfony\Component\HttpFoundation\JsonResponse; | ||||
| use Symfony\Component\HttpFoundation\Request; | ||||
| use Symfony\Component\Routing\Annotation\Route; | ||||
| use Symfony\Component\Security\Core\Exception\AccessDeniedException; | ||||
| use Symfony\Component\Security\Core\Security; | ||||
| use Symfony\Component\Serializer\SerializerInterface; | ||||
| use UnexpectedValueException; | ||||
|  | ||||
| /** | ||||
| @@ -29,12 +35,26 @@ class NotificationApiController | ||||
| { | ||||
|     private EntityManagerInterface $entityManager; | ||||
|  | ||||
|     private NotificationRepository $notificationRepository; | ||||
|  | ||||
|     private PaginatorFactory $paginatorFactory; | ||||
|  | ||||
|     private Security $security; | ||||
|  | ||||
|     public function __construct(EntityManagerInterface $entityManager, Security $security) | ||||
|     { | ||||
|     private SerializerInterface $serializer; | ||||
|  | ||||
|     public function __construct( | ||||
|         EntityManagerInterface $entityManager, | ||||
|         NotificationRepository $notificationRepository, | ||||
|         PaginatorFactory $paginatorFactory, | ||||
|         Security $security, | ||||
|         SerializerInterface $serializer | ||||
|     ) { | ||||
|         $this->entityManager = $entityManager; | ||||
|         $this->notificationRepository = $notificationRepository; | ||||
|         $this->paginatorFactory = $paginatorFactory; | ||||
|         $this->security = $security; | ||||
|         $this->serializer = $serializer; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
| @@ -53,6 +73,37 @@ class NotificationApiController | ||||
|         return $this->markAs('unread', $notification); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @Route("/my/unread") | ||||
|      */ | ||||
|     public function myUnreadNotifications(Request $request): JsonResponse | ||||
|     { | ||||
|         $total = $this->notificationRepository->countUnreadByUser($this->security->getUser()); | ||||
|  | ||||
|         if ($request->query->getBoolean('countOnly')) { | ||||
|             return new JsonResponse( | ||||
|                 $this->serializer->serialize(new Counter($total), 'json', ['groups' => ['read']]), | ||||
|                 JsonResponse::HTTP_OK, | ||||
|                 [], | ||||
|                 true | ||||
|             ); | ||||
|         } | ||||
|         $paginator = $this->paginatorFactory->create($total); | ||||
|         $notifications = $this->notificationRepository->findUnreadByUser( | ||||
|             $this->security->getUser(), | ||||
|             $paginator->getItemsPerPage(), | ||||
|             $paginator->getCurrentPageFirstItemNumber() | ||||
|         ); | ||||
|         $collection = new Collection($notifications, $paginator); | ||||
|  | ||||
|         return new JsonResponse( | ||||
|             $this->serializer->serialize($collection, 'json', ['groups' => ['read']]), | ||||
|             JsonResponse::HTTP_OK, | ||||
|             [], | ||||
|             true | ||||
|         ); | ||||
|     } | ||||
|  | ||||
|     private function markAs(string $target, Notification $notification): JsonResponse | ||||
|     { | ||||
|         if (!$this->security->isGranted(NotificationVoter::NOTIFICATION_TOGGLE_READ_STATUS, $notification)) { | ||||
|   | ||||
							
								
								
									
										118
									
								
								src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										118
									
								
								src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,118 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Controller; | ||||
|  | ||||
| use Chill\MainBundle\Entity\Workflow\EntityWorkflow; | ||||
| use Doctrine\ORM\EntityManagerInterface; | ||||
| use LogicException; | ||||
| use Symfony\Component\HttpFoundation\JsonResponse; | ||||
| use Symfony\Component\HttpFoundation\Request; | ||||
| use Symfony\Component\HttpFoundation\Response; | ||||
| use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; | ||||
| use Symfony\Component\Routing\Annotation\Route; | ||||
| use Symfony\Component\Security\Core\Exception\AccessDeniedException; | ||||
| use Symfony\Component\Security\Core\Security; | ||||
|  | ||||
| class WorkflowApiController | ||||
| { | ||||
|     private EntityManagerInterface $entityManager; | ||||
|  | ||||
|     private Security $security; | ||||
|  | ||||
|     public function __construct(Security $security, EntityManagerInterface $entityManager) | ||||
|     { | ||||
|         $this->entityManager = $entityManager; | ||||
|         $this->security = $security; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @Route("/api/1.0/main/workflow/{id}/subscribe", methods={"POST"}) | ||||
|      */ | ||||
|     public function subscribe(EntityWorkflow $entityWorkflow, Request $request): Response | ||||
|     { | ||||
|         return $this->handleSubscription($entityWorkflow, $request, 'subscribe'); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @Route("/api/1.0/main/workflow/{id}/unsubscribe", methods={"POST"}) | ||||
|      */ | ||||
|     public function unsubscribe(EntityWorkflow $entityWorkflow, Request $request): Response | ||||
|     { | ||||
|         return $this->handleSubscription($entityWorkflow, $request, 'unsubscribe'); | ||||
|     } | ||||
|  | ||||
|     private function handleSubscription(EntityWorkflow $entityWorkflow, Request $request, string $action): JsonResponse | ||||
|     { | ||||
|         if (!$this->security->isGranted('IS_AUTHENTICATED_REMEMBERED')) { | ||||
|             throw new AccessDeniedException(); | ||||
|         } | ||||
|  | ||||
|         if (!$request->query->has('subscribe')) { | ||||
|             throw new BadRequestHttpException('missing subscribe parameter'); | ||||
|         } | ||||
|  | ||||
|         $user = $this->security->getUser(); | ||||
|  | ||||
|         switch ($request->query->get('subscribe')) { | ||||
|             case 'final': | ||||
|                 switch ($action) { | ||||
|                     case 'subscribe': | ||||
|                         $entityWorkflow->addSubscriberToFinal($user); | ||||
|  | ||||
|                         break; | ||||
|  | ||||
|                     case 'unsubscribe': | ||||
|                         $entityWorkflow->removeSubscriberToFinal($user); | ||||
|  | ||||
|                         break; | ||||
|  | ||||
|                     default: | ||||
|                         throw new LogicException(); | ||||
|                 } | ||||
|  | ||||
|                 break; | ||||
|  | ||||
|             case 'step': | ||||
|                 switch ($action) { | ||||
|                     case 'subscribe': | ||||
|                         $entityWorkflow->addSubscriberToStep($user); | ||||
|  | ||||
|                         break; | ||||
|  | ||||
|                     case 'unsubscribe': | ||||
|                         $entityWorkflow->removeSubscriberToStep($user); | ||||
|  | ||||
|                         break; | ||||
|  | ||||
|                     default: | ||||
|                         throw new LogicException(); | ||||
|                 } | ||||
|  | ||||
|                 break; | ||||
|  | ||||
|             default: | ||||
|                 throw new BadRequestHttpException('subscribe parameter must be equal to "step" or "final"'); | ||||
|         } | ||||
|  | ||||
|         $this->entityManager->flush(); | ||||
|  | ||||
|         return new JsonResponse( | ||||
|             [ | ||||
|                 'step' => $entityWorkflow->isUserSubscribedToStep($user), | ||||
|                 'final' => $entityWorkflow->isUserSubscribedToFinal($user), | ||||
|             ], | ||||
|             JsonResponse::HTTP_OK, | ||||
|             [], | ||||
|             false | ||||
|         ); | ||||
|     } | ||||
| } | ||||
							
								
								
									
										257
									
								
								src/Bundle/ChillMainBundle/Controller/WorkflowController.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										257
									
								
								src/Bundle/ChillMainBundle/Controller/WorkflowController.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,257 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Controller; | ||||
|  | ||||
| use Chill\MainBundle\Entity\Workflow\EntityWorkflow; | ||||
| use Chill\MainBundle\Entity\Workflow\EntityWorkflowComment; | ||||
| use Chill\MainBundle\Form\EntityWorkflowCommentType; | ||||
| use Chill\MainBundle\Form\WorkflowStepType; | ||||
| use Chill\MainBundle\Pagination\PaginatorFactory; | ||||
| use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository; | ||||
| use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter; | ||||
| use Chill\MainBundle\Workflow\EntityWorkflowManager; | ||||
| use Doctrine\ORM\EntityManagerInterface; | ||||
| use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; | ||||
| use Symfony\Component\HttpFoundation\Request; | ||||
| use Symfony\Component\HttpFoundation\Response; | ||||
| use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; | ||||
| use Symfony\Component\Routing\Annotation\Route; | ||||
| use Symfony\Component\Validator\Validator\ValidatorInterface; | ||||
| use Symfony\Component\Workflow\Registry; | ||||
| use Symfony\Component\Workflow\TransitionBlocker; | ||||
| use Symfony\Contracts\Translation\TranslatorInterface; | ||||
| use function count; | ||||
|  | ||||
| class WorkflowController extends AbstractController | ||||
| { | ||||
|     private EntityManagerInterface $entityManager; | ||||
|  | ||||
|     private EntityWorkflowManager $entityWorkflowManager; | ||||
|  | ||||
|     private EntityWorkflowRepository $entityWorkflowRepository; | ||||
|  | ||||
|     private PaginatorFactory $paginatorFactory; | ||||
|  | ||||
|     private Registry $registry; | ||||
|  | ||||
|     private TranslatorInterface $translator; | ||||
|  | ||||
|     private ValidatorInterface $validator; | ||||
|  | ||||
|     public function __construct(EntityWorkflowManager $entityWorkflowManager, EntityWorkflowRepository $entityWorkflowRepository, ValidatorInterface $validator, PaginatorFactory $paginatorFactory, Registry $registry, EntityManagerInterface $entityManager, TranslatorInterface $translator) | ||||
|     { | ||||
|         $this->entityWorkflowManager = $entityWorkflowManager; | ||||
|         $this->entityWorkflowRepository = $entityWorkflowRepository; | ||||
|         $this->validator = $validator; | ||||
|         $this->paginatorFactory = $paginatorFactory; | ||||
|         $this->registry = $registry; | ||||
|         $this->entityManager = $entityManager; | ||||
|         $this->translator = $translator; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @Route("/{_locale}/main/workflow/create", name="chill_main_workflow_create") | ||||
|      */ | ||||
|     public function create(Request $request): Response | ||||
|     { | ||||
|         if (!$request->query->has('entityClass')) { | ||||
|             throw new BadRequestHttpException('Missing entityClass parameter'); | ||||
|         } | ||||
|  | ||||
|         if (!$request->query->has('entityId')) { | ||||
|             throw new BadRequestHttpException('missing entityId parameter'); | ||||
|         } | ||||
|  | ||||
|         if (!$request->query->has('workflow')) { | ||||
|             throw new BadRequestHttpException('missing workflow parameter'); | ||||
|         } | ||||
|  | ||||
|         $entityWorkflow = new EntityWorkflow(); | ||||
|         $entityWorkflow | ||||
|             ->setRelatedEntityClass($request->query->get('entityClass')) | ||||
|             ->setRelatedEntityId($request->query->getInt('entityId')) | ||||
|             ->setWorkflowName($request->query->get('workflow')); | ||||
|  | ||||
|         $errors = $this->validator->validate($entityWorkflow, null, ['creation']); | ||||
|  | ||||
|         if (count($errors) > 0) { | ||||
|             $msg = []; | ||||
|  | ||||
|             foreach ($errors as $error) { | ||||
|                 /** @var \Symfony\Component\Validator\ConstraintViolationInterface $error */ | ||||
|                 $msg[] = $error->getMessage(); | ||||
|             } | ||||
|  | ||||
|             return new Response(implode("\n", $msg), Response::HTTP_UNPROCESSABLE_ENTITY); | ||||
|         } | ||||
|  | ||||
|         $this->denyAccessUnlessGranted(EntityWorkflowVoter::CREATE, $entityWorkflow); | ||||
|  | ||||
|         $em = $this->getDoctrine()->getManager(); | ||||
|         $em->persist($entityWorkflow); | ||||
|         $em->flush(); | ||||
|  | ||||
|         return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @Route("/{_locale}/main/workflow/list/dest", name="chill_main_workflow_list_dest") | ||||
|      */ | ||||
|     public function myWorkflowsDest(Request $request): Response | ||||
|     { | ||||
|         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED'); | ||||
|  | ||||
|         $total = $this->entityWorkflowRepository->countByDest($this->getUser()); | ||||
|         $paginator = $this->paginatorFactory->create($total); | ||||
|  | ||||
|         $workflows = $this->entityWorkflowRepository->findByDest( | ||||
|             $this->getUser(), | ||||
|             ['createdAt' => 'DESC'], | ||||
|             $paginator->getItemsPerPage(), | ||||
|             $paginator->getCurrentPageFirstItemNumber() | ||||
|         ); | ||||
|  | ||||
|         return $this->render( | ||||
|             '@ChillMain/Workflow/list.html.twig', | ||||
|             [ | ||||
|                 'workflows' => $this->buildHandler($workflows), | ||||
|                 'paginator' => $paginator, | ||||
|                 'step' => 'dest', | ||||
|             ] | ||||
|         ); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @Route("/{_locale}/main/workflow/list/subscribed", name="chill_main_workflow_list_subscribed") | ||||
|      */ | ||||
|     public function myWorkflowsSubscribed(Request $request): Response | ||||
|     { | ||||
|         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED'); | ||||
|  | ||||
|         $total = $this->entityWorkflowRepository->countBySubscriber($this->getUser()); | ||||
|         $paginator = $this->paginatorFactory->create($total); | ||||
|  | ||||
|         $workflows = $this->entityWorkflowRepository->findBySubscriber( | ||||
|             $this->getUser(), | ||||
|             ['createdAt' => 'DESC'], | ||||
|             $paginator->getItemsPerPage(), | ||||
|             $paginator->getCurrentPageFirstItemNumber() | ||||
|         ); | ||||
|  | ||||
|         return $this->render( | ||||
|             '@ChillMain/Workflow/list.html.twig', | ||||
|             [ | ||||
|                 'workflows' => $this->buildHandler($workflows), | ||||
|                 'paginator' => $paginator, | ||||
|                 'step' => 'subscribed', | ||||
|             ] | ||||
|         ); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @Route("/{_locale}/main/workflow/{id}/show", name="chill_main_workflow_show") | ||||
|      */ | ||||
|     public function show(EntityWorkflow $entityWorkflow, Request $request): Response | ||||
|     { | ||||
|         $this->denyAccessUnlessGranted(EntityWorkflowVoter::SEE, $entityWorkflow); | ||||
|  | ||||
|         $handler = $this->entityWorkflowManager->getHandler($entityWorkflow); | ||||
|         $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName()); | ||||
|  | ||||
|         if (count($workflow->getEnabledTransitions($entityWorkflow)) > 0) { | ||||
|             // possible transition | ||||
|             $transitionForm = $this->createForm( | ||||
|                 WorkflowStepType::class, | ||||
|                 $entityWorkflow->getCurrentStep(), | ||||
|                 ['transition' => true, 'entity_workflow' => $entityWorkflow] | ||||
|             ); | ||||
|  | ||||
|             $transitionForm->handleRequest($request); | ||||
|  | ||||
|             if ($transitionForm->isSubmitted() && $transitionForm->isValid()) { | ||||
|                 if (!$workflow->can($entityWorkflow, $transition = $transitionForm['transition']->getData()->getName())) { | ||||
|                     $blockers = $workflow->buildTransitionBlockerList($entityWorkflow, $transition); | ||||
|                     $msgs = array_map(function (TransitionBlocker $tb) { | ||||
|                         return $this->translator->trans( | ||||
|                             $tb->getMessage(), | ||||
|                             $tb->getParameters() | ||||
|                         ); | ||||
|                     }, iterator_to_array($blockers)); | ||||
|  | ||||
|                     throw $this->createAccessDeniedException( | ||||
|                         sprintf( | ||||
|                             "not allowed to apply transition {$transition}: %s", | ||||
|                             implode(', ', $msgs) | ||||
|                         ) | ||||
|                     ); | ||||
|                 } | ||||
|  | ||||
|                 $workflow->apply($entityWorkflow, $transition); | ||||
|  | ||||
|                 foreach ($transitionForm['future_dest_users']->getData() as $user) { | ||||
|                     $entityWorkflow->getCurrentStep()->addDestUser($user); | ||||
|                 } | ||||
|  | ||||
|                 $this->entityManager->flush(); | ||||
|  | ||||
|                 return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]); | ||||
|             } | ||||
|  | ||||
|             if ($transitionForm->isSubmitted() && !$transitionForm->isValid()) { | ||||
|                 $this->addFlash('error', $this->translator->trans('This form contains errors')); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         /* | ||||
|         $commentForm = $this->createForm(EntityWorkflowCommentType::class, $newComment = new EntityWorkflowComment()); | ||||
|         $commentForm->handleRequest($request); | ||||
|  | ||||
|         if ($commentForm->isSubmitted() && $commentForm->isValid()) { | ||||
|             $this->entityManager->persist($newComment); | ||||
|             $this->entityManager->flush(); | ||||
|  | ||||
|             $this->addFlash('success', $this->translator->trans('workflow.Comment added')); | ||||
|  | ||||
|             return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]); | ||||
|         } elseif ($commentForm->isSubmitted() && !$commentForm->isValid()) { | ||||
|             $this->addFlash('error', $this->translator->trans('This form contains errors')); | ||||
|         } | ||||
|          */ | ||||
|  | ||||
|         return $this->render( | ||||
|             '@ChillMain/Workflow/index.html.twig', | ||||
|             [ | ||||
|                 'handler_template' => $handler->getTemplate($entityWorkflow), | ||||
|                 'handler_template_title' => $handler->getTemplateTitle($entityWorkflow), | ||||
|                 'handler_template_data' => $handler->getTemplateData($entityWorkflow), | ||||
|                 'transition_form' => isset($transitionForm) ? $transitionForm->createView() : null, | ||||
|                 'entity_workflow' => $entityWorkflow, | ||||
|                 //'comment_form' => $commentForm->createView(), | ||||
|             ] | ||||
|         ); | ||||
|     } | ||||
|  | ||||
|     private function buildHandler(array $workflows): array | ||||
|     { | ||||
|         $lines = []; | ||||
|  | ||||
|         foreach ($workflows as $workflow) { | ||||
|             $handler = $this->entityWorkflowManager->getHandler($workflow); | ||||
|             $lines[] = [ | ||||
|                 'handler' => $handler, | ||||
|                 'entity_workflow' => $workflow, | ||||
|             ]; | ||||
|         } | ||||
|  | ||||
|         return $lines; | ||||
|     } | ||||
| } | ||||
| @@ -168,6 +168,7 @@ class ChillMainExtension extends Extension implements | ||||
|         $loader->load('services/timeline.yaml'); | ||||
|         $loader->load('services/search.yaml'); | ||||
|         $loader->load('services/serializer.yaml'); | ||||
|         $loader->load('services/mailer.yaml'); | ||||
|  | ||||
|         $this->configureCruds($container, $config['cruds'], $config['apis'], $loader); | ||||
|     } | ||||
| @@ -391,6 +392,26 @@ class ChillMainExtension extends Extension implements | ||||
|                         ], | ||||
|                     ], | ||||
|                 ], | ||||
|                 [ | ||||
|                     'class' => \Chill\MainBundle\Entity\UserJob::class, | ||||
|                     'name' => 'user_job', | ||||
|                     'base_path' => '/api/1.0/main/user-job', | ||||
|                     'base_role' => 'ROLE_USER', | ||||
|                     'actions' => [ | ||||
|                         '_index' => [ | ||||
|                             'methods' => [ | ||||
|                                 Request::METHOD_GET => true, | ||||
|                                 Request::METHOD_HEAD => true, | ||||
|                             ], | ||||
|                         ], | ||||
|                         '_entity' => [ | ||||
|                             'methods' => [ | ||||
|                                 Request::METHOD_GET => true, | ||||
|                                 Request::METHOD_HEAD => true, | ||||
|                             ], | ||||
|                         ], | ||||
|                     ], | ||||
|                 ], | ||||
|                 [ | ||||
|                     'controller' => \Chill\MainBundle\Controller\AddressReferenceAPIController::class, | ||||
|                     'class' => \Chill\MainBundle\Entity\AddressReference::class, | ||||
|   | ||||
| @@ -0,0 +1,56 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Doctrine\Model; | ||||
|  | ||||
| use Chill\MainBundle\Entity\User; | ||||
| use DateTime; | ||||
| use DateTimeImmutable; | ||||
| use DateTimeInterface; | ||||
| use Doctrine\ORM\Mapping as ORM; | ||||
|  | ||||
| trait TrackCreationTrait | ||||
| { | ||||
|     /** | ||||
|      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL}) | ||||
|      */ | ||||
|     private ?DateTimeImmutable $createdAt = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=User::class) | ||||
|      * @ORM\JoinColumn(nullable=true) | ||||
|      */ | ||||
|     private ?User $createdBy = null; | ||||
|  | ||||
|     public function getCreatedAt(): ?DateTimeInterface | ||||
|     { | ||||
|         return $this->createdAt; | ||||
|     } | ||||
|  | ||||
|     public function getCreatedBy(): ?User | ||||
|     { | ||||
|         return $this->createdBy; | ||||
|     } | ||||
|  | ||||
|     public function setCreatedAt(DateTimeInterface $datetime): self | ||||
|     { | ||||
|         $this->createdAt = $datetime instanceof DateTime ? DateTimeImmutable::createFromMutable($datetime) : $datetime; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setCreatedBy(User $user): self | ||||
|     { | ||||
|         $this->createdBy = $user; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,56 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Doctrine\Model; | ||||
|  | ||||
| use Chill\MainBundle\Entity\User; | ||||
| use DateTime; | ||||
| use DateTimeImmutable; | ||||
| use DateTimeInterface; | ||||
| use Doctrine\ORM\Mapping as ORM; | ||||
|  | ||||
| trait TrackUpdateTrait | ||||
| { | ||||
|     /** | ||||
|      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL}) | ||||
|      */ | ||||
|     private ?DateTimeImmutable $updatedAt = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=User::class) | ||||
|      * @ORM\JoinColumn(nullable=true) | ||||
|      */ | ||||
|     private ?User $updatedBy = null; | ||||
|  | ||||
|     public function getUpdatedAt(): ?DateTimeInterface | ||||
|     { | ||||
|         return $this->updatedAt; | ||||
|     } | ||||
|  | ||||
|     public function getUpdatedBy(): ?User | ||||
|     { | ||||
|         return $this->updatedBy; | ||||
|     } | ||||
|  | ||||
|     public function setUpdatedAt(DateTimeInterface $datetime): self | ||||
|     { | ||||
|         $this->updatedAt = $datetime instanceof DateTime ? DateTimeImmutable::createFromMutable($datetime) : $datetime; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setUpdatedBy(User $user): self | ||||
|     { | ||||
|         $this->updatedBy = $user; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
| } | ||||
| @@ -42,10 +42,16 @@ class Address | ||||
|      */ | ||||
|     private $buildingName; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="boolean") | ||||
|      * @Groups({"write"}) | ||||
|      */ | ||||
|     private bool $confidential = false; | ||||
|  | ||||
|     /** | ||||
|      * @var string|null | ||||
|      * | ||||
|      * @ORM\Column(type="string", length=16, nullable=true) | ||||
|      * @ORM\Column(type="string", length=255, nullable=true) | ||||
|      * @Groups({"write"}) | ||||
|      */ | ||||
|     private $corridor; | ||||
| @@ -78,7 +84,7 @@ class Address | ||||
|     /** | ||||
|      * @var string|null | ||||
|      * | ||||
|      * @ORM\Column(type="string", length=16, nullable=true) | ||||
|      * @ORM\Column(type="string", length=255, nullable=true) | ||||
|      * @Groups({"write"}) | ||||
|      */ | ||||
|     private $flat; | ||||
| @@ -86,7 +92,7 @@ class Address | ||||
|     /** | ||||
|      * @var string|null | ||||
|      * | ||||
|      * @ORM\Column(type="string", length=16, nullable=true) | ||||
|      * @ORM\Column(type="string", length=255, nullable=true) | ||||
|      * @Groups({"write"}) | ||||
|      */ | ||||
|     private $floor; | ||||
| @@ -143,7 +149,7 @@ class Address | ||||
|     /** | ||||
|      * @var string|null | ||||
|      * | ||||
|      * @ORM\Column(type="string", length=16, nullable=true) | ||||
|      * @ORM\Column(type="string", length=255, nullable=true) | ||||
|      * @Groups({"write"}) | ||||
|      */ | ||||
|     private $steps; | ||||
| @@ -192,6 +198,7 @@ class Address | ||||
|         return (new Address()) | ||||
|             ->setAddressReference($original->getAddressReference()) | ||||
|             ->setBuildingName($original->getBuildingName()) | ||||
|             ->setConfidential($original->getConfidential()) | ||||
|             ->setCorridor($original->getCorridor()) | ||||
|             ->setCustoms($original->getCustoms()) | ||||
|             ->setDistribution($original->getDistribution()) | ||||
| @@ -229,6 +236,11 @@ class Address | ||||
|         return $this->buildingName; | ||||
|     } | ||||
|  | ||||
|     public function getConfidential(): bool | ||||
|     { | ||||
|         return $this->confidential; | ||||
|     } | ||||
|  | ||||
|     public function getCorridor(): ?string | ||||
|     { | ||||
|         return $this->corridor; | ||||
| @@ -369,6 +381,13 @@ class Address | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setConfidential(bool $confidential): self | ||||
|     { | ||||
|         $this->confidential = $confidential; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setCorridor(?string $corridor): self | ||||
|     { | ||||
|         $this->corridor = $corridor; | ||||
|   | ||||
| @@ -20,10 +20,9 @@ use Doctrine\ORM\Mapping as ORM; | ||||
| class CommentEmbeddable | ||||
| { | ||||
|     /** | ||||
|      * @var string | ||||
|      * @ORM\Column(type="text", nullable=true) | ||||
|      */ | ||||
|     private $comment; | ||||
|     private ?string $comment = null; | ||||
|  | ||||
|     /** | ||||
|      * @var DateTime | ||||
| @@ -39,10 +38,7 @@ class CommentEmbeddable | ||||
|      */ | ||||
|     private $userId; | ||||
|  | ||||
|     /** | ||||
|      * @return string | ||||
|      */ | ||||
|     public function getComment() | ||||
|     public function getComment(): ?string | ||||
|     { | ||||
|         return $this->comment; | ||||
|     } | ||||
| @@ -68,9 +64,6 @@ class CommentEmbeddable | ||||
|         return empty($this->getComment()); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param string $comment | ||||
|      */ | ||||
|     public function setComment(?string $comment) | ||||
|     { | ||||
|         $this->comment = $comment; | ||||
|   | ||||
| @@ -64,7 +64,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="string", length=255, nullable=true) | ||||
|      * @Serializer\Groups({"read", "write"}) | ||||
|      * @Serializer\Groups({"read", "write", "docgen:read"}) | ||||
|      */ | ||||
|     private ?string $email = null; | ||||
|  | ||||
|   | ||||
| @@ -67,6 +67,12 @@ class LocationType | ||||
|      */ | ||||
|     private ?string $defaultFor = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="boolean") | ||||
|      * @Serializer\Groups({"read"}) | ||||
|      */ | ||||
|     private bool $editableByUsers = true; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Id | ||||
|      * @ORM\GeneratedValue | ||||
| @@ -107,6 +113,11 @@ class LocationType | ||||
|         return $this->defaultFor; | ||||
|     } | ||||
|  | ||||
|     public function getEditableByUsers(): ?bool | ||||
|     { | ||||
|         return $this->editableByUsers; | ||||
|     } | ||||
|  | ||||
|     public function getId(): ?int | ||||
|     { | ||||
|         return $this->id; | ||||
| @@ -152,6 +163,13 @@ class LocationType | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setEditableByUsers(bool $editableByUsers): self | ||||
|     { | ||||
|         $this->editableByUsers = $editableByUsers; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setTitle(array $title): self | ||||
|     { | ||||
|         $this->title = $title; | ||||
|   | ||||
| @@ -17,11 +17,15 @@ use DateTimeInterface; | ||||
| use Doctrine\Common\Collections\ArrayCollection; | ||||
| use Doctrine\Common\Collections\Collection; | ||||
| use Doctrine\ORM\Mapping as ORM; | ||||
| use Symfony\Component\Validator\Constraints as Assert; | ||||
|  | ||||
| /** | ||||
|  * @ORM\Entity | ||||
|  * @ORM\Table( | ||||
|  *     name="chill_main_notification", | ||||
|  *     indexes={ | ||||
|  *         @ORM\Index(name="chill_main_notification_related_entity_idx", columns={"relatedentityclass", "relatedentityid"}) | ||||
|  *     } | ||||
|  * ) | ||||
|  * @ORM\HasLifecycleCallbacks | ||||
|  */ | ||||
| @@ -32,6 +36,7 @@ class Notification implements TrackUpdateInterface | ||||
|     /** | ||||
|      * @ORM\ManyToMany(targetEntity=User::class) | ||||
|      * @ORM\JoinTable(name="chill_main_notification_addresses_user") | ||||
|      * @Assert\Count(min="1", minMessage="notification.At least one addressee") | ||||
|      */ | ||||
|     private Collection $addressees; | ||||
|  | ||||
| @@ -80,6 +85,7 @@ class Notification implements TrackUpdateInterface | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="text", options={"default": ""}) | ||||
|      * @Assert\NotBlank(message="notification.Title must be defined") | ||||
|      */ | ||||
|     private string $title = ''; | ||||
|  | ||||
| @@ -286,9 +292,9 @@ class Notification implements TrackUpdateInterface | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setMessage(string $message): self | ||||
|     public function setMessage(?string $message): self | ||||
|     { | ||||
|         $this->message = $message; | ||||
|         $this->message = (string) $message; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
| @@ -314,9 +320,9 @@ class Notification implements TrackUpdateInterface | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setTitle(string $title): Notification | ||||
|     public function setTitle(?string $title): Notification | ||||
|     { | ||||
|         $this->title = $title; | ||||
|         $this->title = (string) $title; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|   | ||||
							
								
								
									
										166
									
								
								src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										166
									
								
								src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,166 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Entity; | ||||
|  | ||||
| use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable; | ||||
| use Chill\MainBundle\Repository\ResidentialAddressRepository; | ||||
| use Chill\PersonBundle\Entity\Person; | ||||
| use Chill\ThirdPartyBundle\Entity\ThirdParty; | ||||
| use DateTimeImmutable; | ||||
| use Doctrine\ORM\Mapping as ORM; | ||||
|  | ||||
| /** | ||||
|  * @ORM\Entity(repositoryClass=ResidentialAddressRepository::class) | ||||
|  * @ORM\Table(name="chill_main_residential_address") | ||||
|  */ | ||||
| class ResidentialAddress | ||||
| { | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=Address::class) | ||||
|      * @ORM\JoinColumn(nullable=true) | ||||
|      */ | ||||
|     private ?Address $address = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="residentialAddressComment_") | ||||
|      */ | ||||
|     private CommentEmbeddable $comment; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="datetime_immutable", nullable=true) | ||||
|      */ | ||||
|     private ?DateTimeImmutable $endDate = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=Person::class) | ||||
|      * @ORM\JoinColumn(nullable=true) | ||||
|      */ | ||||
|     private ?Person $hostPerson = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=ThirdParty::class) | ||||
|      * @ORM\JoinColumn(nullable=true) | ||||
|      */ | ||||
|     private ?ThirdParty $hostThirdParty = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Id | ||||
|      * @ORM\GeneratedValue | ||||
|      * @ORM\Column(type="integer") | ||||
|      */ | ||||
|     private $id; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=Person::class) | ||||
|      * @ORM\JoinColumn(nullable=false) | ||||
|      */ | ||||
|     private Person $person; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="datetime_immutable") | ||||
|      */ | ||||
|     private ?DateTimeImmutable $startDate = null; | ||||
|  | ||||
|     public function __construct() | ||||
|     { | ||||
|         $this->comment = new CommentEmbeddable(); | ||||
|     } | ||||
|  | ||||
|     public function getAddress(): ?Address | ||||
|     { | ||||
|         return $this->address; | ||||
|     } | ||||
|  | ||||
|     public function getComment(): CommentEmbeddable | ||||
|     { | ||||
|         return $this->comment; | ||||
|     } | ||||
|  | ||||
|     public function getEndDate(): ?DateTimeImmutable | ||||
|     { | ||||
|         return $this->endDate; | ||||
|     } | ||||
|  | ||||
|     public function getHostPerson(): ?Person | ||||
|     { | ||||
|         return $this->hostPerson; | ||||
|     } | ||||
|  | ||||
|     public function getHostThirdParty(): ?ThirdParty | ||||
|     { | ||||
|         return $this->hostThirdParty; | ||||
|     } | ||||
|  | ||||
|     public function getId(): ?int | ||||
|     { | ||||
|         return $this->id; | ||||
|     } | ||||
|  | ||||
|     public function getPerson(): ?Person | ||||
|     { | ||||
|         return $this->person; | ||||
|     } | ||||
|  | ||||
|     public function getStartDate(): ?DateTimeImmutable | ||||
|     { | ||||
|         return $this->startDate; | ||||
|     } | ||||
|  | ||||
|     public function setAddress(?Address $address): self | ||||
|     { | ||||
|         $this->address = $address; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setComment(CommentEmbeddable $comment): self | ||||
|     { | ||||
|         $this->comment = $comment; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setEndDate(?DateTimeImmutable $endDate): self | ||||
|     { | ||||
|         $this->endDate = $endDate; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setHostPerson(?Person $hostPerson): self | ||||
|     { | ||||
|         $this->hostPerson = $hostPerson; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setHostThirdParty(?ThirdParty $hostThirdParty): self | ||||
|     { | ||||
|         $this->hostThirdParty = $hostThirdParty; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setPerson(?Person $person): self | ||||
|     { | ||||
|         $this->person = $person; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setStartDate(DateTimeImmutable $startDate): self | ||||
|     { | ||||
|         $this->startDate = $startDate; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
| } | ||||
| @@ -97,6 +97,11 @@ class User implements AdvancedUserInterface | ||||
|      */ | ||||
|     private ?Center $mainCenter = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=Location::class) | ||||
|      */ | ||||
|     private ?Location $mainLocation = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=Scope::class) | ||||
|      */ | ||||
| @@ -228,6 +233,11 @@ class User implements AdvancedUserInterface | ||||
|         return $this->mainCenter; | ||||
|     } | ||||
|  | ||||
|     public function getMainLocation(): ?Location | ||||
|     { | ||||
|         return $this->mainLocation; | ||||
|     } | ||||
|  | ||||
|     public function getMainScope(): ?Scope | ||||
|     { | ||||
|         return $this->mainScope; | ||||
| @@ -405,6 +415,13 @@ class User implements AdvancedUserInterface | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setMainLocation(?Location $mainLocation): User | ||||
|     { | ||||
|         $this->mainLocation = $mainLocation; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setMainScope(?Scope $mainScope): User | ||||
|     { | ||||
|         $this->mainScope = $mainScope; | ||||
|   | ||||
							
								
								
									
										461
									
								
								src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										461
									
								
								src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,461 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Entity\Workflow; | ||||
|  | ||||
| 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\User; | ||||
| use Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation; | ||||
| use DateTimeInterface; | ||||
| use Doctrine\Common\Collections\ArrayCollection; | ||||
| use Doctrine\Common\Collections\Collection; | ||||
| use Doctrine\ORM\Mapping as ORM; | ||||
| use Iterator; | ||||
| use RuntimeException; | ||||
| use Symfony\Component\Serializer\Annotation as Serializer; | ||||
| use function count; | ||||
| use function is_array; | ||||
|  | ||||
| /** | ||||
|  * @ORM\Entity | ||||
|  * @ORM\Table("chill_main_workflow_entity") | ||||
|  * @EntityWorkflowCreation(groups={"creation"}) | ||||
|  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={ | ||||
|  *     "entity_workflow": EntityWorkflow::class | ||||
|  * }) | ||||
|  */ | ||||
| class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface | ||||
| { | ||||
|     use TrackCreationTrait; | ||||
|  | ||||
|     use TrackUpdateTrait; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\OneToMany(targetEntity=EntityWorkflowComment::class, mappedBy="entityWorkflow", orphanRemoval=true) | ||||
|      * | ||||
|      * @var Collection|EntityWorkflowComment[] | ||||
|      */ | ||||
|     private Collection $comments; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Id | ||||
|      * @ORM\GeneratedValue | ||||
|      * @ORM\Column(type="integer") | ||||
|      */ | ||||
|     private ?int $id = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="string", length=255) | ||||
|      */ | ||||
|     private string $relatedEntityClass = ''; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="integer") | ||||
|      */ | ||||
|     private int $relatedEntityId; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\OneToMany(targetEntity=EntityWorkflowStep::class, mappedBy="entityWorkflow", orphanRemoval=true, cascade={"persist"}) | ||||
|      * @ORM\OrderBy({"transitionAt": "ASC", "id": "ASC"}) | ||||
|      * | ||||
|      * @var Collection|EntityWorkflowStep[] | ||||
|      */ | ||||
|     private Collection $steps; | ||||
|  | ||||
|     /** | ||||
|      * @var null|array|EntityWorkflowStep[] | ||||
|      */ | ||||
|     private ?array $stepsChainedCache = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToMany(targetEntity=User::class) | ||||
|      * @ORM\JoinTable(name="chill_main_workflow_entity_subscriber_to_final") | ||||
|      * | ||||
|      * @var Collection|User[] | ||||
|      */ | ||||
|     private Collection $subscriberToFinal; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToMany(targetEntity=User::class) | ||||
|      * @ORM\JoinTable(name="chill_main_workflow_entity_subscriber_to_step") | ||||
|      * | ||||
|      * @var Collection|User[] | ||||
|      */ | ||||
|     private Collection $subscriberToStep; | ||||
|  | ||||
|     /** | ||||
|      * a step which will store all the transition data. | ||||
|      */ | ||||
|     private ?EntityWorkflowStep $transitionningStep = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="text") | ||||
|      */ | ||||
|     private string $workflowName; | ||||
|  | ||||
|     public function __construct() | ||||
|     { | ||||
|         $this->subscriberToFinal = new ArrayCollection(); | ||||
|         $this->subscriberToStep = new ArrayCollection(); | ||||
|         $this->comments = new ArrayCollection(); | ||||
|         $this->steps = new ArrayCollection(); | ||||
|  | ||||
|         $initialStep = new EntityWorkflowStep(); | ||||
|         $initialStep | ||||
|             ->setCurrentStep('initial'); | ||||
|         $this->addStep($initialStep); | ||||
|     } | ||||
|  | ||||
|     public function addComment(EntityWorkflowComment $comment): self | ||||
|     { | ||||
|         if (!$this->comments->contains($comment)) { | ||||
|             $this->comments[] = $comment; | ||||
|             $comment->setEntityWorkflow($this); | ||||
|         } | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @internal You should prepare a step and run a workflow transition instead of manually adding a step | ||||
|      */ | ||||
|     public function addStep(EntityWorkflowStep $step): self | ||||
|     { | ||||
|         if (!$this->steps->contains($step)) { | ||||
|             $this->steps[] = $step; | ||||
|             $step->setEntityWorkflow($this); | ||||
|         } | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function addSubscriberToFinal(User $user): self | ||||
|     { | ||||
|         if (!$this->subscriberToFinal->contains($user)) { | ||||
|             $this->subscriberToFinal[] = $user; | ||||
|         } | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function addSubscriberToStep(User $user): self | ||||
|     { | ||||
|         if (!$this->subscriberToStep->contains($user)) { | ||||
|             $this->subscriberToStep[] = $user; | ||||
|         } | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function getComments(): Collection | ||||
|     { | ||||
|         return $this->comments; | ||||
|     } | ||||
|  | ||||
|     public function getCurrentStep(): ?EntityWorkflowStep | ||||
|     { | ||||
|         $step = $this->steps->last(); | ||||
|  | ||||
|         if (false !== $step) { | ||||
|             return $step; | ||||
|         } | ||||
|  | ||||
|         return null; | ||||
|     } | ||||
|  | ||||
|     public function getCurrentStepChained(): ?EntityWorkflowStep | ||||
|     { | ||||
|         $steps = $this->getStepsChained(); | ||||
|         $currentStep = $this->getCurrentStep(); | ||||
|  | ||||
|         foreach ($steps as $step) { | ||||
|             if ($step === $currentStep) { | ||||
|                 return $step; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         return null; | ||||
|     } | ||||
|  | ||||
|     public function getCurrentStepCreatedAt(): ?DateTimeInterface | ||||
|     { | ||||
|         if (null !== $previous = $this->getPreviousStepIfAny()) { | ||||
|             return $previous->getTransitionAt(); | ||||
|         } | ||||
|  | ||||
|         return null; | ||||
|     } | ||||
|  | ||||
|     public function getCurrentStepCreatedBy(): ?User | ||||
|     { | ||||
|         if (null !== $previous = $this->getPreviousStepIfAny()) { | ||||
|             return $previous->getTransitionBy(); | ||||
|         } | ||||
|  | ||||
|         return null; | ||||
|     } | ||||
|  | ||||
|     public function getId(): ?int | ||||
|     { | ||||
|         return $this->id; | ||||
|     } | ||||
|  | ||||
|     public function getRelatedEntityClass(): string | ||||
|     { | ||||
|         return $this->relatedEntityClass; | ||||
|     } | ||||
|  | ||||
|     public function getRelatedEntityId(): int | ||||
|     { | ||||
|         return $this->relatedEntityId; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Method used by MarkingStore. | ||||
|      * | ||||
|      * get a string representation of the step | ||||
|      */ | ||||
|     public function getStep(): string | ||||
|     { | ||||
|         return $this->getCurrentStep()->getCurrentStep(); | ||||
|     } | ||||
|  | ||||
|     public function getStepAfter(EntityWorkflowStep $step): ?EntityWorkflowStep | ||||
|     { | ||||
|         $iterator = $this->steps->getIterator(); | ||||
|  | ||||
|         if ($iterator instanceof Iterator) { | ||||
|             $iterator->rewind(); | ||||
|  | ||||
|             while ($iterator->valid()) { | ||||
|                 $curStep = $iterator->current(); | ||||
|  | ||||
|                 if ($curStep === $step) { | ||||
|                     $iterator->next(); | ||||
|  | ||||
|                     if ($iterator->valid()) { | ||||
|                         return $iterator->current(); | ||||
|                     } | ||||
|  | ||||
|                     return null; | ||||
|                 } | ||||
|                 $iterator->next(); | ||||
|             } | ||||
|  | ||||
|             return null; | ||||
|         } | ||||
|  | ||||
|         throw new RuntimeException(); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return ArrayCollection|Collection | ||||
|      */ | ||||
|     public function getSteps() | ||||
|     { | ||||
|         return $this->steps; | ||||
|     } | ||||
|  | ||||
|     public function getStepsChained(): array | ||||
|     { | ||||
|         if (is_array($this->stepsChainedCache)) { | ||||
|             return $this->stepsChainedCache; | ||||
|         } | ||||
|  | ||||
|         $iterator = $this->steps->getIterator(); | ||||
|         $current = null; | ||||
|         $steps = []; | ||||
|  | ||||
|         $iterator->rewind(); | ||||
|  | ||||
|         do { | ||||
|             $previous = $current; | ||||
|             $current = $iterator->current(); | ||||
|             $steps[] = $current; | ||||
|  | ||||
|             $current->setPrevious($previous); | ||||
|  | ||||
|             $iterator->next(); | ||||
|  | ||||
|             if ($iterator->valid()) { | ||||
|                 $current->setNext($iterator->current()); | ||||
|             } else { | ||||
|                 $current->setNext(null); | ||||
|             } | ||||
|         } while ($iterator->valid()); | ||||
|  | ||||
|         $this->stepsChainedCache = $steps; | ||||
|  | ||||
|         return $steps; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return ArrayCollection|Collection | ||||
|      */ | ||||
|     public function getSubscriberToFinal() | ||||
|     { | ||||
|         return $this->subscriberToFinal; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return ArrayCollection|Collection | ||||
|      */ | ||||
|     public function getSubscriberToStep() | ||||
|     { | ||||
|         return $this->subscriberToStep; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * get the step which is transitionning. Should be called only by event which will | ||||
|      * concern the transition. | ||||
|      */ | ||||
|     public function getTransitionningStep(): ?EntityWorkflowStep | ||||
|     { | ||||
|         return $this->transitionningStep; | ||||
|     } | ||||
|  | ||||
|     public function getWorkflowName(): string | ||||
|     { | ||||
|         return $this->workflowName; | ||||
|     } | ||||
|  | ||||
|     public function isFinal(): bool | ||||
|     { | ||||
|         $steps = $this->getStepsChained(); | ||||
|  | ||||
|         if (1 === count($steps)) { | ||||
|             // the initial step cannot be finalized | ||||
|             return false; | ||||
|         } | ||||
|  | ||||
|         /** @var EntityWorkflowStep $last */ | ||||
|         $last = end($steps); | ||||
|  | ||||
|         return $last->isFinal(); | ||||
|     } | ||||
|  | ||||
|     public function isFreeze(): bool | ||||
|     { | ||||
|         $steps = $this->getStepsChained(); | ||||
|  | ||||
|         if (1 === count($steps)) { | ||||
|             // the initial step cannot be finalized | ||||
|             return false; | ||||
|         } | ||||
|  | ||||
|         /** @var EntityWorkflowStep $last */ | ||||
|         $last = end($steps); | ||||
|  | ||||
|         return $last->getPrevious()->isFreezeAfter(); | ||||
|     } | ||||
|  | ||||
|     public function isUserSubscribedToFinal(User $user): bool | ||||
|     { | ||||
|         return $this->subscriberToFinal->contains($user); | ||||
|     } | ||||
|  | ||||
|     public function isUserSubscribedToStep(User $user): bool | ||||
|     { | ||||
|         return $this->subscriberToStep->contains($user); | ||||
|     } | ||||
|  | ||||
|     public function prepareStepBeforeTransition(EntityWorkflowStep $step): self | ||||
|     { | ||||
|         $this->transitionningStep = $step; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function removeComment(EntityWorkflowComment $comment): self | ||||
|     { | ||||
|         if ($this->comments->removeElement($comment)) { | ||||
|             $comment->setEntityWorkflow(null); | ||||
|         } | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function removeStep(EntityWorkflowStep $step): self | ||||
|     { | ||||
|         if ($this->steps->removeElement($step)) { | ||||
|             $step->setEntityWorkflow(null); | ||||
|         } | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function removeSubscriberToFinal(User $user): self | ||||
|     { | ||||
|         $this->subscriberToFinal->removeElement($user); | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function removeSubscriberToStep(User $user): self | ||||
|     { | ||||
|         $this->subscriberToStep->removeElement($user); | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setRelatedEntityClass(string $relatedEntityClass): EntityWorkflow | ||||
|     { | ||||
|         $this->relatedEntityClass = $relatedEntityClass; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setRelatedEntityId(int $relatedEntityId): EntityWorkflow | ||||
|     { | ||||
|         $this->relatedEntityId = $relatedEntityId; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Method use by marking store. | ||||
|      * | ||||
|      * @return $this | ||||
|      */ | ||||
|     public function setStep(string $step): self | ||||
|     { | ||||
|         $newStep = new EntityWorkflowStep(); | ||||
|         $newStep->setCurrentStep($step); | ||||
|  | ||||
|         // copy the freeze | ||||
|         if ($this->getCurrentStep()->isFreezeAfter()) { | ||||
|             $newStep->setFreezeAfter(true); | ||||
|         } | ||||
|  | ||||
|         $this->addStep($newStep); | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setWorkflowName(string $workflowName): EntityWorkflow | ||||
|     { | ||||
|         $this->workflowName = $workflowName; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     private function getPreviousStepIfAny(): ?EntityWorkflowStep | ||||
|     { | ||||
|         if (1 === count($this->steps)) { | ||||
|             return null; | ||||
|         } | ||||
|  | ||||
|         return $this->steps->get($this->steps->count() - 2); | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,78 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Entity\Workflow; | ||||
|  | ||||
| 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 Doctrine\ORM\Mapping as ORM; | ||||
|  | ||||
| /** | ||||
|  * @ORM\Entity | ||||
|  * @ORM\Table("chill_main_workflow_entity_comment") | ||||
|  */ | ||||
| class EntityWorkflowComment implements TrackCreationInterface, TrackUpdateInterface | ||||
| { | ||||
|     use TrackCreationTrait; | ||||
|  | ||||
|     use TrackUpdateTrait; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="text", options={"default": ""}) | ||||
|      */ | ||||
|     private string $comment = ''; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=EntityWorkflow::class, inversedBy="comments") | ||||
|      */ | ||||
|     private ?EntityWorkflow $entityWorkflow = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Id | ||||
|      * @ORM\GeneratedValue | ||||
|      * @ORM\Column(type="integer") | ||||
|      */ | ||||
|     private ?int $id = null; | ||||
|  | ||||
|     public function getComment(): string | ||||
|     { | ||||
|         return $this->comment; | ||||
|     } | ||||
|  | ||||
|     public function getEntityWorkflow(): ?EntityWorkflow | ||||
|     { | ||||
|         return $this->entityWorkflow; | ||||
|     } | ||||
|  | ||||
|     public function getId(): ?int | ||||
|     { | ||||
|         return $this->id; | ||||
|     } | ||||
|  | ||||
|     public function setComment(string $comment): self | ||||
|     { | ||||
|         $this->comment = $comment; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @internal use @see{EntityWorkflow::addComment} | ||||
|      */ | ||||
|     public function setEntityWorkflow(?EntityWorkflow $entityWorkflow): self | ||||
|     { | ||||
|         $this->entityWorkflow = $entityWorkflow; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,336 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Entity\Workflow; | ||||
|  | ||||
| use Chill\MainBundle\Entity\User; | ||||
| use DateTimeImmutable; | ||||
| use Doctrine\Common\Collections\ArrayCollection; | ||||
| use Doctrine\Common\Collections\Collection; | ||||
| use Doctrine\ORM\Mapping as ORM; | ||||
| use Symfony\Component\Validator\Constraints as Assert; | ||||
| use Symfony\Component\Validator\Context\ExecutionContextInterface; | ||||
| use function count; | ||||
| use function in_array; | ||||
|  | ||||
| /** | ||||
|  * @ORM\Entity | ||||
|  * @ORM\Table("chill_main_workflow_entity_step") | ||||
|  */ | ||||
| class EntityWorkflowStep | ||||
| { | ||||
|     /** | ||||
|      * @ORM\Column(type="text", options={"default": ""}) | ||||
|      */ | ||||
|     private string $comment = ''; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="text") | ||||
|      */ | ||||
|     private ?string $currentStep = ''; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="json") | ||||
|      */ | ||||
|     private array $destEmail = []; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToMany(targetEntity=User::class) | ||||
|      * @ORM\JoinTable(name="chill_main_workflow_entity_step_user") | ||||
|      */ | ||||
|     private Collection $destUser; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=EntityWorkflow::class, inversedBy="steps") | ||||
|      */ | ||||
|     private ?EntityWorkflow $entityWorkflow = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="boolean", options={"default": false}) | ||||
|      */ | ||||
|     private bool $freezeAfter = false; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Id | ||||
|      * @ORM\GeneratedValue | ||||
|      * @ORM\Column(type="integer") | ||||
|      */ | ||||
|     private ?int $id = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="boolean", options={"default": false}) | ||||
|      */ | ||||
|     private bool $isFinal = false; | ||||
|  | ||||
|     /** | ||||
|      * filled by @see{EntityWorkflow::getStepsChained}. | ||||
|      */ | ||||
|     private ?EntityWorkflowStep $next = null; | ||||
|  | ||||
|     /** | ||||
|      * filled by @see{EntityWorkflow::getStepsChained}. | ||||
|      */ | ||||
|     private ?EntityWorkflowStep $previous = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="text", nullable=true, options={"default": null}) | ||||
|      */ | ||||
|     private ?string $transitionAfter = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="datetime_immutable") | ||||
|      */ | ||||
|     private ?DateTimeImmutable $transitionAt = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\ManyToOne(targetEntity=User::class) | ||||
|      * @ORM\JoinColumn(nullable=true) | ||||
|      */ | ||||
|     private ?User $transitionBy = null; | ||||
|  | ||||
|     /** | ||||
|      * @ORM\Column(type="text", nullable=true) | ||||
|      */ | ||||
|     private ?string $transitionByEmail = null; | ||||
|  | ||||
|     public function __construct() | ||||
|     { | ||||
|         $this->destUser = new ArrayCollection(); | ||||
|     } | ||||
|  | ||||
|     public function addDestEmail(string $email): self | ||||
|     { | ||||
|         if (!in_array($email, $this->destEmail, true)) { | ||||
|             $this->destEmail[] = $email; | ||||
|         } | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function addDestUser(User $user): self | ||||
|     { | ||||
|         if (!$this->destUser->contains($user)) { | ||||
|             $this->destUser[] = $user; | ||||
|         } | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function getComment(): string | ||||
|     { | ||||
|         return $this->comment; | ||||
|     } | ||||
|  | ||||
|     public function getCurrentStep(): ?string | ||||
|     { | ||||
|         return $this->currentStep; | ||||
|     } | ||||
|  | ||||
|     public function getDestEmail(): array | ||||
|     { | ||||
|         return $this->destEmail; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return ArrayCollection|Collection | ||||
|      */ | ||||
|     public function getDestUser() | ||||
|     { | ||||
|         return $this->destUser; | ||||
|     } | ||||
|  | ||||
|     public function getEntityWorkflow(): ?EntityWorkflow | ||||
|     { | ||||
|         return $this->entityWorkflow; | ||||
|     } | ||||
|  | ||||
|     public function getId(): ?int | ||||
|     { | ||||
|         return $this->id; | ||||
|     } | ||||
|  | ||||
|     public function getNext(): ?EntityWorkflowStep | ||||
|     { | ||||
|         return $this->next; | ||||
|     } | ||||
|  | ||||
|     public function getPrevious(): ?EntityWorkflowStep | ||||
|     { | ||||
|         return $this->previous; | ||||
|     } | ||||
|  | ||||
|     public function getTransitionAfter(): ?string | ||||
|     { | ||||
|         return $this->transitionAfter; | ||||
|     } | ||||
|  | ||||
|     public function getTransitionAt(): ?DateTimeImmutable | ||||
|     { | ||||
|         return $this->transitionAt; | ||||
|     } | ||||
|  | ||||
|     public function getTransitionBy(): ?User | ||||
|     { | ||||
|         return $this->transitionBy; | ||||
|     } | ||||
|  | ||||
|     public function getTransitionByEmail(): ?string | ||||
|     { | ||||
|         return $this->transitionByEmail; | ||||
|     } | ||||
|  | ||||
|     public function isFinal(): bool | ||||
|     { | ||||
|         return $this->isFinal; | ||||
|     } | ||||
|  | ||||
|     public function isFreezeAfter(): bool | ||||
|     { | ||||
|         return $this->freezeAfter; | ||||
|     } | ||||
|  | ||||
|     public function removeDestEmail(string $email): self | ||||
|     { | ||||
|         $this->destEmail = array_filter($this->destEmail, static function (string $existing) use ($email) { | ||||
|             return $email !== $existing; | ||||
|         }); | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function removeDestUser(User $user): self | ||||
|     { | ||||
|         $this->destUser->removeElement($user); | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setComment(?string $comment): EntityWorkflowStep | ||||
|     { | ||||
|         $this->comment = (string) $comment; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setCurrentStep(?string $currentStep): EntityWorkflowStep | ||||
|     { | ||||
|         $this->currentStep = $currentStep; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setDestEmail(array $destEmail): EntityWorkflowStep | ||||
|     { | ||||
|         $this->destEmail = $destEmail; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @internal use @see(EntityWorkflow::addStep} instead | ||||
|      */ | ||||
|     public function setEntityWorkflow(?EntityWorkflow $entityWorkflow): EntityWorkflowStep | ||||
|     { | ||||
|         $this->entityWorkflow = $entityWorkflow; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setFreezeAfter(bool $freezeAfter): EntityWorkflowStep | ||||
|     { | ||||
|         $this->freezeAfter = $freezeAfter; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setIsFinal(bool $isFinal): EntityWorkflowStep | ||||
|     { | ||||
|         $this->isFinal = $isFinal; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return EntityWorkflowStep | ||||
|      * | ||||
|      * @internal | ||||
|      */ | ||||
|     public function setNext(?EntityWorkflowStep $next): self | ||||
|     { | ||||
|         $this->next = $next; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return EntityWorkflowStep | ||||
|      * | ||||
|      * @internal | ||||
|      */ | ||||
|     public function setPrevious(?EntityWorkflowStep $previous): self | ||||
|     { | ||||
|         $this->previous = $previous; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setTransitionAfter(?string $transitionAfter): EntityWorkflowStep | ||||
|     { | ||||
|         $this->transitionAfter = $transitionAfter; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setTransitionAt(?DateTimeImmutable $transitionAt): EntityWorkflowStep | ||||
|     { | ||||
|         $this->transitionAt = $transitionAt; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setTransitionBy(?User $transitionBy): EntityWorkflowStep | ||||
|     { | ||||
|         $this->transitionBy = $transitionBy; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     public function setTransitionByEmail(?string $transitionByEmail): EntityWorkflowStep | ||||
|     { | ||||
|         $this->transitionByEmail = $transitionByEmail; | ||||
|  | ||||
|         return $this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @Assert\Callback | ||||
|      * | ||||
|      * @param mixed $payload | ||||
|      */ | ||||
|     public function validateOnCreation(ExecutionContextInterface $context, $payload): void | ||||
|     { | ||||
|         return; | ||||
|  | ||||
|         if ($this->isFinalizeAfter()) { | ||||
|             if (0 !== count($this->getDestUser())) { | ||||
|                 $context->buildViolation('workflow.No dest users when the workflow is finalized') | ||||
|                     ->atPath('finalizeAfter') | ||||
|                     ->addViolation(); | ||||
|             } | ||||
|         } else { | ||||
|             if (0 === count($this->getDestUser())) { | ||||
|                 $context->buildViolation('workflow.The next step must count at least one dest') | ||||
|                     ->atPath('finalizeAfter') | ||||
|                     ->addViolation(); | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,27 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Form; | ||||
|  | ||||
| use Chill\MainBundle\Form\Type\ChillTextareaType; | ||||
| use Symfony\Component\Form\AbstractType; | ||||
| use Symfony\Component\Form\FormBuilderInterface; | ||||
|  | ||||
| class EntityWorkflowCommentType extends AbstractType | ||||
| { | ||||
|     public function buildForm(FormBuilderInterface $builder, array $options) | ||||
|     { | ||||
|         $builder | ||||
|             ->add('comment', ChillTextareaType::class, [ | ||||
|                 'required' => false, | ||||
|             ]); | ||||
|     } | ||||
| } | ||||
| @@ -54,7 +54,6 @@ final class LocationFormType extends AbstractType | ||||
|                 'label' => 'Address', | ||||
|                 'use_valid_from' => false, | ||||
|                 'use_valid_to' => false, | ||||
|                 'mapped' => false, | ||||
|             ]) | ||||
|             ->add( | ||||
|                 'active', | ||||
|   | ||||
| @@ -39,6 +39,17 @@ final class LocationTypeType extends AbstractType | ||||
|                     'expanded' => true, | ||||
|                 ] | ||||
|             ) | ||||
|             ->add( | ||||
|                 'editableByUsers', | ||||
|                 ChoiceType::class, | ||||
|                 [ | ||||
|                     'choices' => [ | ||||
|                         'Yes' => true, | ||||
|                         'No' => false, | ||||
|                     ], | ||||
|                     'expanded' => true, | ||||
|                 ] | ||||
|             ) | ||||
|             ->add( | ||||
|                 'addressRequired', | ||||
|                 ChoiceType::class, | ||||
|   | ||||
| @@ -12,14 +12,18 @@ declare(strict_types=1); | ||||
| namespace Chill\MainBundle\Form\Type\DataTransformer; | ||||
| 
 | ||||
| use Chill\MainBundle\Entity\User; | ||||
| use Chill\PersonBundle\Entity\Person; | ||||
| use Chill\ThirdPartyBundle\Entity\ThirdParty; | ||||
| use Symfony\Component\Form\DataTransformerInterface; | ||||
| use Symfony\Component\Form\Exception\TransformationFailedException; | ||||
| use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; | ||||
| use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; | ||||
| use Symfony\Component\Serializer\SerializerInterface; | ||||
| use UnexpectedValueException; | ||||
| 
 | ||||
| use function array_key_exists; | ||||
| 
 | ||||
| class UserToJsonTransformer implements DataTransformerInterface | ||||
| class EntityToJsonTransformer implements DataTransformerInterface | ||||
| { | ||||
|     private DenormalizerInterface $denormalizer; | ||||
| 
 | ||||
| @@ -27,23 +31,36 @@ class UserToJsonTransformer implements DataTransformerInterface | ||||
| 
 | ||||
|     private SerializerInterface $serializer; | ||||
| 
 | ||||
|     public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, bool $multiple) | ||||
|     private string $type; | ||||
| 
 | ||||
|     public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, bool $multiple, string $type) | ||||
|     { | ||||
|         $this->denormalizer = $denormalizer; | ||||
|         $this->serializer = $serializer; | ||||
|         $this->multiple = $multiple; | ||||
|         $this->type = $type; | ||||
|     } | ||||
| 
 | ||||
|     public function reverseTransform($value) | ||||
|     { | ||||
|         $denormalized = json_decode($value, true); | ||||
| 
 | ||||
|         if ($this->multiple) { | ||||
|             if (null === $denormalized) { | ||||
|                 return []; | ||||
|             } | ||||
| 
 | ||||
|             return array_map( | ||||
|                 function ($item) { return $this->denormalizeOne($item); }, | ||||
|                 json_decode($value, true) | ||||
|                 $denormalized | ||||
|             ); | ||||
|         } | ||||
| 
 | ||||
|         return $this->denormalizeOne(json_decode($value, true)); | ||||
|         if ('' === $value) { | ||||
|             return null; | ||||
|         } | ||||
| 
 | ||||
|         return $this->denormalizeOne($denormalized); | ||||
|     } | ||||
| 
 | ||||
|     /** | ||||
| @@ -60,7 +77,7 @@ class UserToJsonTransformer implements DataTransformerInterface | ||||
|         ]); | ||||
|     } | ||||
| 
 | ||||
|     private function denormalizeOne(array $item): User | ||||
|     private function denormalizeOne(array $item) | ||||
|     { | ||||
|         if (!array_key_exists('type', $item)) { | ||||
|             throw new TransformationFailedException('the key "type" is missing on element'); | ||||
| @@ -70,10 +87,30 @@ class UserToJsonTransformer implements DataTransformerInterface | ||||
|             throw new TransformationFailedException('the key "id" is missing on element'); | ||||
|         } | ||||
| 
 | ||||
|         switch ($this->type) { | ||||
|             case 'user': | ||||
|                 $class = User::class; | ||||
| 
 | ||||
|                 break; | ||||
| 
 | ||||
|             case 'person': | ||||
|                 $class = Person::class; | ||||
| 
 | ||||
|                 break; | ||||
| 
 | ||||
|             case 'thirdparty': | ||||
|                 $class = ThirdParty::class; | ||||
| 
 | ||||
|                 break; | ||||
| 
 | ||||
|             default: | ||||
|                 throw new UnexpectedValueException('This type is not supported'); | ||||
|         } | ||||
| 
 | ||||
|         return | ||||
|             $this->denormalizer->denormalize( | ||||
|                 ['type' => $item['type'], 'id' => $item['id']], | ||||
|                 User::class, | ||||
|                 $class, | ||||
|                 'json', | ||||
|                 [AbstractNormalizer::GROUPS => ['read']], | ||||
|             ); | ||||
| @@ -12,7 +12,7 @@ declare(strict_types=1); | ||||
| namespace Chill\MainBundle\Form\Type; | ||||
|  | ||||
| use Chill\MainBundle\Entity\User; | ||||
| use Chill\MainBundle\Form\Type\DataTransformer\UserToJsonTransformer; | ||||
| use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer; | ||||
| use Symfony\Component\Form\AbstractType; | ||||
| use Symfony\Component\Form\FormBuilderInterface; | ||||
| use Symfony\Component\Form\FormInterface; | ||||
| @@ -38,7 +38,7 @@ class PickUserDynamicType extends AbstractType | ||||
|  | ||||
|     public function buildForm(FormBuilderInterface $builder, array $options) | ||||
|     { | ||||
|         $builder->addViewTransformer(new UserToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple'])); | ||||
|         $builder->addViewTransformer(new EntityToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple'], 'user')); | ||||
|     } | ||||
|  | ||||
|     public function buildView(FormView $view, FormInterface $form, array $options) | ||||
| @@ -58,6 +58,6 @@ class PickUserDynamicType extends AbstractType | ||||
|  | ||||
|     public function getBlockPrefix() | ||||
|     { | ||||
|         return 'pick_user_dynamic'; | ||||
|         return 'pick_entity_dynamic'; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -0,0 +1,73 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Form\Type; | ||||
|  | ||||
| use Chill\MainBundle\Entity\ResidentialAddress; | ||||
| use Chill\PersonBundle\Form\Type\PickPersonDynamicType; | ||||
| use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType; | ||||
| use Symfony\Component\Form\AbstractType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\DateType; | ||||
| use Symfony\Component\Form\FormBuilderInterface; | ||||
| use Symfony\Component\OptionsResolver\OptionsResolver; | ||||
|  | ||||
| final class ResidentialAddressType extends AbstractType | ||||
| { | ||||
|     public function buildForm(FormBuilderInterface $builder, array $options) | ||||
|     { | ||||
|         $builder | ||||
|             ->add('startDate', DateType::class, [ | ||||
|                 'required' => true, | ||||
|                 'input' => 'datetime_immutable', | ||||
|                 'widget' => 'single_text', | ||||
|             ]) | ||||
|             ->add('endDate', DateType::class, [ | ||||
|                 'required' => false, | ||||
|                 'input' => 'datetime_immutable', | ||||
|                 'widget' => 'single_text', | ||||
|             ]) | ||||
|             ->add('comment', CommentType::class, [ | ||||
|                 'required' => false, | ||||
|             ]); | ||||
|  | ||||
|         if ('person' === $options['kind']) { | ||||
|             $builder | ||||
|                 ->add('hostPerson', PickPersonDynamicType::class, [ | ||||
|                     'label' => 'Person', | ||||
|                 ]); | ||||
|         } | ||||
|  | ||||
|         if ('thirdparty' === $options['kind']) { | ||||
|             $builder | ||||
|                 ->add('hostThirdParty', PickThirdpartyDynamicType::class, [ | ||||
|                     'label' => 'Third party', | ||||
|                 ]); | ||||
|         } | ||||
|  | ||||
|         if ('address' === $options['kind']) { | ||||
|             $builder | ||||
|                 ->add('address', PickAddressType::class, [ | ||||
|                     'required' => false, | ||||
|                     'label' => 'Address', | ||||
|                     'use_valid_from' => false, | ||||
|                     'use_valid_to' => false, | ||||
|                 ]); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     public function configureOptions(OptionsResolver $resolver) | ||||
|     { | ||||
|         $resolver->setDefaults([ | ||||
|             'data_class' => ResidentialAddress::class, | ||||
|             'kind' => null, | ||||
|         ]); | ||||
|     } | ||||
| } | ||||
| @@ -12,6 +12,7 @@ declare(strict_types=1); | ||||
| namespace Chill\MainBundle\Form; | ||||
|  | ||||
| use Chill\MainBundle\Entity\Center; | ||||
| use Chill\MainBundle\Entity\Location; | ||||
| use Chill\MainBundle\Entity\Scope; | ||||
| use Chill\MainBundle\Entity\UserJob; | ||||
| use Chill\MainBundle\Templating\TranslatableStringHelper; | ||||
| @@ -75,6 +76,22 @@ class UserType extends AbstractType | ||||
|                 'choice_label' => function (UserJob $c) { | ||||
|                     return $this->translatableStringHelper->localize($c->getLabel()); | ||||
|                 }, | ||||
|             ]) | ||||
|             ->add('mainLocation', EntityType::class, [ | ||||
|                 'label' => 'Main location', | ||||
|                 'required' => false, | ||||
|                 'placeholder' => 'choose a location', | ||||
|                 'class' => Location::class, | ||||
|                 'choice_label' => function (Location $l) { | ||||
|                     return $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ' - ' . $l->getName(); | ||||
|                 }, | ||||
|                 'query_builder' => static function (EntityRepository $er) { | ||||
|                     $qb = $er->createQueryBuilder('l'); | ||||
|                     $qb->orderBy('l.locationType'); | ||||
|                     $qb->where('l.availableForUsers = TRUE'); | ||||
|  | ||||
|                     return $qb; | ||||
|                 }, | ||||
|             ]); | ||||
|  | ||||
|         if ($options['is_creation']) { | ||||
|   | ||||
							
								
								
									
										180
									
								
								src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										180
									
								
								src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,180 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Form; | ||||
|  | ||||
| use Chill\MainBundle\Entity\Workflow\EntityWorkflow; | ||||
| use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep; | ||||
| use Chill\MainBundle\Form\Type\ChillTextareaType; | ||||
| use Chill\MainBundle\Form\Type\PickUserDynamicType; | ||||
| use Chill\MainBundle\Templating\TranslatableStringHelperInterface; | ||||
| use Chill\MainBundle\Workflow\EntityWorkflowManager; | ||||
| use LogicException; | ||||
| use Symfony\Component\Form\AbstractType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\CheckboxType; | ||||
| use Symfony\Component\Form\Extension\Core\Type\ChoiceType; | ||||
| use Symfony\Component\Form\FormBuilderInterface; | ||||
| use Symfony\Component\OptionsResolver\OptionsResolver; | ||||
| use Symfony\Component\Workflow\Registry; | ||||
| use Symfony\Component\Workflow\Transition; | ||||
| use function array_key_exists; | ||||
|  | ||||
| class WorkflowStepType extends AbstractType | ||||
| { | ||||
|     private EntityWorkflowManager $entityWorkflowManager; | ||||
|  | ||||
|     private Registry $registry; | ||||
|  | ||||
|     private TranslatableStringHelperInterface $translatableStringHelper; | ||||
|  | ||||
|     public function __construct(EntityWorkflowManager $entityWorkflowManager, Registry $registry, TranslatableStringHelperInterface $translatableStringHelper) | ||||
|     { | ||||
|         $this->entityWorkflowManager = $entityWorkflowManager; | ||||
|         $this->registry = $registry; | ||||
|         $this->translatableStringHelper = $translatableStringHelper; | ||||
|     } | ||||
|  | ||||
|     public function buildForm(FormBuilderInterface $builder, array $options) | ||||
|     { | ||||
|         /** @var \Chill\MainBundle\Entity\Workflow\EntityWorkflow $entityWorkflow */ | ||||
|         $entityWorkflow = $options['entity_workflow']; | ||||
|         $handler = $this->entityWorkflowManager->getHandler($entityWorkflow); | ||||
|         $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName()); | ||||
|         $place = $workflow->getMarking($entityWorkflow); | ||||
|         $placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata(array_keys($place->getPlaces())[0]); | ||||
|  | ||||
|         if (true === $options['transition']) { | ||||
|             if (null === $options['entity_workflow']) { | ||||
|                 throw new LogicException('if transition is true, entity_workflow should be defined'); | ||||
|             } | ||||
|  | ||||
|             $transitions = $this->registry | ||||
|                 ->get($options['entity_workflow'], $entityWorkflow->getWorkflowName()) | ||||
|                 ->getEnabledTransitions($entityWorkflow); | ||||
|  | ||||
|             $choices = array_combine( | ||||
|                 array_map( | ||||
|                     static function (Transition $transition) { | ||||
|                         return $transition->getName(); | ||||
|                     }, | ||||
|                     $transitions | ||||
|                 ), | ||||
|                 $transitions | ||||
|             ); | ||||
|  | ||||
|             if (array_key_exists('validationFilterInputLabels', $placeMetadata)) { | ||||
|                 $inputLabels = $placeMetadata['validationFilterInputLabels']; | ||||
|  | ||||
|                 $builder->add('transitionFilter', ChoiceType::class, [ | ||||
|                     'multiple' => false, | ||||
|                     'label' => 'workflow.My decision', | ||||
|                     'choices' => [ | ||||
|                         'forward' => 'forward', | ||||
|                         'backward' => 'backward', | ||||
|                         'neutral' => 'neutral', | ||||
|                     ], | ||||
|                     'choice_label' => function (string $key) use ($inputLabels) { | ||||
|                         return $this->translatableStringHelper->localize($inputLabels[$key]); | ||||
|                     }, | ||||
|                     'choice_attr' => static function (string $key) { | ||||
|                         return [ | ||||
|                             $key => $key, | ||||
|                         ]; | ||||
|                     }, | ||||
|                     'mapped' => false, | ||||
|                     'expanded' => true, | ||||
|                     'data' => 'forward', | ||||
|                 ]); | ||||
|             } | ||||
|  | ||||
|             $builder | ||||
|                 ->add('transition', ChoiceType::class, [ | ||||
|                     'label' => 'workflow.Next step', | ||||
|                     'mapped' => false, | ||||
|                     'multiple' => false, | ||||
|                     'expanded' => true, | ||||
|                     'choices' => $choices, | ||||
|                     'choice_label' => function (Transition $transition) use ($workflow) { | ||||
|                         $meta = $workflow->getMetadataStore()->getTransitionMetadata($transition); | ||||
|  | ||||
|                         if (array_key_exists('label', $meta)) { | ||||
|                             return $this->translatableStringHelper->localize($meta['label']); | ||||
|                         } | ||||
|  | ||||
|                         return $transition->getName(); | ||||
|                     }, | ||||
|                     'choice_attr' => static function (Transition $transition) use ($workflow) { | ||||
|                         $toFinal = true; | ||||
|                         $isForward = 'neutral'; | ||||
|  | ||||
|                         $metadata = $workflow->getMetadataStore()->getTransitionMetadata($transition); | ||||
|  | ||||
|                         if (array_key_exists('isForward', $metadata)) { | ||||
|                             if ($metadata['isForward']) { | ||||
|                                 $isForward = 'forward'; | ||||
|                             } else { | ||||
|                                 $isForward = 'backward'; | ||||
|                             } | ||||
|                         } | ||||
|  | ||||
|                         foreach ($transition->getTos() as $to) { | ||||
|                             $meta = $workflow->getMetadataStore()->getPlaceMetadata($to); | ||||
|  | ||||
|                             if ( | ||||
|                                     !array_key_exists('isFinal', $meta) || false === $meta['isFinal'] | ||||
|                                 ) { | ||||
|                                 $toFinal = false; | ||||
|                             } | ||||
|                         } | ||||
|  | ||||
|                         return [ | ||||
|                             'data-is-transition' => 'data-is-transition', | ||||
|                             'data-to-final' => $toFinal ? '1' : '0', | ||||
|                             'data-is-forward' => $isForward, | ||||
|                         ]; | ||||
|                     }, | ||||
|                 ]) | ||||
|                 ->add('future_dest_users', PickUserDynamicType::class, [ | ||||
|                     'label' => 'workflow.dest for next steps', | ||||
|                     'multiple' => true, | ||||
|                     'mapped' => false, | ||||
|                 ]); | ||||
|         } | ||||
|  | ||||
|         if ( | ||||
|             $handler->supportsFreeze($entityWorkflow) | ||||
|             && !$entityWorkflow->isFreeze() | ||||
|         ) { | ||||
|             $builder | ||||
|                 ->add('freezeAfter', CheckboxType::class, [ | ||||
|                     'required' => false, | ||||
|                     'label' => 'workflow.Freeze', | ||||
|                     'help' => 'workflow.The associated element will be freezed', | ||||
|                 ]); | ||||
|         } | ||||
|  | ||||
|         $builder | ||||
|             ->add('comment', ChillTextareaType::class, [ | ||||
|                 'required' => false, | ||||
|                 'label' => 'Comment', | ||||
|             ]); | ||||
|     } | ||||
|  | ||||
|     public function configureOptions(OptionsResolver $resolver) | ||||
|     { | ||||
|         $resolver | ||||
|             ->setDefined('class', EntityWorkflowStep::class) | ||||
|             ->setRequired('transition') | ||||
|             ->setAllowedTypes('transition', 'bool') | ||||
|             ->setRequired('entity_workflow') | ||||
|             ->setAllowedTypes('entity_workflow', EntityWorkflow::class); | ||||
|     } | ||||
| } | ||||
							
								
								
									
										36
									
								
								src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,36 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Form; | ||||
|  | ||||
| use Chill\MainBundle\Entity\Workflow\EntityWorkflow; | ||||
| use Symfony\Component\Form\AbstractType; | ||||
| use Symfony\Component\Form\FormBuilderInterface; | ||||
| use Symfony\Component\OptionsResolver\OptionsResolver; | ||||
|  | ||||
| class WorkflowTransitionType extends AbstractType | ||||
| { | ||||
|     public function buildForm(FormBuilderInterface $builder, array $options) | ||||
|     { | ||||
|         $builder | ||||
|             ->add('current_step', WorkflowStepType::class, [ | ||||
|                 'transition' => true, | ||||
|                 'entity_workflow' => $options['entity_workflow'], | ||||
|             ]); | ||||
|     } | ||||
|  | ||||
|     public function configureOptions(OptionsResolver $resolver) | ||||
|     { | ||||
|         $resolver | ||||
|             ->setRequired('entity_workflow') | ||||
|             ->setAllowedTypes('entity_workflow', EntityWorkflow::class); | ||||
|     } | ||||
| } | ||||
| @@ -50,7 +50,7 @@ class NotificationMailer | ||||
|             $email = new TemplatedEmail(); | ||||
|             $email | ||||
|                 ->to($dest->getEmail()) | ||||
|                 ->subject('Re: [Chill] ' . $comment->getNotification()->getTitle()) | ||||
|                 ->subject('Re: ' . $comment->getNotification()->getTitle()) | ||||
|                 ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.fr.md.twig') | ||||
|                 ->context([ | ||||
|                     'comment' => $comment, | ||||
| @@ -79,11 +79,13 @@ class NotificationMailer | ||||
|                 continue; | ||||
|             } | ||||
|  | ||||
|             $email = new Email(); | ||||
|             $email | ||||
|                 ->subject($notification->getTitle()); | ||||
|  | ||||
|             if ($notification->isSystem()) { | ||||
|                 $email = new Email(); | ||||
|                 $email | ||||
|                     ->text($notification->getMessage()) | ||||
|                     ->subject('[Chill] ' . $notification->getTitle()); | ||||
|                     ->text($notification->getMessage()); | ||||
|             } else { | ||||
|                 $email = new TemplatedEmail(); | ||||
|                 $email | ||||
|   | ||||
| @@ -15,12 +15,15 @@ use Chill\MainBundle\Entity\Notification; | ||||
| use Chill\MainBundle\Entity\User; | ||||
| use Chill\MainBundle\Repository\NotificationRepository; | ||||
| use Symfony\Component\Security\Core\Security; | ||||
| use function array_key_exists; | ||||
|  | ||||
| /** | ||||
|  * Helps to find if a notification exist for a given entity. | ||||
|  */ | ||||
| class NotificationPresence | ||||
| { | ||||
|     private array $cache = []; | ||||
|  | ||||
|     private NotificationRepository $notificationRepository; | ||||
|  | ||||
|     private Security $security; | ||||
| @@ -31,6 +34,29 @@ class NotificationPresence | ||||
|         $this->notificationRepository = $notificationRepository; | ||||
|     } | ||||
|  | ||||
|     public function countNotificationsForClassAndEntity(string $relatedEntityClass, int $relatedEntityId): array | ||||
|     { | ||||
|         if (array_key_exists($relatedEntityClass, $this->cache) && array_key_exists($relatedEntityId, $this->cache[$relatedEntityClass])) { | ||||
|             return $this->cache[$relatedEntityClass][$relatedEntityId]; | ||||
|         } | ||||
|  | ||||
|         $user = $this->security->getUser(); | ||||
|  | ||||
|         if ($user instanceof User) { | ||||
|             $counter = $this->notificationRepository->countNotificationByRelatedEntityAndUserAssociated( | ||||
|                 $relatedEntityClass, | ||||
|                 $relatedEntityId, | ||||
|                 $user | ||||
|             ); | ||||
|  | ||||
|             $this->cache[$relatedEntityClass][$relatedEntityId] = $counter; | ||||
|  | ||||
|             return $counter; | ||||
|         } | ||||
|  | ||||
|         return ['unread' => 0, 'read' => 0]; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return array|Notification[] | ||||
|      */ | ||||
|   | ||||
| @@ -23,6 +23,13 @@ class NotificationTwigExtension extends AbstractExtension | ||||
|                 'needs_environment' => true, | ||||
|                 'is_safe' => ['html'], | ||||
|             ]), | ||||
|             new TwigFunction('chill_count_notifications', [NotificationTwigExtensionRuntime::class, 'countNotificationsFor'], [ | ||||
|                 'is_safe' => [], | ||||
|             ]), | ||||
|             new TwigFunction('chill_counter_notifications', [NotificationTwigExtensionRuntime::class, 'counterNotificationFor'], [ | ||||
|                 'needs_environment' => true, | ||||
|                 'is_safe' => ['html'], | ||||
|             ]), | ||||
|         ]; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -11,17 +11,42 @@ declare(strict_types=1); | ||||
|  | ||||
| namespace Chill\MainBundle\Notification\Templating; | ||||
|  | ||||
| use Chill\MainBundle\Entity\NotificationComment; | ||||
| use Chill\MainBundle\Form\NotificationCommentType; | ||||
| use Chill\MainBundle\Notification\NotificationPresence; | ||||
| use Symfony\Component\Form\FormFactoryInterface; | ||||
| use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | ||||
| use Twig\Environment; | ||||
| use Twig\Extension\RuntimeExtensionInterface; | ||||
|  | ||||
| class NotificationTwigExtensionRuntime implements RuntimeExtensionInterface | ||||
| { | ||||
|     private FormFactoryInterface $formFactory; | ||||
|  | ||||
|     private NotificationPresence $notificationPresence; | ||||
|  | ||||
|     public function __construct(NotificationPresence $notificationPresence) | ||||
|     private UrlGeneratorInterface $urlGenerator; | ||||
|  | ||||
|     public function __construct(FormFactoryInterface $formFactory, NotificationPresence $notificationPresence, UrlGeneratorInterface $urlGenerator) | ||||
|     { | ||||
|         $this->formFactory = $formFactory; | ||||
|         $this->notificationPresence = $notificationPresence; | ||||
|         $this->urlGenerator = $urlGenerator; | ||||
|     } | ||||
|  | ||||
|     public function counterNotificationFor(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $options = []): string | ||||
|     { | ||||
|         return $environment->render( | ||||
|             '@ChillMain/Notification/extension_counter_notifications_for.html.twig', | ||||
|             [ | ||||
|                 'counter' => $this->notificationPresence->countNotificationsForClassAndEntity($relatedEntityClass, $relatedEntityId), | ||||
|             ] | ||||
|         ); | ||||
|     } | ||||
|  | ||||
|     public function countNotificationsFor(string $relatedEntityClass, int $relatedEntityId, array $options = []): array | ||||
|     { | ||||
|         return $this->notificationPresence->countNotificationsForClassAndEntity($relatedEntityClass, $relatedEntityId); | ||||
|     } | ||||
|  | ||||
|     public function listNotificationsFor(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $options = []): string | ||||
| @@ -32,8 +57,24 @@ class NotificationTwigExtensionRuntime implements RuntimeExtensionInterface | ||||
|             return ''; | ||||
|         } | ||||
|  | ||||
|         $appendCommentForms = []; | ||||
|  | ||||
|         foreach ($notifications as $notification) { | ||||
|             $appendComment = new NotificationComment(); | ||||
|             $appendCommentForms[$notification->getId()] = $this->formFactory->create( | ||||
|                 NotificationCommentType::class, | ||||
|                 $appendComment, | ||||
|                 [ | ||||
|                     'action' => $this->urlGenerator->generate( | ||||
|                         'chill_main_notification_show', | ||||
|                         ['id' => $notification->getId()] | ||||
|                     ), | ||||
|                 ] | ||||
|             )->createView(); | ||||
|         } | ||||
|  | ||||
|         return $environment->render('@ChillMain/Notification/extension_list_notifications_for.html.twig', [ | ||||
|             'notifications' => $notifications, | ||||
|             'notifications' => $notifications, 'appendCommentForms' => $appendCommentForms, | ||||
|         ]); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -13,6 +13,7 @@ namespace Chill\MainBundle\Repository; | ||||
|  | ||||
| use Chill\MainBundle\Entity\Notification; | ||||
| use Chill\MainBundle\Entity\User; | ||||
| use Doctrine\DBAL\Statement; | ||||
| use Doctrine\DBAL\Types\Types; | ||||
| use Doctrine\ORM\EntityManagerInterface; | ||||
| use Doctrine\ORM\EntityRepository; | ||||
| @@ -24,6 +25,8 @@ final class NotificationRepository implements ObjectRepository | ||||
| { | ||||
|     private EntityManagerInterface $em; | ||||
|  | ||||
|     private ?Statement $notificationByRelatedEntityAndUserAssociatedStatement = null; | ||||
|  | ||||
|     private EntityRepository $repository; | ||||
|  | ||||
|     public function __construct(EntityManagerInterface $entityManager) | ||||
| @@ -48,6 +51,30 @@ final class NotificationRepository implements ObjectRepository | ||||
|             ->getSingleScalarResult(); | ||||
|     } | ||||
|  | ||||
|     public function countNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user): array | ||||
|     { | ||||
|         if (null === $this->notificationByRelatedEntityAndUserAssociatedStatement) { | ||||
|             $sql = | ||||
|                 'SELECT | ||||
|                    SUM((EXISTS (SELECT 1 AS c FROM chill_main_notification_addresses_unread cmnau WHERE user_id = 1812 and cmnau.notification_id = cmn.id))::int) AS unread, | ||||
|                    SUM((cmn.sender_id = 1812)::int) AS sent, | ||||
|                    COUNT(cmn.*) AS total | ||||
|                 FROM chill_main_notification cmn | ||||
|                 WHERE relatedentityclass = :relatedEntityClass AND relatedentityid = :relatedEntityId AND sender_id IS NOT NULL'; | ||||
|             $this->notificationByRelatedEntityAndUserAssociatedStatement = | ||||
|                 $this->em->getConnection()->prepare($sql); | ||||
|         } | ||||
|  | ||||
|         $results = $this->notificationByRelatedEntityAndUserAssociatedStatement | ||||
|             ->executeQuery(['relatedEntityClass' => $relatedEntityClass, 'relatedEntityId' => $relatedEntityId]); | ||||
|  | ||||
|         $result = $results->fetchAssociative(); | ||||
|  | ||||
|         $results->free(); | ||||
|  | ||||
|         return $result; | ||||
|     } | ||||
|  | ||||
|     public function countUnreadByUser(User $user): int | ||||
|     { | ||||
|         $sql = 'SELECT count(*) AS c FROM chill_main_notification_addresses_unread WHERE user_id = :userId'; | ||||
| @@ -153,11 +180,52 @@ final class NotificationRepository implements ObjectRepository | ||||
|      * @return array|Notification[] | ||||
|      */ | ||||
|     public function findNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user): array | ||||
|     { | ||||
|         return | ||||
|             $this->buildQueryNotificationByRelatedEntityAndUserAssociated($relatedEntityClass, $relatedEntityId, $user) | ||||
|                 ->select('n') | ||||
|                 ->getQuery() | ||||
|                 ->getResult(); | ||||
|     } | ||||
|  | ||||
|     public function findOneBy(array $criteria, ?array $orderBy = null): ?Notification | ||||
|     { | ||||
|         return $this->repository->findOneBy($criteria, $orderBy); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return array|Notification[] | ||||
|      */ | ||||
|     public function findUnreadByUser(User $user, int $limit = 20, int $offset = 0): array | ||||
|     { | ||||
|         $rsm = new Query\ResultSetMappingBuilder($this->em); | ||||
|         $rsm->addRootEntityFromClassMetadata(Notification::class, 'cmn'); | ||||
|  | ||||
|         $sql = 'SELECT ' . $rsm->generateSelectClause(['cmn' => 'cmn']) . ' ' . | ||||
|         'FROM chill_main_notification cmn ' . | ||||
|         'WHERE ' . | ||||
|               'EXISTS (select 1 FROM chill_main_notification_addresses_unread cmnau WHERE cmnau.user_id = :userId and cmnau.notification_id = cmn.id) ' . | ||||
|         'ORDER BY cmn.date DESC ' . | ||||
|         'LIMIT :limit OFFSET :offset'; | ||||
|  | ||||
|         $nq = $this->em->createNativeQuery($sql, $rsm) | ||||
|             ->setParameter('userId', $user->getId()) | ||||
|             ->setParameter('limit', $limit) | ||||
|             ->setParameter('offset', $offset); | ||||
|  | ||||
|         return $nq->getResult(); | ||||
|     } | ||||
|  | ||||
|     public function getClassName() | ||||
|     { | ||||
|         return Notification::class; | ||||
|     } | ||||
|  | ||||
|     private function buildQueryNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user): QueryBuilder | ||||
|     { | ||||
|         $qb = $this->repository->createQueryBuilder('n'); | ||||
|  | ||||
|         $qb | ||||
|             ->select('n') | ||||
|             ->where($qb->expr()->eq('n.relatedEntityClass', ':relatedEntityClass')) | ||||
|             ->andWhere($qb->expr()->eq('n.relatedEntityId', ':relatedEntityId')) | ||||
|             ->andWhere($qb->expr()->isNotNull('n.sender')) | ||||
| @@ -171,17 +239,7 @@ final class NotificationRepository implements ObjectRepository | ||||
|             ->setParameter('relatedEntityId', $relatedEntityId) | ||||
|             ->setParameter('user', $user); | ||||
|  | ||||
|         return $qb->getQuery()->getResult(); | ||||
|     } | ||||
|  | ||||
|     public function findOneBy(array $criteria, ?array $orderBy = null): ?Notification | ||||
|     { | ||||
|         return $this->repository->findOneBy($criteria, $orderBy); | ||||
|     } | ||||
|  | ||||
|     public function getClassName() | ||||
|     { | ||||
|         return Notification::class; | ||||
|         return $qb; | ||||
|     } | ||||
|  | ||||
|     private function queryByAddressee(User $addressee, bool $countQuery = false): QueryBuilder | ||||
|   | ||||
| @@ -0,0 +1,59 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Repository; | ||||
|  | ||||
| use Chill\MainBundle\Entity\ResidentialAddress; | ||||
| use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; | ||||
| use Doctrine\Persistence\ManagerRegistry; | ||||
|  | ||||
| /** | ||||
|  * @method ResidentialAddress|null find($id, $lockMode = null, $lockVersion = null) | ||||
|  * @method ResidentialAddress|null findOneBy(array $criteria, array $orderBy = null) | ||||
|  * @method ResidentialAddress[]    findAll() | ||||
|  * @method ResidentialAddress[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) | ||||
|  */ | ||||
| class ResidentialAddressRepository extends ServiceEntityRepository | ||||
| { | ||||
|     public function __construct(ManagerRegistry $registry) | ||||
|     { | ||||
|         parent::__construct($registry, ResidentialAddress::class); | ||||
|     } | ||||
|  | ||||
|     // /** | ||||
|     //  * @return ResidentialAddress[] Returns an array of ResidentialAddress objects | ||||
|     //  */ | ||||
|     /* | ||||
|     public function findByExampleField($value) | ||||
|     { | ||||
|         return $this->createQueryBuilder('r') | ||||
|             ->andWhere('r.exampleField = :val') | ||||
|             ->setParameter('val', $value) | ||||
|             ->orderBy('r.id', 'ASC') | ||||
|             ->setMaxResults(10) | ||||
|             ->getQuery() | ||||
|             ->getResult() | ||||
|         ; | ||||
|     } | ||||
|      */ | ||||
|  | ||||
|     /* | ||||
|     public function findOneBySomeField($value): ?ResidentialAddress | ||||
|     { | ||||
|         return $this->createQueryBuilder('r') | ||||
|             ->andWhere('r.exampleField = :val') | ||||
|             ->setParameter('val', $value) | ||||
|             ->getQuery() | ||||
|             ->getOneOrNullResult() | ||||
|         ; | ||||
|     } | ||||
|      */ | ||||
| } | ||||
| @@ -0,0 +1,137 @@ | ||||
| <?php | ||||
|  | ||||
| /** | ||||
|  * 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\Repository\Workflow; | ||||
|  | ||||
| use Chill\MainBundle\Entity\User; | ||||
| use Chill\MainBundle\Entity\Workflow\EntityWorkflow; | ||||
| use Doctrine\ORM\EntityManagerInterface; | ||||
| use Doctrine\ORM\EntityRepository; | ||||
| use Doctrine\ORM\QueryBuilder; | ||||
| use Doctrine\Persistence\ObjectRepository; | ||||
|  | ||||
| class EntityWorkflowRepository implements ObjectRepository | ||||
| { | ||||
|     private EntityRepository $repository; | ||||
|  | ||||
|     public function __construct(EntityManagerInterface $entityManager) | ||||
|     { | ||||
|         $this->repository = $entityManager->getRepository(EntityWorkflow::class); | ||||
|     } | ||||
|  | ||||
|     public function countByDest(User $user): int | ||||
|     { | ||||
|         $qb = $this->buildQueryByDest($user)->select('count(ew)'); | ||||
|  | ||||
|         return (int) $qb->getQuery()->getSingleScalarResult(); | ||||
|     } | ||||
|  | ||||
|     public function countBySubscriber(User $user): int | ||||
|     { | ||||
|         $qb = $this->buildQueryBySubscriber($user)->select('count(ew)'); | ||||
|  | ||||
|         return (int) $qb->getQuery()->getSingleScalarResult(); | ||||
|     } | ||||
|  | ||||
|     public function find($id): ?EntityWorkflow | ||||
|     { | ||||
|         return $this->repository->find($id); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return array|EntityWorkflow[] | ||||
|      */ | ||||
|     public function findAll(): array | ||||
|     { | ||||
|         return $this->repository->findAll(); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param null|mixed $limit | ||||
|      * @param null|mixed $offset | ||||
|      * | ||||
|      * @return array|EntityWorkflow[] | ||||
|      */ | ||||
|     public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array | ||||
|     { | ||||
|         return $this->repository->findBy($criteria, $orderBy, $limit, $offset); | ||||
|     } | ||||
|  | ||||
|     public function findByDest(User $user, ?array $orderBy = null, $limit = null, $offset = null): array | ||||
|     { | ||||
|         $qb = $this->buildQueryByDest($user)->select('ew'); | ||||
|  | ||||
|         foreach ($orderBy as $key => $sort) { | ||||
|             $qb->addOrderBy('ew.' . $key, $sort); | ||||
|         } | ||||
|  | ||||
|         $qb->setMaxResults($limit)->setFirstResult($offset); | ||||
|  | ||||
|         return $qb->getQuery()->getResult(); | ||||
|     } | ||||
|  | ||||
|     public function findBySubscriber(User $user, ?array $orderBy = null, $limit = null, $offset = null): array | ||||
|     { | ||||
|         $qb = $this->buildQueryBySubscriber($user)->select('ew'); | ||||
|  | ||||
|         foreach ($orderBy as $key => $sort) { | ||||
|             $qb->addOrderBy('ew.' . $key, $sort); | ||||
|         } | ||||
|  | ||||
|         $qb->setMaxResults($limit)->setFirstResult($offset); | ||||
|  | ||||
|         return $qb->getQuery()->getResult(); | ||||
|     } | ||||
|  | ||||
|     public function findOneBy(array $criteria): ?EntityWorkflow | ||||
|     { | ||||
|         return $this->repository->findOneBy($criteria); | ||||
|     } | ||||
|  | ||||
|     public function getClassName(): string | ||||
|     { | ||||
|         return EntityWorkflow::class; | ||||
|     } | ||||
|  | ||||
|     private function buildQueryByDest(User $user): QueryBuilder | ||||
|     { | ||||
|         $qb = $this->repository->createQueryBuilder('ew'); | ||||
|  | ||||
|         $qb->join('ew.steps', 'step'); | ||||
|  | ||||
|         $qb->where( | ||||
|             $qb->expr()->andX( | ||||
|                 $qb->expr()->isMemberOf(':user', 'step.destUser'), | ||||
|                 $qb->expr()->isNull('step.transitionAfter') | ||||
|             ) | ||||
|         ); | ||||
|  | ||||
|         $qb->setParameter('user', $user); | ||||
|  | ||||
|         return $qb; | ||||
|     } | ||||
|  | ||||
|     private function buildQueryBySubscriber(User $user): QueryBuilder | ||||
|     { | ||||
|         $qb = $this->repository->createQueryBuilder('ew'); | ||||
|  | ||||
|         $qb->where( | ||||
|             $qb->expr()->orX( | ||||
|                 $qb->expr()->isMemberOf(':user', 'ew.subscriberToStep'), | ||||
|                 $qb->expr()->isMemberOf(':user', 'ew.subscriberToFinal'), | ||||
|             ) | ||||
|         ); | ||||
|  | ||||
|         $qb->setParameter('user', $user); | ||||
|  | ||||
|         return $qb; | ||||
|     } | ||||
| } | ||||
| @@ -1,5 +1,5 @@ | ||||
| // Access to Bootstrap variables and mixins | ||||
| @import '~ChillMainAssets/module/bootstrap/shared'; | ||||
| @import 'ChillMainAssets/module/bootstrap/shared'; | ||||
|  | ||||
| // Chill variables | ||||
| @import './scss/chill_variables'; | ||||
| @@ -240,6 +240,10 @@ table.table-bordered { | ||||
|    color: $gray-800; | ||||
|    font-size: 90%; | ||||
|  | ||||
|     p { | ||||
|         margin-bottom: 0.75rem !important; | ||||
|     } | ||||
|  | ||||
|    // test a bottom right decoration (to be confirmed) | ||||
|    &.test { | ||||
|       position: relative; | ||||
| @@ -273,11 +277,17 @@ table.table-bordered { | ||||
|    } | ||||
| } | ||||
|  | ||||
| /// meta-data | ||||
| div.updatedBy, | ||||
| div.metadata { | ||||
|     span.user, span.date { | ||||
|         text-decoration: underline dotted; | ||||
|     } | ||||
| } | ||||
| div.metadata { | ||||
|    font-size: smaller; | ||||
|    color: $gray-600; | ||||
|    span.user, span.date { | ||||
|       text-decoration: underline dotted; | ||||
|       &:hover { | ||||
|          color: $gray-700; | ||||
|       } | ||||
| @@ -318,6 +328,7 @@ dl.definition-inline { | ||||
| .custom_field_no_data, | ||||
| .chill-no-data-statement { | ||||
|    font-style: italic; | ||||
|    font-size: 90%; | ||||
| } | ||||
|  | ||||
| /// flash | ||||
| @@ -419,7 +430,64 @@ span.item-key { | ||||
|     //text-decoration: dotted underline; | ||||
| } | ||||
|  | ||||
| /// Workflows | ||||
| div.workflow { | ||||
|     section.step { | ||||
|         border: 1px solid $chill-l-gray; | ||||
|         padding: 1em 2em; | ||||
|         div.flex-table { | ||||
|             margin: 1.5em -2em; | ||||
|         } | ||||
|     } | ||||
|     div.to-decision, | ||||
|     div.decided { | ||||
|         font-variant: all-small-caps; | ||||
|         margin-left: 1em; | ||||
|     } | ||||
|     div.to-decision { | ||||
|         font-weight: 300; | ||||
|     } | ||||
|     div.decided { | ||||
|         font-weight: 600; | ||||
|     } | ||||
|     div.breadcrumb { | ||||
|         display: initial; | ||||
|         margin-bottom: 0; | ||||
|         padding-right: 0.5em; | ||||
|         background-color: tint-color($chill-yellow, 90%); | ||||
|         border: 1px solid $chill-yellow; | ||||
|         color: $primary; | ||||
|         border-radius: 1.5em; | ||||
|         font-size: 12pt; | ||||
|         font-weight: 500; | ||||
|         font-variant: small-caps; | ||||
|         span, a { | ||||
|             cursor: pointer; | ||||
|             text-decoration: none; | ||||
|             &:hover { | ||||
|                 font-weight: 700; | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| // Override bootstrap popover styles | ||||
| div.popover { | ||||
|     box-shadow: 0 0 10px -5px $dark; | ||||
|     z-index: 9999; | ||||
|     .popover-arrow {} | ||||
|     .popover-header {} | ||||
|     .popover-body {} | ||||
|  | ||||
|     // Specific worflow breadcrumb popover | ||||
|     &.workflow-transition { | ||||
|         .popover-header { | ||||
|             font-variant: small-caps; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| // increase toast message z-index (above all modals) | ||||
| div.v-toast { | ||||
|    z-index: 10000!important; | ||||
| } | ||||
| } | ||||
|   | ||||
| @@ -12,6 +12,7 @@ | ||||
|         display: block; | ||||
|         top: calc(50% - 7px); | ||||
|         right: 10px; | ||||
|         line-height: 11px; | ||||
|     } | ||||
| } | ||||
|  | ||||
| @@ -62,14 +63,19 @@ ul.list-suggest { | ||||
|             & span:hover { | ||||
|                 color: $chill-l-gray; | ||||
|             } | ||||
|             .person-text { | ||||
|                 span { | ||||
|                     padding-left: 0px; | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|     &.remove-items { | ||||
|         li { | ||||
|             position: relative; | ||||
|             span { | ||||
|             & > span { | ||||
|                 display: block; | ||||
|                 padding-right: .75rem; | ||||
|                 padding-right: 1.75rem; | ||||
|                 @include remove_link; | ||||
|             } | ||||
|         } | ||||
|   | ||||
| @@ -18,10 +18,13 @@ $chill-theme-buttons: ( | ||||
|    "show":          $chill-blue, | ||||
|    "view":          $chill-blue, | ||||
|    "misc":          $gray-300, | ||||
|    "download":      $gray-300, | ||||
|    "cancel":        $gray-300, | ||||
|    "choose":        $gray-300, | ||||
|    "notify":        $gray-300, | ||||
|    "notify":        $chill-blue, | ||||
|    "search":        $gray-300, | ||||
|    "unlink":        $chill-red, | ||||
|    "tpchild":       $chill-pink, | ||||
| ); | ||||
|  | ||||
| @each $button, $color in $chill-theme-buttons { | ||||
| @@ -50,6 +53,7 @@ $chill-theme-buttons: ( | ||||
|    &.btn-unlink, | ||||
|    &.btn-action, | ||||
|    &.btn-edit, | ||||
|    &.btn-tpchild, | ||||
|    &.btn-update { | ||||
|        &, &:hover { | ||||
|           color: $light; | ||||
| @@ -75,6 +79,9 @@ $chill-theme-buttons: ( | ||||
|    &.btn-remove::before, | ||||
|    &.btn-choose::before, | ||||
|    &.btn-notify::before, | ||||
|    &.btn-tpchild::before, | ||||
|    &.btn-download::before, | ||||
|    &.btn-search::before, | ||||
|    &.btn-cancel::before { | ||||
|       font: normal normal normal 14px/1 ForkAwesome; | ||||
|       margin-right: 0.5em; | ||||
| @@ -101,6 +108,9 @@ $chill-theme-buttons: ( | ||||
|    &.btn-choose::before    { content: "\f00c"; } // fa-check  // f046 fa-check-square-o | ||||
|    &.btn-unlink::before    { content: "\f127"; } // fa-chain-broken | ||||
|    &.btn-notify::before    { content: "\f1d8"; } // fa-paper-plane | ||||
|    &.btn-tpchild::before   { content: "\f007"; } // fa-user | ||||
|    &.btn-download::before  { content: "\f019"; } // fa-download | ||||
|    &.btn-search::before    { content: "\f002"; } // fa-search | ||||
| } | ||||
|  | ||||
|  | ||||
| @@ -126,3 +136,18 @@ $chill-theme-buttons: ( | ||||
| .btn-sm, .btn-group-sm > .btn { | ||||
|    min-width: 36px; | ||||
| } | ||||
|  | ||||
| // Homepage special fast action buttons | ||||
| div.sticky-buttons { | ||||
|     position: fixed; | ||||
|     bottom: 3em; | ||||
|     right: 2em; | ||||
|     .btn-circle { | ||||
|         width: 50px; height: 50px; | ||||
|         border-radius: 50%; | ||||
|         text-align: center; | ||||
|         padding: 0.45rem 0.7rem; | ||||
|         display: block; | ||||
|         margin-bottom: 0.5rem; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -41,6 +41,15 @@ div.flex-table { | ||||
|             margin-right: 5px; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     div.item-meta { | ||||
|         flex-grow: 1 !important; | ||||
|         flex-shrink: 1 !important; | ||||
|         width: unset !important; | ||||
|         display: flex; | ||||
|         flex-direction: column; | ||||
|         justify-content: center; | ||||
|     } | ||||
| } | ||||
|  | ||||
| /* | ||||
|   | ||||
| @@ -36,27 +36,57 @@ div.notification { | ||||
| div.notification-list, | ||||
| div.notification-show { | ||||
|     div.item-bloc { | ||||
|         div.item-row.header { | ||||
|  | ||||
|             div.item-col { | ||||
|                 &:first-child { | ||||
|                     flex-grow: 1; | ||||
|         div.item-row { | ||||
|             &.notification-header { | ||||
|                 div.item-col { | ||||
|                     &:first-child { | ||||
|                         flex-grow: 1; | ||||
|  | ||||
|                     } | ||||
|                     &:last-child { | ||||
|                         flex-grow: 0; | ||||
|                     } | ||||
|                 } | ||||
|                 &:last-child { | ||||
|                     flex-grow: 0; | ||||
|                 ul.small_in_title { | ||||
|                     list-style-type: circle; | ||||
|                     li { | ||||
|                         span.item-key { | ||||
|                             display: inline-block; | ||||
|                             width: 3em; | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             ul.small_in_title { | ||||
|                 list-style-type: circle; | ||||
|                 li { | ||||
|                     span.item-key { | ||||
|                         display: inline-block; | ||||
|                         width: 3em; | ||||
|                     } | ||||
|             div.notification-content { | ||||
|                 margin: 1.5rem; | ||||
|                 p { | ||||
|                     margin-bottom: 0.75rem; | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| // Override bootstrap accordion | ||||
| div#workflow-fold, | ||||
| div#notification-fold { | ||||
|     .accordion-button { | ||||
|         padding: 0; | ||||
|         background-color: unset; | ||||
|         &:not(.collapsed) { | ||||
|             background-color: unset; | ||||
|             box-shadow: unset; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| // Counter | ||||
| div.notification-counter { | ||||
|     span { | ||||
|         &:not(:first-child) { | ||||
|             &::before { | ||||
|                 content: '/ '; | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -106,6 +106,8 @@ section.chill-entity { | ||||
|     // used for comment-embeddable | ||||
|     &.entity-comment-embeddable { | ||||
|         width: 100%; | ||||
|          | ||||
|         /* already defined !! | ||||
|         div.metadata { | ||||
|             font-size: smaller; | ||||
|             color: $gray-600; | ||||
| @@ -116,5 +118,6 @@ section.chill-entity { | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         */ | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -0,0 +1,12 @@ | ||||
| const buildLinkCreate = function(workflowName, relatedEntityClass, relatedEntityId) { | ||||
|     let params = new URLSearchParams(); | ||||
|     params.set('entityClass', relatedEntityClass); | ||||
|     params.set('entityId', relatedEntityId); | ||||
|     params.set('workflow', workflowName); | ||||
|  | ||||
|     return `/fr/main/workflow/create?`+params.toString(); | ||||
| }; | ||||
|  | ||||
| export { | ||||
|     buildLinkCreate, | ||||
| }; | ||||
| @@ -1,19 +1,19 @@ | ||||
| /** | ||||
|  * Create a control to show or hide values | ||||
|  *  | ||||
|  * | ||||
|  * Possible options are: | ||||
|  *  | ||||
|  * | ||||
|  *  - froms: an Element, an Array of Element, or a NodeList. A | ||||
|  *    listener will be attached to **all** input of those elements | ||||
|  *    and will trigger the check on changes | ||||
|  *  - test: a function which will test the element and will return true  | ||||
|  *  - test: a function which will test the element and will return true | ||||
|  *    if the content must be shown, false if it must be hidden. | ||||
|  *    The function will receive the `froms` as first argument, and the  | ||||
|  *    The function will receive the `froms` as first argument, and the | ||||
|  *    event as second argument. | ||||
|  *  - container: an Element, an Array of Element, or a Node List. The  | ||||
|  *  - container: an Element, an Array of Element, or a Node List. The | ||||
|  *    child nodes will be hidden / shown inside this container | ||||
|  *  - event_name: the name of the event to listen to. `'change'` by default. | ||||
|  *  | ||||
|  * | ||||
|  * @param object options | ||||
|  */ | ||||
| var ShowHide = function(options) { | ||||
| @@ -26,8 +26,10 @@ var ShowHide = function(options) { | ||||
|         container_content = [], | ||||
|         debug = 'debug' in options ? options.debug : false, | ||||
|         load_event = 'load_event' in options ? options.load_event : 'load', | ||||
|         id = 'uid' in options ? options.id : Math.random(); | ||||
|      | ||||
|         id = 'uid' in options ? options.id : Math.random(), | ||||
|         toggle_callback = 'toggle_callback' in options ? options.toggle_callback : null | ||||
|     ; | ||||
|  | ||||
|     var bootstrap = function(event) { | ||||
|         if (debug) { | ||||
|             console.log('debug is activated on this show-hide', this); | ||||
| @@ -43,10 +45,10 @@ var ShowHide = function(options) { | ||||
|  | ||||
|         // attach the listener on each input | ||||
|         for (let f of froms.values()) { | ||||
|             let  | ||||
|                 inputs = f.querySelectorAll('input'),  | ||||
|             let | ||||
|                 inputs = f.querySelectorAll('input'), | ||||
|                 selects = f.querySelectorAll('select'); | ||||
|          | ||||
|  | ||||
|             for (let input of inputs.values()) { | ||||
|                 if (debug) { | ||||
|                     console.log('attaching event to input', input); | ||||
| @@ -66,10 +68,10 @@ var ShowHide = function(options) { | ||||
|         } | ||||
|  | ||||
|         // first launch of the show/hide | ||||
|         onChange(event);     | ||||
|         onChange(event); | ||||
|     }; | ||||
|  | ||||
|      | ||||
|  | ||||
|     var onChange = function (event) { | ||||
|         var result = test(froms, event), me; | ||||
|  | ||||
| @@ -88,45 +90,53 @@ var ShowHide = function(options) { | ||||
|         } else { | ||||
|             throw "the result of test is not a boolean"; | ||||
|         } | ||||
|          | ||||
|  | ||||
|     }; | ||||
|      | ||||
|  | ||||
|     var forceHide = function() { | ||||
|         if (debug) { | ||||
|             console.log('force hide'); | ||||
|         } | ||||
|         for (let contents of container_content.values()) { | ||||
|             for (let el of contents.values()) { | ||||
|                 el.remove(); | ||||
|         if (toggle_callback !== null) { | ||||
|             toggle_callback(container, 'hide'); | ||||
|         } else { | ||||
|             for (let contents of container_content.values()) { | ||||
|                 for (let el of contents.values()) { | ||||
|                     el.remove(); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         is_shown = false; | ||||
|     }; | ||||
|      | ||||
|  | ||||
|     var forceShow = function() { | ||||
|         if (debug) { | ||||
|             console.log('show'); | ||||
|         } | ||||
|         for (let i of container_content.keys()) { | ||||
|             var contents = container_content[i]; | ||||
|             for (let el of contents.values()) { | ||||
|                 container[i].appendChild(el); | ||||
|         if (toggle_callback !== null) { | ||||
|             toggle_callback(container, 'show'); | ||||
|         } else { | ||||
|             for (let i of container_content.keys()) { | ||||
|                 var contents = container_content[i]; | ||||
|                 for (let el of contents.values()) { | ||||
|                     container[i].appendChild(el); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         is_shown = true; | ||||
|     }; | ||||
|      | ||||
|  | ||||
|     var forceCompute = function(event) { | ||||
|         onChange(event); | ||||
|     }; | ||||
|      | ||||
|      | ||||
|  | ||||
|  | ||||
|     if (load_event !== null) { | ||||
|         window.addEventListener('load', bootstrap); | ||||
|     } else { | ||||
|         bootstrap(null); | ||||
|     } | ||||
|      | ||||
|  | ||||
|     return { | ||||
|         forceHide: forceHide, | ||||
|         forceShow: forceShow, | ||||
|   | ||||
| @@ -1,21 +1,19 @@ | ||||
| require('./blur.scss'); | ||||
|  | ||||
| var toggleBlur =  function(e){ | ||||
|  | ||||
|     var btn = e.target; | ||||
|  | ||||
|     btn.previousElementSibling.classList.toggle("blur"); | ||||
|     btn.classList.toggle("fa-eye"); | ||||
|     btn.classList.toggle("fa-eye-slash"); | ||||
|  | ||||
| } | ||||
|  | ||||
| var infos = document.getElementsByClassName("confidential"); | ||||
| for(var i=0; i < infos.length; i++){ | ||||
|     infos[i].insertAdjacentHTML('beforeend', '<i class="fa fa-eye toggle" aria-hidden="true"></i>'); | ||||
| } | ||||
|  | ||||
| var toggles = document.getElementsByClassName("toggle"); | ||||
| for(var i=0; i < toggles.length; i++){ | ||||
|     toggles[i].addEventListener("click", toggleBlur); | ||||
| } | ||||
| document.querySelectorAll('.confidential').forEach(function (el) { | ||||
|     let i = document.createElement('i'); | ||||
|     const classes = ['fa', 'fa-eye', 'toggle']; | ||||
|     i.classList.add(...classes); | ||||
|     el.appendChild(i); | ||||
|     const toggleBlur = function(e) { | ||||
|         for (let child of el.children) { | ||||
|             if (!child.classList.contains('toggle')) { | ||||
|                 child.classList.toggle('blur'); | ||||
|             } | ||||
|         } | ||||
|         i.classList.toggle('fa-eye'); | ||||
|         i.classList.toggle('fa-eye-slash'); | ||||
|     } | ||||
|     i.addEventListener('click', toggleBlur); | ||||
|     toggleBlur(); | ||||
| }); | ||||
|   | ||||
| @@ -9,9 +9,10 @@ import Dropdown from 'bootstrap/js/src/dropdown'; | ||||
| import Modal from 'bootstrap/js/dist/modal'; | ||||
| import Collapse from 'bootstrap/js/src/collapse'; | ||||
| import Carousel from 'bootstrap/js/src/carousel'; | ||||
| import Popover from 'bootstrap/js/src/popover'; | ||||
|  | ||||
| // | ||||
| // ACHeaderSlider is a small slider used in banner of AccompanyingCourse Section | ||||
| // Carousel: ACHeaderSlider is a small slider used in banner of AccompanyingCourse Section | ||||
| // Initialize options, and show/hide controls in first/last slides | ||||
| // | ||||
| let ACHeaderSlider = document.querySelector('#ACHeaderSlider'); | ||||
| @@ -48,3 +49,14 @@ if (ACHeaderSlider) { | ||||
|         } | ||||
|     }) | ||||
| } | ||||
|  | ||||
| // | ||||
| // Popover: used in workflow breadcrumb, | ||||
| // (expected in: contextual help, notification-box, workflow-box ) | ||||
| // | ||||
| const triggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]')); | ||||
| const popoverList = triggerList.map(function (el) { | ||||
|     return new Popover(el, { | ||||
|         html: true, | ||||
|     }); | ||||
| }); | ||||
| @@ -0,0 +1,34 @@ | ||||
| import { createApp } from "vue"; | ||||
| import ListWorkflowModalVue from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue'; | ||||
| import { _createI18n } from "ChillMainAssets/vuejs/_js/i18n"; | ||||
|  | ||||
| const i18n = _createI18n({}); | ||||
|  | ||||
| // list workflow | ||||
| document.querySelectorAll('[data-list-workflows]') | ||||
|     .forEach(function (el) { | ||||
|         const app = { | ||||
|             components: { | ||||
|                 ListWorkflowModalVue, | ||||
|             }, | ||||
|             template: | ||||
|                 '<list-workflow-modal-vue ' + | ||||
|                     ':workflows="workflows" ' + | ||||
|                     ':allowCreate="allowCreate" ' + | ||||
|                     ':relatedEntityClass="relatedEntityClass" ' + | ||||
|                     ':relatedEntityId="relatedEntityId" ' + | ||||
|                     ':workflowsAvailables="workflowsAvailables" ' + | ||||
|                 '></list-workflow-modal-vue>', | ||||
|             data() { | ||||
|                 return { | ||||
|                     workflows: JSON.parse(el.dataset.workflows), | ||||
|                     allowCreate: el.dataset.allowCreate === "1", | ||||
|                     relatedEntityClass: el.dataset.relatedEntityClass, | ||||
|                     relatedEntityId: Number.parseInt(el.dataset.relatedEntityId), | ||||
|                     workflowsAvailables: JSON.parse(el.dataset.workflowsAvailables), | ||||
|                 } | ||||
|             } | ||||
|         }; | ||||
|         createApp(app).use(i18n).mount(el); | ||||
|     }) | ||||
| ; | ||||
| @@ -0,0 +1,32 @@ | ||||
| import {createApp} from "vue"; | ||||
| import EntityWorkflowVueSubscriber from 'ChillMainAssets/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue'; | ||||
| import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'; | ||||
| import { appMessages } from 'ChillMainAssets/vuejs/PickEntity/i18n'; | ||||
|  | ||||
| const i18n = _createI18n(appMessages); | ||||
|  | ||||
| let containers = document.querySelectorAll('[data-entity-workflow-subscribe]'); | ||||
|  | ||||
| containers.forEach(container => { | ||||
|     let app = { | ||||
|         components: { | ||||
|             EntityWorkflowVueSubscriber, | ||||
|         }, | ||||
|         template: '<entity-workflow-vue-subscriber :entityWorkflowId="this.entityWorkflowId" :subscriberStep="this.subscriberStep" :subscriberFinal="this.subscriberFinal" @subscriptionUpdated="onUpdate"></entity-workflow-vue-subscriber>', | ||||
|         data() { | ||||
|             return { | ||||
|                 entityWorkflowId: Number.parseInt(container.dataset.entityWorkflowId), | ||||
|                 subscriberStep: container.dataset.subscribeStep === "1", | ||||
|                 subscriberFinal: container.dataset.subscribeFinal === "1", | ||||
|             } | ||||
|         }, | ||||
|         methods: { | ||||
|             onUpdate(status) { | ||||
|                this.subscriberStep = status.step; | ||||
|                this.subscriberFinal = status.final; | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     createApp(app).use(i18n).mount(container); | ||||
| }) | ||||
| @@ -6,7 +6,7 @@ const i18n = _createI18n({}); | ||||
|  | ||||
| window.addEventListener('DOMContentLoaded', function (e) { | ||||
|     document.querySelectorAll('.notification_toggle_read_status') | ||||
|         .forEach(function (el) { | ||||
|         .forEach(function (el, i) { | ||||
|             createApp({ | ||||
|                 template: '<notification-read-toggle ' + | ||||
|                     ':notificationId="notificationId" ' + | ||||
| @@ -26,13 +26,25 @@ window.addEventListener('DOMContentLoaded', function (e) { | ||||
|                         buttonNoText: 'false' === el.dataset.buttonText, | ||||
|                         showUrl: el.dataset.showButtonUrl, | ||||
|                         isRead: 1 === +el.dataset.notificationCurrentIsRead, | ||||
|                         container: el.dataset.container | ||||
|                     } | ||||
|                 }, | ||||
|                 computed: { | ||||
|                     getContainer() { | ||||
|                         return document.querySelectorAll('div.' + this.container); | ||||
|                     } | ||||
|                 }, | ||||
|                 methods: { | ||||
|                     onMarkRead() { | ||||
|                         if (typeof this.getContainer[i] !== 'undefined') { | ||||
|                             this.getContainer[i].classList.replace('read', 'unread'); | ||||
|                         } else { throw 'data-container attribute is missing' } | ||||
|                         this.isRead = false; | ||||
|                     }, | ||||
|                     onMarkUnread() { | ||||
|                         if (typeof this.getContainer[i] !== 'undefined') { | ||||
|                             this.getContainer[i].classList.replace('unread', 'read'); | ||||
|                         } else { throw 'data-container attribute is missing' } | ||||
|                         this.isRead = true; | ||||
|                     }, | ||||
|                 } | ||||
| @@ -40,4 +52,4 @@ window.addEventListener('DOMContentLoaded', function (e) { | ||||
|             .use(i18n) | ||||
|             .mount(el); | ||||
|         }); | ||||
| }) | ||||
| }); | ||||
|   | ||||
| @@ -5,18 +5,27 @@ import { appMessages } from 'ChillMainAssets/vuejs/PickEntity/i18n'; | ||||
|  | ||||
| const i18n = _createI18n(appMessages); | ||||
|  | ||||
| window.addEventListener('DOMContentLoaded', function(e) { | ||||
| let appsOnPage = new Map(); | ||||
|  | ||||
|     let apps = document.querySelectorAll('[data-module="pick-dynamic"]'); | ||||
| function loadDynamicPicker(element) { | ||||
|  | ||||
|     let apps = element.querySelectorAll('[data-module="pick-dynamic"]'); | ||||
|  | ||||
|     apps.forEach(function(el) { | ||||
|  | ||||
|         const | ||||
|             isMultiple = parseInt(el.dataset.multiple) === 1, | ||||
|             input = document.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'), | ||||
|             picked = isMultiple ? JSON.parse(input.value) : [JSON.parse(input.value)]; | ||||
|             uniqId = el.dataset.uniqid, | ||||
|             input = element.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'), | ||||
|             picked = (isMultiple) ? (JSON.parse(input.value)) : ((input.value === '[]') ? (null) : ([JSON.parse(input.value)])); | ||||
|  | ||||
|         createApp({ | ||||
|         if (!isMultiple) { | ||||
|             if (input.value === '[]'){ | ||||
|                 input.value = null; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         const app = createApp({ | ||||
|             template: '<pick-entity ' + | ||||
|                 ':multiple="multiple" ' + | ||||
|                 ':types="types" ' + | ||||
| @@ -31,7 +40,7 @@ window.addEventListener('DOMContentLoaded', function(e) { | ||||
|                 return { | ||||
|                     multiple: isMultiple, | ||||
|                     types: JSON.parse(el.dataset.types), | ||||
|                     picked, | ||||
|                     picked: picked === null ? [] : picked, | ||||
|                     uniqid: el.dataset.uniqid, | ||||
|                 } | ||||
|             }, | ||||
| @@ -65,5 +74,36 @@ window.addEventListener('DOMContentLoaded', function(e) { | ||||
|         }) | ||||
|         .use(i18n) | ||||
|         .mount(el); | ||||
|  | ||||
|         appsOnPage.set(uniqId, app); | ||||
|     }); | ||||
| }); | ||||
| } | ||||
|  | ||||
|  | ||||
| document.addEventListener('show-hide-show', function(e) { | ||||
|     console.log('creation event caught') | ||||
|     loadDynamicPicker(e.detail.container) | ||||
| }) | ||||
|  | ||||
| document.addEventListener('show-hide-hide', function(e) { | ||||
|     console.log('hiding event caught') | ||||
|     e.detail.container.querySelectorAll('[data-module="pick-dynamic"]').forEach((el) => { | ||||
|         let uniqId = el.dataset.uniqid; | ||||
|         console.log(uniqId); | ||||
|         if (appsOnPage.has(uniqId)) { | ||||
|             appsOnPage.get(uniqId).unmount(); | ||||
|             console.log('App has been unmounted') | ||||
|             appsOnPage.delete(uniqId); | ||||
|         } | ||||
|     }) | ||||
| }) | ||||
|  | ||||
| document.addEventListener('DOMContentLoaded', function(e) { | ||||
|     console.log('loaded event', e) | ||||
|     loadDynamicPicker(document) | ||||
| }) | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -0,0 +1,29 @@ | ||||
| import { createApp } from 'vue'; | ||||
| import OpenWopiLink from 'ChillMainAssets/vuejs/_components/OpenWopiLink'; | ||||
| import {_createI18n} from "ChillMainAssets/vuejs/_js/i18n"; | ||||
|  | ||||
| const i18n = _createI18n({}); | ||||
|  | ||||
| window.addEventListener('DOMContentLoaded', function (e) { | ||||
|     document.querySelectorAll('span[data-module="wopi-link"]') | ||||
|         .forEach(function (el) { | ||||
|             createApp({ | ||||
|                 template: '<open-wopi-link :wopiUrl="wopiUrl" :title="title" :type="type" :button="button"></open-wopi-link>', | ||||
|                 components: { | ||||
|                     OpenWopiLink | ||||
|                 }, | ||||
|                 data() { | ||||
|                     return { | ||||
|                         wopiUrl: el.dataset.wopiUrl, | ||||
|                         title: el.dataset.docTitle, | ||||
|                         type: el.dataset.docType, | ||||
|                         button: el.dataset.button ? JSON.parse(el.dataset.button) : {} | ||||
|                     } | ||||
|                 } | ||||
|             }) | ||||
|             .use(i18n) | ||||
|             .mount(el) | ||||
|             ; | ||||
|         }) | ||||
|     ; | ||||
| }); | ||||
| @@ -0,0 +1,16 @@ | ||||
| import { createApp } from 'vue'; | ||||
| import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'; | ||||
| import { appMessages } from 'ChillMainAssets/vuejs/HomepageWidget/js/i18n'; | ||||
| import { store } from 'ChillMainAssets/vuejs/HomepageWidget/js/store'; | ||||
| import App from 'ChillMainAssets/vuejs/HomepageWidget/App'; | ||||
|  | ||||
| const i18n = _createI18n(appMessages); | ||||
|  | ||||
| const app = createApp({ | ||||
|     template: `<app></app>`, | ||||
| }) | ||||
| .use(store) | ||||
| .use(i18n) | ||||
| .component('app', App) | ||||
| .mount('#homepage_widget') | ||||
| ; | ||||
| @@ -0,0 +1,75 @@ | ||||
| import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js'; | ||||
|  | ||||
| window.addEventListener('DOMContentLoaded', function() { | ||||
|     let | ||||
|         divTransitions = document.querySelector('#transitions'), | ||||
|         futureDestUsersContainer = document.querySelector('#futureDestUsers') | ||||
|     ; | ||||
|  | ||||
|     if (null !== divTransitions) { | ||||
|         new ShowHide({ | ||||
|             load_event: null, | ||||
|             froms: [divTransitions], | ||||
|             container: [futureDestUsersContainer], | ||||
|             test: function(divs, arg2, arg3) { | ||||
|                 for (let div of divs) { | ||||
|                     for (let input of div.querySelectorAll('input')) { | ||||
|                         if (input.checked) { | ||||
|                             if (input.dataset.toFinal === "1") { | ||||
|                                 return false; | ||||
|                             } else { | ||||
|                                 return true; | ||||
|                             } | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|  | ||||
|                 return true; | ||||
|             }, | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     let | ||||
|         transitionFilterContainer = document.querySelector('#transitionFilter'), | ||||
|         transitions = document.querySelector('#transitions') | ||||
|     ; | ||||
|  | ||||
|     if (null !== transitionFilterContainer) { | ||||
|         transitions.querySelectorAll('.form-check').forEach(function(row) { | ||||
|  | ||||
|             const isForward = row.querySelector('input').dataset.isForward; | ||||
|             console.log(row); | ||||
|             console.log(isForward); | ||||
|  | ||||
|             new ShowHide({ | ||||
|                 load_event: null, | ||||
|                 froms: [transitionFilterContainer], | ||||
|                 container: row, | ||||
|                 test: function (containers) { | ||||
|                     for (let container of containers) { | ||||
|                         for (let input of container.querySelectorAll('input')) { | ||||
|                             if (input.checked) { | ||||
|                                 return isForward === input.value; | ||||
|                             } | ||||
|                         } | ||||
|                     } | ||||
|                 }, | ||||
|                 toggle_callback: function (c, dir) { | ||||
|                     for (let div of c) { | ||||
|                         let input = div.querySelector('input'); | ||||
|                         if ('hide' === dir) { | ||||
|                             input.checked = false; | ||||
|                             input.disabled = true; | ||||
|                         } else { | ||||
|                             input.disabled = false; | ||||
|                         } | ||||
|                     } | ||||
|                 }, | ||||
|             }); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| }); | ||||
| @@ -562,6 +562,7 @@ export default { | ||||
|          this.entity.loaded.cities = []; | ||||
|          this.entity.loaded.countries = []; | ||||
|  | ||||
|          this.entity.selected.confidential = this.context.edit ? this.entity.address.confidential : false; | ||||
|          this.entity.selected.isNoAddress = (this.context.edit && this.entity.address.text === '') ? true : false; | ||||
|  | ||||
|          this.entity.selected.country = this.context.edit ? this.entity.address.country : {}; | ||||
| @@ -593,6 +594,7 @@ export default { | ||||
|       { | ||||
|          console.log('apply changes'); | ||||
|          let newAddress = { | ||||
|             'confidential': this.entity.selected.confidential, | ||||
|             'isNoAddress': this.entity.selected.isNoAddress, | ||||
|             'street': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.street, | ||||
|             'streetNumber': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.streetNumber, | ||||
|   | ||||
| @@ -6,7 +6,6 @@ | ||||
|             <input class="form-control" | ||||
|             type="text" | ||||
|             name="floor" | ||||
|             maxlength=16 | ||||
|             :placeholder="$t('floor')" | ||||
|             v-model="floor"/> | ||||
|             <label for="floor">{{ $t('floor') }}</label> | ||||
| @@ -15,7 +14,6 @@ | ||||
|             <input class="form-control" | ||||
|             type="text" | ||||
|             name="corridor" | ||||
|             maxlength=16 | ||||
|             :placeholder="$t('corridor')" | ||||
|             v-model="corridor"/> | ||||
|             <label for="corridor">{{ $t('corridor') }}</label> | ||||
| @@ -24,7 +22,6 @@ | ||||
|             <input class="form-control" | ||||
|             type="text" | ||||
|             name="steps" | ||||
|             maxlength=16 | ||||
|             :placeholder="$t('steps')" | ||||
|             v-model="steps"/> | ||||
|             <label for="steps">{{ $t('steps') }}</label> | ||||
| @@ -33,7 +30,6 @@ | ||||
|             <input class="form-control" | ||||
|             type="text" | ||||
|             name="flat" | ||||
|             maxlength=16 | ||||
|             :placeholder="$t('flat')" | ||||
|             v-model="flat"/> | ||||
|             <label for="flat">{{ $t('flat') }}</label> | ||||
|   | ||||
| @@ -17,12 +17,22 @@ | ||||
|       <div class="row my-3"> | ||||
|          <div class="col-lg-6"> | ||||
|  | ||||
|             <div class="form-check"> | ||||
|                <input type="checkbox" | ||||
|                   class="form-check-input" | ||||
|                   id="isConfidential" | ||||
|                   v-model="isConfidential" | ||||
|                   :value="valueConfidential" /> | ||||
|                <label class="form-check-label" for="isConfidential"> | ||||
|                   {{ $t('isConfidential') }} | ||||
|                </label> | ||||
|             </div> | ||||
|             <div class="form-check"> | ||||
|                <input type="checkbox" | ||||
|                   class="form-check-input" | ||||
|                   id="isNoAddress" | ||||
|                   v-model="isNoAddress" | ||||
|                   v-bind:value="value" /> | ||||
|                   :value="value" /> | ||||
|                <label class="form-check-label" for="isNoAddress"> | ||||
|                   {{ $t('isNoAddress') }} | ||||
|                </label> | ||||
| @@ -118,7 +128,8 @@ export default { | ||||
|    emits: ['getCities', 'getReferenceAddresses'], | ||||
|    data() { | ||||
|       return { | ||||
|          value: false | ||||
|          value: false, | ||||
|          valueConfidential: false, | ||||
|       } | ||||
|    }, | ||||
|    computed: { | ||||
| @@ -134,6 +145,14 @@ export default { | ||||
|       addressMap() { | ||||
|          return this.entity.addressMap; | ||||
|       }, | ||||
|       isConfidential: { | ||||
|          set(value) { | ||||
|             this.entity.selected.confidential = value; | ||||
|          }, | ||||
|          get() { | ||||
|             return this.entity.selected.confidential; | ||||
|          } | ||||
|       }, | ||||
|       isNoAddress: { | ||||
|          set(value) { | ||||
|             console.log('isNoAddress value', value); | ||||
|   | ||||
| @@ -18,6 +18,7 @@ const addressMessages = { | ||||
|         other_address: 'Autre adresse', | ||||
|         create_address: 'Adresse inconnue. Cliquez ici pour créer une nouvelle adresse', | ||||
|         isNoAddress: 'Pas d\'adresse complète', | ||||
|         isConfidential: 'Adresse confidentielle', | ||||
|         street: 'Nom de rue', | ||||
|         streetNumber: 'Numéro', | ||||
|         floor: 'Étage', | ||||
|   | ||||
| @@ -0,0 +1,140 @@ | ||||
| <template> | ||||
|     | ||||
|    <h2>{{ $t('main_title') }}</h2> | ||||
|     | ||||
|    <ul class="nav nav-tabs"> | ||||
|       <li class="nav-item"> | ||||
|          <a class="nav-link" | ||||
|             :class="{'active': activeTab === 'MyCustoms'}" | ||||
|             @click="selectTab('MyCustoms')"> | ||||
|             <i class="fa fa-dashboard"></i> | ||||
|          </a> | ||||
|       </li> | ||||
|       <li class="nav-item"> | ||||
|          <a class="nav-link" | ||||
|             :class="{'active': activeTab === 'MyNotifications'}" | ||||
|             @click="selectTab('MyNotifications')"> | ||||
|             {{ $t('my_notifications.tab') }} | ||||
|             <tab-counter :count="state.notifications.count"></tab-counter> | ||||
|          </a> | ||||
|       </li> | ||||
|       <li class="nav-item"> | ||||
|          <a class="nav-link" | ||||
|             :class="{'active': activeTab === 'MyAccompanyingCourses'}" | ||||
|             @click="selectTab('MyAccompanyingCourses')"> | ||||
|             {{ $t('my_accompanying_courses.tab') }} | ||||
|             <tab-counter :count="state.accompanyingCourses.count"></tab-counter> | ||||
|          </a> | ||||
|       </li> | ||||
|       <li class="nav-item"> | ||||
|          <a class="nav-link" | ||||
|             :class="{'active': activeTab === 'MyWorks'}" | ||||
|             @click="selectTab('MyWorks')"> | ||||
|             {{ $t('my_works.tab') }} | ||||
|             <tab-counter :count="state.works.count"></tab-counter> | ||||
|          </a> | ||||
|       </li> | ||||
|       <li class="nav-item"> | ||||
|          <a class="nav-link" | ||||
|             :class="{'active': activeTab === 'MyEvaluations'}" | ||||
|             @click="selectTab('MyEvaluations')"> | ||||
|             {{ $t('my_evaluations.tab') }} | ||||
|             <tab-counter :count="state.evaluations.count"></tab-counter> | ||||
|          </a> | ||||
|       </li> | ||||
|       <li class="nav-item"> | ||||
|          <a class="nav-link" | ||||
|             :class="{'active': activeTab === 'MyTasks'}" | ||||
|             @click="selectTab('MyTasks')"> | ||||
|             {{ $t('my_tasks.tab') }} | ||||
|             <tab-counter :count="state.tasks.warning.count"></tab-counter> | ||||
|             <tab-counter :count="state.tasks.alert.count"></tab-counter> | ||||
|          </a> | ||||
|       </li> | ||||
|       <li class="nav-item loading ms-auto py-2" v-if="loading"> | ||||
|          <i class="fa fa-circle-o-notch fa-spin fa-lg text-chill-gray" :title="$t('loading')"></i> | ||||
|       </li> | ||||
|    </ul> | ||||
|     | ||||
|    <div class="my-4"> | ||||
|       <my-customs | ||||
|          v-if="activeTab === 'MyCustoms'"> | ||||
|       </my-customs> | ||||
|       <my-works | ||||
|          v-else-if="activeTab === 'MyWorks'"> | ||||
|       </my-works> | ||||
|       <my-evaluations | ||||
|          v-else-if="activeTab === 'MyEvaluations'"> | ||||
|       </my-evaluations> | ||||
|       <my-tasks | ||||
|          v-else-if="activeTab === 'MyTasks'"> | ||||
|       </my-tasks> | ||||
|       <my-accompanying-courses | ||||
|          v-else-if="activeTab === 'MyAccompanyingCourses'"> | ||||
|       </my-accompanying-courses> | ||||
|       <my-notifications | ||||
|          v-else-if="activeTab === 'MyNotifications'"> | ||||
|       </my-notifications> | ||||
|    </div> | ||||
| </template> | ||||
|  | ||||
| <script> | ||||
| import MyCustoms from './MyCustoms'; | ||||
| import MyWorks from './MyWorks'; | ||||
| import MyEvaluations from './MyEvaluations'; | ||||
| import MyTasks from './MyTasks'; | ||||
| import MyAccompanyingCourses from './MyAccompanyingCourses'; | ||||
| import MyNotifications from './MyNotifications'; | ||||
| import TabCounter from './TabCounter'; | ||||
| import { mapState } from "vuex"; | ||||
|  | ||||
| export default { | ||||
|    name: "App", | ||||
|    components: { | ||||
|       MyCustoms, | ||||
|       MyWorks, | ||||
|       MyEvaluations, | ||||
|       MyTasks, | ||||
|       MyAccompanyingCourses, | ||||
|       MyNotifications, | ||||
|       TabCounter, | ||||
|    }, | ||||
|    data() { | ||||
|       return { | ||||
|          activeTab: 'MyCustoms' | ||||
|       } | ||||
|    }, | ||||
|    computed: { | ||||
|       ...mapState([ | ||||
|          'loading', | ||||
|       ]), | ||||
|       // just to see all in devtool : | ||||
|       ...mapState({ | ||||
|          state: (state) => state, | ||||
|       }), | ||||
|    }, | ||||
|    methods: { | ||||
|       selectTab(tab) { | ||||
|          this.$store.dispatch('getByTab', { tab: tab }); | ||||
|          this.activeTab = tab; | ||||
|       } | ||||
|    }, | ||||
|    mounted() { | ||||
|       for (const m of [ | ||||
|          'MyNotifications', | ||||
|          'MyAccompanyingCourses', | ||||
|          'MyWorks', | ||||
|          'MyEvaluations', | ||||
|          'MyTasks', | ||||
|       ]) { | ||||
|          this.$store.dispatch('getByTab', { tab: m, param: "countOnly=1" }); | ||||
|       } | ||||
|    } | ||||
| } | ||||
| </script> | ||||
|  | ||||
| <style scoped> | ||||
| a.nav-link { | ||||
|    cursor: pointer; | ||||
| } | ||||
| </style> | ||||
| @@ -0,0 +1,60 @@ | ||||
| <template> | ||||
|    <div class="alert alert-light">{{ $t('my_accompanying_courses.description') }}</div> | ||||
|    <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span> | ||||
|    <tab-table v-else> | ||||
|       <template v-slot:thead> | ||||
|          <th scope="col">id</th> | ||||
|          <th scope="col">Ouvert le</th> | ||||
|          <th scope="col">Usagers concernés</th> | ||||
|          <th scope="col"></th> | ||||
|       </template> | ||||
|       <template v-slot:tbody> | ||||
|          <tr v-for="(c, i) in accompanyingCourses.results" :key="`course-${i}`"> | ||||
|             <td>{{ c.id}}</td> | ||||
|             <td>{{ $d(c.openingDate.datetime, 'long') }}</td> | ||||
|             <td>{{ c.participations.length }}</td> | ||||
|             <td> | ||||
|                <a class="btn btn-sm btn-show" :href="getUrl(c)"> | ||||
|                   {{ $t('show_entity', { entity: $t('the_course') }) }} | ||||
|                </a> | ||||
|             </td> | ||||
|          </tr> | ||||
|       </template> | ||||
|    </tab-table> | ||||
| </template> | ||||
|  | ||||
| <script> | ||||
| import { mapState, mapGetters } from "vuex"; | ||||
| import TabTable from "./TabTable"; | ||||
|  | ||||
| export default { | ||||
|    name: "MyAccompanyingCourses", | ||||
|    components: { | ||||
|       TabTable | ||||
|    }, | ||||
|    computed: { | ||||
|       ...mapState([ | ||||
|          'accompanyingCourses', | ||||
|       ]), | ||||
|       ...mapGetters([ | ||||
|          'isAccompanyingCoursesLoaded', | ||||
|       ]), | ||||
|       noResults() { | ||||
|          if (!this.isAccompanyingCoursesLoaded) { | ||||
|             return false; | ||||
|          } else { | ||||
|             return this.accompanyingCourses.count === 0; | ||||
|          } | ||||
|       }, | ||||
|    }, | ||||
|    methods: { | ||||
|       getUrl(c) { | ||||
|          return `/fr/parcours/${c.id}` | ||||
|       } | ||||
|    } | ||||
| } | ||||
| </script> | ||||
|  | ||||
| <style scoped> | ||||
|  | ||||
| </style> | ||||
| @@ -0,0 +1,77 @@ | ||||
| <template> | ||||
|    <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_dashboard') }}</span> | ||||
|    <div v-else id="dashboards" class="row g-3" data-masonry='{"percentPosition": true }'> | ||||
|        | ||||
|       <div class="mbloc col col-sm-6 col-lg-4"> | ||||
|          <div class="custom1"> | ||||
|             <ul class="list-unstyled"> | ||||
|                <li v-if="counter.notifications > 0"> | ||||
|                   <b>{{ counter.notifications }}</b> {{ $t('counter.unread_notifications') }} | ||||
|                </li> | ||||
|                <li v-if="counter.accompanyingCourses > 0"> | ||||
|                   <b>{{ counter.accompanyingCourses }}</b> {{ $t('counter.assignated_courses') }} | ||||
|                </li> | ||||
|                <li v-if="counter.works > 0"> | ||||
|                   <b>{{ counter.works }}</b> {{ $t('counter.assignated_actions') }} | ||||
|                </li> | ||||
|                <li v-if="counter.evaluations > 0"> | ||||
|                   <b>{{ counter.evaluations }}</b> {{ $t('counter.assignated_evaluations') }} | ||||
|                </li> | ||||
|                <li v-if="counter.tasksAlert > 0"> | ||||
|                   <b>{{ counter.tasksAlert }}</b> {{ $t('counter.alert_tasks') }} | ||||
|                </li> | ||||
|                <li v-if="counter.tasksWarning > 0"> | ||||
|                   <b>{{ counter.tasksWarning }}</b> {{ $t('counter.warning_tasks') }} | ||||
|                </li> | ||||
|             </ul> | ||||
|          </div> | ||||
|       </div> | ||||
|        | ||||
|       <!-- | ||||
|       <div class="mbloc col col-sm-6 col-lg-4"> | ||||
|          <div class="custom2"> | ||||
|             Mon dashboard personnalisé | ||||
|          </div> | ||||
|       </div> | ||||
|       <div class="mbloc col col-sm-6 col-lg-4"> | ||||
|          <div class="custom3"> | ||||
|             Mon dashboard personnalisé | ||||
|          </div> | ||||
|       </div> | ||||
|       <div class="mbloc col col-sm-6 col-lg-4"> | ||||
|          <div class="custom4"> | ||||
|             Mon dashboard personnalisé | ||||
|          </div> | ||||
|       </div> | ||||
|       --> | ||||
|  | ||||
|    </div> | ||||
| </template> | ||||
|  | ||||
| <script> | ||||
| import { mapGetters } from "vuex"; | ||||
| import Masonry from 'masonry-layout/masonry'; | ||||
|  | ||||
| export default { | ||||
|    name: "MyCustoms", | ||||
|    computed: { | ||||
|       ...mapGetters(['counter']), | ||||
|       noResults() { | ||||
|          return false | ||||
|       }, | ||||
|    }, | ||||
|    mounted() { | ||||
|       const elem = document.querySelector('#dashboards'); | ||||
|       const masonry = new Masonry(elem, {}); | ||||
|    } | ||||
| } | ||||
| </script> | ||||
|  | ||||
| <style scoped> | ||||
| div.custom4, | ||||
| div.custom3, | ||||
| div.custom2 { | ||||
|    font-style: italic; | ||||
|    color: var(--bs-chill-gray); | ||||
| } | ||||
| </style> | ||||
| @@ -0,0 +1,57 @@ | ||||
| <template> | ||||
|    <div class="alert alert-light">{{ $t('my_evaluations.description') }}</div> | ||||
|    <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span> | ||||
|    <tab-table v-else> | ||||
|       <template v-slot:thead> | ||||
|          <th scope="col">id</th> | ||||
|          <th scope="col"></th> | ||||
|       </template> | ||||
|       <template v-slot:tbody> | ||||
|          <tr v-for="(e, i) in evaluations.results" :key="`evaluation-${i}`"> | ||||
|             <td>{{ e.id}}</td> | ||||
|             <td> | ||||
|                <a class="btn btn-sm btn-show" :href="getUrl(e)"> | ||||
|                   {{ $t('show_entity', { entity: $t('the_evaluation') }) }} | ||||
|                </a> | ||||
|             </td> | ||||
|          </tr> | ||||
|       </template> | ||||
|    </tab-table> | ||||
| </template> | ||||
|  | ||||
| <script> | ||||
| import { mapState, mapGetters } from "vuex"; | ||||
| import TabTable from "./TabTable"; | ||||
|  | ||||
| export default { | ||||
|    name: "MyEvaluations", | ||||
|    components: { | ||||
|       TabTable | ||||
|    }, | ||||
|    computed: { | ||||
|       ...mapState([ | ||||
|          'evaluations', | ||||
|       ]), | ||||
|       ...mapGetters([ | ||||
|          'isEvaluationsLoaded', | ||||
|       ]), | ||||
|       noResults() { | ||||
|          if (!this.isEvaluationsLoaded) { | ||||
|             return false; | ||||
|          } else { | ||||
|             return this.evaluations.count === 0; | ||||
|          } | ||||
|       } | ||||
|    }, | ||||
|    methods: { | ||||
|       getUrl(e) { | ||||
|          let anchor = '#evaluations'; | ||||
|          return `/fr/person/accompanying-period/work/${e.id}/edit${anchor}` | ||||
|       } | ||||
|    }, | ||||
| } | ||||
| </script> | ||||
|  | ||||
| <style scoped> | ||||
|  | ||||
| </style> | ||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user