Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into accourse_impr

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-09-29 23:51:56 +02:00
parent 5da332a06e 8853359405
commit 5de05c0ee9
63 changed files with 1498 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
View File

@@ -247,7 +247,6 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
if (\random_int(0, 10) > 3) {
// always add social scope:
$accompanyingPeriod->addScope($this->getReference('scope_social'));
var_dump(count($accompanyingPeriod->getScopes()));
$accompanyingPeriod->setAddressLocation($this->createAddress());
$manager->persist($accompanyingPeriod->getAddressLocation());

2
src/Bundle/ChillPersonBundle/Entity/Person.php
View File

@@ -146,7 +146,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
* groups={"general", "creation"}
* )
*/
private ?\DateTimeImmutable $deathdate;
private ?\DateTimeImmutable $deathdate = null;
/**
* The person's place of birth

2
src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
View File

@@ -66,7 +66,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
'routeParameters' => [
'id' => $period->getId()
]])
->setExtras(['order' => 40]);
->setExtras(['order' => 50]);
}

2
src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
View File

@@ -199,7 +199,7 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
}
if (NULL !== $birthdate) {
$qb->andWhere($qb->expr()->eq('s.birthdate', ':birthdate'))
$qb->andWhere($qb->expr()->eq('p.birthdate', ':birthdate'))
->setParameter('birthdate', $birthdate);
}

53
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
View File

@@ -1,35 +1,36 @@
<div class="banner banner-accompanying-course">
<div id="header-accompanying_course-name" class="header-name">
<div class="container-xxl">
<div class="row">
<div id="header-accompanying_course-name" class="header-name">
<div class="container-xxl">
<div class="row">
<div class="col-md-6 ps-md-5 ps-xxl-0">
<h1>
<i class="fa fa-random fa-fw"></i>
{{ 'Accompanying Course'|trans }}
<span class="id-number">{{ accompanyingCourse.id }}</span>
</h1>
</div>
<div class="col-md-6 ps-md-5 ps-xxl-0">
<h1>
<i class="fa fa-random fa-fw"></i>
{{ 'Accompanying Course'|trans }}
<span class="id-number">{{ accompanyingCourse.id }}</span>
</h1>
</div>
{# vue teleport fragment here #}
<div class="col-md-3 mt-3 mb-1 my-md-3" id="banner-flags"></div>
{# vue teleport fragment here #}
<div class="col-md-3 mt-3 mb-1 my-md-3" id="banner-flags"></div>
{# vue teleport fragment here #}
<div class="col-md-3 mt-1 mb-3 my-md-3 pe-md-5 pe-xxl-0" id="banner-status"></div>
{# vue teleport fragment here #}
<div class="col-md-3 mt-1 mb-3 my-md-3 pe-md-5 pe-xxl-0" id="banner-status"></div>
</div>
</div>
</div>
</div>
</div>
<div id="header-accompanying_course-details" class="header-details">
<div class="container-xxl">
<div class="row justify-content-md-right">
</div>
<div id="header-accompanying_course-details" class="header-details">
<div class="container-xxl">
<div
class="row justify-content-md-right">
{# vue teleport fragment here #}
<div class="col-md-10 ps-md-5 ps-xxl-0" id="banner-social-issues"></div>
{# vue teleport fragment here #}
<div class="col-md-10 ps-md-5 ps-xxl-0" id="banner-social-issues"></div>
</div>
</div>
</div>
<a id="banner-accompanying-course"></a>
</div>
</div>
</div>
<a id="banner-accompanying-course"></a>
</div>