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

update for better state-user/view

Browse Source
This commit is contained in:
root 2020-11-30 09:31:31 +01:00
parent c0c3f40a41
commit b8a4409d6b
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mithril_client

@ -1 +1 @@
Subproject commit 21d4a0a5e9a19f251e26c0ae07ce74be2fa99bbf
Subproject commit f0b1d113cee2a76e9dbb098b315f4acaf38410d0

6
src/Controller/TransactionCreationsController.php
View File

@ -247,9 +247,9 @@ class TransactionCreationsController extends AppController
['AND' => [
'disabled' => 0,
'OR' => [
'LOWER(first_name)' => strtolower($requestData['searchText']),
'LOWER(last_name)' => strtolower($requestData['searchText']),
'LOWER(email)' => strtolower($requestData['searchText'])
'LOWER(first_name) LIKE' => '%'.strtolower($requestData['searchText']).'%',
'LOWER(last_name) LIKE' => '%'.strtolower($requestData['searchText']).'%',
'LOWER(email) LIKE' => '%'.strtolower($requestData['searchText']).'%'
]
]
]

9
src/Template/StateUsers/view.ctp
View File

@ -23,6 +23,7 @@
</nav>
<div class="stateUsers view large-10 medium-9 columns content">
<h3><?= h($stateUser->first_name) ?> <?= h($stateUser->last_name) ?> &lt;<?= h($stateUser->email) ?>&gt;</h3>
<small>Konto-Adresse: <?= h(bin2hex(stream_get_contents($stateUser->public_key))) ?></small>
<div class="related">
<h4><?= __('State Balance') ?></h4>
<?php if (!empty($stateUser->state_balances)): ?>
@ -47,10 +48,11 @@
<div class="related">
<h4><?= __('Schöpfungen') ?></h4>
<?php if (!empty($stateUser->transaction_creations)): ?>
<table cellpadding="0" cellspacing="0">
<table cellpadding="5">
<tr>
<th scope="col"><?= __('Transaction') ?></th>
<th scope="col"><?= __('Erhalten') ?></th>
<th scope="col"><?= __('Verrechnungs-Datum') ?></th>
<th scope="col"><?= __('Betrag') ?></th>
<th scope="col"><?= __('Verwendungszweck') ?></th>
<th scope="col" class="actions"><?= __('Actions') ?></th>
@ -62,6 +64,7 @@
<tr>
<td><?= $this->Html->link(substr($txHash, 0, 12) . '...', ['controller' => 'Transactions', 'action' => 'view', $transactionCreations->transaction_id], ['title' => $txHash] ) ?></td>
<td><?= h($transactionCreations->transaction->received) ?></td>
<td><?= h($transactionCreations->target_date) ?></td>
<td><?= $this->element('printGradido', ['number' =>$transactionCreations->amount]) ?></td>
<td title="<?= $memo ?>"><?= h(substr($memo, 0, 20). '...') ?></td>
<td class="actions">
@ -75,7 +78,7 @@
<div class="related">
<h4><?= __('Versendete Überweisungen') ?></h4>
<?php if (!empty($stateUser->transaction_send_coins)): ?>
<table cellpadding="0" cellspacing="0">
<table cellpadding="5">
<tr>
<th scope="col"><?= __('Überweisung') ?></th>
<th scope="col"><?= __('Erhalten') ?></th>
@ -109,7 +112,7 @@
<div class="related">
<h4><?= __('Empfangende Überweisungen') ?></h4>
<?php if (!empty($stateUser->transaction_received_coins)): ?>
<table cellpadding="0" cellspacing="0">
<table cellpadding="5">
<tr>
<th scope="col"><?= __('Überweisung') ?></th>
<th scope="col"><?= __('Erhalten') ?></th>

2
src/protobuf

@ -1 +1 @@
Subproject commit 81a461566e46d71533dc3e284fa075d7d68fd020
Subproject commit 9004e6978ac3dafcc635b2ffcf8bc6a156451cca