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

ui fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-07 17:31:41 +00:00
parent 00fbc1011c
commit a554e0ff2d
6 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ return [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesList',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -33,6 +34,7 @@ return [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesExpenseCreate',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
@ -44,6 +46,7 @@ return [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesExpense',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -55,6 +58,7 @@ return [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesElement',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -66,6 +70,7 @@ return [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesElementCreate',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
@ -77,6 +82,7 @@ return [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesTypeList',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -88,6 +94,7 @@ return [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesType',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -99,6 +106,7 @@ return [
[
'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesTypeCreate',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,

4
Controller/ApiController.php
View File

@ -1001,7 +1001,7 @@ final class ApiController extends Controller
}
/**
* Api method to create item files
* Api method to create Note
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
@ -1039,7 +1039,7 @@ final class ApiController extends Controller
}
/**
* Validate item note create request
* Validate note create request
*
* @param RequestAbstract $request Request
*

39
Controller/BackendController.php
View File

@ -15,6 +15,7 @@ declare(strict_types=1);
namespace Modules\BusinessExpenses\Controller;
use Modules\BusinessExpenses\Models\ExpenseMapper;
use Modules\BusinessExpenses\Models\ExpenseTypeMapper;
use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
@ -78,7 +79,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-view');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001001001, $request, $response);
$expense = ExpenseMapper::get()
$view->data['expense'] = ExpenseMapper::get()
->with('from')
->with('notes')
->with('elements')
@ -87,8 +88,6 @@ final class BackendController extends Controller
->where('id', (int) $request->getData('id'))
->execute();
$view->data['expense'] = $expense;
$view->data['expense-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response);
return $view;
@ -113,12 +112,16 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-view');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001001001, $request, $response);
$expense = ExpenseMapper::get()
$view->data['expense'] = ExpenseMapper::get()
->with('from')
->with('notes')
->with('elements')
->with('elements/type')
->with('elements/type/l11n')
->where('id', (int) $request->getData('id'))
->execute();
$view->data['expense'] = $expense;
$view->data['expense-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response);
return $view;
}
@ -139,16 +142,14 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-view');
$view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-type-list');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001001001, $request, $response);
$expense = ExpenseMapper::get()
->with('from')
->where('id', (int) $request->getData('id'))
$view->data['types'] = ExpenseTypeMapper::getAll()
->with('l11n')
->where('l11n/language', $request->header->l11n->language)
->execute();
$view->data['expense'] = $expense;
return $view;
}
@ -171,13 +172,12 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-view');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001001001, $request, $response);
$expense = ExpenseMapper::get()
->with('from')
$view->data['type'] = ExpenseTypeMapper::get()
->with('l11n')
->where('id', (int) $request->getData('id'))
->where('l11n/language', $request->header->l11n->language)
->execute();
$view->data['expense'] = $expense;
return $view;
}
@ -197,16 +197,9 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-view');
$view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-type-view');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001001001, $request, $response);
$expense = ExpenseMapper::get()
->with('from')
->where('id', (int) $request->getData('id'))
->execute();
$view->data['expense'] = $expense;
return $view;
}
}

2
Models/ExpenseElementTypeMapper.php
View File

@ -18,7 +18,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
use phpOMS\Localization\BaseStringL11nType;
/**
* Item mapper class.
* ExpenseElementType mapper class.
*
* @package Modules\BusinessExpenses\Models
* @license OMS License 2.0

2
Models/ExpenseTypeMapper.php
View File

@ -18,7 +18,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
use phpOMS\Localization\BaseStringL11nType;
/**
* Item mapper class.
* ExpenseType mapper class.
*
* @package Modules\BusinessExpenses\Models
* @license OMS License 2.0

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

@ -265,9 +265,9 @@ echo $this->data['nav']->render(); ?>
<td><?= $session->start->format('H:i'); ?>
<td><?= (int) ($session->getBreak() / 3600); ?>h <?= ((int) ($session->getBreak() / 60) % 60); ?>m
<td><?= $session->getEnd() !== null ? $session->getEnd()->format('H:i') : ''; ?>
<td><?= (int) ($session->getBusy() / 3600); ?>h <?= ((int) ($session->getBusy() / 60) % 60); ?>m
<td><?= (int) ($session->busy / 3600); ?>h <?= ((int) ($session->busy / 60) % 60); ?>m
<?php
$busy['week'] += $session->getBusy();
$busy['week'] += $session->busy;
if ($session->start->getTimestamp() < $startWeek->getTimestamp()
|| $count === $sessionCount
) : ?>
@ -281,7 +281,7 @@ echo $this->data['nav']->render(); ?>
endif;
?>
<?php
$busy['month'] += $session->getBusy();
$busy['month'] += $session->busy;
if ($session->start->getTimestamp() < $startMonth->getTimestamp()
|| $count === $sessionCount
) : ?>