mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-12-02 16:38:27 +00:00
Compare commits
2 Commits
v4.8.2
...
475-sugges
| Author | SHA1 | Date | |
|---|---|---|---|
| 5463146925 | |||
| 9375580907 |
6
.changes/unreleased/Fixed-20251201-185859.yaml
Normal file
6
.changes/unreleased/Fixed-20251201-185859.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Fixed
|
||||||
|
body: Do not suggest a user that is no longer active in the activity form.
|
||||||
|
time: 2025-12-01T18:58:59.410998029+01:00
|
||||||
|
custom:
|
||||||
|
Issue: "475"
|
||||||
|
SchemaChange: No schema change
|
||||||
@@ -103,7 +103,7 @@ const store = createStore({
|
|||||||
}
|
}
|
||||||
// console.log("suggested users", suggestedUsers);
|
// console.log("suggested users", suggestedUsers);
|
||||||
|
|
||||||
return suggestedUsers;
|
return suggestedUsers.filter((u) => u.enabled === true);
|
||||||
},
|
},
|
||||||
suggestedResources(state) {
|
suggestedResources(state) {
|
||||||
// const resources = state.activity.accompanyingPeriod.resources;
|
// const resources = state.activity.accompanyingPeriod.resources;
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
|
|||||||
'isAbsent' => false,
|
'isAbsent' => false,
|
||||||
'absenceStart' => null,
|
'absenceStart' => null,
|
||||||
'absenceEnd' => null,
|
'absenceEnd' => null,
|
||||||
|
'enabled' => true,
|
||||||
];
|
];
|
||||||
|
|
||||||
public function __construct(private readonly UserRender $userRender, private readonly ClockInterface $clock) {}
|
public function __construct(private readonly UserRender $userRender, private readonly ClockInterface $clock) {}
|
||||||
@@ -108,6 +109,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
|
|||||||
'isAbsent' => $object->isAbsent(),
|
'isAbsent' => $object->isAbsent(),
|
||||||
'absenceStart' => $this->normalizer->normalize($object->getAbsenceStart(), $format, $absenceDatesContext),
|
'absenceStart' => $this->normalizer->normalize($object->getAbsenceStart(), $format, $absenceDatesContext),
|
||||||
'absenceEnd' => $this->normalizer->normalize($object->getAbsenceEnd(), $format, $absenceDatesContext),
|
'absenceEnd' => $this->normalizer->normalize($object->getAbsenceEnd(), $format, $absenceDatesContext),
|
||||||
|
'enabled' => $object->isEnabled(),
|
||||||
];
|
];
|
||||||
|
|
||||||
if ('docgen' === $format) {
|
if ('docgen' === $format) {
|
||||||
|
|||||||
Reference in New Issue
Block a user