IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add showing subtotal in gdt overview

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2020-05-14 09:30:09 +00:00 committed by Dario via Pythagoras
parent 21208266f7
commit 0b7dbce508
1 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/Template/StateBalances/overview_gdt.ctp
View File

@ -28,7 +28,21 @@ $gdtSumFromEmails = 0;
foreach($gdtSumPerEmail as $email => $gdt) {
$gdtSumFromEmails += $gdt;
}
$ownEuroSum = 0;
$ownGdtSum = 0;
$publisherEuroSum = 0;
$publisherGdtSum = 0;
?>
<style type="text/css">
.font-smaller {
font-size:smaller;
}
.font-color-grey
{
color:grey;
}
</style>
<div class="row">
<div class="col-md-8 equel-grid">
<div class="grid">
@ -65,11 +79,19 @@ foreach($gdtSumPerEmail as $email => $gdt) {
</tr>
</thead>
<tbody>
<?php foreach($ownEntries as $entry) : ?>
<?php foreach($ownEntries as $entry) :
$ownEuroSum += $entry['amount'];
$ownGdtSum += $entry['gdt'];
?>
<tr>
<td>
<?= $this->element('printEuro', ['number' => $entry['amount']]); ?>
<?php if($entry['amount2']) echo ' + ' . $this->element('printEuro', ['number' => $entry['amount2']]) ?>
<?php
if($entry['amount2']) {
echo ' + ' . $this->element('printEuro', ['number' => $entry['amount2']]);
$ownEuroSum += $entry['amount2'];
}
?>
</td>
<td>
<?= $this->Number->format($entry['factor']) ?>
@ -82,6 +104,12 @@ foreach($gdtSumPerEmail as $email => $gdt) {
<td><?= h($entry['comment']) ?></td>
<td><?= $entry['email'] ?></td>
</tr>
<tr class="font-smaller">
<td><i class="font-color-grey"><?= __('Zwischensumme') ?>:</i></td>
<td><i class="font-color-grey"><?= $this->element('printEuro', ['number' => $ownEuroSum]) ?></i></td>
<td></td>
<td><i class="font-color-grey"><?= $this->element('printGDT', ['number' => $ownGdtSum]) ?></i></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
@ -113,6 +141,8 @@ foreach($gdtSumPerEmail as $email => $gdt) {
<?php foreach($connectEntries as $entry) :
$elopageTransaction = $entry['connect']['elopage_transaction'];
$gdtEntry = $entry['connect']['gdt_entry'];
$publisherEuroSum += $gdtEntry['amount'];
$publisherGdtSum += $gdtEntry['gdt'];
?>
<!-- <tr><td colspan="5">
<?= $elopageTransaction['email'] ?>
@ -129,7 +159,12 @@ foreach($gdtSumPerEmail as $email => $gdt) {
<td><?= new FrozenTime($gdtEntry['date']) ?></td>
<td>
<?= $this->element('printEuro', ['number' => $gdtEntry['amount']]) ?>
<?php if($gdtEntry['amount2']) echo ' + ' . $this->element('printEuro', ['number' => $gdtEntry['amount2']]) ?>
<?php
if($gdtEntry['amount2']) {
echo ' + ' . $this->element('printEuro', ['number' => $gdtEntry['amount2']]);
$publisherEuroSum += $gdtEntry['amount2'];
}
?>
</td>
<td>
<?= $this->Number->format($gdtEntry['factor']) ?>
@ -145,6 +180,12 @@ foreach($gdtSumPerEmail as $email => $gdt) {
<?php if($publisher['email'] == $user['email']) break ?>
<?php endforeach; ?>"><?= $elopageTransaction['email'] ?></td>
</tr>
<tr class="font-smaller">
<td><i class="font-color-grey"><?= __('Zwischensumme') ?>:</i></td>
<td><i class="font-color-grey"><?= $this->element('printEuro', ['number' => $publisherEuroSum]) ?></i></td>
<td></td>
<td><i class="font-color-grey"><?= $this->element('printGDT', ['number' => $publisherGdtSum]) ?></i></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>