mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-11-20 02:47:44 +00:00
Compare commits
331 Commits
466-set-ma
...
ticket/64-
| Author | SHA1 | Date | |
|---|---|---|---|
|
4ddbcf4037
|
|||
|
6d3bcf48b5
|
|||
|
7136c682f2
|
|||
|
625e55056d
|
|||
|
6d617146b8
|
|||
| 65bbdc283d | |||
|
|
f0b3e63d66 | ||
|
14e0cba2e8
|
|||
| 41a31944b3 | |||
| 51607572de | |||
|
627e128977
|
|||
| 1fc5530707 | |||
|
|
b31778c068 | ||
|
305c6deb24
|
|||
|
d691098a21
|
|||
|
3f6bbbc1b3
|
|||
|
31e57d7507
|
|||
|
5c098a336d
|
|||
|
e107d20bea
|
|||
|
491fd81f9b
|
|||
|
8c2acbd166
|
|||
|
e291c7abec
|
|||
|
1e186fab58
|
|||
|
83a2c04537
|
|||
|
e89b33bc1a
|
|||
|
6b208e9962
|
|||
|
b0c63fab91
|
|||
|
6d4c4d2c74
|
|||
|
df6087d468
|
|||
|
ffac143ab9
|
|||
|
f1bf6023ff
|
|||
|
71e146e4f0
|
|||
|
4234377b7e
|
|||
|
1be82b3049
|
|||
|
808954df42
|
|||
|
3f8bb6c5c0
|
|||
|
23e1a0d36a
|
|||
|
a594d86346
|
|||
|
870907804b
|
|||
|
e9e6c05e3d
|
|||
|
532f2dd842
|
|||
|
d14d4d4d8f
|
|||
| a22cbe0239 | |||
| 98902bdeb8 | |||
|
592a0f3698
|
|||
|
d469eb19ad
|
|||
| 4765d4fe28 | |||
|
|
30bcb85549 | ||
|
189a9337b4
|
|||
|
c030232a73
|
|||
|
d4f9726f90
|
|||
|
8740025dbd
|
|||
|
6d8ef035ea
|
|||
|
60eab628ee
|
|||
|
1fd559b722
|
|||
|
b526e802d7
|
|||
|
60937152c3
|
|||
|
6d2e78ce55
|
|||
|
e566f60a4a
|
|||
|
c06531cddb
|
|||
| 61ca700bbe | |||
|
|
b43aeebc3c | ||
| 056e2dcc5f | |||
| e57d1ac696 | |||
|
4a1da25fee
|
|||
| 0eff1d2e79 | |||
| 3928b2cc7a | |||
|
02783e5391
|
|||
|
4f51ef81ad
|
|||
|
4637dc692c
|
|||
|
be3b9f0f56
|
|||
|
ee006f55d6
|
|||
|
13b1c45271
|
|||
|
ad2b6d63ac
|
|||
|
bfbde078b7
|
|||
|
d42a1296c4
|
|||
|
4b7e3c1601
|
|||
|
6ea9af588b
|
|||
|
0fd76d3fa8
|
|||
|
34af53130b
|
|||
|
a1fd395868
|
|||
|
b8a7cbb321
|
|||
|
6124eb9e34
|
|||
|
a5b06de92a
|
|||
|
52404956d2
|
|||
|
4207efd6bf
|
|||
|
840fde4ad4
|
|||
|
3611ea2518
|
|||
|
bbd4292cb9
|
|||
|
54f8c92240
|
|||
|
5330befc8f
|
|||
|
c19206be0c
|
|||
|
5ff374d2fa
|
|||
|
4a73aaae94
|
|||
|
ff2c567d05
|
|||
|
a734e84f28
|
|||
|
4367ed086e
|
|||
|
3227bfcd3a
|
|||
|
8d29fb260a
|
|||
|
bda0743c63
|
|||
|
d9b730627f
|
|||
|
27548ad654
|
|||
|
bec7297039
|
|||
|
852523e644
|
|||
|
c05d0aad47
|
|||
|
1c0ed9abc8
|
|||
|
9aed5cc216
|
|||
|
e4fe5bff68
|
|||
|
4c73c4d9d0
|
|||
| 38935edb93 | |||
|
|
e1ef65d4ca | ||
| ec9d0be70b | |||
|
|
0ba2cbc1e8 | ||
| e87429933a | |||
|
8e2e676e3d
|
|||
| e12ad563a3 | |||
|
|
711aa8db9b | ||
| e78d44953f | |||
| 18f67801c7 | |||
|
c815e6bc69
|
|||
| 807f2711fe | |||
|
|
cd594cd580 | ||
|
fb6b26bfb5
|
|||
|
c5cedb8bd6
|
|||
|
2665e43a61
|
|||
|
25561cdf63
|
|||
| 10b73e06e1 | |||
|
|
e7c04e34a9 | ||
| 164beee7c6 | |||
|
|
4d96eb9457 | ||
| fe2eba3b29 | |||
|
|
61d1232e31 | ||
| 6594d4f6a6 | |||
| 1a66a9e864 | |||
| 1b74c119dc | |||
| 14d88810f3 | |||
| 445a2c9358 | |||
| c8baf0a8aa | |||
| faed443a96 | |||
| bbf387d96f | |||
|
|
b7c9b60744 | ||
|
2bd303bbbe
|
|||
|
c5e6122d2c
|
|||
| 088b876e20 | |||
| 3400656d7c | |||
|
568c8be7fd
|
|||
|
538ecc42ea
|
|||
|
15d26d4b06
|
|||
|
d8bd9bd7cd
|
|||
|
dcdfba5ccd
|
|||
|
0204bdd38d
|
|||
|
392fd01b56
|
|||
| 35844f3b73 | |||
| 7506b918d7 | |||
| cfba291f2c | |||
|
|
04438c09d3 | ||
| 2a54d1b909 | |||
|
|
628eeac5e0 | ||
| a2263b3fa1 | |||
| 74796d0fb0 | |||
|
c19481e40a
|
|||
|
|
6eeb717b1a | ||
|
beb7c462da
|
|||
|
|
dbf363a9e8 | ||
|
64a2f7c9ed
|
|||
| f26d9739c8 | |||
|
afa5edc1d8
|
|||
|
42d6c9e672
|
|||
|
2b22d4cb7c
|
|||
|
c8e5d0eb37
|
|||
| 2bf8ad5d6c | |||
| 11698a52e3 | |||
| 70955573e8 | |||
|
|
3df4043eb9 | ||
|
06e8264dde
|
|||
| b451d2c4a3 | |||
| 4f93150874 | |||
| 0566ab0910 | |||
|
|
f4eeee1598 | ||
| 33cf16fc13 | |||
| 0a331aab37 | |||
| d43b739654 | |||
| c72432efae | |||
|
95975fae55
|
|||
|
95a7efa138
|
|||
|
45e193ff6d
|
|||
|
dfc146ff3f
|
|||
| b41fcf66a9 | |||
|
|
a8dd1b3548 | ||
|
2b99a480ac
|
|||
|
7633e587bb
|
|||
|
fc61dfdf3a
|
|||
|
f1a5b5c49e
|
|||
|
ec685dcd47
|
|||
|
631ae3eedd
|
|||
|
440a7837ac
|
|||
|
e0abf34784
|
|||
|
377ae9a9dc
|
|||
|
034dc30e30
|
|||
|
d615111a0f
|
|||
|
ffb756c712
|
|||
|
69daccb860
|
|||
|
16435423cf
|
|||
|
697b4ab436
|
|||
|
67d804e28e
|
|||
|
cf41fa9574
|
|||
|
b8b325f7d7
|
|||
|
e97bd8c4ef
|
|||
|
e28d7df533
|
|||
|
4b20b1bc01
|
|||
|
b15733076c
|
|||
|
25be5c9ea3
|
|||
|
b035020c6f
|
|||
|
128101dc46
|
|||
|
5f2711023e
|
|||
|
bdf2ed4bbd
|
|||
|
1df542603e
|
|||
|
80bcc68ce5
|
|||
|
154fc3e2f6
|
|||
|
e45af94c78
|
|||
|
166a6fde20
|
|||
|
631f047338
|
|||
|
a777588bb8
|
|||
|
ca78d112c2
|
|||
|
bcfd317d83
|
|||
|
348740f073
|
|||
|
0d74f0980f
|
|||
|
be19dc00db
|
|||
|
643028ffd6
|
|||
|
ac4e2e5bf2
|
|||
|
498572b96e
|
|||
|
d2a61ce69b
|
|||
|
a9c0567ee1
|
|||
|
76cec5b5a8
|
|||
|
efe8a67697
|
|||
|
26dfa9b028
|
|||
|
50025044d3
|
|||
|
e6202a2e34
|
|||
|
b863bd967d
|
|||
|
e65bcf7275
|
|||
|
e00ece4200
|
|||
|
640fd71402
|
|||
|
aae50ca290
|
|||
|
1fa483598b
|
|||
|
e4b6a468f8
|
|||
|
|
66c7758023 | ||
|
|
4750d2c24e | ||
|
|
ca05e3d979 | ||
|
|
a20f9b4f86 | ||
|
|
c73c1eb8d5 | ||
|
|
8778bb0731 | ||
|
|
c7d20eebc5 | ||
|
|
b9e130c159 | ||
|
|
3e8bc94af3 | ||
|
|
0c914c9f9f | ||
|
|
580a60c939 | ||
|
|
4996ac3b7c | ||
|
|
2a23bf19cb | ||
|
|
650d2596d9 | ||
|
|
2bdd5a329e | ||
|
78d1776733
|
|||
|
66dc603c85
|
|||
|
3a8154ecce
|
|||
|
c81828e04f
|
|||
|
|
ec17dd7de2 | ||
| 76c076a5f3 | |||
|
|
f0045edd6c | ||
|
|
d00b76ffcd | ||
|
|
8991f0ef3f | ||
|
|
d6f5eae0c9 | ||
|
|
821fce3dd8 | ||
|
|
1d33ae1e39 | ||
|
|
19af0feb57 | ||
|
|
1c09e9a692 | ||
|
|
d72e748388 | ||
|
|
ab850b7b70 | ||
|
|
3f9745d8cf | ||
|
|
473765366a | ||
|
|
6500c24a7f | ||
|
|
1d00457141 | ||
|
|
eb0bf56cff | ||
|
|
7b8cd90cf1 | ||
|
|
a27d92aba0 | ||
|
|
85bdfb9e21 | ||
|
|
4cffcf4de1 | ||
|
|
b2587a688f | ||
|
|
c9f0e9843b | ||
|
|
b40ad9e445 | ||
|
|
3e10e47e29 | ||
|
|
2a1963e993 | ||
| 34c171659b | |||
|
2d8b960d9e
|
|||
| 831ae03431 | |||
|
45828174d1
|
|||
|
ed45f14a45
|
|||
|
fa67835690
|
|||
|
b434d38091
|
|||
|
|
800a952532 | ||
|
9f355032a8
|
|||
|
0bc6e62d4d
|
|||
|
46fb1c04b5
|
|||
| 3b2c3d1464 | |||
|
|
0bd6038160 | ||
|
|
baab8e94ce | ||
|
e2deb55fdb
|
|||
|
|
2cdfb50058 | ||
|
39d701feb2
|
|||
|
613ee8b186
|
|||
|
56a1a488de
|
|||
| 3f789ad0f4 | |||
|
467bea7cde
|
|||
|
670b8eb82b
|
|||
|
a9760b323f
|
|||
|
71a3a1924a
|
|||
|
ecdc1e25bf
|
|||
|
dd37427be1
|
|||
|
c8467df1b1
|
|||
|
4c89a954fa
|
|||
|
7c1f3b114d
|
|||
|
36bc4dab24
|
|||
|
4b30d92282
|
|||
|
75fbec5489
|
|||
|
912fdd6349
|
|||
|
5832542978
|
|||
|
5c3585a1ed
|
|||
|
a2f1e20ddf
|
|||
|
4d67702a76
|
|||
| 18e442db29 | |||
|
|
deb3d92189 | ||
|
a59ea7db31
|
|||
|
a738b0cac9
|
7
.changes/unreleased/DX-20251027-150053.yaml
Normal file
7
.changes/unreleased/DX-20251027-150053.yaml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
kind: DX
|
||||||
|
body: |
|
||||||
|
Send notifications log to dedicated channel, if it exists
|
||||||
|
time: 2025-10-27T15:00:53.309372316+01:00
|
||||||
|
custom:
|
||||||
|
Issue: ""
|
||||||
|
SchemaChange: No schema change
|
||||||
6
.changes/unreleased/Feature-20240530-160003.yaml
Normal file
6
.changes/unreleased/Feature-20240530-160003.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Feature
|
||||||
|
body: |
|
||||||
|
Upgrade import of address list to the last version of compiled addresses of belgian-best-address
|
||||||
|
time: 2024-05-30T16:00:03.440767606+02:00
|
||||||
|
custom:
|
||||||
|
Issue: ""
|
||||||
6
.changes/unreleased/Feature-20240531-190242.yaml
Normal file
6
.changes/unreleased/Feature-20240531-190242.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Feature
|
||||||
|
body: |
|
||||||
|
Upgrade CKEditor and refactor configuration with use of typescript
|
||||||
|
time: 2024-05-31T19:02:42.776662753+02:00
|
||||||
|
custom:
|
||||||
|
Issue: ""
|
||||||
6
.changes/unreleased/Feature-20250808-120802.yaml
Normal file
6
.changes/unreleased/Feature-20250808-120802.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Feature
|
||||||
|
body: Create invitation list in user menu
|
||||||
|
time: 2025-08-08T12:08:02.446361367+02:00
|
||||||
|
custom:
|
||||||
|
Issue: "385"
|
||||||
|
SchemaChange: No schema change
|
||||||
6
.changes/unreleased/Feature-20251007-155945.yaml
Normal file
6
.changes/unreleased/Feature-20251007-155945.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Feature
|
||||||
|
body: Admin interface for Motive entity
|
||||||
|
time: 2025-10-07T15:59:45.597029709+02:00
|
||||||
|
custom:
|
||||||
|
Issue: ""
|
||||||
|
SchemaChange: No schema change
|
||||||
6
.changes/unreleased/Feature-20251022-111552.yaml
Normal file
6
.changes/unreleased/Feature-20251022-111552.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Feature
|
||||||
|
body: Add an admin interface for Motive entity
|
||||||
|
time: 2025-10-22T11:15:52.13937955+02:00
|
||||||
|
custom:
|
||||||
|
Issue: ""
|
||||||
|
SchemaChange: Add columns or tables
|
||||||
6
.changes/unreleased/Feature-20251029-152510.yaml
Normal file
6
.changes/unreleased/Feature-20251029-152510.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Feature
|
||||||
|
body: Add columns for comments linked to an activity in the activity list export
|
||||||
|
time: 2025-10-29T15:25:10.493968528+01:00
|
||||||
|
custom:
|
||||||
|
Issue: "404"
|
||||||
|
SchemaChange: No schema change
|
||||||
6
.changes/unreleased/Fixed-20251029-124355.yaml
Normal file
6
.changes/unreleased/Fixed-20251029-124355.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Fixed
|
||||||
|
body: 'Fix: display also social actions linked to parents of the selected social issue'
|
||||||
|
time: 2025-10-29T12:43:55.008647232+01:00
|
||||||
|
custom:
|
||||||
|
Issue: "451"
|
||||||
|
SchemaChange: No schema change
|
||||||
6
.changes/unreleased/Fixed-20251029-143836.yaml
Normal file
6
.changes/unreleased/Fixed-20251029-143836.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Fixed
|
||||||
|
body: 'Fix: export actions and their results in csv even when action does not have any goals attached to it.'
|
||||||
|
time: 2025-10-29T14:38:36.195220844+01:00
|
||||||
|
custom:
|
||||||
|
Issue: "453"
|
||||||
|
SchemaChange: No schema change
|
||||||
6
.changes/unreleased/Fixed-20251104-135108.yaml
Normal file
6
.changes/unreleased/Fixed-20251104-135108.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Fixed
|
||||||
|
body: Fix the possibility to delete a workflow
|
||||||
|
time: 2025-11-04T13:51:08.113234488+01:00
|
||||||
|
custom:
|
||||||
|
Issue: ""
|
||||||
|
SchemaChange: Drop or rename table or columns, or enforce new constraint that must be manually fixed
|
||||||
6
.changes/unreleased/Fixed-20251106-161605.yaml
Normal file
6
.changes/unreleased/Fixed-20251106-161605.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Fixed
|
||||||
|
body: Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument
|
||||||
|
time: 2025-11-06T16:16:05.861813041+01:00
|
||||||
|
custom:
|
||||||
|
Issue: "428"
|
||||||
|
SchemaChange: No schema change
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
kind: Fixed
|
|
||||||
body: |
|
|
||||||
Associate activity's creator as a participant by default, and retro-actively append the creator to each activity
|
|
||||||
time: 2025-11-18T14:05:59.904993123+01:00
|
|
||||||
custom:
|
|
||||||
Issue: "466"
|
|
||||||
SchemaChange: Add columns or tables
|
|
||||||
6
.changes/unreleased/UX-20251006-123932.yaml
Normal file
6
.changes/unreleased/UX-20251006-123932.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: UX
|
||||||
|
body: Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.
|
||||||
|
time: 2025-10-06T12:39:32.514056818+02:00
|
||||||
|
custom:
|
||||||
|
Issue: "425"
|
||||||
|
SchemaChange: No schema change
|
||||||
6
.changes/unreleased/UX-20251029-110804.yaml
Normal file
6
.changes/unreleased/UX-20251029-110804.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: UX
|
||||||
|
body: Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps
|
||||||
|
time: 2025-10-29T11:08:04.077020411+01:00
|
||||||
|
custom:
|
||||||
|
Issue: "542"
|
||||||
|
SchemaChange: No schema change
|
||||||
6
.changes/unreleased/UX-20251030-180919.yaml
Normal file
6
.changes/unreleased/UX-20251030-180919.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: UX
|
||||||
|
body: Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
|
||||||
|
time: 2025-10-30T18:09:19.373907522+01:00
|
||||||
|
custom:
|
||||||
|
Issue: ""
|
||||||
|
SchemaChange: No schema change
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
## v4.7.0 - 2025-11-10
|
|
||||||
### Feature
|
|
||||||
* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu
|
|
||||||
* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export
|
|
||||||
### Fixed
|
|
||||||
* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue
|
|
||||||
* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.
|
|
||||||
* Fix the possibility to delete a workflow
|
|
||||||
|
|
||||||
**Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
|
|
||||||
* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target
|
|
||||||
* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument
|
|
||||||
### DX
|
|
||||||
* Send notifications log to dedicated channel, if it exists
|
|
||||||
|
|
||||||
### UX
|
|
||||||
* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.
|
|
||||||
* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps
|
|
||||||
* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
|
|
||||||
* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form
|
|
||||||
* Wrap text when it is too long within badges
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
## v4.8.0 - 2025-11-17
|
|
||||||
### Feature
|
|
||||||
* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.
|
|
||||||
### Fixed
|
|
||||||
* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page
|
|
||||||
* Improve accessibility on login page
|
|
||||||
|
|
||||||
### UX
|
|
||||||
* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.
|
|
||||||
@@ -23,7 +23,7 @@ max_line_length = 0
|
|||||||
indent_size = 2
|
indent_size = 2
|
||||||
indent_style = space
|
indent_style = space
|
||||||
|
|
||||||
[.rst]
|
[*.rst]
|
||||||
ident_size = 3
|
indent_size = 3
|
||||||
ident_style = space
|
indent_style = space
|
||||||
|
|
||||||
|
|||||||
@@ -234,17 +234,17 @@ This must be a decision made by a human, not by an AI. Every AI task must abort
|
|||||||
|
|
||||||
#### Running Tests
|
#### Running Tests
|
||||||
|
|
||||||
The tests are run from the project's root (not from the bundle's root).
|
The tests are run from the project's root (not from the bundle's root: so, do not change the directory to any bundle directory before running tests).
|
||||||
|
|
||||||
|
Tests must be run using the `symfony` command:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Run all tests
|
|
||||||
vendor/bin/phpunit
|
|
||||||
|
|
||||||
# Run a specific test file
|
# Run a specific test file
|
||||||
vendor/bin/phpunit path/to/TestFile.php
|
symfony composer exec phpunit -- path/to/TestFile.php
|
||||||
|
|
||||||
# Run a specific test method
|
# Run a specific test method
|
||||||
vendor/bin/phpunit --filter methodName path/to/TestFile.php
|
symfony composer exec phpunit -- --filter methodName path/to/TestFile.php
|
||||||
```
|
```
|
||||||
|
|
||||||
When writing tests, only test specific files. Do not run all tests or the full
|
When writing tests, only test specific files. Do not run all tests or the full
|
||||||
|
|||||||
4
.prettierrc
Normal file
4
.prettierrc
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"tabWidth": 2,
|
||||||
|
"useTabs": false
|
||||||
|
}
|
||||||
30
.vscode/launch.json
vendored
Normal file
30
.vscode/launch.json
vendored
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
{
|
||||||
|
// Use IntelliSense to learn about possible attributes.
|
||||||
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "Chill Debug",
|
||||||
|
"type": "php",
|
||||||
|
"request": "launch",
|
||||||
|
"port": 9000,
|
||||||
|
"pathMappings": {
|
||||||
|
"/var/www/html": "${workspaceFolder}"
|
||||||
|
},
|
||||||
|
"preLaunchTask": "symfony"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Yarn Encore Dev (Watch)",
|
||||||
|
"type": "node-terminal",
|
||||||
|
"request": "launch",
|
||||||
|
"command": "yarn encore dev --watch",
|
||||||
|
"cwd": "${workspaceFolder}"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"compounds": [
|
||||||
|
{
|
||||||
|
"name": "Chill Debug + Yarn Encore Dev (Watch)",
|
||||||
|
"configurations": ["Chill Debug", "Yarn Encore Dev (Watch)"]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
23
.vscode/tasks.json
vendored
Normal file
23
.vscode/tasks.json
vendored
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"type": "shell",
|
||||||
|
"command": "symfony",
|
||||||
|
"args": [
|
||||||
|
"server:start",
|
||||||
|
"--allow-http",
|
||||||
|
"--no-tls",
|
||||||
|
"--port=8000",
|
||||||
|
"--allow-all-ip",
|
||||||
|
"-d"
|
||||||
|
],
|
||||||
|
"label": "symfony"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "shell",
|
||||||
|
"command": "yarn",
|
||||||
|
"args": ["encore", "dev", "--watch"],
|
||||||
|
"label": "webpack"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
36
CHANGELOG.md
36
CHANGELOG.md
@@ -6,38 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
|
|||||||
and is generated by [Changie](https://github.com/miniscruff/changie).
|
and is generated by [Changie](https://github.com/miniscruff/changie).
|
||||||
|
|
||||||
|
|
||||||
## v4.8.0 - 2025-11-17
|
|
||||||
### Feature
|
|
||||||
* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.
|
|
||||||
### Fixed
|
|
||||||
* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page
|
|
||||||
* Improve accessibility on login page
|
|
||||||
|
|
||||||
### UX
|
|
||||||
* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.
|
|
||||||
|
|
||||||
## v4.7.0 - 2025-11-10
|
|
||||||
### Feature
|
|
||||||
* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu
|
|
||||||
* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export
|
|
||||||
### Fixed
|
|
||||||
* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue
|
|
||||||
* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.
|
|
||||||
* Fix the possibility to delete a workflow
|
|
||||||
|
|
||||||
**Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
|
|
||||||
* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target
|
|
||||||
* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument
|
|
||||||
### DX
|
|
||||||
* Send notifications log to dedicated channel, if it exists
|
|
||||||
|
|
||||||
### UX
|
|
||||||
* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.
|
|
||||||
* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps
|
|
||||||
* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
|
|
||||||
* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form
|
|
||||||
* Wrap text when it is too long within badges
|
|
||||||
|
|
||||||
## v4.6.1 - 2025-10-27
|
## v4.6.1 - 2025-10-27
|
||||||
### Fixed
|
### Fixed
|
||||||
* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php
|
* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php
|
||||||
@@ -812,7 +780,7 @@ Fix color of Chill footer
|
|||||||
- ajout d'un filtre et regroupement par usager participant sur les échanges
|
- ajout d'un filtre et regroupement par usager participant sur les échanges
|
||||||
- ajout d'un regroupement: par type d'activité associé au parcours;
|
- ajout d'un regroupement: par type d'activité associé au parcours;
|
||||||
- trie les filtre et regroupements par ordre alphabétique dans els exports
|
- trie les filtre et regroupements par ordre alphabétique dans els exports
|
||||||
- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
|
- ajout d'un paramètre qui permet de désactiver le filtre par territoire dans les exports
|
||||||
- correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"
|
- correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"
|
||||||
|
|
||||||
## v2.9.2 - 2023-10-17
|
## v2.9.2 - 2023-10-17
|
||||||
@@ -992,7 +960,7 @@ error when trying to reedit a saved export
|
|||||||
- ajout d'un regroupement par métier des intervenants sur un parcours;
|
- ajout d'un regroupement par métier des intervenants sur un parcours;
|
||||||
- ajout d'un regroupement par service des intervenants sur un parcours;
|
- ajout d'un regroupement par service des intervenants sur un parcours;
|
||||||
- ajout d'un regroupement par utilisateur intervenant sur un parcours
|
- ajout d'un regroupement par utilisateur intervenant sur un parcours
|
||||||
- ajout d'un regroupement "par centre de l'usager";
|
- ajout d'un regroupement "par territoire de l'usager";
|
||||||
- ajout d'un filtre "par métier intervenant sur un parcours";
|
- ajout d'un filtre "par métier intervenant sur un parcours";
|
||||||
- ajout d'un filtre "par service intervenant sur un parcours";
|
- ajout d'un filtre "par service intervenant sur un parcours";
|
||||||
- création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);
|
- création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ Arborescence:
|
|||||||
- person
|
- person
|
||||||
- personvendee
|
- personvendee
|
||||||
- household_edit_metadata
|
- household_edit_metadata
|
||||||
- index.js
|
- index.ts
|
||||||
```
|
```
|
||||||
|
|
||||||
## Organisation des feuilles de styles
|
## Organisation des feuilles de styles
|
||||||
|
|||||||
@@ -1,7 +1,12 @@
|
|||||||
import { trans, setLocale, setLocaleFallbacks } from "./ux-translator";
|
import {
|
||||||
|
trans,
|
||||||
|
setLocale,
|
||||||
|
getLocale,
|
||||||
|
setLocaleFallbacks,
|
||||||
|
} from "./ux-translator";
|
||||||
|
|
||||||
setLocaleFallbacks({"en": "fr", "nl": "fr", "fr": "en"});
|
setLocaleFallbacks({ en: "fr", nl: "fr", fr: "en" });
|
||||||
setLocale('fr');
|
setLocale("fr");
|
||||||
|
|
||||||
export { trans };
|
export { trans, getLocale };
|
||||||
export * from '../var/translations';
|
export * from "../var/translations";
|
||||||
|
|||||||
@@ -133,6 +133,7 @@
|
|||||||
"Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
|
"Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
|
||||||
"Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
|
"Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
|
||||||
"Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
|
"Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
|
||||||
|
"Chill\\TicketBundle\\": "src/Bundle/ChillTicketBundle/src",
|
||||||
"Chill\\Utils\\Rector\\": "utils/rector/src"
|
"Chill\\Utils\\Rector\\": "utils/rector/src"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ return [
|
|||||||
Chill\ThirdPartyBundle\ChillThirdPartyBundle::class => ['all' => true],
|
Chill\ThirdPartyBundle\ChillThirdPartyBundle::class => ['all' => true],
|
||||||
Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true],
|
Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true],
|
||||||
Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
|
Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
|
||||||
|
Chill\TicketBundle\ChillTicketBundle::class => ['all' => true],
|
||||||
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
|
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
|
||||||
Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
|
Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
|
||||||
loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
|
loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
chill_main:
|
chill_main:
|
||||||
available_languages: [ '%env(resolve:LOCALE)%', 'en', 'nl' ]
|
available_languages: [ '%env(resolve:LOCALE)%', 'en' ]
|
||||||
available_countries: ['BE', 'FR']
|
available_countries: ['BE', 'FR']
|
||||||
top_banner:
|
top_banner:
|
||||||
visible: false
|
visible: false
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
chill_doc_store:
|
chill_doc_store:
|
||||||
use_driver: openstack
|
use_driver: local_storage
|
||||||
local_storage:
|
local_storage:
|
||||||
storage_path: '%kernel.project_dir%/var/storage'
|
storage_path: '%kernel.project_dir%/var/storage'
|
||||||
openstack:
|
openstack:
|
||||||
|
|||||||
5
config/packages/chill_ticket.yaml
Normal file
5
config/packages/chill_ticket.yaml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
chill_ticket:
|
||||||
|
ticket:
|
||||||
|
person_per_ticket: one # One of "one"; "many"
|
||||||
|
response_time_exceeded_delay: PT12H
|
||||||
|
|
||||||
@@ -14,6 +14,7 @@ doctrine_migrations:
|
|||||||
'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
|
'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
|
||||||
'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
|
'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
|
||||||
'Chill\Migrations\Report': '@ChillReportBundle/migrations'
|
'Chill\Migrations\Report': '@ChillReportBundle/migrations'
|
||||||
|
'Chill\Migrations\Ticket': '@ChillTicketBundle/migrations'
|
||||||
all_or_nothing:
|
all_or_nothing:
|
||||||
true
|
true
|
||||||
|
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ framework:
|
|||||||
'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
|
'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
|
||||||
'Chill\MainBundle\Export\Messenger\RemoveExportGenerationMessage': async
|
'Chill\MainBundle\Export\Messenger\RemoveExportGenerationMessage': async
|
||||||
'Chill\MainBundle\Notification\Email\NotificationEmailMessages\ScheduleDailyNotificationDigestMessage': async
|
'Chill\MainBundle\Notification\Email\NotificationEmailMessages\ScheduleDailyNotificationDigestMessage': async
|
||||||
|
'Chill\TicketBundle\Messenger\PostTicketUpdateMessage': async
|
||||||
# end of routes added by chill-bundles recipes
|
# end of routes added by chill-bundles recipes
|
||||||
# Route your messages to the transports
|
# Route your messages to the transports
|
||||||
# 'App\Message\YourMessage': async
|
# 'App\Message\YourMessage': async
|
||||||
|
|||||||
2
config/routes/chill_ticket.yaml
Normal file
2
config/routes/chill_ticket.yaml
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
chill_ticket_bundle:
|
||||||
|
resource: '@ChillTicketBundle/config/routes.yaml'
|
||||||
@@ -11,24 +11,94 @@
|
|||||||
Create a new bundle
|
Create a new bundle
|
||||||
*******************
|
*******************
|
||||||
|
|
||||||
Create your own bundle is not a trivial task.
|
|
||||||
|
|
||||||
The easiest way to achieve this is seems to be :
|
|
||||||
|
|
||||||
1. Prepare a fresh installation of the chill project, in a new directory
|
|
||||||
2. Create a new bundle in this project, in the src directory
|
|
||||||
3. Initialize a git repository **at the root bundle**, and create your initial commit.
|
|
||||||
4. Register the bundle with composer/packagist. If you do not plan to distribute your bundle with packagist, you may use a custom repository for achieve this [#f1]_
|
|
||||||
5. Move to a development installation, made as described in the :ref:`installation-for-development` section, and add your new repository to the composer.json file
|
|
||||||
6. Work as :ref:`usual <editing-code-and-commiting>`
|
|
||||||
|
|
||||||
.. warning::
|
.. warning::
|
||||||
|
|
||||||
This part of the doc is not yet tested
|
This part of the doc is not yet tested
|
||||||
|
|
||||||
TODO
|
Create a new directory with Bundle class
|
||||||
|
----------------------------------------
|
||||||
|
|
||||||
|
.. code-block:: bash
|
||||||
|
|
||||||
|
mkdir -p src/Bundle/ChillSomeBundle/src/config
|
||||||
|
mkdir -p src/Bundle/ChillSomeBundle/src/Controller
|
||||||
|
|
||||||
|
Add a bundle file
|
||||||
|
|
||||||
|
.. code-block:: php
|
||||||
|
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\SomeBundle;
|
||||||
|
|
||||||
|
use Symfony\Component\HttpKernel\Bundle\Bundle;
|
||||||
|
|
||||||
|
class ChillSomeBundle extends Bundle {}
|
||||||
|
|
||||||
|
And a route file:
|
||||||
|
|
||||||
|
.. code-block:: yaml
|
||||||
|
|
||||||
|
chill_ticket_controller:
|
||||||
|
resource: '@ChillTicketBundle/Controller/'
|
||||||
|
type: annotation
|
||||||
|
|
||||||
|
Register the new psr-4 namespace
|
||||||
|
--------------------------------
|
||||||
|
|
||||||
|
In composer.json, add the new psr4 namespace
|
||||||
|
|
||||||
|
.. code-block:: diff
|
||||||
|
|
||||||
|
{
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
+ "Chill\\SomeBundle\\": "src/Bundle/ChillSomeBundle/src",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.. rubric:: Footnotes
|
Register the bundle
|
||||||
|
-------------------
|
||||||
|
|
||||||
|
Register in the file :code:`config/bundles.php`:
|
||||||
|
|
||||||
|
.. code-block:: php
|
||||||
|
|
||||||
|
Vendor\Bundle\YourBundle\YourBundle::class => ['all' => true],
|
||||||
|
|
||||||
|
And import routes in :code:`config/routes/chill_some_bundle.yaml`:
|
||||||
|
|
||||||
|
.. code-block:: yaml
|
||||||
|
|
||||||
|
chill_ticket_bundle:
|
||||||
|
resource: '@ChillSomeBundle/config/routes.yaml'
|
||||||
|
|
||||||
|
Add the doctrine_migration namespace
|
||||||
|
------------------------------------
|
||||||
|
|
||||||
|
Add the namespace to :code:`config/packages/doctrine_migrations_chill.yaml`
|
||||||
|
|
||||||
|
.. code-block:: diff
|
||||||
|
|
||||||
|
doctrine_migrations:
|
||||||
|
migrations_paths:
|
||||||
|
+ 'Chill\Some\Ticket': '@ChillSomeBundle/migrations'
|
||||||
|
|
||||||
|
Dump autoloading
|
||||||
|
----------------
|
||||||
|
|
||||||
|
.. code-block:: bash
|
||||||
|
|
||||||
|
symfony composer dump-autoload
|
||||||
|
|
||||||
.. [#f1] Be aware that we use the Affero GPL Licence, which ensure that all users must have access to derivative works done with this software.
|
|
||||||
|
|||||||
@@ -41,6 +41,7 @@
|
|||||||
"typescript": "^5.6.3",
|
"typescript": "^5.6.3",
|
||||||
"typescript-eslint": "^8.13.0",
|
"typescript-eslint": "^8.13.0",
|
||||||
"vue-loader": "^17.0.0",
|
"vue-loader": "^17.0.0",
|
||||||
|
"vue-tsc": "^3.1.3",
|
||||||
"webpack": "^5.75.0",
|
"webpack": "^5.75.0",
|
||||||
"webpack-cli": "^5.0.1"
|
"webpack-cli": "^5.0.1"
|
||||||
},
|
},
|
||||||
@@ -80,12 +81,12 @@
|
|||||||
"dev": "encore dev",
|
"dev": "encore dev",
|
||||||
"watch": "encore dev --watch",
|
"watch": "encore dev --watch",
|
||||||
"build": "encore production --progress",
|
"build": "encore production --progress",
|
||||||
"specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
|
"specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/chill.api.specs.yaml> templates/api/specs.yaml",
|
||||||
"specs-validate": "swagger-cli validate templates/api/specs.yaml",
|
"specs-validate": "swagger-cli validate templates/api/specs.yaml",
|
||||||
"specs-create-dir": "mkdir -p templates/api",
|
"specs-create-dir": "mkdir -p templates/api",
|
||||||
"specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
|
"specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
|
||||||
"version": "node --version",
|
"version": "node --version",
|
||||||
"eslint": "npx eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
|
"eslint": "eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
|
||||||
},
|
},
|
||||||
"private": true
|
"private": true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,6 +58,10 @@
|
|||||||
<!-- temporarily removed, the time to find a fix -->
|
<!-- temporarily removed, the time to find a fix -->
|
||||||
<exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
|
<exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
|
||||||
</testsuite>
|
</testsuite>
|
||||||
|
|
||||||
|
<testsuite name="TicketBundle">
|
||||||
|
<directory suffix="Test.php">src/Bundle/ChillTicketBundle/tests/</directory>
|
||||||
|
</testsuite>
|
||||||
<!--
|
<!--
|
||||||
<testsuite name="ReportBundle">
|
<testsuite name="ReportBundle">
|
||||||
<directory suffix="Test.php">src/Bundle/ChillReportBundle/Tests/</directory>
|
<directory suffix="Test.php">src/Bundle/ChillReportBundle/Tests/</directory>
|
||||||
|
|||||||
8
resources/ticket_motives_import/README.md
Normal file
8
resources/ticket_motives_import/README.md
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
In this directory, you find an example of file for the command `chill:main:ticket_motives_import`.
|
||||||
|
|
||||||
|
This file contains a list of ticket motives to import into the system. Each entry is a dictionary with two keys: `code` and `label`. The `code` key contains the unique code for the ticket motive, and the `label` key contains the human-readable label for the ticket motive.
|
||||||
|
|
||||||
|
The `stored_objects` key contains the documents that will be associated with the tickets. They must be found in the same directory.
|
||||||
|
|
||||||
|
The command `chill:main:ticket_motives_import` uses this file to import the specified ticket motives into the system.
|
||||||
|
|
||||||
136
resources/ticket_motives_import/motives.yaml
Normal file
136
resources/ticket_motives_import/motives.yaml
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
- label:
|
||||||
|
fr: Appel famille pour annonce de décès
|
||||||
|
urgent: false
|
||||||
|
supplementary_informations:
|
||||||
|
- label:
|
||||||
|
fr: Date du décès
|
||||||
|
- label:
|
||||||
|
fr: lieu du décès (domicile ou hôpital)
|
||||||
|
- label:
|
||||||
|
fr: nom de l’hôpital
|
||||||
|
- label:
|
||||||
|
fr: service concerné
|
||||||
|
stored_objects:
|
||||||
|
- label:
|
||||||
|
fr: ☀️ De 07h à 21h
|
||||||
|
filename: 2_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🌙 De 21h à 07h du matin
|
||||||
|
filename: 3_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🗓️ Dimanches et jours fériés
|
||||||
|
filename: 4_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 'Appel famille pour annonce absence : hospitalisation ou consultation'
|
||||||
|
urgent: false
|
||||||
|
supplementary_informations:
|
||||||
|
- label:
|
||||||
|
fr: Quel hôpital
|
||||||
|
- label:
|
||||||
|
fr: quel service
|
||||||
|
- label:
|
||||||
|
fr: pour quelles raisons
|
||||||
|
- label:
|
||||||
|
fr: 'consultation : date et heure'
|
||||||
|
- label:
|
||||||
|
fr: hospitalisation complète ou HDJ
|
||||||
|
stored_objects:
|
||||||
|
- label:
|
||||||
|
fr: ☀️ De 07h à 21h
|
||||||
|
filename: 5_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🌙 De 21h à 07h du matin
|
||||||
|
filename: 6_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🗓️ Dimanches et jours fériés
|
||||||
|
filename: 7_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 'Appel famille pour annonce absence : interruption de prise en charge'
|
||||||
|
urgent: false
|
||||||
|
supplementary_informations:
|
||||||
|
- label:
|
||||||
|
fr: Pour quelles raisons ? Date
|
||||||
|
- label:
|
||||||
|
fr: durée
|
||||||
|
- label:
|
||||||
|
fr: accord médical ?
|
||||||
|
stored_objects:
|
||||||
|
- label:
|
||||||
|
fr: ☀️ De 07h à 21h
|
||||||
|
filename: 8_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🌙 De 21h à 07h du matin
|
||||||
|
filename: 9_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🗓️ Dimanches et jours fériés
|
||||||
|
filename: 10_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 'Appel famille pour annonce absence : changement d’adresse'
|
||||||
|
urgent: false
|
||||||
|
supplementary_informations:
|
||||||
|
- label:
|
||||||
|
fr: Où
|
||||||
|
- label:
|
||||||
|
fr: Pourquoi ? Pour combien de temps ? Besoin d’un relais des soins ? Nouvelle adresse ?
|
||||||
|
stored_objects:
|
||||||
|
- label:
|
||||||
|
fr: ☀️ De 07h à 21h
|
||||||
|
filename: 11_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🌙 De 21h à 07h du matin
|
||||||
|
filename: 12_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🗓️ Dimanches et jours fériés
|
||||||
|
filename: 13_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: Appel famille pour altération de l’état général du patient
|
||||||
|
urgent: true
|
||||||
|
supplementary_informations:
|
||||||
|
- label:
|
||||||
|
fr: Recherche des symptômes
|
||||||
|
- label:
|
||||||
|
fr: Attentes par rapport à la demande
|
||||||
|
stored_objects:
|
||||||
|
- label:
|
||||||
|
fr: ☀️ De 07h à 21h
|
||||||
|
filename: 14_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🌙 De 21h à 07h du matin
|
||||||
|
filename: 15_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🗓️ Dimanches et jours fériés
|
||||||
|
filename: 16_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: Appel famille pour prise en charge de la douleur
|
||||||
|
urgent: true
|
||||||
|
supplementary_informations:
|
||||||
|
- label:
|
||||||
|
fr: Localisation douleur
|
||||||
|
- label:
|
||||||
|
fr: Horaire dernier passage
|
||||||
|
- label:
|
||||||
|
fr: Traitements en cours
|
||||||
|
stored_objects:
|
||||||
|
- label:
|
||||||
|
fr: ☀️ De 07h à 21h
|
||||||
|
filename: 17_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🌙 De 21h à 07h du matin
|
||||||
|
filename: 18_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🗓️ Dimanches et jours fériés
|
||||||
|
filename: 19_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: Appel famille pour information sur la date de prise en charge
|
||||||
|
urgent: false
|
||||||
|
supplementary_informations: []
|
||||||
|
stored_objects:
|
||||||
|
- label:
|
||||||
|
fr: ☀️ De 07h à 21h
|
||||||
|
filename: 20_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🌙 De 21h à 07h du matin
|
||||||
|
filename: 21_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
|
- label:
|
||||||
|
fr: 🗓️ Dimanches et jours fériés
|
||||||
|
filename: 22_doc_20250402_Pelotons flux externes consolidés.pdf
|
||||||
6
resources/translation_override/README.md
Normal file
6
resources/translation_override/README.md
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
In this directory, you find an example of file for the command `chill:main:override_translation`.
|
||||||
|
|
||||||
|
This file contains a list of translations to override in the translation catalogue. Each entry is a dictionary with two keys: `from` and `to`. The `from` key contains the original translation string, and the `to` key contains the replacement string.
|
||||||
|
|
||||||
|
The command `chill:main:override_translation` uses this file to generate a new translation catalogue with the specified overrides applied.
|
||||||
|
|
||||||
8
resources/translation_override/overrides.yaml
Normal file
8
resources/translation_override/overrides.yaml
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
- {from: "de l'usager", to: "du patient"}
|
||||||
|
- {from: "l'usager", to: "le patient"}
|
||||||
|
- {from: "L'usager", to: "Le patient"}
|
||||||
|
- {from: "d'usagers", to: "de patients"}
|
||||||
|
- {from: "usagers", to: "patients"}
|
||||||
|
- {from: "Usagers", to: "Patients"}
|
||||||
|
- {from: "usager", to: "patient"}
|
||||||
|
- {from: "Usager", to: "Patient"}
|
||||||
@@ -382,7 +382,6 @@ final class ActivityController extends AbstractController
|
|||||||
|
|
||||||
$entity = new Activity();
|
$entity = new Activity();
|
||||||
$entity->setUser($this->security->getUser());
|
$entity->setUser($this->security->getUser());
|
||||||
$entity->addUser($this->security->getUser());
|
|
||||||
|
|
||||||
if ($person instanceof Person) {
|
if ($person instanceof Person) {
|
||||||
$entity->setPerson($person);
|
$entity->setPerson($person);
|
||||||
|
|||||||
@@ -88,8 +88,8 @@ class ActivityType extends AbstractType
|
|||||||
|
|
||||||
if (null !== $options['data']->getPerson()) {
|
if (null !== $options['data']->getPerson()) {
|
||||||
$builder->add('scope', ScopePickerType::class, [
|
$builder->add('scope', ScopePickerType::class, [
|
||||||
'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
|
|
||||||
'center' => $options['center'],
|
'center' => $options['center'],
|
||||||
|
'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
|
||||||
'required' => true,
|
'required' => true,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,10 +10,7 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="
|
v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0"
|
||||||
getContext === 'accompanyingCourse' &&
|
|
||||||
suggestedEntities.length > 0
|
|
||||||
"
|
|
||||||
>
|
>
|
||||||
<ul class="list-suggest add-items inline">
|
<ul class="list-suggest add-items inline">
|
||||||
<li
|
<li
|
||||||
|
|||||||
@@ -39,17 +39,11 @@
|
|||||||
<option selected disabled value="">
|
<option selected disabled value="">
|
||||||
{{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
|
{{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
|
||||||
</option>
|
</option>
|
||||||
<option
|
<option v-for="t in locationTypes" :value="t" :key="t.id">
|
||||||
v-for="t in locationTypes"
|
|
||||||
:value="t"
|
|
||||||
:key="t.id"
|
|
||||||
>
|
|
||||||
{{ localizeString(t.title) }}
|
{{ localizeString(t.title) }}
|
||||||
</option>
|
</option>
|
||||||
</select>
|
</select>
|
||||||
<label>{{
|
<label>{{ trans(ACTIVITY_LOCATION_FIELDS_TYPE) }}</label>
|
||||||
trans(ACTIVITY_LOCATION_FIELDS_TYPE)
|
|
||||||
}}</label>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-floating mb-3">
|
<div class="form-floating mb-3">
|
||||||
@@ -108,10 +102,7 @@
|
|||||||
</form>
|
</form>
|
||||||
</template>
|
</template>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<button
|
<button class="btn btn-save" @click.prevent="saveNewLocation">
|
||||||
class="btn btn-save"
|
|
||||||
@click.prevent="saveNewLocation"
|
|
||||||
>
|
|
||||||
{{ trans(SAVE) }}
|
{{ trans(SAVE) }}
|
||||||
</button>
|
</button>
|
||||||
</template>
|
</template>
|
||||||
@@ -244,8 +235,7 @@ export default {
|
|||||||
},
|
},
|
||||||
hasPhonenumber1() {
|
hasPhonenumber1() {
|
||||||
return (
|
return (
|
||||||
this.selected.phonenumber1 !== null &&
|
this.selected.phonenumber1 !== null && this.selected.phonenumber1 !== ""
|
||||||
this.selected.phonenumber1 !== ""
|
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
showAddAddress() {
|
showAddAddress() {
|
||||||
|
|||||||
@@ -43,23 +43,11 @@ export default {
|
|||||||
span.badge {
|
span.badge {
|
||||||
@include badge_social($social-action-color);
|
@include badge_social($social-action-color);
|
||||||
font-size: 95%;
|
font-size: 95%;
|
||||||
white-space: normal;
|
|
||||||
word-wrap: break-word;
|
|
||||||
word-break: break-word;
|
|
||||||
display: inline-block;
|
|
||||||
max-width: 100%;
|
|
||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
margin-right: 1em;
|
margin-right: 1em;
|
||||||
text-align: left;
|
max-width: 100%; /* Adjust as needed */
|
||||||
line-height: 1.2em;
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
&::before {
|
white-space: nowrap;
|
||||||
position: absolute;
|
|
||||||
left: 11px;
|
|
||||||
top: 0;
|
|
||||||
margin: 0 0.3em 0 -0.75em;
|
|
||||||
}
|
|
||||||
position: relative;
|
|
||||||
padding-left: 1.5em;
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -10,9 +10,7 @@
|
|||||||
:value="issue"
|
:value="issue"
|
||||||
/>
|
/>
|
||||||
<label class="form-check-label" :for="issue.id">
|
<label class="form-check-label" :for="issue.id">
|
||||||
<span class="badge bg-chill-l-gray text-dark">{{
|
<span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
|
||||||
issue.text
|
|
||||||
}}</span>
|
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</span>
|
</span>
|
||||||
@@ -43,22 +41,7 @@ export default {
|
|||||||
span.badge {
|
span.badge {
|
||||||
@include badge_social($social-issue-color);
|
@include badge_social($social-issue-color);
|
||||||
font-size: 95%;
|
font-size: 95%;
|
||||||
white-space: normal;
|
|
||||||
word-wrap: break-word;
|
|
||||||
word-break: break-word;
|
|
||||||
display: inline-block;
|
|
||||||
max-width: 100%;
|
|
||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
margin-right: 1em;
|
margin-right: 1em;
|
||||||
text-align: left;
|
|
||||||
|
|
||||||
&::before {
|
|
||||||
position: absolute;
|
|
||||||
left: 11px;
|
|
||||||
top: 0;
|
|
||||||
margin: 0 0.3em 0 -0.75em;
|
|
||||||
}
|
|
||||||
position: relative;
|
|
||||||
padding-left: 1.5em;
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Chill is a software for social workers
|
|
||||||
*
|
|
||||||
* For the full copyright and license information, please view
|
|
||||||
* the LICENSE file that was distributed with this source code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace Chill\Migrations\Activity;
|
|
||||||
|
|
||||||
use Doctrine\DBAL\Schema\Schema;
|
|
||||||
use Doctrine\Migrations\AbstractMigration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Migration fixing the automatic association of users to activities (exchanges).
|
|
||||||
*
|
|
||||||
* Originally, the user who created an exchange was not automatically associated
|
|
||||||
* to it (the "TMS" column), which led to incomplete data and biased statistics.
|
|
||||||
*
|
|
||||||
* This migration:
|
|
||||||
* - retroactively associates the creator of each exchange to the corresponding
|
|
||||||
* activity;
|
|
||||||
* - flags these backfilled associations with a temporary column so it is clear
|
|
||||||
* they were added by this data correction and can be safely cleaned up later.
|
|
||||||
*/
|
|
||||||
final class Version20251118124241 extends AbstractMigration
|
|
||||||
{
|
|
||||||
public function getDescription(): string
|
|
||||||
{
|
|
||||||
return 'Insert the creator of activity into the activity_user table';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function up(Schema $schema): void
|
|
||||||
{
|
|
||||||
$this->addSql('ALTER TABLE activity_user ADD COLUMN by_migration BOOL DEFAULT FALSE');
|
|
||||||
$this->addSql("COMMENT ON COLUMN activity_user.by_migration IS 'For backup purpose - can be safely deleted after a while. See migration \\Chill\\Migrations\\Activity\\Version20251118124241'");
|
|
||||||
|
|
||||||
$this->addSql('INSERT INTO activity_user (activity_id, user_id, by_migration)
|
|
||||||
SELECT id, user_id, true FROM activity
|
|
||||||
ON CONFLICT DO NOTHING');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function down(Schema $schema): void
|
|
||||||
{
|
|
||||||
$this->addSql('ALTER TABLE activity_user DROP COLUMN by_migration');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -12,7 +12,6 @@ declare(strict_types=1);
|
|||||||
namespace Chill\CalendarBundle\Controller;
|
namespace Chill\CalendarBundle\Controller;
|
||||||
|
|
||||||
use Chill\CalendarBundle\Repository\CalendarRepository;
|
use Chill\CalendarBundle\Repository\CalendarRepository;
|
||||||
use Chill\CalendarBundle\Repository\InviteRepository;
|
|
||||||
use Chill\MainBundle\CRUD\Controller\ApiController;
|
use Chill\MainBundle\CRUD\Controller\ApiController;
|
||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
use Chill\MainBundle\Serializer\Model\Collection;
|
use Chill\MainBundle\Serializer\Model\Collection;
|
||||||
@@ -24,10 +23,7 @@ use Symfony\Component\Routing\Annotation\Route;
|
|||||||
|
|
||||||
class CalendarAPIController extends ApiController
|
class CalendarAPIController extends ApiController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(private readonly CalendarRepository $calendarRepository) {}
|
||||||
private readonly CalendarRepository $calendarRepository,
|
|
||||||
private readonly InviteRepository $inviteRepository,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
#[Route(path: '/api/1.0/calendar/calendar/by-user/{id}.{_format}', name: 'chill_api_single_calendar_list_by-user', requirements: ['_format' => 'json'])]
|
#[Route(path: '/api/1.0/calendar/calendar/by-user/{id}.{_format}', name: 'chill_api_single_calendar_list_by-user', requirements: ['_format' => 'json'])]
|
||||||
public function listByUser(User $user, Request $request, string $_format): JsonResponse
|
public function listByUser(User $user, Request $request, string $_format): JsonResponse
|
||||||
@@ -56,37 +52,16 @@ class CalendarAPIController extends ApiController
|
|||||||
throw new BadRequestHttpException('dateTo not parsable');
|
throw new BadRequestHttpException('dateTo not parsable');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get calendar items where user is the main user
|
$total = $this->calendarRepository->countByUser($user, $dateFrom, $dateTo);
|
||||||
$ownCalendars = $this->calendarRepository->findByUser(
|
$paginator = $this->getPaginatorFactory()->create($total);
|
||||||
|
$ranges = $this->calendarRepository->findByUser(
|
||||||
$user,
|
$user,
|
||||||
$dateFrom,
|
$dateFrom,
|
||||||
$dateTo
|
$dateTo,
|
||||||
|
$paginator->getItemsPerPage(),
|
||||||
|
$paginator->getCurrentPageFirstItemNumber()
|
||||||
);
|
);
|
||||||
|
|
||||||
// Get calendar items from accepted invites
|
|
||||||
$acceptedInvites = $this->inviteRepository->findAcceptedInvitesByUserAndDateRange($user, $dateFrom, $dateTo);
|
|
||||||
$inviteCalendars = array_map(fn ($invite) => $invite->getCalendar(), $acceptedInvites);
|
|
||||||
|
|
||||||
// Merge
|
|
||||||
$allCalendars = array_merge($ownCalendars, $inviteCalendars);
|
|
||||||
$uniqueCalendars = [];
|
|
||||||
$seenIds = [];
|
|
||||||
|
|
||||||
foreach ($allCalendars as $calendar) {
|
|
||||||
$id = $calendar->getId();
|
|
||||||
if (!in_array($id, $seenIds, true)) {
|
|
||||||
$seenIds[] = $id;
|
|
||||||
$uniqueCalendars[] = $calendar;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$total = count($uniqueCalendars);
|
|
||||||
$paginator = $this->getPaginatorFactory()->create($total);
|
|
||||||
|
|
||||||
$offset = $paginator->getCurrentPageFirstItemNumber();
|
|
||||||
$limit = $paginator->getItemsPerPage();
|
|
||||||
$ranges = array_slice($uniqueCalendars, $offset, $limit);
|
|
||||||
|
|
||||||
$collection = new Collection($ranges, $paginator);
|
$collection = new Collection($ranges, $paginator);
|
||||||
|
|
||||||
return $this->json($collection, Response::HTTP_OK, [], ['groups' => ['calendar:light']]);
|
return $this->json($collection, Response::HTTP_OK, [], ['groups' => ['calendar:light']]);
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ declare(strict_types=1);
|
|||||||
namespace Chill\CalendarBundle\Repository;
|
namespace Chill\CalendarBundle\Repository;
|
||||||
|
|
||||||
use Chill\CalendarBundle\Entity\Invite;
|
use Chill\CalendarBundle\Entity\Invite;
|
||||||
use Chill\MainBundle\Entity\User;
|
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Doctrine\ORM\EntityRepository;
|
use Doctrine\ORM\EntityRepository;
|
||||||
use Doctrine\Persistence\ObjectRepository;
|
use Doctrine\Persistence\ObjectRepository;
|
||||||
@@ -52,52 +51,6 @@ class InviteRepository implements ObjectRepository
|
|||||||
return $this->entityRepository->findOneBy($criteria);
|
return $this->entityRepository->findOneBy($criteria);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Find accepted invites for a user within a date range.
|
|
||||||
*
|
|
||||||
* @return array|Invite[]
|
|
||||||
*/
|
|
||||||
public function findAcceptedInvitesByUserAndDateRange(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): array
|
|
||||||
{
|
|
||||||
return $this->buildAcceptedInviteByUserAndDateRangeQuery($user, $from, $to)
|
|
||||||
->getQuery()
|
|
||||||
->getResult();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Count accepted invites for a user within a date range.
|
|
||||||
*/
|
|
||||||
public function countAcceptedInvitesByUserAndDateRange(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): int
|
|
||||||
{
|
|
||||||
return $this->buildAcceptedInviteByUserAndDateRangeQuery($user, $from, $to)
|
|
||||||
->select('COUNT(c)')
|
|
||||||
->getQuery()
|
|
||||||
->getSingleScalarResult();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function buildAcceptedInviteByUserAndDateRangeQuery(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to)
|
|
||||||
{
|
|
||||||
$qb = $this->entityRepository->createQueryBuilder('i');
|
|
||||||
|
|
||||||
return $qb
|
|
||||||
->join('i.calendar', 'c')
|
|
||||||
->where(
|
|
||||||
$qb->expr()->andX(
|
|
||||||
$qb->expr()->eq('i.user', ':user'),
|
|
||||||
$qb->expr()->eq('i.status', ':status'),
|
|
||||||
$qb->expr()->gte('c.startDate', ':startDate'),
|
|
||||||
$qb->expr()->lte('c.endDate', ':endDate'),
|
|
||||||
$qb->expr()->isNull('c.cancelReason')
|
|
||||||
)
|
|
||||||
)
|
|
||||||
->setParameters([
|
|
||||||
'user' => $user,
|
|
||||||
'status' => Invite::ACCEPTED,
|
|
||||||
'startDate' => $from,
|
|
||||||
'endDate' => $to,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getClassName(): string
|
public function getClassName(): string
|
||||||
{
|
{
|
||||||
return Invite::class;
|
return Invite::class;
|
||||||
|
|||||||
@@ -68,9 +68,7 @@ export type EventInputCalendarRange = EventInput & {
|
|||||||
export function isEventInputCalendarRange(
|
export function isEventInputCalendarRange(
|
||||||
toBeDetermined: EventInputCalendarRange | EventInput,
|
toBeDetermined: EventInputCalendarRange | EventInput,
|
||||||
): toBeDetermined is EventInputCalendarRange {
|
): toBeDetermined is EventInputCalendarRange {
|
||||||
return (
|
return typeof toBeDetermined.is === "string" && toBeDetermined.is === "range";
|
||||||
typeof toBeDetermined.is === "string" && toBeDetermined.is === "range"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export {};
|
export {};
|
||||||
|
|||||||
@@ -4,18 +4,9 @@
|
|||||||
{{ user.text }}
|
{{ user.text }}
|
||||||
<template v-if="invite !== null">
|
<template v-if="invite !== null">
|
||||||
<i v-if="invite.status === 'accepted'" class="fa fa-check" />
|
<i v-if="invite.status === 'accepted'" class="fa fa-check" />
|
||||||
<i
|
<i v-else-if="invite.status === 'declined'" class="fa fa-times" />
|
||||||
v-else-if="invite.status === 'declined'"
|
<i v-else-if="invite.status === 'pending'" class="fa fa-question-o" />
|
||||||
class="fa fa-times"
|
<i v-else-if="invite.status === 'tentative'" class="fa fa-question" />
|
||||||
/>
|
|
||||||
<i
|
|
||||||
v-else-if="invite.status === 'pending'"
|
|
||||||
class="fa fa-question-o"
|
|
||||||
/>
|
|
||||||
<i
|
|
||||||
v-else-if="invite.status === 'tentative'"
|
|
||||||
class="fa fa-question"
|
|
||||||
/>
|
|
||||||
<span v-else="">{{ invite.status }}</span>
|
<span v-else="">{{ invite.status }}</span>
|
||||||
</template>
|
</template>
|
||||||
</span>
|
</span>
|
||||||
@@ -69,8 +60,7 @@ export default {
|
|||||||
computed: {
|
computed: {
|
||||||
style() {
|
style() {
|
||||||
return {
|
return {
|
||||||
backgroundColor: this.$store.getters.getUserData(this.user)
|
backgroundColor: this.$store.getters.getUserData(this.user).mainColor,
|
||||||
.mainColor,
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
rangeShow: {
|
rangeShow: {
|
||||||
@@ -81,9 +71,7 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
get() {
|
get() {
|
||||||
return this.$store.getters.isRangeShownOnCalendarForUser(
|
return this.$store.getters.isRangeShownOnCalendarForUser(this.user);
|
||||||
this.user,
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
remoteShow: {
|
remoteShow: {
|
||||||
@@ -94,9 +82,7 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
get() {
|
get() {
|
||||||
return this.$store.getters.isRemoteShownOnCalendarForUser(
|
return this.$store.getters.isRemoteShownOnCalendarForUser(this.user);
|
||||||
this.user,
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -22,33 +22,25 @@
|
|||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
|
<ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
|
||||||
<li v-if="status !== Statuses.ACCEPTED">
|
<li v-if="status !== Statuses.ACCEPTED">
|
||||||
<a
|
<a class="dropdown-item" @click="changeStatus(Statuses.ACCEPTED)"
|
||||||
class="dropdown-item"
|
><i class="fa fa-check" aria-hidden="true"></i> {{ $t("Accept") }}</a
|
||||||
@click="changeStatus(Statuses.ACCEPTED)"
|
|
||||||
><i class="fa fa-check" aria-hidden="true"></i>
|
|
||||||
{{ $t("Accept") }}</a
|
|
||||||
>
|
>
|
||||||
</li>
|
</li>
|
||||||
<li v-if="status !== Statuses.DECLINED">
|
<li v-if="status !== Statuses.DECLINED">
|
||||||
<a
|
<a class="dropdown-item" @click="changeStatus(Statuses.DECLINED)"
|
||||||
class="dropdown-item"
|
><i class="fa fa-times" aria-hidden="true"></i> {{ $t("Decline") }}</a
|
||||||
@click="changeStatus(Statuses.DECLINED)"
|
|
||||||
><i class="fa fa-times" aria-hidden="true"></i>
|
|
||||||
{{ $t("Decline") }}</a
|
|
||||||
>
|
>
|
||||||
</li>
|
</li>
|
||||||
<li v-if="status !== Statuses.TENTATIVELY_ACCEPTED">
|
<li v-if="status !== Statuses.TENTATIVELY_ACCEPTED">
|
||||||
<a
|
<a
|
||||||
class="dropdown-item"
|
class="dropdown-item"
|
||||||
@click="changeStatus(Statuses.TENTATIVELY_ACCEPTED)"
|
@click="changeStatus(Statuses.TENTATIVELY_ACCEPTED)"
|
||||||
><i class="fa fa-question"></i>
|
><i class="fa fa-question"></i> {{ $t("Tentatively_accept") }}</a
|
||||||
{{ $t("Tentatively_accept") }}</a
|
|
||||||
>
|
>
|
||||||
</li>
|
</li>
|
||||||
<li v-if="status !== Statuses.PENDING">
|
<li v-if="status !== Statuses.PENDING">
|
||||||
<a class="dropdown-item" @click="changeStatus(Statuses.PENDING)"
|
<a class="dropdown-item" @click="changeStatus(Statuses.PENDING)"
|
||||||
><i class="fa fa-hourglass-o"></i>
|
><i class="fa fa-hourglass-o"></i> {{ $t("Set_pending") }}</a
|
||||||
{{ $t("Set_pending") }}</a
|
|
||||||
>
|
>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -91,9 +83,7 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
emits: {
|
emits: {
|
||||||
statusChanged(
|
statusChanged(payload: "accepted" | "declined" | "pending" | "tentative") {
|
||||||
payload: "accepted" | "declined" | "pending" | "tentative",
|
|
||||||
) {
|
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -108,12 +108,9 @@
|
|||||||
{{ formatDate(event.endStr, "time") }}:
|
{{ formatDate(event.endStr, "time") }}:
|
||||||
{{ event.extendedProps.locationName }}</b
|
{{ event.extendedProps.locationName }}</b
|
||||||
>
|
>
|
||||||
<a
|
<b v-else-if="event.extendedProps.is === 'local'">{{
|
||||||
:href="calendarLink(event.id)"
|
event.title
|
||||||
v-else-if="event.extendedProps.is === 'local'"
|
}}</b>
|
||||||
>
|
|
||||||
<b>{{ event.title }}</b>
|
|
||||||
</a>
|
|
||||||
<b v-else>no 'is'</b>
|
<b v-else>no 'is'</b>
|
||||||
<a
|
<a
|
||||||
v-if="event.extendedProps.is === 'range'"
|
v-if="event.extendedProps.is === 'range'"
|
||||||
@@ -489,12 +486,6 @@ function copyWeek() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const calendarLink = (calendarId: string) => {
|
|
||||||
const idStr = calendarId.match(/_(\d+)$/)?.[1];
|
|
||||||
|
|
||||||
return `/fr/calendar/calendar/${idStr}/edit`;
|
|
||||||
};
|
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
copyFromWeek.value = dateToISO(getMonday(0));
|
copyFromWeek.value = dateToISO(getMonday(0));
|
||||||
copyToWeek.value = dateToISO(getMonday(1));
|
copyToWeek.value = dateToISO(getMonday(1));
|
||||||
|
|||||||
@@ -41,9 +41,7 @@ const futureStore = function (): Promise<Store<State>> {
|
|||||||
});
|
});
|
||||||
|
|
||||||
store.commit("me/setWhoAmi", user, { root: true });
|
store.commit("me/setWhoAmi", user, { root: true });
|
||||||
store
|
store.dispatch("locations/getLocations", null, { root: true }).then((_) => {
|
||||||
.dispatch("locations/getLocations", null, { root: true })
|
|
||||||
.then((_) => {
|
|
||||||
return store.dispatch("locations/getCurrentLocation", null, {
|
return store.dispatch("locations/getCurrentLocation", null, {
|
||||||
root: true,
|
root: true,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -29,10 +29,7 @@ export default {
|
|||||||
(state: CalendarLocalsState) =>
|
(state: CalendarLocalsState) =>
|
||||||
({ start, end }: { start: Date; end: Date }): boolean => {
|
({ start, end }: { start: Date; end: Date }): boolean => {
|
||||||
for (const range of state.localsLoaded) {
|
for (const range of state.localsLoaded) {
|
||||||
if (
|
if (start.getTime() === range.start && end.getTime() === range.end) {
|
||||||
start.getTime() === range.start &&
|
|
||||||
end.getTime() === range.end
|
|
||||||
) {
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -54,10 +51,7 @@ export default {
|
|||||||
});
|
});
|
||||||
state.key = state.key + toAdd.length;
|
state.key = state.key + toAdd.length;
|
||||||
},
|
},
|
||||||
addLoaded(
|
addLoaded(state: CalendarLocalsState, payload: { start: Date; end: Date }) {
|
||||||
state: CalendarLocalsState,
|
|
||||||
payload: { start: Date; end: Date },
|
|
||||||
) {
|
|
||||||
state.localsLoaded.push({
|
state.localsLoaded.push({
|
||||||
start: payload.start.getTime(),
|
start: payload.start.getTime(),
|
||||||
end: payload.end.getTime(),
|
end: payload.end.getTime(),
|
||||||
@@ -85,11 +79,7 @@ export default {
|
|||||||
end: end,
|
end: end,
|
||||||
});
|
});
|
||||||
|
|
||||||
return fetchCalendarLocalForUser(
|
return fetchCalendarLocalForUser(ctx.rootGetters["me/getMe"], start, end)
|
||||||
ctx.rootGetters["me/getMe"],
|
|
||||||
start,
|
|
||||||
end,
|
|
||||||
)
|
|
||||||
.then((remotes: CalendarLight[]) => {
|
.then((remotes: CalendarLight[]) => {
|
||||||
// to be add when reactivity problem will be solve ?
|
// to be add when reactivity problem will be solve ?
|
||||||
//ctx.commit('addRemotes', remotes);
|
//ctx.commit('addRemotes', remotes);
|
||||||
|
|||||||
@@ -40,10 +40,7 @@ export default {
|
|||||||
(state: CalendarRangesState) =>
|
(state: CalendarRangesState) =>
|
||||||
({ start, end }: { start: Date; end: Date }): boolean => {
|
({ start, end }: { start: Date; end: Date }): boolean => {
|
||||||
for (const range of state.rangesLoaded) {
|
for (const range of state.rangesLoaded) {
|
||||||
if (
|
if (start.getTime() === range.start && end.getTime() === range.end) {
|
||||||
start.getTime() === range.start &&
|
|
||||||
end.getTime() === range.end
|
|
||||||
) {
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -110,9 +107,7 @@ export default {
|
|||||||
state: CalendarRangesState,
|
state: CalendarRangesState,
|
||||||
externalEvents: (EventInput & { id: string })[],
|
externalEvents: (EventInput & { id: string })[],
|
||||||
) {
|
) {
|
||||||
const toAdd = externalEvents.filter(
|
const toAdd = externalEvents.filter((r) => !state.rangesIndex.has(r.id));
|
||||||
(r) => !state.rangesIndex.has(r.id),
|
|
||||||
);
|
|
||||||
|
|
||||||
toAdd.forEach((r) => {
|
toAdd.forEach((r) => {
|
||||||
state.rangesIndex.add(r.id);
|
state.rangesIndex.add(r.id);
|
||||||
@@ -120,10 +115,7 @@ export default {
|
|||||||
});
|
});
|
||||||
state.key = state.key + toAdd.length;
|
state.key = state.key + toAdd.length;
|
||||||
},
|
},
|
||||||
addLoaded(
|
addLoaded(state: CalendarRangesState, payload: { start: Date; end: Date }) {
|
||||||
state: CalendarRangesState,
|
|
||||||
payload: { start: Date; end: Date },
|
|
||||||
) {
|
|
||||||
state.rangesLoaded.push({
|
state.rangesLoaded.push({
|
||||||
start: payload.start.getTime(),
|
start: payload.start.getTime(),
|
||||||
end: payload.end.getTime(),
|
end: payload.end.getTime(),
|
||||||
@@ -142,17 +134,12 @@ export default {
|
|||||||
},
|
},
|
||||||
removeRange(state: CalendarRangesState, calendarRangeId: number) {
|
removeRange(state: CalendarRangesState, calendarRangeId: number) {
|
||||||
const found = state.ranges.find(
|
const found = state.ranges.find(
|
||||||
(r) =>
|
(r) => r.calendarRangeId === calendarRangeId && r.is === "range",
|
||||||
r.calendarRangeId === calendarRangeId && r.is === "range",
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if (found !== undefined) {
|
if (found !== undefined) {
|
||||||
state.ranges = state.ranges.filter(
|
state.ranges = state.ranges.filter(
|
||||||
(r) =>
|
(r) => !(r.calendarRangeId === calendarRangeId && r.is === "range"),
|
||||||
!(
|
|
||||||
r.calendarRangeId === calendarRangeId &&
|
|
||||||
r.is === "range"
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if (typeof found.id === "string") {
|
if (typeof found.id === "string") {
|
||||||
@@ -211,11 +198,7 @@ export default {
|
|||||||
},
|
},
|
||||||
createRange(
|
createRange(
|
||||||
ctx: Context,
|
ctx: Context,
|
||||||
{
|
{ start, end, location }: { start: Date; end: Date; location: Location },
|
||||||
start,
|
|
||||||
end,
|
|
||||||
location,
|
|
||||||
}: { start: Date; end: Date; location: Location },
|
|
||||||
): Promise<null> {
|
): Promise<null> {
|
||||||
const url = `/api/1.0/calendar/calendar-range.json?`;
|
const url = `/api/1.0/calendar/calendar-range.json?`;
|
||||||
|
|
||||||
@@ -240,11 +223,7 @@ export default {
|
|||||||
},
|
},
|
||||||
} as CalendarRangeCreate;
|
} as CalendarRangeCreate;
|
||||||
|
|
||||||
return makeFetch<CalendarRangeCreate, CalendarRange>(
|
return makeFetch<CalendarRangeCreate, CalendarRange>("POST", url, body)
|
||||||
"POST",
|
|
||||||
url,
|
|
||||||
body,
|
|
||||||
)
|
|
||||||
.then((newRange) => {
|
.then((newRange) => {
|
||||||
ctx.commit("addRange", newRange);
|
ctx.commit("addRange", newRange);
|
||||||
|
|
||||||
@@ -281,11 +260,7 @@ export default {
|
|||||||
},
|
},
|
||||||
} as CalendarRangeEdit;
|
} as CalendarRangeEdit;
|
||||||
|
|
||||||
return makeFetch<CalendarRangeEdit, CalendarRange>(
|
return makeFetch<CalendarRangeEdit, CalendarRange>("PATCH", url, body)
|
||||||
"PATCH",
|
|
||||||
url,
|
|
||||||
body,
|
|
||||||
)
|
|
||||||
.then((range) => {
|
.then((range) => {
|
||||||
ctx.commit("updateRange", range);
|
ctx.commit("updateRange", range);
|
||||||
return Promise.resolve(null);
|
return Promise.resolve(null);
|
||||||
@@ -310,11 +285,7 @@ export default {
|
|||||||
},
|
},
|
||||||
} as CalendarRangeEdit;
|
} as CalendarRangeEdit;
|
||||||
|
|
||||||
return makeFetch<CalendarRangeEdit, CalendarRange>(
|
return makeFetch<CalendarRangeEdit, CalendarRange>("PATCH", url, body)
|
||||||
"PATCH",
|
|
||||||
url,
|
|
||||||
body,
|
|
||||||
)
|
|
||||||
.then((range) => {
|
.then((range) => {
|
||||||
ctx.commit("updateRange", range);
|
ctx.commit("updateRange", range);
|
||||||
return Promise.resolve(null);
|
return Promise.resolve(null);
|
||||||
@@ -334,20 +305,14 @@ export default {
|
|||||||
|
|
||||||
for (const r of rangesToCopy) {
|
for (const r of rangesToCopy) {
|
||||||
const start = new Date(ISOToDatetime(r.start) as Date);
|
const start = new Date(ISOToDatetime(r.start) as Date);
|
||||||
start.setFullYear(
|
start.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
|
||||||
to.getFullYear(),
|
|
||||||
to.getMonth(),
|
|
||||||
to.getDate(),
|
|
||||||
);
|
|
||||||
const end = new Date(ISOToDatetime(r.end) as Date);
|
const end = new Date(ISOToDatetime(r.end) as Date);
|
||||||
end.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
|
end.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
|
||||||
const location = ctx.rootGetters["locations/getLocationById"](
|
const location = ctx.rootGetters["locations/getLocationById"](
|
||||||
r.locationId,
|
r.locationId,
|
||||||
);
|
);
|
||||||
|
|
||||||
promises.push(
|
promises.push(ctx.dispatch("createRange", { start, end, location }));
|
||||||
ctx.dispatch("createRange", { start, end, location }),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return Promise.all(promises).then(() => Promise.resolve(null));
|
return Promise.all(promises).then(() => Promise.resolve(null));
|
||||||
@@ -369,9 +334,7 @@ export default {
|
|||||||
r.locationId,
|
r.locationId,
|
||||||
);
|
);
|
||||||
|
|
||||||
promises.push(
|
promises.push(ctx.dispatch("createRange", { start, end, location }));
|
||||||
ctx.dispatch("createRange", { start, end, location }),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return Promise.all(promises).then(() => Promise.resolve(null));
|
return Promise.all(promises).then(() => Promise.resolve(null));
|
||||||
|
|||||||
@@ -29,10 +29,7 @@ export default {
|
|||||||
(state: CalendarRemotesState) =>
|
(state: CalendarRemotesState) =>
|
||||||
({ start, end }: { start: Date; end: Date }): boolean => {
|
({ start, end }: { start: Date; end: Date }): boolean => {
|
||||||
for (const range of state.remotesLoaded) {
|
for (const range of state.remotesLoaded) {
|
||||||
if (
|
if (start.getTime() === range.start && end.getTime() === range.end) {
|
||||||
start.getTime() === range.start &&
|
|
||||||
end.getTime() === range.end
|
|
||||||
) {
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -85,11 +82,7 @@ export default {
|
|||||||
end: end,
|
end: end,
|
||||||
});
|
});
|
||||||
|
|
||||||
return fetchCalendarRemoteForUser(
|
return fetchCalendarRemoteForUser(ctx.rootGetters["me/getMe"], start, end)
|
||||||
ctx.rootGetters["me/getMe"],
|
|
||||||
start,
|
|
||||||
end,
|
|
||||||
)
|
|
||||||
.then((remotes: CalendarRemote[]) => {
|
.then((remotes: CalendarRemote[]) => {
|
||||||
// to be add when reactivity problem will be solve ?
|
// to be add when reactivity problem will be solve ?
|
||||||
//ctx.commit('addRemotes', remotes);
|
//ctx.commit('addRemotes', remotes);
|
||||||
|
|||||||
@@ -112,11 +112,8 @@ export default {
|
|||||||
|
|
||||||
results.forEach((i) => {
|
results.forEach((i) => {
|
||||||
if (!users.some((j) => i.user.id === j.id)) {
|
if (!users.some((j) => i.user.id === j.id)) {
|
||||||
let ratio = Math.floor(
|
let ratio = Math.floor(users.length / COLORS.length);
|
||||||
users.length / COLORS.length,
|
let colorIndex = users.length - ratio * COLORS.length;
|
||||||
);
|
|
||||||
let colorIndex =
|
|
||||||
users.length - ratio * COLORS.length;
|
|
||||||
users.push({
|
users.push({
|
||||||
id: i.user.id,
|
id: i.user.id,
|
||||||
username: i.user.username,
|
username: i.user.username,
|
||||||
@@ -153,45 +150,29 @@ export default {
|
|||||||
(me) =>
|
(me) =>
|
||||||
new Promise((resolve, reject) => {
|
new Promise((resolve, reject) => {
|
||||||
this.users.logged = me;
|
this.users.logged = me;
|
||||||
let currentUser = users.find(
|
let currentUser = users.find((u) => u.id === me.id);
|
||||||
(u) => u.id === me.id,
|
|
||||||
);
|
|
||||||
this.value = currentUser;
|
this.value = currentUser;
|
||||||
|
|
||||||
fetchCalendar(currentUser.id).then(
|
fetchCalendar(currentUser.id).then(
|
||||||
(calendar) =>
|
(calendar) =>
|
||||||
new Promise(
|
new Promise((resolve, reject) => {
|
||||||
(resolve, reject) => {
|
let results = calendar.results;
|
||||||
let results =
|
let events = results.map((i) => ({
|
||||||
calendar.results;
|
start: i.startDate.datetime,
|
||||||
let events =
|
end: i.endDate.datetime,
|
||||||
results.map(
|
}));
|
||||||
(i) => ({
|
let calendarEventsCurrentUser = {
|
||||||
start: i
|
|
||||||
.startDate
|
|
||||||
.datetime,
|
|
||||||
end: i
|
|
||||||
.endDate
|
|
||||||
.datetime,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
let calendarEventsCurrentUser =
|
|
||||||
{
|
|
||||||
events: events,
|
events: events,
|
||||||
color: "darkblue",
|
color: "darkblue",
|
||||||
id: 1000,
|
id: 1000,
|
||||||
editable: false,
|
editable: false,
|
||||||
};
|
};
|
||||||
this.calendarEvents.user =
|
this.calendarEvents.user = calendarEventsCurrentUser;
|
||||||
calendarEventsCurrentUser;
|
|
||||||
|
|
||||||
this.selectUsers(
|
this.selectUsers(currentUser);
|
||||||
currentUser,
|
|
||||||
);
|
|
||||||
|
|
||||||
resolve();
|
resolve();
|
||||||
},
|
}),
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
resolve();
|
resolve();
|
||||||
@@ -209,9 +190,7 @@ export default {
|
|||||||
return `${value.username}`;
|
return `${value.username}`;
|
||||||
},
|
},
|
||||||
coloriseSelectedValues() {
|
coloriseSelectedValues() {
|
||||||
let tags = document.querySelectorAll(
|
let tags = document.querySelectorAll("div.multiselect__tags-wrap")[0];
|
||||||
"div.multiselect__tags-wrap",
|
|
||||||
)[0];
|
|
||||||
|
|
||||||
if (tags.hasChildNodes()) {
|
if (tags.hasChildNodes()) {
|
||||||
let children = tags.childNodes;
|
let children = tags.childNodes;
|
||||||
@@ -232,8 +211,8 @@ export default {
|
|||||||
},
|
},
|
||||||
selectEvents() {
|
selectEvents() {
|
||||||
let selectedUsersId = this.users.selected.map((a) => a.id);
|
let selectedUsersId = this.users.selected.map((a) => a.id);
|
||||||
this.calendarEvents.selected = this.calendarEvents.loaded.filter(
|
this.calendarEvents.selected = this.calendarEvents.loaded.filter((a) =>
|
||||||
(a) => selectedUsersId.includes(a.id),
|
selectedUsersId.includes(a.id),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
selectUsers(value) {
|
selectUsers(value) {
|
||||||
@@ -243,9 +222,7 @@ export default {
|
|||||||
this.updateEventsSource();
|
this.updateEventsSource();
|
||||||
},
|
},
|
||||||
unSelectUsers(value) {
|
unSelectUsers(value) {
|
||||||
this.users.selected = this.users.selected.filter(
|
this.users.selected = this.users.selected.filter((a) => a.id != value.id);
|
||||||
(a) => a.id != value.id,
|
|
||||||
);
|
|
||||||
this.selectEvents();
|
this.selectEvents();
|
||||||
this.updateEventsSource();
|
this.updateEventsSource();
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -20,10 +20,7 @@
|
|||||||
</option>
|
</option>
|
||||||
<template v-for="t in templates" :key="t.id">
|
<template v-for="t in templates" :key="t.id">
|
||||||
<option :value="t.id">
|
<option :value="t.id">
|
||||||
{{
|
{{ localizeString(t.name) || "Aucun nom défini" }}
|
||||||
localizeString(t.name) ||
|
|
||||||
"Aucun nom défini"
|
|
||||||
}}
|
|
||||||
</option>
|
</option>
|
||||||
</template>
|
</template>
|
||||||
</select>
|
</select>
|
||||||
@@ -31,9 +28,7 @@
|
|||||||
v-if="canGenerate"
|
v-if="canGenerate"
|
||||||
class="btn btn-update btn-sm change-icon"
|
class="btn btn-update btn-sm change-icon"
|
||||||
:href="buildUrlGenerate"
|
:href="buildUrlGenerate"
|
||||||
@click.prevent="
|
@click.prevent="clickGenerate($event, buildUrlGenerate)"
|
||||||
clickGenerate($event, buildUrlGenerate)
|
|
||||||
"
|
|
||||||
><i class="fa fa-fw fa-cog"
|
><i class="fa fa-fw fa-cog"
|
||||||
/></a>
|
/></a>
|
||||||
<a
|
<a
|
||||||
|
|||||||
@@ -25,8 +25,6 @@ use Symfony\Component\Mailer\MailerInterface;
|
|||||||
use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
|
use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
|
|
||||||
// use Symfony\Component\Translation\LocaleSwitcher;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see OnGenerationFailsTest for test suite
|
* @see OnGenerationFailsTest for test suite
|
||||||
*/
|
*/
|
||||||
@@ -42,7 +40,6 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
|
|||||||
private StoredObjectRepositoryInterface $storedObjectRepository,
|
private StoredObjectRepositoryInterface $storedObjectRepository,
|
||||||
private TranslatorInterface $translator,
|
private TranslatorInterface $translator,
|
||||||
private UserRepositoryInterface $userRepository,
|
private UserRepositoryInterface $userRepository,
|
||||||
// private LocaleSwitcher $localeSwitcher,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public static function getSubscribedEvents()
|
public static function getSubscribedEvents()
|
||||||
@@ -121,25 +118,6 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
|
|
||||||
/*
|
|
||||||
$this->localeSwitcher->runWithLocale($creator->getLocale(), function () use ($message, $errors, $template, $creator) {
|
|
||||||
$email = (new TemplatedEmail())
|
|
||||||
->to($message->getSendResultToEmail())
|
|
||||||
->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))
|
|
||||||
->textTemplate('@ChillDocGenerator/Email/on_generation_failed_email.txt.twig')
|
|
||||||
->context([
|
|
||||||
'errors' => $errors,
|
|
||||||
'template' => $template,
|
|
||||||
'creator' => $creator,
|
|
||||||
'stored_object_id' => $message->getDestinationStoredObjectId(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
$this->mailer->send($email);
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Current implementation:
|
|
||||||
$email = (new TemplatedEmail())
|
$email = (new TemplatedEmail())
|
||||||
->to($message->getSendResultToEmail())
|
->to($message->getSendResultToEmail())
|
||||||
->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))
|
->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))
|
||||||
|
|||||||
@@ -27,8 +27,6 @@ use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
|
|||||||
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
|
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
|
|
||||||
// use Symfony\Component\Translation\LocaleSwitcher;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle the request of document generation.
|
* Handle the request of document generation.
|
||||||
*/
|
*/
|
||||||
@@ -48,7 +46,6 @@ class RequestGenerationHandler implements MessageHandlerInterface
|
|||||||
private readonly MailerInterface $mailer,
|
private readonly MailerInterface $mailer,
|
||||||
private readonly TranslatorInterface $translator,
|
private readonly TranslatorInterface $translator,
|
||||||
private readonly StoredObjectManagerInterface $storedObjectManager,
|
private readonly StoredObjectManagerInterface $storedObjectManager,
|
||||||
// private readonly LocaleSwitcher $localeSwitcher,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function __invoke(RequestGenerationMessage $message)
|
public function __invoke(RequestGenerationMessage $message)
|
||||||
@@ -125,30 +122,6 @@ class RequestGenerationHandler implements MessageHandlerInterface
|
|||||||
|
|
||||||
private function sendDataDump(StoredObject $destinationStoredObject, RequestGenerationMessage $message): void
|
private function sendDataDump(StoredObject $destinationStoredObject, RequestGenerationMessage $message): void
|
||||||
{
|
{
|
||||||
// Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
|
|
||||||
// Note: This method sends emails to admin addresses, not user addresses, so locale switching may not be needed
|
|
||||||
/*
|
|
||||||
$this->localeSwitcher->runWithLocale('fr', function () use ($destinationStoredObject, $message) {
|
|
||||||
// Get the content of the document
|
|
||||||
$content = $this->storedObjectManager->read($destinationStoredObject);
|
|
||||||
$filename = $destinationStoredObject->getFilename();
|
|
||||||
$contentType = $destinationStoredObject->getType();
|
|
||||||
|
|
||||||
// Create the email with the document as an attachment
|
|
||||||
$email = (new TemplatedEmail())
|
|
||||||
->to($message->getSendResultToEmail())
|
|
||||||
->textTemplate('@ChillDocGenerator/Email/send_data_dump_to_admin.txt.twig')
|
|
||||||
->context([
|
|
||||||
'filename' => $filename,
|
|
||||||
])
|
|
||||||
->subject($this->translator->trans('docgen.data_dump_email.subject'))
|
|
||||||
->attach($content, $filename, $contentType);
|
|
||||||
|
|
||||||
$this->mailer->send($email);
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Current implementation:
|
|
||||||
// Get the content of the document
|
// Get the content of the document
|
||||||
$content = $this->storedObjectManager->read($destinationStoredObject);
|
$content = $this->storedObjectManager->read($destinationStoredObject);
|
||||||
$filename = $destinationStoredObject->getFilename();
|
$filename = $destinationStoredObject->getFilename();
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ class StoredObject implements Document, TrackCreationInterface
|
|||||||
/**
|
/**
|
||||||
* @var Collection<int, StoredObjectVersion>&Selectable<int, StoredObjectVersion>
|
* @var Collection<int, StoredObjectVersion>&Selectable<int, StoredObjectVersion>
|
||||||
*/
|
*/
|
||||||
#[ORM\OneToMany(mappedBy: 'storedObject', targetEntity: StoredObjectVersion::class, cascade: ['persist'], orphanRemoval: true)]
|
#[ORM\OneToMany(mappedBy: 'storedObject', targetEntity: StoredObjectVersion::class, cascade: ['persist'], orphanRemoval: true, fetch: 'EAGER')]
|
||||||
private Collection&Selectable $versions;
|
private Collection&Selectable $versions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ use Chill\DocStoreBundle\Entity\PersonDocument;
|
|||||||
use Chill\MainBundle\Form\Type\ChillDateType;
|
use Chill\MainBundle\Form\Type\ChillDateType;
|
||||||
use Chill\MainBundle\Form\Type\ChillTextareaType;
|
use Chill\MainBundle\Form\Type\ChillTextareaType;
|
||||||
use Chill\MainBundle\Form\Type\ScopePickerType;
|
use Chill\MainBundle\Form\Type\ScopePickerType;
|
||||||
|
use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
|
||||||
use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
|
use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
|
||||||
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
|
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
|
||||||
use Doctrine\ORM\EntityRepository;
|
use Doctrine\ORM\EntityRepository;
|
||||||
@@ -29,7 +30,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
|
|||||||
|
|
||||||
class PersonDocumentType extends AbstractType
|
class PersonDocumentType extends AbstractType
|
||||||
{
|
{
|
||||||
public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly ScopeResolverDispatcher $scopeResolverDispatcher, private readonly ParameterBagInterface $parameterBag) {}
|
public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly ScopeResolverDispatcher $scopeResolverDispatcher, private readonly ParameterBagInterface $parameterBag, private readonly CenterResolverDispatcher $centerResolverDispatcher) {}
|
||||||
|
|
||||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||||
{
|
{
|
||||||
@@ -56,8 +57,8 @@ class PersonDocumentType extends AbstractType
|
|||||||
|
|
||||||
if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
|
if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
|
||||||
$builder->add('scope', ScopePickerType::class, [
|
$builder->add('scope', ScopePickerType::class, [
|
||||||
|
'center' => $this->centerResolverDispatcher->resolveCenter($document),
|
||||||
'role' => $options['role'],
|
'role' => $options['role'],
|
||||||
'subject' => $document,
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,8 +13,9 @@ const startApp = (
|
|||||||
|
|
||||||
const inputTitle = collectionEntry?.querySelector("input[type='text']");
|
const inputTitle = collectionEntry?.querySelector("input[type='text']");
|
||||||
|
|
||||||
const input_stored_object: HTMLInputElement | null =
|
const input_stored_object: HTMLInputElement | null = divElement.querySelector(
|
||||||
divElement.querySelector("input[data-stored-object]");
|
"input[data-stored-object]",
|
||||||
|
);
|
||||||
if (null === input_stored_object) {
|
if (null === input_stored_object) {
|
||||||
throw new Error("input to stored object not found");
|
throw new Error("input to stored object not found");
|
||||||
}
|
}
|
||||||
@@ -53,9 +54,7 @@ const startApp = (
|
|||||||
console.log("version added", stored_object_version);
|
console.log("version added", stored_object_version);
|
||||||
this.$data.existingDoc = stored_object;
|
this.$data.existingDoc = stored_object;
|
||||||
this.$data.existingDoc.currentVersion = stored_object_version;
|
this.$data.existingDoc.currentVersion = stored_object_version;
|
||||||
input_stored_object.value = JSON.stringify(
|
input_stored_object.value = JSON.stringify(this.$data.existingDoc);
|
||||||
this.$data.existingDoc,
|
|
||||||
);
|
|
||||||
if (this.$data.inputTitle) {
|
if (this.$data.inputTitle) {
|
||||||
if (!this.$data.inputTitle?.value) {
|
if (!this.$data.inputTitle?.value) {
|
||||||
this.$data.inputTitle.value = file_name;
|
this.$data.inputTitle.value = file_name;
|
||||||
|
|||||||
@@ -49,9 +49,7 @@
|
|||||||
<li v-if="isHistoryViewable">
|
<li v-if="isHistoryViewable">
|
||||||
<history-button
|
<history-button
|
||||||
:stored-object="props.storedObject"
|
:stored-object="props.storedObject"
|
||||||
:can-edit="
|
:can-edit="canEdit && props.storedObject._permissions.canEdit"
|
||||||
canEdit && props.storedObject._permissions.canEdit
|
|
||||||
"
|
|
||||||
></history-button>
|
></history-button>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -129,9 +127,7 @@ const props = withDefaults(defineProps<DocumentActionButtonsGroupConfig>(), {
|
|||||||
canDownload: true,
|
canDownload: true,
|
||||||
canConvertPdf: true,
|
canConvertPdf: true,
|
||||||
returnPath:
|
returnPath:
|
||||||
window.location.pathname +
|
window.location.pathname + window.location.search + window.location.hash,
|
||||||
window.location.search +
|
|
||||||
window.location.hash,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -29,9 +29,7 @@
|
|||||||
</modal>
|
</modal>
|
||||||
</teleport>
|
</teleport>
|
||||||
<div class="col-12 m-auto sticky-top">
|
<div class="col-12 m-auto sticky-top">
|
||||||
<div
|
<div class="row justify-content-center border-bottom pdf-tools d-md-none">
|
||||||
class="row justify-content-center border-bottom pdf-tools d-md-none"
|
|
||||||
>
|
|
||||||
<div class="col-5 text-center turn-page">
|
<div class="col-5 text-center turn-page">
|
||||||
<select
|
<select
|
||||||
class="form-select form-select-sm"
|
class="form-select form-select-sm"
|
||||||
@@ -92,10 +90,7 @@
|
|||||||
v-if="signature.zones.length === 1 && signedState !== 'signed'"
|
v-if="signature.zones.length === 1 && signedState !== 'signed'"
|
||||||
class="col-5 p-0 text-center turnSignature"
|
class="col-5 p-0 text-center turnSignature"
|
||||||
>
|
>
|
||||||
<button
|
<button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
|
||||||
class="btn btn-light btn-sm"
|
|
||||||
@click="goToSignatureZoneUnique"
|
|
||||||
>
|
|
||||||
{{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
|
{{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -150,10 +145,7 @@
|
|||||||
:title="trans(SIGNATURES_ADD_SIGN_ZONE)"
|
:title="trans(SIGNATURES_ADD_SIGN_ZONE)"
|
||||||
>
|
>
|
||||||
<template v-if="canvasEvent === 'add'">
|
<template v-if="canvasEvent === 'add'">
|
||||||
<div
|
<div class="spinner-border spinner-border-sm" role="status">
|
||||||
class="spinner-border spinner-border-sm"
|
|
||||||
role="status"
|
|
||||||
>
|
|
||||||
<span class="visually-hidden">Loading...</span>
|
<span class="visually-hidden">Loading...</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -207,10 +199,7 @@
|
|||||||
v-if="signature.zones.length === 1 && signedState !== 'signed'"
|
v-if="signature.zones.length === 1 && signedState !== 'signed'"
|
||||||
class="col-4 d-xl-none text-center turnSignature p-0"
|
class="col-4 d-xl-none text-center turnSignature p-0"
|
||||||
>
|
>
|
||||||
<button
|
<button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
|
||||||
class="btn btn-light btn-sm"
|
|
||||||
@click="goToSignatureZoneUnique"
|
|
||||||
>
|
|
||||||
{{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
|
{{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -238,10 +227,7 @@
|
|||||||
v-if="signature.zones.length === 1 && signedState !== 'signed'"
|
v-if="signature.zones.length === 1 && signedState !== 'signed'"
|
||||||
class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
|
class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
|
||||||
>
|
>
|
||||||
<button
|
<button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
|
||||||
class="btn btn-light btn-sm"
|
|
||||||
@click="goToSignatureZoneUnique"
|
|
||||||
>
|
|
||||||
{{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
|
{{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -299,10 +285,7 @@
|
|||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
{{ trans(SIGNATURES_CLICK_ON_DOCUMENT) }}
|
{{ trans(SIGNATURES_CLICK_ON_DOCUMENT) }}
|
||||||
<div
|
<div class="spinner-border spinner-border-sm" role="status">
|
||||||
class="spinner-border spinner-border-sm"
|
|
||||||
role="status"
|
|
||||||
>
|
|
||||||
<span class="visually-hidden">Loading...</span>
|
<span class="visually-hidden">Loading...</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -562,14 +545,8 @@ const addCanvasEvents = () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
const canvas = document.querySelectorAll(
|
const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
|
||||||
"canvas",
|
canvas.addEventListener("pointerup", (e) => canvasClick(e, canvas), false);
|
||||||
)[0] as HTMLCanvasElement;
|
|
||||||
canvas.addEventListener(
|
|
||||||
"pointerup",
|
|
||||||
(e) => canvasClick(e, canvas),
|
|
||||||
false,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -605,11 +582,7 @@ const hitSignature = (
|
|||||||
scaleYToCanvas(zone.y, canvas.height, zone.PDFPage.height) <
|
scaleYToCanvas(zone.y, canvas.height, zone.PDFPage.height) <
|
||||||
xy[1] &&
|
xy[1] &&
|
||||||
xy[1] <
|
xy[1] <
|
||||||
scaleYToCanvas(
|
scaleYToCanvas(zone.height - zone.y, canvas.height, zone.PDFPage.height) +
|
||||||
zone.height - zone.y,
|
|
||||||
canvas.height,
|
|
||||||
zone.PDFPage.height,
|
|
||||||
) +
|
|
||||||
zone.PDFPage.height * zoom.value;
|
zone.PDFPage.height * zoom.value;
|
||||||
|
|
||||||
const selectZone = async (z: SignatureZone, canvas: HTMLCanvasElement) => {
|
const selectZone = async (z: SignatureZone, canvas: HTMLCanvasElement) => {
|
||||||
@@ -625,8 +598,7 @@ const selectZoneEvent = (e: PointerEvent, canvas: HTMLCanvasElement) =>
|
|||||||
signature.zones
|
signature.zones
|
||||||
.filter(
|
.filter(
|
||||||
(z) =>
|
(z) =>
|
||||||
(z.PDFPage.index + 1 === getCanvasId(canvas) &&
|
(z.PDFPage.index + 1 === getCanvasId(canvas) && multiPage.value) ||
|
||||||
multiPage.value) ||
|
|
||||||
(z.PDFPage.index + 1 === page.value && !multiPage.value),
|
(z.PDFPage.index + 1 === page.value && !multiPage.value),
|
||||||
)
|
)
|
||||||
.map((z) => {
|
.map((z) => {
|
||||||
|
|||||||
@@ -153,12 +153,10 @@ const handleFile = async (file: File): Promise<void> => {
|
|||||||
</p>
|
</p>
|
||||||
<!-- todo i18n -->
|
<!-- todo i18n -->
|
||||||
<p v-if="has_existing_doc">
|
<p v-if="has_existing_doc">
|
||||||
Déposez un document ou cliquez ici pour remplacer le document
|
Déposez un document ou cliquez ici pour remplacer le document existant
|
||||||
existant
|
|
||||||
</p>
|
</p>
|
||||||
<p v-else>
|
<p v-else>
|
||||||
Déposez un document ou cliquez ici pour ouvrir le navigateur de
|
Déposez un document ou cliquez ici pour ouvrir le navigateur de fichier
|
||||||
fichier
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="waiting">
|
<div v-else class="waiting">
|
||||||
|
|||||||
@@ -35,9 +35,7 @@ async function download_and_open(event: Event): Promise<void> {
|
|||||||
if (null === state.content) {
|
if (null === state.content) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
const raw = await download_doc(
|
const raw = await download_doc(build_convert_link(props.storedObject.uuid));
|
||||||
build_convert_link(props.storedObject.uuid),
|
|
||||||
);
|
|
||||||
state.content = window.URL.createObjectURL(raw);
|
state.content = window.URL.createObjectURL(raw);
|
||||||
|
|
||||||
button.href = window.URL.createObjectURL(raw);
|
button.href = window.URL.createObjectURL(raw);
|
||||||
|
|||||||
@@ -42,9 +42,7 @@ const editionUntilFormatted = computed<string>(() => {
|
|||||||
<modal v-if="state.modalOpened" @close="state.modalOpened = false">
|
<modal v-if="state.modalOpened" @close="state.modalOpened = false">
|
||||||
<template v-slot:body>
|
<template v-slot:body>
|
||||||
<div class="desktop-edit">
|
<div class="desktop-edit">
|
||||||
<p class="center">
|
<p class="center">Veuillez enregistrer vos modifications avant le</p>
|
||||||
Veuillez enregistrer vos modifications avant le
|
|
||||||
</p>
|
|
||||||
<p>
|
<p>
|
||||||
<strong>{{ editionUntilFormatted }}</strong>
|
<strong>{{ editionUntilFormatted }}</strong>
|
||||||
</p>
|
</p>
|
||||||
@@ -57,23 +55,21 @@ const editionUntilFormatted = computed<string>(() => {
|
|||||||
|
|
||||||
<p>
|
<p>
|
||||||
<small
|
<small
|
||||||
>Le document peut être édité uniquement en utilisant
|
>Le document peut être édité uniquement en utilisant Libre
|
||||||
Libre Office.</small
|
Office.</small
|
||||||
>
|
>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<small
|
<small
|
||||||
>En cas d'échec lors de l'enregistrement, sauver le
|
>En cas d'échec lors de l'enregistrement, sauver le document sur
|
||||||
document sur le poste de travail avant de le déposer
|
le poste de travail avant de le déposer à nouveau ici.</small
|
||||||
à nouveau ici.</small
|
|
||||||
>
|
>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<small
|
<small
|
||||||
>Vous pouvez naviguez sur d'autres pages pendant
|
>Vous pouvez naviguez sur d'autres pages pendant l'édition.</small
|
||||||
l'édition.</small
|
|
||||||
>
|
>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -95,10 +95,7 @@ async function download_and_open(): Promise<void> {
|
|||||||
let raw;
|
let raw;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
raw = await download_and_decrypt_doc(
|
raw = await download_and_decrypt_doc(props.storedObject, props.atVersion);
|
||||||
props.storedObject,
|
|
||||||
props.atVersion,
|
|
||||||
);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("error while downloading and decrypting document");
|
console.error("error while downloading and decrypting document");
|
||||||
console.error(e);
|
console.error(e);
|
||||||
|
|||||||
@@ -2,9 +2,7 @@
|
|||||||
<a
|
<a
|
||||||
:class="Object.assign(props.classes, { btn: true })"
|
:class="Object.assign(props.classes, { btn: true })"
|
||||||
@click="beforeLeave($event)"
|
@click="beforeLeave($event)"
|
||||||
:href="
|
:href="build_wopi_editor_link(props.storedObject.uuid, props.returnPath)"
|
||||||
build_wopi_editor_link(props.storedObject.uuid, props.returnPath)
|
|
||||||
"
|
|
||||||
>
|
>
|
||||||
<i class="fa fa-paragraph"></i>
|
<i class="fa fa-paragraph"></i>
|
||||||
Editer en ligne
|
Editer en ligne
|
||||||
|
|||||||
@@ -145,9 +145,7 @@ async function download_info_link(
|
|||||||
function build_wopi_editor_link(uuid: string, returnPath?: string) {
|
function build_wopi_editor_link(uuid: string, returnPath?: string) {
|
||||||
if (returnPath === undefined) {
|
if (returnPath === undefined) {
|
||||||
returnPath =
|
returnPath =
|
||||||
window.location.pathname +
|
window.location.pathname + window.location.search + window.location.hash;
|
||||||
window.location.search +
|
|
||||||
window.location.hash;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -177,8 +175,6 @@ async function download_and_decrypt_doc(
|
|||||||
throw new Error("no version associated to stored object");
|
throw new Error("no version associated to stored object");
|
||||||
}
|
}
|
||||||
|
|
||||||
// sometimes, the downloadInfo may be embedded into the storedObject
|
|
||||||
console.log("storedObject", storedObject);
|
|
||||||
let downloadInfo;
|
let downloadInfo;
|
||||||
if (
|
if (
|
||||||
typeof storedObject._links !== "undefined" &&
|
typeof storedObject._links !== "undefined" &&
|
||||||
@@ -186,10 +182,7 @@ async function download_and_decrypt_doc(
|
|||||||
) {
|
) {
|
||||||
downloadInfo = storedObject._links.downloadLink;
|
downloadInfo = storedObject._links.downloadLink;
|
||||||
} else {
|
} else {
|
||||||
downloadInfo = await download_info_link(
|
downloadInfo = await download_info_link(storedObject, atVersionToDownload);
|
||||||
storedObject,
|
|
||||||
atVersionToDownload,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const rawResponse = await window.fetch(downloadInfo.url);
|
const rawResponse = await window.fetch(downloadInfo.url);
|
||||||
@@ -244,10 +237,7 @@ async function download_doc_as_pdf(storedObject: StoredObject): Promise<Blob> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (storedObject.currentVersion?.type === "application/pdf") {
|
if (storedObject.currentVersion?.type === "application/pdf") {
|
||||||
return download_and_decrypt_doc(
|
return download_and_decrypt_doc(storedObject, storedObject.currentVersion);
|
||||||
storedObject,
|
|
||||||
storedObject.currentVersion,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const convertLink = build_convert_link(storedObject.uuid);
|
const convertLink = build_convert_link(storedObject.uuid);
|
||||||
|
|||||||
@@ -43,11 +43,17 @@ class StoredObjectVersionNormalizer implements NormalizerInterface, NormalizerAw
|
|||||||
'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, [...$context, UserNormalizer::AT_DATE => $object->getCreatedAt()]),
|
'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, [...$context, UserNormalizer::AT_DATE => $object->getCreatedAt()]),
|
||||||
];
|
];
|
||||||
|
|
||||||
if (in_array(self::WITH_POINT_IN_TIMES_CONTEXT, $context[AbstractNormalizer::GROUPS] ?? [], true)) {
|
$normalizationGroups = $context[AbstractNormalizer::GROUPS] ?? [];
|
||||||
|
|
||||||
|
if (is_string($normalizationGroups)) {
|
||||||
|
$normalizationGroups = [$normalizationGroups];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (in_array(self::WITH_POINT_IN_TIMES_CONTEXT, $normalizationGroups, true)) {
|
||||||
$data['point-in-times'] = $this->normalizer->normalize($object->getPointInTimes(), $format, $context);
|
$data['point-in-times'] = $this->normalizer->normalize($object->getPointInTimes(), $format, $context);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (in_array(self::WITH_RESTORED_CONTEXT, $context[AbstractNormalizer::GROUPS] ?? [], true)) {
|
if (in_array(self::WITH_RESTORED_CONTEXT, $normalizationGroups, true)) {
|
||||||
$data['from-restored'] = $this->normalizer->normalize($object->getCreatedFrom(), $format, [AbstractNormalizer::GROUPS => ['read']]);
|
$data['from-restored'] = $this->normalizer->normalize($object->getCreatedFrom(), $format, [AbstractNormalizer::GROUPS => ['read']]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ use Chill\MainBundle\Entity\User;
|
|||||||
use Chill\MainBundle\Entity\Address;
|
use Chill\MainBundle\Entity\Address;
|
||||||
use libphonenumber\PhoneNumber;
|
use libphonenumber\PhoneNumber;
|
||||||
use Symfony\Component\Validator\Constraints as Assert;
|
use Symfony\Component\Validator\Constraints as Assert;
|
||||||
use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Immersion.
|
* Immersion.
|
||||||
@@ -86,14 +85,14 @@ class Immersion implements \Stringable
|
|||||||
* @Assert\NotBlank()
|
* @Assert\NotBlank()
|
||||||
*/
|
*/
|
||||||
#[ORM\Column(name: 'tuteurPhoneNumber', type: 'phone_number', nullable: true)]
|
#[ORM\Column(name: 'tuteurPhoneNumber', type: 'phone_number', nullable: true)]
|
||||||
#[PhonenumberConstraint(type: 'any')]
|
#[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
|
||||||
private ?PhoneNumber $tuteurPhoneNumber = null;
|
private ?PhoneNumber $tuteurPhoneNumber = null;
|
||||||
|
|
||||||
#[ORM\Column(name: 'structureAccName', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)]
|
#[ORM\Column(name: 'structureAccName', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)]
|
||||||
private ?string $structureAccName = null;
|
private ?string $structureAccName = null;
|
||||||
|
|
||||||
#[ORM\Column(name: 'structureAccPhonenumber', type: 'phone_number', nullable: true)]
|
#[ORM\Column(name: 'structureAccPhonenumber', type: 'phone_number', nullable: true)]
|
||||||
#[PhonenumberConstraint(type: 'any')]
|
#[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
|
||||||
private ?PhoneNumber $structureAccPhonenumber = null;
|
private ?PhoneNumber $structureAccPhonenumber = null;
|
||||||
|
|
||||||
#[ORM\Column(name: 'structureAccEmail', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)]
|
#[ORM\Column(name: 'structureAccEmail', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)]
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\User;
|
|||||||
use Chill\MainBundle\Notification\NotificationFlagManager;
|
use Chill\MainBundle\Notification\NotificationFlagManager;
|
||||||
use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
|
use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
|
||||||
use libphonenumber\PhoneNumber;
|
use libphonenumber\PhoneNumber;
|
||||||
use Symfony\Component\Validator\Constraints as Assert;
|
|
||||||
|
|
||||||
final class UpdateProfileCommand
|
final class UpdateProfileCommand
|
||||||
{
|
{
|
||||||
@@ -24,13 +23,11 @@ final class UpdateProfileCommand
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
#[PhonenumberConstraint]
|
#[PhonenumberConstraint]
|
||||||
public ?PhoneNumber $phonenumber,
|
public ?PhoneNumber $phonenumber,
|
||||||
#[Assert\Choice(choices: ['fr', 'nl'], message: 'Locale must be either "fr" or "nl"')]
|
|
||||||
public string $locale = 'fr',
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public static function create(User $user, NotificationFlagManager $flagManager): self
|
public static function create(User $user, NotificationFlagManager $flagManager): self
|
||||||
{
|
{
|
||||||
$updateProfileCommand = new self($user->getPhonenumber(), $user->getLocale());
|
$updateProfileCommand = new self($user->getPhonenumber());
|
||||||
|
|
||||||
foreach ($flagManager->getAllNotificationFlagProviders() as $provider) {
|
foreach ($flagManager->getAllNotificationFlagProviders() as $provider) {
|
||||||
$updateProfileCommand->setNotificationFlag(
|
$updateProfileCommand->setNotificationFlag(
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ final readonly class UpdateProfileCommandHandler
|
|||||||
public function updateProfile(User $user, UpdateProfileCommand $command): void
|
public function updateProfile(User $user, UpdateProfileCommand $command): void
|
||||||
{
|
{
|
||||||
$user->setPhonenumber($command->phonenumber);
|
$user->setPhonenumber($command->phonenumber);
|
||||||
$user->setLocale($command->locale);
|
|
||||||
|
|
||||||
foreach ($command->notificationFlags as $flag => $values) {
|
foreach ($command->notificationFlags as $flag => $values) {
|
||||||
$user->setNotificationImmediately($flag, $values['immediate_email']);
|
$user->setNotificationImmediately($flag, $values['immediate_email']);
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ namespace Chill\MainBundle;
|
|||||||
use Chill\MainBundle\Cron\CronJobInterface;
|
use Chill\MainBundle\Cron\CronJobInterface;
|
||||||
use Chill\MainBundle\CRUD\CompilerPass\CRUDControllerCompilerPass;
|
use Chill\MainBundle\CRUD\CompilerPass\CRUDControllerCompilerPass;
|
||||||
use Chill\MainBundle\DependencyInjection\CompilerPass\ACLFlagsCompilerPass;
|
use Chill\MainBundle\DependencyInjection\CompilerPass\ACLFlagsCompilerPass;
|
||||||
use Chill\MainBundle\DependencyInjection\CompilerPass\MenuCompilerPass;
|
|
||||||
use Chill\MainBundle\DependencyInjection\CompilerPass\NotificationCounterCompilerPass;
|
use Chill\MainBundle\DependencyInjection\CompilerPass\NotificationCounterCompilerPass;
|
||||||
use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
|
use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
|
||||||
use Chill\MainBundle\DependencyInjection\CompilerPass\TimelineCompilerClass;
|
use Chill\MainBundle\DependencyInjection\CompilerPass\TimelineCompilerClass;
|
||||||
@@ -70,7 +69,6 @@ class ChillMainBundle extends Bundle
|
|||||||
$container->addCompilerPass(new TimelineCompilerClass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
$container->addCompilerPass(new TimelineCompilerClass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
||||||
$container->addCompilerPass(new WidgetsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
$container->addCompilerPass(new WidgetsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
||||||
$container->addCompilerPass(new NotificationCounterCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
$container->addCompilerPass(new NotificationCounterCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
||||||
$container->addCompilerPass(new MenuCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
|
||||||
$container->addCompilerPass(new ACLFlagsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
$container->addCompilerPass(new ACLFlagsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
||||||
$container->addCompilerPass(new CRUDControllerCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
$container->addCompilerPass(new CRUDControllerCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,115 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Command;
|
||||||
|
|
||||||
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Input\InputArgument;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\HttpKernel\KernelInterface;
|
||||||
|
use Symfony\Component\Translation\MessageCatalogue;
|
||||||
|
use Symfony\Component\Translation\Reader\TranslationReaderInterface;
|
||||||
|
use Symfony\Component\Translation\Writer\TranslationWriterInterface;
|
||||||
|
use Symfony\Component\Yaml\Yaml;
|
||||||
|
|
||||||
|
class OverrideTranslationCommand extends Command
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly TranslationReaderInterface $reader,
|
||||||
|
private readonly TranslationWriterInterface $writer,
|
||||||
|
) {
|
||||||
|
$this->setName('chill:main:override_translation');
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function configure(): void
|
||||||
|
{
|
||||||
|
$this
|
||||||
|
->setDescription('Generate a translation catalogue with translation remplacements based on replacements provided in a YAML file.')
|
||||||
|
->addArgument('locale', InputArgument::REQUIRED, 'The locale to process (e.g. fr, en).')
|
||||||
|
->addArgument('overrides', InputArgument::REQUIRED, 'Path to the overrides YAML file (list of {from, to}).');
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||||
|
{
|
||||||
|
$locale = (string) $input->getArgument('locale');
|
||||||
|
$overridesPath = (string) $input->getArgument('overrides');
|
||||||
|
|
||||||
|
$catalogue = $this->loadCatalogue($locale);
|
||||||
|
$overrides = $this->loadOverrides($overridesPath);
|
||||||
|
|
||||||
|
|
||||||
|
$toOverrideCatalogue = new MessageCatalogue($locale);
|
||||||
|
foreach ($catalogue->getDomains() as $domain) {
|
||||||
|
// hack: we have to replace the suffix ".intl-icu" by "+intl-ic"
|
||||||
|
$domain = str_replace('.intl-icu', '+intl-icu', $domain);
|
||||||
|
foreach ($catalogue->all($domain) as $key => $translation) {
|
||||||
|
foreach ($overrides as $changes) {
|
||||||
|
$from = $changes['from'];
|
||||||
|
$to = $changes['to'];
|
||||||
|
|
||||||
|
if (is_string($translation) && str_contains($translation, $from)) {
|
||||||
|
$newTranslation = strtr($translation, [$from => $to]);
|
||||||
|
$toOverrideCatalogue->set($key, $newTranslation, $domain);
|
||||||
|
$translation = $newTranslation;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var KernelInterface $kernel */
|
||||||
|
/* @phpstan-ignore-next-line */
|
||||||
|
$kernel = $this->getApplication()->getKernel();
|
||||||
|
$outputDir = rtrim($kernel->getProjectDir(), '/').'/translations';
|
||||||
|
if (!is_dir($outputDir)) {
|
||||||
|
@mkdir($outputDir, 0775, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Writer expects the 'path' option to be a directory; it will create the proper file name
|
||||||
|
$this->writer->write($toOverrideCatalogue, 'yaml', ['path' => $outputDir]);
|
||||||
|
|
||||||
|
$output->writeln(sprintf('Override catalogue written to %s (domain: messages, locale: %s).', $outputDir, $locale));
|
||||||
|
|
||||||
|
return Command::SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<array{from: string, to: string}>
|
||||||
|
*/
|
||||||
|
private function loadOverrides(string $path): array
|
||||||
|
{
|
||||||
|
return Yaml::parseFile($path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function loadCatalogue(string $locale): MessageCatalogue
|
||||||
|
{
|
||||||
|
/** @var KernelInterface $kernel */
|
||||||
|
/* @phpstan-ignore-next-line */
|
||||||
|
$kernel = $this->getApplication()->getKernel();
|
||||||
|
|
||||||
|
// collect path for translations
|
||||||
|
$transPaths = [];
|
||||||
|
foreach ($kernel->getBundles() as $bundle) {
|
||||||
|
$bundleDir = $bundle->getPath();
|
||||||
|
$transPaths[] = is_dir($bundleDir.'/Resources/translations') ? $bundleDir.'/Resources/translations' : $bundle->getPath().'/translations';
|
||||||
|
}
|
||||||
|
|
||||||
|
$currentCatalogue = new MessageCatalogue($locale);
|
||||||
|
foreach ($transPaths as $path) {
|
||||||
|
if (is_dir($path)) {
|
||||||
|
$this->reader->read($path, $currentCatalogue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $currentCatalogue;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,9 +14,9 @@ namespace Chill\MainBundle\Entity;
|
|||||||
use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
|
use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
|
||||||
use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
|
use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
|
||||||
use Chill\MainBundle\Repository\LocationRepository;
|
use Chill\MainBundle\Repository\LocationRepository;
|
||||||
use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use libphonenumber\PhoneNumber;
|
use libphonenumber\PhoneNumber;
|
||||||
|
use Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber as MisdPhoneNumberConstraint;
|
||||||
use Symfony\Component\Serializer\Annotation as Serializer;
|
use Symfony\Component\Serializer\Annotation as Serializer;
|
||||||
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
|
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
|
||||||
|
|
||||||
@@ -67,12 +67,12 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
|
|
||||||
#[Serializer\Groups(['read', 'write', 'docgen:read'])]
|
#[Serializer\Groups(['read', 'write', 'docgen:read'])]
|
||||||
#[ORM\Column(type: 'phone_number', nullable: true)]
|
#[ORM\Column(type: 'phone_number', nullable: true)]
|
||||||
#[PhonenumberConstraint(type: 'any')]
|
#[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::ANY])]
|
||||||
private ?PhoneNumber $phonenumber1 = null;
|
private ?PhoneNumber $phonenumber1 = null;
|
||||||
|
|
||||||
#[Serializer\Groups(['read', 'write', 'docgen:read'])]
|
#[Serializer\Groups(['read', 'write', 'docgen:read'])]
|
||||||
#[ORM\Column(type: 'phone_number', nullable: true)]
|
#[ORM\Column(type: 'phone_number', nullable: true)]
|
||||||
#[PhonenumberConstraint(type: 'any')]
|
#[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::ANY])]
|
||||||
private ?PhoneNumber $phonenumber2 = null;
|
private ?PhoneNumber $phonenumber2 = null;
|
||||||
|
|
||||||
#[Serializer\Groups(['read'])]
|
#[Serializer\Groups(['read'])]
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
|
|||||||
* The user's mobile phone number.
|
* The user's mobile phone number.
|
||||||
*/
|
*/
|
||||||
#[ORM\Column(type: 'phone_number', nullable: true)]
|
#[ORM\Column(type: 'phone_number', nullable: true)]
|
||||||
#[PhonenumberConstraint]
|
#[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
|
||||||
private ?PhoneNumber $phonenumber = null;
|
private ?PhoneNumber $phonenumber = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -128,12 +128,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
|
|||||||
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]', 'jsonb' => true])]
|
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]', 'jsonb' => true])]
|
||||||
private array $notificationFlags = [];
|
private array $notificationFlags = [];
|
||||||
|
|
||||||
/**
|
|
||||||
* User's preferred locale.
|
|
||||||
*/
|
|
||||||
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 5, nullable: false, options: ['default' => 'fr'])]
|
|
||||||
private string $locale = 'fr';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* User constructor.
|
* User constructor.
|
||||||
*/
|
*/
|
||||||
@@ -722,14 +716,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
|
|||||||
|
|
||||||
public function getLocale(): string
|
public function getLocale(): string
|
||||||
{
|
{
|
||||||
return $this->locale;
|
return 'fr';
|
||||||
}
|
|
||||||
|
|
||||||
public function setLocale(string $locale): self
|
|
||||||
{
|
|
||||||
$this->locale = $locale;
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[Assert\Callback]
|
#[Assert\Callback]
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ use Symfony\Component\HttpFoundation\Response;
|
|||||||
use Symfony\Contracts\Translation\TranslatableInterface;
|
use Symfony\Contracts\Translation\TranslatableInterface;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
|
|
||||||
|
// command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a CSV List for the export.
|
* Create a CSV List for the export.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ use Chill\MainBundle\Entity\Scope;
|
|||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
use Chill\MainBundle\Form\DataMapper\ScopePickerDataMapper;
|
use Chill\MainBundle\Form\DataMapper\ScopePickerDataMapper;
|
||||||
use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
|
use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
|
||||||
use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
|
|
||||||
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
|
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
|
||||||
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
|
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
|
||||||
use Symfony\Component\Form\AbstractType;
|
use Symfony\Component\Form\AbstractType;
|
||||||
@@ -33,84 +32,65 @@ use Symfony\Component\Security\Core\Security;
|
|||||||
* Allow to pick amongst available scope for the current
|
* Allow to pick amongst available scope for the current
|
||||||
* user.
|
* user.
|
||||||
*
|
*
|
||||||
* Options:
|
* options :
|
||||||
* - `role`: string, the role to check permissions for
|
*
|
||||||
* - Either `subject`: object, entity to resolve centers from
|
* - `center`: the center of the entity
|
||||||
* - Or `center`: Center|array|null, the center(s) to check
|
* - `role` : the role of the user
|
||||||
*/
|
*/
|
||||||
class ScopePickerType extends AbstractType
|
class ScopePickerType extends AbstractType
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly TranslatableStringHelperInterface $translatableStringHelper,
|
|
||||||
private readonly AuthorizationHelperInterface $authorizationHelper,
|
private readonly AuthorizationHelperInterface $authorizationHelper,
|
||||||
private readonly Security $security,
|
private readonly Security $security,
|
||||||
private readonly CenterResolverManagerInterface $centerResolverManager,
|
private readonly TranslatableStringHelperInterface $translatableStringHelper,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||||
{
|
{
|
||||||
// Compute centers from subject
|
$items = array_values(
|
||||||
$centers = $options['center'] ?? null;
|
|
||||||
if (null === $centers && isset($options['subject'])) {
|
|
||||||
$centers = $this->centerResolverManager->resolveCenters($options['subject']);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (null === $centers) {
|
|
||||||
throw new \RuntimeException('Either "center" or "subject" must be provided');
|
|
||||||
}
|
|
||||||
|
|
||||||
$reachableScopes = array_values(
|
|
||||||
array_filter(
|
array_filter(
|
||||||
$this->authorizationHelper->getReachableScopes(
|
$this->authorizationHelper->getReachableScopes(
|
||||||
$this->security->getUser(),
|
$this->security->getUser(),
|
||||||
$options['role'],
|
$options['role'],
|
||||||
$centers
|
$options['center']
|
||||||
),
|
),
|
||||||
static fn (Scope $s) => $s->isActive()
|
static fn (Scope $s) => $s->isActive()
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
$builder->setAttribute('reachable_scopes_count', count($reachableScopes));
|
if (0 === \count($items)) {
|
||||||
|
throw new \RuntimeException('no scopes are reachable. This form should not be shown to user');
|
||||||
if (0 === count($reachableScopes)) {
|
|
||||||
$builder->setAttribute('has_scopes', false);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$builder->setAttribute('has_scopes', true);
|
if (1 !== \count($items)) {
|
||||||
|
|
||||||
if (1 !== count($reachableScopes)) {
|
|
||||||
$builder->add('scope', EntityType::class, [
|
$builder->add('scope', EntityType::class, [
|
||||||
'class' => Scope::class,
|
'class' => Scope::class,
|
||||||
'placeholder' => 'Choose the circle',
|
'placeholder' => 'Choose the circle',
|
||||||
'choice_label' => fn (Scope $c) => $this->translatableStringHelper->localize($c->getName()),
|
'choice_label' => fn (Scope $c) => $this->translatableStringHelper->localize($c->getName()),
|
||||||
'choices' => $reachableScopes,
|
'choices' => $items,
|
||||||
]);
|
]);
|
||||||
$builder->setDataMapper(new ScopePickerDataMapper());
|
$builder->setDataMapper(new ScopePickerDataMapper());
|
||||||
} else {
|
} else {
|
||||||
$builder->add('scope', HiddenType::class, [
|
$builder->add('scope', HiddenType::class, [
|
||||||
'data' => $reachableScopes[0]->getId(),
|
'data' => $items[0]->getId(),
|
||||||
]);
|
]);
|
||||||
$builder->setDataMapper(new ScopePickerDataMapper($reachableScopes[0]));
|
$builder->setDataMapper(new ScopePickerDataMapper($items[0]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function buildView(FormView $view, FormInterface $form, array $options)
|
public function buildView(FormView $view, FormInterface $form, array $options)
|
||||||
{
|
{
|
||||||
$view->vars['fullWidth'] = true;
|
$view->vars['fullWidth'] = true;
|
||||||
// display of label is handled by the EntityType
|
|
||||||
$view->vars['label'] = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver
|
$resolver
|
||||||
|
// create `center` option
|
||||||
|
->setRequired('center')
|
||||||
|
->setAllowedTypes('center', [Center::class, 'array', 'null'])
|
||||||
|
// create ``role` option
|
||||||
->setRequired('role')
|
->setRequired('role')
|
||||||
->setAllowedTypes('role', ['string'])
|
->setAllowedTypes('role', ['string']);
|
||||||
->setDefined('subject')
|
|
||||||
->setAllowedTypes('subject', ['object'])
|
|
||||||
->setDefined('center')
|
|
||||||
->setAllowedTypes('center', [Center::class, 'array', 'null']);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Chill is a software for social workers
|
|
||||||
*
|
|
||||||
* For the full copyright and license information, please view
|
|
||||||
* the LICENSE file that was distributed with this source code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace Chill\MainBundle\Form\Type;
|
|
||||||
|
|
||||||
use Symfony\Component\Form\AbstractType;
|
|
||||||
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
|
||||||
use Symfony\Component\Intl\Languages;
|
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
|
||||||
|
|
||||||
class UserLocaleType extends AbstractType
|
|
||||||
{
|
|
||||||
public function __construct(private readonly array $availableLanguages) {}
|
|
||||||
|
|
||||||
public function configureOptions(OptionsResolver $resolver): void
|
|
||||||
{
|
|
||||||
$choices = [];
|
|
||||||
foreach ($this->availableLanguages as $languageCode) {
|
|
||||||
$choices[Languages::getName($languageCode)] = $languageCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
$resolver->setDefaults([
|
|
||||||
'choices' => $choices,
|
|
||||||
'placeholder' => 'user.locale.placeholder',
|
|
||||||
'required' => true,
|
|
||||||
'label' => 'user.locale.label',
|
|
||||||
'help' => 'user.locale.help',
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getParent(): string
|
|
||||||
{
|
|
||||||
return ChoiceType::class;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -14,7 +14,6 @@ namespace Chill\MainBundle\Form;
|
|||||||
use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommand;
|
use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommand;
|
||||||
use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
|
use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
|
||||||
use Chill\MainBundle\Form\Type\NotificationFlagsType;
|
use Chill\MainBundle\Form\Type\NotificationFlagsType;
|
||||||
use Chill\MainBundle\Form\Type\UserLocaleType;
|
|
||||||
use Symfony\Component\Form\AbstractType;
|
use Symfony\Component\Form\AbstractType;
|
||||||
use Symfony\Component\Form\FormBuilderInterface;
|
use Symfony\Component\Form\FormBuilderInterface;
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||||
@@ -27,7 +26,6 @@ class UpdateProfileType extends AbstractType
|
|||||||
->add('phonenumber', ChillPhoneNumberType::class, [
|
->add('phonenumber', ChillPhoneNumberType::class, [
|
||||||
'required' => false,
|
'required' => false,
|
||||||
])
|
])
|
||||||
->add('locale', UserLocaleType::class)
|
|
||||||
->add('notificationFlags', NotificationFlagsType::class)
|
->add('notificationFlags', NotificationFlagsType::class)
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,8 +24,6 @@ use Symfony\Component\Mime\Email;
|
|||||||
use Symfony\Component\Messenger\MessageBusInterface;
|
use Symfony\Component\Messenger\MessageBusInterface;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
|
|
||||||
// use Symfony\Component\Translation\LocaleSwitcher;
|
|
||||||
|
|
||||||
readonly class NotificationMailer
|
readonly class NotificationMailer
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
@@ -33,7 +31,6 @@ readonly class NotificationMailer
|
|||||||
private LoggerInterface $logger,
|
private LoggerInterface $logger,
|
||||||
private MessageBusInterface $messageBus,
|
private MessageBusInterface $messageBus,
|
||||||
private TranslatorInterface $translator,
|
private TranslatorInterface $translator,
|
||||||
// private LocaleSwitcher $localeSwitcher,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function postPersistComment(NotificationComment $comment, PostPersistEventArgs $eventArgs): void
|
public function postPersistComment(NotificationComment $comment, PostPersistEventArgs $eventArgs): void
|
||||||
@@ -59,7 +56,7 @@ readonly class NotificationMailer
|
|||||||
$email
|
$email
|
||||||
->to($dest->getEmail())
|
->to($dest->getEmail())
|
||||||
->subject('Re: '.$comment->getNotification()->getTitle())
|
->subject('Re: '.$comment->getNotification()->getTitle())
|
||||||
->textTemplate('@ChillMain/Notification/email_notification_comment_persist.md.twig')
|
->textTemplate('@ChillMain/Notification/email_notification_comment_persist.fr.md.twig')
|
||||||
->context([
|
->context([
|
||||||
'comment' => $comment,
|
'comment' => $comment,
|
||||||
'dest' => $dest,
|
'dest' => $dest,
|
||||||
@@ -140,53 +137,13 @@ readonly class NotificationMailer
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
|
|
||||||
/*
|
|
||||||
$this->localeSwitcher->runWithLocale($addressee->getLocale(), function () use ($notification, $addressee) {
|
|
||||||
if ($notification->isSystem()) {
|
if ($notification->isSystem()) {
|
||||||
$email = new Email();
|
$email = new Email();
|
||||||
$email->text($notification->getMessage());
|
$email->text($notification->getMessage());
|
||||||
} else {
|
} else {
|
||||||
$email = new TemplatedEmail();
|
$email = new TemplatedEmail();
|
||||||
$email
|
$email
|
||||||
->textTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
|
->textTemplate('@ChillMain/Notification/email_non_system_notification_content.fr.md.twig')
|
||||||
->context([
|
|
||||||
'notification' => $notification,
|
|
||||||
'dest' => $addressee,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
$email
|
|
||||||
->subject($notification->getTitle())
|
|
||||||
->to($addressee->getEmail());
|
|
||||||
|
|
||||||
try {
|
|
||||||
$this->mailer->send($email);
|
|
||||||
$this->logger->info('[NotificationMailer] Email sent successfully', [
|
|
||||||
'notification_id' => $notification->getId(),
|
|
||||||
'addressee_email' => $addressee->getEmail(),
|
|
||||||
'locale' => $addressee->getLocale(),
|
|
||||||
]);
|
|
||||||
} catch (TransportExceptionInterface $e) {
|
|
||||||
$this->logger->warning('[NotificationMailer] Could not send an email notification', [
|
|
||||||
'to' => $addressee->getEmail(),
|
|
||||||
'notification_id' => $notification->getId(),
|
|
||||||
'error_message' => $e->getMessage(),
|
|
||||||
'error_trace' => $e->getTraceAsString(),
|
|
||||||
]);
|
|
||||||
throw $e;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Current implementation:
|
|
||||||
if ($notification->isSystem()) {
|
|
||||||
$email = new Email();
|
|
||||||
$email->text($notification->getMessage());
|
|
||||||
} else {
|
|
||||||
$email = new TemplatedEmail();
|
|
||||||
$email
|
|
||||||
->textTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
|
|
||||||
->context([
|
->context([
|
||||||
'notification' => $notification,
|
'notification' => $notification,
|
||||||
'dest' => $addressee,
|
'dest' => $addressee,
|
||||||
@@ -225,43 +182,9 @@ readonly class NotificationMailer
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
|
|
||||||
/*
|
|
||||||
$this->localeSwitcher->runWithLocale($user->getLocale(), function () use ($user, $notifications) {
|
|
||||||
$email = new TemplatedEmail();
|
$email = new TemplatedEmail();
|
||||||
$email
|
$email
|
||||||
->htmlTemplate('@ChillMain/Notification/email_daily_digest.md.twig')
|
->htmlTemplate('@ChillMain/Notification/email_daily_digest.fr.md.twig')
|
||||||
->context([
|
|
||||||
'user' => $user,
|
|
||||||
'notifications' => $notifications,
|
|
||||||
'notification_count' => count($notifications),
|
|
||||||
])
|
|
||||||
->subject($this->translator->trans('notification.Daily Notification Digest'))
|
|
||||||
->to($user->getEmail());
|
|
||||||
|
|
||||||
try {
|
|
||||||
$this->mailer->send($email);
|
|
||||||
$this->logger->info('[NotificationMailer] Daily digest email sent successfully', [
|
|
||||||
'user_email' => $user->getEmail(),
|
|
||||||
'notification_count' => count($notifications),
|
|
||||||
'locale' => $user->getLocale(),
|
|
||||||
]);
|
|
||||||
} catch (TransportExceptionInterface $e) {
|
|
||||||
$this->logger->warning('[NotificationMailer] Could not send daily digest email', [
|
|
||||||
'to' => $user->getEmail(),
|
|
||||||
'notification_count' => count($notifications),
|
|
||||||
'error_message' => $e->getMessage(),
|
|
||||||
'error_trace' => $e->getTraceAsString(),
|
|
||||||
]);
|
|
||||||
throw $e;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Current implementation:
|
|
||||||
$email = new TemplatedEmail();
|
|
||||||
$email
|
|
||||||
->htmlTemplate('@ChillMain/Notification/email_daily_digest.md.twig')
|
|
||||||
->context([
|
->context([
|
||||||
'user' => $user,
|
'user' => $user,
|
||||||
'notifications' => $notifications,
|
'notifications' => $notifications,
|
||||||
@@ -299,7 +222,7 @@ readonly class NotificationMailer
|
|||||||
|
|
||||||
$email = new TemplatedEmail();
|
$email = new TemplatedEmail();
|
||||||
$email
|
$email
|
||||||
->textTemplate('@ChillMain/Notification/email_non_system_notification_content_to_email.md.twig')
|
->textTemplate('@ChillMain/Notification/email_non_system_notification_content_to_email.fr.md.twig')
|
||||||
->context([
|
->context([
|
||||||
'notification' => $notification,
|
'notification' => $notification,
|
||||||
'dest' => $emailAddress,
|
'dest' => $emailAddress,
|
||||||
|
|||||||
@@ -31,6 +31,8 @@ interface PhoneNumberHelperInterface
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return true if the validation is configured and available.
|
* Return true if the validation is configured and available.
|
||||||
|
*
|
||||||
|
* @deprecated this is an internal behaviour of the helper and should not be taken into account outside of the implementation
|
||||||
*/
|
*/
|
||||||
public function isPhonenumberValidationConfigured(): bool;
|
public function isPhonenumberValidationConfigured(): bool;
|
||||||
|
|
||||||
|
|||||||
@@ -76,6 +76,24 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
|
|||||||
->formatOutOfCountryCallingNumber($phoneNumber, $this->config['default_carrier_code']);
|
->formatOutOfCountryCallingNumber($phoneNumber, $this->config['default_carrier_code']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws NumberParseException
|
||||||
|
*/
|
||||||
|
public function parse(string $phoneNumber): PhoneNumber
|
||||||
|
{
|
||||||
|
$sanitizedPhoneNumber = $phoneNumber;
|
||||||
|
|
||||||
|
if (str_starts_with($sanitizedPhoneNumber, '00')) {
|
||||||
|
$sanitizedPhoneNumber = '+'.substr($sanitizedPhoneNumber, 2, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!str_starts_with($sanitizedPhoneNumber, '+') && !str_starts_with($sanitizedPhoneNumber, '0')) {
|
||||||
|
$sanitizedPhoneNumber = '+'.$sanitizedPhoneNumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->phoneNumberUtil->parse($sanitizedPhoneNumber, $this->config['default_carrier_code']);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get type (mobile, landline, ...) for phone number.
|
* Get type (mobile, landline, ...) for phone number.
|
||||||
*/
|
*/
|
||||||
@@ -104,7 +122,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
|
|||||||
*/
|
*/
|
||||||
public function isValidPhonenumberAny($phonenumber): bool
|
public function isValidPhonenumberAny($phonenumber): bool
|
||||||
{
|
{
|
||||||
if (false === $this->isPhonenumberValidationConfigured()) {
|
if (false === $this->isConfigured) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
$validation = $this->performTwilioLookup($phonenumber);
|
$validation = $this->performTwilioLookup($phonenumber);
|
||||||
@@ -124,7 +142,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
|
|||||||
*/
|
*/
|
||||||
public function isValidPhonenumberLandOrVoip($phonenumber): bool
|
public function isValidPhonenumberLandOrVoip($phonenumber): bool
|
||||||
{
|
{
|
||||||
if (false === $this->isPhonenumberValidationConfigured()) {
|
if (false === $this->isConfigured) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -145,7 +163,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
|
|||||||
*/
|
*/
|
||||||
public function isValidPhonenumberMobile($phonenumber): bool
|
public function isValidPhonenumberMobile($phonenumber): bool
|
||||||
{
|
{
|
||||||
if (false === $this->isPhonenumberValidationConfigured()) {
|
if (false === $this->isConfigured) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -160,7 +178,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
|
|||||||
|
|
||||||
private function performTwilioLookup($phonenumber)
|
private function performTwilioLookup($phonenumber)
|
||||||
{
|
{
|
||||||
if (false === $this->isPhonenumberValidationConfigured()) {
|
if (false === $this->isConfigured) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -166,3 +166,18 @@ export const intervalISOToDays = (str: string | null): number | null => {
|
|||||||
|
|
||||||
return days;
|
return days;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export function getTimezoneOffsetString(date: Date, timeZone: string): string {
|
||||||
|
const utcDate = new Date(date.toLocaleString("en-US", { timeZone: "UTC" }));
|
||||||
|
const tzDate = new Date(date.toLocaleString("en-US", { timeZone }));
|
||||||
|
const offsetMinutes = (utcDate.getTime() - tzDate.getTime()) / (60 * 1000);
|
||||||
|
|
||||||
|
// Inverser le signe pour avoir la convention ±HH:MM
|
||||||
|
const sign = offsetMinutes <= 0 ? "+" : "-";
|
||||||
|
const absMinutes = Math.abs(offsetMinutes);
|
||||||
|
const hours = String(Math.floor(absMinutes / 60)).padStart(2, "0");
|
||||||
|
const minutes = String(absMinutes % 60).padStart(2, "0");
|
||||||
|
|
||||||
|
return `${sign}${hours}:${minutes}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,6 @@ $chill-theme-buttons: (
|
|||||||
&.btn-unlink,
|
&.btn-unlink,
|
||||||
&.btn-action,
|
&.btn-action,
|
||||||
&.btn-edit,
|
&.btn-edit,
|
||||||
&.btn-tpchild,
|
|
||||||
&.btn-wopilink,
|
&.btn-wopilink,
|
||||||
&.btn-update {
|
&.btn-update {
|
||||||
&, &:hover {
|
&, &:hover {
|
||||||
@@ -82,7 +81,6 @@ $chill-theme-buttons: (
|
|||||||
&.btn-remove::before,
|
&.btn-remove::before,
|
||||||
&.btn-choose::before,
|
&.btn-choose::before,
|
||||||
&.btn-notify::before,
|
&.btn-notify::before,
|
||||||
&.btn-tpchild::before,
|
|
||||||
&.btn-download::before,
|
&.btn-download::before,
|
||||||
&.btn-search::before,
|
&.btn-search::before,
|
||||||
&.btn-cancel::before {
|
&.btn-cancel::before {
|
||||||
@@ -112,7 +110,6 @@ $chill-theme-buttons: (
|
|||||||
&.btn-choose::before { content: "\f00c"; } // fa-check // f046 fa-check-square-o
|
&.btn-choose::before { content: "\f00c"; } // fa-check // f046 fa-check-square-o
|
||||||
&.btn-unlink::before { content: "\f127"; } // fa-chain-broken
|
&.btn-unlink::before { content: "\f127"; } // fa-chain-broken
|
||||||
&.btn-notify::before { content: "\f1d8"; } // fa-paper-plane
|
&.btn-notify::before { content: "\f1d8"; } // fa-paper-plane
|
||||||
&.btn-tpchild::before { content: "\f007"; } // fa-user
|
|
||||||
&.btn-download::before { content: "\f019"; } // fa-download
|
&.btn-download::before { content: "\f019"; } // fa-download
|
||||||
&.btn-search::before { content: "\f002"; } // fa-search
|
&.btn-search::before { content: "\f002"; } // fa-search
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,11 @@ form {
|
|||||||
@include title_in_form;
|
@include title_in_form;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
label {
|
label {
|
||||||
display: inline;
|
display: inline;
|
||||||
&.required:after {
|
&.required:after {
|
||||||
@@ -34,7 +39,6 @@ form {
|
|||||||
color: $red;
|
color: $red;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.col-form-label {
|
.col-form-label {
|
||||||
padding-top: .5em;
|
padding-top: .5em;
|
||||||
|
|||||||
@@ -1,15 +1,26 @@
|
|||||||
import { Scope } from "../../types";
|
import {
|
||||||
|
DynamicKeys,
|
||||||
|
Scope,
|
||||||
|
ValidationExceptionInterface,
|
||||||
|
ValidationProblemFromMap,
|
||||||
|
ViolationFromMap
|
||||||
|
} from "../../types";
|
||||||
|
|
||||||
export type body = Record<string, boolean | string | number | null>;
|
export type body = Record<string, boolean | string | number | null>;
|
||||||
export type fetchOption = Record<string, boolean | string | number | null>;
|
export type fetchOption = Record<string, boolean | string | number | null>;
|
||||||
|
export type Primitive = string | number | boolean | null;
|
||||||
export type Params = Record<string, number | string>;
|
export type Params = Record<string, number | string>;
|
||||||
|
|
||||||
export interface PaginationResponse<T> {
|
export interface Pagination {
|
||||||
pagination: {
|
first: number;
|
||||||
more: boolean;
|
|
||||||
items_per_page: number;
|
items_per_page: number;
|
||||||
};
|
more: boolean;
|
||||||
|
next: string | null;
|
||||||
|
previous: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PaginationResponse<T> {
|
||||||
|
pagination: Pagination;
|
||||||
results: T[];
|
results: T[];
|
||||||
count: number;
|
count: number;
|
||||||
}
|
}
|
||||||
@@ -20,20 +31,115 @@ export interface TransportExceptionInterface {
|
|||||||
name: string;
|
name: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ValidationExceptionInterface
|
export class ValidationException<
|
||||||
extends TransportExceptionInterface {
|
M extends Record<string, Record<string, string|number>> = Record<
|
||||||
name: "ValidationException";
|
string,
|
||||||
error: object;
|
Record<string, string|number>
|
||||||
violations: string[];
|
>,
|
||||||
titles: string[];
|
>
|
||||||
propertyPaths: string[];
|
extends Error
|
||||||
|
implements ValidationExceptionInterface<M>
|
||||||
|
{
|
||||||
|
public readonly name = "ValidationException" as const;
|
||||||
|
public readonly problems: ValidationProblemFromMap<M>;
|
||||||
|
public readonly violations: string[];
|
||||||
|
public readonly violationsList: ViolationFromMap<M>[];
|
||||||
|
public readonly titles: string[];
|
||||||
|
public readonly propertyPaths: DynamicKeys<M> & string[];
|
||||||
|
public readonly byProperty: Record<Extract<keyof M, string>, string[]>;
|
||||||
|
|
||||||
|
constructor(problem: ValidationProblemFromMap<M>) {
|
||||||
|
const message = [problem.title, problem.detail].filter(Boolean).join(" — ");
|
||||||
|
super(message);
|
||||||
|
Object.setPrototypeOf(this, new.target.prototype);
|
||||||
|
|
||||||
|
this.problems = problem;
|
||||||
|
|
||||||
|
this.violationsList = problem.violations;
|
||||||
|
this.violations = problem.violations.map(
|
||||||
|
(v) => `${v.title}: ${v.propertyPath}`,
|
||||||
|
);
|
||||||
|
|
||||||
|
this.titles = problem.violations.map((v) => v.title);
|
||||||
|
|
||||||
|
this.propertyPaths = problem.violations.map(
|
||||||
|
(v) => v.propertyPath,
|
||||||
|
) as DynamicKeys<M> & string[];
|
||||||
|
|
||||||
|
this.byProperty = problem.violations.reduce(
|
||||||
|
(acc, v) => {
|
||||||
|
const key = v.propertyPath.replace('/\[\d+\]$/', "") as Extract<keyof M, string>;
|
||||||
|
(acc[key] ||= []).push(v.title);
|
||||||
|
return acc;
|
||||||
|
},
|
||||||
|
{} as Record<Extract<keyof M, string>, string[]>,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (Error.captureStackTrace) {
|
||||||
|
Error.captureStackTrace(this, ValidationException);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ValidationErrorResponse extends TransportExceptionInterface {
|
violationsByNormalizedProperty(property: Extract<keyof M, string>): ViolationFromMap<M>[] {
|
||||||
violations: {
|
return this.violationsList.filter((v) => v.propertyPath.replace(/\[\d+\]$/, "") === property);
|
||||||
|
}
|
||||||
|
|
||||||
|
violationsByNormalizedPropertyAndParams<
|
||||||
|
P extends Extract<keyof M, string>,
|
||||||
|
K extends Extract<keyof M[P], string>
|
||||||
|
>(
|
||||||
|
property: P,
|
||||||
|
param: K,
|
||||||
|
param_value: M[P][K]
|
||||||
|
): ViolationFromMap<M>[]
|
||||||
|
{
|
||||||
|
const list = this.violationsByNormalizedProperty(property);
|
||||||
|
|
||||||
|
return list.filter(
|
||||||
|
(v): boolean =>
|
||||||
|
!!v.parameters &&
|
||||||
|
// `with_parameter in v.parameters` check indexing
|
||||||
|
param in v.parameters &&
|
||||||
|
// the cast is safe, because we have overloading that bind the types
|
||||||
|
(v.parameters as M[P])[param] === param_value
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check that the exception is a ValidationExceptionInterface
|
||||||
|
* @param x
|
||||||
|
*/
|
||||||
|
export function isValidationException<M extends Record<string, Record<string, string|number>>>(
|
||||||
|
x: unknown,
|
||||||
|
): x is ValidationExceptionInterface<M> {
|
||||||
|
return (
|
||||||
|
x instanceof ValidationException ||
|
||||||
|
(typeof x === "object" &&
|
||||||
|
x !== null &&
|
||||||
|
(x as any).name === "ValidationException")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isValidationProblem(x: unknown): x is {
|
||||||
|
type: string;
|
||||||
title: string;
|
title: string;
|
||||||
propertyPath: string;
|
violations: { propertyPath: string; title: string }[];
|
||||||
}[];
|
} {
|
||||||
|
if (!x || typeof x !== "object") return false;
|
||||||
|
const o = x as any;
|
||||||
|
return (
|
||||||
|
typeof o.type === "string" &&
|
||||||
|
typeof o.title === "string" &&
|
||||||
|
Array.isArray(o.violations) &&
|
||||||
|
o.violations.every(
|
||||||
|
(v: any) =>
|
||||||
|
v &&
|
||||||
|
typeof v === "object" &&
|
||||||
|
typeof v.propertyPath === "string" &&
|
||||||
|
typeof v.title === "string",
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface AccessExceptionInterface extends TransportExceptionInterface {
|
export interface AccessExceptionInterface extends TransportExceptionInterface {
|
||||||
@@ -60,12 +166,151 @@ export interface ConflictHttpExceptionInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generic api method that can be adapted to any fetch request
|
* Generic api method that can be adapted to any fetch request.
|
||||||
*
|
*
|
||||||
* This method is suitable make a single fetch. When performing a GET to fetch a list of elements, always consider pagination
|
* What this does
|
||||||
* and use of the @link{fetchResults} method.
|
* - Performs a single HTTP request using fetch and returns the parsed JSON as Output.
|
||||||
|
* - Interprets common API errors and throws typed exceptions you can catch in your UI.
|
||||||
|
* - When the server returns a Symfony validation problem (HTTP 422), the error is
|
||||||
|
* rethrown as a typed ValidationException that is aware of your Violation Map (see below).
|
||||||
|
*
|
||||||
|
* Important: For GET endpoints that return lists, prefer using fetchResults, which
|
||||||
|
* handles pagination and aggregation for you.
|
||||||
|
*
|
||||||
|
* Violation Map (M): make your 422 errors strongly typed
|
||||||
|
* ------------------------------------------------------
|
||||||
|
* Symfony’s validation problem+json payload looks like this (simplified):
|
||||||
|
*
|
||||||
|
* {
|
||||||
|
* "type": "https://symfony.com/errors/validation",
|
||||||
|
* "title": "Validation Failed",
|
||||||
|
* "violations": [
|
||||||
|
* {
|
||||||
|
* "propertyPath": "mobilenumber",
|
||||||
|
* "title": "This value is not a valid phone number.",
|
||||||
|
* "parameters": {
|
||||||
|
* "{{ value }}": "+33 1 02 03 04 05",
|
||||||
|
* "{{ types }}": "mobile number"
|
||||||
|
* },
|
||||||
|
* "type": "urn:uuid:..."
|
||||||
|
* }
|
||||||
|
* ]
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
* The makeFetch generic type parameter M lets you describe, field by field, which
|
||||||
|
* parameters may appear for each propertyPath. Doing so gives you full type-safety when
|
||||||
|
* consuming ValidationException in your UI code.
|
||||||
|
*
|
||||||
|
* How to build M (Violation Map)
|
||||||
|
* - M is a map where each key is a server-side propertyPath (string), and the value is a
|
||||||
|
* record describing the allowed keys in the parameters object for that property.
|
||||||
|
* - Keys in parameters are the exact strings you receive from Symfony, including the
|
||||||
|
* curly-braced placeholders such as "{{ value }}", "{{ types }}", etc.
|
||||||
|
*
|
||||||
|
* Example from Person creation (WritePersonViolationMap)
|
||||||
|
* -----------------------------------------------------
|
||||||
|
* In ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts you’ll find:
|
||||||
|
*
|
||||||
|
* export type WritePersonViolationMap = {
|
||||||
|
* gender: {
|
||||||
|
* "{{ value }}": string | null;
|
||||||
|
* };
|
||||||
|
* mobilenumber: {
|
||||||
|
* "{{ types }}": string; // ex: "mobile number"
|
||||||
|
* "{{ value }}": string; // ex: "+33 1 02 03 04 05"
|
||||||
|
* };
|
||||||
|
* };
|
||||||
|
*
|
||||||
|
* This means:
|
||||||
|
* - If the server reports a violation for propertyPath "gender", the parameters object
|
||||||
|
* is expected to contain a key "{{ value }}" with a string or null value.
|
||||||
|
* - If the server reports a violation for propertyPath "mobilenumber", the parameters
|
||||||
|
* may include "{{ value }}" and "{{ types }}" as strings.
|
||||||
|
*
|
||||||
|
* How makeFetch uses M
|
||||||
|
* - When the response has status 422 and the payload matches a Symfony validation
|
||||||
|
* problem, makeFetch casts it to ValidationProblemFromMap<M> and throws a
|
||||||
|
* ValidationException<M>.
|
||||||
|
* - The ValidationException exposes helpful, pre-computed fields:
|
||||||
|
* - exception.problem: the full typed payload
|
||||||
|
* - exception.violations: ["Title: propertyPath", ...]
|
||||||
|
* - exception.titles: ["Title 1", "Title 2", ...]
|
||||||
|
* - exception.propertyPaths: ["gender", "mobilenumber", ...] (typed from M)
|
||||||
|
* - exception.byProperty: { gender: [titles...], mobilenumber: [titles...] }
|
||||||
|
*
|
||||||
|
* Typical usage patterns
|
||||||
|
* ----------------------
|
||||||
|
* 1) GET without Validation Map (no 422 expected):
|
||||||
|
*
|
||||||
|
* const centers = await makeFetch<null, { showCenters: boolean; centers: Center[] }>(
|
||||||
|
* "GET",
|
||||||
|
* "/api/1.0/person/creation/authorized-centers",
|
||||||
|
* null
|
||||||
|
* );
|
||||||
|
*
|
||||||
|
* 2) POST with body and Violation Map:
|
||||||
|
*
|
||||||
|
* type WritePersonViolationMap = {
|
||||||
|
* gender: { "{{ value }}": string | null };
|
||||||
|
* mobilenumber: { "{{ types }}": string; "{{ value }}": string };
|
||||||
|
* };
|
||||||
|
*
|
||||||
|
* try {
|
||||||
|
* const created = await makeFetch<PersonWrite, Person, WritePersonViolationMap>(
|
||||||
|
* "POST",
|
||||||
|
* "/api/1.0/person/person.json",
|
||||||
|
* personPayload
|
||||||
|
* );
|
||||||
|
* // Success path
|
||||||
|
* } catch (e) {
|
||||||
|
* if (isValidationException(e)) {
|
||||||
|
* // Fully typed:
|
||||||
|
* e.propertyPaths.includes("mobilenumber");
|
||||||
|
* const firstTitleForMobile = e.byProperty.mobilenumber?.[0];
|
||||||
|
* // You can also inspect parameter values:
|
||||||
|
* const v = e.problem.violations.find(v => v.propertyPath === "mobilenumber");
|
||||||
|
* const rawValue = v?.parameters?.["{{ value }}"]; // typed as string
|
||||||
|
* } else {
|
||||||
|
* // Other error handling (AccessException, ConflictHttpException, etc.)
|
||||||
|
* }
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
* Tips to design your Violation Map
|
||||||
|
* - Use exact propertyPath strings as exposed by the API (they usually match your
|
||||||
|
* DTO field names or entity property paths used by the validator).
|
||||||
|
* - Inside each property, list only the placeholders that you actually read in the UI
|
||||||
|
* (you can always add more later). This keeps your types strict but pragmatic.
|
||||||
|
* - If a field may not include parameters at all, you can set it to an empty object {}.
|
||||||
|
* - If you don’t care about parameter typing, you can omit M entirely and rely on the
|
||||||
|
* default loose typing (Record<string, Primitive>), but you’ll lose safety.
|
||||||
|
*
|
||||||
|
* Error taxonomy thrown by makeFetch
|
||||||
|
* - ValidationException<M> when status = 422 and payload is a validation problem.
|
||||||
|
* - AccessException when status = 403.
|
||||||
|
* - ConflictHttpException when status = 409.
|
||||||
|
* - A generic error object for other non-ok statuses.
|
||||||
|
*
|
||||||
|
* @typeParam Input - Shape of the request body you send (if any)
|
||||||
|
* @typeParam Output - Shape of the successful JSON response you expect
|
||||||
|
* @typeParam M - Violation Map describing the per-field parameters you expect
|
||||||
|
* in Symfony validation violations. See examples above.
|
||||||
|
*
|
||||||
|
* @param method The HTTP method to use (POST, GET, PUT, PATCH, DELETE)
|
||||||
|
* @param url The absolute or relative URL to call
|
||||||
|
* @param body The request payload. If null/undefined, no body is sent
|
||||||
|
* @param options Extra fetch options/headers merged into the request
|
||||||
|
*
|
||||||
|
* @returns The parsed JSON response typed as Output. For 204 No Content, resolves
|
||||||
|
* with undefined (void).
|
||||||
*/
|
*/
|
||||||
export const makeFetch = <Input, Output>(
|
export const makeFetch = async <
|
||||||
|
Input,
|
||||||
|
Output,
|
||||||
|
M extends Record<string, Record<string, string|number>> = Record<
|
||||||
|
string,
|
||||||
|
Record<string, string|number>
|
||||||
|
>,
|
||||||
|
>(
|
||||||
method: "POST" | "GET" | "PUT" | "PATCH" | "DELETE",
|
method: "POST" | "GET" | "PUT" | "PATCH" | "DELETE",
|
||||||
url: string,
|
url: string,
|
||||||
body?: body | Input | null,
|
body?: body | Input | null,
|
||||||
@@ -85,7 +330,8 @@ export const makeFetch = <Input, Output>(
|
|||||||
if (typeof options !== "undefined") {
|
if (typeof options !== "undefined") {
|
||||||
opts = Object.assign(opts, options);
|
opts = Object.assign(opts, options);
|
||||||
}
|
}
|
||||||
return fetch(url, opts).then((response) => {
|
|
||||||
|
return fetch(url, opts).then(async (response) => {
|
||||||
if (response.status === 204) {
|
if (response.status === 204) {
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
}
|
}
|
||||||
@@ -95,9 +341,20 @@ export const makeFetch = <Input, Output>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (response.status === 422) {
|
if (response.status === 422) {
|
||||||
return response.json().then((response) => {
|
// Unprocessable Entity -> payload de validation Symfony
|
||||||
throw ValidationException(response);
|
const json = await response.json().catch(() => undefined);
|
||||||
});
|
|
||||||
|
if (isValidationProblem(json)) {
|
||||||
|
// On ré-interprète le payload selon M (ParamMap) pour typer les violations
|
||||||
|
const problem = json as unknown as ValidationProblemFromMap<M>;
|
||||||
|
throw new ValidationException<M>(problem);
|
||||||
|
}
|
||||||
|
|
||||||
|
const err = new Error(
|
||||||
|
"Validation failed but payload is not a ValidationProblem",
|
||||||
|
);
|
||||||
|
(err as any).raw = json;
|
||||||
|
throw err;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (response.status === 403) {
|
if (response.status === 403) {
|
||||||
@@ -162,12 +419,6 @@ function _fetchAction<T>(
|
|||||||
throw NotFoundException(response);
|
throw NotFoundException(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (response.status === 422) {
|
|
||||||
return response.json().then((response) => {
|
|
||||||
throw ValidationException(response);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response.status === 403) {
|
if (response.status === 403) {
|
||||||
throw AccessException(response);
|
throw AccessException(response);
|
||||||
}
|
}
|
||||||
@@ -226,24 +477,6 @@ export const fetchScopes = (): Promise<Scope[]> => {
|
|||||||
return fetchResults("/api/1.0/main/scope.json");
|
return fetchResults("/api/1.0/main/scope.json");
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Error objects to be thrown
|
|
||||||
*/
|
|
||||||
const ValidationException = (
|
|
||||||
response: ValidationErrorResponse,
|
|
||||||
): ValidationExceptionInterface => {
|
|
||||||
const error = {} as ValidationExceptionInterface;
|
|
||||||
error.name = "ValidationException";
|
|
||||||
error.violations = response.violations.map(
|
|
||||||
(violation) => `${violation.title}: ${violation.propertyPath}`,
|
|
||||||
);
|
|
||||||
error.titles = response.violations.map((violation) => violation.title);
|
|
||||||
error.propertyPaths = response.violations.map(
|
|
||||||
(violation) => violation.propertyPath,
|
|
||||||
);
|
|
||||||
return error;
|
|
||||||
};
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
const AccessException = (response: Response): AccessExceptionInterface => {
|
const AccessException = (response: Response): AccessExceptionInterface => {
|
||||||
const error = {} as AccessExceptionInterface;
|
const error = {} as AccessExceptionInterface;
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import {Gender, GenderTranslation} from "ChillMainAssets/types";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Translates a given gender object into its corresponding gender translation string.
|
||||||
|
*
|
||||||
|
* @param {Gender|null} gender - The gender object to be translated, null values are also supported
|
||||||
|
* @return {GenderTranslation} Returns the gender translation string corresponding to the provided gender,
|
||||||
|
* or "unknown" if the gender is null.
|
||||||
|
*/
|
||||||
|
export function toGenderTranslation(gender: Gender|null): GenderTranslation
|
||||||
|
{
|
||||||
|
if (null === gender) {
|
||||||
|
return "unknown";
|
||||||
|
}
|
||||||
|
|
||||||
|
return gender.genderTranslation;
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { TranslatableString } from "ChillMainAssets/types";
|
import { DateTime, TranslatableString } from "ChillMainAssets/types";
|
||||||
|
import { getLocale } from "translator";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Localizes a translatable string object based on the current locale.
|
* Localizes a translatable string object based on the current locale.
|
||||||
@@ -8,6 +9,25 @@ import { TranslatableString } from "ChillMainAssets/types";
|
|||||||
* @param locale defaults to browser locale
|
* @param locale defaults to browser locale
|
||||||
* @returns The localized string or null if no translation is available
|
* @returns The localized string or null if no translation is available
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Prepends the current HTML lang code to the given URL.
|
||||||
|
* Example: If lang="fr" and url="/about", returns "/fr/about"
|
||||||
|
*
|
||||||
|
* @param url The URL to localize
|
||||||
|
* @returns The localized URL
|
||||||
|
*/
|
||||||
|
export function localizedUrl(url: string): string {
|
||||||
|
const locale = getLocale();
|
||||||
|
// Ensure url starts with a slash and does not already start with /{lang}/
|
||||||
|
const normalizedUrl = url.startsWith("/") ? url : `/${url}`;
|
||||||
|
const langPrefix = `/${locale}`;
|
||||||
|
if (normalizedUrl.startsWith(langPrefix + "/")) {
|
||||||
|
return normalizedUrl;
|
||||||
|
}
|
||||||
|
return `${langPrefix}${normalizedUrl}`;
|
||||||
|
}
|
||||||
|
|
||||||
export function localizeString(
|
export function localizeString(
|
||||||
translatableString: TranslatableString | null | undefined,
|
translatableString: TranslatableString | null | undefined,
|
||||||
locale?: string,
|
locale?: string,
|
||||||
@@ -16,7 +36,7 @@ export function localizeString(
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
const currentLocale = locale || navigator.language.split("-")[0] || "fr";
|
const currentLocale = locale || getLocale();
|
||||||
|
|
||||||
if (translatableString[currentLocale]) {
|
if (translatableString[currentLocale]) {
|
||||||
return translatableString[currentLocale];
|
return translatableString[currentLocale];
|
||||||
@@ -39,3 +59,47 @@ export function localizeString(
|
|||||||
|
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const datetimeFormats: Record<
|
||||||
|
string,
|
||||||
|
Record<string, Intl.DateTimeFormatOptions>
|
||||||
|
> = {
|
||||||
|
fr: {
|
||||||
|
short: {
|
||||||
|
year: "numeric",
|
||||||
|
month: "numeric",
|
||||||
|
day: "numeric",
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
year: "numeric",
|
||||||
|
month: "long",
|
||||||
|
day: "numeric",
|
||||||
|
},
|
||||||
|
long: {
|
||||||
|
year: "numeric",
|
||||||
|
month: "numeric",
|
||||||
|
day: "numeric",
|
||||||
|
hour: "numeric",
|
||||||
|
minute: "numeric",
|
||||||
|
hour12: false,
|
||||||
|
},
|
||||||
|
hoursOnly: {
|
||||||
|
hour: "numeric",
|
||||||
|
minute: "numeric",
|
||||||
|
hour12: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
export function localizeDateTimeFormat(
|
||||||
|
dateTime: DateTime,
|
||||||
|
format: keyof typeof datetimeFormats.fr = "short",
|
||||||
|
): string {
|
||||||
|
const locale = getLocale();
|
||||||
|
const options =
|
||||||
|
datetimeFormats[locale]?.[format] || datetimeFormats.fr[format];
|
||||||
|
return new Intl.DateTimeFormat(locale, options).format(
|
||||||
|
new Date(dateTime.datetime),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default datetimeFormats;
|
||||||
|
|||||||
@@ -126,7 +126,8 @@ function loadDynamicPicker(element) {
|
|||||||
-1 ===
|
-1 ===
|
||||||
this.suggested.findIndex(
|
this.suggested.findIndex(
|
||||||
(e) => e.type === entity.type && e.id === entity.id,
|
(e) => e.type === entity.type && e.id === entity.id,
|
||||||
)
|
) &&
|
||||||
|
"me" !== entity
|
||||||
) {
|
) {
|
||||||
this.suggested.push(entity);
|
this.suggested.push(entity);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
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,12 @@
|
|||||||
|
import App from "ChillMainAssets/vuejs/HomepageWidget/App.vue";
|
||||||
|
import { createApp } from "vue";
|
||||||
|
import { store } from "ChillMainAssets/vuejs/HomepageWidget/store";
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
interface Window {
|
||||||
|
homepage_config: string;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const _app = createApp(App);
|
||||||
|
_app.use(store).mount("#homepage_widget");
|
||||||
@@ -3,6 +3,8 @@ import {
|
|||||||
isGenericDocWithStoredObject,
|
isGenericDocWithStoredObject,
|
||||||
} from "ChillDocStoreAssets/types/generic_doc";
|
} from "ChillDocStoreAssets/types/generic_doc";
|
||||||
import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
|
import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
|
||||||
|
import { CreatableEntityType } from "ChillPersonAssets/types";
|
||||||
|
import {ThirdpartyCompany} from "../../../ChillThirdPartyBundle/Resources/public/types";
|
||||||
import { Person } from "../../../ChillPersonBundle/Resources/public/types";
|
import { Person } from "../../../ChillPersonBundle/Resources/public/types";
|
||||||
|
|
||||||
export interface DateTime {
|
export interface DateTime {
|
||||||
@@ -10,9 +12,63 @@ export interface DateTime {
|
|||||||
datetime8601: string;
|
datetime8601: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A date representation to use when we create or update a date
|
||||||
|
*/
|
||||||
|
export interface DateTimeWrite {
|
||||||
|
/**
|
||||||
|
* Must be a string in format Y-m-d\TH:i:sO
|
||||||
|
*/
|
||||||
|
datetime: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface Civility {
|
export interface Civility {
|
||||||
|
type: "chill_main_civility";
|
||||||
|
id: number;
|
||||||
|
abbreviation: TranslatableString;
|
||||||
|
active: boolean;
|
||||||
|
name: TranslatableString;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Lightweight reference to Civility, to use in POST or PUT requests.
|
||||||
|
*/
|
||||||
|
export interface SetCivility {
|
||||||
|
type: "chill_main_civility";
|
||||||
|
id: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gender translation.
|
||||||
|
*
|
||||||
|
* Match the GenderEnum in PHP code.
|
||||||
|
*/
|
||||||
|
export type GenderTranslation = "male" | "female" | "neutral" | "unknown";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A gender
|
||||||
|
*
|
||||||
|
* See also
|
||||||
|
*/
|
||||||
|
export interface Gender {
|
||||||
|
type: "chill_main_gender";
|
||||||
|
id: number;
|
||||||
|
label: TranslatableString;
|
||||||
|
genderTranslation: GenderTranslation;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Lightweight reference to a Gender, used in POST / PUT requests.
|
||||||
|
*/
|
||||||
|
export interface SetGender {
|
||||||
|
type: "chill_main_gender";
|
||||||
|
id: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Household {
|
||||||
|
type: "household";
|
||||||
id: number;
|
id: number;
|
||||||
// TODO
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Job {
|
export interface Job {
|
||||||
@@ -27,6 +83,18 @@ export interface Center {
|
|||||||
id: number;
|
id: number;
|
||||||
type: "center";
|
type: "center";
|
||||||
name: string;
|
name: string;
|
||||||
|
isActive: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SetCenter is a lightweight reference used in POST/PUT requests to associate an existing center with a resource.
|
||||||
|
* It links by id only and does not create or modify centers.
|
||||||
|
* Expected shape: { type: "center", id: number }.
|
||||||
|
* Requests will fail if the id is invalid, the center doesn't exist, or permissions are insufficient.
|
||||||
|
*/
|
||||||
|
export interface SetCenter {
|
||||||
|
id: number;
|
||||||
|
type: "center";
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Scope {
|
export interface Scope {
|
||||||
@@ -118,6 +186,13 @@ export interface Address {
|
|||||||
isNoAddress: boolean;
|
isNoAddress: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Associate an existing address in write operations.
|
||||||
|
*/
|
||||||
|
export interface SetAddress {
|
||||||
|
id: number;
|
||||||
|
}
|
||||||
|
|
||||||
export interface AddressWithPoint extends Address {
|
export interface AddressWithPoint extends Address {
|
||||||
point: Point;
|
point: Point;
|
||||||
}
|
}
|
||||||
@@ -291,6 +366,156 @@ export interface PrivateCommentEmbeddable {
|
|||||||
comments: Record<number, string>;
|
comments: Record<number, string>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// API Exception types
|
||||||
|
export interface TransportExceptionInterface {
|
||||||
|
name: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
type IndexedKey<Base extends string> = `${Base}[${number}]`;
|
||||||
|
type BaseKeys<M> = Extract<keyof M, string>;
|
||||||
|
|
||||||
|
export type DynamicKeys<M extends Record<string, Record<string, unknown>>> =
|
||||||
|
| BaseKeys<M>
|
||||||
|
| { [K in BaseKeys<M> as IndexedKey<K>]: K }[IndexedKey<BaseKeys<M>>];
|
||||||
|
|
||||||
|
type NormalizeKey<K extends string> = K extends `${infer B}[${number}]` ? B : K;
|
||||||
|
|
||||||
|
export type ViolationFromMap<M extends Record<string, Record<string, unknown>>> = {
|
||||||
|
[K in DynamicKeys<M> & string]: { // <- note le "& string" ici
|
||||||
|
propertyPath: K;
|
||||||
|
title: string;
|
||||||
|
parameters?: M[NormalizeKey<K>];
|
||||||
|
type?: string;
|
||||||
|
}
|
||||||
|
}[DynamicKeys<M> & string];
|
||||||
|
|
||||||
|
export type ValidationProblemFromMap<
|
||||||
|
M extends Record<string, Record<string, string|number>>,
|
||||||
|
> = {
|
||||||
|
type: string;
|
||||||
|
title: string;
|
||||||
|
detail?: string;
|
||||||
|
violations: ViolationFromMap<M>[];
|
||||||
|
} & Record<string, unknown>;
|
||||||
|
|
||||||
|
export interface ValidationExceptionInterface<
|
||||||
|
M extends Record<string, Record<string, string|number>> = Record<
|
||||||
|
string,
|
||||||
|
Record<string, string|number>
|
||||||
|
>,
|
||||||
|
> extends Error {
|
||||||
|
name: "ValidationException";
|
||||||
|
/** Full server payload copy */
|
||||||
|
problems: ValidationProblemFromMap<M>;
|
||||||
|
/** A list of all violations, with property key */
|
||||||
|
violationsList: ViolationFromMap<M>[];
|
||||||
|
/** Compact list "Title: path" */
|
||||||
|
violations: string[];
|
||||||
|
/** Only titles */
|
||||||
|
titles: string[];
|
||||||
|
/** Only property paths */
|
||||||
|
propertyPaths: DynamicKeys<M> & string[];
|
||||||
|
/** Indexing by property (useful for display by field) */
|
||||||
|
byProperty: Record<Extract<keyof M, string>, string[]>;
|
||||||
|
|
||||||
|
violationsByNormalizedProperty(property: Extract<keyof M, string>): ViolationFromMap<M>[];
|
||||||
|
|
||||||
|
violationsByNormalizedPropertyAndParams<
|
||||||
|
P extends Extract<keyof M, string>,
|
||||||
|
K extends Extract<keyof M[P], string>
|
||||||
|
>(
|
||||||
|
property: P,
|
||||||
|
param: K,
|
||||||
|
param_value: M[P][K]
|
||||||
|
): ViolationFromMap<M>[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AccessExceptionInterface extends TransportExceptionInterface {
|
||||||
|
name: "AccessException";
|
||||||
|
violations: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface NotFoundExceptionInterface
|
||||||
|
extends TransportExceptionInterface {
|
||||||
|
name: "NotFoundException";
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ServerExceptionInterface extends TransportExceptionInterface {
|
||||||
|
name: "ServerException";
|
||||||
|
message: string;
|
||||||
|
code: number;
|
||||||
|
body: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ConflictHttpExceptionInterface
|
||||||
|
extends TransportExceptionInterface {
|
||||||
|
name: "ConflictHttpException";
|
||||||
|
violations: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export type ApiException =
|
||||||
|
| ValidationExceptionInterface
|
||||||
|
| AccessExceptionInterface
|
||||||
|
| NotFoundExceptionInterface
|
||||||
|
| ServerExceptionInterface
|
||||||
|
| ConflictHttpExceptionInterface;
|
||||||
|
|
||||||
|
export interface Modal {
|
||||||
|
showModal: boolean;
|
||||||
|
modalDialogClass: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Selected {
|
||||||
|
result: UserGroupOrUser;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface addNewEntities {
|
||||||
|
selected: Selected[];
|
||||||
|
modal: Modal;
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum HomepageTabs {
|
||||||
|
MyCustoms,
|
||||||
|
MyTickets,
|
||||||
|
MyNotifications,
|
||||||
|
MyAccompanyingCourses,
|
||||||
|
MyEvaluations,
|
||||||
|
MyTasks,
|
||||||
|
MyWorkflows,
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface HomepageConfig {
|
||||||
|
defaultTab: HomepageTabs;
|
||||||
|
displayTabs: HomepageTabs[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TabDefinition {
|
||||||
|
key: HomepageTabs;
|
||||||
|
label: string;
|
||||||
|
icon: string | null;
|
||||||
|
counter: () => number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CreateComponentConfigGeneral = {
|
||||||
|
action: 'create';
|
||||||
|
allowedTypes: CreatableEntityType[];
|
||||||
|
query: string;
|
||||||
|
parent: null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CreateComponentThirdPartyAddContact = {
|
||||||
|
action: 'addContact';
|
||||||
|
allowedTypes: readonly ['thirdparty'];
|
||||||
|
query: string;
|
||||||
|
parent: ThirdpartyCompany;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configuration for the CreateModal and Create component
|
||||||
|
*/
|
||||||
|
export type CreateComponentConfig = CreateComponentConfigGeneral | CreateComponentThirdPartyAddContact;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Possible states for the WaitingScreen Component.
|
* Possible states for the WaitingScreen Component.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -24,9 +24,7 @@
|
|||||||
{{ trans(getTextTitle) }}
|
{{ trans(getTextTitle) }}
|
||||||
<span v-if="flag.loading" class="loading">
|
<span v-if="flag.loading" class="loading">
|
||||||
<i class="fa fa-circle-o-notch fa-spin fa-fw" />
|
<i class="fa fa-circle-o-notch fa-spin fa-fw" />
|
||||||
<span class="sr-only">{{
|
<span class="sr-only">{{ trans(ADDRESS_LOADING) }}</span>
|
||||||
trans(ADDRESS_LOADING)
|
|
||||||
}}</span>
|
|
||||||
</span>
|
</span>
|
||||||
</h2>
|
</h2>
|
||||||
</template>
|
</template>
|
||||||
@@ -90,9 +88,7 @@
|
|||||||
{{ trans(getTextTitle) }}
|
{{ trans(getTextTitle) }}
|
||||||
<span v-if="flag.loading" class="loading">
|
<span v-if="flag.loading" class="loading">
|
||||||
<i class="fa fa-circle-o-notch fa-spin fa-fw" />
|
<i class="fa fa-circle-o-notch fa-spin fa-fw" />
|
||||||
<span class="sr-only">{{
|
<span class="sr-only">{{ trans(ADDRESS_LOADING) }}</span>
|
||||||
trans(ADDRESS_LOADING)
|
|
||||||
}}</span>
|
|
||||||
</span>
|
</span>
|
||||||
</h2>
|
</h2>
|
||||||
</template>
|
</template>
|
||||||
@@ -148,10 +144,7 @@
|
|||||||
</template>
|
</template>
|
||||||
<template #action>
|
<template #action>
|
||||||
<li v-if="!this.context.edit && this.useDatePane">
|
<li v-if="!this.context.edit && this.useDatePane">
|
||||||
<button
|
<button class="btn btn-update change-icon" @click="closeEditPane">
|
||||||
class="btn btn-update change-icon"
|
|
||||||
@click="closeEditPane"
|
|
||||||
>
|
|
||||||
{{ trans(NEXT) }}
|
{{ trans(NEXT) }}
|
||||||
<i class="fa fa-fw fa-arrow-right" />
|
<i class="fa fa-fw fa-arrow-right" />
|
||||||
</button>
|
</button>
|
||||||
@@ -178,9 +171,7 @@
|
|||||||
{{ trans(getTextTitle) }}
|
{{ trans(getTextTitle) }}
|
||||||
<span v-if="flag.loading" class="loading">
|
<span v-if="flag.loading" class="loading">
|
||||||
<i class="fa fa-circle-o-notch fa-spin fa-fw" />
|
<i class="fa fa-circle-o-notch fa-spin fa-fw" />
|
||||||
<span class="sr-only">{{
|
<span class="sr-only">{{ trans(ADDRESS_LOADING) }}</span>
|
||||||
trans(ADDRESS_LOADING)
|
|
||||||
}}</span>
|
|
||||||
</span>
|
</span>
|
||||||
</h2>
|
</h2>
|
||||||
</template>
|
</template>
|
||||||
@@ -394,8 +385,7 @@ export default {
|
|||||||
getTextTitle() {
|
getTextTitle() {
|
||||||
if (
|
if (
|
||||||
typeof this.options.title !== "undefined" &&
|
typeof this.options.title !== "undefined" &&
|
||||||
(this.options.title.edit !== null ||
|
(this.options.title.edit !== null || this.options.title.create !== null)
|
||||||
this.options.title.create !== null)
|
|
||||||
) {
|
) {
|
||||||
console.log("this.options.title", this.options.title);
|
console.log("this.options.title", this.options.title);
|
||||||
|
|
||||||
@@ -515,10 +505,7 @@ export default {
|
|||||||
if (!this.context.edit) {
|
if (!this.context.edit) {
|
||||||
this.context.edit = true;
|
this.context.edit = true;
|
||||||
this.context.addressId = params.addressId;
|
this.context.addressId = params.addressId;
|
||||||
console.log(
|
console.log("context is now edit, with address", params.addressId);
|
||||||
"context is now edit, with address",
|
|
||||||
params.addressId,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -645,9 +632,7 @@ export default {
|
|||||||
? this.entity.address.confidential
|
? this.entity.address.confidential
|
||||||
: false;
|
: false;
|
||||||
this.entity.selected.isNoAddress =
|
this.entity.selected.isNoAddress =
|
||||||
this.context.edit && this.entity.address.text === ""
|
this.context.edit && this.entity.address.text === "" ? true : false;
|
||||||
? true
|
|
||||||
: false;
|
|
||||||
|
|
||||||
this.entity.selected.country = this.context.edit
|
this.entity.selected.country = this.context.edit
|
||||||
? this.entity.address.country
|
? this.entity.address.country
|
||||||
@@ -742,8 +727,7 @@ export default {
|
|||||||
// add the address reference, if any
|
// add the address reference, if any
|
||||||
if (this.entity.selected.address.addressReference !== undefined) {
|
if (this.entity.selected.address.addressReference !== undefined) {
|
||||||
newAddress = Object.assign(newAddress, {
|
newAddress = Object.assign(newAddress, {
|
||||||
addressReference:
|
addressReference: this.entity.selected.address.addressReference,
|
||||||
this.entity.selected.address.addressReference,
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
newAddress = Object.assign(newAddress, {
|
newAddress = Object.assign(newAddress, {
|
||||||
@@ -763,10 +747,7 @@ export default {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (this.validTo && null !== this.entity.selected.valid.to) {
|
if (this.validTo && null !== this.entity.selected.valid.to) {
|
||||||
console.log(
|
console.log("add validTo in fetch body", this.entity.selected.valid.to);
|
||||||
"add validTo in fetch body",
|
|
||||||
this.entity.selected.valid.to,
|
|
||||||
);
|
|
||||||
newAddress = Object.assign(newAddress, {
|
newAddress = Object.assign(newAddress, {
|
||||||
validTo: {
|
validTo: {
|
||||||
datetime: `${this.entity.selected.valid.to.toISOString().split("T")[0]}T00:00:00+0100`,
|
datetime: `${this.entity.selected.valid.to.toISOString().split("T")[0]}T00:00:00+0100`,
|
||||||
@@ -778,10 +759,7 @@ export default {
|
|||||||
newPostcode = Object.assign(newPostcode, {
|
newPostcode = Object.assign(newPostcode, {
|
||||||
country: { id: this.entity.selected.country.id },
|
country: { id: this.entity.selected.country.id },
|
||||||
}); //TODO why not assign postcodeBody here = Object.assign(postcodeBody, {'origin': 3}); ?
|
}); //TODO why not assign postcodeBody here = Object.assign(postcodeBody, {'origin': 3}); ?
|
||||||
console.log(
|
console.log("writeNew postcode is true! newPostcode: ", newPostcode);
|
||||||
"writeNew postcode is true! newPostcode: ",
|
|
||||||
newPostcode,
|
|
||||||
);
|
|
||||||
newAddress = Object.assign(newAddress, {
|
newAddress = Object.assign(newAddress, {
|
||||||
newPostcode: newPostcode,
|
newPostcode: newPostcode,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -72,10 +72,7 @@ export default {
|
|||||||
this.entity.addressMap.zoom,
|
this.entity.addressMap.zoom,
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
this.map.setView(
|
this.map.setView(lonLatForLeaflet(this.addressPoint.coordinates), 15);
|
||||||
lonLatForLeaflet(this.addressPoint.coordinates),
|
|
||||||
15,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.map.scrollWheelZoom.disable();
|
this.map.scrollWheelZoom.disable();
|
||||||
@@ -105,9 +102,7 @@ export default {
|
|||||||
},
|
},
|
||||||
update() {
|
update() {
|
||||||
if (this.marker && this.entity.addressMap.center) {
|
if (this.marker && this.entity.addressMap.center) {
|
||||||
this.marker.setLatLng(
|
this.marker.setLatLng(lonLatForLeaflet(this.entity.addressMap.center));
|
||||||
lonLatForLeaflet(this.entity.addressMap.center),
|
|
||||||
);
|
|
||||||
this.map.panTo(lonLatForLeaflet(this.entity.addressMap.center));
|
this.map.panTo(lonLatForLeaflet(this.entity.addressMap.center));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -55,9 +55,7 @@
|
|||||||
:placeholder="trans(ADDRESS_BUILDING_NAME)"
|
:placeholder="trans(ADDRESS_BUILDING_NAME)"
|
||||||
v-model="buildingName"
|
v-model="buildingName"
|
||||||
/>
|
/>
|
||||||
<label for="buildingName">{{
|
<label for="buildingName">{{ trans(ADDRESS_BUILDING_NAME) }}</label>
|
||||||
trans(ADDRESS_BUILDING_NAME)
|
|
||||||
}}</label>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-floating my-1">
|
<div class="form-floating my-1">
|
||||||
<input
|
<input
|
||||||
@@ -79,9 +77,7 @@
|
|||||||
:placeholder="trans(ADDRESS_DISTRIBUTION)"
|
:placeholder="trans(ADDRESS_DISTRIBUTION)"
|
||||||
v-model="distribution"
|
v-model="distribution"
|
||||||
/>
|
/>
|
||||||
<label for="distribution">{{
|
<label for="distribution">{{ trans(ADDRESS_DISTRIBUTION) }}</label>
|
||||||
trans(ADDRESS_DISTRIBUTION)
|
|
||||||
}}</label>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user