Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	Draw/Controller.js
#	Draw/Models/DrawType.enum.js
#	Draw/Models/Editor.js
#	Media/Models/UploadFile.php

Admin/Activate.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\Workflow\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\ActivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Activate extends ActivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function activate(Pool $dbPool, InfoManager $info)
+    public static function activate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::activate($dbPool, $info);
     }

Admin/Deactivate.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\Workflow\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\DeactivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function deactivate(Pool $dbPool, InfoManager $info)
+    public static function deactivate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::deactivate($dbPool, $info);
     }

Admin/Install/Navigation.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -14,7 +14,7 @@
  * @link       http://orange-management.com
  */
 namespace Modules\Workflow\Admin\Install;
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 
 /**
  * Navigation class.
@@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool;
  */
 class Navigation
 {
-    public static function install(Pool $dbPool)
+    public static function install(string $path, DatabasePool $dbPool)
     {
         $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
 

Admin/Installer.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\Workflow\Admin;
 
 use phpOMS\DataStorage\Database\DatabaseType;
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\InfoManager;
 use phpOMS\Module\InstallerAbstract;
 
@@ -37,12 +37,103 @@ class Installer extends InstallerAbstract
     /**
      * {@inheritdoc}
      */
-    public static function install(Pool $dbPool, InfoManager $info)
+    public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
     {
-        parent::install($dbPool, $info);
+        parent::install($path, $dbPool, $info);
 
         switch ($dbPool->get('core')->getType()) {
             case DatabaseType::MYSQL:
+                $dbPool->get('core')->con->prepare(
+                    'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'workflow` (
+                            `workflow_id` int(11) NOT NULL AUTO_INCREMENT,
+                            `workflow_name` varchar(50) NOT NULL,
+                            `workflow_status` int(11) NOT NULL,
+                            `workflow_desc` varchar(100) DEFAULT NULL,
+                            `workflow_created` datetime DEFAULT NULL,
+                            `workflow_created_by` int(11) DEFAULT NULL,
+                            PRIMARY KEY (`workflow_id`),
+                            KEY `workflow_created_by` (`workflow_created_by`)
+                        )ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
+                )->execute();
+
+                $dbPool->get('core')->con->prepare(
+                    'ALTER TABLE `' . $dbPool->get('core')->prefix . 'workflow`
+                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_ibfk_1` FOREIGN KEY (`workflow_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);'
+                )->execute();
+
+                $dbPool->get('core')->con->prepare(
+                    'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'workflow_media` (
+                            `workflow_media_id` int(11) NOT NULL AUTO_INCREMENT,
+                            `workflow_media_media` int(11) NOT NULL,
+                            `workflow_media_workflow` int(11) NOT NULL,
+                            `workflow_media_type` int(3) DEFAULT NULL,
+                            PRIMARY KEY (`workflow_media_id`),
+                            KEY `workflow_media_media` (`workflow_media_media`),
+                            KEY `workflow_media_workflow` (`workflow_media_workflow`)
+                        )ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
+                )->execute();
+
+                $dbPool->get('core')->con->prepare(
+                    'ALTER TABLE `' . $dbPool->get('core')->prefix . 'workflow_media`
+                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_media_ibfk_1` FOREIGN KEY (`workflow_media_media`) REFERENCES `' . $dbPool->get('core')->prefix . 'media` (`media_id`),
+                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_media_ibfk_2` FOREIGN KEY (`workflow_media_workflow`) REFERENCES `' . $dbPool->get('core')->prefix . 'workflow` (`workflow_id`);'
+                )->execute();
+
+                $dbPool->get('core')->con->prepare(
+                    'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'workflow_element` (
+                            `workflow_element_id` int(11) NOT NULL AUTO_INCREMENT,
+                            `workflow_element_name` varchar(50) NOT NULL,
+                            `workflow_element_status` int(11) NOT NULL,
+                            `workflow_element_data` text NOT NULL,
+                            `workflow_element_desc` varchar(100) DEFAULT NULL,
+                            `workflow_element_created` datetime DEFAULT NULL,
+                            `workflow_element_created_by` int(11) DEFAULT NULL,
+                            `workflow_element_workflow` int(11) DEFAULT NULL,
+                            PRIMARY KEY (`workflow_element_id`),
+                            KEY `workflow_element_created_by` (`workflow_element_created_by`),
+                            KEY `workflow_element_workflow` (`workflow_element_workflow`)
+                        )ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
+                )->execute();
+
+                $dbPool->get('core')->con->prepare(
+                    'ALTER TABLE `' . $dbPool->get('core')->prefix . 'workflow_element`
+                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_ibfk_1` FOREIGN KEY (`workflow_element_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`),
+                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_ibfk_2` FOREIGN KEY (`workflow_element_workflow`) REFERENCES `' . $dbPool->get('core')->prefix . 'workflow` (`workflow_id`);'
+                )->execute();
+
+                $dbPool->get('core')->con->prepare(
+                    'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'workflow_element_media` (
+                            `workflow_element_media_id` int(11) NOT NULL AUTO_INCREMENT,
+                            `workflow_element_media_media` int(11) NOT NULL,
+                            `workflow_element_media_workflow_element` int(11) NOT NULL,
+                            PRIMARY KEY (`workflow_element_media_id`),
+                            KEY `workflow_element_media_media` (`workflow_element_media_media`),
+                            KEY `workflow_element_media_workflow_element` (`workflow_element_media_workflow_element`)
+                        )ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
+                )->execute();
+
+                $dbPool->get('core')->con->prepare(
+                    'ALTER TABLE `' . $dbPool->get('core')->prefix . 'workflow_element_media`
+                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_media_ibfk_1` FOREIGN KEY (`workflow_element_media_media`) REFERENCES `' . $dbPool->get('core')->prefix . 'media` (`media_id`),
+                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_media_ibfk_2` FOREIGN KEY (`workflow_element_media_workflow_element`) REFERENCES `' . $dbPool->get('core')->prefix . 'workflow_element` (`workflow_element_id`);'
+                )->execute();
+
+                    $dbPool->get('core')->con->prepare(
+                        'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'workflow_element_task` (
+                            `workflow_element_task_id` int(11) NOT NULL AUTO_INCREMENT,
+                            `workflow_element_task_task` int(11) NOT NULL,
+                            `workflow_element_task_workflow_element` int(11) NOT NULL,
+                            PRIMARY KEY (`workflow_element_task_id`),
+                            KEY `workflow_element_task_task` (`workflow_element_task_task`),
+                            KEY `workflow_element_task_workflow_element` (`workflow_element_task_workflow_element`)
+                        )ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
+                    )->execute();
+
+                $dbPool->get('core')->con->prepare(
+                    'ALTER TABLE `' . $dbPool->get('core')->prefix . 'workflow_element_task`
+                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_task_ibfk_1` FOREIGN KEY (`workflow_element_task_task`) REFERENCES `' . $dbPool->get('core')->prefix . 'task` (`media_id`),
+                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_task_ibfk_2` FOREIGN KEY (`workflow_element_task_workflow_element`) REFERENCES `' . $dbPool->get('core')->prefix . 'workflow_element` (`workflow_element_id`);'
+                )->execute();
                 break;
         }
     }

Admin/Uninstall.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\Workflow\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\Schema\Builder;
 use phpOMS\Module\InfoManager;
 use phpOMS\Module\UninstallAbstract;
@@ -38,7 +38,7 @@ class Uninstall extends UninstallAbstract
     /**
      * {@inheritdoc}
      */
-    public static function uninstall(Pool $dbPool, InfoManager $info)
+    public static function uninstall(DatabasePool $dbPool, InfoManager $info)
     {
         parent::uninstall($dbPool, $info);
 

Admin/Update.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\Workflow\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\InfoManager;
 use phpOMS\Module\UpdateAbstract;
 use phpOMS\System\File\Directory;
@@ -38,7 +38,7 @@ class Update extends UpdateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function update(Pool $dbPool, InfoManager $info)
+    public static function update(DatabasePool $dbPool, InfoManager $info)
     {
         Directory::deletePath(__DIR__ . '/Update');
         mkdir('Update');

Controller.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -41,7 +41,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_PATH = __DIR__;
+    /* public */ const MODULE_PATH = __DIR__;
 
     /**
      * Module version.
@@ -49,7 +49,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_VERSION = '1.0.0';
+    /* public */ const MODULE_VERSION = '1.0.0';
 
     /**
      * Module name.
@@ -57,7 +57,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_NAME = 'Workflow';
+    /* public */ const MODULE_NAME = 'Workflow';
 
     /**
      * Providing.

Models/Template.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD

Models/WorkflowInterface.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD

Models/WorkflowStatus.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -30,10 +30,10 @@ use phpOMS\Datatypes\Enum;
  */
 abstract class WorkflowStatus extends Enum
 {
-    const OPEN = 1;
+    /* public */ const OPEN = 1;
-    const WORKING = 2;
+    /* public */ const WORKING = 2;
-    const SUSPENDED = 3;
+    /* public */ const SUSPENDED = 3;
-    const CANCELED = 4;
+    /* public */ const CANCELED = 4;
-    const DONE = 5;
+    /* public */ const DONE = 5;
-    const CLOSED = 6;
+    /* public */ const CLOSED = 6;
 }

Templates/Permission/PermissionStatus.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -30,7 +30,7 @@ use phpOMS\Datatypes\Enum;
  */
 abstract class PermissionStatus extends Enum
 {
-    const PENDING = 1;
+    /* public */ const PENDING = 1;
-    const APPROVED = 2;
+    /* public */ const APPROVED = 2;
-    const DISMISSED = 3;
+    /* public */ const DISMISSED = 3;
 }

Templates/Permission/States.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -30,8 +30,8 @@ use phpOMS\Datatypes\Enum;
  */
 abstract class States extends Enum
 {
-    const DEFAULT = 0;
+    /* public */ const DEFAULT = 0;
-    const PENDING = 1;
+    /* public */ const PENDING = 1;
-    const APPROVED = 2;
+    /* public */ const APPROVED = 2;
-    const DISMISSED = 3;
+    /* public */ const DISMISSED = 3;
 }

Templates/Permission/Workflow.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD

Theme/Backend/Lang/Navigation.en.lang.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD

Theme/Backend/Lang/en.lang.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD

Theme/Backend/workflow-create.tpl.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD

Theme/Backend/workflow-dashboard.tpl.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD

Theme/Backend/workflow-single.tpl.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD

Theme/Backend/workflow-template-create.tpl.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD

Theme/Backend/workflow-template-list.tpl.php

@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD