remove some getter/setter

This commit is contained in:
Dennis Eichhorn 2020-11-24 17:31:19 +01:00
parent 24217bf464
commit 2e124c3183
5 changed files with 25 additions and 113 deletions

View File

@ -51,7 +51,7 @@ class Event
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $name = ''; public string $name = '';
/** /**
* Description. * Description.
@ -59,7 +59,7 @@ class Event
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $description = ''; public string $description = '';
private $calendar = null; private $calendar = null;
@ -83,7 +83,7 @@ class Event
* @var \DateTimeImmutable * @var \DateTimeImmutable
* @since 1.0.0 * @since 1.0.0
*/ */
private \DateTimeImmutable $createdAt; public \DateTimeImmutable $createdAt;
/** /**
* Creator. * Creator.
@ -91,7 +91,7 @@ class Event
* @var Account * @var Account
* @since 1.0.0 * @since 1.0.0
*/ */
private Account $createdBy; public Account $createdBy;
/** /**
* Constructor. * Constructor.
@ -111,7 +111,7 @@ class Event
$this->createdAt = new \DateTimeImmutable('now'); $this->createdAt = new \DateTimeImmutable('now');
$this->createdBy = new NullAccount(); $this->createdBy = new NullAccount();
$this->setName($name); $this->name = $name;
} }
/** /**
@ -268,58 +268,6 @@ class Event
return $this->calendar; return $this->calendar;
} }
/**
* Set description
*
* @param string $description Description
*
* @return void
*
* @since 1.0.0
*/
public function setDescription(string $description) : void
{
$this->description = $description;
}
/**
* Get description
*
* @return string
*
* @since 1.0.0
*/
public function getDescription() : string
{
return $this->description;
}
/**
* Set name
*
* @param string $name Name
*
* @return void
*
* @since 1.0.0
*/
public function setName(string $name) : void
{
$this->name = $name;
}
/**
* Get name
*
* @return string
*
* @since 1.0.0
*/
public function getName() : string
{
return $this->name;
}
/** /**
* Add task. * Add task.
* *
@ -503,40 +451,4 @@ class Event
{ {
$this->earnings = $earnings; $this->earnings = $earnings;
} }
/**
* get created at
*
* @return \DateTimeImmutable
*
* @since 1.0.0
*/
public function getCreatedAt() : \DateTimeImmutable
{
return $this->createdAt;
}
/**
* Get creator
*
* @return Account
*
* @since 1.0.0
*/
public function getCreatedBy() : Account
{
return $this->createdBy;
}
/**
* Set creator
*
* @param Account $createdBy Creator
*
* @since 1.0.0
*/
public function setCreatedBy(Account $createdBy) : void
{
$this->createdBy = $createdBy;
}
} }

View File

@ -35,7 +35,7 @@ echo $this->getData('nav')->render(); ?>
<?php $count = 0; foreach ($events as $key => $value) : ++$count; <?php $count = 0; foreach ($events as $key => $value) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('{/prefix}eventmanagement/profile?{?}&id=' . $value->getId()); ?> $url = \phpOMS\Uri\UriFactory::build('{/prefix}eventmanagement/profile?{?}&id=' . $value->getId()); ?>
<tr tabindex="0" data-href="<?= $url; ?>"> <tr tabindex="0" data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a> <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<td data-label="<?= $this->getHtml('Start'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getStart()->format('Y-m-d')); ?></a> <td data-label="<?= $this->getHtml('Start'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getStart()->format('Y-m-d')); ?></a>
<td data-label="<?= $this->getHtml('End'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getEnd()->format('Y-m-d')); ?></a> <td data-label="<?= $this->getHtml('End'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getEnd()->format('Y-m-d')); ?></a>
<?php endforeach; ?> <?php endforeach; ?>

View File

@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); ?>
<tr><td><input type="datetime-local" id="iStart" name="start" value="<?= $this->printHtml($event->getStart()->format('Y-m-d\TH:i:s')); ?>"> <tr><td><input type="datetime-local" id="iStart" name="start" value="<?= $this->printHtml($event->getStart()->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')); ?>"> <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->description); ?></textarea>
<tr><td colspan="2"><label for="iProgressType"><?= $this->getHtml('Progress'); ?></label> <tr><td colspan="2"><label for="iProgressType"><?= $this->getHtml('Progress'); ?></label>
<tr><td><select id="iProgressType" name="progressType"> <tr><td><select id="iProgressType" name="progressType">
<option value="<?= \Modules\EventManagement\Models\ProgressType::MANUAL; ?>"><?= $this->getHtml('Manual'); ?> <option value="<?= \Modules\EventManagement\Models\ProgressType::MANUAL; ?>"><?= $this->getHtml('Manual'); ?>

View File

@ -38,9 +38,9 @@ class EventMapperTest extends \PHPUnit\Framework\TestCase
$event = new Event(); $event = new Event();
$event->setType(EventType::SEMINAR); $event->setType(EventType::SEMINAR);
$event->setName('Eventname'); $event->name = 'Eventname';
$event->setDescription('Event description'); $event->description = 'Event description';
$event->setCreatedBy(new NullAccount(1)); $event->createdBy = new NullAccount(1);
$event->setStart(new \DateTime('2000-05-05')); $event->setStart(new \DateTime('2000-05-05'));
$event->setEnd(new \DateTime('2005-05-05')); $event->setEnd(new \DateTime('2005-05-05'));
@ -52,11 +52,11 @@ class EventMapperTest extends \PHPUnit\Framework\TestCase
$event->setEarnings($money); $event->setEarnings($money);
$task = new Task(); $task = new Task();
$task->setTitle('EventTask 1'); $task->title = 'EventTask 1';
$task->setCreatedBy(new NullAccount(1)); $task->setCreatedBy(new NullAccount(1));
$task2 = new Task(); $task2 = new Task();
$task2->setTitle('EventTask 2'); $task2->title = 'EventTask 2';
$task2->setCreatedBy(new NullAccount(1)); $task2->setCreatedBy(new NullAccount(1));
$event->addTask($task); $event->addTask($task);
@ -66,12 +66,12 @@ class EventMapperTest extends \PHPUnit\Framework\TestCase
$event->setProgressType(ProgressType::TASKS); $event->setProgressType(ProgressType::TASKS);
$media = new Media(); $media = new Media();
$media->setCreatedBy(new NullAccount(1)); $media->createdBy = new NullAccount(1);
$media->setDescription('desc'); $media->description = 'desc';
$media->setPath('some/path'); $media->setPath('some/path');
$media->setSize(11); $media->size = 11;
$media->setExtension('png'); $media->extension = 'png';
$media->setName('Event Media'); $media->name = 'Event Media';
$event->addMedia($media); $event->addMedia($media);
$id = EventMapper::create($event); $id = EventMapper::create($event);
@ -80,8 +80,8 @@ class EventMapperTest extends \PHPUnit\Framework\TestCase
$eventR = EventMapper::get($event->getId()); $eventR = EventMapper::get($event->getId());
self::assertEquals($event->getName(), $eventR->getName()); self::assertEquals($event->name, $eventR->name);
self::assertEquals($event->getDescription(), $eventR->getDescription()); self::assertEquals($event->description, $eventR->description);
self::assertEquals($event->countTasks(), $eventR->countTasks()); self::assertEquals($event->countTasks(), $eventR->countTasks());
self::assertEquals($event->getStart()->format('Y-m-d'), $eventR->getStart()->format('Y-m-d')); self::assertEquals($event->getStart()->format('Y-m-d'), $eventR->getStart()->format('Y-m-d'));
self::assertEquals($event->getEnd()->format('Y-m-d'), $eventR->getEnd()->format('Y-m-d')); self::assertEquals($event->getEnd()->format('Y-m-d'), $eventR->getEnd()->format('Y-m-d'));
@ -94,7 +94,7 @@ class EventMapperTest extends \PHPUnit\Framework\TestCase
$expected = $event->getMedia(); $expected = $event->getMedia();
$actual = $eventR->getMedia(); $actual = $eventR->getMedia();
self::assertEquals(\end($expected)->getName(), \end($actual)->getName()); self::assertEquals(\end($expected)->name, \end($actual)->name);
} }
/** /**
@ -121,9 +121,9 @@ class EventMapperTest extends \PHPUnit\Framework\TestCase
$event = new Event(); $event = new Event();
$event->setType(EventType::SEMINAR); $event->setType(EventType::SEMINAR);
$event->setName($text->generateText(\mt_rand(3, 7))); $event->name = $text->generateText(\mt_rand(3, 7));
$event->setDescription($text->generateText(\mt_rand(20, 100))); $event->description = $text->generateText(\mt_rand(20, 100));
$event->setCreatedBy(new NullAccount(1)); $event->createdBy = new NullAccount(1);
$event->setStart(new \DateTime('2000-05-05')); $event->setStart(new \DateTime('2000-05-05'));
$event->setEnd(new \DateTime('2005-05-05')); $event->setEnd(new \DateTime('2005-05-05'));
$event->setProgress(\mt_rand(0, 100)); $event->setProgress(\mt_rand(0, 100));

View File

@ -71,10 +71,10 @@ class EventTest extends \PHPUnit\Framework\TestCase
self::assertEquals($money->getAmount(), $event->getEarnings()->getAmount()); self::assertEquals($money->getAmount(), $event->getEarnings()->getAmount());
$task = new Task(); $task = new Task();
$task->setTitle('A'); $task->title = 'A';
$event->addTask($task); $event->addTask($task);
self::assertEquals('A', $event->getTask(0)->getTitle()); self::assertEquals('A', $event->getTask(0)->title);
self::assertTrue($event->removeTask(0)); self::assertTrue($event->removeTask(0));
self::assertEquals(0, $event->countTasks()); self::assertEquals(0, $event->countTasks());