From bad7cae26e7b15618af627b203f99fe9ccf5f60a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 24 Mar 2023 16:20:24 +0100 Subject: [PATCH] registration fixes --- Admin/Install/Admin.install.php | 2 +- Admin/Install/Admin.php | 4 +- Admin/Install/Media.php | 4 +- Admin/Install/Media/letter.doc.php | 2 +- Admin/Install/Media/letter.pdf.php | 2 +- Admin/Install/Navigation.install.json | 20 +-- Admin/Install/Navigation.php | 4 +- Admin/Installer.php | 4 +- Admin/Routes/Web/Api.php | 2 +- Admin/Routes/Web/Backend.php | 2 +- Admin/Status.php | 4 +- Admin/Uninstaller.php | 4 +- Admin/Updater.php | 4 +- Controller/ApiController.php | 143 ++++++++++-------- Controller/BackendController.php | 23 +-- Controller/Controller.php | 4 +- Models/AttributeValueType.php | 4 +- Models/Department.php | 4 +- Models/DepartmentMapper.php | 4 +- Models/NullDepartment.php | 4 +- Models/NullPosition.php | 4 +- Models/NullUnit.php | 4 +- Models/NullUnitAttribute.php | 4 +- Models/NullUnitAttributeType.php | 4 +- Models/NullUnitAttributeValue.php | 4 +- Models/PermissionCategory.php | 4 +- Models/Position.php | 4 +- Models/PositionMapper.php | 4 +- Models/SettingsEnum.php | 4 +- Models/Status.php | 4 +- Models/Unit.php | 8 +- Models/UnitAttribute.php | 4 +- Models/UnitAttributeMapper.php | 4 +- Models/UnitAttributeType.php | 6 +- Models/UnitAttributeTypeL11nMapper.php | 4 +- Models/UnitAttributeTypeMapper.php | 4 +- Models/UnitAttributeValue.php | 6 +- Models/UnitAttributeValueL11nMapper.php | 4 +- Models/UnitAttributeValueMapper.php | 4 +- Models/UnitMapper.php | 4 +- .../DepartmentTagSelectorPopupView.php | 4 +- .../DepartmentTagSelectorView.php | 4 +- .../department-selector.tpl.php | 4 +- .../PositionTagSelectorPopupView.php | 4 +- .../PositionTagSelectorView.php | 4 +- .../position-selector.tpl.php | 4 +- .../UnitTagSelectorPopupView.php | 4 +- .../UnitTagSelector/UnitTagSelectorView.php | 4 +- Theme/Backend/Lang/Navigation.ar.lang.php | 2 +- Theme/Backend/Lang/Navigation.cs.lang.php | 2 +- Theme/Backend/Lang/Navigation.da.lang.php | 2 +- Theme/Backend/Lang/Navigation.de.lang.php | 2 +- Theme/Backend/Lang/Navigation.el.lang.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 2 +- Theme/Backend/Lang/Navigation.es.lang.php | 2 +- Theme/Backend/Lang/Navigation.fi.lang.php | 2 +- Theme/Backend/Lang/Navigation.fr.lang.php | 2 +- Theme/Backend/Lang/Navigation.hu.lang.php | 2 +- Theme/Backend/Lang/Navigation.it.lang.php | 2 +- Theme/Backend/Lang/Navigation.ja.lang.php | 2 +- Theme/Backend/Lang/Navigation.ko.lang.php | 2 +- Theme/Backend/Lang/Navigation.no.lang.php | 2 +- Theme/Backend/Lang/Navigation.pl.lang.php | 2 +- Theme/Backend/Lang/Navigation.pt.lang.php | 2 +- Theme/Backend/Lang/Navigation.ru.lang.php | 2 +- Theme/Backend/Lang/Navigation.sv.lang.php | 2 +- Theme/Backend/Lang/Navigation.th.lang.php | 2 +- Theme/Backend/Lang/Navigation.tr.lang.php | 2 +- Theme/Backend/Lang/Navigation.uk.lang.php | 2 +- Theme/Backend/Lang/Navigation.zh.lang.php | 2 +- Theme/Backend/Lang/ar.lang.php | 2 +- Theme/Backend/Lang/cs.lang.php | 2 +- Theme/Backend/Lang/da.lang.php | 2 +- Theme/Backend/Lang/de.lang.php | 2 +- Theme/Backend/Lang/el.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/Lang/es.lang.php | 2 +- Theme/Backend/Lang/fi.lang.php | 2 +- Theme/Backend/Lang/fr.lang.php | 2 +- Theme/Backend/Lang/hu.lang.php | 2 +- Theme/Backend/Lang/it.lang.php | 2 +- Theme/Backend/Lang/ja.lang.php | 2 +- Theme/Backend/Lang/ko.lang.php | 2 +- Theme/Backend/Lang/no.lang.php | 2 +- Theme/Backend/Lang/pl.lang.php | 2 +- Theme/Backend/Lang/pt.lang.php | 2 +- Theme/Backend/Lang/ru.lang.php | 2 +- Theme/Backend/Lang/sv.lang.php | 2 +- Theme/Backend/Lang/th.lang.php | 2 +- Theme/Backend/Lang/tr.lang.php | 2 +- Theme/Backend/Lang/uk.lang.php | 2 +- Theme/Backend/Lang/zh.lang.php | 2 +- Theme/Backend/department-create.tpl.php | 2 +- Theme/Backend/department-list.tpl.php | 8 +- Theme/Backend/department-profile.tpl.php | 2 +- Theme/Backend/organigram.tpl.php | 2 +- Theme/Backend/position-create.tpl.php | 2 +- Theme/Backend/position-list.tpl.php | 10 +- Theme/Backend/position-profile.tpl.php | 2 +- Theme/Backend/unit-create.tpl.php | 2 +- Theme/Backend/unit-list.tpl.php | 10 +- Theme/Backend/unit-profile.tpl.php | 2 +- tests/Admin/AdminTest.php | 2 +- tests/Autoloader.php | 4 +- tests/Controller/ApiControllerTest.php | 2 +- tests/Models/DepartmentMapperTest.php | 2 +- tests/Models/DepartmentTest.php | 2 +- tests/Models/NullDepartmentTest.php | 2 +- tests/Models/NullPositionTest.php | 2 +- tests/Models/NullUnitTest.php | 2 +- tests/Models/PositionMapperTest.php | 2 +- tests/Models/PositionTest.php | 2 +- tests/Models/UnitMapperTest.php | 2 +- tests/Models/UnitTest.php | 2 +- 114 files changed, 267 insertions(+), 253 deletions(-) diff --git a/Admin/Install/Admin.install.php b/Admin/Install/Admin.install.php index 8513b80..31cb18c 100755 --- a/Admin/Install/Admin.install.php +++ b/Admin/Install/Admin.install.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Admin/Install/Admin.php b/Admin/Install/Admin.php index 16150bb..66ee08a 100755 --- a/Admin/Install/Admin.php +++ b/Admin/Install/Admin.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Admin\Install * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract; * Admin class. * * @package Modules\Organization\Admin\Install - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php index e0c5d8d..378cc17 100755 --- a/Admin/Install/Media.php +++ b/Admin/Install/Media.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Admin\Install * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract; * Media class. * * @package Modules\Organization\Admin\Install - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Media/letter.doc.php b/Admin/Install/Media/letter.doc.php index b7a300a..d55cfe6 100755 --- a/Admin/Install/Media/letter.doc.php +++ b/Admin/Install/Media/letter.doc.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Admin/Install/Media/letter.pdf.php b/Admin/Install/Media/letter.pdf.php index b7a300a..d55cfe6 100755 --- a/Admin/Install/Media/letter.pdf.php +++ b/Admin/Install/Media/letter.pdf.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index b91d721..9554f48 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -19,7 +19,7 @@ "type": 2, "subtype": 1, "name": "Organigram", - "uri": "{/lang}/{/app}/organization/organigram?{?}", + "uri": "{/base}/organization/organigram?{?}", "target": "self", "icon": null, "order": 1, @@ -38,7 +38,7 @@ "type": 2, "subtype": 1, "name": "Units", - "uri": "{/lang}/{/app}/organization/unit/list", + "uri": "{/base}/organization/unit/list", "target": "self", "icon": null, "order": 5, @@ -52,7 +52,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/{/app}/organization/unit/list", + "uri": "{/base}/organization/unit/list", "target": "self", "icon": null, "order": 5, @@ -67,7 +67,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/{/app}/organization/unit/create?{?}", + "uri": "{/base}/organization/unit/create?{?}", "target": "self", "icon": null, "order": 25, @@ -84,7 +84,7 @@ "type": 2, "subtype": 1, "name": "Departments", - "uri": "{/lang}/{/app}/organization/department/list", + "uri": "{/base}/organization/department/list", "target": "self", "icon": null, "order": 10, @@ -98,7 +98,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/{/app}/organization/department/list", + "uri": "{/base}/organization/department/list", "target": "self", "icon": null, "order": 5, @@ -113,7 +113,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/{/app}/organization/department/create?{?}", + "uri": "{/base}/organization/department/create?{?}", "target": "self", "icon": null, "order": 25, @@ -130,7 +130,7 @@ "type": 2, "subtype": 1, "name": "Positions", - "uri": "{/lang}/{/app}/organization/position/list", + "uri": "{/base}/organization/position/list", "target": "self", "icon": null, "order": 20, @@ -144,7 +144,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/{/app}/organization/position/list", + "uri": "{/base}/organization/position/list", "target": "self", "icon": null, "order": 5, @@ -159,7 +159,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/{/app}/organization/position/create?{?}", + "uri": "{/base}/organization/position/create?{?}", "target": "self", "icon": null, "order": 25, diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 55583e4..1e35f67 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Admin\Install * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract; * Navigation class. * * @package Modules\Organization\Admin\Install - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Installer.php b/Admin/Installer.php index afeae49..6263688 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -28,7 +28,7 @@ use phpOMS\Uri\HttpUri; * Installer class. * * @package Modules\Organization\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 9edbb18..7986e89 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -6,7 +6,7 @@ * * @package Modules * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 7c00e53..1eadc93 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -6,7 +6,7 @@ * * @package Modules * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Admin/Status.php b/Admin/Status.php index 2e538aa..f3b4402 100755 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\StatusAbstract; * Status class. * * @package Modules\Organization\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php index 82fb825..a17d000 100755 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\UninstallerAbstract; * Uninstaller class. * * @package Modules\Organization\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Updater.php b/Admin/Updater.php index 15f1a04..f7b5a6b 100755 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\System\File\Local\Directory; * Navigation class. * * @package Modules\Organization\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/ApiController.php b/Controller/ApiController.php index f787c04..630c00f 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -60,7 +60,7 @@ use phpOMS\Utils\Parser\Markdown\Markdown; * Organization Controller class. * * @package Modules\Organization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -84,7 +84,7 @@ final class ApiController extends Controller && !\is_numeric($request->getData('parent')) )) || ($val['status'] = ( - $request->getData('status') === null + !$request->hasData('status') || !Status::isValidValue((int) $request->getData('status')) )) ) { @@ -153,7 +153,7 @@ final class ApiController extends Controller $parent = (int) $request->getData('parent'); $unit->parent = !empty($parent) ? new NullUnit($parent) : $unit->parent; - $unit->setStatus((int) ($request->getData('status') ?? $unit->getStatus())); + $unit->setStatus($request->getDataInt('status') ?? $unit->getStatus()); return $unit; } @@ -259,12 +259,12 @@ final class ApiController extends Controller } /** @var Unit $unit */ - $unit = UnitMapper::get()->with('mainAddress')->where('id', $request->getData('unit'))->execute(); + $unit = UnitMapper::get()->with('mainAddress')->where('id', $request->getData('unit'))->execute(); $oldUnit = clone $unit; if ($unit->mainAddress->getId() !== 0) { $oldAddr = clone $unit->mainAddress; - $addr = $this->updateUnitMainAddressFromRequest($request, $unit); + $addr = $this->updateUnitMainAddressFromRequest($request, $unit); $this->updateModel($request->header->account, $oldAddr, $addr, AddressMapper::class, 'address', $request->getOrigin()); } else { @@ -311,12 +311,12 @@ final class ApiController extends Controller private function createUnitMainAddressFromRequest(RequestAbstract $request) : Address { $addr = new Address(); - $addr->name = (string) ($request->getData('legal') ?? ''); - $addr->address = (string) ($request->getData('address') ?? ''); - $addr->postal = (string) ($request->getData('postal') ?? ''); - $addr->city = (string) ($request->getData('city') ?? ''); - $addr->setCountry($request->getData('country') ?? ISO3166TwoEnum::_XXX); - $addr->state = (string) ($request->getData('state') ?? ''); + $addr->name = $request->getDataString('legal') ?? ''; + $addr->address = $request->getDataString('address') ?? ''; + $addr->postal = $request->getDataString('postal') ?? ''; + $addr->city = $request->getDataString('city') ?? ''; + $addr->state = $request->getDataString('state') ?? ''; + $addr->setCountry($request->getDataString('country') ?? ISO3166TwoEnum::_XXX); return $addr; } @@ -333,12 +333,12 @@ final class ApiController extends Controller private function updateUnitMainAddressFromRequest(RequestAbstract $request, Unit $unit) : Address { $addr = $unit->mainAddress; - $addr->name = (string) ($request->getData('legal') ?? ''); - $addr->address = (string) ($request->getData('address') ?? ''); - $addr->postal = (string) ($request->getData('postal') ?? ''); - $addr->city = (string) ($request->getData('city') ?? ''); - $addr->setCountry($request->getData('country') ?? ISO3166TwoEnum::_XXX); - $addr->state = (string) ($request->getData('state') ?? ''); + $addr->name = $request->getDataString('legal') ?? ''; + $addr->address = $request->getDataString('address') ?? ''; + $addr->postal = $request->getDataString('postal') ?? ''; + $addr->city = $request->getDataString('city') ?? ''; + $addr->state = $request->getDataString('state') ?? ''; + $addr->setCountry($request->getDataString('country') ?? ISO3166TwoEnum::_XXX); return $addr; } @@ -356,20 +356,21 @@ final class ApiController extends Controller { $unit = new Unit(); $unit->name = (string) $request->getData('name'); - $unit->descriptionRaw = (string) ($request->getData('description') ?? ''); - $unit->description = Markdown::parse((string) ($request->getData('description') ?? '')); + $unit->descriptionRaw = $request->getDataString('description') ?? ''; + $unit->description = Markdown::parse($request->getDataString('description') ?? ''); $unit->parent = new NullUnit((int) $request->getData('parent')); $unit->setStatus((int) $request->getData('status')); if ($request->hasData('address')) { $addr = new Address(); - $addr->name = (string) ($request->getData('legal') ?? ($request->getData('name') ?? '')); - $addr->address = (string) ($request->getData('address') ?? ''); - $addr->postal = (string) ($request->getData('postal') ?? ''); - $addr->city = (string) ($request->getData('city') ?? ''); - $addr->setCountry($request->getData('country') ?? ISO3166TwoEnum::_XXX); - $addr->state = (string) ($request->getData('state') ?? ''); + $addr->name = $request->getDataString('legal') ?? ($request->getDataString('name') ?? ''); + $addr->address = $request->getDataString('address') ?? ''; + $addr->postal = $request->getDataString('postal') ?? ''; + $addr->city = $request->getDataString('city') ?? ''; + $addr->state = $request->getDataString('state') ?? ''; + $addr->setCountry($request->getDataString('country') ?? ISO3166TwoEnum::_XXX); + $unit->mainAddress = $addr; } @@ -400,7 +401,7 @@ final class ApiController extends Controller } /** @var Unit $unit */ - $unit = UnitMapper::get()->where('id', (int) ($request->getData('id') ?? 0))->execute(); + $unit = UnitMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $old = clone $unit; $path = '/Modules/Organization/' . $unit->name; @@ -439,7 +440,7 @@ final class ApiController extends Controller && !\is_numeric($request->getData('parent')) )) || ($val['status'] = ( - $request->getData('status') === null + !$request->hasData('status') || !Status::isValidValue((int) $request->getData('status')) )) ) { @@ -532,7 +533,7 @@ final class ApiController extends Controller $department = (int) $request->getData('department'); $position->department = !empty($department) ? new NullDepartment($department) : $position->department; - $position->setStatus((int) ($request->getData('status') ?? $position->getStatus())); + $position->setStatus($request->getDataInt('status') ?? $position->getStatus()); return $position; } @@ -589,8 +590,8 @@ final class ApiController extends Controller $position = new Position(); $position->name = (string) ($request->getData('name')); $position->setStatus((int) $request->getData('status')); - $position->descriptionRaw = (string) ($request->getData('description') ?? ''); - $position->description = Markdown::parse((string) ($request->getData('description') ?? '')); + $position->descriptionRaw = $request->getDataString('description') ?? ''; + $position->description = Markdown::parse($request->getDataString('description') ?? ''); $position->parent = new NullPosition((int) $request->getData('parent')); $position->department = new NullDepartment((int) $request->getData('department')); @@ -683,7 +684,7 @@ final class ApiController extends Controller $parent = (int) $request->getData('parent'); $department->parent = !empty($parent) ? new NullDepartment($parent) : $department->parent; - $department->setStatus((int) ($request->getData('status') ?? $department->getStatus())); + $department->setStatus($request->getDataInt('status') ?? $department->getStatus()); $unit = (int) $request->getData('unit'); $department->unit = !empty($unit) ? new NullUnit($unit) : $department->unit; @@ -767,9 +768,9 @@ final class ApiController extends Controller $department->setStatus((int) $request->getData('status')); $department->parent = new NullDepartment((int) $request->getData('parent')); - $department->unit = new NullUnit((int) ($request->getData('unit') ?? 1)); - $department->descriptionRaw = (string) ($request->getData('description') ?? ''); - $department->description = Markdown::parse((string) ($request->getData('description') ?? '')); + $department->unit = new NullUnit($request->getDataInt('unit') ?? 1); + $department->descriptionRaw = $request->getDataString('description') ?? ''; + $department->description = Markdown::parse($request->getDataString('description') ?? ''); return $department; } @@ -789,12 +790,15 @@ final class ApiController extends Controller */ public function apiUnitFind(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { + /** @var \Modules\Organization\Models\Unit[] $units */ + $units = UnitMapper::getAll() + ->where('name', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE') + ->execute(); + $response->header->set('Content-Type', MimeType::M_JSON, true); $response->set( $request->uri->__toString(), - \array_values( - UnitMapper::getAll()->where('name', '%' . ($request->getData('search') ?? '') . '%', 'LIKE')->execute() - ) + \array_values($units) ); } @@ -813,12 +817,15 @@ final class ApiController extends Controller */ public function apiDepartmentFind(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { + /** @var \Modules\Organization\Models\Department[] $departments */ + $departments = DepartmentMapper::getAll() + ->where('name', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE') + ->execute(); + $response->header->set('Content-Type', MimeType::M_JSON, true); $response->set( $request->uri->__toString(), - \array_values( - DepartmentMapper::getAll()->where('name', '%' . ($request->getData('search') ?? '') . '%', 'LIKE')->execute() - ) + \array_values($departments) ); } @@ -837,12 +844,15 @@ final class ApiController extends Controller */ public function apiPositionFind(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { + /** @var \Modules\Organization\Models\Position[] $positions */ + $positions = PositionMapper::getAll() + ->where('name', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE') + ->execute(); + $response->header->set('Content-Type', MimeType::M_JSON, true); $response->set( $request->uri->__toString(), - \array_values( - PositionMapper::getAll()->where('name', '%' . ($request->getData('search') ?? '') . '%', 'LIKE')->execute() - ) + \array_values($positions) ); } @@ -889,7 +899,7 @@ final class ApiController extends Controller $attribute->unit = (int) $request->getData('unit'); $attribute->type = new NullUnitAttributeType((int) $request->getData('type')); - if ($request->getData('value') !== null) { + if ($request->hasData('value')) { $attribute->value = new NullUnitAttributeValue((int) $request->getData('value')); } else { $newRequest = clone $request; @@ -964,11 +974,11 @@ final class ApiController extends Controller private function createUnitAttributeTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n { $attrL11n = new BaseStringL11n(); - $attrL11n->ref = (int) ($request->getData('type') ?? 0); - $attrL11n->setLanguage((string) ( - $request->getData('language') ?? $request->getLanguage() - )); - $attrL11n->content = (string) ($request->getData('title') ?? ''); + $attrL11n->ref = $request->getDataInt('type') ?? 0; + $attrL11n->setLanguage( + $request->getDataString('language') ?? $request->getLanguage() + ); + $attrL11n->content = $request->getDataString('title') ?? ''; return $attrL11n; } @@ -1033,13 +1043,13 @@ final class ApiController extends Controller */ private function createUnitAttributeTypeFromRequest(RequestAbstract $request) : UnitAttributeType { - $attrType = new UnitAttributeType($request->getData('name') ?? ''); - $attrType->datatype = (int) ($request->getData('datatype') ?? 0); - $attrType->custom = (bool) ($request->getData('custom') ?? false); + $attrType = new UnitAttributeType($request->getDataString('name') ?? ''); + $attrType->datatype = $request->getDataInt('datatype') ?? 0; + $attrType->custom = $request->getDataBool('custom') ?? false; $attrType->isRequired = (bool) ($request->getData('is_required') ?? false); - $attrType->validationPattern = (string) ($request->getData('validation_pattern') ?? ''); - $attrType->setL11n((string) ($request->getData('title') ?? ''), $request->getData('language') ?? ISO639x1Enum::_EN); - $attrType->setFields((int) ($request->getData('fields') ?? 0)); + $attrType->validationPattern = $request->getDataString('validation_pattern') ?? ''; + $attrType->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN); + $attrType->setFields($request->getDataInt('fields') ?? 0); return $attrType; } @@ -1115,15 +1125,18 @@ final class ApiController extends Controller { /** @var UnitAttributeType $type */ $type = UnitAttributeTypeMapper::get() - ->where('id', (int) ($request->getData('type') ?? 0)) + ->where('id', $request->getDataInt('type') ?? 0) ->execute(); $attrValue = new UnitAttributeValue(); - $attrValue->isDefault = (bool) ($request->getData('default') ?? false); + $attrValue->isDefault = $request->getDataBool('default') ?? false; $attrValue->setValue($request->getData('value'), $type->datatype); - if ($request->getData('title') !== null) { - $attrValue->setL11n($request->getData('title'), $request->getData('language') ?? ISO639x1Enum::_EN); + if ($request->hasData('title')) { + $attrValue->setL11n( + $request->getDataString('title') ?? '', + $request->getDataString('language') ?? ISO639x1Enum::_EN + ); } return $attrValue; @@ -1189,11 +1202,11 @@ final class ApiController extends Controller private function createUnitAttributeValueL11nFromRequest(RequestAbstract $request) : BaseStringL11n { $attrL11n = new BaseStringL11n(); - $attrL11n->ref = (int) ($request->getData('value') ?? 0); - $attrL11n->setLanguage((string) ( - $request->getData('language') ?? $request->getLanguage() - )); - $attrL11n->content = (string) ($request->getData('title') ?? ''); + $attrL11n->ref = $request->getDataInt('value') ?? 0; + $attrL11n->setLanguage( + $request->getDataString('language') ?? $request->getLanguage() + ); + $attrL11n->content = $request->getDataString('title') ?? ''; return $attrL11n; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index b6ba980..9c47870 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -30,7 +30,7 @@ use phpOMS\Views\View; * Organization Controller class. * * @package Modules\Organization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore @@ -62,9 +62,9 @@ final class BackendController extends Controller ->limit(25); if ($request->getData('ptype') === 'p') { - $view->setData('units', $mapper->where('id', (int) ($request->getData('id') ?? 0), '<')->execute()); + $view->setData('units', $mapper->where('id', $request->getDataInt('id') ?? 0, '<')->execute()); } elseif ($request->getData('ptype') === 'n') { - $view->setData('units', $mapper->where('id', (int) ($request->getData('id') ?? 0), '>')->execute()); + $view->setData('units', $mapper->where('id', $request->getDataInt('id') ?? 0, '>')->execute()); } else { $view->setData('units', $mapper->where('id', 0, '>')->execute()); } @@ -253,16 +253,17 @@ final class BackendController extends Controller $mapper = DepartmentMapper::getAll()->with('parent')->with('unit')->limit($pageLimit + 1); - /** @var \Modules\Organization\Models\Department[] $departments */ - $departments = []; if ($request->getData('ptype') === 'p') { - $departments = $mapper->where('id', (int) ($request->getData('id') ?? 0), '<')->execute(); + $mapper->where('id', $request->getDataInt('id') ?? 0, '<'); } elseif ($request->getData('ptype') === 'n') { - $departments = $mapper->where('id', (int) ($request->getData('id') ?? 0), '>')->execute(); + $mapper->where('id', $request->getDataInt('id') ?? 0, '>'); } else { - $departments = $mapper->where('id', 0, '>')->execute(); + $mapper->where('id', 0, '>'); } + /** @var \Modules\Organization\Models\Department[] $departments */ + $departments = $mapper->execute(); + $view->setData('hasMore', ($count = \count($departments)) > $pageLimit); if ($count > $pageLimit) { @@ -357,9 +358,9 @@ final class BackendController extends Controller $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response)); if ($request->getData('ptype') === 'p') { - $view->setData('positions', PositionMapper::getAll()->with('parent')->with('department')->where('id', (int) ($request->getData('id') ?? 0), '<')->limit(25)->execute()); + $view->setData('positions', PositionMapper::getAll()->with('parent')->with('department')->where('id', $request->getDataInt('id') ?? 0, '<')->limit(25)->execute()); } elseif ($request->getData('ptype') === 'n') { - $view->setData('positions', PositionMapper::getAll()->with('parent')->with('department')->where('id', (int) ($request->getData('id') ?? 0), '>')->limit(25)->execute()); + $view->setData('positions', PositionMapper::getAll()->with('parent')->with('department')->where('id', $request->getDataInt('id') ?? 0, '>')->limit(25)->execute()); } else { $view->setData('positions', PositionMapper::getAll()->with('parent')->with('department')->where('id', 0, '>')->limit(25)->execute()); } diff --git a/Controller/Controller.php b/Controller/Controller.php index 4772997..2875d10 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\ModuleAbstract; * Organization Controller class. * * @package Modules\Organization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/AttributeValueType.php b/Models/AttributeValueType.php index d300f2b..e986910 100755 --- a/Models/AttributeValueType.php +++ b/Models/AttributeValueType.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Attribute value type enum. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Department.php b/Models/Department.php index 2cc02e7..5aa6913 100755 --- a/Models/Department.php +++ b/Models/Department.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Organization\Models; * Organization department class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/DepartmentMapper.php b/Models/DepartmentMapper.php index c10c262..c2d037f 100755 --- a/Models/DepartmentMapper.php +++ b/Models/DepartmentMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Organization department mapper class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullDepartment.php b/Models/NullDepartment.php index 3db77b7..b5bce5b 100755 --- a/Models/NullDepartment.php +++ b/Models/NullDepartment.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Organization\Models; * Organization null class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullPosition.php b/Models/NullPosition.php index 5d57734..9012519 100755 --- a/Models/NullPosition.php +++ b/Models/NullPosition.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Organization\Models; * Organization null class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullUnit.php b/Models/NullUnit.php index 2530763..ba0e264 100755 --- a/Models/NullUnit.php +++ b/Models/NullUnit.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use Modules\Media\Models\NullMedia; * Organization null class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullUnitAttribute.php b/Models/NullUnitAttribute.php index 8198732..fa117b7 100755 --- a/Models/NullUnitAttribute.php +++ b/Models/NullUnitAttribute.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Organization\Models; * Null model * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullUnitAttributeType.php b/Models/NullUnitAttributeType.php index e7c5656..54dc339 100755 --- a/Models/NullUnitAttributeType.php +++ b/Models/NullUnitAttributeType.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Organization\Models; * Null model * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullUnitAttributeValue.php b/Models/NullUnitAttributeValue.php index 52239b6..c3b3905 100755 --- a/Models/NullUnitAttributeValue.php +++ b/Models/NullUnitAttributeValue.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Organization\Models; * Null model * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index a6ff61a..274530a 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Permision state enum. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Position.php b/Models/Position.php index 380871d..da75aaa 100755 --- a/Models/Position.php +++ b/Models/Position.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Organization\Models; * Organization position class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/PositionMapper.php b/Models/PositionMapper.php index ae546c5..2733790 100755 --- a/Models/PositionMapper.php +++ b/Models/PositionMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Organization position mapper class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SettingsEnum.php b/Models/SettingsEnum.php index a660b5c..097bfb8 100755 --- a/Models/SettingsEnum.php +++ b/Models/SettingsEnum.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Module settings enum. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Status.php b/Models/Status.php index cd92b5c..cda198e 100755 --- a/Models/Status.php +++ b/Models/Status.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Accept status enum. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Unit.php b/Models/Unit.php index 057d889..05531e1 100755 --- a/Models/Unit.php +++ b/Models/Unit.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use Modules\Media\Models\NullMedia; * Organization unit class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -103,8 +103,8 @@ class Unit implements \JsonSerializable */ public function __construct() { - $this->image = new NullMedia(); - $this->parent = new NullUnit(); + $this->image = new NullMedia(); + $this->parent = new NullUnit(); $this->mainAddress = new NullAddress(); } diff --git a/Models/UnitAttribute.php b/Models/UnitAttribute.php index e5b91c3..dfccd44 100755 --- a/Models/UnitAttribute.php +++ b/Models/UnitAttribute.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Organization\Models; * Unit class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/UnitAttributeMapper.php b/Models/UnitAttributeMapper.php index 10bf132..3f7ee35 100755 --- a/Models/UnitAttributeMapper.php +++ b/Models/UnitAttributeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Unit mapper class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/UnitAttributeType.php b/Models/UnitAttributeType.php index b3eb6a1..1f19c09 100755 --- a/Models/UnitAttributeType.php +++ b/Models/UnitAttributeType.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\ISO639x1Enum; * Unit Attribute Type class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -143,7 +143,7 @@ class UnitAttributeType implements \JsonSerializable if ($l11n instanceof BaseStringL11n) { $this->l11n = $l11n; } elseif (isset($this->l11n) && $this->l11n instanceof BaseStringL11n) { - $this->l11n->content = $l11n; + $this->l11n->content = $l11n; $this->l11n->setLanguage($lang); } else { $this->l11n = new BaseStringL11n(); diff --git a/Models/UnitAttributeTypeL11nMapper.php b/Models/UnitAttributeTypeL11nMapper.php index 8682438..2a160be 100755 --- a/Models/UnitAttributeTypeL11nMapper.php +++ b/Models/UnitAttributeTypeL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n; * Unit mapper class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/UnitAttributeTypeMapper.php b/Models/UnitAttributeTypeMapper.php index 6b49cea..533c339 100755 --- a/Models/UnitAttributeTypeMapper.php +++ b/Models/UnitAttributeTypeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Unit mapper class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/UnitAttributeValue.php b/Models/UnitAttributeValue.php index 862b0b4..c8e8dde 100755 --- a/Models/UnitAttributeValue.php +++ b/Models/UnitAttributeValue.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Localization\ISO639x1Enum; * The relation with the type/bill is defined in the UnitAttribute class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -135,7 +135,7 @@ class UnitAttributeValue implements \JsonSerializable if ($l11n instanceof BaseStringL11n) { $this->l11n = $l11n; } elseif (isset($this->l11n) && $this->l11n instanceof BaseStringL11n) { - $this->l11n->content = $l11n; + $this->l11n->content = $l11n; $this->l11n->setLanguage($lang); } else { $this->l11n = new BaseStringL11n(); diff --git a/Models/UnitAttributeValueL11nMapper.php b/Models/UnitAttributeValueL11nMapper.php index 9840083..9c2819c 100755 --- a/Models/UnitAttributeValueL11nMapper.php +++ b/Models/UnitAttributeValueL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n; * Unit mapper class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/UnitAttributeValueMapper.php b/Models/UnitAttributeValueMapper.php index bd8c653..22f4cf1 100755 --- a/Models/UnitAttributeValueMapper.php +++ b/Models/UnitAttributeValueMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Unit mapper class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/UnitMapper.php b/Models/UnitMapper.php index 2449514..53dd831 100755 --- a/Models/UnitMapper.php +++ b/Models/UnitMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Organization\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Organization unit mapper class. * * @package Modules\Organization\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php index 08320f2..5ab0431 100755 --- a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php +++ b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * Component view. * * @package Modules\Organization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php index 4f4410d..201315c 100755 --- a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php +++ b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * Component view. * * @package Modules\Organization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php b/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php index 8f7ffe8..8d734f6 100755 --- a/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php +++ b/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php @@ -5,9 +5,9 @@ { "key": 1, "listener": "click", "action": [ {"key": 1, "type": "dom.popup", "selector": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "getId(); ?>"}, - {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, {"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1}, - {"key": 4, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 4, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1} ] } diff --git a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php index 9c1bb5c..f497590 100755 --- a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php +++ b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * Component view. * * @package Modules\Organization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php index d21df89..04533ef 100755 --- a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php +++ b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * Component view. * * @package Modules\Organization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php b/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php index 174a679..c2592d8 100755 --- a/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php +++ b/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php @@ -5,9 +5,9 @@ { "key": 1, "listener": "click", "action": [ {"key": 1, "type": "dom.popup", "selector": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "getId(); ?>"}, - {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, {"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1}, - {"key": 4, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 4, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1} ] } diff --git a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php index abb9316..36b78d2 100755 --- a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php +++ b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * Component view. * * @package Modules\Organization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php index 050353e..87dc58b 100755 --- a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php +++ b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * Component view. * * @package Modules\Organization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php index 2d9c413..7cecf97 100755 --- a/Theme/Backend/Lang/Navigation.ar.lang.php +++ b/Theme/Backend/Lang/Navigation.ar.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php index ceae72c..1ed19a7 100755 --- a/Theme/Backend/Lang/Navigation.cs.lang.php +++ b/Theme/Backend/Lang/Navigation.cs.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php index cb83b21..06b677e 100755 --- a/Theme/Backend/Lang/Navigation.da.lang.php +++ b/Theme/Backend/Lang/Navigation.da.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index 1594386..a2e469a 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php index 6885d1d..f151511 100755 --- a/Theme/Backend/Lang/Navigation.el.lang.php +++ b/Theme/Backend/Lang/Navigation.el.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index b48192d..89258ce 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php index 2230611..d02adf3 100755 --- a/Theme/Backend/Lang/Navigation.es.lang.php +++ b/Theme/Backend/Lang/Navigation.es.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php index 97fa31d..3f5d7db 100755 --- a/Theme/Backend/Lang/Navigation.fi.lang.php +++ b/Theme/Backend/Lang/Navigation.fi.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php index e38baa8..84008cf 100755 --- a/Theme/Backend/Lang/Navigation.fr.lang.php +++ b/Theme/Backend/Lang/Navigation.fr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php index cd057d7..1c9b868 100755 --- a/Theme/Backend/Lang/Navigation.hu.lang.php +++ b/Theme/Backend/Lang/Navigation.hu.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php index 9fb19d9..44a9500 100755 --- a/Theme/Backend/Lang/Navigation.it.lang.php +++ b/Theme/Backend/Lang/Navigation.it.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php index b280632..a44bc30 100755 --- a/Theme/Backend/Lang/Navigation.ja.lang.php +++ b/Theme/Backend/Lang/Navigation.ja.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php index e4f4644..f227cee 100755 --- a/Theme/Backend/Lang/Navigation.ko.lang.php +++ b/Theme/Backend/Lang/Navigation.ko.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php index 97119aa..221e2bb 100755 --- a/Theme/Backend/Lang/Navigation.no.lang.php +++ b/Theme/Backend/Lang/Navigation.no.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php index f269d0d..33030b8 100755 --- a/Theme/Backend/Lang/Navigation.pl.lang.php +++ b/Theme/Backend/Lang/Navigation.pl.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php index 1f5d01f..211907f 100755 --- a/Theme/Backend/Lang/Navigation.pt.lang.php +++ b/Theme/Backend/Lang/Navigation.pt.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php index 88f4876..fbd8464 100755 --- a/Theme/Backend/Lang/Navigation.ru.lang.php +++ b/Theme/Backend/Lang/Navigation.ru.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php index 6e05ab4..13d62fa 100755 --- a/Theme/Backend/Lang/Navigation.sv.lang.php +++ b/Theme/Backend/Lang/Navigation.sv.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php index 5b7b9ea..3f4a578 100755 --- a/Theme/Backend/Lang/Navigation.th.lang.php +++ b/Theme/Backend/Lang/Navigation.th.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php index a19ca7d..b61219a 100755 --- a/Theme/Backend/Lang/Navigation.tr.lang.php +++ b/Theme/Backend/Lang/Navigation.tr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php index 1358c9d..a976cbb 100755 --- a/Theme/Backend/Lang/Navigation.uk.lang.php +++ b/Theme/Backend/Lang/Navigation.uk.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php index 62f4c27..7a0b6bb 100755 --- a/Theme/Backend/Lang/Navigation.zh.lang.php +++ b/Theme/Backend/Lang/Navigation.zh.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php index 3b25284..ed0439e 100755 --- a/Theme/Backend/Lang/ar.lang.php +++ b/Theme/Backend/Lang/ar.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php index 37fae96..acf5b6b 100755 --- a/Theme/Backend/Lang/cs.lang.php +++ b/Theme/Backend/Lang/cs.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index fbb020c..64918b7 100755 --- a/Theme/Backend/Lang/da.lang.php +++ b/Theme/Backend/Lang/da.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 1b38def..3c6b436 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php index 1b34418..2776b0f 100755 --- a/Theme/Backend/Lang/el.lang.php +++ b/Theme/Backend/Lang/el.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 5acbf2c..65508e4 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php index e5c021b..5f5d87f 100755 --- a/Theme/Backend/Lang/es.lang.php +++ b/Theme/Backend/Lang/es.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php index d2b2aca..efefbf5 100755 --- a/Theme/Backend/Lang/fi.lang.php +++ b/Theme/Backend/Lang/fi.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php index da9ecd0..ff4ac34 100755 --- a/Theme/Backend/Lang/fr.lang.php +++ b/Theme/Backend/Lang/fr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php index aa08a0a..8336a0c 100755 --- a/Theme/Backend/Lang/hu.lang.php +++ b/Theme/Backend/Lang/hu.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php index ecfa8c8..9f302a7 100755 --- a/Theme/Backend/Lang/it.lang.php +++ b/Theme/Backend/Lang/it.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php index 3daa06c..bc7169f 100755 --- a/Theme/Backend/Lang/ja.lang.php +++ b/Theme/Backend/Lang/ja.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php index e87ecfc..b8e9192 100755 --- a/Theme/Backend/Lang/ko.lang.php +++ b/Theme/Backend/Lang/ko.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php index d4ece18..eed10f2 100755 --- a/Theme/Backend/Lang/no.lang.php +++ b/Theme/Backend/Lang/no.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php index 94af1dd..dcb8f47 100755 --- a/Theme/Backend/Lang/pl.lang.php +++ b/Theme/Backend/Lang/pl.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php index c739546..4a15c3d 100755 --- a/Theme/Backend/Lang/pt.lang.php +++ b/Theme/Backend/Lang/pt.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php index bb03c11..81423dd 100755 --- a/Theme/Backend/Lang/ru.lang.php +++ b/Theme/Backend/Lang/ru.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php index e665382..0ff43f3 100755 --- a/Theme/Backend/Lang/sv.lang.php +++ b/Theme/Backend/Lang/sv.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php index 060b453..86b993b 100755 --- a/Theme/Backend/Lang/th.lang.php +++ b/Theme/Backend/Lang/th.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php index 8bac914..aaa5538 100755 --- a/Theme/Backend/Lang/tr.lang.php +++ b/Theme/Backend/Lang/tr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php index 6633979..dd1b610 100755 --- a/Theme/Backend/Lang/uk.lang.php +++ b/Theme/Backend/Lang/uk.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php index b65d7cc..e17a9b0 100755 --- a/Theme/Backend/Lang/zh.lang.php +++ b/Theme/Backend/Lang/zh.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/department-create.tpl.php b/Theme/Backend/department-create.tpl.php index 54f4da6..acdfb19 100755 --- a/Theme/Backend/department-create.tpl.php +++ b/Theme/Backend/department-create.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index f9982b4..35d967c 100755 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -90,12 +90,12 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = UriFactory::build('{/lang}/{/app}/organization/department/profile?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/organization/department/profile?{?}&id=' . $value->getId()); ?> getId(); ?> printHtml($value->name); ?> - printHtml($value->parent->name); ?> - printHtml($value->unit->name); ?> + printHtml($value->parent->name); ?> + printHtml($value->unit->name); ?> diff --git a/Theme/Backend/department-profile.tpl.php b/Theme/Backend/department-profile.tpl.php index 0a1675d..9aaa784 100755 --- a/Theme/Backend/department-profile.tpl.php +++ b/Theme/Backend/department-profile.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/organigram.tpl.php b/Theme/Backend/organigram.tpl.php index e90113f..ea0fa4c 100755 --- a/Theme/Backend/organigram.tpl.php +++ b/Theme/Backend/organigram.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/position-create.tpl.php b/Theme/Backend/position-create.tpl.php index 0bd13fe..5656f3a 100755 --- a/Theme/Backend/position-create.tpl.php +++ b/Theme/Backend/position-create.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/position-list.tpl.php b/Theme/Backend/position-list.tpl.php index 85d541e..a106a2c 100755 --- a/Theme/Backend/position-list.tpl.php +++ b/Theme/Backend/position-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory; */ $positions = $this->getData('positions') ?? []; -$previous = empty($positions) ? 'organization/position/list' : '{/lang}/{/app}/organization/position/list?{?}&id=' . \reset($positions)->getId() . '&ptype=p'; -$next = empty($positions) ? 'organization/position/list' : '{/lang}/{/app}/organization/position/list?{?}&id=' . \end($positions)->getId() . '&ptype=n'; +$previous = empty($positions) ? 'organization/position/list' : '{/base}/organization/position/list?{?}&id=' . \reset($positions)->getId() . '&ptype=p'; +$next = empty($positions) ? 'organization/position/list' : '{/base}/organization/position/list?{?}&id=' . \end($positions)->getId() . '&ptype=n'; echo $this->getData('nav')->render(); ?> @@ -87,8 +87,8 @@ echo $this->getData('nav')->render(); ?> getId(); ?> printHtml($value->name); ?> - printHtml($value->parent->name); ?> - printHtml($value->department->name); ?> + printHtml($value->parent->name); ?> + printHtml($value->department->name); ?> getHtml('Empty', '0', '0'); ?> diff --git a/Theme/Backend/position-profile.tpl.php b/Theme/Backend/position-profile.tpl.php index a127248..dade633 100755 --- a/Theme/Backend/position-profile.tpl.php +++ b/Theme/Backend/position-profile.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/unit-create.tpl.php b/Theme/Backend/unit-create.tpl.php index e26976c..9df04d8 100755 --- a/Theme/Backend/unit-create.tpl.php +++ b/Theme/Backend/unit-create.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php index 2a251b9..bb41195 100755 --- a/Theme/Backend/unit-list.tpl.php +++ b/Theme/Backend/unit-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,8 +21,8 @@ use phpOMS\Uri\UriFactory; */ $units = $this->getData('units') ?? []; -$previous = empty($units) ? 'organization/unit/list' : '{/lang}/{/app}/organization/unit/list?{?}&id=' . \reset($units)->getId() . '&ptype=p'; -$next = empty($units) ? 'organization/unit/list' : '{/lang}/{/app}/organization/unit/list?{?}&id=' . \end($units)->getId() . '&ptype=n'; +$previous = empty($units) ? 'organization/unit/list' : '{/base}/organization/unit/list?{?}&id=' . \reset($units)->getId() . '&ptype=p'; +$next = empty($units) ? 'organization/unit/list' : '{/base}/organization/unit/list?{?}&id=' . \end($units)->getId() . '&ptype=n'; echo $this->getData('nav')->render(); ?> @@ -84,14 +84,14 @@ echo $this->getData('nav')->render(); ?> $value) : - $url = UriFactory::build('{/lang}/{/app}/organization/unit/profile?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/organization/unit/profile?{?}&id=' . $value->getId()); ?> getId(); ?> <?= $this->getHtml('IMG_alt_profile'); ?> printHtml($value->name); ?> - printHtml($value->parent->name); ?> + printHtml($value->parent->name); ?> diff --git a/Theme/Backend/unit-profile.tpl.php b/Theme/Backend/unit-profile.tpl.php index 02dd4b0..251b50a 100755 --- a/Theme/Backend/unit-profile.tpl.php +++ b/Theme/Backend/unit-profile.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Organization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index f39b5e1..665c179 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Autoloader.php b/tests/Autoloader.php index d032623..d08f1b7 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -6,7 +6,7 @@ * * @package Modules/tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace tests; * Autoloader class. * * @package tests - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 6fe8c2a..34c013c 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/DepartmentMapperTest.php b/tests/Models/DepartmentMapperTest.php index df56131..491f6f3 100755 --- a/tests/Models/DepartmentMapperTest.php +++ b/tests/Models/DepartmentMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/DepartmentTest.php b/tests/Models/DepartmentTest.php index 4cf36b7..2af409d 100755 --- a/tests/Models/DepartmentTest.php +++ b/tests/Models/DepartmentTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullDepartmentTest.php b/tests/Models/NullDepartmentTest.php index bc7201a..62b93c9 100755 --- a/tests/Models/NullDepartmentTest.php +++ b/tests/Models/NullDepartmentTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullPositionTest.php b/tests/Models/NullPositionTest.php index 9a36d0d..f507350 100755 --- a/tests/Models/NullPositionTest.php +++ b/tests/Models/NullPositionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullUnitTest.php b/tests/Models/NullUnitTest.php index 43b7cea..f04fe7b 100755 --- a/tests/Models/NullUnitTest.php +++ b/tests/Models/NullUnitTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/PositionMapperTest.php b/tests/Models/PositionMapperTest.php index fe7dac6..cf0373c 100755 --- a/tests/Models/PositionMapperTest.php +++ b/tests/Models/PositionMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/PositionTest.php b/tests/Models/PositionTest.php index 6c9ecca..2bb6326 100755 --- a/tests/Models/PositionTest.php +++ b/tests/Models/PositionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/UnitMapperTest.php b/tests/Models/UnitMapperTest.php index a051645..02547a6 100755 --- a/tests/Models/UnitMapperTest.php +++ b/tests/Models/UnitMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/UnitTest.php b/tests/Models/UnitTest.php index dc7e598..b76c374 100755 --- a/tests/Models/UnitTest.php +++ b/tests/Models/UnitTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */