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

phpcbf

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-02-03 13:09:09 +01:00
parent 0b0f754666
commit 27f495879f
8 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Admin/Update.php
View File

@ -19,7 +19,6 @@ use phpOMS\Module\UpdateAbstract;
use phpOMS\System\File\Directory; use phpOMS\System\File\Directory;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
/** /**
* Navigation class. * Navigation class.
* *

6
Controller.php
View File

@ -244,8 +244,7 @@ class Controller extends ModuleAbstract implements WebInterface
private function validateTaskCreate(RequestAbstract $request) : array private function validateTaskCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if ( if (($val['title'] = empty($request->getData('title')))
($val['title'] = empty($request->getData('title')))
|| ($val['description'] = empty($request->getData('description'))) || ($val['description'] = empty($request->getData('description')))
|| ($val['due'] = !((bool) strtotime((string) $request->getData('due')))) || ($val['due'] = !((bool) strtotime((string) $request->getData('due'))))
|| ($val['forward'] = !(is_numeric($request->getData('forward') ?? 0))) || ($val['forward'] = !(is_numeric($request->getData('forward') ?? 0)))
@ -317,8 +316,7 @@ class Controller extends ModuleAbstract implements WebInterface
private function validateTaskElementCreate(RequestAbstract $request) : array private function validateTaskElementCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if ( if (($val['status'] = !TaskStatus::isValidValue((int) $request->getData('status')))
($val['status'] = !TaskStatus::isValidValue((int) $request->getData('status')))
|| ($val['due'] = !((bool) strtotime((string) $request->getData('due')))) || ($val['due'] = !((bool) strtotime((string) $request->getData('due'))))
|| ($val['task'] = !(is_numeric($request->getData('task')))) || ($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->getHeader()->getAccount() : $request->getData('forward'))))

4
Models/PermissionState.php
View File

@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum;
*/ */
abstract class PermissionState extends Enum abstract class PermissionState extends Enum
{ {
/* public */ const DASHBOARD = 1; /* public */ const DASHBOARD = 1;
/* public */ const TASK = 2; /* public */ const TASK = 2;
/* public */ const TASKELEMENT = 3; /* public */ const TASKELEMENT = 3;
} }

7
Models/Task.php
View File

@ -148,8 +148,8 @@ class Task implements \JsonSerializable
public function __construct() public function __construct()
{ {
$this->createdAt = new \DateTime('now'); $this->createdAt = new \DateTime('now');
$this->start = new \DateTime('now'); $this->start = new \DateTime('now');
$this->due = new \DateTime('now'); $this->due = new \DateTime('now');
$this->due->modify('+1 day'); $this->due->modify('+1 day');
$this->schedule = new Schedule(); $this->schedule = new Schedule();
} }
@ -502,7 +502,8 @@ class Task implements \JsonSerializable
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function getSchedule() : Schedule { public function getSchedule() : Schedule
{
return $this->schedule; return $this->schedule;
} }

9
Models/TaskElement.php
View File

@ -13,6 +13,7 @@
declare(strict_types = 1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
/** /**
@ -107,7 +108,7 @@ class TaskElement implements \JsonSerializable
*/ */
public function __construct() public function __construct()
{ {
$this->due = new \DateTime('now'); $this->due = new \DateTime('now');
$this->due->modify('+1 day'); $this->due->modify('+1 day');
$this->createdAt = new \DateTime('now'); $this->createdAt = new \DateTime('now');
} }
@ -306,7 +307,8 @@ class TaskElement implements \JsonSerializable
$this->task = $task; $this->task = $task;
} }
public function toArray() : array { public function toArray() : array
{
return [ return [
'id' => $this->id, 'id' => $this->id,
'task' => $this->task, 'task' => $this->task,
@ -319,7 +321,8 @@ class TaskElement implements \JsonSerializable
]; ];
} }
public function jsonSerialize() { public function jsonSerialize()
{
return $this->toArray(); return $this->toArray();
} }
} }

10
Models/TaskPriority.php
View File

@ -26,10 +26,10 @@ use phpOMS\Stdlib\Base\Enum;
*/ */
abstract class TaskPriority extends Enum abstract class TaskPriority extends Enum
{ {
/* public */ const NONE = 0; /* public */ const NONE = 0;
/* public */ const VLOW = 1; /* public */ const VLOW = 1;
/* public */ const LOW = 2; /* public */ const LOW = 2;
/* public */ const MEDIUM = 3; /* public */ const MEDIUM = 3;
/* public */ const HIGH = 4; /* public */ const HIGH = 4;
/* public */ const VHIGH = 5; /* public */ const VHIGH = 5;
} }

8
Models/TaskStatus.php
View File

@ -26,9 +26,9 @@ use phpOMS\Stdlib\Base\Enum;
*/ */
abstract class TaskStatus extends Enum abstract class TaskStatus extends Enum
{ {
/* public */ const OPEN = 1; /* public */ const OPEN = 1;
/* public */ const WORKING = 2; /* public */ const WORKING = 2;
/* public */ const SUSPENDED = 3; /* public */ const SUSPENDED = 3;
/* public */ const CANCELED = 4; /* public */ const CANCELED = 4;
/* public */ const DONE = 5; /* public */ const DONE = 5;
} }

2
Theme/Backend/Components/Tasks/BaseView.php
View File

@ -34,4 +34,4 @@ class BaseView extends View
$this->tasks = $data[0]; $this->tasks = $data[0];
return parent::render(); return parent::render();
} }
} }