Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix error in date in accompanying period timeline

Browse Source
This commit is contained in:
Julien Fastré 2017-08-19 22:47:03 +02:00
parent 47e194b1ed
commit bd50ca44db
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Timeline/AbstractTimelineAccompanyingPeriod.php
View File

@ -83,8 +83,12 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
return array( return array(
'id' => $metadata->getColumnName('id'), 'id' => $metadata->getColumnName('id'),
'date' => $metadata->getColumnName('openingDate'),
'FROM' => $metadata->getTableName(), 'FROM' => $metadata->getTableName(),
'WHERE' => sprintf('%s = %d',
$this->em
->getClassMetadata('ChillPersonBundle:AccompanyingPeriod')
->getAssociationMapping('person')['joinColumns'][0]['name'],
$args['person']->getId())
); );
} }

10
Timeline/TimelineAccompanyingPeriodClosing.php
View File

@ -51,14 +51,8 @@ class TimelineAccompanyingPeriodClosing extends AbstractTimelineAccompanyingPeri
$data = $this->basicFetchQuery($context, $args); $data = $this->basicFetchQuery($context, $args);
$data['type'] = 'accompanying_period_closing'; $data['type'] = 'accompanying_period_closing';
$data['WHERE'] = sprintf('%s = %d AND %s IS NOT NULL', $data['date'] = $metadata->getColumnName('closingDate');
$metadata
->getAssociationMapping('person')['joinColumns'][0]['name'],
$args['person']->getId(),
$metadata
->getColumnName('closingDate')
);
return $data; return $data;
} }

8
Timeline/TimelineAccompanyingPeriodOpening.php
View File

@ -45,15 +45,13 @@ class TimelineAccompanyingPeriodOpening extends AbstractTimelineAccompanyingPeri
*/ */
public function fetchQuery($context, array $args) public function fetchQuery($context, array $args)
{ {
$metadata = $this->em
->getClassMetadata('ChillPersonBundle:AccompanyingPeriod');
$data = $this->basicFetchQuery($context, $args); $data = $this->basicFetchQuery($context, $args);
$data['type'] = 'accompanying_period_opening'; $data['type'] = 'accompanying_period_opening';
$data['WHERE'] = sprintf('%s = %d', $data['date'] = $metadata->getColumnName('openingDate');
$this->em
->getClassMetadata('ChillPersonBundle:AccompanyingPeriod')
->getAssociationMapping('person')['joinColumns'][0]['name'],
$args['person']->getId());
return $data; return $data;
} }