Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-01-11 07:38:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make id public, organigram impl. media password/encryption, settings bug fix, Money->FloatInt change, ...

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-06 11:42:06 +00:00
parent 831ce0e616
commit 4be63bbeba
27 changed files with 116 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Installer.php
View File

@ -87,7 +87,7 @@ final class Installer extends InstallerAbstract
$request->setData('title', \reset($attribute['l11n']));
$request->setData('language', \array_keys($attribute['l11n'])[0] ?? 'en');
$request->setData('is_required', $attribute['is_required'] ?? false);
$request->setData('is_custom_allowed', $attribute['is_custom_allowed'] ?? false);
$request->setData('custom', $attribute['is_custom_allowed'] ?? false);
$request->setData('validation_pattern', $attribute['validation_pattern'] ?? '');
$module->apiTaskAttributeTypeCreate($request, $response);

66
Controller/ApiController.php
View File

@ -155,8 +155,8 @@ final class ApiController extends Controller
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$task->getId(),
$media->getId(),
$task->id,
$media->id,
TaskMapper::class,
'media',
'',
@ -164,15 +164,15 @@ final class ApiController extends Controller
);
$accountPath = '/Accounts/'
. $account->getId() . ' '
. $account->id . ' '
. $account->login . '/Tasks/'
. $task->createdAt->format('Y') . '/'
. $task->createdAt->format('m') . '/'
. $task->getId();
. $task->id;
$ref = new Reference();
$ref->name = $media->name;
$ref->source = new NullMedia($media->getId());
$ref->source = new NullMedia($media->id);
$ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($accountPath);
@ -182,23 +182,23 @@ final class ApiController extends Controller
/** @var \Modules\Media\Models\Media $media */
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection instanceof NullCollection) {
if ($collection->id === 0) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$accountPath,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Accounts/'
. $account->getId() . '/Tasks/'
. $account->id . '/Tasks/'
. $task->createdAt->format('Y') . '/'
. $task->createdAt->format('m') . '/'
. $task->getId()
. $task->id
);
}
}
$this->createModelRelation(
$request->header->account,
$collection->getId(),
$ref->getId(),
$collection->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
@ -216,8 +216,8 @@ final class ApiController extends Controller
$this->createModelRelation(
$request->header->account,
$task->getId(),
$media->getId(),
$task->id,
$media->id,
TaskMapper::class,
'media',
'',
@ -226,7 +226,7 @@ final class ApiController extends Controller
$ref = new Reference();
$ref->name = $media->name;
$ref->source = new NullMedia($media->getId());
$ref->source = new NullMedia($media->id);
$ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($path);
@ -236,7 +236,7 @@ final class ApiController extends Controller
/** @var \Modules\Media\Models\Media $media */
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection instanceof NullCollection) {
if ($collection->id === 0) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$path,
$request->header->account,
@ -247,8 +247,8 @@ final class ApiController extends Controller
$this->createModelRelation(
$request->header->account,
$collection->getId(),
$ref->getId(),
$collection->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
@ -273,7 +273,7 @@ final class ApiController extends Controller
. $task->createdAt->format('Y') . '/'
. $task->createdAt->format('m') . '/'
. $task->createdAt->format('d') . '/'
. $task->getId();
. $task->id;
}
/**
@ -530,23 +530,23 @@ final class ApiController extends Controller
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$element->getId(),
$media->getId(),
$element->id,
$media->id,
TaskElementMapper::class,
'media',
'',
$request->getOrigin()
);
$accountPath = '/Accounts/' . $account->getId() . ' '
$accountPath = '/Accounts/' . $account->id . ' '
. $account->login . '/Tasks/'
. $task->createdAt->format('Y') . '/'
. $task->createdAt->format('m') . '/'
. $task->getId();
. $task->id;
$ref = new Reference();
$ref->name = $media->name;
$ref->source = new NullMedia($media->getId());
$ref->source = new NullMedia($media->id);
$ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($accountPath);
@ -556,17 +556,17 @@ final class ApiController extends Controller
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$accountPath,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId()
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id
. '/Tasks/' . $task->createdAt->format('Y') . '/'
. $task->createdAt->format('m') . '/'
. $task->getId()
. $task->id
);
}
$this->createModelRelation(
$request->header->account,
$collection->getId(),
$ref->getId(),
$collection->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
@ -584,8 +584,8 @@ final class ApiController extends Controller
$this->createModelRelation(
$request->header->account,
$element->getId(),
$media->getId(),
$element->id,
$media->id,
TaskElementMapper::class,
'media',
'',
@ -594,7 +594,7 @@ final class ApiController extends Controller
$ref = new Reference();
$ref->name = $media->name;
$ref->source = new NullMedia($media->getId());
$ref->source = new NullMedia($media->id);
$ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($path);
@ -610,8 +610,8 @@ final class ApiController extends Controller
$this->createModelRelation(
$request->header->account,
$collection->getId(),
$ref->getId(),
$collection->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
@ -638,7 +638,7 @@ final class ApiController extends Controller
$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->task = $task->id;
$element->description = Markdown::parse($request->getDataString('plain') ?? '');
$element->descriptionRaw = $request->getDataString('plain') ?? '';
@ -1039,7 +1039,7 @@ final class ApiController extends Controller
$this->createModelRelation(
$request->header->account,
(int) $request->getData('attributetype'),
$attrValue->getId(),
$attrValue->id,
TaskAttributeTypeMapper::class, 'defaults', '', $request->getOrigin()
);
}

4
Controller/BackendController.php
View File

@ -203,11 +203,11 @@ final class BackendController extends Controller implements DashboardElementInte
$accountId = $request->header->account;
if (!($task->createdBy->getId() === $accountId
if (!($task->createdBy->id === $accountId
|| $task->isCCAccount($accountId)
|| $task->isToAccount($accountId))
&& !$this->app->accountManager->get($accountId)->hasPermission(
PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::TASK, $task->getId())
PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::TASK, $task->id)
) {
$view->setTemplate('/Web/Backend/Error/403_inline');
$response->header->status = RequestStatusCode::R_403;

2
Models/RelationAbstract.php
View File

@ -33,7 +33,7 @@ abstract class RelationAbstract implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Duty.

6
Models/Task.php
View File

@ -38,7 +38,7 @@ class Task implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Title.
@ -107,7 +107,7 @@ class Task implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $type = TaskType::SINGLE;
public int $type = TaskType::SINGLE;
/**
* Status.
@ -115,7 +115,7 @@ class Task implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $status = TaskStatus::OPEN;
public int $status = TaskStatus::OPEN;
/**
* Completion status

2
Models/TaskAttribute.php
View File

@ -30,7 +30,7 @@ class TaskAttribute implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Task this attribute belongs to

2
Models/TaskAttributeType.php
View File

@ -33,7 +33,7 @@ class TaskAttributeType implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Name/string identifier by which it can be found/categorized

2
Models/TaskAttributeValue.php
View File

@ -35,7 +35,7 @@ class TaskAttributeValue implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Depending attribute type

28
Models/TaskElement.php
View File

@ -36,7 +36,7 @@ class TaskElement implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Description.
@ -84,7 +84,7 @@ class TaskElement implements \JsonSerializable
* @var int
* @since 1.0.0
*/
private int $status = TaskStatus::OPEN;
public int $status = TaskStatus::OPEN;
/**
* Due.
@ -248,7 +248,7 @@ class TaskElement implements \JsonSerializable
{
foreach ($this->accRelation as $acc) {
if ($acc->getDuty() === DutyType::TO
&& $acc->getRelation()->getId() === $id
&& $acc->getRelation()->id === $id
) {
return true;
}
@ -270,7 +270,7 @@ class TaskElement implements \JsonSerializable
{
foreach ($this->grpRelation as $grp) {
if ($grp->getDuty() === DutyType::TO
&& $grp->getRelation()->getId() === $id
&& $grp->getRelation()->id === $id
) {
return true;
}
@ -292,7 +292,7 @@ class TaskElement implements \JsonSerializable
{
foreach ($this->accRelation as $acc) {
if ($acc->getDuty() === DutyType::CC
&& $acc->getRelation()->getId() === $id
&& $acc->getRelation()->id === $id
) {
return true;
}
@ -314,7 +314,7 @@ class TaskElement implements \JsonSerializable
{
foreach ($this->grpRelation as $grp) {
if ($grp->getDuty() === DutyType::CC
&& $grp->getRelation()->getId() === $id
&& $grp->getRelation()->id === $id
) {
return true;
}
@ -352,10 +352,10 @@ class TaskElement implements \JsonSerializable
*/
public function addGroupTo(Group $group) : void
{
$groupId = $group->getId();
$groupId = $group->id;
foreach ($this->grpRelation as $grp) {
$grpId = $grp->getRelation()->getId();
$grpId = $grp->getRelation()->id;
if ($grpId === $groupId && $grp->getDuty() === DutyType::TO) {
return;
@ -376,10 +376,10 @@ class TaskElement implements \JsonSerializable
*/
public function addAccountTo(Account $account) : void
{
$accountId = $account->getId();
$accountId = $account->id;
foreach ($this->accRelation as $acc) {
$accId = $acc->getRelation()->getId();
$accId = $acc->getRelation()->id;
if ($accId === $accountId && $acc->getDuty() === DutyType::TO) {
return;
@ -444,10 +444,10 @@ class TaskElement implements \JsonSerializable
*/
public function addGroupCC(Group $group) : void
{
$groupId = $group->getId();
$groupId = $group->id;
foreach ($this->grpRelation as $grp) {
$grpId = $grp->getRelation()->getId();
$grpId = $grp->getRelation()->id;
if ($grpId === $groupId && $grp->getDuty() === DutyType::CC) {
return;
@ -468,10 +468,10 @@ class TaskElement implements \JsonSerializable
*/
public function addAccountCC(Account $account) : void
{
$accountId = $account->getId();
$accountId = $account->id;
foreach ($this->accRelation as $acc) {
$accId = $acc->getRelation()->getId();
$accId = $acc->getRelation()->id;
if ($accId === $accountId && $acc->getDuty() === DutyType::CC) {
return;

2
Models/TaskSeen.php
View File

@ -32,7 +32,7 @@ class TaskSeen
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
public \DateTime $seenAt;

2
Models/TaskTemplate.php
View File

@ -30,5 +30,5 @@ class TaskTemplate extends Task
* @var int
* @since 1.0.0
*/
protected int $type = TaskType::TEMPLATE;
public int $type = TaskType::TEMPLATE;
}

2
Theme/Backend/Components/Tasks/list.tpl.php
View File

@ -31,7 +31,7 @@ use phpOMS\Uri\UriFactory;
<?php
$c = 0;
foreach ($this->tasks as $key => $task) : ++$c;
$url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('task/single?{?}&id=' . $task->getId()));
$url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('task/single?{?}&id=' . $task->id));
$color = 'darkred';
if ($task->getStatus() === TaskStatus::DONE) { $color = 'green'; }

6
Theme/Backend/Components/Tasks/status.tpl.php
View File

@ -1,13 +1,13 @@
<div class="ipt-wrap">
<div class="ipt-first">
<span class="input">
<div class="advancedSelect" id="<?= $this->getId(); ?>"
<div class="advancedSelect" id="<?= $this->id; ?>"
data-search="true"
data-multiple="false"
data-src="api/admin/find/accgrp?search={!#i<?= $this->getId(); ?>}">
data-src="api/admin/find/accgrp?search={!#i<?= $this->id; ?>}">
<template><!-- Template for the selected element --></template>
</div>
<div id="<?= $this->getId(); ?>-popup" class="popup" data-active="true" data-selected="<?= $task->getStatus(); ?>">
<div id="<?= $this->id; ?>-popup" class="popup" data-active="true" data-selected="<?= $task->getStatus(); ?>">
<template class="rowTemplate"><!-- Template for remote data or data manually to be added --></template>
<tr><td data-value="<?= TaskStatus::OPEN; ?>"><?= $this->getHtml('S1'); ?>
<tr><td data-value="<?= TaskStatus::WORKING; ?>"><?= $this->getHtml('S2'); ?>

2
Theme/Backend/dashboard-task.tpl.php
View File

@ -34,7 +34,7 @@ $tasksList = $this->getData('tasks') ?? [];
foreach ($tasksList as $key => $task) : ++$c;
$url = UriFactory::build(!empty($task->redirect)
? $task->redirect
: ('task/single?{?}&id=' . $task->getId())
: ('task/single?{?}&id=' . $task->id)
);
?>
<tr data-href="<?= $url; ?>">

18
Theme/Backend/task-dashboard.tpl.php
View File

@ -19,8 +19,8 @@ use phpOMS\Uri\UriFactory;
/** @var \Modules\Tasks\Models\Task[] $tasks */
$tasks = $this->getData('tasks') ?? [];
$previous = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \reset($tasks)->getId() . '&ptype=p';
$next = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \end($tasks)->getId() . '&ptype=n';
$previous = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \reset($tasks)->id . '&ptype=p';
$next = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \end($tasks)->id . '&ptype=n';
$open = $this->getData('open');
@ -48,8 +48,8 @@ if ($open !== null) :
foreach ($open as $key => $task) : ++$c;
$url = UriFactory::build(!empty($task->redirect)
? '{/lang}{/app}/' . $task->redirect
: ('task/single?{?}&id=' . $task->getId()),
['$id' => $task->getId()]
: ('task/single?{?}&id=' . $task->id),
['$id' => $task->id]
);
?>
<tr tabindex="0" data-href="<?= $url; ?>">
@ -76,7 +76,7 @@ if ($open !== null) :
</a>
<?php endforeach; ?>
<td data-label="<?= $this->getHtml('Creator'); ?>">
<a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $task->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?></a>
<a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $task->createdBy->id); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?></a>
<td data-label="<?= $this->getHtml('Created'); ?>">
<a href="<?= $url; ?>"><?= $this->printHtml($task->createdAt->format('Y-m-d H:i')); ?></a>
<?php endforeach; if ($c == 0) : ?>
@ -106,15 +106,15 @@ if ($open !== null) :
<?php
$c = 0;
foreach ($tasks as $key => $task) :
if ($open !== null && isset($open[$task->getId()])) {
if ($open !== null && isset($open[$task->id])) {
continue;
}
++$c;
$url = UriFactory::build(!empty($task->redirect)
? '{/lang}{/app}/' . $task->redirect
: ('task/single?{?}&id=' . $task->getId()),
['$id' => $task->getId()]
: ('task/single?{?}&id=' . $task->id),
['$id' => $task->id]
);
?>
<tr tabindex="0" data-href="<?= $url; ?>">
@ -141,7 +141,7 @@ if ($open !== null) :
</a>
<?php endforeach; ?>
<td data-label="<?= $this->getHtml('Creator'); ?>">
<a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $task->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?></a>
<a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $task->createdBy->id); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?></a>
<td data-label="<?= $this->getHtml('Created'); ?>">
<a href="<?= $url; ?>"><?= $this->printHtml($task->createdAt->format('Y-m-d H:i')); ?></a>
<?php endforeach; if ($c == 0) : ?>

32
Theme/Backend/task-single.tpl.php
View File

@ -57,7 +57,7 @@ echo $this->getData('nav')->render(); ?>
<div class="portlet-head">
<div class="row middle-xs">
<span class="col-xs-0">
<img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($task->createdBy->getId()); ?>">
<img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($task->createdBy->id); ?>">
</span>
<span>
<?= $this->printHtml($task->createdBy->name1); ?> - <?= $this->printHtml($task->createdAt->format('Y/m/d H:i')); ?>
@ -84,7 +84,7 @@ echo $this->getData('nav')->render(); ?>
<?php if (!empty($taskMedia)) : ?>
<div>
<?php foreach ($taskMedia as $media) : ?>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $media->id);?>"><?= $media->name; ?></a></span>
<?php endforeach; ?>
</div>
<?php endif; ?>
@ -102,7 +102,7 @@ echo $this->getData('nav')->render(); ?>
</div>
</div>
<div class="col-xs-0 end-xs plain-grid">
<?php if ($task->isEditable && $this->request->header->account === $task->createdBy->getId()) : ?>
<?php if ($task->isEditable && $this->request->header->account === $task->createdBy->id) : ?>
<div class="col-xs end-xs plain-grid">
<button class="save hidden"><?= $this->getHtml('Save', '0', '0'); ?></button>
<button class="cancel hidden"><?= $this->getHtml('Cancel', '0', '0'); ?></button>
@ -176,7 +176,7 @@ echo $this->getData('nav')->render(); ?>
<section class="portlet">
<div class="portlet-body">
<?= \sprintf($this->getHtml('status_change'),
'<a href="' . UriFactory::build('profile/single?{?}&for=' . $element->createdBy->getId()) . '">' . $this->printHtml(
'<a href="' . UriFactory::build('profile/single?{?}&for=' . $element->createdBy->id) . '">' . $this->printHtml(
$this->renderUserName(
'%3$s %2$s %1$s',
[$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login])
@ -196,7 +196,7 @@ echo $this->getData('nav')->render(); ?>
<section class="portlet">
<div class="portlet-body">
<?= \sprintf($this->getHtml('priority_change'),
'<a href="' . UriFactory::build('profile/single?{?}&for=' . $element->createdBy->getId()) . '">' . $this->printHtml(
'<a href="' . UriFactory::build('profile/single?{?}&for=' . $element->createdBy->id) . '">' . $this->printHtml(
$this->renderUserName(
'%3$s %2$s %1$s',
[$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login])
@ -211,18 +211,18 @@ echo $this->getData('nav')->render(); ?>
<?php endif; ?>
<?php if ($element->description !== '') : ?>
<section id="taskelmenet-<?= $element->getId(); ?>" class="portlet taskElement"
<section id="taskelmenet-<?= $element->id; ?>" class="portlet taskElement"
data-update-content="#elements"
data-update-element=".taskElement .taskElement-content"
data-update-tpl="#taskElementContentTpl"
data-tag="form"
data-method="POST"
data-id="<?= $element->getId(); ?>"
data-uri="<?= UriFactory::build('{/api}task/element?id=' . $element->getId() .'&csrf={$CSRF}'); ?>">
data-id="<?= $element->id; ?>"
data-uri="<?= UriFactory::build('{/api}task/element?id=' . $element->id .'&csrf={$CSRF}'); ?>">
<div class="portlet-head">
<div class="row middle-xs">
<span class="col-xs-0">
<img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($element->createdBy->getId()); ?>">
<img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($element->createdBy->id); ?>">
</span>
<span class="col-xs">
<?= $this->printHtml(
@ -248,13 +248,13 @@ echo $this->getData('nav')->render(); ?>
<?php $elementMedia = $element->getMedia();
if (!empty($elementMedia)
|| ($task->isEditable
&& $this->request->header->account === $element->createdBy->getId())
&& $this->request->header->account === $element->createdBy->id)
) : ?>
<div class="portlet-foot row middle-xs">
<?php if (!empty($elementMedia)) : ?>
<div>
<?php foreach ($elementMedia as $media) : ?>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $media->id);?>"><?= $media->name; ?></a></span>
<?php endforeach; ?>
</div>
<?php endif; ?>
@ -279,10 +279,10 @@ echo $this->getData('nav')->render(); ?>
<?php endif; ?>
<?php if ($task->isEditable
&& $this->request->header->account === $element->createdBy->getId()
&& $this->request->header->account === $element->createdBy->id
) : ?>
<div class="col-xs end-xs plain-grid">
<input type="hidden" value="<?= $element->getId(); ?>" name="id">
<input type="hidden" value="<?= $element->id; ?>" name="id">
<button class="save hidden"><?= $this->getHtml('Save', '0', '0'); ?></button>
<button class="cancel hidden"><?= $this->getHtml('Cancel', '0', '0'); ?></button>
<button class="update"><?= $this->getHtml('Edit', '0', '0'); ?></button>
@ -296,18 +296,18 @@ echo $this->getData('nav')->render(); ?>
<?php
$tos = $element->getTo();
if (\count($tos) > 1
|| (!empty($tos) && $tos[0]->getRelation()->getId() !== $element->createdBy->getId())
|| (!empty($tos) && $tos[0]->getRelation()->id !== $element->createdBy->id)
) : ?>
<section class="portlet wf-100">
<div class="portlet-body">
<a href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $element->createdBy->getId()); ?>"><?= $this->printHtml(
<a href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $element->createdBy->id); ?>"><?= $this->printHtml(
$this->renderUserName(
'%3$s %2$s %1$s',
[$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login])
); ?></a> <?= $this->getHtml('forwarded_to'); ?>
<?php foreach ($tos as $to) : ?>
<?php if ($to instanceof AccountRelation) : ?>
<a href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
<a href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $to->getRelation()->id); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
<?php elseif ($to instanceof GroupRelation) : ?>
<?= $this->printHtml($to->getRelation()->name); ?>
<?php endif; ?>

2
Views/TaskView.php
View File

@ -73,7 +73,7 @@ class TaskView extends View
->where('account', $account)
->execute();
if (($profile instanceof NullProfile) || $profile->image->getPath() === '') {
if ($profile->id === 0 || $profile->image->getPath() === '') {
return UriFactory::build('{/base}/' . $this->defaultProfileImage->getPath());
}

8
tests/Controller/ApiControllerTest.php
View File

@ -120,7 +120,7 @@ final class ControllerTest extends \PHPUnit\Framework\TestCase
$this->module->apiTaskCreate($request, $response);
self::assertEquals('Controller Test Title', $response->get('')['response']->title);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -137,7 +137,7 @@ final class ControllerTest extends \PHPUnit\Framework\TestCase
$this->module->apiTaskGet($request, $response);
self::assertEquals(1, $response->get('')['response']->getId());
self::assertEquals(1, $response->get('')['response']->id);
}
/**
@ -195,7 +195,7 @@ final class ControllerTest extends \PHPUnit\Framework\TestCase
$this->module->apiTaskElementCreate($request, $response);
self::assertEquals('Controller Test', $response->get('')['response']->descriptionRaw);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -212,7 +212,7 @@ final class ControllerTest extends \PHPUnit\Framework\TestCase
$this->module->apiTaskElementGet($request, $response);
self::assertEquals(1, $response->get('')['response']->getId());
self::assertEquals(1, $response->get('')['response']->id);
}
/**

6
tests/Models/AccountRelationTest.php
View File

@ -30,8 +30,8 @@ final class AccountRelationTest extends \PHPUnit\Framework\TestCase
public function testDefault() : void
{
$obj = new AccountRelation();
self::assertEquals(0, $obj->getId());
self::assertEquals(0, $obj->getRelation()->getId());
self::assertEquals(0, $obj->id);
self::assertEquals(0, $obj->getRelation()->id);
self::assertEquals(DutyType::TO, $obj->getDuty());
}
@ -42,7 +42,7 @@ final class AccountRelationTest extends \PHPUnit\Framework\TestCase
public function testSetGet() : void
{
$obj = new AccountRelation($a = new NullAccount(1), DutyType::CC);
self::assertEquals(1, $obj->getRelation()->getId());
self::assertEquals(1, $obj->getRelation()->id);
self::assertEquals(DutyType::CC, $obj->getDuty());
self::assertEquals([

6
tests/Models/GroupRelationTest.php
View File

@ -30,8 +30,8 @@ final class GroupRelationTest extends \PHPUnit\Framework\TestCase
public function testDefault() : void
{
$obj = new GroupRelation();
self::assertEquals(0, $obj->getId());
self::assertEquals(0, $obj->getRelation()->getId());
self::assertEquals(0, $obj->id);
self::assertEquals(0, $obj->getRelation()->id);
self::assertEquals(DutyType::TO, $obj->getDuty());
}
@ -42,7 +42,7 @@ final class GroupRelationTest extends \PHPUnit\Framework\TestCase
public function testSetGet() : void
{
$obj = new GroupRelation($g = new NullGroup(1), DutyType::CC);
self::assertEquals(1, $obj->getRelation()->getId());
self::assertEquals(1, $obj->getRelation()->id);
self::assertEquals(DutyType::CC, $obj->getDuty());
self::assertEquals([

2
tests/Models/NullTaskElementTest.php
View File

@ -37,6 +37,6 @@ final class NullTaskElementTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullTaskElement(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

2
tests/Models/NullTaskTest.php
View File

@ -37,6 +37,6 @@ final class NullTaskTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullTask(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

2
tests/Models/RelationAbstractTest.php
View File

@ -43,7 +43,7 @@ final class RelationAbstractTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->rel->getId());
self::assertEquals(0, $this->rel->id);
self::assertEquals(DutyType::TO, $this->rel->getDuty());
}

6
tests/Models/TaskElementTest.php
View File

@ -42,8 +42,8 @@ final class TaskElementTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->element->getId());
self::assertEquals(0, $this->element->createdBy->getId());
self::assertEquals(0, $this->element->id);
self::assertEquals(0, $this->element->createdBy->id);
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->element->createdAt->format('Y-m-d'));
self::assertEquals((new \DateTime('now'))->modify('+1 day')->format('Y-m-d'), $this->element->due->format('Y-m-d'));
self::assertEquals(TaskStatus::OPEN, $this->element->getStatus());
@ -62,7 +62,7 @@ final class TaskElementTest extends \PHPUnit\Framework\TestCase
public function testCreatedByInputOutput() : void
{
$this->element->createdBy = new NullAccount(1);
self::assertEquals(1, $this->element->createdBy->getId());
self::assertEquals(1, $this->element->createdBy->id);
}
/**

8
tests/Models/TaskMapperTest.php
View File

@ -95,8 +95,8 @@ final class TaskMapperTest extends \PHPUnit\Framework\TestCase
$task->addMedia($media);
$id = TaskMapper::create()->execute($task);
self::assertGreaterThan(0, $task->getId());
self::assertEquals($id, $task->getId());
self::assertGreaterThan(0, $task->id);
self::assertEquals($id, $task->id);
$taskR = TaskMapper::get()
->with('media')
@ -106,11 +106,11 @@ final class TaskMapperTest extends \PHPUnit\Framework\TestCase
->with('taskElements/accRelation/relation')
->with('taskElements/grpRelation')
->with('taskElements/grpRelation/relation')
->where('id', $task->getId())
->where('id', $task->id)
->execute();
self::assertEquals($task->createdAt->format('Y-m-d'), $taskR->createdAt->format('Y-m-d'));
self::assertEquals($task->start->format('Y-m-d'), $taskR->start->format('Y-m-d'));
self::assertEquals($task->getCreatedBy()->getId(), $taskR->getCreatedBy()->getId());
self::assertEquals($task->getCreatedBy()->id, $taskR->getCreatedBy()->id);
self::assertEquals($task->description, $taskR->description);
self::assertEquals($task->descriptionRaw, $taskR->descriptionRaw);
self::assertEquals($task->title, $taskR->title);

10
tests/Models/TaskTest.php
View File

@ -45,8 +45,8 @@ final class TaskTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->task->getId());
self::assertEquals(0, $this->task->getCreatedBy()->getId());
self::assertEquals(0, $this->task->id);
self::assertEquals(0, $this->task->getCreatedBy()->id);
self::assertEquals('', $this->task->title);
self::assertFalse($this->task->isToAccount(0));
self::assertFalse($this->task->isCCAccount(0));
@ -77,7 +77,7 @@ final class TaskTest extends \PHPUnit\Framework\TestCase
public function testCreatedByInputOutput() : void
{
$this->task->setCreatedBy(new NullAccount(1));
self::assertEquals(1, $this->task->getCreatedBy()->getId());
self::assertEquals(1, $this->task->getCreatedBy()->id);
}
/**
@ -182,8 +182,8 @@ final class TaskTest extends \PHPUnit\Framework\TestCase
self::assertTrue($this->task->isCCGroup(8));
self::assertTrue($this->task->isCCGroup(9));
self::assertEquals(0, $this->task->getTaskElements()[0]->getId());
self::assertEquals(0, $this->task->getTaskElement(0)->getId());
self::assertEquals(0, $this->task->getTaskElements()[0]->id);
self::assertEquals(0, $this->task->getTaskElement(0)->id);
}
/**

2
tests/Views/TaskViewTest.php
View File

@ -40,6 +40,6 @@ class TaskViewTest extends \PHPUnit\Framework\TestCase
{
$view = new TaskView();
self::assertEquals('Web/Backend/img/default-user.jpg', $view->getAccountImage(1));
self::assertEquals('/Web/Backend/img/default-user.jpg', $view->getAccountImage(1));
}
}