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

Fix if for foreach while spacing

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-10-27 17:56:33 +02:00
parent c9438272f6
commit 1b70f05c53
23 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Activate.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Admin; namespace Modules\Tasks\Admin;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;

2
Admin/Deactivate.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Admin; namespace Modules\Tasks\Admin;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;

2
Admin/Install/Navigation.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Admin\Install; namespace Modules\Tasks\Admin\Install;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;

2
Admin/Installer.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Admin; namespace Modules\Tasks\Admin;
use phpOMS\DataStorage\Database\DatabaseType; use phpOMS\DataStorage\Database\DatabaseType;

2
Admin/Uninstall.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Admin; namespace Modules\Tasks\Admin;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;

2
Admin/Update.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Admin; namespace Modules\Tasks\Admin;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;

2
Controller.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks; namespace Modules\Tasks;
use Model\Message\FormValidation; use Model\Message\FormValidation;

2
Models/NullTask.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;

2
Models/NullTaskElement.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;

2
Models/PermissionState.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use phpOMS\Stdlib\Base\Enum; use phpOMS\Stdlib\Base\Enum;

10
Models/Task.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use Modules\Calendar\Models\Schedule; use Modules\Calendar\Models\Schedule;
use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
@ -191,8 +191,8 @@ class Task implements \JsonSerializable
public function isForwarded(int $id) : bool public function isForwarded(int $id) : bool
{ {
foreach($this->taskElements as $element) { foreach ($this->taskElements as $element) {
if($element->getForwarded()->getId() === $id) { if ($element->getForwarded()->getId() === $id) {
return true; return true;
} }
} }
@ -350,7 +350,7 @@ class Task implements \JsonSerializable
*/ */
public function setStatus(int $status) public function setStatus(int $status)
{ {
if(!TaskStatus::isValidValue($status)) { if (!TaskStatus::isValidValue($status)) {
throw new InvalidEnumValue((string) $status); throw new InvalidEnumValue((string) $status);
} }
@ -376,7 +376,7 @@ class Task implements \JsonSerializable
*/ */
public function setPriority(int $priority) public function setPriority(int $priority)
{ {
if(!TaskStatus::isValidValue($priority)) { if (!TaskStatus::isValidValue($priority)) {
throw new InvalidEnumValue((string) $priority); throw new InvalidEnumValue((string) $priority);
} }

6
Models/TaskElement.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
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;
@ -154,7 +154,7 @@ class TaskElement implements \JsonSerializable
{ {
$this->createdBy = $creator; $this->createdBy = $creator;
if($this->forwarded === 0) { if ($this->forwarded === 0) {
$this->setForwarded($this->createdBy); $this->setForwarded($this->createdBy);
} }
} }
@ -266,7 +266,7 @@ class TaskElement implements \JsonSerializable
*/ */
public function setStatus(int $status) public function setStatus(int $status)
{ {
if(!TaskStatus::isValidValue($status)) { if (!TaskStatus::isValidValue($status)) {
throw new InvalidEnumValue((string) $status); throw new InvalidEnumValue((string) $status);
} }

2
Models/TaskElementMapper.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;

4
Models/TaskMapper.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
@ -137,7 +137,7 @@ class TaskMapper extends DataMapperAbstract
try { try {
$objId = parent::create($obj, $relations); $objId = parent::create($obj, $relations);
if($objId === null || !is_scalar($objId)) { if ($objId === null || !is_scalar($objId)) {
return $objId; return $objId;
} }
} catch (\Exception $e) { } catch (\Exception $e) {

2
Models/TaskPriority.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use phpOMS\Stdlib\Base\Enum; use phpOMS\Stdlib\Base\Enum;

2
Models/TaskStatus.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use phpOMS\Stdlib\Base\Enum; use phpOMS\Stdlib\Base\Enum;

2
Models/TaskTemplate.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
/** /**

2
Models/TaskType.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use phpOMS\Stdlib\Base\Enum; use phpOMS\Stdlib\Base\Enum;

2
Models/TaskVisibility.php
View File

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use phpOMS\Stdlib\Base\Enum; use phpOMS\Stdlib\Base\Enum;

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

@ -11,7 +11,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
declare(strict_types=1); declare(strict_types = 1);
namespace Modules\Tasks\Theme\Backend\Components\Tasks; namespace Modules\Tasks\Theme\Backend\Components\Tasks;

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

@ -6,19 +6,19 @@
<td class="full"><?= $this->getHtml('Title', 'Tasks') ?> <td class="full"><?= $this->getHtml('Title', 'Tasks') ?>
<tfoot> <tfoot>
<tbody> <tbody>
<?php $c = 0; foreach($this->tasks as $key => $task) : $c++; <?php $c = 0; foreach ($this->tasks as $key => $task) : $c++;
$url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/task/single?{?}&id=' . $task->getId()); $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/task/single?{?}&id=' . $task->getId());
$color = 'darkred'; $color = 'darkred';
if($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; } if ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; } elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; } elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; } elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ;?> elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ;?>
<tr data-href="<?= $url; ?>"> <tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('S' . $task->getStatus(), 'Tasks') ?></span></a> <td><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('S' . $task->getStatus(), 'Tasks') ?></span></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($task->getDue()->format('Y-m-d H:i')); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getDue()->format('Y-m-d H:i')); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($task->getTitle()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getTitle()); ?></a>
<?php endforeach; if($c == 0) : ?> <?php endforeach; if ($c == 0) : ?>
<tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', 0, 0); ?> <tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
<?php endif; ?> <?php endif; ?>
</table> </table>

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

@ -31,21 +31,21 @@ echo $this->getData('nav')->render(); ?>
<td><?= $this->getHtml('Created') ?> <td><?= $this->getHtml('Created') ?>
<tfoot> <tfoot>
<tbody> <tbody>
<?php $c = 0; foreach($tasks as $key => $task) : $c++; <?php $c = 0; foreach ($tasks as $key => $task) : $c++;
$url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/task/single?{?}&id=' . $task->getId()); $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/task/single?{?}&id=' . $task->getId());
$color = 'darkred'; $color = 'darkred';
if($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; } if ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; } elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; } elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; } elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?> elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
<tr data-href="<?= $url; ?>"> <tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('S' . $task->getStatus()) ?></span></a> <td><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('S' . $task->getStatus()) ?></span></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($task->getDue()->format('Y-m-d H:i')); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getDue()->format('Y-m-d H:i')); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($task->getTitle()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getTitle()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($task->getCreatedBy()->getName1()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getCreatedBy()->getName1()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($task->getCreatedAt()->format('Y-m-d H:i')); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($task->getCreatedAt()->format('Y-m-d H:i')); ?></a>
<?php endforeach; if($c == 0) : ?> <?php endforeach; if ($c == 0) : ?>
<tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', 0, 0); ?> <tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
<?php endif; ?> <?php endif; ?>
</table> </table>

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

@ -20,10 +20,10 @@ $taskMedia = $task->getMedia();
$elements = $task->getTaskElements(); $elements = $task->getTaskElements();
$cElements = count($elements); $cElements = count($elements);
if($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; } if ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; } elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; } elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; }
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>
@ -41,9 +41,9 @@ echo $this->getData('nav')->render(); ?>
</blockquote> </blockquote>
</div> </div>
<?php if(!empty($taskMedia)) : ?> <?php if (!empty($taskMedia)) : ?>
<div class="inner"> <div class="inner">
<?php foreach($taskMedia as $media) : ?> <?php foreach ($taskMedia as $media) : ?>
<span><?= $media->getName(); ?></span> <span><?= $media->getName(); ?></span>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
@ -59,11 +59,11 @@ echo $this->getData('nav')->render(); ?>
<?php $c = 0; <?php $c = 0;
foreach ($elements as $key => $element) : $c++; foreach ($elements as $key => $element) : $c++;
if($element->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; } if ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; } elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; } elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; } elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?> elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
<section class="box wf-100"> <section class="box wf-100">
<div class="inner pAlignTable"> <div class="inner pAlignTable">
<div class="vCenterTable wf-100"><?= $this->printHtml($element->getCreatedBy()->getName1()); ?> - <?= $this->printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?></div> <div class="vCenterTable wf-100"><?= $this->printHtml($element->getCreatedBy()->getName1()); ?> - <?= $this->printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?></div>
@ -78,9 +78,9 @@ echo $this->getData('nav')->render(); ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
<?php $elementMedia = $element->getMedia(); if(!empty($elementMedia)) : ?> <?php $elementMedia = $element->getMedia(); if (!empty($elementMedia)) : ?>
<div class="inner"> <div class="inner">
<?php foreach($elementMedia as $media) : ?> <?php foreach ($elementMedia as $media) : ?>
<span><?= $media->getName(); ?></span> <span><?= $media->getName(); ?></span>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>