mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-11-03 10:48:25 +00:00
Compare commits
1 Commits
280-add-mi
...
451-activi
| Author | SHA1 | Date | |
|---|---|---|---|
| 0f03413383 |
@@ -1,6 +0,0 @@
|
|||||||
kind: DX
|
|
||||||
body: Add missing fixtures for proper loading of AccompanyingPeriods
|
|
||||||
time: 2025-10-30T12:37:32.824593456+01:00
|
|
||||||
custom:
|
|
||||||
Issue: "280"
|
|
||||||
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
|
||||||
@@ -1,45 +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\DataFixtures\ORM;
|
|
||||||
|
|
||||||
use Chill\MainBundle\Entity\Location;
|
|
||||||
use Chill\MainBundle\Entity\LocationType;
|
|
||||||
use Doctrine\Common\DataFixtures\AbstractFixture;
|
|
||||||
use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
|
|
||||||
use Doctrine\Persistence\ObjectManager;
|
|
||||||
|
|
||||||
class LoadAdministrativeLocation extends AbstractFixture implements OrderedFixtureInterface
|
|
||||||
{
|
|
||||||
final public const ADMINISTRATIVE_LOCATION = 'administrative_location';
|
|
||||||
|
|
||||||
public function getOrder(): int
|
|
||||||
{
|
|
||||||
return 9000;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function load(ObjectManager $manager): void
|
|
||||||
{
|
|
||||||
$o = new Location();
|
|
||||||
/** @var LocationType $locationType */
|
|
||||||
$locationType = $this->getReference(LoadLocationType::LOCATION_TYPE.'_0');
|
|
||||||
$o->setLocationType($locationType);
|
|
||||||
$o->setName('Commune de Bruxelles');
|
|
||||||
$o->setAvailableForUsers(true);
|
|
||||||
|
|
||||||
$manager->persist($o);
|
|
||||||
|
|
||||||
$this->addReference(self::ADMINISTRATIVE_LOCATION, $o);
|
|
||||||
echo "Adding one Administrative Location\n";
|
|
||||||
|
|
||||||
$manager->flush();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -25,8 +25,6 @@ class LoadLocationType extends AbstractFixture implements ContainerAwareInterfac
|
|||||||
{
|
{
|
||||||
private ?ContainerInterface $container = null;
|
private ?ContainerInterface $container = null;
|
||||||
|
|
||||||
final public const LOCATION_TYPE = 'location_type';
|
|
||||||
|
|
||||||
public function getOrder(): int
|
public function getOrder(): int
|
||||||
{
|
{
|
||||||
return 52;
|
return 52;
|
||||||
@@ -55,15 +53,13 @@ class LoadLocationType extends AbstractFixture implements ContainerAwareInterfac
|
|||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
foreach ($arr as $index => $a) {
|
foreach ($arr as $a) {
|
||||||
$locationType = (new LocationType())
|
$locationType = (new LocationType())
|
||||||
->setTitle($a['name'])
|
->setTitle($a['name'])
|
||||||
->setAvailableForUsers(true)
|
->setAvailableForUsers(true)
|
||||||
->setActive(true)
|
->setActive(true)
|
||||||
->setAddressRequired($a['address_required']);
|
->setAddressRequired($a['address_required']);
|
||||||
$manager->persist($locationType);
|
$manager->persist($locationType);
|
||||||
|
|
||||||
$this->addReference(self::LOCATION_TYPE.'_'.$index, $locationType);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$manager->flush();
|
$manager->flush();
|
||||||
|
|||||||
@@ -1,41 +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\DataFixtures\ORM;
|
|
||||||
|
|
||||||
use Chill\MainBundle\Entity\UserJob;
|
|
||||||
use Doctrine\Common\DataFixtures\AbstractFixture;
|
|
||||||
use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
|
|
||||||
use Doctrine\Persistence\ObjectManager;
|
|
||||||
|
|
||||||
class LoadUserJob extends AbstractFixture implements OrderedFixtureInterface
|
|
||||||
{
|
|
||||||
final public const USER_JOB = 'user_job';
|
|
||||||
private array $socialWorker = ['en' => 'social worker', 'fr' => 'travailleur social'];
|
|
||||||
|
|
||||||
public function getOrder(): int
|
|
||||||
{
|
|
||||||
return 9000;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function load(ObjectManager $manager): void
|
|
||||||
{
|
|
||||||
$o = new UserJob();
|
|
||||||
$o->setLabel($this->socialWorker);
|
|
||||||
|
|
||||||
$manager->persist($o);
|
|
||||||
|
|
||||||
$this->addReference(self::USER_JOB, $o);
|
|
||||||
echo "Adding one AccompanyingPeriod User Job\n";
|
|
||||||
|
|
||||||
$manager->flush();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -11,19 +11,15 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\PersonBundle\DataFixtures\ORM;
|
namespace Chill\PersonBundle\DataFixtures\ORM;
|
||||||
|
|
||||||
use Chill\MainBundle\DataFixtures\ORM\LoadAdministrativeLocation;
|
|
||||||
use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
|
use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
|
||||||
use Chill\MainBundle\DataFixtures\ORM\LoadUserJob;
|
|
||||||
use Chill\MainBundle\Entity\Address;
|
use Chill\MainBundle\Entity\Address;
|
||||||
use Chill\MainBundle\Entity\Center;
|
use Chill\MainBundle\Entity\Center;
|
||||||
use Chill\MainBundle\Entity\Country;
|
use Chill\MainBundle\Entity\Country;
|
||||||
use Chill\MainBundle\Entity\Gender;
|
use Chill\MainBundle\Entity\Gender;
|
||||||
use Chill\MainBundle\Entity\GenderEnum;
|
use Chill\MainBundle\Entity\GenderEnum;
|
||||||
use Chill\MainBundle\Entity\Location;
|
|
||||||
use Chill\MainBundle\Entity\PostalCode;
|
use Chill\MainBundle\Entity\PostalCode;
|
||||||
use Chill\MainBundle\Entity\Scope;
|
use Chill\MainBundle\Entity\Scope;
|
||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
use Chill\MainBundle\Entity\UserJob;
|
|
||||||
use Chill\MainBundle\Repository\CenterRepository;
|
use Chill\MainBundle\Repository\CenterRepository;
|
||||||
use Chill\MainBundle\Repository\CountryRepository;
|
use Chill\MainBundle\Repository\CountryRepository;
|
||||||
use Chill\MainBundle\Repository\GenderRepository;
|
use Chill\MainBundle\Repository\GenderRepository;
|
||||||
@@ -366,10 +362,6 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
|
|||||||
$origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN, AccompanyingPeriod\Origin::class);
|
$origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN, AccompanyingPeriod\Origin::class);
|
||||||
$accompanyingPeriod->setOrigin($origin);
|
$accompanyingPeriod->setOrigin($origin);
|
||||||
$accompanyingPeriod->setIntensity('regular');
|
$accompanyingPeriod->setIntensity('regular');
|
||||||
$userJob = $this->getReference(LoadUserJob::USER_JOB, UserJob::class);
|
|
||||||
$accompanyingPeriod->setJob($userJob);
|
|
||||||
$administrativeLocation = $this->getReference(LoadAdministrativeLocation::ADMINISTRATIVE_LOCATION, Location::class);
|
|
||||||
$accompanyingPeriod->setAdministrativeLocation($administrativeLocation);
|
|
||||||
$accompanyingPeriod->setAddressLocation($this->createAddress());
|
$accompanyingPeriod->setAddressLocation($this->createAddress());
|
||||||
$manager->persist($accompanyingPeriod->getAddressLocation());
|
$manager->persist($accompanyingPeriod->getAddressLocation());
|
||||||
$workflow = $this->workflowRegistry->get($accompanyingPeriod);
|
$workflow = $this->workflowRegistry->get($accompanyingPeriod);
|
||||||
|
|||||||
@@ -239,13 +239,22 @@ class SocialIssue
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Collection<SocialAction> All the descendant social actions of all
|
* @return Collection<SocialAction> All the social actions of the entity, it's
|
||||||
* the descendants of the entity
|
* the descendants and it's parents
|
||||||
*/
|
*/
|
||||||
public function getRecursiveSocialActions(): Collection
|
public function getRecursiveSocialActions(): Collection
|
||||||
{
|
{
|
||||||
$recursiveSocialActions = new ArrayCollection();
|
$recursiveSocialActions = new ArrayCollection();
|
||||||
|
|
||||||
|
// Get social actions from parent issues
|
||||||
|
foreach ($this->getAncestors(false) as $ancestor) {
|
||||||
|
foreach ($ancestor->getDescendantsSocialActions() as $descendant) {
|
||||||
|
if (!$recursiveSocialActions->contains($descendant)) {
|
||||||
|
$recursiveSocialActions->add($descendant);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($this->getDescendantsWithThis() as $socialIssue) {
|
foreach ($this->getDescendantsWithThis() as $socialIssue) {
|
||||||
foreach ($socialIssue->getDescendantsSocialActions() as $descendant) {
|
foreach ($socialIssue->getDescendantsSocialActions() as $descendant) {
|
||||||
if (!$recursiveSocialActions->contains($descendant)) {
|
if (!$recursiveSocialActions->contains($descendant)) {
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ import {
|
|||||||
EVALUATION_DOCUMENT_MOVE_SUCCESS,
|
EVALUATION_DOCUMENT_MOVE_SUCCESS,
|
||||||
} from "translator";
|
} from "translator";
|
||||||
import { useToast } from "vue-toast-notification";
|
import { useToast } from "vue-toast-notification";
|
||||||
import { buildLinkCreate as buildLinkCreateNotification } from "ChillMainAssets/lib/entity-notification/api";
|
|
||||||
|
|
||||||
const props = defineProps(["evaluation", "docAnchorId"]);
|
const props = defineProps(["evaluation", "docAnchorId"]);
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
|
|||||||
Reference in New Issue
Block a user