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

bug and media fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-10-29 14:49:55 +02:00
parent 41c6e6f84a
commit dfbc9fdacd
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Models/Event.php
View File

@ -17,8 +17,8 @@ namespace Modules\EventManagement\Models;
use Modules\Admin\Models\Account; use Modules\Admin\Models\Account;
use Modules\Admin\Models\NullAccount; use Modules\Admin\Models\NullAccount;
use Modules\Calendar\Models\Calendar; use Modules\Calendar\Models\Calendar;
use Modules\Tasks\Models\Task;
use Modules\Tasks\Models\NullTask; use Modules\Tasks\Models\NullTask;
use Modules\Tasks\Models\Task;
use phpOMS\Localization\Money; use phpOMS\Localization\Money;
use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
@ -353,21 +353,21 @@ class Event
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'type' => $this->type, 'type' => $this->type,
'start' => $this->start, 'start' => $this->start,
'end' => $this->end, 'end' => $this->end,
'name' => $this->name, 'name' => $this->name,
'description' => $this->description, 'description' => $this->description,
'calendar' => $this->calendar, 'calendar' => $this->calendar,
'costs' => $this->costs, 'costs' => $this->costs,
'budget' => $this->budget, 'budget' => $this->budget,
'earnings' => $this->earnings, 'earnings' => $this->earnings,
'tasks' => $this->tasks, 'tasks' => $this->tasks,
'media' => $this->media, 'media' => $this->media,
'progress' => $this->progress, 'progress' => $this->progress,
'progressType' => $this->progressType, 'progressType' => $this->progressType,
'createdAt' => $this->createdAt, 'createdAt' => $this->createdAt,
]; ];
} }

2
tests/Bootstrap.php
View File

@ -392,4 +392,4 @@ function phpServe() : void
}); });
} }
phpServe(); \phpServe();

18
tests/Models/EventMapperTest.php
View File

@ -41,14 +41,14 @@ final class EventMapperTest extends \PHPUnit\Framework\TestCase
$event->name = 'Eventname'; $event->name = 'Eventname';
$event->description = 'Event description'; $event->description = 'Event description';
$event->createdBy = new NullAccount(1); $event->createdBy = new NullAccount(1);
$event->start = new \DateTime('2000-05-05'); $event->start = new \DateTime('2000-05-05');
$event->end = new \DateTime('2005-05-05'); $event->end = new \DateTime('2005-05-05');
$money = new Money(); $money = new Money();
$money->setString('1.23'); $money->setString('1.23');
$event->costs = $money; $event->costs = $money;
$event->budget = $money; $event->budget = $money;
$event->earnings = $money; $event->earnings = $money;
$task = new Task(); $task = new Task();
@ -124,16 +124,16 @@ final class EventMapperTest extends \PHPUnit\Framework\TestCase
$event->name = $text->generateText(\mt_rand(3, 7)); $event->name = $text->generateText(\mt_rand(3, 7));
$event->description = $text->generateText(\mt_rand(20, 100)); $event->description = $text->generateText(\mt_rand(20, 100));
$event->createdBy = new NullAccount(1); $event->createdBy = new NullAccount(1);
$event->start = new \DateTime('2000-05-05'); $event->start = new \DateTime('2000-05-05');
$event->end = new \DateTime('2005-05-05'); $event->end = new \DateTime('2005-05-05');
$event->progress = \mt_rand(0, 100); $event->progress = \mt_rand(0, 100);
$event->setProgressType(\mt_rand(0, 4)); $event->setProgressType(\mt_rand(0, 4));
$money = new Money(); $money = new Money();
$money->setString('1.23'); $money->setString('1.23');
$event->costs = $money; $event->costs = $money;
$event->budget = $money; $event->budget = $money;
$event->earnings = $money; $event->earnings = $money;
$id = EventMapper::create($event); $id = EventMapper::create($event);

32
tests/Models/EventTest.php
View File

@ -17,8 +17,8 @@ namespace Modules\EventManagement\tests\Models;
use Modules\EventManagement\Models\Event; use Modules\EventManagement\Models\Event;
use Modules\EventManagement\Models\EventType; use Modules\EventManagement\Models\EventType;
use Modules\EventManagement\Models\ProgressType; use Modules\EventManagement\Models\ProgressType;
use Modules\Tasks\Models\Task;
use Modules\Media\Models\Media; use Modules\Media\Models\Media;
use Modules\Tasks\Models\Task;
use phpOMS\Localization\Money; use phpOMS\Localization\Money;
/** /**
@ -172,10 +172,10 @@ final class EventTest extends \PHPUnit\Framework\TestCase
*/ */
public function testSerialize() : void public function testSerialize() : void
{ {
$this->event->name = 'Name'; $this->event->name = 'Name';
$this->event->description = 'Description'; $this->event->description = 'Description';
$this->event->start = new \DateTime(); $this->event->start = new \DateTime();
$this->event->end = new \DateTime(); $this->event->end = new \DateTime();
$this->event->setType(EventType::SEMINAR); $this->event->setType(EventType::SEMINAR);
$this->event->progress = 10; $this->event->progress = 10;
$this->event->setProgressType(ProgressType::TASKS); $this->event->setProgressType(ProgressType::TASKS);
@ -186,18 +186,18 @@ final class EventTest extends \PHPUnit\Framework\TestCase
self::assertEquals( self::assertEquals(
[ [
'id' => 0, 'id' => 0,
'type' => EventType::SEMINAR, 'type' => EventType::SEMINAR,
'start' => $this->event->start, 'start' => $this->event->start,
'end' => $this->event->end, 'end' => $this->event->end,
'name' => 'Name', 'name' => 'Name',
'description' => 'Description', 'description' => 'Description',
'costs' => new Money(), 'costs' => new Money(),
'budget' => new Money(), 'budget' => new Money(),
'earnings' => new Money(), 'earnings' => new Money(),
'tasks' => [], 'tasks' => [],
'media' => [], 'media' => [],
'progress' => 10, 'progress' => 10,
'progressType' => ProgressType::TASKS, 'progressType' => ProgressType::TASKS,
], ],
$serialized $serialized