Jingga/oms-EventManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-EventManagement.git synced 2026-02-15 09:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes #90

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-09-23 13:58:23 +02:00
parent 4d1f87067d
commit 47b1a7f468
6 changed files with 91 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Admin/Installer.php
View File

@ -38,10 +38,10 @@ class Installer extends InstallerAbstract
{ {
parent::install(__DIR__ . '/..', $dbPool, $info); parent::install(__DIR__ . '/..', $dbPool, $info);
switch ($dbPool->get('core')->getType()) { switch ($dbPool->get()->getType()) {
case DatabaseType::MYSQL: case DatabaseType::MYSQL:
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'eventmanagement_event` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'eventmanagement_event` (
`eventmanagement_event_id` int(11) NOT NULL AUTO_INCREMENT, `eventmanagement_event_id` int(11) NOT NULL AUTO_INCREMENT,
`eventmanagement_event_name` varchar(255) NOT NULL, `eventmanagement_event_name` varchar(255) NOT NULL,
`eventmanagement_event_description` text 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_calendar` int(11) NOT NULL,
`eventmanagement_event_start` datetime NOT NULL, `eventmanagement_event_start` datetime NOT NULL,
`eventmanagement_event_end` 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_costs` int(11) NOT NULL,
`eventmanagement_event_budget` int(11) NOT NULL, `eventmanagement_event_budget` int(11) NOT NULL,
`eventmanagement_event_earnings` 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;' )ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'eventmanagement_event` 'ALTER TABLE `' . $dbPool->get()->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()->prefix . 'eventmanagement_event_ibfk_1` FOREIGN KEY (`eventmanagement_event_calendar`) REFERENCES `' . $dbPool->get()->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`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'eventmanagement_event_ibfk_2` FOREIGN KEY (`eventmanagement_event_created_by`) REFERENCES `' . $dbPool->get()->prefix . 'account` (`account_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'eventmanagement_task_relation` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'eventmanagement_task_relation` (
`eventmanagement_task_relation_id` int(11) NOT NULL AUTO_INCREMENT, `eventmanagement_task_relation_id` int(11) NOT NULL AUTO_INCREMENT,
`eventmanagement_task_relation_src` int(11) NULL, `eventmanagement_task_relation_src` int(11) NULL,
`eventmanagement_task_relation_dst` int(11) NULL, `eventmanagement_task_relation_dst` int(11) NULL,
@ -77,10 +79,10 @@ class Installer extends InstallerAbstract
)ENGINE=InnoDB DEFAULT CHARSET=utf8;' )ENGINE=InnoDB DEFAULT CHARSET=utf8;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'eventmanagement_task_relation` 'ALTER TABLE `' . $dbPool->get()->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()->prefix . 'eventmanagement_task_relation_ibfk_1` FOREIGN KEY (`eventmanagement_task_relation_src`) REFERENCES `' . $dbPool->get()->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`);' 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(); )->execute();
break; break;
} }

24
Models/Event.php
View File

@ -59,6 +59,10 @@ class Event
private $tasks = []; private $tasks = [];
private $progress = 0;
private $progressType = ProgressType::MANUAL;
/** /**
* Created. * Created.
* *
@ -108,6 +112,26 @@ class Event
return $this->end; 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 public function getCalendar() : Calendar
{ {
return $this->calendar; return $this->calendar;

2
Models/EventMapper.php
View File

@ -46,6 +46,8 @@ class EventMapper extends DataMapperAbstract
'eventmanagement_event_calendar' => ['name' => 'eventmanagement_event_calendar', 'type' => 'int', 'internal' => 'calendar'], 'eventmanagement_event_calendar' => ['name' => 'eventmanagement_event_calendar', 'type' => 'int', 'internal' => 'calendar'],
'eventmanagement_event_start' => ['name' => 'eventmanagement_event_start', 'type' => 'DateTime', 'internal' => 'start'], 'eventmanagement_event_start' => ['name' => 'eventmanagement_event_start', 'type' => 'DateTime', 'internal' => 'start'],
'eventmanagement_event_end' => ['name' => 'eventmanagement_event_end', 'type' => 'DateTime', 'internal' => 'end'], '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_costs' => ['name' => 'eventmanagement_event_costs', 'type' => 'Serializable', 'internal' => 'costs'],
'eventmanagement_event_budget' => ['name' => 'eventmanagement_event_budget', 'type' => 'Serializable', 'internal' => 'budget'], 'eventmanagement_event_budget' => ['name' => 'eventmanagement_event_budget', 'type' => 'Serializable', 'internal' => 'budget'],
'eventmanagement_event_earnings' => ['name' => 'eventmanagement_event_earnings', 'type' => 'Serializable', 'internal' => 'earnings'], 'eventmanagement_event_earnings' => ['name' => 'eventmanagement_event_earnings', 'type' => 'Serializable', 'internal' => 'earnings'],

35
Models/ProgressType.php Normal file
View File

@ -0,0 +1,35 @@
<?php
/**
* Orange Management
*
* PHP Version 7.1
*
* @category TBD
* @package TBD
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link http://orange-management.com
*/
declare(strict_types=1);
namespace Modules\EventManagement\Models;
use phpOMS\Stdlib\Base\Enum;
/**
* Task type enum.
*
* @category Tasks
* @package Modules
* @license OMS License 1.0
* @link http://orange-management.com
* @since 1.0.0
*/
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;
}

6
Theme/Backend/Lang/en.lang.php
View File

@ -36,4 +36,10 @@ return ['EventManagement' => [
'Title' => 'Title', 'Title' => 'Title',
'User' => 'User', 'User' => 'User',
'UserGroup' => 'User/Group', 'UserGroup' => 'User/Group',
'Manual' => 'Manual',
'Linear' => 'Linear',
'Exponential' => 'Exponential',
'Progress' => 'Progress',
'Log' => 'Log',
'Tasks' => 'Tasks',
]]; ]];

9
Theme/Backend/eventmanagement-profile.tpl.php
View File

@ -33,6 +33,15 @@ echo $this->getData('nav')->render(); ?>
<td><input type="datetime-local" id="iEnd" name="end" value="<?= $this->printHtml($event->getEnd()->format('Y-m-d\TH:i:s')); ?>"> <td><input type="datetime-local" id="iEnd" name="end" value="<?= $this->printHtml($event->getEnd()->format('Y-m-d\TH:i:s')); ?>">
<tr><td colspan="2"><label for="iDescription"><?= $this->getHtml('Description') ?></label> <tr><td colspan="2"><label for="iDescription"><?= $this->getHtml('Description') ?></label>
<tr><td colspan="2"><textarea id="iDescription" name="desc"><?= $this->printHtml($event->getDescription()); ?></textarea> <tr><td colspan="2"><textarea id="iDescription" name="desc"><?= $this->printHtml($event->getDescription()); ?></textarea>
<tr><td colspan="2"><label for="iProgressType"><?= $this->getHtml('Progress') ?></label>
<tr><td><select id="iProgressType" name="progressType">
<option value="<?= \Modules\EventManagement\Models\ProgressType::MANUAL; ?>"><?= $this->getHtml('Manual') ?>
<option value="<?= \Modules\EventManagement\Models\ProgressType::LINEAR; ?>"><?= $this->getHtml('Linear') ?>
<option value="<?= \Modules\EventManagement\Models\ProgressType::EXPONENTIAL; ?>"><?= $this->getHtml('Exponential') ?>
<option value="<?= \Modules\EventManagement\Models\ProgressType::LOG; ?>"><?= $this->getHtml('Log') ?>
<option value="<?= \Modules\EventManagement\Models\ProgressType::TASKS; ?>"><?= $this->getHtml('Tasks') ?>
</select>
<td><input type="text" id="iProgress" name="progress" value="<?= $project->getProgress(); ?>"<?= $project->getProgressType() !== \Modules\EventManagement\Models\ProgressType::MANUAL ? ' disabled' : ''; ?>>
<tr><td><label for="iBudget"><?= $this->getHtml('Budget') ?></label><td><label for="iActual"><?= $this->getHtml('Actual') ?></label> <tr><td><label for="iBudget"><?= $this->getHtml('Budget') ?></label><td><label for="iActual"><?= $this->getHtml('Actual') ?></label>
<tr><td><input type="text" id="iBudget" name="budget" placeholder=""><td><input type="text" id="iActual" name="actual"> <tr><td><input type="text" id="iBudget" name="budget" placeholder=""><td><input type="text" id="iActual" name="actual">
<tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>"> <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>">