Jingga/oms-EventManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-EventManagement.git synced 2026-01-26 15:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	Draw/Controller.js
#	Draw/Models/DrawType.enum.js
#	Draw/Models/Editor.js
#	Media/Models/UploadFile.php
This commit is contained in:
Dennis Eichhorn 2017-01-26 16:42:29 +01:00
commit d298815613
18 changed files with 97 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin/Activate.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -16,7 +16,7 @@
namespace Modules\EventManagement\Admin;
use phpOMS\DataStorage\Database\Pool;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\ActivateAbstract;
use phpOMS\Module\InfoManager;
@ -37,7 +37,7 @@ class Activate extends ActivateAbstract
/**
* {@inheritdoc}
*/
public static function activate(Pool $dbPool, InfoManager $info)
public static function activate(DatabasePool $dbPool, InfoManager $info)
{
parent::activate($dbPool, $info);
}

6
Admin/Deactivate.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -16,7 +16,7 @@
namespace Modules\EventManagement\Admin;
use phpOMS\DataStorage\Database\Pool;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\DeactivateAbstract;
use phpOMS\Module\InfoManager;
@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract
/**
* {@inheritdoc}
*/
public static function deactivate(Pool $dbPool, InfoManager $info)
public static function deactivate(DatabasePool $dbPool, InfoManager $info)
{
parent::deactivate($dbPool, $info);
}

6
Admin/Install/Navigation.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -14,7 +14,7 @@
* @link http://orange-management.com
*/
namespace Modules\EventManagement\Admin\Install;
use phpOMS\DataStorage\Database\Pool;
use phpOMS\DataStorage\Database\DatabasePool;
/**
* Navigation class.
@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool;
*/
class Navigation
{
public static function install(Pool $dbPool)
public static function install(string $path, DatabasePool $dbPool)
{
$navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);

17
Admin/Installer.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -16,7 +16,7 @@
namespace Modules\EventManagement\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\InfoManager;
use phpOMS\Module\InstallerAbstract;
@ -37,32 +37,33 @@ class Installer extends InstallerAbstract
/**
* {@inheritdoc}
*/
public static function install(Pool $dbPool, InfoManager $info)
public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
{
parent::install($dbPool, $info);
parent::install($path, $dbPool, $info);
switch ($dbPool->get('core')->getType()) {
case DatabaseType::MYSQL:
$dbPool->get('core')->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'eventmanagement_event` (
`eventmanagement_event_id` int(11) NOT NULL AUTO_INCREMENT,
`eventmanagement_event_name` varchar(255) NOT NULL,
`eventmanagement_event_type` tinyint(2) NOT NULL,
`eventmanagement_event_event` int(11) NOT NULL,
`eventmanagement_event_calendar` int(11) NOT NULL,
`eventmanagement_event_costs` int(11) NOT NULL,
`eventmanagement_event_budget` int(11) NOT NULL,
`eventmanagement_event_earnings` int(11) NOT NULL,
`eventmanagement_event_created_by` int(11) NOT NULL,
`eventmanagement_event_created_at` datetime NOT NULL,
PRIMARY KEY (`eventmanagement_event_id`),
KEY `eventmanagement_event_event` (`eventmanagement_event_event`),
KEY `eventmanagement_event_calendar` (`eventmanagement_event_calendar`),
KEY `eventmanagement_event_created_by` (`eventmanagement_event_created_by`)
)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_event`) REFERENCES `' . $dbPool->get('core')->prefix . 'calendar_event` (`calendar_event_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'eventmanagement_event_ibfk_2` FOREIGN KEY (`eventmanagement_event_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account_id` (`calendar_event_created_by`);'
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`);'
)->execute();
$dbPool->get('core')->con->prepare(

6
Admin/Uninstall.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -16,7 +16,7 @@
namespace Modules\EventManagement\Admin;
use phpOMS\DataStorage\Database\Pool;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\UninstallAbstract;
/**
@ -36,7 +36,7 @@ class Uninstall extends UninstallAbstract
/**
* {@inheritdoc}
*/
public static function uninstall(Pool $dbPool, InfoManager $info)
public static function uninstall(DatabasePool $dbPool, InfoManager $info)
{
parent::uninstall($dbPool, $info);
}

6
Admin/Update.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -16,7 +16,7 @@
namespace Modules\EventManagement\Admin;
use phpOMS\DataStorage\Database\Pool;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\UpdateAbstract;
use phpOMS\System\File\Directory;
@ -37,7 +37,7 @@ class Update extends UpdateAbstract
/**
* {@inheritdoc}
*/
public static function update(Pool $dbPool, array $info)
public static function update(DatabasePool $dbPool, array $info)
{
Directory::deletePath(__DIR__ . '/Update');
mkdir('Update');

8
Controller.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -41,7 +41,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var string
* @since 1.0.0
*/
const MODULE_PATH = __DIR__;
/* public */ const MODULE_PATH = __DIR__;
/**
* Module version.
@ -49,7 +49,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var string
* @since 1.0.0
*/
const MODULE_VERSION = '1.0.0';
/* public */ const MODULE_VERSION = '1.0.0';
/**
* Module name.
@ -57,7 +57,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var string
* @since 1.0.0
*/
const MODULE_NAME = 'EventManagement';
/* public */ const MODULE_NAME = 'EventManagement';
/**
* Providing.

52
Models/Event.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -15,7 +15,7 @@
*/
namespace Modules\EventManagement\Models;
use Modules\Calendar\Models\Event as CalendarEvent;
use Modules\Calendar\Models\Calendar;
use Modules\Tasks\Models\Task;
use phpOMS\Datatypes\Exception\InvalidEnumValue;
use phpOMS\Localization\Money;
@ -44,7 +44,9 @@ class Event
private $type = EventType::DEFAULT;
private $event = null;
private $name = '';
private $calendar = null;
private $costs = null;
@ -72,33 +74,33 @@ class Event
public function __construct(string $name = '')
{
$this->event = new CalendarEvent();
$this->costs = new Money();
$this->budget = new Money();
$this->earnings = new Money();
$this->calendar = new Calendar();
$this->costs = new Money();
$this->budget = new Money();
$this->earnings = new Money();
$this->createdAt = new \DateTime('now');
$this->setName($name);
}
public function getEvent() : CalendarEvent
public function getCalendar() : Calendar
{
return $this->event;
return $this->calendar;
}
public function setName(string $name)
public function setName(string $name)
{
$this->event->setName($name);
$this->name = $name;
}
public function getName() : string
{
return $this->event->getName();
return $this->name;
}
public function addTask(Task $task)
{
if($task->getId() !== 0) {
if ($task->getId() !== 0) {
$this->tasks[$task->getId()] = $task;
} else {
$this->tasks[] = $task;
@ -107,7 +109,7 @@ class Event
public function removeTask(int $id) : bool
{
if(isset($this->tasks[$id])) {
if (isset($this->tasks[$id])) {
unset($this->tasks[$id]);
return true;
@ -121,12 +123,12 @@ class Event
return $this->tasks[$id] ?? new Task();
}
public function getTasks() : array
public function getTasks() : array
{
return $this->tasks;
}
public function countTasks() : int
public function countTasks() : int
{
return count($this->tasks);
}
@ -138,7 +140,7 @@ class Event
public function setType(int $type)
{
if(!EventType::isValidValue($type)) {
if (!EventType::isValidValue($type)) {
throw new InvalidEnumValue($type);
}
@ -150,32 +152,32 @@ class Event
return $this->type;
}
public function getCosts() : Money
public function getCosts() : Money
{
return $this->costs;
}
public function getBudget() : Money
public function getBudget() : Money
{
return $this->budget;
}
public function getEarnings() : Money
public function getEarnings() : Money
{
return $this->earnings;
}
public function setCosts(Money $costs)
public function setCosts(Money $costs)
{
$this->costs = $costs;
}
public function setBudget(Money $budget)
public function setBudget(Money $budget)
{
$this->budget = $budget;
}
public function setEarnings(Money $earnings)
public function setEarnings(Money $earnings)
{
$this->earnings = $earnings;
}
@ -200,7 +202,7 @@ class Event
public function setCreatedAt(\DateTime $createdAt)
{
$this->createdAt = $createdAt;
$this->event->setCreatedAt($this->createdAt);
$this->calendar->setCreatedAt($this->createdAt);
}
/**
@ -223,6 +225,6 @@ class Event
public function setCreatedBy(int $createdBy)
{
$this->createdBy = $createdBy;
$this->event->setCreatedBy($this->createdBy);
$this->calendar->setCreatedBy($this->createdBy);
}
}

41
Models/EventMapper.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -37,37 +37,38 @@ class EventMapper extends DataMapperAbstract
/**
* Columns.
*
* @var array<string, array>
* @var array
* @since 1.0.0
*/
protected static $columns = [
'eventmanagement_event_id' => ['name' => 'eventmanagement_event_id', 'type' => 'int', 'internal' => 'id'],
'eventmanagement_event_type' => ['name' => 'eventmanagement_event_type', 'type' => 'int', 'internal' => 'type'],
'eventmanagement_event_event' => ['name' => 'eventmanagement_event_event', 'type' => 'int', 'internal' => 'event'],
'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'],
'eventmanagement_event_created_by' => ['name' => 'eventmanagement_event_created_by', 'type' => 'int', 'internal' => 'createdBy'],
'eventmanagement_event_created_at' => ['name' => 'eventmanagement_event_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
'eventmanagement_event_id' => ['name' => 'eventmanagement_event_id', 'type' => 'int', 'internal' => 'id'],
'eventmanagement_event_name' => ['name' => 'eventmanagement_event_name', 'type' => 'string', 'internal' => 'name'],
'eventmanagement_event_type' => ['name' => 'eventmanagement_event_type', 'type' => 'int', 'internal' => 'type'],
'eventmanagement_event_calendar' => ['name' => 'eventmanagement_event_calendar', 'type' => 'int', 'internal' => 'calendar'],
'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'],
'eventmanagement_event_created_by' => ['name' => 'eventmanagement_event_created_by', 'type' => 'int', 'internal' => 'createdBy'],
'eventmanagement_event_created_at' => ['name' => 'eventmanagement_event_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
];
/**
* Has one relation.
*
* @var array<string, array>
* @var array
* @since 1.0.0
*/
protected static $hasOne = [
'event' => [
'mapper' => \Modules\Calendar\Models\EventMapper::class,
'src' => 'eventmanagement_event_event',
protected static $ownsOne = [
'calendar' => [
'mapper' => \Modules\Calendar\Models\CalendarMapper::class,
'src' => 'eventmanagement_event_calendar',
],
];
/**
* Has many relation.
*
* @var array<string, array>
* @var array
* @since 1.0.0
*/
protected static $hasMany = [
@ -153,9 +154,9 @@ class EventMapper extends DataMapperAbstract
public static function find(...$columns) : Builder
{
return parent::find(...$columns)->from('account_permission')
->where('account_permission.account_permission_for', '=', 'calendar_event')
->where('account_permission.account_permission_id1', '=', 1)
->where('calendar_event.calendar_event_id', '=', new Column('account_permission.account_permission_id2'))
->where('account_permission.account_permission_r', '=', 1);
->where('account_permission.account_permission_for', '=', 'calendar_event')
->where('account_permission.account_permission_id1', '=', 1)
->where('calendar_event.calendar_event_id', '=', new Column('account_permission.account_permission_id2'))
->where('account_permission.account_permission_r', '=', 1);
}
}

26
Models/EventType.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -30,27 +30,27 @@ use phpOMS\Datatypes\Enum;
*/
abstract class EventType extends Enum
{
const DEFAULT = 0;
/* public */ const DEFAULT = 0;
const COURSE = 1;
/* public */ const COURSE = 1;
const EVENT = 2;
/* public */ const EVENT = 2;
const FAIR = 3;
/* public */ const FAIR = 3;
const CONGRESS = 4;
/* public */ const CONGRESS = 4;
const DEMO = 5;
/* public */ const DEMO = 5;
const CONFERENCE = 6;
/* public */ const CONFERENCE = 6;
const SEMINAR = 7;
/* public */ const SEMINAR = 7;
const MEETING = 8;
/* public */ const MEETING = 8;
const TRADESHOW = 9;
/* public */ const TRADESHOW = 9;
const LAUNCH = 10;
/* public */ const LAUNCH = 10;
const CELEBRATION = 11;
/* public */ const CELEBRATION = 11;
}

2
Theme/Backend/eventmanagement-create.tpl.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD

2
Theme/Backend/eventmanagement-list.tpl.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD

2
Theme/backend/Lang/Navigation.en.lang.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD

2
Theme/backend/Lang/api.en.lang.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD

2
Theme/backend/Lang/en.lang.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD

2
Theme/backend/eventmanagement-create.tpl.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD

2
Theme/backend/eventmanagement-list.tpl.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD

2
Theme/backend/eventmanagement-profile.tpl.php
View File

@ -2,7 +2,7 @@
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD