Bläddra i källkod

Merge branch 'feature/collectifdata' into develop

master
Charly 3 år sedan
förälder
incheckning
43d08ff6fd
21 ändrade filer med 595 tillägg och 72 borttagningar
  1. +20
    -1
      public/build/adminlte-form.css
  2. +86
    -8
      src/Controller/Admin/CollectifDataCrudController.php
  3. +1
    -1
      src/Controller/Admin/ConfigurationCrudController.php
  4. +4
    -3
      src/Controller/Admin/DashboardAnimatorController.php
  5. +78
    -42
      src/Controller/Admin/DashboardController.php
  6. +27
    -3
      src/Controller/Admin/IndividualDataCrudController.php
  7. +1
    -2
      src/Controller/Admin/PageCrudController.php
  8. +1
    -1
      src/Controller/Admin/TerritoryCrudController.php
  9. +1
    -1
      src/Controller/Admin/ThematicCrudController.php
  10. +1
    -2
      src/Controller/Admin/UserCrudController.php
  11. +11
    -5
      src/Entity/CollectifData.php
  12. +5
    -0
      src/Entity/Dreams.php
  13. +5
    -0
      src/Entity/ProjectsBoost.php
  14. +5
    -0
      src/Entity/ProjectsInspiring.php
  15. +5
    -0
      src/Entity/Revolts.php
  16. +71
    -0
      src/Type/DreamsType.php
  17. +71
    -0
      src/Type/ProjectsBoostType.php
  18. +71
    -0
      src/Type/ProjectsInspiringType.php
  19. +71
    -0
      src/Type/RevoltsType.php
  20. +8
    -0
      templates/crud/field/association.html.twig
  21. +52
    -3
      translations/admin.fr.yaml

+ 20
- 1
public/build/adminlte-form.css Visa fil

@@ -35,4 +35,23 @@
z-index: 2;
}

/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9mb3JtLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUU7RUFDRTtFQUNBO0VBQ0E7RUFDQTtFQUNBO0VBQ0E7QUFESjtBQUlFO0VBQ0U7QUFGSjtBQUtFO0VBQ0U7QUFISjtBQU1FO0VBQ0U7QUFKSjs7QUFRQTtFQUNFO0FBTEY7QUFPRTtFQUNFO0VBQ0E7RUFDQTtFQUNBO0VBQ0E7RUFDQTtFQUNBO0VBQ0E7QUFMSjs7QUFTQTtFQUNFO0VBQ0E7QUFORixDIiwiZmlsZSI6ImFkbWlubHRlLWZvcm0uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiXG4uZm9ybS1zZW50IHtcbiAgLmZvcm0tY29udHJvbDppbnZhbGlkIHtcbiAgICBib3JkZXItY29sb3I6ICNkYzM1NDU7XG4gICAgcGFkZGluZy1yaWdodDogMi4yNXJlbTtcbiAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoXCJkYXRhOmltYWdlL3N2Zyt4bWwsJTNjc3ZnIHhtbG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZycgZmlsbD0nJTIzZGMzNTQ1JyB2aWV3Qm94PSctMiAtMiA3IDcnJTNlJTNjcGF0aCBzdHJva2U9JyUyM2RjMzU0NScgZD0nTTAgMGwzIDNtMC0zTDAgMycvJTNlJTNjY2lyY2xlIHI9Jy41Jy8lM2UlM2NjaXJjbGUgY3g9JzMnIHI9Jy41Jy8lM2UlM2NjaXJjbGUgY3k9JzMnIHI9Jy41Jy8lM2UlM2NjaXJjbGUgY3g9JzMnIGN5PSczJyByPScuNScvJTNlJTNjL3N2ZyUzRVwiKTtcbiAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0O1xuICAgIGJhY2tncm91bmQtcG9zaXRpb246IGNlbnRlciByaWdodCBjYWxjKC4zNzVlbSArIC4xODc1cmVtKTtcbiAgICBiYWNrZ3JvdW5kLXNpemU6IGNhbGMoLjc1ZW0gKyAuMzc1cmVtKSBjYWxjKC43NWVtICsgLjM3NXJlbSk7XG4gIH1cblxuICBzZWxlY3QuZm9ybS1jb250cm9sOmludmFsaWQgKyAuc2VsZWN0MiAuc2VsZWN0Mi1zZWxlY3Rpb24ge1xuICAgIGJvcmRlci1jb2xvcjogI2RjMzU0NTtcbiAgfVxuXG4gIHNlbGVjdC5mb3JtLWNvbnRyb2w6aW52YWxpZCArIC5zZWxlY3QyIC5zZWxlY3QyLXNlbGVjdGlvbiBiIHtcbiAgICBib3JkZXItY29sb3I6ICNkYzM1NDUgdHJhbnNwYXJlbnQgdHJhbnNwYXJlbnQgdHJhbnNwYXJlbnQ7XG4gIH1cblxuICAuZm9ybS1jaGVjay1sYWJlbCBpbnB1dDppbnZhbGlkIH4gLmNoZWNrbWFyayB7XG4gICAgYm9yZGVyLWNvbG9yOiAjZGMzNTQ1O1xuICB9XG59XG5cbi5uYXYtaXRlbSAubmF2LWxpbmsge1xuICBwb3NpdGlvbjogcmVsYXRpdmU7XG5cbiAgLmludmFsaWQtZm9ybSB7XG4gICAgZGlzcGxheTogbm9uZTtcbiAgICBwb3NpdGlvbjogYWJzb2x1dGU7XG4gICAgdG9wOiAtN3B4O1xuICAgIHJpZ2h0OiAtNnB4O1xuICAgIGNvbG9yOiAjZGMzNTQ1O1xuICAgIGJhY2tncm91bmQ6ICNmZmY7XG4gICAgYm9yZGVyLXJhZGl1czogMTBweDtcbiAgICBmb250LXNpemU6IDEuMnJlbTtcbiAgfVxufVxuXG4ubmF2LWl0ZW0uaGFzLWludmFsaWQgLm5hdi1saW5rIC5pbnZhbGlkLWZvcm0ge1xuICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7XG4gIHotaW5kZXg6IDI7XG59XG5cblxuIl0sInNvdXJjZVJvb3QiOiIifQ==*/
.field-collection {
padding-top: 15px;
}
.field-collection legend {
font-weight: bold;
font-size: 18px;
}
.field-collection .field-collection-item {
background-color: gainsboro;
padding: 10px;
position: relative;
border-radius: 5px;
}
.field-collection .field-collection-item .field-collection-delete {
position: absolute;
right: 0px;
top: 0px;
}

/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9mb3JtLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUU7RUFDRTtFQUNBO0VBQ0E7RUFDQTtFQUNBO0VBQ0E7QUFESjtBQUlFO0VBQ0U7QUFGSjtBQUtFO0VBQ0U7QUFISjtBQU1FO0VBQ0U7QUFKSjs7QUFRQTtFQUNFO0FBTEY7QUFPRTtFQUNFO0VBQ0E7RUFDQTtFQUNBO0VBQ0E7RUFDQTtFQUNBO0VBQ0E7QUFMSjs7QUFTQTtFQUNFO0VBQ0E7QUFORjs7QUFTQTtFQUNFO0FBTkY7QUFRRTtFQUNFO0VBQ0E7QUFOSjtBQVNFO0VBQ0U7RUFDQTtFQUNBO0VBQ0E7QUFQSjtBQVNJO0VBQ0U7RUFDQTtFQUNBO0FBUE4sQyIsImZpbGUiOiJhZG1pbmx0ZS1mb3JtLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIlxuLmZvcm0tc2VudCB7XG4gIC5mb3JtLWNvbnRyb2w6aW52YWxpZCB7XG4gICAgYm9yZGVyLWNvbG9yOiAjZGMzNTQ1O1xuICAgIHBhZGRpbmctcmlnaHQ6IDIuMjVyZW07XG4gICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKFwiZGF0YTppbWFnZS9zdmcreG1sLCUzY3N2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGZpbGw9JyUyM2RjMzU0NScgdmlld0JveD0nLTIgLTIgNyA3JyUzZSUzY3BhdGggc3Ryb2tlPSclMjNkYzM1NDUnIGQ9J00wIDBsMyAzbTAtM0wwIDMnLyUzZSUzY2NpcmNsZSByPScuNScvJTNlJTNjY2lyY2xlIGN4PSczJyByPScuNScvJTNlJTNjY2lyY2xlIGN5PSczJyByPScuNScvJTNlJTNjY2lyY2xlIGN4PSczJyBjeT0nMycgcj0nLjUnLyUzZSUzYy9zdmclM0VcIik7XG4gICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDtcbiAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBjZW50ZXIgcmlnaHQgY2FsYyguMzc1ZW0gKyAuMTg3NXJlbSk7XG4gICAgYmFja2dyb3VuZC1zaXplOiBjYWxjKC43NWVtICsgLjM3NXJlbSkgY2FsYyguNzVlbSArIC4zNzVyZW0pO1xuICB9XG5cbiAgc2VsZWN0LmZvcm0tY29udHJvbDppbnZhbGlkICsgLnNlbGVjdDIgLnNlbGVjdDItc2VsZWN0aW9uIHtcbiAgICBib3JkZXItY29sb3I6ICNkYzM1NDU7XG4gIH1cblxuICBzZWxlY3QuZm9ybS1jb250cm9sOmludmFsaWQgKyAuc2VsZWN0MiAuc2VsZWN0Mi1zZWxlY3Rpb24gYiB7XG4gICAgYm9yZGVyLWNvbG9yOiAjZGMzNTQ1IHRyYW5zcGFyZW50IHRyYW5zcGFyZW50IHRyYW5zcGFyZW50O1xuICB9XG5cbiAgLmZvcm0tY2hlY2stbGFiZWwgaW5wdXQ6aW52YWxpZCB+IC5jaGVja21hcmsge1xuICAgIGJvcmRlci1jb2xvcjogI2RjMzU0NTtcbiAgfVxufVxuXG4ubmF2LWl0ZW0gLm5hdi1saW5rIHtcbiAgcG9zaXRpb246IHJlbGF0aXZlO1xuXG4gIC5pbnZhbGlkLWZvcm0ge1xuICAgIGRpc3BsYXk6IG5vbmU7XG4gICAgcG9zaXRpb246IGFic29sdXRlO1xuICAgIHRvcDogLTdweDtcbiAgICByaWdodDogLTZweDtcbiAgICBjb2xvcjogI2RjMzU0NTtcbiAgICBiYWNrZ3JvdW5kOiAjZmZmO1xuICAgIGJvcmRlci1yYWRpdXM6IDEwcHg7XG4gICAgZm9udC1zaXplOiAxLjJyZW07XG4gIH1cbn1cblxuLm5hdi1pdGVtLmhhcy1pbnZhbGlkIC5uYXYtbGluayAuaW52YWxpZC1mb3JtIHtcbiAgZGlzcGxheTogaW5saW5lLWJsb2NrO1xuICB6LWluZGV4OiAyO1xufVxuXG4uZmllbGQtY29sbGVjdGlvbiB7XG4gIHBhZGRpbmctdG9wOiAxNXB4O1xuXG4gIGxlZ2VuZCB7XG4gICAgZm9udC13ZWlnaHQ6IGJvbGQ7XG4gICAgZm9udC1zaXplOiAxOHB4O1xuICB9XG5cbiAgLmZpZWxkLWNvbGxlY3Rpb24taXRlbSB7XG4gICAgYmFja2dyb3VuZC1jb2xvcjogZ2FpbnNib3JvO1xuICAgIHBhZGRpbmc6IDEwcHg7XG4gICAgcG9zaXRpb246IHJlbGF0aXZlO1xuICAgIGJvcmRlci1yYWRpdXM6IDVweDtcblxuICAgIC5maWVsZC1jb2xsZWN0aW9uLWRlbGV0ZSB7XG4gICAgICBwb3NpdGlvbjogYWJzb2x1dGU7XG4gICAgICByaWdodDogMHB4O1xuICAgICAgdG9wOiAwcHg7XG4gICAgfVxuICB9XG59XG5cblxuXG4iXSwic291cmNlUm9vdCI6IiJ9*/

+ 86
- 8
src/Controller/Admin/CollectifDataCrudController.php Visa fil

@@ -3,7 +3,26 @@
namespace App\Controller\Admin;

use App\Entity\CollectifData;
use Lc\SovBundle\Controller\Admin\AbstractCrudController;
use App\Entity\Configuration;
use App\Type\DreamsType;
use App\Type\ProjectsBoostType;
use App\Type\ProjectsInspiringType;
use App\Type\RevoltsType;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\QueryBuilder;
use EasyCorp\Bundle\EasyAdminBundle\Collection\FieldCollection;
use EasyCorp\Bundle\EasyAdminBundle\Collection\FilterCollection;
use EasyCorp\Bundle\EasyAdminBundle\Config\Filters;
use EasyCorp\Bundle\EasyAdminBundle\Dto\EntityDto;
use EasyCorp\Bundle\EasyAdminBundle\Dto\SearchDto;
use EasyCorp\Bundle\EasyAdminBundle\Field\AssociationField;
use EasyCorp\Bundle\EasyAdminBundle\Field\HiddenField;
use EasyCorp\Bundle\EasyAdminBundle\Field\IntegerField;
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
use Lc\SovBundle\Controller\AbstractAdminController as AbstractCrudController;
use Lc\SovBundle\Doctrine\Extension\TreeInterface;
use Lc\SovBundle\Field\CollectionField;
use Lc\SovBundle\Field\StatusField;

class CollectifDataCrudController extends AbstractCrudController
{
@@ -12,14 +31,73 @@ class CollectifDataCrudController extends AbstractCrudController
return CollectifData::class;
}

/*
public function configureFields(string $pageName): iterable
{
return [
IdField::new('id'),
TextField::new('title'),
TextEditorField::new('description'),
];
$fields = array();

$fields[] = TextField::new('resume');
$fields[] = AssociationField::new('territory')
->setTemplatePath('crud/field/association.html.twig');
$fields[] = IntegerField::new('nbParticipant');
$fields[] = CollectionField::new('revolts')
->setFormTypeOption('entry_type', RevoltsType::class)
->setFormTypeOption('by_reference', false)
->setRequired(false)
->hideOnIndex();
$fields[] = CollectionField::new('dreams')
->setFormTypeOption('entry_type', DreamsType::class)
->setFormTypeOption('by_reference', false)
->setRequired(false)
->hideOnIndex();
$fields[] = CollectionField::new('projectsboost')
->setFormTypeOption('entry_type', ProjectsBoostType::class)
->setFormTypeOption('by_reference', false)
->setRequired(false)
->hideOnIndex();
$fields[] = CollectionField::new('projectsinspiring')
->setFormTypeOption('entry_type', ProjectsInspiringType::class)
->setFormTypeOption('by_reference', false)
->setRequired(false)
->hideOnIndex();
$hasAccess = $this->isGranted('ROLE_ADMIN');
if ($hasAccess) {
$fields[] = StatusField::new('status')
->setFormTypeOption('data', 0)
->setFormTypeOption('choices', ['Validé' => 1, 'En attente' => 0])
->setCustomOption('toggle_label', 'Valider');
} else {
$fields[] = HiddenField::new('status')
->setFormTypeOption('data', 0);
}


return $fields;
}

public function createIndexQueryBuilder(
SearchDto $searchDto,
EntityDto $entityDto,
FieldCollection $fields,
FilterCollection $filters
): QueryBuilder
{
$queryBuilder = parent::createIndexQueryBuilder(
$searchDto,
$entityDto,
$fields,
$filters
);

$queryBuilder->andWhere('entity.status = ' . $searchDto->getRequest()->get('status'));

return $queryBuilder;
}

public function persistEntity(EntityManagerInterface $entityManager, $entityInstance): void
{
$entityManager->persist($entityInstance);
$entityManager->flush();

parent::persistEntity($entityManager, $entityInstance);
}
*/
}

+ 1
- 1
src/Controller/Admin/ConfigurationCrudController.php Visa fil

@@ -4,7 +4,7 @@ namespace App\Controller\Admin;

use App\Entity\Configuration;
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
use Lc\SovBundle\Controller\Admin\AbstractCrudController;
use Lc\SovBundle\Controller\AbstractAdminController as AbstractCrudController;

class ConfigurationCrudController extends AbstractCrudController
{

+ 4
- 3
src/Controller/Admin/DashboardAnimatorController.php Visa fil

@@ -12,11 +12,12 @@ use App\Entity\Territory;
use App\Entity\Thematic;
use App\Entity\User\GroupUser;
use App\Entity\User\User;
use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
use EasyCorp\Bundle\EasyAdminBundle\Config\Assets;
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem;
use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
use Lc\SovBundle\Controller\Admin\DashboardController as SovDashboardController;
use Lc\SovBundle\Controller\Dashboard\DashboardController as SovDashboardController;
use Symfony\Component\HttpFoundation\Response;

class DashboardAnimatorController extends SovDashboardController
@@ -32,10 +33,11 @@ class DashboardAnimatorController extends SovDashboardController
{
$urlCreate = $this->adminUrlGenerator
->setController(CollectifDataCrudController::class)
->setAction('new')
->setAction(Action::NEW)
->generateUrl();

yield MenuItem::linkToDashboard('dashboard', 'circle');
yield MenuItem::linkToUrl('data_collectif_create', '', $urlCreate);
yield MenuItem::subMenu('account', 'user')
->setSubItems(
[
@@ -43,7 +45,6 @@ class DashboardAnimatorController extends SovDashboardController
MenuItem::linkToRoute('account_password', '', 'sov_admin_account_password'),
]
);
yield MenuItem::linkToUrl('data_collectif_create', '', $urlCreate);

}
}

+ 78
- 42
src/Controller/Admin/DashboardController.php Visa fil

@@ -12,11 +12,12 @@ use App\Entity\Territory;
use App\Entity\Thematic;
use App\Entity\User\GroupUser;
use App\Entity\User\User;
use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
use EasyCorp\Bundle\EasyAdminBundle\Config\Assets;
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem;
use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
use Lc\SovBundle\Controller\Admin\DashboardController as SovDashboardController;
use Lc\SovBundle\Controller\Dashboard\DashboardController as SovDashboardController;

class DashboardController extends SovDashboardController
{
@@ -32,50 +33,85 @@ class DashboardController extends SovDashboardController

public function configureMenuItems(): iterable
{
$urlNewCollectif = $this->adminUrlGenerator
->setController(CollectifDataCrudController::class)
->setAction(Action::NEW)
->set('menuIndex', 3)
->set('submenuIndex', 0)
->generateUrl();

$urlOnlineCollectif = $this->adminUrlGenerator
->setController(CollectifDataCrudController::class)
->setAction(Action::INDEX)
->set('status', 1)
->set('menuIndex', 3)
->set('submenuIndex', 2)
->generateUrl();

$urlCreate = $this->adminUrlGenerator
$urlOfflineCollectif = $this->adminUrlGenerator
->setController(CollectifDataCrudController::class)
->setAction('new')
->setAction(Action::INDEX)
->set('status', 0)
->set('menuIndex', 3)
->set('submenuIndex', 1)
->generateUrl();

yield MenuItem::linkToDashboard('dashboard', 'circle');
yield MenuItem::subMenu('account', 'user')
->setSubItems(
[
MenuItem::linkToRoute('account_profile', '', 'sov_admin_account_profile'),
MenuItem::linkToRoute('account_password', '', 'sov_admin_account_password'),
]
);
yield MenuItem::subMenu('user', 'user')
->setPermission(self::ROLE_ADMIN)
->setSubItems(
[
MenuItem::linkToCrud('user_index', '', User::class),
]
);
yield MenuItem::subMenu('data_individual', 'user')
->setPermission(self::ROLE_ADMIN)
->setSubItems(
[
MenuItem::linkToCrud('data_individual_validate', '', IndividualData::class),
MenuItem::linkToCrud('data_individual_waiting', '', IndividualData::class),
]
);
yield MenuItem::subMenu('data_collectif', 'user')
->setPermission(self::ROLE_ADMIN)
->setSubItems(
[
MenuItem::linkToCrud('data_collectif_validate', '', CollectifData::class),
MenuItem::linkToCrud('data_collectif_waiting', '', CollectifData::class),
]
);
yield MenuItem::linkToCrud('thematic', 'copy', Thematic::class)
->setPermission(self::ROLE_ADMIN);
yield MenuItem::linkToCrud('territory', 'copy', Territory::class)
->setPermission(self::ROLE_SUPER_ADMIN);
yield MenuItem::linkToCrud('configuration', 'copy', Configuration::class)
->setPermission(self::ROLE_SUPER_ADMIN);
yield MenuItem::linkToCrud('page', 'copy', Page::class)
->setPermission(self::ROLE_ADMIN);
$urlOnlineIndividuel = $this->adminUrlGenerator
->setController(IndividualDataCrudController::class)
->setAction(Action::INDEX)
->set('status', 1)
->set('menuIndex', 3)
->set('submenuIndex', 1)
->generateUrl();

$urlOfflineIndividuel = $this->adminUrlGenerator
->setController(IndividualDataCrudController::class)
->setAction(Action::INDEX)
->set('status', 0)
->set('menuIndex', 3)
->set('submenuIndex', 0)
->generateUrl();

$menuItems = [
MenuItem::linkToDashboard('dashboard', 'far fa-circle'),
MenuItem::subMenu('account', 'fas fa-user')
->setSubItems(
[
MenuItem::linkToRoute('account_profile', 'fas fa-user-cog', 'sov_admin_account_profile'),
MenuItem::linkToRoute('account_password', 'fas fa-key', 'sov_admin_account_password'),
]
),
MenuItem::linkToCrud('user', 'fas fa-users', User::class)
->setPermission(self::ROLE_ADMIN),
/*MenuItem::subMenu('data_individual', 'user')
->setPermission(self::ROLE_ADMIN)
->setSubItems(
[
MenuItem::linkToUrl('data_individual_waiting', '', $urlOfflineIndividuel),
MenuItem::linkToUrl('data_individual_validate', '', $urlOnlineIndividuel),
]
),*/
MenuItem::subMenu('data_collectif', 'fas fa-database')
->setPermission(self::ROLE_ADMIN)
->setSubItems(
[
MenuItem::linkToUrl('data_collectif_new', 'fas fa-plus', $urlNewCollectif),
MenuItem::linkToUrl('data_collectif_waiting', 'fas fa-hourglass-half', $urlOfflineCollectif),
MenuItem::linkToUrl('data_collectif_validate', 'fas fa-check', $urlOnlineCollectif),
]
),
MenuItem::linkToCrud('thematic', 'fas fa-book', Thematic::class)
->setPermission(self::ROLE_ADMIN),
MenuItem::linkToCrud('territory', 'far fa-copy', Territory::class)
->setPermission(self::ROLE_SUPER_ADMIN),
MenuItem::linkToCrud('configuration', 'far fa-copy', Configuration::class)
->setPermission(self::ROLE_SUPER_ADMIN),
MenuItem::linkToCrud('page', 'far fa-copy', Page::class)
->setPermission(self::ROLE_ADMIN),
];

/*$this->setMenuIndexes($menuItems);*/

return $menuItems;
}
}

+ 27
- 3
src/Controller/Admin/IndividualDataCrudController.php Visa fil

@@ -5,11 +5,16 @@ namespace App\Controller\Admin;
use App\Entity\Configuration;
use App\Entity\IndividualData;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\QueryBuilder;
use EasyCorp\Bundle\EasyAdminBundle\Collection\FieldCollection;
use EasyCorp\Bundle\EasyAdminBundle\Collection\FilterCollection;
use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
use EasyCorp\Bundle\EasyAdminBundle\Dto\EntityDto;
use EasyCorp\Bundle\EasyAdminBundle\Dto\SearchDto;
use Lc\SovBundle\Controller\AbstractAdminController as AbstractCrudController;
use EasyCorp\Bundle\EasyAdminBundle\Field\EmailField;
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
use Lc\SovBundle\Field\BooleanField;
use Lc\SovBundle\Field\StatusField;

class IndividualDataCrudController extends AbstractCrudController
{
@@ -25,7 +30,7 @@ class IndividualDataCrudController extends AbstractCrudController
TextField::new('lastname'),
EmailField::new('email'),
TextField::new('introAnswer'),
BooleanField::new('status')->setRequired(false)
StatusField::new('status')->setRequired(false)
];
}

@@ -40,4 +45,23 @@ class IndividualDataCrudController extends AbstractCrudController

parent::persistEntity($entityManager, $entityInstance); // TODO: Change the autogenerated stub
}

public function createIndexQueryBuilder(
SearchDto $searchDto,
EntityDto $entityDto,
FieldCollection $fields,
FilterCollection $filters
): QueryBuilder
{
$queryBuilder = parent::createIndexQueryBuilder(
$searchDto,
$entityDto,
$fields,
$filters
);

$queryBuilder->andWhere('entity.status = ' . $searchDto->getRequest()->get('status'));

return $queryBuilder;
}
}

+ 1
- 2
src/Controller/Admin/PageCrudController.php Visa fil

@@ -6,8 +6,7 @@ use App\Entity\Site\Page;
use EasyCorp\Bundle\EasyAdminBundle\Field\FormField;
use EasyCorp\Bundle\EasyAdminBundle\Field\NumberField;
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
use Lc\SovBundle\Controller\Admin\AbstractCrudController;
use Lc\SovBundle\Field\BooleanField;
use Lc\SovBundle\Controller\AbstractAdminController as AbstractCrudController;;
use Lc\SovBundle\Field\CKEditorField;
use Lc\SovBundle\Field\FileManagerField;
use Lc\SovBundle\Field\GalleryManagerField;

+ 1
- 1
src/Controller/Admin/TerritoryCrudController.php Visa fil

@@ -4,7 +4,7 @@ namespace App\Controller\Admin;

use App\Entity\Territory;
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
use Lc\SovBundle\Controller\Admin\AbstractCrudController;
use Lc\SovBundle\Controller\AbstractAdminController as AbstractCrudController;

class TerritoryCrudController extends AbstractCrudController
{

+ 1
- 1
src/Controller/Admin/ThematicCrudController.php Visa fil

@@ -5,7 +5,7 @@ namespace App\Controller\Admin;
use App\Entity\Thematic;
use EasyCorp\Bundle\EasyAdminBundle\Field\FormField;
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
use Lc\SovBundle\Controller\Admin\AbstractCrudController;
use Lc\SovBundle\Controller\AbstractAdminController as AbstractCrudController;

class ThematicCrudController extends AbstractCrudController
{

+ 1
- 2
src/Controller/Admin/UserCrudController.php Visa fil

@@ -8,7 +8,7 @@ use EasyCorp\Bundle\EasyAdminBundle\Field\ArrayField;
use EasyCorp\Bundle\EasyAdminBundle\Field\ChoiceField;
use EasyCorp\Bundle\EasyAdminBundle\Field\EmailField;
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
use Lc\SovBundle\Controller\Admin\UserCrudController as AbstractUserCrudController;
use Lc\SovBundle\Controller\User\UserAdminController as AbstractUserCrudController;
use Lc\SovBundle\Doctrine\EntityManager;
use Lc\SovBundle\Translation\TranslatorAdmin;
use Symfony\Component\HttpFoundation\RequestStack;
@@ -55,7 +55,6 @@ class UserCrudController extends AbstractUserCrudController
TextField::new('firstname'),
TextField::new('lastname'),
EmailField::new('email'),
ArrayField::new('roles'),
ChoiceField::new('roles')
->allowMultipleChoices()
->autocomplete()

+ 11
- 5
src/Entity/CollectifData.php Visa fil

@@ -36,22 +36,22 @@ class CollectifData implements StatusInterface, EntityInterface
private $user;

/**
* @ORM\OneToMany(targetEntity=Revolts::class, mappedBy="collectifData")
* @ORM\OneToMany(targetEntity=Revolts::class, mappedBy="collectifData", cascade={"persist", "remove"})
*/
private $revolts;

/**
* @ORM\OneToMany(targetEntity=Dreams::class, mappedBy="collectifData")
* @ORM\OneToMany(targetEntity=Dreams::class, mappedBy="collectifData", cascade={"persist", "remove"})
*/
private $dreams;

/**
* @ORM\OneToMany(targetEntity=ProjectsBoost::class, mappedBy="collectifData")
* @ORM\OneToMany(targetEntity=ProjectsBoost::class, mappedBy="collectifData", cascade={"persist", "remove"})
*/
private $projectsBoost;

/**
* @ORM\OneToMany(targetEntity=ProjectsInspiring::class, mappedBy="collectifData")
* @ORM\OneToMany(targetEntity=ProjectsInspiring::class, mappedBy="collectifData", cascade={"persist", "remove"})
*/
private $projectsInspiring;

@@ -70,8 +70,14 @@ class CollectifData implements StatusInterface, EntityInterface

public function __toString()
{
return $this->nbParticipant;
return $this->nbParticipant . " participants";
}

public function getResume()
{
return count($this->getRevolts()) . " révolte(s) - " . count($this->getDreams()) . " rêve(s) - " . count($this->getProjectsBoost()) . " projet(s) boosté(s) - " . count($this->getProjectsInspiring()) . " projets inspirants";
}

public function getId(): ?int
{
return $this->id;

+ 5
- 0
src/Entity/Dreams.php Visa fil

@@ -32,6 +32,11 @@ class Dreams implements DescriptionProjectInterface, EntityInterface
*/
private $collectifData;

public function __toString()
{
return $this->description;
}

public function getId(): ?int
{
return $this->id;

+ 5
- 0
src/Entity/ProjectsBoost.php Visa fil

@@ -32,6 +32,11 @@ class ProjectsBoost implements DescriptionProjectInterface, EntityInterface
*/
private $collectifData;

public function __toString()
{
return $this->description;
}

public function getId(): ?int
{
return $this->id;

+ 5
- 0
src/Entity/ProjectsInspiring.php Visa fil

@@ -32,6 +32,11 @@ class ProjectsInspiring implements DescriptionProjectInterface, EntityInterface
*/
private $collectifData;

public function __toString()
{
return $this->description;
}

public function getId(): ?int
{
return $this->id;

+ 5
- 0
src/Entity/Revolts.php Visa fil

@@ -32,6 +32,11 @@ class Revolts implements DescriptionProjectInterface, EntityInterface
*/
private $collectifData;

public function __toString()
{
return $this->description;
}

public function getId(): ?int
{
return $this->id;

+ 71
- 0
src/Type/DreamsType.php Visa fil

@@ -0,0 +1,71 @@
<?php

namespace App\Type;

use App\Entity\Dreams;
use App\Entity\Thematic;
use Lc\SovBundle\Doctrine\EntityManager;
use Lc\SovBundle\Model\User\UserInterface;
use Lc\SovBundle\Translation\TranslatorAdmin;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
use Symfony\Component\Validator\Constraints\NotBlank;

class DreamsType extends AbstractType
{

protected $em;
protected $translatorAdmin;

public function __construct(EntityManager $em, TranslatorAdmin $translatorAdmin)
{
$this->em = $em;
$this->translatorAdmin = $translatorAdmin;
}

/**
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->add(
'description',
TextareaType::class,
[
'label' => 'form.field.dreams.description',
'constraints' => [
new NotBlank(),
],
]
)
->add(
'thematic',
EntityType::class,
[
'label' => 'form.field.dreams.thematic',
'class' => Thematic::class,
'required' => false,
]
);
}

/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(
[
'data_class' => $this->em->getEntityName(Dreams::class),
]
);
}
}


+ 71
- 0
src/Type/ProjectsBoostType.php Visa fil

@@ -0,0 +1,71 @@
<?php

namespace App\Type;

use App\Entity\ProjectsBoost;
use App\Entity\Thematic;
use Lc\SovBundle\Doctrine\EntityManager;
use Lc\SovBundle\Model\User\UserInterface;
use Lc\SovBundle\Translation\TranslatorAdmin;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
use Symfony\Component\Validator\Constraints\NotBlank;

class ProjectsBoostType extends AbstractType
{

protected $em;
protected $translatorAdmin;

public function __construct(EntityManager $em, TranslatorAdmin $translatorAdmin)
{
$this->em = $em;
$this->translatorAdmin = $translatorAdmin;
}

/**
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->add(
'description',
TextareaType::class,
[
'label' => 'form.field.projectsboost.description',
'constraints' => [
new NotBlank(),
],
]
)
->add(
'thematic',
EntityType::class,
[
'label' => 'form.field.projectsboost.thematic',
'class' => Thematic::class,
'required' => false,
]
);
}

/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(
[
'data_class' => $this->em->getEntityName(ProjectsBoost::class),
]
);
}
}


+ 71
- 0
src/Type/ProjectsInspiringType.php Visa fil

@@ -0,0 +1,71 @@
<?php

namespace App\Type;

use App\Entity\ProjectsInspiring;
use App\Entity\Thematic;
use Lc\SovBundle\Doctrine\EntityManager;
use Lc\SovBundle\Model\User\UserInterface;
use Lc\SovBundle\Translation\TranslatorAdmin;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
use Symfony\Component\Validator\Constraints\NotBlank;

class ProjectsInspiringType extends AbstractType
{

protected $em;
protected $translatorAdmin;

public function __construct(EntityManager $em, TranslatorAdmin $translatorAdmin)
{
$this->em = $em;
$this->translatorAdmin = $translatorAdmin;
}

/**
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->add(
'description',
TextareaType::class,
[
'label' => 'form.field.projectsinspiring.description',
'constraints' => [
new NotBlank(),
],
]
)
->add(
'thematic',
EntityType::class,
[
'label' => 'form.field.projectsinspiring.thematic',
'class' => Thematic::class,
'required' => false,
]
);
}

/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(
[
'data_class' => $this->em->getEntityName(ProjectsInspiring::class),
]
);
}
}


+ 71
- 0
src/Type/RevoltsType.php Visa fil

@@ -0,0 +1,71 @@
<?php

namespace App\Type;

use App\Entity\Revolts;
use App\Entity\Thematic;
use Lc\SovBundle\Doctrine\EntityManager;
use Lc\SovBundle\Model\User\UserInterface;
use Lc\SovBundle\Translation\TranslatorAdmin;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
use Symfony\Component\Validator\Constraints\NotBlank;

class RevoltsType extends AbstractType
{

protected $em;
protected $translatorAdmin;

public function __construct(EntityManager $em, TranslatorAdmin $translatorAdmin)
{
$this->em = $em;
$this->translatorAdmin = $translatorAdmin;
}

/**
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->add(
'description',
TextareaType::class,
[
'label' => 'form.field.revolts.description',
'constraints' => [
new NotBlank(),
],
]
)
->add(
'thematic',
EntityType::class,
[
'label' => 'form.field.revolts.thematic',
'class' => Thematic::class,
'required' => false,
]
);
}

/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(
[
'data_class' => $this->em->getEntityName(Revolts::class),
]
);
}
}


+ 8
- 0
templates/crud/field/association.html.twig Visa fil

@@ -0,0 +1,8 @@
{# @var ea \EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext #}
{# @var field \EasyCorp\Bundle\EasyAdminBundle\Dto\FieldDto #}
{# @var entity \EasyCorp\Bundle\EasyAdminBundle\Dto\EntityDto #}
{% if 'toMany' == field.customOptions.get('associationType') %}
<span class="badge badge-secondary">{{ field.formattedValue }}</span>
{% else %}
{{ field.formattedValue }}
{% endif %}

+ 52
- 3
translations/admin.fr.yaml Visa fil

@@ -1,11 +1,60 @@
menu:
data_individual: Formulaire individuel
data_individual_validate: Données validées
data_individual_waiting: Données en attente de validation
data_individual_waiting: Données en attente
data_collectif: Formulaire collectif
data_collectif_new: Créer
data_collectif_validate: Données validées
data_collectif_waiting: Données en attente de validation
data_collectif_waiting: Données en attente
data_collectif_create: Formulaire collectif
territory: Territoires
thematic: Thématiques
configuration: Configuration question Intro
configuration: Configuration
entity:
User:
fields:
roles: Rôle(s)
CollectifData:
label: Données collectif
label_plurial: Données du formulaire collectif
fields:
territory: Territoire
nbParticipant: Nombre de participants
revolts: Les révoltes
dreams: Les rêves
projectsboost: Les projets boostés
projectsinspiring: Les projets inspirants
resume: Résumé
IndividualData:
label: Données individuel
label_plurial: Données du formulaire individuel
fields:
firstname: Prénom
lastname: Nom
Thematic:
label_plurial: Les thémes
label: Thématique
fields:
name: Nom
Territory:
label_plurial: Les territoires
label: Territoire
fields:
name: Nom
Configuration:
label_plurial: Les configurations
label: Configuration
form:
field:
dreams:
description: Description
thematic: Thématique
projectsboost:
description: Description
thematic: Thématique
projectsinspiring:
description: Description
thematic: Thématique
revolts:
description: Description
thematic: Thématique

Laddar…
Avbryt
Spara