Jingga/oms-Support
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Support.git synced 2026-02-10 05:48:39 +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 7c6d2c442e
commit ef408f396c
14 changed files with 29 additions and 29 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\Support\Admin; namespace Modules\Support\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\Support\Admin; namespace Modules\Support\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\Support\Admin\Install; namespace Modules\Support\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\Support\Admin; namespace Modules\Support\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\Support\Admin; namespace Modules\Support\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\Support\Admin; namespace Modules\Support\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\Support; namespace Modules\Support;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;

2
Models/Issue.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\Support; namespace Modules\Support;
use phpOMS\Pattern\Multition; use phpOMS\Pattern\Multition;

2
Models/Message.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\Support; namespace Modules\Support;
use phpOMS\Pattern\Multition; use phpOMS\Pattern\Multition;

2
Models/SupportStatus.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\Support; namespace Modules\Support;
use phpOMS\Stdlib\Base\Enum; use phpOMS\Stdlib\Base\Enum;

2
Models/Ticket.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\Support\Models; namespace Modules\Support\Models;
use Modules\Tasks\Models\Task; use Modules\Tasks\Models\Task;

4
Models/TicketMapper.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\Support\Models; namespace Modules\Support\Models;
use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\DataMapperAbstract;
@ -88,7 +88,7 @@ class TicketMapper 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) {

14
Theme/Backend/support-list.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($tickets as $key => $ticket) : $c++; <?php $c = 0; foreach ($tickets as $key => $ticket) : $c++;
$url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/support/single?{?}&id=' . $ticket->getId()); $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/support/single?{?}&id=' . $ticket->getId());
$color = 'darkred'; $color = 'darkred';
if($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; } if ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
elseif($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; } elseif ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
elseif($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; } elseif ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
elseif($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; } elseif ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
elseif($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?> elseif ($ticket->getTask()->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' . $ticket->getTask()->getStatus(), 'Tasks') ?></span></a> <td><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('S' . $ticket->getTask()->getStatus(), 'Tasks') ?></span></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->getTask()->getDue()->format('Y-m-d H:i')); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->getTask()->getDue()->format('Y-m-d H:i')); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->getTask()->getTitle()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->getTask()->getTitle()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->getTask()->getCreatedBy()->getName1()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->getTask()->getCreatedBy()->getName1()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->getTask()->getCreatedAt()->format('Y-m-d H:i')); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->getTask()->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>

18
Theme/Backend/ticket-single.tpl.php
View File

@ -19,10 +19,10 @@ $ticket = $this->getData('ticket');
$elements = $ticket->getTask()->getTaskElements(); $elements = $ticket->getTask()->getTaskElements();
$cElements = count($elements); $cElements = count($elements);
if($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; } if ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
elseif($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; } elseif ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
elseif($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; } elseif ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
elseif($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } elseif ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; }
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>
@ -49,11 +49,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>