diff --git a/Admin/Installer.php b/Admin/Installer.php index 7137762..3a17a53 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -38,10 +38,10 @@ class Installer extends InstallerAbstract { parent::install(__DIR__ . '/..', $dbPool, $info); - switch ($dbPool->get('core')->getType()) { + switch ($dbPool->get()->getType()) { case DatabaseType::MYSQL: - $dbPool->get('core')->con->prepare( - 'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'eventmanagement_event` ( + $dbPool->get()->con->prepare( + 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'eventmanagement_event` ( `eventmanagement_event_id` int(11) NOT NULL AUTO_INCREMENT, `eventmanagement_event_name` varchar(255) NOT NULL, `eventmanagement_event_description` text NOT NULL, @@ -49,6 +49,8 @@ class Installer extends InstallerAbstract `eventmanagement_event_calendar` int(11) NOT NULL, `eventmanagement_event_start` datetime NOT NULL, `eventmanagement_event_end` datetime NOT NULL, + `eventmanagement_event_progress` int NOT NULL, + `eventmanagement_event_progress_type` int NOT NULL, `eventmanagement_event_costs` int(11) NOT NULL, `eventmanagement_event_budget` int(11) NOT NULL, `eventmanagement_event_earnings` int(11) NOT NULL, @@ -60,14 +62,14 @@ class Installer extends InstallerAbstract )ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;' )->execute(); - $dbPool->get('core')->con->prepare( - 'ALTER TABLE `' . $dbPool->get('core')->prefix . 'eventmanagement_event` - ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'eventmanagement_event_ibfk_1` FOREIGN KEY (`eventmanagement_event_calendar`) REFERENCES `' . $dbPool->get('core')->prefix . 'calendar` (`calendar_id`), - ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'eventmanagement_event_ibfk_2` FOREIGN KEY (`eventmanagement_event_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);' + $dbPool->get()->con->prepare( + 'ALTER TABLE `' . $dbPool->get()->prefix . 'eventmanagement_event` + ADD CONSTRAINT `' . $dbPool->get()->prefix . 'eventmanagement_event_ibfk_1` FOREIGN KEY (`eventmanagement_event_calendar`) REFERENCES `' . $dbPool->get()->prefix . 'calendar` (`calendar_id`), + ADD CONSTRAINT `' . $dbPool->get()->prefix . 'eventmanagement_event_ibfk_2` FOREIGN KEY (`eventmanagement_event_created_by`) REFERENCES `' . $dbPool->get()->prefix . 'account` (`account_id`);' )->execute(); - $dbPool->get('core')->con->prepare( - 'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'eventmanagement_task_relation` ( + $dbPool->get()->con->prepare( + 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'eventmanagement_task_relation` ( `eventmanagement_task_relation_id` int(11) NOT NULL AUTO_INCREMENT, `eventmanagement_task_relation_src` int(11) NULL, `eventmanagement_task_relation_dst` int(11) NULL, @@ -77,10 +79,10 @@ class Installer extends InstallerAbstract )ENGINE=InnoDB DEFAULT CHARSET=utf8;' )->execute(); - $dbPool->get('core')->con->prepare( - 'ALTER TABLE `' . $dbPool->get('core')->prefix . 'eventmanagement_task_relation` - ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'eventmanagement_task_relation_ibfk_1` FOREIGN KEY (`eventmanagement_task_relation_src`) REFERENCES `' . $dbPool->get('core')->prefix . 'task` (`task_id`), - ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'eventmanagement_task_relation_ibfk_2` FOREIGN KEY (`eventmanagement_task_relation_dst`) REFERENCES `' . $dbPool->get('core')->prefix . 'eventmanagement_event` (`eventmanagement_event_id`);' + $dbPool->get()->con->prepare( + 'ALTER TABLE `' . $dbPool->get()->prefix . 'eventmanagement_task_relation` + ADD CONSTRAINT `' . $dbPool->get()->prefix . 'eventmanagement_task_relation_ibfk_1` FOREIGN KEY (`eventmanagement_task_relation_src`) REFERENCES `' . $dbPool->get()->prefix . 'task` (`task_id`), + ADD CONSTRAINT `' . $dbPool->get()->prefix . 'eventmanagement_task_relation_ibfk_2` FOREIGN KEY (`eventmanagement_task_relation_dst`) REFERENCES `' . $dbPool->get()->prefix . 'eventmanagement_event` (`eventmanagement_event_id`);' )->execute(); break; } diff --git a/Models/Event.php b/Models/Event.php index da81d58..54edb4c 100644 --- a/Models/Event.php +++ b/Models/Event.php @@ -59,6 +59,10 @@ class Event private $tasks = []; + private $progress = 0; + + private $progressType = ProgressType::MANUAL; + /** * Created. * @@ -108,6 +112,26 @@ class Event return $this->end; } + public function getProgress() : int + { + return $this->progress; + } + + public function setProgress(int $progress) /* : void */ + { + $this->progress = $progres; + } + + public function getProgressType() : int + { + return $this->progressType; + } + + public function setProgressType(int $type) /* : void */ + { + $this->progressType = $type; + } + public function getCalendar() : Calendar { return $this->calendar; diff --git a/Models/EventMapper.php b/Models/EventMapper.php index 7847820..a68c0b5 100644 --- a/Models/EventMapper.php +++ b/Models/EventMapper.php @@ -46,6 +46,8 @@ class EventMapper extends DataMapperAbstract 'eventmanagement_event_calendar' => ['name' => 'eventmanagement_event_calendar', 'type' => 'int', 'internal' => 'calendar'], 'eventmanagement_event_start' => ['name' => 'eventmanagement_event_start', 'type' => 'DateTime', 'internal' => 'start'], 'eventmanagement_event_end' => ['name' => 'eventmanagement_event_end', 'type' => 'DateTime', 'internal' => 'end'], + 'eventmanagement_event_progress' => ['name' => 'eventmanagement_event_progress', 'type' => 'int', 'internal' => 'progress'], + 'eventmanagement_event_progress_type' => ['name' => 'eventmanagement_event_progress_type', 'type' => 'int', 'internal' => 'progressType'], 'eventmanagement_event_costs' => ['name' => 'eventmanagement_event_costs', 'type' => 'Serializable', 'internal' => 'costs'], 'eventmanagement_event_budget' => ['name' => 'eventmanagement_event_budget', 'type' => 'Serializable', 'internal' => 'budget'], 'eventmanagement_event_earnings' => ['name' => 'eventmanagement_event_earnings', 'type' => 'Serializable', 'internal' => 'earnings'], diff --git a/Models/ProgressType.php b/Models/ProgressType.php new file mode 100644 index 0000000..15545fb --- /dev/null +++ b/Models/ProgressType.php @@ -0,0 +1,35 @@ + [ 'Title' => 'Title', 'User' => 'User', 'UserGroup' => 'User/Group', + 'Manual' => 'Manual', + 'Linear' => 'Linear', + 'Exponential' => 'Exponential', + 'Progress' => 'Progress', + 'Log' => 'Log', + 'Tasks' => 'Tasks', ]]; diff --git a/Theme/Backend/eventmanagement-profile.tpl.php b/Theme/Backend/eventmanagement-profile.tpl.php index 48a9395..bb2093b 100644 --- a/Theme/Backend/eventmanagement-profile.tpl.php +++ b/Theme/Backend/eventmanagement-profile.tpl.php @@ -33,6 +33,15 @@ echo $this->getData('nav')->render(); ?> + + + getProgressType() !== \Modules\EventManagement\Models\ProgressType::MANUAL ? ' disabled' : ''; ?>>