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

Merge branch '111_exports_suite' into testing

Browse Source
This commit is contained in:
Julie Lenaerts 2022-11-25 14:17:16 +01:00
commit 7c8ac8cfcb
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
View File

@ -210,10 +210,20 @@ class ListActivity implements ListInterface, GroupedExportInterface
$qb $qb
->from('ChillActivityBundle:Activity', 'activity') ->from('ChillActivityBundle:Activity', 'activity')
->join('activity.person', 'person') ->join('activity.person', 'actperson')
->join('actperson.center', 'actcenter') ->join('actperson.centerHistory', 'centerHistory');
->andWhere('actcenter IN (:authorized_centers)')
->setParameter('authorized_centers', $centers); $qb->where(
$qb->expr()->andX(
$qb->expr()->lte('centerHistory.startDate', 'activity.date'),
$qb->expr()->orX(
$qb->expr()->isNull('centerHistory.endDate'),
$qb->expr()->gt('centerHistory.endDate', 'activity.date')
)
)
)
->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
->setParameter('centers', $centers);
foreach ($this->fields as $f) { foreach ($this->fields as $f) {
if (in_array($f, $data['fields'], true)) { if (in_array($f, $data['fields'], true)) {
@ -224,17 +234,17 @@ class ListActivity implements ListInterface, GroupedExportInterface
break; break;
case 'person_firstname': case 'person_firstname':
$qb->addSelect('person.firstName AS person_firstname'); $qb->addSelect('actperson.firstName AS person_firstname');
break; break;
case 'person_lastname': case 'person_lastname':
$qb->addSelect('person.lastName AS person_lastname'); $qb->addSelect('actperson.lastName AS person_lastname');
break; break;
case 'person_id': case 'person_id':
$qb->addSelect('person.id AS person_id'); $qb->addSelect('actperson.id AS person_id');
break; break;
@ -251,7 +261,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
break; break;
case 'type_name': case 'type_name':
$qb->join('activity.type', 'type'); $qb->join('activity.activityType', 'type');
$qb->addSelect('type.name AS type_name'); $qb->addSelect('type.name AS type_name');
break; break;
@ -263,6 +273,11 @@ class ListActivity implements ListInterface, GroupedExportInterface
break; break;
case 'attendee':
$qb->addSelect('IDENTITY(activity.attendee) AS attendee');
break;
default: default:
$qb->addSelect(sprintf('activity.%s as %s', $f, $f)); $qb->addSelect(sprintf('activity.%s as %s', $f, $f));

2
src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
View File

@ -445,6 +445,8 @@ class SpreadSheetFormatter implements FormatterInterface
$this->initializeCache($key); $this->initializeCache($key);
} }
$value = null === $value ? '' : $value;
return call_user_func($this->cacheDisplayableResult[$key], $value); return call_user_func($this->cacheDisplayableResult[$key], $value);
} }