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

docgen/budget: add comment for each budget line (resource and charge)

Browse Source 
The comments are cocatenated by lines of each type, and separated by a
`|`
This commit is contained in:
Julien Fastré 2022-04-11 18:10:10 +02:00
parent 910245f855
commit 69b2dce7ee
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ and this project adheres to
<!-- write down unreleased development here --> <!-- write down unreleased development here -->
* [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person); * [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);
* [docgen] add a new context with a list of activities in course * [docgen] add a new context with a list of activities in course
* [docgen] add a comment in budget lines
## Test releases ## Test releases

17
src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
View File

@ -25,13 +25,13 @@ use function count;
*/ */
class SummaryBudget implements SummaryBudgetInterface class SummaryBudget implements SummaryBudgetInterface
{ {
private const QUERY_CHARGE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, type FROM chill_budget.charge WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type'; private const QUERY_CHARGE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.charge WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
private const QUERY_CHARGE_BY_PERSON = 'select SUM(amount) AS sum, type FROM chill_budget.charge WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type'; private const QUERY_CHARGE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.charge WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
private const QUERY_RESOURCE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, type FROM chill_budget.resource WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type'; private const QUERY_RESOURCE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.resource WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
private const QUERY_RESOURCE_BY_PERSON = 'select SUM(amount) AS sum, type FROM chill_budget.resource WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type'; private const QUERY_RESOURCE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.resource WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
private array $chargeLabels; private array $chargeLabels;
@ -110,7 +110,9 @@ class SummaryBudget implements SummaryBudgetInterface
$rsm = new ResultSetMapping(); $rsm = new ResultSetMapping();
$rsm $rsm
->addScalarResult('sum', 'sum') ->addScalarResult('sum', 'sum')
->addScalarResult('type', 'type'); ->addScalarResult('type', 'type')
->addScalarResult('comment', 'comment')
;
return $rsm; return $rsm;
} }
@ -121,7 +123,7 @@ class SummaryBudget implements SummaryBudgetInterface
$labels = $this->chargeLabels; $labels = $this->chargeLabels;
return array_combine($keys, array_map(function ($i) use ($labels) { return array_combine($keys, array_map(function ($i) use ($labels) {
return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i])]; return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i]), 'comment' => ''];
}, $keys)); }, $keys));
} }
@ -131,7 +133,7 @@ class SummaryBudget implements SummaryBudgetInterface
$labels = $this->resourcesLabels; $labels = $this->resourcesLabels;
return array_combine($keys, array_map(function ($i) use ($labels) { return array_combine($keys, array_map(function ($i) use ($labels) {
return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i])]; return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i]), 'comment' => ''];
}, $keys)); }, $keys));
} }
@ -158,6 +160,7 @@ class SummaryBudget implements SummaryBudgetInterface
$result[$row['type']] = [ $result[$row['type']] = [
'sum' => (float) $row['sum'], 'sum' => (float) $row['sum'],
'label' => $this->translatableStringHelper->localize($label[$row['type']]), 'label' => $this->translatableStringHelper->localize($label[$row['type']]),
'comment' => (string) $row['comment'],
]; ];
} }