Jingga/oms-BusinessExpenses
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-BusinessExpenses.git synced 2026-01-11 15:18:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

template fixes + bug fixes + style fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-02 21:40:47 +00:00
parent 6272f885fc
commit 00fbc1011c
6 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Admin/Routes/Web/Backend.php
View File

@ -40,7 +40,7 @@ return [
],
],
],
'^/businessexpenses/expense(\?.*$|$)' => [
'^/businessexpenses/expense/view(\?.*$|$)' => [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesExpense',
'verb' => RouteVerb::GET,
@ -51,6 +51,28 @@ return [
],
],
],
'^/businessexpenses/expense/element/view(\?.*$|$)' => [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesElement',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
'state' => PermissionCategory::EXPENSE,
],
],
],
'^/businessexpenses/expense/element/create(\?.*$|$)' => [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesElementCreate',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionCategory::EXPENSE,
],
],
],
'^/businessexpenses/type/list(\?.*$|$)' => [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesTypeList',

2
Controller/BackendController.php
View File

@ -52,7 +52,7 @@ final class BackendController extends Controller
$list = ExpenseMapper::getAll()
->with('from')
->execute();
->executeGetArray();
$view->data['expenses'] = $list;

1
Theme/Backend/Lang/de.lang.php
View File

@ -33,4 +33,5 @@ return ['BusinessExpenses' => [
'Overview' => 'Übersicht',
'Clocking' => 'Zeiterfassung',
'Type' => 'Typ',
'Upload' => 'Hochladen',
]];

1
Theme/Backend/Lang/en.lang.php
View File

@ -33,4 +33,5 @@ return ['BusinessExpenses' => [
'Overview' => 'Overview',
'Clocking' => 'Clocking',
'Type' => 'Type',
'Upload' => 'Upload',
]];

4
Theme/Backend/expense-list.tpl.php
View File

@ -113,8 +113,8 @@ echo $this->data['nav']->render(); ?>
<tbody>
<?php $count = 0;
foreach ($expenses as $key => $value) : ++$count;
$url = UriFactory::build('{/base}/businessexpenses/expense?{?}&id=' . $value->id);
?>
$url = UriFactory::build('{/base}/businessexpenses/expense/view?{?}&id=' . $value->id);
?>
<tr data-href="<?= $url; ?>">
<td>
<td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->id; ?></a>

24
Theme/Backend/expense-view.tpl.php
View File

@ -14,6 +14,7 @@
declare(strict_types=1);
use Modules\BusinessExpenses\Models\NullExpense;
use phpOMS\Uri\UriFactory;
/** @var \phpOMS\Views\View $this */
$expense = $this->getData('expense') ?? new NullExpense();
@ -106,7 +107,14 @@ echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">
<section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Expenses'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="portlet-head">
<?= $this->getHtml('Expenses'); ?>
<i class="g-icon download btn end-xs">download</i>
<div class="end-xs">
<a class="button save" href="<?= UriFactory::build('{/base}/businessexpenses/expense/element/create?id=' . $expense->id); ?>"><?= $this->getHtml('New', '0', '0'); ?></a>
<a class="button" href="<?= UriFactory::build('{/base}/businessexpenses/expense/element/upload?id=' . $expense->id); ?>"><?= $this->getHtml('Upload'); ?></a>
</div>
</div>
<div class="slider">
<table id="iExpenseList" class="default sticky">
<thead>
@ -128,13 +136,15 @@ echo $this->data['nav']->render(); ?>
<td><?= $this->getHtml('End'); ?>
<td class="wf-100"><?= $this->getHtml('Type'); ?>
<tbody>
<?php foreach ($expense->elements as $element) : ?>
<tr>
<?php foreach ($expense->elements as $element) :
$url = UriFactory::build('{/base}/businessexpenses/expense/element/view?{?}&id=' . $element->id);
?>
<tr data-href="<?= $url; ?>">
<td>
<td><?= $element->id; ?>
<td><?= $element->start->format('Y-m-d H:i'); ?>
<td><?= $element->end?->format('Y-m-d H:i'); ?>
<td><?= $this->printHtml($element->type->l11n); ?>
<td><a href="<?= $url; ?>"><?= $element->id; ?></a>
<td><a href="<?= $url; ?>"><?= $element->start->format('Y-m-d H:i'); ?></a>
<td><a href="<?= $url; ?>"><?= $element->end?->format('Y-m-d H:i'); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($element->type->l11n); ?></a>
<?php endforeach; ?>
</table>
</section>