diff --git a/Models/PermissionState.php b/Models/PermissionState.php index 4010108..8fae12c 100755 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -27,5 +27,6 @@ use phpOMS\Stdlib\Base\Enum; abstract class PermissionState extends Enum { public const WORKFLOW = 1; + public const TEMPLATE = 2; } diff --git a/Models/WorkflowStatus.php b/Models/WorkflowStatus.php index 7c26934..d31fbba 100755 --- a/Models/WorkflowStatus.php +++ b/Models/WorkflowStatus.php @@ -27,9 +27,14 @@ use phpOMS\Stdlib\Base\Enum; abstract class WorkflowStatus extends Enum { public const OPEN = 1; + public const WORKING = 2; + public const SUSPENDED = 3; + public const CANCELED = 4; + public const DONE = 5; + public const CLOSED = 6; } diff --git a/Templates/Permission/PermissionStatus.php b/Templates/Permission/PermissionStatus.php index 382371f..e1ad78a 100755 --- a/Templates/Permission/PermissionStatus.php +++ b/Templates/Permission/PermissionStatus.php @@ -27,6 +27,8 @@ use phpOMS\Stdlib\Base\Enum; abstract class PermissionStatus extends Enum { public const PENDING = 1; + public const APPROVED = 2; + public const DISMISSED = 3; } diff --git a/Templates/Permission/States.php b/Templates/Permission/States.php index b0c3a7d..ea5fe67 100755 --- a/Templates/Permission/States.php +++ b/Templates/Permission/States.php @@ -27,7 +27,10 @@ use phpOMS\Stdlib\Base\Enum; abstract class States extends Enum { public const DEFAULT = 0; + public const PENDING = 1; + public const APPROVED = 2; + public const DISMISSED = 3; } diff --git a/Templates/Permission/Workflow.php b/Templates/Permission/Workflow.php index 2aefb67..4b1aadc 100755 --- a/Templates/Permission/Workflow.php +++ b/Templates/Permission/Workflow.php @@ -28,7 +28,9 @@ use phpOMS\DataStorage\Database\Connection\ConnectionAbstract; class Workflow implements WorkflowInterface { private $id = 0; + private $state = 0; + private $con = null; /** diff --git a/Theme/Backend/workflow-create.tpl.php b/Theme/Backend/workflow-create.tpl.php index 332c17f..fccad07 100755 --- a/Theme/Backend/workflow-create.tpl.php +++ b/Theme/Backend/workflow-create.tpl.php @@ -16,21 +16,21 @@ declare(strict_types=1); echo $this->getData('nav')->render(); ?>
-

getHtml('Task') ?>

+

getHtml('Task'); ?>

-
+
-
+
-
+
-
-
-
+
+
+
@@ -39,15 +39,15 @@ echo $this->getData('nav')->render(); ?>
-

getHtml('Media') ?>

+

getHtml('Media'); ?>

-
-
-
+
+
+
diff --git a/Theme/Backend/workflow-dashboard.tpl.php b/Theme/Backend/workflow-dashboard.tpl.php index 828a9f9..382cc66 100755 --- a/Theme/Backend/workflow-dashboard.tpl.php +++ b/Theme/Backend/workflow-dashboard.tpl.php @@ -22,14 +22,14 @@ echo $this->getData('nav')->render(); ?>
-
getHtml('Workflow') ?>
+
getHtml('Workflow'); ?>
- $workflow) : ++$c; @@ -41,11 +41,11 @@ echo $this->getData('nav')->render(); ?> elseif ($workflow->getStatus() === \Modules\Workflow\Models\WorkflowStatus::CANCELED) { $color = 'red'; } elseif ($workflow->getStatus() === \Modules\Workflow\Models\WorkflowStatus::SUSPENDED) { $color = 'yellow'; } ?> -
getHtml('Status') ?> - getHtml('Next') ?> - getHtml('Title') ?> - getHtml('Creator') ?> - getHtml('Created') ?> + getHtml('Status'); ?> + getHtml('Next'); ?> + getHtml('Title'); ?> + getHtml('Creator'); ?> + getHtml('Created'); ?>
getHtml('S' . $workflow->getStatus()) ?> - printHtml($workflow->getDue()->format('Y-m-d H:i')); ?> - printHtml($workflow->getTitle()); ?> - printHtml($workflow->getCreatedBy()->getId()); ?> - printHtml($workflow->getCreatedAt()->format('Y-m-d H:i')); ?> + getHtml('S' . $workflow->getStatus()); ?> + printHtml($workflow->getDue()->format('Y-m-d H:i')); ?> + printHtml($workflow->getTitle()); ?> + printHtml($workflow->getCreatedBy()->getId()); ?> + printHtml($workflow->getCreatedAt()->format('Y-m-d H:i')); ?>
getHtml('Empty', '0', '0'); ?> diff --git a/Theme/Backend/workflow-single.tpl.php b/Theme/Backend/workflow-single.tpl.php index f400eda..67bfc33 100755 --- a/Theme/Backend/workflow-single.tpl.php +++ b/Theme/Backend/workflow-single.tpl.php @@ -43,7 +43,7 @@ foreach ($elements as $key => $element) : ++$c; elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; } elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
-
getHtml('S' . $element->getStatus()) ?>
+
getHtml('S' . $element->getStatus()); ?>
printHtml($element->getCreatedBy()->getId()); ?> - printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?>
getDescription() !== '') : ?> @@ -72,15 +72,15 @@ foreach ($elements as $key => $element) : ++$c;
-
+
-
+
-
+
-
+
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 59b6d50..ef1e97b 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -20,6 +20,7 @@ namespace Modules\Workflow\tests\Admin; class AdminTest extends \PHPUnit\Framework\TestCase { protected const MODULE_NAME = 'Workflow'; + protected const URI_LOAD = ''; use \Modules\tests\ModuleTestTrait;