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

remove some getter/setter

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-24 17:31:21 +01:00
parent 936004a8d2
commit f2968b0cf6
11 changed files with 229 additions and 582 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Controller/ApiController.php
View File

@ -94,14 +94,14 @@ final class ApiController extends Controller
public function apiTaskCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
if (!empty($val = $this->validateTaskCreate($request))) {
$response->set($request->getUri()->__toString(), new FormValidation($val));
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->set($request->uri->__toString(), new FormValidation($val));
$response->header->status = RequestStatusCode::R_400;
return;
}
$task = $this->createTaskFromRequest($request);
$this->createModel($request->getHeader()->getAccount(), $task, TaskMapper::class, 'task', $request->getOrigin());
$this->createModel($request->header->account, $task, TaskMapper::class, 'task', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task', 'Task successfully created.', $task);
}
@ -117,15 +117,15 @@ final class ApiController extends Controller
private function createTaskFromRequest(RequestAbstract $request) : Task
{
$task = new Task();
$task->setTitle((string) ($request->getData('title') ?? ''));
$task->setDescription(Markdown::parse((string) ($request->getData('plain') ?? '')));
$task->setDescriptionRaw((string) ($request->getData('plain') ?? ''));
$task->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
$task->title = (string) ($request->getData('title') ?? '');
$task->description = Markdown::parse((string) ($request->getData('plain') ?? ''));
$task->descriptionRaw = (string) ($request->getData('plain') ?? '');
$task->setCreatedBy(new NullAccount($request->header->account));
$task->setStatus(TaskStatus::OPEN);
$task->setType(TaskType::SINGLE);
if (empty($request->getData('priority'))) {
$task->setDue(empty($request->getData('due')) ? null : new \DateTime($request->getData('due')));
$task->due = empty($request->getData('due')) ? null : new \DateTime($request->getData('due'));
} else {
$task->setPriority((int) $request->getData('priority'));
}
@ -139,7 +139,7 @@ final class ApiController extends Controller
$internalResponse = new HttpResponse();
$this->app->moduleManager->get('Tag')->apiTagCreate($request, $internalResponse, null);
$task->addTag($internalResponse->get($request->getUri()->__toString())['response']);
$task->addTag($internalResponse->get($request->uri->__toString())['response']);
} else {
$task->addTag(new NullTag((int) $tag['id']));
}
@ -147,9 +147,9 @@ final class ApiController extends Controller
}
$element = new TaskElement();
$element->addTo(new NullAccount((int) ($request->getData('forward') ?? $request->getHeader()->getAccount())));
$element->setCreatedBy($task->getCreatedBy());
$element->setDue($task->getDue());
$element->addTo(new NullAccount((int) ($request->getData('forward') ?? $request->header->account)));
$element->createdBy = $task->getCreatedBy();
$element->due = $task->due;
$element->setPriority($task->getPriority());
$element->setStatus(TaskStatus::OPEN);
@ -194,7 +194,7 @@ final class ApiController extends Controller
{
$old = clone TaskMapper::get((int) $request->getData('id'));
$new = $this->updateTaskFromRequest($request);
$this->updateModel($request->getHeader()->getAccount(), $old, $new, TaskMapper::class, 'task', $request->getOrigin());
$this->updateModel($request->header->account, $old, $new, TaskMapper::class, 'task', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task', 'Task successfully updated.', $new);
}
@ -210,10 +210,10 @@ final class ApiController extends Controller
private function updateTaskFromRequest(RequestAbstract $request) : Task
{
$task = TaskMapper::get((int) ($request->getData('id')));
$task->setTitle((string) ($request->getData('title') ?? $task->getTitle()));
$task->setDescription(Markdown::parse((string) ($request->getData('plain') ?? $task->getDescriptionRaw())));
$task->setDescriptionRaw((string) ($request->getData('plain') ?? $task->getDescriptionRaw()));
$task->setDue(new \DateTime((string) ($request->getData('due') ?? $task->getDue()->format('Y-m-d H:i:s'))));
$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 = new \DateTime((string) ($request->getData('due') ?? $task->due->format('Y-m-d H:i:s')));
$task->setStatus((int) ($request->getData('status') ?? $task->getStatus()));
$task->setType((int) ($request->getData('type') ?? $task->getType()));
$task->setPriority((int) ($request->getData('priority') ?? $task->getPriority()));
@ -236,7 +236,7 @@ final class ApiController extends Controller
if (($val['status'] = !TaskStatus::isValidValue((int) $request->getData('status')))
|| ($val['due'] = !((bool) \strtotime((string) $request->getData('due'))))
|| ($val['task'] = !(\is_numeric($request->getData('task'))))
|| ($val['forward'] = !(\is_numeric(empty($request->getData('forward')) ? $request->getHeader()->getAccount() : $request->getData('forward'))))
|| ($val['forward'] = !(\is_numeric(empty($request->getData('forward')) ? $request->header->account : $request->getData('forward'))))
) {
return $val;
}
@ -261,7 +261,7 @@ final class ApiController extends Controller
{
if (!empty($val = $this->validateTaskElementCreate($request))) {
$response->set('task_element_create', new FormValidation($val));
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
return;
}
@ -275,10 +275,10 @@ final class ApiController extends Controller
$element = $this->createTaskElementFromRequest($request, $task);
$task->setStatus($element->getStatus());
$task->setPriority($element->getPriority());
$task->setDue($element->getDue());
$task->due = $element->due;
$this->createModel($request->getHeader()->getAccount(), $element, TaskElementMapper::class, 'taskelement', $request->getOrigin());
$this->updateModel($request->getHeader()->getAccount(), $task, $task, TaskMapper::class, 'task', $request->getOrigin());
$this->createModel($request->header->account, $element, TaskElementMapper::class, 'taskelement', $request->getOrigin());
$this->updateModel($request->header->account, $task, $task, TaskMapper::class, 'task', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task element', 'Task element successfully created.', $element);
}
@ -295,15 +295,15 @@ final class ApiController extends Controller
private function createTaskElementFromRequest(RequestAbstract $request, Task $task) : TaskElement
{
$element = new TaskElement();
$element->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
$element->setDue(!empty($request->getData('due')) ? new \DateTime((string) ($request->getData('due'))) : $task->getDue());
$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->setStatus((int) ($request->getData('status')));
$element->setTask($task->getId());
$element->setDescription(Markdown::parse((string) ($request->getData('plain') ?? '')));
$element->setDescriptionRaw((string) ($request->getData('plain') ?? ''));
$element->task = $task->getId();
$element->description = Markdown::parse((string) ($request->getData('plain') ?? ''));
$element->descriptionRaw = (string) ($request->getData('plain') ?? '');
$tos = $request->getData('to') ?? $request->getHeader()->getAccount();
$tos = $request->getData('to') ?? $request->header->account;
if (!\is_array($tos)) {
$tos = [$tos];
}
@ -360,7 +360,7 @@ final class ApiController extends Controller
{
$old = clone TaskElementMapper::get((int) $request->getData('id'));
$new = $this->updateTaskElementFromRequest($request);
$this->updateModel($request->getHeader()->getAccount(), $old, $new, TaskElementMapper::class, 'taskelement', $request->getOrigin());
$this->updateModel($request->header->account, $old, $new, TaskElementMapper::class, 'taskelement', $request->getOrigin());
/**
* @todo Orange-Management/oms-Tasks#2
@ -368,7 +368,7 @@ final class ApiController extends Controller
* The task status is not normalized and relates to the last task element.
* Depending on the task status of the last task element also the task status should change.
*/
//$this->updateModel($request->getHeader()->getAccount(), $task, $task, TaskMapper::class, 'task', $request->getOrigin());
//$this->updateModel($request->header->account, $task, $task, TaskMapper::class, 'task', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task element', 'Task element successfully updated.', $new);
}
@ -384,12 +384,12 @@ final class ApiController extends Controller
private function updateTaskElementFromRequest(RequestAbstract $request) : TaskElement
{
$element = TaskElementMapper::get((int) ($request->getData('id')));
$element->setDue(new \DateTime((string) ($request->getData('due') ?? $element->getDue()->format('Y-m-d H:i:s'))));
$element->due = new \DateTime((string) ($request->getData('due') ?? $element->due->format('Y-m-d H:i:s')));
$element->setStatus((int) ($request->getData('status') ?? $element->getStatus()));
$element->setDescription(Markdown::parse((string) ($request->getData('plain') ?? $element->getDescriptionRaw())));
$element->setDescriptionRaw((string) ($request->getData('plain') ?? $element->getDescriptionRaw()));
$element->description = Markdown::parse((string) ($request->getData('plain') ?? $element->descriptionRaw));
$element->descriptionRaw = (string) ($request->getData('plain') ?? $element->descriptionRaw);
$tos = $request->getData('to') ?? $request->getHeader()->getAccount();
$tos = $request->getData('to') ?? $request->header->account;
if (!\is_array($tos)) {
$tos = [$tos];
}

14
Controller/BackendController.php
View File

@ -75,17 +75,17 @@ final class BackendController extends Controller implements DashboardElementInte
if ($request->getData('ptype') === 'p') {
$view->setData('tasks',
TaskMapper::withConditional('language', $response->getLanguage())
::getAnyBeforePivot($request->getHeader()->getAccount(), (int) ($request->getData('id') ?? 0), null, 25)
::getAnyBeforePivot($request->header->account, (int) ($request->getData('id') ?? 0), null, 25)
);
} elseif ($request->getData('ptype') === 'n') {
$view->setData('tasks',
TaskMapper::withConditional('language', $response->getLanguage())
::getAnyAfterPivot($request->getHeader()->getAccount(), (int) ($request->getData('id') ?? 0), null, 25)
::getAnyAfterPivot($request->header->account, (int) ($request->getData('id') ?? 0), null, 25)
);
} else {
$view->setData('tasks',
TaskMapper::withConditional('language', $response->getLanguage())
::getAnyAfterPivot($request->getHeader()->getAccount(), 0, null, 25)
::getAnyAfterPivot($request->header->account, 0, null, 25)
);
}
@ -127,8 +127,8 @@ final class BackendController extends Controller implements DashboardElementInte
{
$view = new TaskView($this->app->l11nManager, $request, $response);
if (!TaskMapper::hasReadingPermission($request->getHeader()->getAccount(), (int) $request->getData('id'))) {
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
if (!TaskMapper::hasReadingPermission($request->header->account, (int) $request->getData('id'))) {
$response->header->status = RequestStatusCode::R_403;
$view->setTemplate('/Web/Backend/Error/403');
$this->app->loadLanguageFromPath(
@ -144,7 +144,7 @@ final class BackendController extends Controller implements DashboardElementInte
$head->addAsset(AssetType::CSS, 'Modules/Tasks/Theme/Backend/css/styles.css');
$task = TaskMapper::withConditional('language', $response->getLanguage())::get((int) $request->getData('id'), RelationType::ALL, 4);
$accountId = $request->getHeader()->getAccount();
$accountId = $request->header->account;
if (!($task->getCreatedBy()->getId() === $accountId
|| $task->isCCAccount($accountId)
@ -153,7 +153,7 @@ final class BackendController extends Controller implements DashboardElementInte
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK, $task->getId())
) {
$view->setTemplate('/Web/Backend/Error/403_inline');
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
$response->header->status = RequestStatusCode::R_403;
return $view;
}

256
Models/Task.php
View File

@ -46,7 +46,7 @@ class Task implements \JsonSerializable
* @var string
* @since 1.0.0
*/
protected string $title = '';
public string $title = '';
/**
* Creator.
@ -62,7 +62,7 @@ class Task implements \JsonSerializable
* @var \DateTimeImmutable
* @since 1.0.0
*/
protected \DateTimeImmutable $createdAt;
public \DateTimeImmutable $createdAt;
/**
* Description.
@ -70,7 +70,7 @@ class Task implements \JsonSerializable
* @var string
* @since 1.0.0
*/
protected string $description = '';
public string $description = '';
/**
* Description raw.
@ -78,7 +78,7 @@ class Task implements \JsonSerializable
* @var string
* @since 1.0.0
*/
protected string $descriptionRaw = '';
public string $descriptionRaw = '';
/**
* Type.
@ -99,18 +99,22 @@ class Task implements \JsonSerializable
/**
* Task can be closed by user.
*
* @var bool
* @since 1.0.0
*/
protected bool $isClosable = true;
/**
* Task can be edited by user.
* Setting it to false will only allow other modules to close this task
*
* @var bool
* @since 1.0.0
*/
protected bool $isEditable = true;
public bool $isClosable = true;
/**
* Task can be edited by user.
*
* Setting it to false will only allow other modules to close this task
*
* @var bool
* @since 1.0.0
*/
public bool $isEditable = true;
/**
* Start.
@ -118,7 +122,7 @@ class Task implements \JsonSerializable
* @var null|\DateTime
* @since 1.0.0
*/
protected ?\DateTime $start = null;
public ?\DateTime $start = null;
/**
* Due.
@ -126,7 +130,7 @@ class Task implements \JsonSerializable
* @var null|\DateTime
* @since 1.0.0
*/
protected ?\DateTime $due = null;
public ?\DateTime $due = null;
/**
* Done.
@ -134,7 +138,7 @@ class Task implements \JsonSerializable
* @var null|\DateTime
* @since 1.0.0
*/
protected ?\DateTime $done = null;
public ?\DateTime $done = null;
/**
* Task elements.
@ -203,62 +207,6 @@ class Task implements \JsonSerializable
return $this->id;
}
/**
* Set closable
*
* Setting it to false will only allow other modules to close this task
*
* @param bool $closable Is closable
*
* @return void
*
* @since 1.0.0
*/
public function setClosable(bool $closable) : void
{
$this->isClosable = $closable;
}
/**
* Is closable
*
* @return bool
*
* @since 1.0.0
*/
public function isClosable() : bool
{
return $this->isClosable;
}
/**
* Set editable
*
* Setting it to false will only allow other modules to close this task
*
* @param bool $editable Is editable
*
* @return void
*
* @since 1.0.0
*/
public function setEditable(bool $editable) : void
{
$this->isEditable = $editable;
}
/**
* Is editable
*
* @return bool
*
* @since 1.0.0
*/
public function isEditable() : bool
{
return $this->isEditable;
}
/**
* Adding new task element.
*
@ -405,40 +353,6 @@ class Task implements \JsonSerializable
return false;
}
/**
* @return \DateTimeImmutable
*
* @since 1.0.0
*/
public function getCreatedAt() : \DateTimeImmutable
{
return $this->createdAt;
}
/**
* @return \DateTime
*
* @since 1.0.0
*/
public function getStart() : \DateTime
{
return $this->start ?? new \DateTime();
}
/**
* Set start time of task
*
* @param \DateTime $start Start date of task
*
* @return void
*
* @since 1.0.0
*/
public function setStart(\DateTime $start) : void
{
$this->start = $start;
}
/**
* Get created by
*
@ -463,111 +377,7 @@ class Task implements \JsonSerializable
public function setCreatedBy(Account $account) : void
{
$this->createdBy = $account;
$this->schedule->setCreatedBy($account);
}
/**
* Get description
*
* @return string
*
* @since 1.0.0
*/
public function getDescription() : string
{
return $this->description;
}
/**
* Set description
*
* @param string $description Description
*
* @return void
*
* @since 1.0.0
*/
public function setDescription(string $description) : void
{
$this->description = $description;
}
/**
* Get description
*
* @return string
*
* @since 1.0.0
*/
public function getDescriptionRaw() : string
{
return $this->descriptionRaw;
}
/**
* Set description
*
* @param string $description Description
*
* @return void
*
* @since 1.0.0
*/
public function setDescriptionRaw(string $description) : void
{
$this->descriptionRaw = $description;
}
/**
* Get done date
*
* @return null|\DateTime
*
* @since 1.0.0
*/
public function getDone() : ?\DateTime
{
return $this->done;
}
/**
* Set done date
*
* @param \DateTime $done Done date
*
* @return void
*
* @since 1.0.0
*/
public function setDone(\DateTime $done) : void
{
$this->done = $done;
}
/**
* Get due date
*
* @return null|\DateTime
*
* @since 1.0.0
*/
public function getDue() : ?\DateTime
{
return $this->due;
}
/**
* Set due date
*
* @param null|\DateTime $due Due date
*
* @return void
*
* @since 1.0.0
*/
public function setDue(?\DateTime $due) : void
{
$this->due = $due;
$this->schedule->createdBy = $account;
}
/**
@ -634,32 +444,6 @@ class Task implements \JsonSerializable
$this->priority = $priority;
}
/**
* Get title
*
* @return string
*
* @since 1.0.0
*/
public function getTitle() : string
{
return $this->title;
}
/**
* Set title
*
* @param string $title Title
*
* @return void
*
* @since 1.0.0
*/
public function setTitle(string $title) : void
{
$this->title = $title;
}
/**
* Remove Element from list.
*

149
Models/TaskElement.php
View File

@ -44,7 +44,7 @@ class TaskElement implements \JsonSerializable
* @var string
* @since 1.0.0
*/
private string $description = '';
public string $description = '';
/**
* Description raw.
@ -52,7 +52,7 @@ class TaskElement implements \JsonSerializable
* @var string
* @since 1.0.0
*/
private string $descriptionRaw = '';
public string $descriptionRaw = '';
/**
* Task.
@ -60,7 +60,7 @@ class TaskElement implements \JsonSerializable
* @var int
* @since 1.0.0
*/
private int $task = 0;
public int $task = 0;
/**
* Creator.
@ -68,7 +68,7 @@ class TaskElement implements \JsonSerializable
* @var Account
* @since 1.0.0
*/
private Account $createdBy;
public Account $createdBy;
/**
* Created.
@ -76,7 +76,7 @@ class TaskElement implements \JsonSerializable
* @var \DateTimeImmutable
* @since 1.0.0
*/
private \DateTimeImmutable $createdAt;
public \DateTimeImmutable $createdAt;
/**
* Status.
@ -92,7 +92,7 @@ class TaskElement implements \JsonSerializable
* @var null|\DateTime
* @since 1.0.0
*/
private ?\DateTime $due = null;
public ?\DateTime $due = null;
/**
* Priority
@ -151,40 +151,6 @@ class TaskElement implements \JsonSerializable
return $this->id;
}
/**
* @return \DateTimeImmutable
*
* @since 1.0.0
*/
public function getCreatedAt() : \DateTimeImmutable
{
return $this->createdAt;
}
/**
* @return Account
*
* @since 1.0.0
*/
public function getCreatedBy() : Account
{
return $this->createdBy;
}
/**
* Set created by
*
* @param Account $creator Creator
*
* @return void
*
* @since 1.0.0
*/
public function setCreatedBy(Account $creator) : void
{
$this->createdBy = $creator;
}
/**
* Get all media
*
@ -211,83 +177,6 @@ class TaskElement implements \JsonSerializable
$this->media[] = $media;
}
/**
* Get description
* @return string
*
* @since 1.0.0
*/
public function getDescription() : string
{
return $this->description;
}
/**
* Set description
*
* @param string $description Description
*
* @return void
*
* @since 1.0.0
*/
public function setDescription(string $description) : void
{
$this->description = $description;
}
/**
* Get description
*
* @return string
*
* @since 1.0.0
*/
public function getDescriptionRaw() : string
{
return $this->descriptionRaw;
}
/**
* Set description
*
* @param string $description Description
*
* @return void
*
* @since 1.0.0
*/
public function setDescriptionRaw(string $description) : void
{
$this->descriptionRaw = $description;
}
/**
* Get due date
*
* @return null|\DateTime
*
* @since 1.0.0
*/
public function getDue() : ?\DateTime
{
return $this->due;
}
/**
* Set due date
*
* @param null|\DateTime $due Due date
*
* @return void
*
* @since 1.0.0
*/
public function setDue(?\DateTime $due) : void
{
$this->due = $due;
}
/**
* Get priority
*
@ -624,32 +513,6 @@ class TaskElement implements \JsonSerializable
$this->status = $status;
}
/**
* Get task id
*
* @return int
*
* @since 1.0.0
*/
public function getTask() : int
{
return $this->task;
}
/**
* Set task i
*
* @param int $task Task id
*
* @return void
*
* @since 1.0.0
*/
public function setTask(int $task) : void
{
$this->task = $task;
}
/**
* {@inheritdoc}
*/

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

@ -59,17 +59,17 @@ echo $this->getData('nav')->render(); ?>
<td data-label="<?= $this->getHtml('Due/Priority'); ?>">
<a href="<?= $url; ?>">
<?php if ($task->getPriority() === TaskPriority::NONE) : ?>
<?= $this->printHtml($task->getDue()->format('Y-m-d H:i')); ?>
<?= $this->printHtml($task->due->format('Y-m-d H:i')); ?>
<?php else : ?>
<?= $this->getHtml('P' . $task->getPriority()); ?>
<?php endif; ?>
</a>
<td data-label="<?= $this->getHtml('Title'); ?>">
<a href="<?= $url; ?>"><?= $this->printHtml($task->getTitle()); ?></a>
<a href="<?= $url; ?>"><?= $this->printHtml($task->title); ?></a>
<td data-label="<?= $this->getHtml('Creator'); ?>">
<a href="<?= $url; ?>"><?= $this->printHtml($task->getCreatedBy()->getName1()); ?></a>
<a href="<?= $url; ?>"><?= $this->printHtml($task->getCreatedBy()->name1); ?></a>
<td data-label="<?= $this->getHtml('Created'); ?>">
<a href="<?= $url; ?>"><?= $this->printHtml($task->getCreatedAt()->format('Y-m-d H:i')); ?></a>
<a href="<?= $url; ?>"><?= $this->printHtml($task->createdAt->format('Y-m-d H:i')); ?></a>
<?php endforeach; if ($c == 0) : ?>
<tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<?php endif; ?>

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

@ -37,7 +37,7 @@ echo $this->getData('nav')->render(); ?>
data-tag="form"
data-method="POST"
data-uri="<?= UriFactory::build('{/api}task?id={?id}&csrf={$CSRF}'); ?>">
<?php if ($task->isEditable()) : ?>
<?php if ($task->isEditable) : ?>
<template id="headTpl">
<h1 class="task-title"><input type="text" data-tpl-text="/title" data-tpl-value="/title" data-value="" name="title" autocomplete="off"></h1>
</template>
@ -61,7 +61,7 @@ echo $this->getData('nav')->render(); ?>
<img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($task->getCreatedBy()->getId()); ?>">
</span>
<span>
<?= $this->printHtml($task->getCreatedBy()->getName1()); ?> - <?= $this->printHtml($task->getCreatedAt()->format('Y/m/d H:i')); ?>
<?= $this->printHtml($task->getCreatedBy()->name1); ?> - <?= $this->printHtml($task->createdAt->format('Y/m/d H:i')); ?>
</span>
<span class="col-xs end-xs plain-grid">
<span id="task-status-badge" class="nobreak tag task-status-<?= $this->printHtml($task->getStatus()); ?>">
@ -71,13 +71,13 @@ echo $this->getData('nav')->render(); ?>
</div>
</div>
<div class="portlet-body">
<span class="task-title" data-tpl-text="/title" data-tpl-value="/title" data-value=""><?= $this->printHtml($task->getTitle()); ?></span>
<span class="task-title" data-tpl-text="/title" data-tpl-value="/title" data-value=""><?= $this->printHtml($task->title); ?></span>
<article class="task-content"
data-tpl-text="{/base}/api/task?id={?id}"
data-tpl-value="{/base}/api/task?id={?id}"
data-tpl-value-path="/0/response/descriptionRaw"
data-tpl-text-path="/0/response/description"
data-value=""><?= $task->getDescription(); ?></article>
data-value=""><?= $task->description; ?></article>
</div>
<div class="portlet-foot row">
<div class="row col-xs plain-grid">
@ -85,14 +85,14 @@ echo $this->getData('nav')->render(); ?>
<?php if (!empty($taskMedia)) : ?>
<div>
<?php foreach ($taskMedia as $media) : ?>
<span><?= $media->getName(); ?></span>
<span><?= $media->name; ?></span>
<?php endforeach; ?>
</div>
<?php endif; ?>
<div>
<?php if ($task->getPriority() === TaskPriority::NONE) : ?>
<?= $this->getHtml('Due'); ?>: <?= $this->printHtml($task->getDue()->format('Y/m/d H:i')); ?>
<?= $this->getHtml('Due'); ?>: <?= $this->printHtml($task->due->format('Y/m/d H:i')); ?>
<?php else : ?>
<?= $this->getHtml('Priority'); ?>: <?= $this->getHtml('P' . $task->getPriority()); ?>
<?php endif; ?>
@ -103,7 +103,7 @@ echo $this->getData('nav')->render(); ?>
</div>
</div>
<div class="col-xs-0 end-xs plain-grid">
<?php if ($task->isEditable() && $this->request->getHeader()->getAccount() === $task->getCreatedBy()->getId()) : ?>
<?php if ($task->isEditable && $this->request->header->account === $task->getCreatedBy()->getId()) : ?>
<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>
@ -127,7 +127,7 @@ echo $this->getData('nav')->render(); ?>
<div class="portlet-head">
<div class="row middle-xs">
<span class="col-xs-0">
<img class="profile-image" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($this->request->getHeader()->getAccount()); ?>">
<img class="profile-image" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($this->request->header->account); ?>">
</span>
<span class="col-xs">
<span data-tpl-text="{/base}/api/task/element?id={$id}" data-tpl-text-path="/0/response/createdBy/name/0"></span>
@ -154,7 +154,7 @@ echo $this->getData('nav')->render(); ?>
</div>
</section>
</template>
<?php if ($task->isEditable()) : ?>
<?php if ($task->isEditable) : ?>
<template id="taskElementContentTpl">
<div class="taskElement-content">
<!-- todo: bind js after adding template -->
@ -177,8 +177,8 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100">
<div class="inner">
<?= $this->printHtml(\sprintf($this->getHtml('status_change'),
$element->getCreatedBy()->getName1(),
$element->getCreatedAt()->format('Y-m-d H:i')
$element->createdBy->name1,
$element->createdAt->format('Y-m-d H:i')
)); ?>
<span class="tag task-status-<?= $this->printHtml($element->getStatus()); ?>">
<?= $this->getHtml('S' . $element->getStatus()); ?>
@ -193,8 +193,8 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100">
<div class="inner">
<?= $this->printHtml(\sprintf($this->getHtml('priority_change'),
$element->getCreatedBy()->getName1(),
$element->getCreatedAt()->format('Y-m-d H:i')
$element->createdBy->name1,
$element->createdAt->format('Y-m-d H:i')
)); ?>
<span class="tag task-priority-<?= $this->printHtml($element->getPriority()); ?>">
<?= $this->getHtml('P' . $element->getPriority()); ?>
@ -203,7 +203,7 @@ echo $this->getData('nav')->render(); ?>
</section>
<?php endif; ?>
<?php if ($element->getDescription() !== '') : ?>
<?php if ($element->description !== '') : ?>
<section id="taskelmenet-<?= $element->getId(); ?>" class="portlet taskElement"
data-update-content="#elements"
data-update-element=".taskElement .taskElement-content"
@ -215,35 +215,35 @@ 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($element->getCreatedBy()->getId()); ?>">
<img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($element->createdBy->getId()); ?>">
</span>
<span class="col-xs">
<?= $this->printHtml($element->getCreatedBy()->getName1()); ?> - <?= $this->printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?>
<?= $this->printHtml($element->createdBy->name1); ?> - <?= $this->printHtml($element->createdAt->format('Y-m-d H:i')); ?>
</span>
</div>
</div>
<?php if ($element->getDescription() !== '') : ?>
<?php if ($element->description !== '') : ?>
<div class="portlet-body">
<article class="taskElement-content" data-tpl-text="{/base}/api/task/element?id={$id}"
data-tpl-value="{/base}/api/task/element?id={$id}"
data-tpl-value-path="/0/response/descriptionRaw"
data-tpl-text-path="/0/response/description"
data-value=""><?= $element->getDescription(); ?></article>
data-value=""><?= $element->description; ?></article>
</div>
<?php endif; ?>
<?php $elementMedia = $element->getMedia();
if (!empty($elementMedia)
|| ($task->isEditable()
&& $this->request->getHeader()->getAccount() === $element->getCreatedBy()->getId())
|| ($task->isEditable
&& $this->request->header->account === $element->createdBy->getId())
) : ?>
<div class="portlet-foot row middle-xs">
<?php if (!empty($elementMedia)) : ?>
<div>
<?php foreach ($elementMedia as $media) : ?>
<span><?= $media->getName(); ?></span>
<span><?= $media->name; ?></span>
<?php endforeach; ?>
</div>
<?php endif; ?>
@ -257,18 +257,18 @@ echo $this->getData('nav')->render(); ?>
<?php
if ($element->getPriority() === TaskPriority::NONE
&& ($previous !== null
&& $previous->getDue()->format('Y/m/d H:i') !== $element->getDue()->format('Y/m/d H:i')
&& $previous->due->format('Y/m/d H:i') !== $element->due->format('Y/m/d H:i')
)
) : ?>
<?= $this->getHtml('Due'); ?>: <?= $this->printHtml($element->getDue()->format('Y/m/d H:i')); ?>
<?= $this->getHtml('Due'); ?>: <?= $this->printHtml($element->due->format('Y/m/d H:i')); ?>
<?php elseif ($previous !== null && $previous->getPriority() !== $element->getPriority()) : ?>
<?= $this->getHtml('Priority'); ?>: <?= $this->getHtml('P' . $element->getPriority()); ?>
<?php endif; ?>
</div>
<?php endif; ?>
<?php if ($task->isEditable()
&& $this->request->getHeader()->getAccount() === $element->getCreatedBy()->getId()
<?php if ($task->isEditable
&& $this->request->header->account === $element->createdBy->getId()
) : ?>
<div class="col-xs end-xs plain-grid">
<input type="hidden" value="<?= $element->getId(); ?>" name="id">
@ -285,16 +285,16 @@ echo $this->getData('nav')->render(); ?>
<?php
$tos = $element->getTo();
if (\count($tos) > 1
|| (!empty($tos) && $tos[0]->getRelation()->getId() !== $element->getCreatedBy()->getId())
|| (!empty($tos) && $tos[0]->getRelation()->getId() !== $element->createdBy->getId())
) : ?>
<section class="box wf-100">
<div class="inner">
<?= $this->printHtml($element->getCreatedBy()->getName1()); ?> <?= $this->getHtml('forwarded_to'); ?>
<?= $this->printHtml($element->createdBy->name1); ?> <?= $this->getHtml('forwarded_to'); ?>
<?php foreach ($tos as $to) : ?>
<?php if ($to instanceof AccountRelation) : ?>
<a href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->getName1()); ?></a>
<a href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
<?php elseif ($to instanceof GroupRelation) : ?>
<?= $this->printHtml($to->getRelation()->getName()); ?>
<?= $this->printHtml($to->getRelation()->name); ?>
<?php endif; ?>
<?php endforeach; ?>
</div>
@ -336,7 +336,7 @@ echo $this->getData('nav')->render(); ?>
</select>
<tr><td><label for="iDue"><?= $this->getHtml('Due'); ?></label>
<tr><td><input type="datetime-local" id="iDue" name="due" value="<?= $this->printHtml(
!empty($elements) ? \end($elements)->getDue()->format('Y-m-d\TH:i:s') : $task->getDue()->format('Y-m-d\TH:i:s')
!empty($elements) ? \end($elements)->due->format('Y-m-d\TH:i:s') : $task->due->format('Y-m-d\TH:i:s')
); ?>">
<tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
<tr><td><select id="iStatus" name="status">

4
Views/TaskView.php
View File

@ -44,11 +44,11 @@ class TaskView extends View
{
$profile = ProfileMapper::getFor($account, 'account');
if ($profile === null || $profile->getImage()->getPath() === '') {
if ($profile === null || $profile->image->getPath() === '') {
return UriFactory::build('Web/Backend/img/user_default_' . \mt_rand(1, 6) . '.png');
}
return UriFactory::build($profile->getImage()->getPath());
return UriFactory::build($profile->image->getPath());
}
/**

24
tests/ControllerTest.php
View File

@ -89,14 +89,14 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('title', 'Controller Test Title');
$request->setData('plain', 'Controller Test Description');
$request->setData('due', (new \DateTime())->format('Y-m-d H:i:s'));
$this->module->apiTaskCreate($request, $response);
self::assertEquals('Controller Test Title', $response->get('')['response']->getTitle());
self::assertEquals('Controller Test Title', $response->get('')['response']->title);
self::assertGreaterThan(0, $response->get('')['response']->getId());
}
@ -109,7 +109,7 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', '1');
$this->module->apiTaskGet($request, $response);
@ -126,7 +126,7 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', 1);
$request->setData('title', 'New Title');
$request->setData('description', 'New Content here');
@ -134,7 +134,7 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
$this->module->apiTaskSet($request, $response);
$this->module->apiTaskGet($request, $response);
self::assertEquals('New Title', $response->get('')['response']->getTitle());
self::assertEquals('New Title', $response->get('')['response']->title);
}
/**
@ -146,7 +146,7 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('due', (new \DateTime())->format('Y-m-d H:i:s'));
$request->setData('priority', TaskPriority::HIGH);
$request->setData('status', TaskStatus::DONE);
@ -155,7 +155,7 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
$this->module->apiTaskElementCreate($request, $response);
self::assertEquals('Controller Test', $response->get('')['response']->getDescriptionRaw());
self::assertEquals('Controller Test', $response->get('')['response']->descriptionRaw);
self::assertGreaterThan(0, $response->get('')['response']->getId());
}
@ -168,7 +168,7 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', '1');
$this->module->apiTaskElementGet($request, $response);
@ -185,14 +185,14 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', 1);
$request->setData('plain', 'This is a changed description');
$this->module->apiTaskElementSet($request, $response);
$this->module->apiTaskElementGet($request, $response);
self::assertEquals('This is a changed description', $response->get('')['response']->getDescriptionRaw());
self::assertEquals('This is a changed description', $response->get('')['response']->descriptionRaw);
}
/**
@ -204,7 +204,7 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('plain', 'Controller Test Description');
$request->setData('due', (new \DateTime())->format('Y-m-d H:i:s'));
@ -222,7 +222,7 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('due', (new \DateTime())->format('Y-m-d H:i:s'));
$request->setData('priority', TaskPriority::HIGH);
$request->setData('status', TaskStatus::DONE);

32
tests/Models/TaskElementTest.php
View File

@ -34,15 +34,15 @@ class TaskElementTest extends \PHPUnit\Framework\TestCase
$task = new TaskElement();
self::assertEquals(0, $task->getId());
self::assertEquals(0, $task->getCreatedBy()->getId());
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $task->getCreatedAt()->format('Y-m-d'));
self::assertEquals((new \DateTime('now'))->modify('+1 day')->format('Y-m-d'), $task->getDue()->format('Y-m-d'));
self::assertEquals(0, $task->createdBy->getId());
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $task->createdAt->format('Y-m-d'));
self::assertEquals((new \DateTime('now'))->modify('+1 day')->format('Y-m-d'), $task->due->format('Y-m-d'));
self::assertEquals(TaskStatus::OPEN, $task->getStatus());
self::assertEquals('', $task->getDescription());
self::assertEquals('', $task->getDescriptionRaw());
self::assertEquals('', $task->description);
self::assertEquals('', $task->descriptionRaw);
self::assertEquals([], $task->getTo());
self::assertEquals([], $task->getCC());
self::assertEquals(0, $task->getTask());
self::assertEquals(0, $task->task);
self::assertEquals(TaskPriority::NONE, $task->getPriority());
}
@ -54,8 +54,8 @@ class TaskElementTest extends \PHPUnit\Framework\TestCase
{
$task = new TaskElement();
$task->setCreatedBy(new NullAccount(1));
self::assertEquals(1, $task->getCreatedBy()->getId());
$task->createdBy = new NullAccount(1);
self::assertEquals(1, $task->createdBy->getId());
}
/**
@ -66,8 +66,8 @@ class TaskElementTest extends \PHPUnit\Framework\TestCase
{
$task = new TaskElement();
$task->setDue($date = new \DateTime('2000-05-07'));
self::assertEquals($date->format('Y-m-d'), $task->getDue()->format('Y-m-d'));
$task->due = ($date = new \DateTime('2000-05-07'));
self::assertEquals($date->format('Y-m-d'), $task->due->format('Y-m-d'));
}
/**
@ -102,8 +102,8 @@ class TaskElementTest extends \PHPUnit\Framework\TestCase
{
$task = new TaskElement();
$task->setDescription('Description');
self::assertEquals('Description', $task->getDescription());
$task->description = 'Description';
self::assertEquals('Description', $task->description);
}
/**
@ -114,8 +114,8 @@ class TaskElementTest extends \PHPUnit\Framework\TestCase
{
$task = new TaskElement();
$task->setDescriptionRaw('DescriptionRaw');
self::assertEquals('DescriptionRaw', $task->getDescriptionRaw());
$task->descriptionRaw = 'DescriptionRaw';
self::assertEquals('DescriptionRaw', $task->descriptionRaw);
}
/**
@ -126,8 +126,8 @@ class TaskElementTest extends \PHPUnit\Framework\TestCase
{
$task = new TaskElement();
$task->setTask(2);
self::assertEquals(2, $task->getTask());
$task->task = 2;
self::assertEquals(2, $task->task);
}
/**

126
tests/Models/TaskMapperTest.php
View File

@ -48,35 +48,35 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$task = new Task();
$task->setCreatedBy(new NullAccount(1));
$task->getSchedule()->setCreatedBy(new NullAccount(1));
$task->setStart(new \DateTime('2005-05-05'));
$task->setTitle('Task Test');
$task->getSchedule()->createdBy = new NullAccount(1);
$task->start = new \DateTime('2005-05-05');
$task->title = 'Task Test';
$task->setStatus(TaskStatus::OPEN);
$task->setClosable(false);
$task->isClosable = false;
$task->setPriority(TaskPriority::HIGH);
$task->setDescription('Description');
$task->setDescriptionRaw('DescriptionRaw');
$task->setDone(new \DateTime('2000-05-06'));
$task->setDue(new \DateTime('2000-05-05'));
$task->description = 'Description';
$task->descriptionRaw = 'DescriptionRaw';
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$taskElement1 = new TaskElement();
$taskElement1->setDescription('Desc1');
$taskElement1->setCreatedBy(new NullAccount(1));
$taskElement1->description = 'Desc1';
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->setStatus($task->getStatus());
$task->addElement($taskElement1);
$media = new Media();
$media->setCreatedBy(new NullAccount(1));
$media->setDescription('desc');
$media->createdBy = new NullAccount(1);
$media->description = 'desc';
$media->setPath('some/path');
$media->setSize(11);
$media->setExtension('png');
$media->setName('Task Element Media');
$media->size = 11;
$media->extension = 'png';
$media->name = 'Task Element Media';
$taskElement1->addMedia($media);
$taskElement2 = new TaskElement();
$taskElement2->setDescription('Desc2');
$taskElement2->setCreatedBy(new NullAccount(1));
$taskElement2->description = 'Desc2';
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->setStatus($task->getStatus());
$taskElement2->addAccountTo(new NullAccount(1));
$taskElement2->addAccountCC(new NullAccount(1));
@ -85,12 +85,12 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$task->addElement($taskElement2);
$media = new Media();
$media->setCreatedBy(new NullAccount(1));
$media->setDescription('desc');
$media->createdBy = new NullAccount(1);
$media->description = 'desc';
$media->setPath('some/path');
$media->setSize(11);
$media->setExtension('png');
$media->setName('Task Media');
$media->size = 11;
$media->extension = 'png';
$media->name = 'Task Media';
$task->addMedia($media);
$id = TaskMapper::create($task);
@ -98,22 +98,22 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
self::assertEquals($id, $task->getId());
$taskR = TaskMapper::get($task->getId());
self::assertEquals($task->getCreatedAt()->format('Y-m-d'), $taskR->getCreatedAt()->format('Y-m-d'));
self::assertEquals($task->getStart()->format('Y-m-d'), $taskR->getStart()->format('Y-m-d'));
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->getDescription(), $taskR->getDescription());
self::assertEquals($task->getDescriptionRaw(), $taskR->getDescriptionRaw());
self::assertEquals($task->getTitle(), $taskR->getTitle());
self::assertEquals($task->description, $taskR->description);
self::assertEquals($task->descriptionRaw, $taskR->descriptionRaw);
self::assertEquals($task->title, $taskR->title);
self::assertEquals($task->getStatus(), $taskR->getStatus());
self::assertEquals($task->isClosable(), $taskR->isClosable());
self::assertEquals($task->isClosable, $taskR->isClosable);
self::assertEquals($task->getType(), $taskR->getType());
self::assertEquals($task->getDone()->format('Y-m-d'), $taskR->getDone()->format('Y-m-d'));
self::assertEquals($task->getDue()->format('Y-m-d'), $taskR->getDue()->format('Y-m-d'));
self::assertEquals($task->done->format('Y-m-d'), $taskR->done->format('Y-m-d'));
self::assertEquals($task->due->format('Y-m-d'), $taskR->due->format('Y-m-d'));
self::assertGreaterThan(0, TaskMapper::countUnread(1));
$expected = $task->getMedia();
$actual = $taskR->getMedia();
self::assertEquals(\end($expected)->getName(), \end($actual)->getName());
self::assertEquals(\end($expected)->name, \end($actual)->name);
$expected = $task->getTaskElements();
$actual = $taskR->getTaskElements();
@ -121,8 +121,8 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$expectedMedia = \reset($expected)->getMedia();
$actualMedia = \reset($actual)->getMedia();
self::assertEquals(\end($expected)->getDescription(), \end($actual)->getDescription());
self::assertEquals(\end($expectedMedia)->getName(), \end($actualMedia)->getName());
self::assertEquals(\end($expected)->description, \end($actual)->description);
self::assertEquals(\end($expectedMedia)->name, \end($actualMedia)->name);
self::assertTrue(\end($actual)->isToAccount(1));
self::assertTrue(\end($actual)->isToGroup(1));
@ -159,23 +159,23 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$task = new Task();
$task->setCreatedBy(new NullAccount(1));
$task->getSchedule()->setCreatedBy(new NullAccount(1));
$task->setStart(new \DateTime('2005-05-05'));
$task->setTitle($text->generateText(\mt_rand(1, 5)));
$task->getSchedule()->createdBy = new NullAccount(1);
$task->start = new \DateTime('2005-05-05');
$task->title = $text->generateText(\mt_rand(1, 5));
$task->setStatus($status);
$task->setDescription($text->generateText(\mt_rand(10, 30)));
$task->setDone(new \DateTime('2000-05-06'));
$task->setDue(new \DateTime('2000-05-05'));
$task->description = $text->generateText(\mt_rand(10, 30));
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$taskElement1 = new TaskElement();
$taskElement1->setDescription($text->generateText(\mt_rand(3, 20)));
$taskElement1->setCreatedBy(new NullAccount(1));
$taskElement1->description = $text->generateText(\mt_rand(3, 20));
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->setStatus($status);
$task->addElement($taskElement1);
$taskElement2 = new TaskElement();
$taskElement2->setDescription('Desc2');
$taskElement2->setCreatedBy(new NullAccount(1));
$taskElement2->description = 'Desc2';
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->setStatus($status);
$task->addElement($taskElement2);
@ -200,23 +200,23 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$task = new Task();
$task->setCreatedBy(new NullAccount(1));
$task->getSchedule()->setCreatedBy(new NullAccount(1));
$task->setTitle($text->generateText(\mt_rand(1, 5)));
$task->getSchedule()->createdBy = new NullAccount(1);
$task->title = $text->generateText(\mt_rand(1, 5));
$task->setStatus($status);
$task->setClosable(true);
$task->setDescription($text->generateText(\mt_rand(10, 30)));
$task->setDone(new \DateTime('2000-05-06'));
$task->setDue(new \DateTime('2000-05-05'));
$task->isClosable = true;
$task->description = $text->generateText(\mt_rand(10, 30));
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$taskElement1 = new TaskElement();
$taskElement1->setDescription($text->generateText(\mt_rand(3, 20)));
$taskElement1->setCreatedBy(new NullAccount(1));
$taskElement1->description = $text->generateText(\mt_rand(3, 20));
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->setStatus($status);
$task->addElement($taskElement1);
$taskElement2 = new TaskElement();
$taskElement2->setDescription($text->generateText(\mt_rand(3, 20)));
$taskElement2->setCreatedBy(new NullAccount(1));
$taskElement2->description = $text->generateText(\mt_rand(3, 20));
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->setStatus($status);
$task->addElement($taskElement2);
@ -239,23 +239,23 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$task = new Task();
$task->setCreatedBy(new NullAccount(1));
$task->getSchedule()->setCreatedBy(new NullAccount(1));
$task->setTitle($text->generateText(\mt_rand(1, 5)));
$task->getSchedule()->createdBy = new NullAccount(1);
$task->title = $text->generateText(\mt_rand(1, 5));
$task->setStatus($status);
$task->setClosable(true);
$task->setDescription($text->generateText(\mt_rand(10, 30)));
$task->setDone(new \DateTime('2000-05-06'));
$task->setDue(new \DateTime('2000-05-05'));
$task->isClosable = true;
$task->description = $text->generateText(\mt_rand(10, 30));
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$taskElement1 = new TaskElement();
$taskElement1->setDescription($text->generateText(\mt_rand(3, 20)));
$taskElement1->setCreatedBy(new NullAccount(1));
$taskElement1->description = $text->generateText(\mt_rand(3, 20));
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->setStatus($status);
$task->addElement($taskElement1);
$taskElement2 = new TaskElement();
$taskElement2->setDescription($text->generateText(\mt_rand(3, 20)));
$taskElement2->setCreatedBy(new NullAccount(1));
$taskElement2->description = $text->generateText(\mt_rand(3, 20));
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->setStatus($status);
$task->addElement($taskElement2);

70
tests/Models/TaskTest.php
View File

@ -37,23 +37,23 @@ class TaskTest extends \PHPUnit\Framework\TestCase
self::assertEquals(0, $task->getId());
self::assertEquals(0, $task->getCreatedBy()->getId());
self::assertEquals('', $task->getTitle());
self::assertEquals('', $task->title);
self::assertFalse($task->isToAccount(0));
self::assertFalse($task->isCCAccount(0));
self::assertFalse($task->isToGroup(0));
self::assertFalse($task->isCCGroup(0));
self::assertTrue($task->isEditable());
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $task->getCreatedAt()->format('Y-m-d'));
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $task->getStart()->format('Y-m-d'));
self::assertNull($task->getDone());
self::assertEquals((new \DateTime('now'))->modify('+1 day')->format('Y-m-d'), $task->getDue()->format('Y-m-d'));
self::assertTrue($task->isEditable);
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $task->createdAt->format('Y-m-d'));
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $task->start->format('Y-m-d'));
self::assertNull($task->done);
self::assertEquals((new \DateTime('now'))->modify('+1 day')->format('Y-m-d'), $task->due->format('Y-m-d'));
self::assertEquals(TaskStatus::OPEN, $task->getStatus());
self::assertTrue($task->isClosable());
self::assertTrue($task->isClosable);
self::assertEquals(TaskPriority::NONE, $task->getPriority());
self::assertEquals(TaskType::SINGLE, $task->getType());
self::assertEquals([], $task->getTaskElements());
self::assertEquals('', $task->getDescription());
self::assertEquals('', $task->getDescriptionRaw());
self::assertEquals('', $task->description);
self::assertEquals('', $task->descriptionRaw);
self::assertInstanceOf('\Modules\Tasks\Models\NullTaskElement', $task->getTaskElement(1));
}
@ -77,8 +77,8 @@ class TaskTest extends \PHPUnit\Framework\TestCase
{
$task = new Task();
$task->setStart($date = new \DateTime('2005-05-05'));
self::assertEquals($date->format('Y-m-d'), $task->getStart()->format('Y-m-d'));
$task->start = ($date = new \DateTime('2005-05-05'));
self::assertEquals($date->format('Y-m-d'), $task->start->format('Y-m-d'));
}
/**
@ -89,8 +89,8 @@ class TaskTest extends \PHPUnit\Framework\TestCase
{
$task = new Task();
$task->setTitle('Title');
self::assertEquals('Title', $task->getTitle());
$task->title = 'Title';
self::assertEquals('Title', $task->title);
}
/**
@ -101,8 +101,8 @@ class TaskTest extends \PHPUnit\Framework\TestCase
{
$task = new Task();
$task->setDone($date = new \DateTime('2000-05-06'));
self::assertEquals($date->format('Y-m-d'), $task->getDone()->format('Y-m-d'));
$task->done = ($date = new \DateTime('2000-05-06'));
self::assertEquals($date->format('Y-m-d'), $task->done->format('Y-m-d'));
}
/**
@ -113,8 +113,8 @@ class TaskTest extends \PHPUnit\Framework\TestCase
{
$task = new Task();
$task->setDue($date = new \DateTime('2000-05-07'));
self::assertEquals($date->format('Y-m-d'), $task->getDue()->format('Y-m-d'));
$task->due = ($date = new \DateTime('2000-05-07'));
self::assertEquals($date->format('Y-m-d'), $task->due->format('Y-m-d'));
}
/**
@ -137,8 +137,8 @@ class TaskTest extends \PHPUnit\Framework\TestCase
{
$task = new Task();
$task->setClosable(false);
self::assertFalse($task->isClosable());
$task->isClosable = false;
self::assertFalse($task->isClosable);
}
/**
@ -241,8 +241,8 @@ class TaskTest extends \PHPUnit\Framework\TestCase
{
$task = new Task();
$task->setDescription('Description');
self::assertEquals('Description', $task->getDescription());
$task->description = 'Description';
self::assertEquals('Description', $task->description);
}
/**
@ -253,8 +253,8 @@ class TaskTest extends \PHPUnit\Framework\TestCase
{
$task = new Task();
$task->setDescriptionRaw('DescriptionRaw');
self::assertEquals('DescriptionRaw', $task->getDescriptionRaw());
$task->descriptionRaw = 'DescriptionRaw';
self::assertEquals('DescriptionRaw', $task->descriptionRaw);
}
/**
@ -265,8 +265,8 @@ class TaskTest extends \PHPUnit\Framework\TestCase
{
$task = new Task();
$task->setEditable(false);
self::assertFalse($task->isEditable());
$task->isEditable = false;
self::assertFalse($task->isEditable);
}
/**
@ -280,14 +280,14 @@ class TaskTest extends \PHPUnit\Framework\TestCase
$arr = [
'id' => 0,
'createdBy' => $task->getCreatedBy(),
'createdAt' => $task->getCreatedAt(),
'title' => $task->getTitle(),
'description' => $task->getDescription(),
'createdAt' => $task->createdAt,
'title' => $task->title,
'description' => $task->description,
'status' => $task->getStatus(),
'type' => $task->getType(),
'priority' => $task->getPriority(),
'due' => $task->getDue(),
'done' => $task->getDone(),
'due' => $task->due,
'done' => $task->done,
];
$isSubset = true;
@ -312,14 +312,14 @@ class TaskTest extends \PHPUnit\Framework\TestCase
$arr = [
'id' => 0,
'createdBy' => $task->getCreatedBy(),
'createdAt' => $task->getCreatedAt(),
'title' => $task->getTitle(),
'description' => $task->getDescription(),
'createdAt' => $task->createdAt,
'title' => $task->title,
'description' => $task->description,
'status' => $task->getStatus(),
'type' => $task->getType(),
'priority' => $task->getPriority(),
'due' => $task->getDue(),
'done' => $task->getDone(),
'due' => $task->due,
'done' => $task->done,
];
$isSubset = true;