mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-11-24 04:47:46 +00:00
Compare commits
3 Commits
470-alphab
...
466-set-ma
| Author | SHA1 | Date | |
|---|---|---|---|
|
220d1fd928
|
|||
|
8878efdc47
|
|||
|
845a794b74
|
7
.changes/unreleased/Fixed-20251118-140559.yaml
Normal file
7
.changes/unreleased/Fixed-20251118-140559.yaml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
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
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
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: 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
|
|
||||||
@@ -382,6 +382,7 @@ 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);
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
<?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');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
|
|
||||||
<ul class="record_actions">
|
<ul class="record_actions">
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ path('chill_event__event_show', { 'id' : event.id } ) }}" class="btn btn-cancel">
|
<a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-cancel">
|
||||||
{{ 'Back to the event'|trans }}
|
{{ 'Back to the event'|trans }}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ 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;
|
||||||
@@ -37,7 +36,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, private readonly UserJobRepository $userJobRepository) {}
|
public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag) {}
|
||||||
|
|
||||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||||
{
|
{
|
||||||
@@ -81,7 +80,12 @@ 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()),
|
||||||
'choices' => $this->loadAndSortUserJobs(),
|
'query_builder' => static function (EntityRepository $er) {
|
||||||
|
$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',
|
||||||
@@ -92,7 +96,6 @@ 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;
|
||||||
@@ -152,20 +155,6 @@ 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, file_name }) {
|
function addDocument({ stored_object, stored_object_version }) {
|
||||||
let document = {
|
let document = {
|
||||||
type: "accompanying_period_work_evaluation_document",
|
type: "accompanying_period_work_evaluation_document",
|
||||||
storedObject: stored_object,
|
storedObject: stored_object,
|
||||||
title: file_name,
|
title: "Nouveau document",
|
||||||
};
|
};
|
||||||
store.commit("addDocument", {
|
store.commit("addDocument", {
|
||||||
key: props.evaluation.key,
|
key: props.evaluation.key,
|
||||||
|
|||||||
Reference in New Issue
Block a user