mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-11-20 10:57:47 +00:00
Compare commits
5 Commits
386-chill-
...
470-alphab
| Author | SHA1 | Date | |
|---|---|---|---|
| 00ae2ad3b0 | |||
| eae08e5752 | |||
| c7d7c3ac6f | |||
| 7eb895c0e1 | |||
|
e1b91ebbfd
|
@@ -1,6 +0,0 @@
|
|||||||
kind: Feature
|
|
||||||
body: Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.
|
|
||||||
time: 2025-11-12T10:32:24.916576945+01:00
|
|
||||||
custom:
|
|
||||||
Issue: "461"
|
|
||||||
SchemaChange: No schema change
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
kind: Fixed
|
|
||||||
body: Display calendar items for which an invite was accepted on the mes rendez-vous page
|
|
||||||
time: 2025-11-12T17:00:25.58946528+01:00
|
|
||||||
custom:
|
|
||||||
Issue: "463"
|
|
||||||
SchemaChange: No schema change
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
kind: Fixed
|
|
||||||
body: |
|
|
||||||
Improve accessibility on login page
|
|
||||||
time: 2025-11-13T12:01:25.488478771+01:00
|
|
||||||
custom:
|
|
||||||
Issue: ""
|
|
||||||
SchemaChange: No schema change
|
|
||||||
6
.changes/unreleased/Fixed-20251119-133324.yaml
Normal file
6
.changes/unreleased/Fixed-20251119-133324.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Fixed
|
||||||
|
body: Insert name of file as the document title when uploading
|
||||||
|
time: 2025-11-19T13:33:24.778116633+01:00
|
||||||
|
custom:
|
||||||
|
Issue: ""
|
||||||
|
SchemaChange: No schema change
|
||||||
6
.changes/unreleased/Fixed-20251119-134802.yaml
Normal file
6
.changes/unreleased/Fixed-20251119-134802.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: Fixed
|
||||||
|
body: Add missing path paramater 'id' for editing multiple participations
|
||||||
|
time: 2025-11-19T13:48:02.078949572+01:00
|
||||||
|
custom:
|
||||||
|
Issue: ""
|
||||||
|
SchemaChange: No schema change
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
kind: UX
|
|
||||||
body: Remove the label if there is only one scope and no scope picking field is displayed.
|
|
||||||
time: 2025-10-30T15:31:26.807444365+01:00
|
|
||||||
custom:
|
|
||||||
Issue: "449"
|
|
||||||
SchemaChange: No schema change
|
|
||||||
6
.changes/unreleased/UX-20251119-153706.yaml
Normal file
6
.changes/unreleased/UX-20251119-153706.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
kind: UX
|
||||||
|
body: Alphabetically order userJobs and mainLocations within user creation form
|
||||||
|
time: 2025-11-19T15:37:06.393470745+01:00
|
||||||
|
custom:
|
||||||
|
Issue: "470"
|
||||||
|
SchemaChange: No schema change
|
||||||
9
.changes/v4.8.0.md
Normal file
9
.changes/v4.8.0.md
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
## 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.
|
||||||
10
CHANGELOG.md
10
CHANGELOG.md
@@ -6,6 +6,16 @@ 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
|
## v4.7.0 - 2025-11-10
|
||||||
### Feature
|
### Feature
|
||||||
* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu
|
* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
|
|
||||||
<ul class="record_actions">
|
<ul class="record_actions">
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-cancel">
|
<a href="{{ path('chill_event__event_show', { 'id' : event.id } ) }}" class="btn btn-cancel">
|
||||||
{{ 'Back to the event'|trans }}
|
{{ 'Back to the event'|trans }}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ use Chill\MainBundle\Entity\UserJob;
|
|||||||
use Chill\MainBundle\Form\Type\ChillDateType;
|
use Chill\MainBundle\Form\Type\ChillDateType;
|
||||||
use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
|
use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
|
||||||
use Chill\MainBundle\Form\Type\PickCivilityType;
|
use Chill\MainBundle\Form\Type\PickCivilityType;
|
||||||
|
use Chill\MainBundle\Repository\UserJobRepository;
|
||||||
use Chill\MainBundle\Templating\TranslatableStringHelper;
|
use Chill\MainBundle\Templating\TranslatableStringHelper;
|
||||||
use Doctrine\ORM\EntityRepository;
|
use Doctrine\ORM\EntityRepository;
|
||||||
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
|
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
|
||||||
@@ -36,7 +37,7 @@ use Symfony\Component\Validator\Constraints\Regex;
|
|||||||
|
|
||||||
class UserType extends AbstractType
|
class UserType extends AbstractType
|
||||||
{
|
{
|
||||||
public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag) {}
|
public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag, private readonly UserJobRepository $userJobRepository) {}
|
||||||
|
|
||||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||||
{
|
{
|
||||||
@@ -80,12 +81,7 @@ class UserType extends AbstractType
|
|||||||
'placeholder' => 'choose a job',
|
'placeholder' => 'choose a job',
|
||||||
'class' => UserJob::class,
|
'class' => UserJob::class,
|
||||||
'choice_label' => fn (UserJob $c) => $this->translatableStringHelper->localize($c->getLabel()),
|
'choice_label' => fn (UserJob $c) => $this->translatableStringHelper->localize($c->getLabel()),
|
||||||
'query_builder' => static function (EntityRepository $er) {
|
'choices' => $this->loadAndSortUserJobs(),
|
||||||
$qb = $er->createQueryBuilder('uj');
|
|
||||||
$qb->where('uj.active = TRUE');
|
|
||||||
|
|
||||||
return $qb;
|
|
||||||
},
|
|
||||||
])
|
])
|
||||||
->add('mainLocation', EntityType::class, [
|
->add('mainLocation', EntityType::class, [
|
||||||
'label' => 'Main location',
|
'label' => 'Main location',
|
||||||
@@ -96,6 +92,7 @@ class UserType extends AbstractType
|
|||||||
'query_builder' => static function (EntityRepository $er) {
|
'query_builder' => static function (EntityRepository $er) {
|
||||||
$qb = $er->createQueryBuilder('l');
|
$qb = $er->createQueryBuilder('l');
|
||||||
$qb->orderBy('l.locationType');
|
$qb->orderBy('l.locationType');
|
||||||
|
$qb->orderBy('l.name', 'ASC');
|
||||||
$qb->where('l.availableForUsers = TRUE');
|
$qb->where('l.availableForUsers = TRUE');
|
||||||
|
|
||||||
return $qb;
|
return $qb;
|
||||||
@@ -155,6 +152,20 @@ class UserType extends AbstractType
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function loadAndSortUserJobs(): array
|
||||||
|
{
|
||||||
|
$items = $this->userJobRepository->findBy(['active' => true]);
|
||||||
|
|
||||||
|
usort(
|
||||||
|
$items,
|
||||||
|
fn ($a, $b) => mb_strtolower((string) $this->translatableStringHelper->localize($a->getLabel()))
|
||||||
|
<=>
|
||||||
|
mb_strtolower((string) $this->translatableStringHelper->localize($b->getLabel()))
|
||||||
|
);
|
||||||
|
|
||||||
|
return $items;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param OptionsResolverInterface $resolver
|
* @param OptionsResolverInterface $resolver
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -293,11 +293,11 @@ function onInputDocumentTitle(event) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function addDocument({ stored_object, stored_object_version }) {
|
function addDocument({ stored_object, stored_object_version, file_name }) {
|
||||||
let document = {
|
let document = {
|
||||||
type: "accompanying_period_work_evaluation_document",
|
type: "accompanying_period_work_evaluation_document",
|
||||||
storedObject: stored_object,
|
storedObject: stored_object,
|
||||||
title: "Nouveau document",
|
title: file_name,
|
||||||
};
|
};
|
||||||
store.commit("addDocument", {
|
store.commit("addDocument", {
|
||||||
key: props.evaluation.key,
|
key: props.evaluation.key,
|
||||||
|
|||||||
Reference in New Issue
Block a user