mirror of
https://github.com/Karaka-Management/oms-Tasks.git
synced 2026-01-11 15:38:40 +00:00
phpcbf
This commit is contained in:
parent
0b0f754666
commit
27f495879f
|
|
@ -19,7 +19,6 @@ use phpOMS\Module\UpdateAbstract;
|
|||
use phpOMS\System\File\Directory;
|
||||
use phpOMS\Module\InfoManager;
|
||||
|
||||
|
||||
/**
|
||||
* Navigation class.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -244,8 +244,7 @@ class Controller extends ModuleAbstract implements WebInterface
|
|||
private function validateTaskCreate(RequestAbstract $request) : array
|
||||
{
|
||||
$val = [];
|
||||
if (
|
||||
($val['title'] = empty($request->getData('title')))
|
||||
if (($val['title'] = empty($request->getData('title')))
|
||||
|| ($val['description'] = empty($request->getData('description')))
|
||||
|| ($val['due'] = !((bool) strtotime((string) $request->getData('due'))))
|
||||
|| ($val['forward'] = !(is_numeric($request->getData('forward') ?? 0)))
|
||||
|
|
@ -317,8 +316,7 @@ class Controller extends ModuleAbstract implements WebInterface
|
|||
private function validateTaskElementCreate(RequestAbstract $request) : array
|
||||
{
|
||||
$val = [];
|
||||
if (
|
||||
($val['status'] = !TaskStatus::isValidValue((int) $request->getData('status')))
|
||||
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'))))
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum;
|
|||
*/
|
||||
abstract class PermissionState extends Enum
|
||||
{
|
||||
/* public */ const DASHBOARD = 1;
|
||||
/* public */ const TASK = 2;
|
||||
/* public */ const DASHBOARD = 1;
|
||||
/* public */ const TASK = 2;
|
||||
/* public */ const TASKELEMENT = 3;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,8 +148,8 @@ class Task implements \JsonSerializable
|
|||
public function __construct()
|
||||
{
|
||||
$this->createdAt = new \DateTime('now');
|
||||
$this->start = new \DateTime('now');
|
||||
$this->due = new \DateTime('now');
|
||||
$this->start = new \DateTime('now');
|
||||
$this->due = new \DateTime('now');
|
||||
$this->due->modify('+1 day');
|
||||
$this->schedule = new Schedule();
|
||||
}
|
||||
|
|
@ -502,7 +502,8 @@ class Task implements \JsonSerializable
|
|||
*
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public function getSchedule() : Schedule {
|
||||
public function getSchedule() : Schedule
|
||||
{
|
||||
return $this->schedule;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
declare(strict_types = 1);
|
||||
|
||||
namespace Modules\Tasks\Models;
|
||||
|
||||
use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
|
||||
|
||||
/**
|
||||
|
|
@ -107,7 +108,7 @@ class TaskElement implements \JsonSerializable
|
|||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->due = new \DateTime('now');
|
||||
$this->due = new \DateTime('now');
|
||||
$this->due->modify('+1 day');
|
||||
$this->createdAt = new \DateTime('now');
|
||||
}
|
||||
|
|
@ -306,7 +307,8 @@ class TaskElement implements \JsonSerializable
|
|||
$this->task = $task;
|
||||
}
|
||||
|
||||
public function toArray() : array {
|
||||
public function toArray() : array
|
||||
{
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'task' => $this->task,
|
||||
|
|
@ -319,7 +321,8 @@ class TaskElement implements \JsonSerializable
|
|||
];
|
||||
}
|
||||
|
||||
public function jsonSerialize() {
|
||||
public function jsonSerialize()
|
||||
{
|
||||
return $this->toArray();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,10 +26,10 @@ use phpOMS\Stdlib\Base\Enum;
|
|||
*/
|
||||
abstract class TaskPriority extends Enum
|
||||
{
|
||||
/* public */ const NONE = 0;
|
||||
/* public */ const VLOW = 1;
|
||||
/* public */ const LOW = 2;
|
||||
/* public */ const NONE = 0;
|
||||
/* public */ const VLOW = 1;
|
||||
/* public */ const LOW = 2;
|
||||
/* public */ const MEDIUM = 3;
|
||||
/* public */ const HIGH = 4;
|
||||
/* public */ const VHIGH = 5;
|
||||
/* public */ const HIGH = 4;
|
||||
/* public */ const VHIGH = 5;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ use phpOMS\Stdlib\Base\Enum;
|
|||
*/
|
||||
abstract class TaskStatus extends Enum
|
||||
{
|
||||
/* public */ const OPEN = 1;
|
||||
/* public */ const WORKING = 2;
|
||||
/* public */ const OPEN = 1;
|
||||
/* public */ const WORKING = 2;
|
||||
/* public */ const SUSPENDED = 3;
|
||||
/* public */ const CANCELED = 4;
|
||||
/* public */ const DONE = 5;
|
||||
/* public */ const CANCELED = 4;
|
||||
/* public */ const DONE = 5;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,4 +34,4 @@ class BaseView extends View
|
|||
$this->tasks = $data[0];
|
||||
return parent::render();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user