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

Move Publisher Path into Tooltip for better layout

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2020-05-14 08:14:05 +00:00
parent b6343e8ab2
commit 6e28513077
2 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Controller/StateBalancesController.php
View File

@ -193,7 +193,10 @@ class StateBalancesController extends AppController
//echo "gdtSum: $gdtSum<br>";
$this->set('gdtSum', $gdtSum);
$this->set('ownEntries', $ownEntries);
$this->set('gdtSumPerEmail', $requestResult['data']['gdtSumPerEmail']);
$this->set('moreEntrysAsShown', $requestResult['data']['moreEntrysAsShown']);
$this->set('user', $user);
if(isset($requestResult['data']['publishers'])) {
$publishers = $requestResult['data']['publishers'];
$this->set('publishers', $publishers);

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

@ -24,6 +24,10 @@ function publisherLink($publisher, $the) {
}
$this->assign('title', __('GDT Kontoübersicht'));
$gdtSumFromEmails = 0;
foreach($gdtSumPerEmail as $email => $gdt) {
$gdtSumFromEmails += $gdt;
}
?>
<div class="row">
<div class="col-md-8 equel-grid">
@ -31,7 +35,10 @@ $this->assign('title', __('GDT Kontoübersicht'));
<div class="grid-body py-3">
<h3><?= __('Zur Verfügung: ') ?></h3>
<?php if($gdtSum > 0) : ?>
<h2><?= $this->element('printGDT', ['number' => $gdtSum]) ?></h2>
<h2><?= $this->element('printGDT', ['number' => $gdtSumFromEmails]) ?></h2>
<?php endif; ?>
<?php if($moreEntrysAsShown) : ?>
<span><?= __('Nur die letzten 100 Einträge werden angezeigt!'); ?></span>
<?php endif; ?>
</div>
</div>
@ -48,20 +55,17 @@ $this->assign('title', __('GDT Kontoübersicht'));
<table class="table table-hover table-sm">
<thead>
<tr class="solid-header">
<th class="pl-4"><?= __('E-Mail') ?></th>
<th><?= __('Datum') ?></th>
<th><?= __('Kommentar') ?></th>
<th><?= __('Euro') ?></th>
<th class="pl-4"><?= __('Euro') ?></th>
<th><?= __('Factor')?></th>
<th><?= __('GDT') ?></th>
<th><?= __('Datum') ?></th>
<th><?= __('Kommentar') ?></th>
<th><?= __('E-Mail') ?></th>
</tr>
</thead>
<tbody>
<?php foreach($ownEntries as $entry) : ?>
<tr>
<td><?= $entry['email'] ?></td>
<td><?= new FrozenTime($entry['date']) ?></td>
<td><?= h($entry['comment']) ?></td>
<td>
<?= $this->element('printEuro', ['number' => $entry['amount']]); ?>
<?php if($entry['amount2']) echo ' + ' . $this->element('printEuro', ['number' => $entry['amount2']]) ?>
@ -73,6 +77,9 @@ $this->assign('title', __('GDT Kontoübersicht'));
<?php endif; ?>
</td>
<td><?= $this->element('printGDT', ['number' => $entry['gdt']]) ?></td>
<td><?= new FrozenTime($entry['date']) ?></td>
<td><?= h($entry['comment']) ?></td>
<td><?= $entry['email'] ?></td>
</tr>
<?php endforeach; ?>
</tbody>
@ -94,10 +101,11 @@ $this->assign('title', __('GDT Kontoübersicht'));
<thead>
<tr class="solid-header">
<!--<th class="pl-4"><?= __('Einzahlender') ?></th>-->
<th class="pl-4"><?= __('Datum') ?></th>
<th><?= __('Euro') ?></th>
<th><?= __('Factor')?></th>
<th><?= __('GDT') ?></th>
<th class="pl-4"><?= __('Euro') ?></th>
<th><?= __('Factor') ?></th>
<th><?= __('GDT')?></th>
<th><?= __('Datum') ?></th>
<th><?= __('E-Mail') ?></th>
</tr>
</thead>
<tbody>
@ -105,14 +113,16 @@ $this->assign('title', __('GDT Kontoübersicht'));
$elopageTransaction = $entry['connect']['elopage_transaction'];
$gdtEntry = $entry['connect']['gdt_entry'];
?>
<tr><td colspan="5">
<!-- <tr><td colspan="5">
<?= $elopageTransaction['email'] ?>
<?php foreach($entry['publishersPath'] as $c => $publisher) : ?>
->
<?= publisherLink($publisher, $this) ?>
<?php endforeach; ?>
</td>
</tr>
</tr>-->
<tr>
<!--<td><?= h($elopageTransaction['email']) ?></td>-->
<td><?= new FrozenTime($gdtEntry['date']) ?></td>
@ -127,6 +137,12 @@ $this->assign('title', __('GDT Kontoübersicht'));
<?php endif; ?>
</td>
<td><?= $this->element('printGDT', ['number' => $gdtEntry['gdt']]) ?></td>
<td data-tippy-content="<?= $elopageTransaction['email'] ?>
<?php foreach($entry['publishersPath'] as $c => $publisher) : ?>
-><br>
<?= publisherLink($publisher, $this) ?>
<?php if($publisher['email'] == $user['email']) break ?>
<?php endforeach; ?>"><?= $elopageTransaction['email'] ?></td>
</tr>
<?php endforeach; ?>
</tbody>
@ -136,4 +152,13 @@ $this->assign('title', __('GDT Kontoübersicht'));
</div>
</div>
<?php endif; ?>
<?= $this->Html->css(['gdt.css']) ?>
<?= $this->Html->css(['gdt.css']) ?>
<?= $this->Html->script(['basic', 'popper.min', 'tippy-bundle.umd.min']) ?>
<script type="text/javascript">
domIsReady(function() {
tippy('[data-tippy-content]', {
placement: 'top-start',
allowHTML: true,
});
});
</script>