Jingga/oms-Dashboard
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Dashboard.git synced 2026-02-16 10:28:40 +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 35485c1b1e
commit 982cb82c31
7 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Controller/ApiController.php
View File

@ -92,8 +92,8 @@ final class ApiController extends Controller
*/ */
private function createBoardFromRequest(RequestAbstract $request) : DashboardBoard private function createBoardFromRequest(RequestAbstract $request) : DashboardBoard
{ {
$board = new DashboardBoard(); $board = new DashboardBoard();
$board->title = (string) ($request->getData('title') ?? ''); $board->title = (string) ($request->getData('title') ?? '');
$board->account = $request->header->account; $board->account = $request->header->account;
$board->setStatus(DashboardBoardStatus::ACTIVE); $board->setStatus(DashboardBoardStatus::ACTIVE);
@ -159,9 +159,9 @@ final class ApiController extends Controller
*/ */
private function createComponentFromRequest(RequestAbstract $request) : DashboardComponent private function createComponentFromRequest(RequestAbstract $request) : DashboardComponent
{ {
$component = new DashboardComponent(); $component = new DashboardComponent();
$component->board = (int) ($request->getData('board') ?? 0); $component->board = (int) ($request->getData('board') ?? 0);
$component->order = (int) ($request->getData('order') ?? 0); $component->order = (int) ($request->getData('order') ?? 0);
$component->module = (string) ($request->getData('module') ?? ''); $component->module = (string) ($request->getData('module') ?? '');
return $component; return $component;

2
Models/NullDashboardBoard.php
View File

@ -24,7 +24,7 @@ namespace Modules\Dashboard\Models;
*/ */
final class NullDashboardBoard extends DashboardBoard final class NullDashboardBoard extends DashboardBoard
{ {
/** /**
* Constructor * Constructor
* *
* @param int $id Model id * @param int $id Model id

2
Models/NullDashboardComponent.php
View File

@ -24,7 +24,7 @@ namespace Modules\Dashboard\Models;
*/ */
final class NullDashboardComponent extends DashboardComponent final class NullDashboardComponent extends DashboardComponent
{ {
/** /**
* Constructor * Constructor
* *
* @param int $id Model id * @param int $id Model id

2
tests/Bootstrap.php
View File

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

11
tests/Controller/ApiControllerTest.php
View File

@ -16,22 +16,21 @@ namespace Modules\Dashboard\tests\Controller;
use Model\CoreSettings; use Model\CoreSettings;
use Modules\Admin\Models\AccountPermission; use Modules\Admin\Models\AccountPermission;
use phpOMS\DataStorage\Session\HttpSession;
use phpOMS\Account\Account; use phpOMS\Account\Account;
use phpOMS\Account\AccountManager; use phpOMS\Account\AccountManager;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Application\ApplicationAbstract; use phpOMS\Application\ApplicationAbstract;
use phpOMS\DataStorage\Session\HttpSession;
use phpOMS\Dispatcher\Dispatcher; use phpOMS\Dispatcher\Dispatcher;
use phpOMS\Event\EventManager; use phpOMS\Event\EventManager;
use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter;
use phpOMS\Utils\TestUtils;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter;
use phpOMS\Uri\HttpUri; use phpOMS\Uri\HttpUri;
use phpOMS\System\MimeType; use phpOMS\Utils\TestUtils;
/** /**
* @testdox Modules\Dashboard\tests\Controller\ApiControllerTest: Dashboard api controller * @testdox Modules\Dashboard\tests\Controller\ApiControllerTest: Dashboard api controller

14
tests/Models/DashboardBoardTest.php
View File

@ -15,8 +15,8 @@ declare(strict_types=1);
namespace Modules\Dashboard\tests\Models; namespace Modules\Dashboard\tests\Models;
use Modules\Dashboard\Models\DashboardBoard; use Modules\Dashboard\Models\DashboardBoard;
use Modules\Dashboard\Models\DashboardComponent;
use Modules\Dashboard\Models\DashboardBoardStatus; use Modules\Dashboard\Models\DashboardBoardStatus;
use Modules\Dashboard\Models\DashboardComponent;
/** /**
* @internal * @internal
@ -41,7 +41,7 @@ final class DashboardBoardTest extends \PHPUnit\Framework\TestCase
{ {
self::assertEquals(0, $this->board->getId()); self::assertEquals(0, $this->board->getId());
self::assertEquals('', $this->board->title); self::assertEquals('', $this->board->title);
self::assertEquals(null, $this->board->account); self::assertNull($this->board->account);
self::assertEquals([], $this->board->getComponents()); self::assertEquals([], $this->board->getComponents());
self::assertEquals(DashboardBoardStatus::ACTIVE, $this->board->getStatus()); self::assertEquals(DashboardBoardStatus::ACTIVE, $this->board->getStatus());
self::assertInstanceOf('\Modules\Dashboard\Models\NullDashboardComponent', $this->board->getComponent(0)); self::assertInstanceOf('\Modules\Dashboard\Models\NullDashboardComponent', $this->board->getComponent(0));
@ -86,17 +86,17 @@ final class DashboardBoardTest extends \PHPUnit\Framework\TestCase
*/ */
public function testSerialize() : void public function testSerialize() : void
{ {
$this->board->title = 'Title'; $this->board->title = 'Title';
$this->board->account = 2; $this->board->account = 2;
$this->board->setStatus(DashboardBoardStatus::INACTIVE); $this->board->setStatus(DashboardBoardStatus::INACTIVE);
self::assertEquals( self::assertEquals(
[ [
'id' => 0, 'id' => 0,
'account' => 2, 'account' => 2,
'title' => 'Title', 'title' => 'Title',
'status' => DashboardBoardStatus::INACTIVE, 'status' => DashboardBoardStatus::INACTIVE,
'components' => [], 'components' => [],
], ],
$this->board->jsonSerialize() $this->board->jsonSerialize()
); );

14
tests/Models/DashboardComponentTest.php
View File

@ -50,17 +50,17 @@ final class DashboardComponentTest extends \PHPUnit\Framework\TestCase
*/ */
public function testSerialize() : void public function testSerialize() : void
{ {
$this->component->board = 3; $this->component->board = 3;
$this->component->order = 2; $this->component->order = 2;
$this->component->module = 'Test'; $this->component->module = 'Test';
$this->component->component = 'Component'; $this->component->component = 'Component';
self::assertEquals( self::assertEquals(
[ [
'id' => 0, 'id' => 0,
'board' => 3, 'board' => 3,
'order' => 2, 'order' => 2,
'module' => 'Test', 'module' => 'Test',
'component' => 'Component', 'component' => 'Component',
], ],
$this->component->jsonSerialize() $this->component->jsonSerialize()