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

Merge remote-tracking branch 'origin/export-2023-01-fixes'

Browse Source
This commit is contained in:
Julien Fastré
2023-01-16 12:06:55 +01:00
parent 4a56c4c945 01790fa0cf
commit 583d7b24ba
48 changed files with 96 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
View File

@@ -65,7 +65,7 @@ class AdministrativeLocationAggregator implements AggregatorInterface
return 'Administrative location';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
View File

@@ -60,7 +60,7 @@ class ClosingMotiveAggregator implements AggregatorInterface
return 'Closing motive';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php
View File

@@ -65,7 +65,7 @@ class CreatorJobAggregator implements AggregatorInterface
return 'export.aggregator.course.by_creator_job.Creator\'s job';
}
if (null === $value || null === $j = $this->jobRepository->find($value)) {
if (null === $value || '' === $value || null === $j = $this->jobRepository->find($value)) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
View File

@@ -69,7 +69,7 @@ final class EvaluationAggregator implements AggregatorInterface
return 'Evaluation';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
View File

@@ -143,7 +143,7 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
return 'acp_geog_agg_unitname';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php
View File

@@ -65,7 +65,7 @@ final class JobAggregator implements AggregatorInterface
return 'Job';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
View File

@@ -67,7 +67,7 @@ final class OriginAggregator implements AggregatorInterface
return 'Origin';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
View File

@@ -94,7 +94,7 @@ final class ReferrerAggregator implements AggregatorInterface
return 'Referrer';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
View File

@@ -101,7 +101,7 @@ class ReferrerScopeAggregator implements AggregatorInterface
return 'export.aggregator.course.by_user_scope.Referrer\'s scope';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

6
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
View File

@@ -65,11 +65,13 @@ final class ScopeAggregator implements AggregatorInterface
return 'Scope';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}
$s = $this->scopeRepository->find($value);
if (null === $s = $this->scopeRepository->find($value)) {
return '';
}
return $this->translatableStringHelper->localize(
$s->getName()

6
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
View File

@@ -66,11 +66,13 @@ final class SocialActionAggregator implements AggregatorInterface
return 'Social action';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}
$sa = $this->actionRepository->find($value);
if (null === $sa = $this->actionRepository->find($value)) {
return '';
}
return $this->actionRender->renderString($sa, []);
};

4
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
View File

@@ -66,6 +66,10 @@ final class SocialIssueAggregator implements AggregatorInterface
return 'Social issues';
}
if (null === $value || '' === $value) {
return '';
}
$i = $this->issueRepository->find($value);
return $this->issueRender->renderString($i, []);

1
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
View File

@@ -98,6 +98,7 @@ final class StepAggregator implements AggregatorInterface
return 'Step';
case null:
case '':
return '';
default:

2
src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
View File

@@ -60,7 +60,7 @@ class EvaluationTypeAggregator implements AggregatorInterface
return 'Evaluation type';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
View File

@@ -89,7 +89,7 @@ class CompositionAggregator implements AggregatorInterface
return 'Composition';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
View File

@@ -105,7 +105,7 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
return 'export.aggregator.person.by_household_composition.Household composition';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

1
src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
View File

@@ -66,6 +66,7 @@ final class GenderAggregator implements AggregatorInterface
return $this->translator->trans('unknown');
case null:
case '':
return $this->translator->trans('Not given');
case '_header':

2
src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
View File

@@ -101,7 +101,7 @@ final class HouseholdPositionAggregator implements AggregatorInterface, ExportEl
return 'Household position';
}
if (null === $value) {
if (null === $value || '' === $value) {
return $this->translator->trans('without data');
}

4
src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
View File

@@ -63,6 +63,10 @@ final class MaritalStatusAggregator implements AggregatorInterface
return 'Marital status';
}
if (null === $value || '' === $value) {
return '';
}
$g = $this->maritalStatusRepository->find($value);
return $this->translatableStringHelper->localize($g->getName());

2
src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
View File

@@ -85,7 +85,7 @@ final class ActionTypeAggregator implements AggregatorInterface
return 'Social Action Type';
}
if (null === $value || null === $sa = $this->socialActionRepository->find($value)) {
if (null === $value || '' === $value || null === $sa = $this->socialActionRepository->find($value)) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
View File

@@ -63,7 +63,7 @@ final class GoalAggregator implements AggregatorInterface
return 'Goal Type';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
View File

@@ -72,7 +72,7 @@ class GoalResultAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data)
{
return function ($value) use ($key): string {
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
View File

@@ -65,7 +65,7 @@ final class JobAggregator implements AggregatorInterface
return 'Job';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
View File

@@ -65,7 +65,7 @@ final class ReferrerAggregator implements AggregatorInterface
return 'Referrer';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
View File

@@ -63,7 +63,7 @@ final class ResultAggregator implements AggregatorInterface
return 'Result Type';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

2
src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
View File

@@ -65,7 +65,7 @@ final class ScopeAggregator implements AggregatorInterface
return 'Scope';
}
if (null === $value) {
if (null === $value || '' === $value) {
return '';
}

6
src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
View File

@@ -111,10 +111,10 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
public function describeAction($data, $format = 'string')
{
return [
'exports.by_person.Filtered by person\'s geographical unit (based on address) computed at datecalc, only units',
'export.filter.by_geog_unit.Filtered by person\'s geographical unit (based on address) computed at %datecalc%, only %units%',
[
'datecalc' => $this->rollingDateConverter->convert($data['date_calc'])->format('Y-m-d'),
'units' => implode(
'%datecalc%' => $this->rollingDateConverter->convert($data['date_calc'])->format('Y-m-d'),
'%units%' => implode(
', ',
array_map(
function (SimpleGeographicalUnitDTO $item) {

2
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@@ -1046,6 +1046,8 @@ export:
Max date: Date d'échéance
filter:
by_geog_unit:
Filtered by person's geographical unit (based on address) computed at %datecalc%, only %units%: Filtré par unité géographique (sur base de l'adresse), calculé le %datecalc%, seulement %units%
person:
by_composition:
Filter by household composition: Filtrer les personnes par composition du ménage