From 330c0db9e927a4c9d74518cac7d2d69302ffb049 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 24 Mar 2023 16:20:25 +0100 Subject: [PATCH] registration fixes --- Admin/Hooks/Web/Api.php | 2 +- Admin/Install/Dashboard.php | 4 +- Admin/Install/Media.php | 4 +- Admin/Install/Navigation.install.json | 10 +-- Admin/Install/Navigation.php | 4 +- Admin/Install/Search.php | 4 +- Admin/Install/SearchCommands.php | 2 +- Admin/Installer.php | 5 +- 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 | 84 +++++++++---------- Controller/BackendController.php | 8 +- Controller/Controller.php | 4 +- Controller/SearchController.php | 4 +- Models/AccountRelation.php | 4 +- Models/AccountRelationMapper.php | 4 +- Models/AttributeValueType.php | 4 +- Models/DutyType.php | 4 +- Models/GroupRelation.php | 4 +- Models/GroupRelationMapper.php | 4 +- Models/NullTask.php | 4 +- Models/NullTaskAttribute.php | 4 +- Models/NullTaskAttributeType.php | 4 +- Models/NullTaskAttributeValue.php | 4 +- Models/NullTaskElement.php | 4 +- Models/PermissionCategory.php | 4 +- Models/RelationAbstract.php | 4 +- Models/Task.php | 4 +- Models/TaskAttribute.php | 4 +- Models/TaskAttributeMapper.php | 4 +- Models/TaskAttributeType.php | 6 +- Models/TaskAttributeTypeL11nMapper.php | 4 +- Models/TaskAttributeTypeMapper.php | 4 +- Models/TaskAttributeValue.php | 6 +- Models/TaskAttributeValueL11nMapper.php | 4 +- Models/TaskAttributeValueMapper.php | 4 +- Models/TaskElement.php | 4 +- Models/TaskElementMapper.php | 4 +- Models/TaskMapper.php | 4 +- Models/TaskPriority.php | 4 +- Models/TaskSeen.php | 4 +- Models/TaskSeenMapper.php | 4 +- Models/TaskStatus.php | 4 +- Models/TaskTemplate.php | 4 +- Models/TaskType.php | 4 +- Models/TaskVisibility.php | 4 +- Theme/Backend/Components/Tasks/ListView.php | 4 +- .../Backend/Components/Tasks/PriorityView.php | 4 +- Theme/Backend/Components/Tasks/StatusView.php | 4 +- Theme/Backend/Components/Tasks/list.tpl.php | 2 +- 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/dashboard-task.tpl.php | 4 +- Theme/Backend/task-analysis.tpl.php | 2 +- Theme/Backend/task-create.tpl.php | 2 +- Theme/Backend/task-dashboard.tpl.php | 14 +--- Theme/Backend/task-single.tpl.php | 10 +-- Views/TaskView.php | 8 +- tests/Admin/AdminTest.php | 2 +- tests/Autoloader.php | 4 +- tests/Controller/ApiControllerTest.php | 2 +- tests/Controller/BackendControllerTest.php | 2 +- tests/Models/AccountRelationTest.php | 2 +- tests/Models/GroupRelationTest.php | 2 +- tests/Models/NullTaskElementTest.php | 2 +- tests/Models/NullTaskTest.php | 2 +- tests/Models/RelationAbstractTest.php | 2 +- tests/Models/TaskElementTest.php | 2 +- tests/Models/TaskMapperTest.php | 2 +- tests/Models/TaskTest.php | 2 +- tests/Views/TaskViewTest.php | 2 +- 116 files changed, 223 insertions(+), 230 deletions(-) diff --git a/Admin/Hooks/Web/Api.php b/Admin/Hooks/Web/Api.php index 524e0a6..f8b3c4d 100755 --- a/Admin/Hooks/Web/Api.php +++ b/Admin/Hooks/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/Install/Dashboard.php b/Admin/Install/Dashboard.php index 94650ad..eee81bd 100755 --- a/Admin/Install/Dashboard.php +++ b/Admin/Install/Dashboard.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Dashboard class. * * @package Modules\Tasks\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 7d0e3ff..8305084 100755 --- a/Admin/Install/Media.php +++ b/Admin/Install/Media.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\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/Navigation.install.json b/Admin/Install/Navigation.install.json index d05337a..5e25250 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 1, "subtype": 1, "name": "Tasks", - "uri": "{/lang}/{/app}/task/dashboard?{?}", + "uri": "{/base}/task/dashboard?{?}", "target": "self", "icon": "fa fa-bolt", "order": 15, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/{/app}/task/dashboard?{?}", + "uri": "{/base}/task/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -33,7 +33,7 @@ "type": 0, "subtype": 1, "name": "Tasks", - "uri": "{/lang}/{/app}/task/single?{?}", + "uri": "{/base}/task/single?{?}", "target": "self", "icon": null, "order": 1, @@ -50,7 +50,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/{/app}/task/create?{?}", + "uri": "{/base}/task/create?{?}", "target": "self", "icon": null, "order": 10, @@ -65,7 +65,7 @@ "type": 3, "subtype": 1, "name": "Analysis", - "uri": "{/lang}/{/app}/task/analysis?{?}", + "uri": "{/base}/task/analysis?{?}", "target": "self", "icon": null, "order": 20, diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index ccbc1eb..530f31c 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\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/Search.php b/Admin/Install/Search.php index b7bc59b..08a5d33 100755 --- a/Admin/Install/Search.php +++ b/Admin/Install/Search.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Search class. * * @package Modules\Tasks\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/SearchCommands.php b/Admin/Install/SearchCommands.php index 98b57ff..9d34420 100755 --- a/Admin/Install/SearchCommands.php +++ b/Admin/Install/SearchCommands.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @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/Installer.php b/Admin/Installer.php index 204bafe..92b8cfc 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -26,7 +26,7 @@ use phpOMS\Uri\HttpUri; * Installer class. * * @package Modules\Tasks\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -53,6 +53,7 @@ final class Installer extends InstallerAbstract return; } + /** @var array $attributes */ $attributes = \json_decode($fileContent, true); $attrTypes = self::createTaskAttributeTypes($app, $attributes); $attrValues = self::createTaskAttributeValues($app, $attrTypes, $attributes); diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 530f220..da5aeca 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 faadea8..5d46b43 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 b34dfc0..47f4e5a 100755 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\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 5927441..d0b8aa8 100755 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\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 d734fe7..f699732 100755 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\UpdaterAbstract; * Updater class. * * @package Modules\Tasks\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 a6c1384..3267dd1 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -53,7 +53,7 @@ use phpOMS\Utils\Parser\Markdown\Markdown; * Api controller for the tasks module. * * @package Modules\Tasks - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -286,16 +286,16 @@ final class ApiController extends Controller public function createTaskFromRequest(RequestAbstract $request) : Task { $task = new Task(); - $task->title = (string) ($request->getData('title') ?? ''); - $task->description = Markdown::parse((string) ($request->getData('plain') ?? '')); - $task->descriptionRaw = (string) ($request->getData('plain') ?? ''); + $task->title = $request->getDataString('title') ?? ''; + $task->description = Markdown::parse($request->getDataString('plain') ?? ''); + $task->descriptionRaw = $request->getDataString('plain') ?? ''; $task->setCreatedBy(new NullAccount($request->header->account)); $task->setStatus(TaskStatus::OPEN); $task->setType(TaskType::SINGLE); - $task->redirect = (string) ($request->getData('redirect') ?? ''); + $task->redirect = $request->getDataString('redirect') ?? ''; if (empty($request->getData('priority'))) { - $task->due = empty($request->getData('due')) ? null : new \DateTime($request->getData('due')); + $task->due = $request->getDataDateTime('due'); } else { $task->setPriority((int) $request->getData('priority')); } @@ -323,7 +323,7 @@ final class ApiController extends Controller } $element = new TaskElement(); - $element->addTo(new NullAccount((int) ($request->getData('forward') ?? $request->header->account))); + $element->addTo(new NullAccount($request->getDataInt('forward') ?? $request->header->account)); $element->createdBy = $task->getCreatedBy(); $element->due = $task->due; $element->setPriority($task->getPriority()); @@ -404,11 +404,11 @@ final class ApiController extends Controller $task->title = (string) ($request->getData('title') ?? $task->title); $task->description = Markdown::parse((string) ($request->getData('plain') ?? $task->descriptionRaw)); $task->descriptionRaw = (string) ($request->getData('plain') ?? $task->descriptionRaw); - $task->due = $request->getData('due') !== null ? new \DateTime((string) ($request->getData('due'))) : $task->due; - $task->setStatus((int) ($request->getData('status') ?? $task->getStatus())); - $task->setType((int) ($request->getData('type') ?? $task->getType())); - $task->setPriority((int) ($request->getData('priority') ?? $task->getPriority())); - $task->completion = (int) ($request->getData('completion') ?? $task->completion); + $task->due = $request->hasData('due') ? new \DateTime((string) ($request->getData('due'))) : $task->due; + $task->setStatus($request->getDataInt('status') ?? $task->getStatus()); + $task->setType($request->getDataInt('type') ?? $task->getType()); + $task->setPriority($request->getDataInt('priority') ?? $task->getPriority()); + $task->completion = $request->getDataInt('completion') ?? $task->completion; return $task; } @@ -463,7 +463,7 @@ final class ApiController extends Controller $element = $this->createTaskElementFromRequest($request, $task); $task->due = $element->due; - $task->completion = (int) ($request->getData('completion') ?? $task->completion); + $task->completion = $request->getDataInt('completion') ?? $task->completion; $task->setPriority($element->getPriority()); $task->setStatus($element->getStatus()); @@ -633,12 +633,12 @@ final class ApiController extends Controller { $element = new TaskElement(); $element->createdBy = new NullAccount($request->header->account); - $element->due = !empty($request->getData('due')) ? new \DateTime((string) ($request->getData('due'))) : $task->due; - $element->setPriority((int) ($request->getData('priority') ?? $task->getPriority())); + $element->due = $request->getDataDateTime('due') ?? $task->due; + $element->setPriority($request->getDataInt('priority') ?? $task->getPriority()); $element->setStatus((int) ($request->getData('status'))); $element->task = $task->getId(); - $element->description = Markdown::parse((string) ($request->getData('plain') ?? '')); - $element->descriptionRaw = (string) ($request->getData('plain') ?? ''); + $element->description = Markdown::parse($request->getDataString('plain') ?? ''); + $element->descriptionRaw = $request->getDataString('plain') ?? ''; $tos = $request->getData('to') ?? $request->header->account; if (!\is_array($tos)) { @@ -742,10 +742,10 @@ final class ApiController extends Controller */ private function updateTaskElementFromRequest(RequestAbstract $request, TaskElement $element) : TaskElement { - $element->due = $request->getData('due') !== null ? new \DateTime((string) ($request->getData('due'))) : $element->due; - $element->setStatus((int) ($request->getData('status') ?? $element->getStatus())); - $element->description = Markdown::parse((string) ($request->getData('plain') ?? $element->descriptionRaw)); - $element->descriptionRaw = (string) ($request->getData('plain') ?? $element->descriptionRaw); + $element->due = $request->getDataDateTime('due') ?? $element->due; + $element->setStatus($request->getDataInt('status') ?? $element->getStatus()); + $element->description = Markdown::parse($request->getDataString('plain') ?? $element->descriptionRaw); + $element->descriptionRaw = $request->getDataString('plain') ?? $element->descriptionRaw; $tos = $request->getData('to') ?? $request->header->account; if (!\is_array($tos)) { @@ -818,7 +818,7 @@ final class ApiController extends Controller $attribute->task = (int) $request->getData('task'); $attribute->type = new NullTaskAttributeType((int) $request->getData('type')); - if ($request->getData('value') !== null) { + if ($request->hasData('value')) { $attribute->value = new NullTaskAttributeValue((int) $request->getData('value')); } else { $newRequest = clone $request; @@ -901,11 +901,11 @@ final class ApiController extends Controller private function createTaskAttributeTypeL11nFromRequest(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; } @@ -977,12 +977,12 @@ final class ApiController extends Controller */ private function createTaskAttributeTypeFromRequest(RequestAbstract $request) : TaskAttributeType { - $attrType = new TaskAttributeType($request->getData('name') ?? ''); - $attrType->setL11n((string) ($request->getData('title') ?? ''), $request->getData('language') ?? ISO639x1Enum::_EN); - $attrType->setFields((int) ($request->getData('fields') ?? 0)); - $attrType->custom = (bool) ($request->getData('custom') ?? false); + $attrType = new TaskAttributeType($request->getDataString('name') ?? ''); + $attrType->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN); + $attrType->setFields($request->getDataInt('fields') ?? 0); + $attrType->custom = $request->getDataBool('custom') ?? false; $attrType->isRequired = (bool) ($request->getData('is_required') ?? false); - $attrType->validationPattern = (string) ($request->getData('validation_pattern') ?? ''); + $attrType->validationPattern = $request->getDataString('validation_pattern') ?? ''; return $attrType; } @@ -1065,15 +1065,15 @@ final class ApiController extends Controller { /** @var TaskAttributeType $type */ $type = TaskAttributeTypeMapper::get() - ->where('id', (int) ($request->getData('type') ?? 0)) + ->where('id', $request->getDataInt('type') ?? 0) ->execute(); $attrValue = new TaskAttributeValue(); - $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; @@ -1147,11 +1147,11 @@ final class ApiController extends Controller private function createTaskAttributeValueL11nFromRequest(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 59a09bf..1439b70 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -39,7 +39,7 @@ use phpOMS\Views\View; * @property \Web\WebApplication $app * * @package Modules\Tasks - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -79,13 +79,13 @@ final class BackendController extends Controller implements DashboardElementInte if ($request->getData('ptype') === 'p') { $view->setData('tasks', $mapperQuery->with('createdBy') - ->where('id', (int) ($request->getData('id') ?? 0), '<') + ->where('id', $request->getDataInt('id') ?? 0, '<') ->execute() ); } elseif ($request->getData('ptype') === 'n') { $view->setData('tasks', $mapperQuery->with('createdBy') - ->where('id', (int) ($request->getData('id') ?? 0), '>') + ->where('id', $request->getDataInt('id') ?? 0, '>') ->execute() ); } else { diff --git a/Controller/Controller.php b/Controller/Controller.php index fbdd0d1..bd0441c 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @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; * Task controller class. * * @package Modules\Tasks - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/SearchController.php b/Controller/SearchController.php index 37d4819..eeb981b 100755 --- a/Controller/SearchController.php +++ b/Controller/SearchController.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @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\System\MimeType; * Search class. * * @package Modules\Tasks - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/AccountRelation.php b/Models/AccountRelation.php index 10ab732..7fabc71 100755 --- a/Models/AccountRelation.php +++ b/Models/AccountRelation.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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 Modules\Admin\Models\NullAccount; * Task relation to account * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/AccountRelationMapper.php b/Models/AccountRelationMapper.php index d6ab614..eb567a6 100755 --- a/Models/AccountRelationMapper.php +++ b/Models/AccountRelationMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\DataStorage\Database\Mapper\DataMapperFactory; * Mapper class. * * @package Modules\Tasks\Models - * @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 9329de8..4bc8fb5 100755 --- a/Models/AttributeValueType.php +++ b/Models/AttributeValueType.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/DutyType.php b/Models/DutyType.php index 2f46c2c..b057403 100755 --- a/Models/DutyType.php +++ b/Models/DutyType.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task forward type enum. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/GroupRelation.php b/Models/GroupRelation.php index acef76b..b2e6dbb 100755 --- a/Models/GroupRelation.php +++ b/Models/GroupRelation.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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 Modules\Admin\Models\NullGroup; * Task relation to group * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/GroupRelationMapper.php b/Models/GroupRelationMapper.php index 4ecabc1..1922b96 100755 --- a/Models/GroupRelationMapper.php +++ b/Models/GroupRelationMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\DataStorage\Database\Mapper\DataMapperFactory; * Mapper class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullTask.php b/Models/NullTask.php index 990f216..8e2e532 100755 --- a/Models/NullTask.php +++ b/Models/NullTask.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\Models; * Null model * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullTaskAttribute.php b/Models/NullTaskAttribute.php index aecfdfc..61a0abe 100755 --- a/Models/NullTaskAttribute.php +++ b/Models/NullTaskAttribute.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\Models; * Null model * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullTaskAttributeType.php b/Models/NullTaskAttributeType.php index f74b717..c7820e5 100755 --- a/Models/NullTaskAttributeType.php +++ b/Models/NullTaskAttributeType.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\Models; * Null model * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullTaskAttributeValue.php b/Models/NullTaskAttributeValue.php index 7477c69..b7a925b 100755 --- a/Models/NullTaskAttributeValue.php +++ b/Models/NullTaskAttributeValue.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\Models; * Null model * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullTaskElement.php b/Models/NullTaskElement.php index 24b8be5..6d4e1d9 100755 --- a/Models/NullTaskElement.php +++ b/Models/NullTaskElement.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\Models; * Null model * * @package Modules\Tasks\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 c99427d..ca7e4ab 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/RelationAbstract.php b/Models/RelationAbstract.php index 284c5cf..685faec 100755 --- a/Models/RelationAbstract.php +++ b/Models/RelationAbstract.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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 Modules\Admin\Models\Group; * Task relation to accounts or groups * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Task.php b/Models/Task.php index ec2fb82..122cfcb 100755 --- a/Models/Task.php +++ b/Models/Task.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; * Task class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskAttribute.php b/Models/TaskAttribute.php index 70fb81a..9b129a8 100755 --- a/Models/TaskAttribute.php +++ b/Models/TaskAttribute.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\Models; * Task class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskAttributeMapper.php b/Models/TaskAttributeMapper.php index bbcc2b5..095df4d 100755 --- a/Models/TaskAttributeMapper.php +++ b/Models/TaskAttributeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task mapper class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskAttributeType.php b/Models/TaskAttributeType.php index 52ba31b..fd633be 100755 --- a/Models/TaskAttributeType.php +++ b/Models/TaskAttributeType.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task Attribute Type class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -132,7 +132,7 @@ class TaskAttributeType 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/TaskAttributeTypeL11nMapper.php b/Models/TaskAttributeTypeL11nMapper.php index 05128e7..79d1e42 100755 --- a/Models/TaskAttributeTypeL11nMapper.php +++ b/Models/TaskAttributeTypeL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task mapper class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskAttributeTypeMapper.php b/Models/TaskAttributeTypeMapper.php index 1176072..60d0601 100755 --- a/Models/TaskAttributeTypeMapper.php +++ b/Models/TaskAttributeTypeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task mapper class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskAttributeValue.php b/Models/TaskAttributeValue.php index df2dbc0..117dda3 100755 --- a/Models/TaskAttributeValue.php +++ b/Models/TaskAttributeValue.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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/task is defined in the TaskAttribute class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -135,7 +135,7 @@ class TaskAttributeValue 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/TaskAttributeValueL11nMapper.php b/Models/TaskAttributeValueL11nMapper.php index c4c52c5..ff0e4b0 100755 --- a/Models/TaskAttributeValueL11nMapper.php +++ b/Models/TaskAttributeValueL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task mapper class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskAttributeValueMapper.php b/Models/TaskAttributeValueMapper.php index 5449986..4c4acf1 100755 --- a/Models/TaskAttributeValueMapper.php +++ b/Models/TaskAttributeValueMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task mapper class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskElement.php b/Models/TaskElement.php index b5170cf..7ed8e23 100755 --- a/Models/TaskElement.php +++ b/Models/TaskElement.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; * Task element class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php index ef6fe59..63d4657 100755 --- a/Models/TaskElementMapper.php +++ b/Models/TaskElementMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Mapper class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php index b48119b..5fb61d2 100755 --- a/Models/TaskMapper.php +++ b/Models/TaskMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -27,7 +27,7 @@ use phpOMS\DataStorage\Database\Query\Where; * Mapper class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskPriority.php b/Models/TaskPriority.php index e084dad..2f71d80 100755 --- a/Models/TaskPriority.php +++ b/Models/TaskPriority.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task priority enum. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskSeen.php b/Models/TaskSeen.php index c867141..05a88de 100755 --- a/Models/TaskSeen.php +++ b/Models/TaskSeen.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Admin\Models\Account; * Null model * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskSeenMapper.php b/Models/TaskSeenMapper.php index 51d8102..d467fad 100755 --- a/Models/TaskSeenMapper.php +++ b/Models/TaskSeenMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * a task. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskStatus.php b/Models/TaskStatus.php index 60835a9..f6d1a07 100755 --- a/Models/TaskStatus.php +++ b/Models/TaskStatus.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task status enum. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskTemplate.php b/Models/TaskTemplate.php index 9a3267c..ba64fe3 100755 --- a/Models/TaskTemplate.php +++ b/Models/TaskTemplate.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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\Tasks\Models; * Task template class. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskType.php b/Models/TaskType.php index d12f05e..1352810 100755 --- a/Models/TaskType.php +++ b/Models/TaskType.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task type enum. * * @package Modules\Tasks\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaskVisibility.php b/Models/TaskVisibility.php index 923b611..fa727f4 100755 --- a/Models/TaskVisibility.php +++ b/Models/TaskVisibility.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks\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; * Task visibility enum. * * @package Modules\Tasks\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/Tasks/ListView.php b/Theme/Backend/Components/Tasks/ListView.php index 6ef6f2e..ef907c7 100755 --- a/Theme/Backend/Components/Tasks/ListView.php +++ b/Theme/Backend/Components/Tasks/ListView.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @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\Tasks - * @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/Tasks/PriorityView.php b/Theme/Backend/Components/Tasks/PriorityView.php index 07666c2..064ac97 100755 --- a/Theme/Backend/Components/Tasks/PriorityView.php +++ b/Theme/Backend/Components/Tasks/PriorityView.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @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\Tasks\Theme\Backend\Components\Tasks; * Component view. * * @package Modules\Tasks - * @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/Tasks/StatusView.php b/Theme/Backend/Components/Tasks/StatusView.php index 4cc66ed..60accc9 100755 --- a/Theme/Backend/Components/Tasks/StatusView.php +++ b/Theme/Backend/Components/Tasks/StatusView.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @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\Tasks\Theme\Backend\Components\Tasks; * Component view. * * @package Modules\Tasks - * @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/Tasks/list.tpl.php b/Theme/Backend/Components/Tasks/list.tpl.php index 81a2d7a..97255c9 100755 --- a/Theme/Backend/Components/Tasks/list.tpl.php +++ b/Theme/Backend/Components/Tasks/list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @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.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php index 635327c..676bb38 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 18891d1..2006a8d 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 a4842ba..e49501d 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 492c8ca..319c219 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 b646974..dc9461f 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 71d5e2f..e56ac31 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 ed32966..48ef570 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 5c0ddfe..e238603 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 6ae6d5b..22a3a29 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 e128498..4041125 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 fb35655..5ff5062 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 56627a3..3f52504 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 8104e87..17acc53 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 0e8f4cd..4004731 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 69edff7..dd7945d 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 8b52a68..40f7472 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 3efa1e3..13b4fc6 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 1b31169..3479229 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 6e67d04..68b3f0a 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 2f6c1b4..f4ef4b7 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 2a23769..0139c03 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 9e79e19..ef3461c 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 9052d76..f781cab 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 f1d4911..c6f1409 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 3507525..8a2b3e6 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 8c41747..33e3f8a 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 4cb7093..3b00688 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 722a315..aec6896 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 18a6da1..de8d066 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 a5504c7..7fb0012 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 9047098..dc49c3d 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 5600056..1d35b62 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 9f47b82..06ada8b 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 54ee1ef..cd7b1aa 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 8c67099..ddc7422 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 9bfe789..80dcc09 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 5bd4d56..cc740fb 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 66e59f5..b810287 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 5a00dcf..a14b442 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 219c71d..44b1031 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 917a3de..6bb7727 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 67daef9..b3e759c 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 5539412..be96885 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 e21bc16..a30ad71 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/dashboard-task.tpl.php b/Theme/Backend/dashboard-task.tpl.php index 17ddcf8..d7ca8ee 100755 --- a/Theme/Backend/dashboard-task.tpl.php +++ b/Theme/Backend/dashboard-task.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -54,7 +54,7 @@ $tasksList = $this->getData('tasks') ?? [];
- getHtml('More', '0', '0'); ?> + getHtml('More', '0', '0'); ?>
\ No newline at end of file diff --git a/Theme/Backend/task-analysis.tpl.php b/Theme/Backend/task-analysis.tpl.php index 482ecbd..10e9e71 100755 --- a/Theme/Backend/task-analysis.tpl.php +++ b/Theme/Backend/task-analysis.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @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/task-create.tpl.php b/Theme/Backend/task-create.tpl.php index a4adb23..fe6384a 100755 --- a/Theme/Backend/task-create.tpl.php +++ b/Theme/Backend/task-create.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @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/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php index 2391015..2824a33 100755 --- a/Theme/Backend/task-dashboard.tpl.php +++ b/Theme/Backend/task-dashboard.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -15,14 +15,6 @@ declare(strict_types=1); use Modules\Tasks\Models\TaskPriority; use phpOMS\Uri\UriFactory; -/** - * @todo Karaka/oms-Tasks#4 - * Batch handle tasks in the dashboard list - * In the dashboard/list it should be possible to change the status of a task without going into it (changing it to done is the most important). - * This could be done with a button but also touch sliding/swiping should be possible for mobile. - * It could also make sense to implement checkboxes infront of the list items which then show a close/done etc. button which can be pressed and changes the status of all of the checked tasks. - */ - /** @var \phpOMS\Views\View $this */ /** @var \Modules\Tasks\Models\Task[] $tasks */ $tasks = $this->getData('tasks') ?? []; @@ -84,7 +76,7 @@ if ($open !== null) : - printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?> + printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?> printHtml($task->createdAt->format('Y-m-d H:i')); ?> @@ -149,7 +141,7 @@ if ($open !== null) : - printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?> + printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?> printHtml($task->createdAt->format('Y-m-d H:i')); ?> diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php index 9adc98f..2567307 100755 --- a/Theme/Backend/task-single.tpl.php +++ b/Theme/Backend/task-single.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -84,7 +84,7 @@ echo $this->getData('nav')->render(); ?>
- name; ?> + name; ?>
@@ -254,7 +254,7 @@ echo $this->getData('nav')->render(); ?>
- name; ?> + name; ?>
@@ -300,14 +300,14 @@ echo $this->getData('nav')->render(); ?> ) : ?>
- printHtml( + printHtml( $this->renderUserName( '%3$s %2$s %1$s', [$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login]) ); ?> getHtml('forwarded_to'); ?> - printHtml($to->getRelation()->name1); ?> + printHtml($to->getRelation()->name1); ?> printHtml($to->getRelation()->name); ?> diff --git a/Views/TaskView.php b/Views/TaskView.php index 1fbdf9b..a729e26 100755 --- a/Views/TaskView.php +++ b/Views/TaskView.php @@ -6,7 +6,7 @@ * * @package Modules\Tasks * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -29,7 +29,7 @@ use phpOMS\Views\View; * Task view class. * * @package Modules\Tasks - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -74,10 +74,10 @@ class TaskView extends View ->execute(); if (($profile instanceof NullProfile) || $profile->image->getPath() === '') { - return UriFactory::build('{/lang}/{/app}/' . $this->defaultProfileImage->getPath()); + return UriFactory::build('{/base}/' . $this->defaultProfileImage->getPath()); } - return UriFactory::build('{/lang}/{/app}/' . $profile->image->getPath()); + return UriFactory::build('{/base}/' . $profile->image->getPath()); } /** diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index d0c43cc..e6e0d68 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 bb05deb..b4ce839 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/Controller/BackendControllerTest.php b/tests/Controller/BackendControllerTest.php index 66d5e8d..55f2633 100755 --- a/tests/Controller/BackendControllerTest.php +++ b/tests/Controller/BackendControllerTest.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/AccountRelationTest.php b/tests/Models/AccountRelationTest.php index 02bf93b..ef774c2 100755 --- a/tests/Models/AccountRelationTest.php +++ b/tests/Models/AccountRelationTest.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/GroupRelationTest.php b/tests/Models/GroupRelationTest.php index 2ff63e0..3f2dc58 100755 --- a/tests/Models/GroupRelationTest.php +++ b/tests/Models/GroupRelationTest.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/NullTaskElementTest.php b/tests/Models/NullTaskElementTest.php index 52a8592..40a235c 100755 --- a/tests/Models/NullTaskElementTest.php +++ b/tests/Models/NullTaskElementTest.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/NullTaskTest.php b/tests/Models/NullTaskTest.php index f20f0cd..2db9e63 100755 --- a/tests/Models/NullTaskTest.php +++ b/tests/Models/NullTaskTest.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/RelationAbstractTest.php b/tests/Models/RelationAbstractTest.php index 0b2d20d..9fec96b 100755 --- a/tests/Models/RelationAbstractTest.php +++ b/tests/Models/RelationAbstractTest.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/TaskElementTest.php b/tests/Models/TaskElementTest.php index bea0d77..344b1ef 100755 --- a/tests/Models/TaskElementTest.php +++ b/tests/Models/TaskElementTest.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/TaskMapperTest.php b/tests/Models/TaskMapperTest.php index 09db1dc..3fab6b0 100755 --- a/tests/Models/TaskMapperTest.php +++ b/tests/Models/TaskMapperTest.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/TaskTest.php b/tests/Models/TaskTest.php index 94ac21d..94db21b 100755 --- a/tests/Models/TaskTest.php +++ b/tests/Models/TaskTest.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/Views/TaskViewTest.php b/tests/Views/TaskViewTest.php index 644b7f1..b479c0d 100755 --- a/tests/Views/TaskViewTest.php +++ b/tests/Views/TaskViewTest.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 */