diff --git a/Admin/Installer.php b/Admin/Installer.php index e26f593..993a455 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 . 'projectmanagement_project` ( + $dbPool->get()->con->prepare( + 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'projectmanagement_project` ( `projectmanagement_project_id` int(11) NOT NULL AUTO_INCREMENT, `projectmanagement_project_name` varchar(255) NOT NULL, `projectmanagement_project_description` text NOT NULL, @@ -51,6 +51,8 @@ class Installer extends InstallerAbstract `projectmanagement_project_earnings` int(11) NOT NULL, `projectmanagement_project_start` datetime NOT NULL, `projectmanagement_project_end` datetime NOT NULL, + `projectmanagement_project_progress` int NOT NULL, + `projectmanagement_project_progress_type` int NOT NULL, `projectmanagement_project_created_at` datetime NOT NULL, `projectmanagement_project_created_by` int(11) NOT NULL, PRIMARY KEY (`projectmanagement_project_id`), @@ -59,14 +61,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 . 'projectmanagement_project` - ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'projectmanagement_project_ibfk_1` FOREIGN KEY (`projectmanagement_project_calendar`) REFERENCES `' . $dbPool->get('core')->prefix . 'calendar` (`calendar_id`), - ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'projectmanagement_project_ibfk_2` FOREIGN KEY (`projectmanagement_project_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);' + $dbPool->get()->con->prepare( + 'ALTER TABLE `' . $dbPool->get()->prefix . 'projectmanagement_project` + ADD CONSTRAINT `' . $dbPool->get()->prefix . 'projectmanagement_project_ibfk_1` FOREIGN KEY (`projectmanagement_project_calendar`) REFERENCES `' . $dbPool->get()->prefix . 'calendar` (`calendar_id`), + ADD CONSTRAINT `' . $dbPool->get()->prefix . 'projectmanagement_project_ibfk_2` FOREIGN KEY (`projectmanagement_project_created_by`) REFERENCES `' . $dbPool->get()->prefix . 'account` (`account_id`);' )->execute(); - $dbPool->get('core')->con->prepare( - 'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'projectmanagement_task_relation` ( + $dbPool->get()->con->prepare( + 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'projectmanagement_task_relation` ( `projectmanagement_task_relation_id` int(11) NOT NULL AUTO_INCREMENT, `projectmanagement_task_relation_src` int(11) NULL, `projectmanagement_task_relation_dst` int(11) NULL, @@ -76,10 +78,10 @@ class Installer extends InstallerAbstract )ENGINE=InnoDB DEFAULT CHARSET=utf8;' )->execute(); - $dbPool->get('core')->con->prepare( - 'ALTER TABLE `' . $dbPool->get('core')->prefix . 'projectmanagement_task_relation` - ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'projectmanagement_task_relation_ibfk_1` FOREIGN KEY (`projectmanagement_task_relation_src`) REFERENCES `' . $dbPool->get('core')->prefix . 'task` (`task_id`), - ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'projectmanagement_task_relation_ibfk_2` FOREIGN KEY (`projectmanagement_task_relation_dst`) REFERENCES `' . $dbPool->get('core')->prefix . 'projectmanagement_project` (`projectmanagement_project_id`);' + $dbPool->get()->con->prepare( + 'ALTER TABLE `' . $dbPool->get()->prefix . 'projectmanagement_task_relation` + ADD CONSTRAINT `' . $dbPool->get()->prefix . 'projectmanagement_task_relation_ibfk_1` FOREIGN KEY (`projectmanagement_task_relation_src`) REFERENCES `' . $dbPool->get()->prefix . 'task` (`task_id`), + ADD CONSTRAINT `' . $dbPool->get()->prefix . 'projectmanagement_task_relation_ibfk_2` FOREIGN KEY (`projectmanagement_task_relation_dst`) REFERENCES `' . $dbPool->get()->prefix . 'projectmanagement_project` (`projectmanagement_project_id`);' )->execute(); break; } diff --git a/Models/ProgressType.php b/Models/ProgressType.php new file mode 100644 index 0000000..864516a --- /dev/null +++ b/Models/ProgressType.php @@ -0,0 +1,35 @@ +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 getTask(int $id) : Task { return $this->tasks[$id] ?? new Task(); diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php index b57e5c9..0a5729f 100644 --- a/Models/ProjectMapper.php +++ b/Models/ProjectMapper.php @@ -49,6 +49,8 @@ class ProjectMapper extends DataMapperAbstract 'projectmanagement_project_earnings' => ['name' => 'projectmanagement_project_earnings', 'type' => 'Serializable', 'internal' => 'earnings'], 'projectmanagement_project_start' => ['name' => 'projectmanagement_project_start', 'type' => 'DateTime', 'internal' => 'start'], 'projectmanagement_project_end' => ['name' => 'projectmanagement_project_end', 'type' => 'DateTime', 'internal' => 'end'], + 'projectmanagement_project_progress' => ['name' => 'projectmanagement_project_progress', 'type' => 'int', 'internal' => 'progress'], + 'projectmanagement_project_progress_type' => ['name' => 'projectmanagement_project_progress_type', 'type' => 'int', 'internal' => 'progressType'], 'projectmanagement_project_created_by' => ['name' => 'projectmanagement_project_created_by', 'type' => 'int', 'internal' => 'createdBy'], 'projectmanagement_project_created_at' => ['name' => 'projectmanagement_project_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'], ]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 245bdcb..876e2b4 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -28,6 +28,7 @@ return ['ProjectManagement' => [ 'Manager' => 'Manager', 'Name' => 'Name', 'Other' => 'Other', + 'Progress' => 'Progress', 'Project' => 'Project', 'Projects' => 'Projects', 'Responsibility' => 'Responsibility', @@ -35,4 +36,10 @@ return ['ProjectManagement' => [ 'Status' => 'Status', 'Title' => 'Title', 'UserGroup' => 'User/Group', + 'Manual' => 'Manual', + 'Linear' => 'Linear', + 'Exponential' => 'Exponential', + 'Progress' => 'Progress', + 'Log' => 'Log', + 'Tasks' => 'Tasks', ]]; diff --git a/Theme/Backend/projectmanagement-profile.tpl.php b/Theme/Backend/projectmanagement-profile.tpl.php index e5c5f6b..4bf179b 100644 --- a/Theme/Backend/projectmanagement-profile.tpl.php +++ b/Theme/Backend/projectmanagement-profile.tpl.php @@ -32,6 +32,15 @@ echo $this->getData('nav')->render(); ?> + + + getProgressType() !== \Modules\Project\Models\ProgressType::MANUAL ? ' disabled' : ''; ?>>