Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-30 03:23:48 +00:00
Code Issues Actions Projects Releases Wiki Activity

cs: Fix code style (safe rules only).

Browse Source
This commit is contained in:
Pol Dellaiera
2021-11-23 14:06:38 +01:00
parent 149d7ce991
commit 8f96a1121d
1223 changed files with 65199 additions and 64625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\AsideActivityBundle;
@@ -8,4 +15,4 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
class ChillAsideActivityBundle extends Bundle
{
}
}

11
src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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\AsideActivityBundle\Controller;
use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -7,9 +14,8 @@ use Chill\MainBundle\Pagination\PaginatorInterface;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\HttpFoundation\Request;
/**
* Class AsideActivityBundle
* Class AsideActivityBundle.
*/
class AsideActivityCategoryController extends CRUDController
{
@@ -20,5 +26,4 @@ class AsideActivityCategoryController extends CRUDController
return $query;
}
}

59
src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\AsideActivityBundle\Controller;
@@ -7,11 +14,10 @@ namespace Chill\AsideActivityBundle\Controller;
use Chill\AsideActivityBundle\Entity\AsideActivity;
use Chill\AsideActivityBundle\Repository\AsideActivityCategoryRepository;
use Chill\MainBundle\CRUD\Controller\CRUDController;
use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\HttpFoundation\Request;
use Chill\MainBundle\Pagination\PaginatorInterface;
use Doctrine\Common\Collections\Criteria;
use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
use DateTime;
use Symfony\Component\HttpFoundation\Request;
final class AsideActivityController extends CRUDController
{
@@ -22,6 +28,28 @@ final class AsideActivityController extends CRUDController
$this->categoryRepository = $categoryRepository;
}
public function createEntity(string $action, Request $request): object
{
$asideActivity = new AsideActivity();
$duration = $request->query->get('duration', '300');
$duration = DateTime::createFromFormat('U', $duration);
$asideActivity->setDuration($duration);
$categoryId = $request->query->get('type', 7);
if (null === $categoryId) {
return $this->createNotFoundException('You must give a valid category id');
}
$category = $this->categoryRepository->find($categoryId);
$asideActivity->setType($category);
$note = $request->query->get('note', null);
$asideActivity->setNote($note);
return $asideActivity;
}
protected function buildQueryEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null)
{
$qb = parent::buildQueryEntities($action, $request);
@@ -42,30 +70,9 @@ final class AsideActivityController extends CRUDController
PaginatorInterface $paginator
) {
if ('index' === $action) {
return $query->orderBy('e.date', 'DESC');
return $query->orderBy('e.date', 'DESC');
}
return parent::orderQuery($action, $query, $request, $paginator);
}
public function createEntity(string $action, Request $request): object
{
$asideActivity = new AsideActivity();
$duration = $request->query->get('duration', '300');
$duration = \DateTime::createFromFormat('U', $duration);
$asideActivity->setDuration($duration);
$categoryId = $request->query->get('type', 7);
if($categoryId === null){
return $this->createNotFoundException('You must give a valid category id');
}
$category = $this->categoryRepository->find($categoryId);
$asideActivity->setType($category);
$note = $request->query->get('note', null);
$asideActivity->setNote($note);
return $asideActivity;
}
}

23
src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
View File

@@ -1,13 +1,23 @@
<?php
/**
* 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\AsideActivityBundle\DataFixtures\ORM;
use Chill\AsideActivityBundle\Entity\AsideActivity;
use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
use Chill\MainBundle\Repository\UserRepository;
use DateInterval;
use DateTimeImmutable;
use Doctrine\Bundle\FixturesBundle\Fixture;
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
use Doctrine\Persistence\ObjectManager;
use function random_int;
class LoadAsideActivity extends Fixture implements DependentFixtureInterface
{
@@ -22,7 +32,7 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface
{
return [
LoadUsers::class,
LoadAsideActivityCategory::class
LoadAsideActivityCategory::class,
];
}
@@ -30,20 +40,19 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface
{
$user = $this->userRepository->findOneBy(['username' => 'center a_social']);
for ($i = 0; $i < 50; $i++) {
for ($i = 0; 50 > $i; ++$i) {
$activity = new AsideActivity();
$activity
->setAgent($user)
->setCreatedAt(new \DateTimeImmutable('now'))
->setCreatedAt(new DateTimeImmutable('now'))
->setCreatedBy($user)
->setUpdatedAt(new \DateTimeImmutable('now'))
->setUpdatedAt(new DateTimeImmutable('now'))
->setUpdatedBy($user)
->setType(
$this->getReference('aside_activity_category_0')
)
->setDate((new \DateTimeImmutable('today'))
->sub(new \DateInterval('P'.\random_int(1, 100).'D')))
;
->setDate((new DateTimeImmutable('today'))
->sub(new DateInterval('P' . random_int(1, 100) . 'D')));
$manager->persist($activity);
}

13
src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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\AsideActivityBundle\DataFixtures\ORM;
use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
@@ -11,12 +18,12 @@ class LoadAsideActivityCategory extends \Doctrine\Bundle\FixturesBundle\Fixture
{
foreach ([
'Appel téléphonique',
'Formation'
] as $key => $label) {
'Formation',
] as $key => $label) {
$category = new AsideActivityCategory();
$category->setTitle(['fr' => $label]);
$manager->persist($category);
$this->setReference('aside_activity_category_'.$key, $category);
$this->setReference('aside_activity_category_' . $key, $category);
}
$manager->flush();

54
src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
View File

@@ -1,6 +1,8 @@
<?php
/**
* 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.
*/
@@ -17,18 +19,14 @@ use Symfony\Component\DependencyInjection\Loader;
final class ChillAsideActivityExtension extends Extension implements PrependExtensionInterface
{
/**
* {@inheritdoc}
*/
public function load(array $configs, ContainerBuilder $container): void
{
$configuration = $this->getConfiguration($configs, $container);
$config = $this->processConfiguration($configuration, $configs);
$container->setParameter('chill_aside_activity.form.time_duration', $config['form']['time_duration']);
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
$loader->load('services.yaml');
$loader->load('services/form.yaml');
$loader->load('services/menu.yaml');
@@ -40,18 +38,6 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
$this->prependCruds($container);
}
protected function prependRoute(ContainerBuilder $container)
{
//declare routes for task bundle
$container->prependExtensionConfig('chill_main', array(
'routing' => array(
'resources' => array(
'@ChillAsideActivityBundle/config/routes.yaml',
)
)
));
}
protected function prependCruds(ContainerBuilder $container)
{
$container->prependExtensionConfig('chill_main', [
@@ -65,17 +51,17 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
'actions' => [
'index' => [
'template' => '@ChillAsideActivity/asideActivityCategory/index.html.twig',
'role' => 'ROLE_ADMIN'
'role' => 'ROLE_ADMIN',
],
'new' => [
'new' => [
'role' => 'ROLE_ADMIN',
'template' => '@ChillAsideActivity/asideActivityCategory/new.html.twig',
],
'edit' => [
'edit' => [
'role' => 'ROLE_ADMIN',
'template' => '@ChillAsideActivity/asideActivityCategory/edit.html.twig',
]
]
],
],
],
[
'class' => \Chill\AsideActivityBundle\Entity\AsideActivity::class,
@@ -86,9 +72,9 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
'actions' => [
'index' => [
'template' => '@ChillAsideActivity/asideActivity/index.html.twig',
'role' => 'ROLE_USER'
'role' => 'ROLE_USER',
],
'new' => [
'new' => [
'role' => 'ROLE_USER',
'template' => '@ChillAsideActivity/asideActivity/new.html.twig',
],
@@ -96,17 +82,29 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
'role' => 'ROLE_USER',
'template' => '@ChillAsideActivity/asideActivity/view.html.twig',
],
'edit' => [
'edit' => [
'role' => 'ROLE_USER',
'template' => '@ChillAsideActivity/asideActivity/edit.html.twig',
],
'delete' => [
'role' => 'ROLE_USER',
'template' => '@ChillAsideActivity/asideActivity/delete.html.twig',
]
]
],
],
],
]
],
]);
}
protected function prependRoute(ContainerBuilder $container)
{
//declare routes for task bundle
$container->prependExtensionConfig('chill_main', [
'routing' => [
'resources' => [
'@ChillAsideActivityBundle/config/routes.yaml',
],
],
]);
}
}

244
src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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\AsideActivityBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -13,126 +20,125 @@ class Configuration implements ConfigurationInterface
$treeBuilder->getRootNode('chill_aside_activity')
->children()
->arrayNode('form')
->canBeEnabled()
->children()
->arrayNode('time_duration')
->isRequired()
->defaultValue(
[
[ 'label' => '5 minutes', 'seconds' => 300],
[ 'label' => '10 minutes', 'seconds' => 600],
[ 'label' => '15 minutes', 'seconds' => 900],
[ 'label' => '20 minutes', 'seconds' => 1200],
[ 'label' => '25 minutes', 'seconds' => 1500],
[ 'label' => '30 minutes', 'seconds' => 1800],
[ 'label' => '45 minutes', 'seconds' => 2700],
[ 'label' => '1 hour', 'seconds' => 3600],
[ 'label' => '1 hour 15', 'seconds' => 4500],
[ 'label' => '1 hour 30', 'seconds' => 5400],
[ 'label' => '1 hour 45', 'seconds' => 6300],
[ 'label' => '2 hours', 'seconds' => 7200],
[ 'label' => '2 hours 30', 'seconds' => 9000],
[ 'label' => '3 hours', 'seconds' => 10800],
[ 'label' => '3 hours 30', 'seconds' => 12600],
[ 'label' => '4 hours', 'seconds' => 14400],
[ 'label' => '4 hours 30', 'seconds' => 16200],
[ 'label' => '5 hours', 'seconds' => 18000],
[ 'label' => '5 hours 30', 'seconds' => 19800],
[ 'label' => '6 hours', 'seconds' => 21600],
[ 'label' => '6 hours 30', 'seconds' => 23400],
[ 'label' => '7 hours', 'seconds' => 25200],
[ 'label' => '7 hours 30', 'seconds' => 27000],
[ 'label' => '8 hours', 'seconds' => 28800],
[ 'label' => '8 hours 30', 'seconds' => 30600],
[ 'label' => '9 hours', 'seconds' => 32400],
[ 'label' => '9 hours 30', 'seconds' => 34200],
[ 'label' => '10 hours', 'seconds' => 36000],
[ 'label' => '1/2 day', 'seconds' => 14040],
[ 'label' => '1 day', 'seconds' => 28080],
[ 'label' => '1 1/2 days', 'seconds' => 42120],
[ 'label' => '2 days', 'seconds' => 56160],
[ 'label' => '2 1/2 days', 'seconds' => 70200],
[ 'label' => '3 days', 'seconds' => 84240],
[ 'label' => '3 1/2 days', 'seconds' => 98280],
[ 'label' => '4 days', 'seconds' => 112320],
[ 'label' => '4 1/2 days', 'seconds' => 126360],
[ 'label' => '5 days', 'seconds' => 140400],
[ 'label' => '5 1/2 days', 'seconds' => 154440],
[ 'label' => '6 days', 'seconds' => 168480],
[ 'label' => '6 1/2 days', 'seconds' => 182520],
[ 'label' => '7 days', 'seconds' => 196560],
[ 'label' => '7 1/2 days', 'seconds' => 210600],
[ 'label' => '8 days', 'seconds' => 224640],
[ 'label' => '8 1/2 days', 'seconds' => 238680],
[ 'label' => '9 days', 'seconds' => 252720],
[ 'label' => '9 1/2 days', 'seconds' => 266760],
[ 'label' => '10 days', 'seconds' => 280800],
[ 'label' => '10 1/2days', 'seconds' => 294840],
[ 'label' => '11 days', 'seconds' => 308880],
[ 'label' => '11 1/2 days', 'seconds' => 322920],
[ 'label' => '12 days', 'seconds' => 336960],
[ 'label' => '12 1/2 days', 'seconds' => 351000],
[ 'label' => '13 days', 'seconds' => 365040],
[ 'label' => '13 1/2 days', 'seconds' => 379080],
[ 'label' => '14 days', 'seconds' => 393120],
[ 'label' => '14 1/2 days', 'seconds' => 407160],
[ 'label' => '15 days', 'seconds' => 421200],
[ 'label' => '15 1/2 days', 'seconds' => 435240],
[ 'label' => '16 days', 'seconds' => 449280],
[ 'label' => '16 1/2 days', 'seconds' => 463320],
[ 'label' => '17 days', 'seconds' => 477360],
[ 'label' => '17 1/2 days', 'seconds' => 491400],
[ 'label' => '18 days', 'seconds' => 505440],
[ 'label' => '18 1/2 days', 'seconds' => 519480],
[ 'label' => '19 days', 'seconds' => 533520],
[ 'label' => '19 1/2 days', 'seconds' => 547560],
[ 'label' => '20 days', 'seconds' => 561600],
[ 'label' => '20 1/2 days', 'seconds' => 575640],
[ 'label' => '21 days', 'seconds' => 580680],
[ 'label' => '21 1/2 days', 'seconds' => 603720],
[ 'label' => '22 days', 'seconds' => 617760],
[ 'label' => '22 1/2 days', 'seconds' => 631800],
[ 'label' => '23 days', 'seconds' => 645840],
[ 'label' => '23 1/2 days', 'seconds' => 659880],
[ 'label' => '24 days', 'seconds' => 673920],
[ 'label' => '24 1/2 days', 'seconds' => 687960],
[ 'label' => '25 days', 'seconds' => 702000],
[ 'label' => '25 1/2 days', 'seconds' => 716040],
[ 'label' => '26 days', 'seconds' => 730080],
[ 'label' => '26 1/2 days', 'seconds' => 744120],
[ 'label' => '27 days', 'seconds' => 758160],
[ 'label' => '27 1/2 days', 'seconds' => 772200],
[ 'label' => '28 days', 'seconds' => 786240],
[ 'label' => '28 1/2 days', 'seconds' => 800280],
[ 'label' => '29 days', 'seconds' => 814320],
[ 'label' => '29 1/2 days', 'seconds' => 828360],
[ 'label' => '30 days', 'seconds' => 842400],
]
)
->info('The intervals of time to show in activity form')
->prototype('array')
->children()
->scalarNode('seconds')
->info("The number of seconds of this duration. Must be an integer.")
->cannotBeEmpty()
->validate()
->ifTrue(function($data) {
->arrayNode('form')
->canBeEnabled()
->children()
->arrayNode('time_duration')
->isRequired()
->defaultValue(
[
['label' => '5 minutes', 'seconds' => 300],
['label' => '10 minutes', 'seconds' => 600],
['label' => '15 minutes', 'seconds' => 900],
['label' => '20 minutes', 'seconds' => 1200],
['label' => '25 minutes', 'seconds' => 1500],
['label' => '30 minutes', 'seconds' => 1800],
['label' => '45 minutes', 'seconds' => 2700],
['label' => '1 hour', 'seconds' => 3600],
['label' => '1 hour 15', 'seconds' => 4500],
['label' => '1 hour 30', 'seconds' => 5400],
['label' => '1 hour 45', 'seconds' => 6300],
['label' => '2 hours', 'seconds' => 7200],
['label' => '2 hours 30', 'seconds' => 9000],
['label' => '3 hours', 'seconds' => 10800],
['label' => '3 hours 30', 'seconds' => 12600],
['label' => '4 hours', 'seconds' => 14400],
['label' => '4 hours 30', 'seconds' => 16200],
['label' => '5 hours', 'seconds' => 18000],
['label' => '5 hours 30', 'seconds' => 19800],
['label' => '6 hours', 'seconds' => 21600],
['label' => '6 hours 30', 'seconds' => 23400],
['label' => '7 hours', 'seconds' => 25200],
['label' => '7 hours 30', 'seconds' => 27000],
['label' => '8 hours', 'seconds' => 28800],
['label' => '8 hours 30', 'seconds' => 30600],
['label' => '9 hours', 'seconds' => 32400],
['label' => '9 hours 30', 'seconds' => 34200],
['label' => '10 hours', 'seconds' => 36000],
['label' => '1/2 day', 'seconds' => 14040],
['label' => '1 day', 'seconds' => 28080],
['label' => '1 1/2 days', 'seconds' => 42120],
['label' => '2 days', 'seconds' => 56160],
['label' => '2 1/2 days', 'seconds' => 70200],
['label' => '3 days', 'seconds' => 84240],
['label' => '3 1/2 days', 'seconds' => 98280],
['label' => '4 days', 'seconds' => 112320],
['label' => '4 1/2 days', 'seconds' => 126360],
['label' => '5 days', 'seconds' => 140400],
['label' => '5 1/2 days', 'seconds' => 154440],
['label' => '6 days', 'seconds' => 168480],
['label' => '6 1/2 days', 'seconds' => 182520],
['label' => '7 days', 'seconds' => 196560],
['label' => '7 1/2 days', 'seconds' => 210600],
['label' => '8 days', 'seconds' => 224640],
['label' => '8 1/2 days', 'seconds' => 238680],
['label' => '9 days', 'seconds' => 252720],
['label' => '9 1/2 days', 'seconds' => 266760],
['label' => '10 days', 'seconds' => 280800],
['label' => '10 1/2days', 'seconds' => 294840],
['label' => '11 days', 'seconds' => 308880],
['label' => '11 1/2 days', 'seconds' => 322920],
['label' => '12 days', 'seconds' => 336960],
['label' => '12 1/2 days', 'seconds' => 351000],
['label' => '13 days', 'seconds' => 365040],
['label' => '13 1/2 days', 'seconds' => 379080],
['label' => '14 days', 'seconds' => 393120],
['label' => '14 1/2 days', 'seconds' => 407160],
['label' => '15 days', 'seconds' => 421200],
['label' => '15 1/2 days', 'seconds' => 435240],
['label' => '16 days', 'seconds' => 449280],
['label' => '16 1/2 days', 'seconds' => 463320],
['label' => '17 days', 'seconds' => 477360],
['label' => '17 1/2 days', 'seconds' => 491400],
['label' => '18 days', 'seconds' => 505440],
['label' => '18 1/2 days', 'seconds' => 519480],
['label' => '19 days', 'seconds' => 533520],
['label' => '19 1/2 days', 'seconds' => 547560],
['label' => '20 days', 'seconds' => 561600],
['label' => '20 1/2 days', 'seconds' => 575640],
['label' => '21 days', 'seconds' => 580680],
['label' => '21 1/2 days', 'seconds' => 603720],
['label' => '22 days', 'seconds' => 617760],
['label' => '22 1/2 days', 'seconds' => 631800],
['label' => '23 days', 'seconds' => 645840],
['label' => '23 1/2 days', 'seconds' => 659880],
['label' => '24 days', 'seconds' => 673920],
['label' => '24 1/2 days', 'seconds' => 687960],
['label' => '25 days', 'seconds' => 702000],
['label' => '25 1/2 days', 'seconds' => 716040],
['label' => '26 days', 'seconds' => 730080],
['label' => '26 1/2 days', 'seconds' => 744120],
['label' => '27 days', 'seconds' => 758160],
['label' => '27 1/2 days', 'seconds' => 772200],
['label' => '28 days', 'seconds' => 786240],
['label' => '28 1/2 days', 'seconds' => 800280],
['label' => '29 days', 'seconds' => 814320],
['label' => '29 1/2 days', 'seconds' => 828360],
['label' => '30 days', 'seconds' => 842400],
]
)
->info('The intervals of time to show in activity form')
->prototype('array')
->children()
->scalarNode('seconds')
->info('The number of seconds of this duration. Must be an integer.')
->cannotBeEmpty()
->validate()
->ifTrue(function ($data) {
return !is_int($data);
})->thenInvalid("The value %s is not a valid integer")
->end()
->end()
->scalarNode('label')
->cannotBeEmpty()
->info("The label to show into fields")
->end()
->end()
->end()
->end()
->end()
})->thenInvalid('The value %s is not a valid integer')
->end()
->end()
->scalarNode('label')
->cannotBeEmpty()
->info('The label to show into fields')
->end()
->end()
->end()
->end()
->end()
->end();
return $treeBuilder;
return $treeBuilder;
}
}
}

195
src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\AsideActivityBundle\Entity;
@@ -7,8 +14,10 @@ namespace Chill\AsideActivityBundle\Entity;
use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
use Chill\MainBundle\Entity\User;
use DateTimeInterface;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/**
* @ORM\Entity
* @ORM\Table(schema="chill_asideactivity")
@@ -16,17 +25,16 @@ use Symfony\Component\Validator\Constraints as Assert;
class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
{
/**
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
* @ORM\ManyToOne(targetEntity=User::class)
* @ORM\JoinColumn(nullable=false)
* @Assert\NotBlank
*/
private ?int $id;
private \Chill\MainBundle\Entity\User $agent;
/**
* @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")
* @ORM\JoinColumn(nullable=false)
* @ORM\Column(type="datetime")
*/
private $type;
private $createdAt;
/**
* @ORM\ManyToOne(targetEntity=User::class)
@@ -34,28 +42,6 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
*/
private \Chill\MainBundle\Entity\User $createdBy;
/**
* @ORM\Column(type="datetime")
*/
private $createdAt;
/**
* @ORM\ManyToOne(targetEntity=User::class)
*/
private \Chill\MainBundle\Entity\User $updatedBy;
/**
* @ORM\Column(type="datetime", nullable=true)
*/
private $updatedAt;
/**
* @ORM\ManyToOne(targetEntity=User::class)
* @ORM\JoinColumn(nullable=false)
* @Assert\NotBlank()
*/
private \Chill\MainBundle\Entity\User $agent;
/**
* @ORM\Column(type="datetime")
*/
@@ -64,7 +50,14 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
/**
* @ORM\Column(type="time", nullable=true)
*/
private ?\DateTimeInterface $duration = null;
private ?DateTimeInterface $duration = null;
/**
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
*/
private ?int $id;
/**
* @ORM\Column(type="string", length=100, nullable=true)
@@ -76,21 +69,30 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
*/
private $note;
public function getId(): ?int
/**
* @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")
* @ORM\JoinColumn(nullable=false)
*/
private $type;
/**
* @ORM\Column(type="datetime", nullable=true)
*/
private $updatedAt;
/**
* @ORM\ManyToOne(targetEntity=User::class)
*/
private \Chill\MainBundle\Entity\User $updatedBy;
public function getAgent(): ?User
{
return $this->id;
return $this->agent;
}
public function getType(): ?AsideActivityCategory
public function getCreatedAt(): ?DateTimeInterface
{
return $this->type;
}
public function setType(?AsideActivityCategory $type): self
{
$this->type = $type;
return $this;
return $this->createdAt;
}
public function getCreatedBy(): ?User
@@ -98,23 +100,39 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
return $this->createdBy;
}
public function setCreatedBy(?User $createdBy): self
public function getDate(): ?DateTimeInterface
{
$this->createdBy = $createdBy;
return $this;
return $this->date;
}
public function getCreatedAt(): ?\DateTimeInterface
public function getDuration(): ?DateTimeInterface
{
return $this->createdAt;
return $this->duration;
}
public function setCreatedAt(\DateTimeInterface $createdAt): self
public function getId(): ?int
{
$this->createdAt = $createdAt;
return $this->id;
}
return $this;
public function getLocation(): ?string
{
return $this->location;
}
public function getNote(): ?string
{
return $this->note;
}
public function getType(): ?AsideActivityCategory
{
return $this->type;
}
public function getUpdatedAt(): ?DateTimeInterface
{
return $this->updatedAt;
}
public function getUpdatedBy(): ?User
@@ -122,30 +140,6 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
return $this->updatedBy;
}
public function setUpdatedBy(?User $updatedBy): self
{
$this->updatedBy = $updatedBy;
return $this;
}
public function getUpdatedAt(): ?\DateTimeInterface
{
return $this->updatedAt;
}
public function setUpdatedAt(\DateTimeInterface $updatedAt): self
{
$this->updatedAt = $updatedAt;
return $this;
}
public function getAgent(): ?User
{
return $this->agent;
}
public function setAgent(?User $agent): self
{
$this->agent = $agent;
@@ -153,35 +147,34 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
return $this;
}
public function getDate(): ?\DateTimeInterface
public function setCreatedAt(DateTimeInterface $createdAt): self
{
return $this->date;
$this->createdAt = $createdAt;
return $this;
}
public function setDate(\DateTimeInterface $date): self
public function setCreatedBy(?User $createdBy): self
{
$this->createdBy = $createdBy;
return $this;
}
public function setDate(DateTimeInterface $date): self
{
$this->date = $date;
return $this;
}
public function getDuration(): ?\DateTimeInterface
{
return $this->duration;
}
public function setDuration(?\DateTimeInterface $duration): self
public function setDuration(?DateTimeInterface $duration): self
{
$this->duration = $duration;
return $this;
}
public function getLocation(): ?string
{
return $this->location;
}
public function setLocation(?string $location): self
{
$this->location = $location;
@@ -189,15 +182,31 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
return $this;
}
public function getNote(): ?string
{
return $this->note;
}
public function setNote(?string $note): self
{
$this->note = $note;
return $this;
}
public function setType(?AsideActivityCategory $type): self
{
$this->type = $type;
return $this;
}
public function setUpdatedAt(DateTimeInterface $updatedAt): self
{
$this->updatedAt = $updatedAt;
return $this;
}
public function setUpdatedBy(?User $updatedBy): self
{
$this->updatedBy = $updatedBy;
return $this;
}
}

133
src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\AsideActivityBundle\Entity;
@@ -16,6 +23,11 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
*/
class AsideActivityCategory
{
/**
* @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
*/
private $children;
/**
* @ORM\Id
* @ORM\GeneratedValue
@@ -23,19 +35,15 @@ class AsideActivityCategory
*/
private int $id;
/**
* @ORM\Column(type="json", length=255)
*/
private array $title;
/**
* @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
* @ORM\Column(type="boolean")
*/
private bool $isActive = true;
private AsideActivityCategory $oldParent;
/**
* @var float
* @ORM\Column(type="float", options={"default": 0.00})
*/
private float $ordering = 0.00;
@@ -47,44 +55,46 @@ class AsideActivityCategory
private ?AsideActivityCategory $parent = null;
/**
* @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
* @ORM\Column(type="json", length=255)
*/
private $children;
private AsideActivityCategory $oldParent;
private array $title;
public function __construct()
{
$this->children = new ArrayCollection();
}
public function addChild(self $child): self
{
if (!$this->children->contains($child)) {
$this->children[] = $child;
$child->setParent($this);
}
return $this;
}
/**
* @return Collection|self[]
*/
public function getChildren(): Collection
{
return $this->children;
}
public function getId(): ?int
{
return $this->id;
}
public function getTitle(): ?array
{
return $this->title;
}
public function setTitle(array $title): self
{
$this->title = $title;
return $this;
}
public function getIsActive(): bool
{
return $this->isActive;
}
public function setIsActive(bool $isActive): self
public function getOrdering(): float
{
$this->isActive = $isActive;
return $this;
return $this->ordering;
}
public function getParent(): ?self
@@ -92,9 +102,20 @@ class AsideActivityCategory
return $this->parent;
}
public function getTitle(): ?array
{
return $this->title;
}
public function hasParent(): bool
{
return null !== $this->parent;
}
/**
* @Assert\Callback
*
* @Assert\Callback()
* @param mixed $payload
*/
public function preventRecursiveParent(ExecutionContextInterface $context, $payload)
{
@@ -108,43 +129,10 @@ class AsideActivityCategory
$this->parent = $this->oldParent;
$context->buildViolation('You must not add twice the same category in the parent tree (previous result returned)')
->atPath('parent')
->addViolation()
;
->addViolation();
}
}
public function hasParent(): bool
{
return $this->parent !== null;
}
public function setParent(?self $parent): self
{
// cache the old result for changing it during validaiton
$this->oldParent = $this->parent;
$this->parent = $parent;
return $this;
}
/**
* @return Collection|self[]
*/
public function getChildren(): Collection
{
return $this->children;
}
public function addChild(self $child): self
{
if (!$this->children->contains($child)) {
$this->children[] = $child;
$child->setParent($this);
}
return $this;
}
public function removeChild(self $child): self
{
if ($this->children->removeElement($child)) {
@@ -157,14 +145,33 @@ class AsideActivityCategory
return $this;
}
public function getOrdering(): float
public function setIsActive(bool $isActive): self
{
return $this->ordering;
$this->isActive = $isActive;
return $this;
}
public function setOrdering(float $ordering): AsideActivityCategory
{
$this->ordering = $ordering;
return $this;
}
public function setParent(?self $parent): self
{
// cache the old result for changing it during validaiton
$this->oldParent = $this->parent;
$this->parent = $parent;
return $this;
}
public function setTitle(array $title): self
{
$this->title = $title;
return $this;
}
}

59
src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\AsideActivityBundle\Form;
@@ -7,7 +14,6 @@ namespace Chill\AsideActivityBundle\Form;
use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
use Chill\MainBundle\Form\Type\TranslatableStringFormType;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -26,27 +32,34 @@ final class AsideActivityCategoryType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->add('title', TranslatableStringFormType::class,
[
'label' => 'Nom',
])
->add('parent', EntityType::class, [
'class' => AsideActivityCategory::class,
'required' => false,
'label' => 'Parent',
'choice_label' => function (AsideActivityCategory $category){
$options = [];
return $this->categoryRender->renderString($category, $options);
}
])
->add('ordering', NumberType::class)
->add('isActive', ChoiceType::class,
[
'choices' => [
'Yes' => true,
'No' => false
],
'expanded' => true
]);
$builder->add(
'title',
TranslatableStringFormType::class,
[
'label' => 'Nom',
]
)
->add('parent', EntityType::class, [
'class' => AsideActivityCategory::class,
'required' => false,
'label' => 'Parent',
'choice_label' => function (AsideActivityCategory $category) {
$options = [];
return $this->categoryRender->renderString($category, $options);
},
])
->add('ordering', NumberType::class)
->add(
'isActive',
ChoiceType::class,
[
'choices' => [
'Yes' => true,
'No' => false,
],
'expanded' => true,
]
);
}
}

130
src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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\AsideActivityBundle\Form;
use Chill\AsideActivityBundle\Entity\AsideActivity;
@@ -8,32 +15,34 @@ use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Form\Type\ChillDateType;
use Chill\MainBundle\Form\Type\ChillTextareaType;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use DateInterval;
use DateTime;
use DateTimeZone;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\QueryBuilder;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Templating\EngineInterface;
final class AsideActivityFormType extends AbstractType
{
private array $timeChoices;
private TokenStorageInterface $storage;
private CategoryRender $categoryRender;
public function __construct (
private TokenStorageInterface $storage;
private array $timeChoices;
public function __construct(
ParameterBagInterface $parameterBag,
TokenStorageInterface $storage,
CategoryRender $categoryRender
){
) {
$this->timeChoices = $parameterBag->get('chill_aside_activity.form.time_duration');
$this->storage = $storage;
$this->categoryRender = $categoryRender;
@@ -54,57 +63,65 @@ final class AsideActivityFormType extends AbstractType
];
$builder
->add('agent', EntityType::class,
[
'label' => 'For agent',
'required' => true,
'class' => User::class,
'data' => $this->storage->getToken()->getUser(),
'query_builder' => function(EntityRepository $er){
return $er->createQueryBuilder('u')->where('u.enabled = true');
},
'attr' => array('class' => 'select2 '),
'placeholder' => 'Choose the agent for whom this activity is created',
'choice_label' => 'username'
])
->add('date', ChillDateType::class,
[
'label' => 'date',
'data' => new \DateTime(),
'required' => true
])
->add('type', EntityType::class,
[
'label' => 'Type',
'required' => true,
'class' => AsideActivityCategory::class,
'placeholder' => 'Choose the activity category',
'query_builder' => function(EntityRepository $er) {
$qb = $er->createQueryBuilder('ac');
$qb->where($qb->expr()->eq('ac.isActive', 'TRUE'))
->addOrderBy('ac.ordering', 'ASC')
;
->add(
'agent',
EntityType::class,
[
'label' => 'For agent',
'required' => true,
'class' => User::class,
'data' => $this->storage->getToken()->getUser(),
'query_builder' => function (EntityRepository $er) {
return $er->createQueryBuilder('u')->where('u.enabled = true');
},
'attr' => ['class' => 'select2 '],
'placeholder' => 'Choose the agent for whom this activity is created',
'choice_label' => 'username',
]
)
->add(
'date',
ChillDateType::class,
[
'label' => 'date',
'data' => new DateTime(),
'required' => true,
]
)
->add(
'type',
EntityType::class,
[
'label' => 'Type',
'required' => true,
'class' => AsideActivityCategory::class,
'placeholder' => 'Choose the activity category',
'query_builder' => function (EntityRepository $er) {
$qb = $er->createQueryBuilder('ac');
$qb->where($qb->expr()->eq('ac.isActive', 'TRUE'))
->addOrderBy('ac.ordering', 'ASC');
return $qb;
},
'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
$options = [];
return $this->categoryRender->renderString($asideActivityCategory, $options);
},
])
return $qb;
},
'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
$options = [];
return $this->categoryRender->renderString($asideActivityCategory, $options);
},
]
)
->add('duration', ChoiceType::class, $durationTimeOptions)
->add('note', ChillTextareaType::class, [
'label' => 'Note',
'required' => false,
]);
foreach (['duration'] as $fieldName)
{
$builder->get($fieldName)
foreach (['duration'] as $fieldName) {
$builder->get($fieldName)
->addModelTransformer($durationTimeTransformer);
$builder->get($fieldName)
->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $formEvent) use (
->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $formEvent) use (
$timeChoices,
$builder,
$durationTimeTransformer,
@@ -113,14 +130,14 @@ final class AsideActivityFormType extends AbstractType
) {
// set the timezone to GMT, and fix the difference between current and GMT
// the datetimetransformer will then handle timezone as GMT
$timezoneUTC = new \DateTimeZone('GMT');
$timezoneUTC = new DateTimeZone('GMT');
/* @var $data \DateTimeImmutable */
$data = $formEvent->getData() === NULL ?
\DateTime::createFromFormat('U', 300) :
$data = $formEvent->getData() === null ?
DateTime::createFromFormat('U', 300) :
$formEvent->getData();
$seconds = $data->getTimezone()->getOffset($data);
$data->setTimeZone($timezoneUTC);
$data->add(new \DateInterval('PT'.$seconds.'S'));
$data->add(new DateInterval('PT' . $seconds . 'S'));
// test if the timestamp is in the choices.
// If not, recreate the field with the new timestamp
@@ -128,16 +145,17 @@ final class AsideActivityFormType extends AbstractType
// the data are not in the possible values. add them
$timeChoices[$data->format('H:i')] = $data->getTimestamp();
$form = $builder->create($fieldName, ChoiceType::class, array_merge(
$durationTimeOptions, [
$durationTimeOptions,
[
'choices' => $timeChoices,
'auto_initialize' => false
'auto_initialize' => false,
]
));
$form->addModelTransformer($durationTimeTransformer);
$formEvent->getForm()->getParent()->add($form->getForm());
}
});
}
}
}
public function configureOptions(OptionsResolver $resolver): void

24
src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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\AsideActivityBundle\Menu;
use Knp\Menu\MenuItem;
@@ -14,11 +21,6 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild
$this->security = $security;
}
public static function getMenuIds(): array
{
return ['admin_index', 'admin_section', 'admin_aside_activity'];
}
public function buildMenu($menuId, MenuItem $menu, array $parameters)
{
// all the entries below must have ROLE_ADMIN permissions
@@ -28,21 +30,25 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild
if (in_array($menuId, ['admin_index', 'admin_section'])) {
$menu->addChild('Aside activities', [
'route' => 'chill_crud_aside_activity_category_index'
'route' => 'chill_crud_aside_activity_category_index',
])
->setExtras([
'order' => 900,
'explain' => "Aside activity type configuration"
'explain' => 'Aside activity type configuration',
]);
} else {
$menu
->addChild('Aside activity categories', [
'route' => 'chill_crud_aside_activity_category_index'
'route' => 'chill_crud_aside_activity_category_index',
])
->setExtras([
'order' => '50'
'order' => '50',
]);
}
}
public static function getMenuIds(): array
{
return ['admin_index', 'admin_section', 'admin_aside_activity'];
}
}

40
src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
View File

@@ -1,23 +1,28 @@
<?php
/**
* 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\AsideActivityBundle\Menu;
use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
use Knp\Menu\MenuItem;
use Symfony\Component\Security\Core\Authorization\AuthorizationChecker;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
* Class SectionMenuBuilder
*
* @package Chill\AsideActivityBundle\Menu
* Class SectionMenuBuilder.
*/
class SectionMenuBuilder implements LocalMenuBuilderInterface
{
protected TranslatorInterface $translator;
public AuthorizationCheckerInterface $authorizationChecker;
protected TranslatorInterface $translator;
public function __construct(TranslatorInterface $translator, AuthorizationCheckerInterface $authorizationChecker)
{
$this->translator = $translator;
@@ -26,38 +31,33 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
/**
* @param $menuId
* @param MenuItem $menu
* @param array $parameters
*/
public function buildMenu($menuId, MenuItem $menu, array $parameters)
{
if ($this->authorizationChecker->isGranted('ROLE_USER')){
if ($this->authorizationChecker->isGranted('ROLE_USER')) {
$menu->addChild($this->translator->trans('Create an aside activity'), [
'route' => 'chill_crud_aside_activity_new'
])
'route' => 'chill_crud_aside_activity_new',
])
->setExtras([
'order' => 11,
'icons' => [ 'plus' ]
'icons' => ['plus'],
]);
$menu->addChild($this->translator->trans('Phonecall'), [
'route' => 'chill_crud_aside_activity_new',
'routeParameters' => [
'type' => 1,
'duration' => 900,
]
],
])
->setExtras([
'order' => 12,
'icons' => ['plus']
]);
->setExtras([
'order' => 12,
'icons' => ['plus'],
]);
}
}
/**
* @return array
*/
public static function getMenuIds(): array
{
return [ 'section' ];
return ['section'];
}
}

62
src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
View File

@@ -1,41 +1,29 @@
<?php
/*
* Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
/**
* Chill is a software for social workers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\AsideActivityBundle\Menu;
use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
use Knp\Menu\MenuItem;
use Chill\TaskBundle\Templating\UI\CountNotificationTask;
use Knp\Menu\MenuItem;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Translation\TranslatorInterface;
use Chill\MainBundle\Entity\User;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Component\Translation\TranslatorInterface;
/**
*
*
* @author Julien Fastré <julien.fastre@champs-libres.coop>
*/
class UserMenuBuilder implements LocalMenuBuilderInterface
{
/**
* @var AuthorizationCheckerInterface
*/
public $authorizationChecker;
/**
*
* @var CountNotificationTask
*/
public $counter;
@@ -46,17 +34,10 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
public $tokenStorage;
/**
*
* @var TranslatorInterface
*/
public $translator;
/**
*
* @var AuthorizationCheckerInterface
*/
public $authorizationChecker;
public function __construct(
CountNotificationTask $counter,
TokenStorageInterface $tokenStorage,
@@ -69,24 +50,21 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
$this->authorizationChecker = $authorizationChecker;
}
public function buildMenu($menuId, MenuItem $menu, array $parameters)
{
if ($this->authorizationChecker->isGranted('ROLE_USER')){
$menu->addChild("My aside activities", [
'route' => 'chill_crud_aside_activity_index'
if ($this->authorizationChecker->isGranted('ROLE_USER')) {
$menu->addChild('My aside activities', [
'route' => 'chill_crud_aside_activity_index',
])
->setExtras([
'order' => 10,
'icon' => 'tasks'
]);
->setExtras([
'order' => 10,
'icon' => 'tasks',
]);
}
}
public static function getMenuIds(): array
{
return [ 'user' ];
return ['user'];
}
}

15
src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\AsideActivityBundle\Repository;
@@ -12,13 +19,12 @@ use Doctrine\Persistence\ObjectRepository;
class AsideActivityCategoryRepository implements ObjectRepository
{
private EntityRepository $repository;
public function __construct(EntityManagerInterface $entityManager)
{
$this->repository = $entityManager->getRepository(AsideActivityCategory::class);
}
public function find($id): ?AsideActivityCategory
{
return $this->repository->find($id);
@@ -33,6 +39,9 @@ class AsideActivityCategoryRepository implements ObjectRepository
}
/**
* @param mixed|null $limit
* @param mixed|null $offset
*
* @return AsideActivityCategory[]
*/
public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
@@ -49,4 +58,4 @@ class AsideActivityCategoryRepository implements ObjectRepository
{
return AsideActivityCategory::class;
}
}
}

13
src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\AsideActivityBundle\Repository;
@@ -32,6 +39,9 @@ final class AsideActivityRepository implements ObjectRepository
}
/**
* @param mixed|null $limit
* @param mixed|null $offset
*
* @return AsideActivity[]
*/
public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
@@ -48,5 +58,4 @@ final class AsideActivityRepository implements ObjectRepository
{
return AsideActivity::class;
}
}
}

76
src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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\AsideActivityBundle\Templating\Entity;
use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
@@ -9,13 +16,15 @@ use Symfony\Component\Templating\EngineInterface;
final class CategoryRender implements ChillEntityRenderInterface
{
private TranslatableStringHelper $translatableStringHelper;
private EngineInterface $engine;
public const DEFAULT_ARGS = [
self::SEPERATOR_KEY => ' > ',
];
public const SEPERATOR_KEY = 'default.separator';
public const DEFAULT_ARGS = [
self::SEPERATOR_KEY => ' > '
];
private EngineInterface $engine;
private TranslatableStringHelper $translatableStringHelper;
public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine)
{
@@ -23,6 +32,35 @@ final class CategoryRender implements ChillEntityRenderInterface
$this->engine = $engine;
}
public function buildParents(AsideActivityCategory $asideActivityCategory)
{
$parents = [];
while ($asideActivityCategory->hasParent()) {
$asideActivityCategory = $parents[] = $asideActivityCategory->getParent();
}
return $parents;
}
/**
* @param AsideActivityCategory $asideActivityCategory
*/
public function renderBox($asideActivityCategory, array $options): string
{
$options = array_merge(self::DEFAULT_ARGS, $options);
$parents = $this->buildParents($asideActivityCategory);
return $this->engine->render(
'@ChillAsideActivity/Entity/asideActivityCategory.html.twig',
[
'asideActivityCategory' => $asideActivityCategory,
'parents' => $parents,
'options' => $options,
]
);
}
/**
* @param AsideActivityCategory $asideActivityCategory
*/
@@ -42,7 +80,6 @@ final class CategoryRender implements ChillEntityRenderInterface
$titles = array_reverse($titles);
return implode($options[self::SEPERATOR_KEY], $titles);
}
/**
@@ -52,31 +89,4 @@ final class CategoryRender implements ChillEntityRenderInterface
{
return $asideActivityCategory instanceof AsideActivityCategory;
}
public function buildParents(AsideActivityCategory $asideActivityCategory)
{
$parents = [];
while($asideActivityCategory->hasParent()) {
$asideActivityCategory = $parents[] = $asideActivityCategory->getParent();
}
return $parents;
}
/**
* @param AsideActivityCategory $asideActivityCategory
*/
public function renderBox($asideActivityCategory, array $options): string
{
$options = array_merge(self::DEFAULT_ARGS, $options);
$parents = $this->buildParents($asideActivityCategory);
return $this->engine->render('@ChillAsideActivity/Entity/asideActivityCategory.html.twig',
[
'asideActivityCategory' => $asideActivityCategory,
'parents' => $parents,
'options' => $options
]);
}
}

80
src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
View File

@@ -1,13 +1,25 @@
<?php
/**
* 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\AsideActivityBundle\Tests\Controller;
use Chill\MainBundle\Test\PrepareClientTrait;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Chill\AsideActivityBundle\Entity\AsideActivity;
use Chill\MainBundle\Test\PrepareClientTrait;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use function array_pop;
use function shuffle;
/**
* @internal
* @coversNothing
*/
class AccompanyingCourseControllerTest extends WebTestCase
{
use PrepareClientTrait;
@@ -19,31 +31,6 @@ class AccompanyingCourseControllerTest extends WebTestCase
$this->client = $this->getClientAuthenticated();
}
public function testIndexWithoutUsers()
{
$this->client->request('GET', '/fr/asideactivity');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
}
public function testNewWithoutUsers()
{
$this->client->request('GET', '/fr/asideactivity/new');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
}
/**
* @dataProvider generateAsideActivityId
*/
public function testEditWithoutUsers(int $asideActivityId)
{
$this->client->request('GET', "/fr/asideactivity/{$asideActivityId}/edit");
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
}
public function generateAsideActivityId()
{
self::bootKernel();
@@ -59,15 +46,38 @@ class AccompanyingCourseControllerTest extends WebTestCase
->setParameter('center_name', 'center a_social')
->setMaxResults(100)
->getQuery()
->getResult()
;
->getResult();
\shuffle($asideActivityIds);
shuffle($asideActivityIds);
yield [ \array_pop($asideActivityIds)['id'] ];
yield [ \array_pop($asideActivityIds)['id'] ];
yield [ \array_pop($asideActivityIds)['id'] ];
yield [array_pop($asideActivityIds)['id']];
yield [array_pop($asideActivityIds)['id']];
yield [array_pop($asideActivityIds)['id']];
}
/**
* @dataProvider generateAsideActivityId
*/
public function testEditWithoutUsers(int $asideActivityId)
{
$this->client->request('GET', "/fr/asideactivity/{$asideActivityId}/edit");
}
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
}
public function testIndexWithoutUsers()
{
$this->client->request('GET', '/fr/asideactivity');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
}
public function testNewWithoutUsers()
{
$this->client->request('GET', '/fr/asideactivity/new');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
}
}

30
src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,16 @@ use Doctrine\Migrations\AbstractMigration;
final class Version20210706124644 extends AbstractMigration
{
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE AsideActivity DROP CONSTRAINT FK_E9FA2191C54C8C93');
$this->addSql('DROP SEQUENCE AsideActivity_id_seq CASCADE');
$this->addSql('DROP SEQUENCE AsideActivityType_id_seq CASCADE');
$this->addSql('DROP TABLE AsideActivity');
$this->addSql('DROP TABLE AsideActivityType');
}
public function getDescription(): string
{
return 'Aside activity category entity created';
@@ -16,7 +33,6 @@ final class Version20210706124644 extends AbstractMigration
public function up(Schema $schema): void
{
$this->addSql('CREATE SEQUENCE AsideActivity_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
$this->addSql('CREATE SEQUENCE AsideActivityType_id_seq INCREMENT BY 1 MINVALUE 1 START 1000');
$this->addSql('CREATE TABLE AsideActivity (id INT NOT NULL, type_id INT NOT NULL, agent_id INT NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, duration TIME(0) WITHOUT TIME ZONE DEFAULT NULL, location VARCHAR(100) DEFAULT NULL, note TEXT DEFAULT NULL, createdBy_id INT NOT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
@@ -32,14 +48,4 @@ final class Version20210706124644 extends AbstractMigration
$this->addSql('ALTER TABLE AsideActivity ADD CONSTRAINT FK_E9FA21913414710B FOREIGN KEY (agent_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
// this up() migration is auto-generated, please modify it to your needs
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE AsideActivity DROP CONSTRAINT FK_E9FA2191C54C8C93');
$this->addSql('DROP SEQUENCE AsideActivity_id_seq CASCADE');
$this->addSql('DROP SEQUENCE AsideActivityType_id_seq CASCADE');
$this->addSql('DROP TABLE AsideActivity');
$this->addSql('DROP TABLE AsideActivityType');
}
}
}

57
src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,31 @@ use Doctrine\Migrations\AbstractMigration;
final class Version20210804082249 extends AbstractMigration
{
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP CONSTRAINT FK_A866DA0EC54C8C93');
$this->addSql('DROP SEQUENCE chill_asideactivity.AsideActivity_id_seq CASCADE');
$this->addSql('DROP SEQUENCE chill_asideactivity.AsideActivityCategory_id_seq CASCADE');
$this->addSql('CREATE SEQUENCE asideactivity_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
$this->addSql('CREATE SEQUENCE asideactivitytype_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
$this->addSql('CREATE TABLE asideactivitytype (id INT NOT NULL, title VARCHAR(255) NOT NULL, isactive BOOLEAN NOT NULL, PRIMARY KEY(id))');
$this->addSql('CREATE TABLE asideactivity (id INT NOT NULL, type_id INT NOT NULL, agent_id INT NOT NULL, createdby_id INT NOT NULL, updatedby_id INT DEFAULT NULL, createdat TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedat TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, duration TIME(0) WITHOUT TIME ZONE DEFAULT NULL, location VARCHAR(100) DEFAULT NULL, note TEXT DEFAULT NULL, PRIMARY KEY(id))');
$this->addSql('CREATE INDEX idx_e9fa21913174800f ON asideactivity (createdby_id)');
$this->addSql('CREATE INDEX idx_e9fa2191c54c8c93 ON asideactivity (type_id)');
$this->addSql('CREATE INDEX idx_e9fa219165ff1aec ON asideactivity (updatedby_id)');
$this->addSql('CREATE INDEX idx_e9fa21913414710b ON asideactivity (agent_id)');
$this->addSql('COMMENT ON COLUMN asideactivity.updatedat IS \'(DC2Type:datetime_immutable)\'');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa2191c54c8c93 FOREIGN KEY (type_id) REFERENCES asideactivitytype (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa21913174800f FOREIGN KEY (createdby_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa219165ff1aec FOREIGN KEY (updatedby_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa21913414710b FOREIGN KEY (agent_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('DROP TABLE chill_asideactivity.AsideActivity');
$this->addSql('DROP TABLE chill_asideactivity.AsideActivityCategory');
$this->addSql('DROP SCHEMA chill_asideactivity');
}
public function getDescription(): string
{
return 'Aside activity entity created';
@@ -39,29 +71,4 @@ final class Version20210804082249 extends AbstractMigration
$this->addSql('DROP TABLE asideactivitytype');
$this->addSql('DROP TABLE asideactivity');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP CONSTRAINT FK_A866DA0EC54C8C93');
$this->addSql('DROP SEQUENCE chill_asideactivity.AsideActivity_id_seq CASCADE');
$this->addSql('DROP SEQUENCE chill_asideactivity.AsideActivityCategory_id_seq CASCADE');
$this->addSql('CREATE SEQUENCE asideactivity_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
$this->addSql('CREATE SEQUENCE asideactivitytype_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
$this->addSql('CREATE TABLE asideactivitytype (id INT NOT NULL, title VARCHAR(255) NOT NULL, isactive BOOLEAN NOT NULL, PRIMARY KEY(id))');
$this->addSql('CREATE TABLE asideactivity (id INT NOT NULL, type_id INT NOT NULL, agent_id INT NOT NULL, createdby_id INT NOT NULL, updatedby_id INT DEFAULT NULL, createdat TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedat TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, duration TIME(0) WITHOUT TIME ZONE DEFAULT NULL, location VARCHAR(100) DEFAULT NULL, note TEXT DEFAULT NULL, PRIMARY KEY(id))');
$this->addSql('CREATE INDEX idx_e9fa21913174800f ON asideactivity (createdby_id)');
$this->addSql('CREATE INDEX idx_e9fa2191c54c8c93 ON asideactivity (type_id)');
$this->addSql('CREATE INDEX idx_e9fa219165ff1aec ON asideactivity (updatedby_id)');
$this->addSql('CREATE INDEX idx_e9fa21913414710b ON asideactivity (agent_id)');
$this->addSql('COMMENT ON COLUMN asideactivity.updatedat IS \'(DC2Type:datetime_immutable)\'');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa2191c54c8c93 FOREIGN KEY (type_id) REFERENCES asideactivitytype (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa21913174800f FOREIGN KEY (createdby_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa219165ff1aec FOREIGN KEY (updatedby_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa21913414710b FOREIGN KEY (agent_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('DROP TABLE chill_asideactivity.AsideActivity');
$this->addSql('DROP TABLE chill_asideactivity.AsideActivityCategory');
$this->addSql('DROP SCHEMA chill_asideactivity');
}
}

19
src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,12 @@ use Doctrine\Migrations\AbstractMigration;
final class Version20210806140343 extends AbstractMigration
{
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ADD duration INT DEFAULT NULL');
}
public function getDescription(): string
{
return 'Duration changed to type integer';
@@ -19,10 +32,4 @@ final class Version20210806140343 extends AbstractMigration
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE chill_asideactivity.asideactivity DROP duration');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ADD duration INT DEFAULT NULL');
}
}

20
src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,12 @@ use Doctrine\Migrations\AbstractMigration;
final class Version20210806140710 extends AbstractMigration
{
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP duration');
}
public function getDescription(): string
{
return 'Duration changed back to timestamp';
@@ -19,11 +32,4 @@ final class Version20210806140710 extends AbstractMigration
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD duration TIME(0) WITHOUT TIME ZONE DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP duration');
}
}

36
src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,20 @@ use Doctrine\Migrations\AbstractMigration;
final class Version20210810084456 extends AbstractMigration
{
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER createdAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER createdAt DROP DEFAULT');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER updatedAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER updatedAt DROP DEFAULT');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER date TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER date DROP DEFAULT');
$this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.createdat IS \'(DC2Type:datetime_immutable)\'');
$this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.updatedat IS \'(DC2Type:datetime_immutable)\'');
$this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.date IS \'(DC2Type:datetime_immutable)\'');
}
public function getDescription(): string
{
return 'createdat, updatedat and date given a type timestamp';
@@ -27,19 +48,4 @@ final class Version20210810084456 extends AbstractMigration
$this->addSql('COMMENT ON COLUMN chill_asideactivity.asideactivity.updatedAt IS NULL');
$this->addSql('COMMENT ON COLUMN chill_asideactivity.asideactivity.date IS NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER createdAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER createdAt DROP DEFAULT');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER updatedAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER updatedAt DROP DEFAULT');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER date TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER date DROP DEFAULT');
$this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.createdat IS \'(DC2Type:datetime_immutable)\'');
$this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.updatedat IS \'(DC2Type:datetime_immutable)\'');
$this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.date IS \'(DC2Type:datetime_immutable)\'');
}
}

19
src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,11 @@ use Doctrine\Migrations\AbstractMigration;
final class Version20210922182907 extends AbstractMigration
{
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivityCategory DROP parent');
}
public function getDescription(): string
{
return 'Parent and children added to aside activity category entity';
@@ -18,11 +30,6 @@ final class Version20210922182907 extends AbstractMigration
{
$this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory ADD parent_id INT DEFAULT NULL');
$this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory ADD CONSTRAINT FK_7BF90DBE727ACA70 FOREIGN KEY (parent_id) REFERENCES chill_asideactivity.AsideActivityCategory (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('CREATE INDEX IDX_7BF90DBE727ACA70 ON chill_asideactivity.asideactivitycategory (parent_id)');
}
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE chill_asideactivity.AsideActivityCategory DROP parent');
$this->addSql('CREATE INDEX IDX_7BF90DBE727ACA70 ON chill_asideactivity.asideactivitycategory (parent_id)');
}
}

19
src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php
View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\Migrations\AsideActivity;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* allow to add an ordering to aside activity categories
* allow to add an ordering to aside activity categories.
*/
final class Version20211004134012 extends AbstractMigration
{
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory DROP ordering');
}
public function getDescription(): string
{
return 'allow to add an ordering to aside activity categories';
@@ -21,9 +33,4 @@ final class Version20211004134012 extends AbstractMigration
{
$this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory ADD ordering DOUBLE PRECISION NOT NULL DEFAULT 0.00');
}
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory DROP ordering');
}
}