Jingga/oms-ContractManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ContractManagement.git synced 2026-02-16 18:38:41 +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 e6c6140a05
commit 01a6f744a7
5 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Controller/BackendController.php
View File

@ -61,9 +61,9 @@ final class BackendController extends Controller
->limit(25); ->limit(25);
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->data['contracts'] = $mapper->where('id', $request->getDataInt('id') ?? 0, '<')->execute(); $view->data['contracts'] = $mapper->where('id', $request->getDataInt('offset') ?? 0, '<')->execute();
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->data['contracts'] = $mapper->where('id', $request->getDataInt('id') ?? 0, '>')->execute(); $view->data['contracts'] = $mapper->where('id', $request->getDataInt('offset') ?? 0, '>')->execute();
} else { } else {
$view->data['contracts'] = $mapper->where('id', 0, '>')->execute(); $view->data['contracts'] = $mapper->where('id', 0, '>')->execute();
} }
@ -96,9 +96,9 @@ final class BackendController extends Controller
->limit(25); ->limit(25);
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->data['types'] = $mapper->where('id', $request->getDataInt('id') ?? 0, '<')->execute(); $view->data['types'] = $mapper->where('id', $request->getDataInt('offset') ?? 0, '<')->execute();
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->data['types'] = $mapper->where('id', $request->getDataInt('id') ?? 0, '>')->execute(); $view->data['types'] = $mapper->where('id', $request->getDataInt('offset') ?? 0, '>')->execute();
} else { } else {
$view->data['types'] = $mapper->where('id', 0, '>')->execute(); $view->data['types'] = $mapper->where('id', 0, '>')->execute();
} }
@ -172,20 +172,20 @@ final class BackendController extends Controller
->with('account') ->with('account')
->where('parent', (int) $request->getData('id')) ->where('parent', (int) $request->getData('id'))
->sort('createdAt', OrderType::DESC) ->sort('createdAt', OrderType::DESC)
->execute(); ->executeGetArray();
$view->data['contractTypes'] = ContractTypeMapper::getAll() $view->data['contractTypes'] = ContractTypeMapper::getAll()
->with('l11n') ->with('l11n')
->where('l11n/language', $response->header->l11n->language) ->where('l11n/language', $response->header->l11n->language)
->execute(); ->executeGetArray();
$view->data['units'] = UnitMapper::getAll() $view->data['units'] = UnitMapper::getAll()
->execute(); ->executeGetArray();
$view->data['attributeTypes'] = ContractAttributeTypeMapper::getAll() $view->data['attributeTypes'] = ContractAttributeTypeMapper::getAll()
->with('l11n') ->with('l11n')
->where('l11n/language', $response->header->l11n->language) ->where('l11n/language', $response->header->l11n->language)
->execute(); ->executeGetArray();
$view->data['editor'] = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $view->data['editor'] = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response); $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response);

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

@ -13,22 +13,22 @@
declare(strict_types=1); declare(strict_types=1);
return ['ContractManagement' => [ return ['ContractManagement' => [
'Account' => 'Account', 'Account' => 'Account',
'AutoRenewal' => 'Automatische Verlängerung', 'AutoRenewal' => 'Automatische Verlängerung',
'Contract' => 'Vertrag', 'Contract' => 'Vertrag',
'Contracts' => 'Verträge', 'Contracts' => 'Verträge',
'Costs' => 'Kosten', 'Costs' => 'Kosten',
'Description' => 'Beschreibung', 'Description' => 'Beschreibung',
'End' => 'Ende', 'End' => 'Ende',
'Files' => 'Dateien', 'Files' => 'Dateien',
'Name' => 'Name', 'Name' => 'Name',
'Overview' => 'Übersicht', 'Overview' => 'Übersicht',
'Parties' => 'Parteien', 'Parties' => 'Parteien',
'Start' => 'Start', 'Start' => 'Start',
'Termination' => 'Beendigung', 'Termination' => 'Beendigung',
'Title' => 'Titel', 'Title' => 'Titel',
'Type' => 'Typ', 'Type' => 'Typ',
'Unit' => 'Unit', 'Unit' => 'Unit',
'With' => 'Mit', 'With' => 'Mit',
'ContractTypes' => 'Vertragsarten', 'ContractTypes' => 'Vertragsarten',
]]; ]];

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

@ -13,22 +13,22 @@
declare(strict_types=1); declare(strict_types=1);
return ['ContractManagement' => [ return ['ContractManagement' => [
'Account' => 'Account', 'Account' => 'Account',
'AutoRenewal' => 'Auto Renewal', 'AutoRenewal' => 'Auto Renewal',
'Contract' => 'Contract', 'Contract' => 'Contract',
'Contracts' => 'Contracts', 'Contracts' => 'Contracts',
'Costs' => 'Costs', 'Costs' => 'Costs',
'Description' => 'Description', 'Description' => 'Description',
'End' => 'End', 'End' => 'End',
'Files' => 'Files', 'Files' => 'Files',
'Name' => '', 'Name' => '',
'Overview' => 'Overview', 'Overview' => 'Overview',
'Parties' => 'Parties', 'Parties' => 'Parties',
'Start' => 'Start', 'Start' => 'Start',
'Termination' => 'Termination', 'Termination' => 'Termination',
'Title' => 'Title', 'Title' => 'Title',
'Type' => 'Type', 'Type' => 'Type',
'Unit' => 'Unit', 'Unit' => 'Unit',
'With' => 'With', 'With' => 'With',
'ContractTypes' => 'Contract Types', 'ContractTypes' => 'Contract Types',
]]; ]];

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

@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
*/ */
$contracts = $this->data['contracts'] ?? []; $contracts = $this->data['contracts'] ?? [];
$previous = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \reset($contracts)->id . '&ptype=p'; $previous = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&offset=' . \reset($contracts)->id . '&ptype=p';
$next = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \end($contracts)->id . '&ptype=n'; $next = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&offset=' . \end($contracts)->id . '&ptype=n';
$now = new \DateTime('now'); $now = new \DateTime('now');

2
Theme/Backend/contract-type-list.tpl.php
View File

@ -24,7 +24,7 @@ echo $this->data['nav']->render(); ?>
<section class="portlet"> <section class="portlet">
<div class="portlet-head"> <div class="portlet-head">
<?= $this->getHtml('ContractTypes'); ?> <?= $this->getHtml('ContractTypes'); ?>
<a class="button end-xs save" href="<?= UriFactory::build('{/base}/'); ?>contract/type/create"><?= $this->getHtml('New', '0', '0'); ?></a> <a class="button end-xs save" href="<?= UriFactory::build('{/base}/contract/type/create'); ?>"><?= $this->getHtml('New', '0', '0'); ?></a>
<i class="g-icon download btn end-xs">download</i> <i class="g-icon download btn end-xs">download</i>
</div> </div>
<div class="slider"> <div class="slider">