Jingga/oms-ProjectManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ProjectManagement.git synced 2026-01-11 15:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

template fixes + bug fixes + style fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-02 21:40:48 +00:00
parent b0711ef33c
commit 9aecd7181c
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Controller/ApiController.php
View File

@ -73,17 +73,17 @@ final class ApiController extends Controller
*/ */
public function createProjectFromRequest(RequestAbstract $request) : Project public function createProjectFromRequest(RequestAbstract $request) : Project
{ {
$project = new Project(); $project = new Project();
$project->name = $request->getDataString('name') ?? ''; $project->name = $request->getDataString('name') ?? '';
$project->descriptionRaw = $request->getDataString('plain') ?? ''; $project->descriptionRaw = $request->getDataString('plain') ?? '';
$project->description = Markdown::parse($request->getDataString('plain') ?? ''); $project->description = Markdown::parse($request->getDataString('plain') ?? '');
$project->start = $request->getDataDateTime('start') ?? $project->start; $project->start = $request->getDataDateTime('start') ?? $project->start;
$project->end = $request->getDataDateTime('end') ?? $project->end; $project->end = $request->getDataDateTime('end') ?? $project->end;
$project->createdBy = new NullAccount($request->header->account); $project->createdBy = new NullAccount($request->header->account);
$project->progressType = ProgressType::tryFromValue($request->getDataInt('progresstype')) ?? ProgressType::MANUAL; $project->progressType = ProgressType::tryFromValue($request->getDataInt('progresstype')) ?? ProgressType::MANUAL;
$project->progress = $request->getDataInt('progress') ?? 0; $project->progress = $request->getDataInt('progress') ?? 0;
$project->budgetCosts->value = $request->getDataInt('budgetcosts') ?? 0; $project->budgetCosts->value = $request->getDataInt('budgetcosts') ?? 0;
$project->actualCosts->value = $request->getDataInt('actualcosts') ?? 0; $project->actualCosts->value = $request->getDataInt('actualcosts') ?? 0;
// @todo implement unit // @todo implement unit
//$project->unit = $this->app->unitId; //$project->unit = $this->app->unitId;

5
Theme/Backend/projectmanagement-view.tpl.php
View File

@ -12,10 +12,11 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use Modules\EventManagement\Models\ProgressType; use Modules\ProjectManagement\Models\NullProject;
use Modules\ProjectManagement\Models\ProgressType;
/** \Modules\ProjectManagement\Models\Project $project */ /** \Modules\ProjectManagement\Models\Project $project */
$project = $this->data['project']; $project = $this->data['project'] ?? new NullProject();
$isNew = $project->id === 0; $isNew = $project->id === 0;

6
tests/Models/ProjectMapperTest.php
View File

@ -34,7 +34,7 @@ final class ProjectMapperTest extends \PHPUnit\Framework\TestCase
{ {
$project = new Project(); $project = new Project();
$project->name = 'Projectname'; $project->name = 'Projectname';
$project->description = 'Description'; $project->description = 'Description';
$project->createdBy = new NullAccount(1); $project->createdBy = new NullAccount(1);
$project->start = new \DateTime('2000-05-05'); $project->start = new \DateTime('2000-05-05');
@ -59,7 +59,7 @@ final class ProjectMapperTest extends \PHPUnit\Framework\TestCase
$project->tasks[] = $task; $project->tasks[] = $task;
$project->tasks[] = $task2; $project->tasks[] = $task2;
$project->progress = 10; $project->progress = 10;
$project->progressType = ProgressType::TASKS; $project->progressType = ProgressType::TASKS;
$media = new Media(); $media = new Media();
@ -98,7 +98,7 @@ final class ProjectMapperTest extends \PHPUnit\Framework\TestCase
#[\PHPUnit\Framework\Attributes\Group('module')] #[\PHPUnit\Framework\Attributes\Group('module')]
public function testNewest() : void public function testNewest() : void
{ {
$newest = ProjectMapper::getAll()->sort('id', OrderType::DESC)->limit(1)->execute(); $newest = ProjectMapper::getAll()->sort('id', OrderType::DESC)->limit(1)->executeGetArray();
self::assertCount(1, $newest); self::assertCount(1, $newest);
} }

10
tests/Models/ProjectTest.php
View File

@ -80,11 +80,11 @@ final class ProjectTest extends \PHPUnit\Framework\TestCase
#[\PHPUnit\Framework\Attributes\Group('module')] #[\PHPUnit\Framework\Attributes\Group('module')]
public function testSerialize() : void public function testSerialize() : void
{ {
$this->project->name = 'Name'; $this->project->name = 'Name';
$this->project->description = 'Description'; $this->project->description = 'Description';
$this->project->start = new \DateTime(); $this->project->start = new \DateTime();
$this->project->end = new \DateTime(); $this->project->end = new \DateTime();
$this->project->progress = 10; $this->project->progress = 10;
$this->project->progressType = ProgressType::TASKS; $this->project->progressType = ProgressType::TASKS;
$serialized = $this->project->jsonSerialize(); $serialized = $this->project->jsonSerialize();