diff --git a/Models/ProgressType.php b/Models/ProgressType.php index c7c1135..dc5ce52 100755 --- a/Models/ProgressType.php +++ b/Models/ProgressType.php @@ -27,8 +27,12 @@ use phpOMS\Stdlib\Base\Enum; abstract class ProgressType extends Enum { public const MANUAL = 0; + public const LINEAR = 1; + public const EXPONENTIAL = 2; + public const LOG = 3; + public const TASKS = 4; } diff --git a/Models/ProjectResponsibility.php b/Models/ProjectResponsibility.php index faa41f0..ac37e37 100755 --- a/Models/ProjectResponsibility.php +++ b/Models/ProjectResponsibility.php @@ -27,5 +27,6 @@ use phpOMS\Stdlib\Base\Enum; abstract class ProjectResponsibility extends Enum { public const MANAGER = 0; + public const OTHER = 1; } diff --git a/Models/ProjectStatus.php b/Models/ProjectStatus.php index 48b700b..52094fa 100755 --- a/Models/ProjectStatus.php +++ b/Models/ProjectStatus.php @@ -27,8 +27,12 @@ use phpOMS\Stdlib\Base\Enum; abstract class ProjectStatus extends Enum { public const ACTIVE = 0; + public const INACTIVE = 1; + public const HOLD = 2; + public const CANCELED = 3; + public const FINISHED = 4; } diff --git a/Theme/Backend/projectmanagement-create.tpl.php b/Theme/Backend/projectmanagement-create.tpl.php index 40a1130..b22ecb5 100755 --- a/Theme/Backend/projectmanagement-create.tpl.php +++ b/Theme/Backend/projectmanagement-create.tpl.php @@ -18,33 +18,33 @@ echo $this->getData('nav')->render(); ?>
-

getHtml('Project') ?>

+

getHtml('Project'); ?>

-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/Theme/Backend/projectmanagement-list.tpl.php b/Theme/Backend/projectmanagement-list.tpl.php index 2a26d88..65be571 100755 --- a/Theme/Backend/projectmanagement-list.tpl.php +++ b/Theme/Backend/projectmanagement-list.tpl.php @@ -29,16 +29,16 @@ echo $this->getData('nav')->render(); ?> - $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}projectmanagement/profile?{?}&id=' . $value->getId());?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}projectmanagement/profile?{?}&id=' . $value->getId()); ?> -
getHtml('Title') ?> - getHtml('Start') ?> - getHtml('Due') ?> + getHtml('Title'); ?> + getHtml('Start'); ?> + getHtml('Due'); ?>
printHtml($value->getName()); ?> - printHtml($value->getStart()->format('Y-m-d')); ?> - printHtml($value->getEnd()->format('Y-m-d')); ?> + printHtml($value->getName()); ?> + printHtml($value->getStart()->format('Y-m-d')); ?> + printHtml($value->getEnd()->format('Y-m-d')); ?>
getHtml('Empty', '0', '0'); ?> diff --git a/Theme/Backend/projectmanagement-profile.tpl.php b/Theme/Backend/projectmanagement-profile.tpl.php index c25c8ad..35d4b68 100755 --- a/Theme/Backend/projectmanagement-profile.tpl.php +++ b/Theme/Backend/projectmanagement-profile.tpl.php @@ -24,24 +24,24 @@ echo $this->getData('nav')->render(); ?> -
+
-
- +
+
-
+
-
+
getProgressType() !== \Modules\ProjectManagement\Models\ProgressType::MANUAL ? ' disabled' : ''; ?>> -
+
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 239e334..e4e4689 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -20,6 +20,7 @@ namespace Modules\ProjectManagement\tests\Admin; class AdminTest extends \PHPUnit\Framework\TestCase { protected const MODULE_NAME = 'ProjectManagement'; + protected const URI_LOAD = ''; use \Modules\tests\ModuleTestTrait;