diff --git a/Models/Event.php b/Models/Event.php index b4df932..329f22a 100755 --- a/Models/Event.php +++ b/Models/Event.php @@ -52,6 +52,7 @@ class Event * @since 1.0.0 */ private string $name = ''; + /** * Description. * @@ -125,7 +126,7 @@ class Event return $this->id; } - /** + /** * Get media files. * * @return array diff --git a/Models/ProgressType.php b/Models/ProgressType.php index 2131ccc..aad52b2 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/Theme/Backend/eventmanagement-create.tpl.php b/Theme/Backend/eventmanagement-create.tpl.php index ffcb3f8..9e50df6 100755 --- a/Theme/Backend/eventmanagement-create.tpl.php +++ b/Theme/Backend/eventmanagement-create.tpl.php @@ -18,28 +18,28 @@ echo $this->getData('nav')->render(); ?>
-

getHtml('Event') ?>

+

getHtml('Event'); ?>

-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/Theme/Backend/eventmanagement-list.tpl.php b/Theme/Backend/eventmanagement-list.tpl.php index e3e622c..0823e0e 100755 --- a/Theme/Backend/eventmanagement-list.tpl.php +++ b/Theme/Backend/eventmanagement-list.tpl.php @@ -29,16 +29,16 @@ echo $this->getData('nav')->render(); ?> - $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}eventmanagement/profile?{?}&id=' . $value->getId());?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}eventmanagement/profile?{?}&id=' . $value->getId()); ?> -
getHtml('Title') ?> - getHtml('Start') ?> - getHtml('End') ?> + getHtml('Title'); ?> + getHtml('Start'); ?> + getHtml('End'); ?>
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/eventmanagement-profile.tpl.php b/Theme/Backend/eventmanagement-profile.tpl.php index 5f84b15..e9f8406 100755 --- a/Theme/Backend/eventmanagement-profile.tpl.php +++ b/Theme/Backend/eventmanagement-profile.tpl.php @@ -26,24 +26,24 @@ echo $this->getData('nav')->render(); ?> -
+
-
- +
+
-
+
-
+
getProgressType() !== \Modules\EventManagement\Models\ProgressType::MANUAL ? ' disabled' : ''; ?>> -
+
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 35fcc2c..4cede9e 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -20,6 +20,7 @@ namespace Modules\EventManagement\tests\Admin; class AdminTest extends \PHPUnit\Framework\TestCase { protected const MODULE_NAME = 'EventManagement'; + protected const URI_LOAD = ''; use \Modules\tests\ModuleTestTrait;