remove some getter/setter

This commit is contained in:
Dennis Eichhorn 2020-11-24 17:31:20 +01:00
parent cb059e73e6
commit 7fcd39a462
5 changed files with 28 additions and 116 deletions

View File

@ -78,7 +78,7 @@ class Project
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $description = ''; public string $description = '';
/** /**
* Project raw description. * Project raw description.
@ -86,7 +86,7 @@ class Project
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
private string $descriptionRaw = ''; public string $descriptionRaw = '';
/** /**
* Calendar. * Calendar.
@ -158,7 +158,7 @@ class Project
* @var \DateTimeImmutable * @var \DateTimeImmutable
* @since 1.0.0 * @since 1.0.0
*/ */
private \DateTimeImmutable $createdAt; public \DateTimeImmutable $createdAt;
/** /**
* Created by. * Created by.
@ -166,7 +166,7 @@ class Project
* @var Account * @var Account
* @since 1.0.0 * @since 1.0.0
*/ */
private Account $createdBy; public Account $createdBy;
/** /**
* Tasks. * Tasks.
@ -533,59 +533,7 @@ class Project
public function setName(string $name) : void public function setName(string $name) : void
{ {
$this->name = $name; $this->name = $name;
$this->calendar->setName($name); $this->calendar->name = $name;
}
/**
* Get description
*
* @return string
*
* @since 1.0.0
*/
public function getDescription() : string
{
return $this->description;
}
/**
* 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 getDescriptionRaw() : string
{
return $this->descriptionRaw;
}
/**
* Set Description
*
* @param string $description Description
*
* @return void
*
* @since 1.0.0
*/
public function setDescriptionRaw(string $description) : void
{
$this->descriptionRaw = $description;
} }
/** /**
@ -691,40 +639,4 @@ class Project
{ {
$this->earnings = $earnings; $this->earnings = $earnings;
} }
/**
* Get created at
*
* @return \DateTimeImmutable
*
* @since 1.0.0
*/
public function getCreatedAt() : \DateTimeImmutable
{
return $this->createdAt;
}
/**
* Get created by
*
* @return Account
*
* @since 1.0.0
*/
public function getCreatedBy() : Account
{
return $this->createdBy;
}
/**
* Set created by
*
* @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 ($list as $key => $value) : ++$count; <?php $count = 0; foreach ($list as $key => $value) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('{/prefix}projectmanagement/profile?{?}&id=' . $value->getId()); ?> $url = \phpOMS\Uri\UriFactory::build('{/prefix}projectmanagement/profile?{?}&id=' . $value->getId()); ?>
<tr tabindex="0" data-href="<?= $url; ?>"> <tr tabindex="0" data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a> <td data-label="<?= $this->getHtml('Title'); ?>"><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('Due'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getEnd()->format('Y-m-d')); ?></a> <td data-label="<?= $this->getHtml('Due'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getEnd()->format('Y-m-d')); ?></a>
<?php endforeach; ?> <?php endforeach; ?>

View File

@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
<tr><td><input type="datetime-local" id="iStart" name="start" value="<?= $this->printHtml($project->getStart()->format('Y-m-d\TH:i:s')); ?>"> <tr><td><input type="datetime-local" id="iStart" name="start" value="<?= $this->printHtml($project->getStart()->format('Y-m-d\TH:i:s')); ?>">
<td><input type="datetime-local" id="iEnd" name="end" value="<?= $this->printHtml($project->getEnd()->format('Y-m-d\TH:i:s')); ?>"> <td><input type="datetime-local" id="iEnd" name="end" value="<?= $this->printHtml($project->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($project->getDescription()); ?></textarea> <tr><td colspan="2"><textarea id="iDescription" name="desc"><?= $this->printHtml($project->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\ProjectManagement\Models\ProgressType::MANUAL; ?>"><?= $this->getHtml('Manual'); ?> <option value="<?= \Modules\ProjectManagement\Models\ProgressType::MANUAL; ?>"><?= $this->getHtml('Manual'); ?>

View File

@ -37,8 +37,8 @@ class ProjectMapperTest extends \PHPUnit\Framework\TestCase
$project = new Project(); $project = new Project();
$project->setName('Projectname'); $project->setName('Projectname');
$project->setDescription('Description'); $project->description = 'Description';
$project->setCreatedBy(new NullAccount(1)); $project->createdBy = new NullAccount(1);
$project->setStart(new \DateTime('2000-05-05')); $project->setStart(new \DateTime('2000-05-05'));
$project->setEnd(new \DateTime('2005-05-05')); $project->setEnd(new \DateTime('2005-05-05'));
@ -51,11 +51,11 @@ class ProjectMapperTest extends \PHPUnit\Framework\TestCase
$project->setEarnings($money); $project->setEarnings($money);
$task = new Task(); $task = new Task();
$task->setTitle('ProjectTask 1'); $task->title = 'ProjectTask 1';
$task->setCreatedBy(new NullAccount(1)); $task->setCreatedBy(new NullAccount(1));
$task2 = new Task(); $task2 = new Task();
$task2->setTitle('ProjectTask 2'); $task2->title = 'ProjectTask 2';
$task2->setCreatedBy(new NullAccount(1)); $task2->setCreatedBy(new NullAccount(1));
$project->addTask($task); $project->addTask($task);
@ -65,12 +65,12 @@ class ProjectMapperTest extends \PHPUnit\Framework\TestCase
$project->setProgressType(ProgressType::TASKS); $project->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('Project Media'); $media->name = 'Project Media';
$project->addMedia($media); $project->addMedia($media);
$id = ProjectMapper::create($project); $id = ProjectMapper::create($project);
@ -80,13 +80,13 @@ class ProjectMapperTest extends \PHPUnit\Framework\TestCase
$projectR = ProjectMapper::get($project->getId()); $projectR = ProjectMapper::get($project->getId());
self::assertEquals($project->getName(), $projectR->getName()); self::assertEquals($project->getName(), $projectR->getName());
self::assertEquals($project->getDescription(), $projectR->getDescription()); self::assertEquals($project->description, $projectR->description);
self::assertEquals($project->countTasks(), $projectR->countTasks()); self::assertEquals($project->countTasks(), $projectR->countTasks());
self::assertEquals($project->getCosts()->getAmount(), $projectR->getCosts()->getAmount()); self::assertEquals($project->getCosts()->getAmount(), $projectR->getCosts()->getAmount());
self::assertEquals($project->getBudgetEarnings()->getAmount(), $projectR->getBudgetEarnings()->getAmount()); self::assertEquals($project->getBudgetEarnings()->getAmount(), $projectR->getBudgetEarnings()->getAmount());
self::assertEquals($project->getBudgetCosts()->getAmount(), $projectR->getBudgetCosts()->getAmount()); self::assertEquals($project->getBudgetCosts()->getAmount(), $projectR->getBudgetCosts()->getAmount());
self::assertEquals($project->getEarnings()->getAmount(), $projectR->getEarnings()->getAmount()); self::assertEquals($project->getEarnings()->getAmount(), $projectR->getEarnings()->getAmount());
self::assertEquals($project->getCreatedAt()->format('Y-m-d'), $projectR->getCreatedAt()->format('Y-m-d')); self::assertEquals($project->createdAt->format('Y-m-d'), $projectR->createdAt->format('Y-m-d'));
self::assertEquals($project->getStart()->format('Y-m-d'), $projectR->getStart()->format('Y-m-d')); self::assertEquals($project->getStart()->format('Y-m-d'), $projectR->getStart()->format('Y-m-d'));
self::assertEquals($project->getEnd()->format('Y-m-d'), $projectR->getEnd()->format('Y-m-d')); self::assertEquals($project->getEnd()->format('Y-m-d'), $projectR->getEnd()->format('Y-m-d'));
self::assertEquals($project->getProgress(), $projectR->getProgress()); self::assertEquals($project->getProgress(), $projectR->getProgress());
@ -95,7 +95,7 @@ class ProjectMapperTest extends \PHPUnit\Framework\TestCase
$expected = $project->getMedias(); $expected = $project->getMedias();
$actual = $projectR->getMedias(); $actual = $projectR->getMedias();
self::assertEquals(\end($expected)->getName(), \end($actual)->getName()); self::assertEquals(\end($expected)->name, \end($actual)->name);
} }
/** /**
@ -122,8 +122,8 @@ class ProjectMapperTest extends \PHPUnit\Framework\TestCase
$project = new Project(); $project = new Project();
$project->setName($text->generateText(\mt_rand(3, 7))); $project->setName($text->generateText(\mt_rand(3, 7)));
$project->setDescription($text->generateText(\mt_rand(20, 100))); $project->description = $text->generateText(\mt_rand(20, 100));
$project->setCreatedBy(new NullAccount(1)); $project->createdBy = new NullAccount(1);
$project->setStart(new \DateTime('2000-05-05')); $project->setStart(new \DateTime('2000-05-05'));
$project->setEnd(new \DateTime('2005-05-05')); $project->setEnd(new \DateTime('2005-05-05'));
$project->setProgress(\mt_rand(0, 100)); $project->setProgress(\mt_rand(0, 100));

View File

@ -35,12 +35,12 @@ class ProjectTest extends \PHPUnit\Framework\TestCase
self::assertEquals(0, $project->getId()); self::assertEquals(0, $project->getId());
self::assertInstanceOf('\Modules\Calendar\Models\Calendar', $project->getCalendar()); self::assertInstanceOf('\Modules\Calendar\Models\Calendar', $project->getCalendar());
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $project->getCreatedAt()->format('Y-m-d')); self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $project->createdAt->format('Y-m-d'));
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $project->getStart()->format('Y-m-d')); self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $project->getStart()->format('Y-m-d'));
self::assertEquals((new \DateTime('now'))->modify('+1 month')->format('Y-m-d'), $project->getEnd()->format('Y-m-d')); self::assertEquals((new \DateTime('now'))->modify('+1 month')->format('Y-m-d'), $project->getEnd()->format('Y-m-d'));
self::assertEquals(0, $project->getCreatedBy()->getId()); self::assertEquals(0, $project->createdBy->getId());
self::assertEquals('', $project->getName()); self::assertEquals('', $project->getName());
self::assertEquals('', $project->getDescription()); self::assertEquals('', $project->description);
self::assertEquals(0, $project->getCosts()->getInt()); self::assertEquals(0, $project->getCosts()->getInt());
self::assertEquals(0, $project->getBudgetCosts()->getInt()); self::assertEquals(0, $project->getBudgetCosts()->getInt());
self::assertEquals(0, $project->getBudgetEarnings()->getInt()); self::assertEquals(0, $project->getBudgetEarnings()->getInt());
@ -63,8 +63,8 @@ class ProjectTest extends \PHPUnit\Framework\TestCase
$project->setName('Project'); $project->setName('Project');
self::assertEquals('Project', $project->getName()); self::assertEquals('Project', $project->getName());
$project->setDescription('Description'); $project->description = 'Description';
self::assertEquals('Description', $project->getDescription()); self::assertEquals('Description', $project->description);
$project->setStart($date = new \DateTime('2000-05-05')); $project->setStart($date = new \DateTime('2000-05-05'));
self::assertEquals($date->format('Y-m-d'), $project->getStart()->format('Y-m-d')); self::assertEquals($date->format('Y-m-d'), $project->getStart()->format('Y-m-d'));
@ -88,12 +88,12 @@ class ProjectTest extends \PHPUnit\Framework\TestCase
self::assertEquals($money->getAmount(), $project->getEarnings()->getAmount()); self::assertEquals($money->getAmount(), $project->getEarnings()->getAmount());
$task = new Task(); $task = new Task();
$task->setTitle('A'); $task->title = 'A';
$task->setCreatedBy(new NullAccount(1)); $task->setCreatedBy(new NullAccount(1));
$project->addTask($task); $project->addTask($task);
self::assertEquals('A', $project->getTask(0)->getTitle()); self::assertEquals('A', $project->getTask(0)->title);
self::assertCount(1, $project->getTasks()); self::assertCount(1, $project->getTasks());
self::assertTrue($project->removeTask(0)); self::assertTrue($project->removeTask(0));
self::assertEquals(0, $project->countTasks()); self::assertEquals(0, $project->countTasks());