Jingga/oms-Kanban
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Kanban.git synced 2026-02-09 00:38:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make id public, organigram impl. media password/encryption, settings bug fix, Money->FloatInt change, ...

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-06 11:42:06 +00:00
parent ccf54337a2
commit 67cbf46dbe
22 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Controller/BackendController.php
View File

@ -116,9 +116,9 @@ final class BackendController extends Controller
$accountId = $request->header->account;
if ($board->createdBy->getId() !== $accountId
if ($board->createdBy->id !== $accountId
&& !$this->app->accountManager->get($accountId)->hasPermission(
PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::BOARD, $board->getId())
PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::BOARD, $board->id)
) {
$view->setTemplate('/Web/Backend/Error/403_inline');
$response->header->status = RequestStatusCode::R_403;
@ -227,9 +227,9 @@ final class BackendController extends Controller
$accountId = $request->header->account;
if ($card->createdBy->getId() !== $accountId
if ($card->createdBy->id !== $accountId
&& !$this->app->accountManager->get($accountId)->hasPermission(
PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::CARD, $card->getId())
PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::CARD, $card->id)
) {
$view->setTemplate('/Web/Backend/Error/403_inline');
$response->header->status = RequestStatusCode::R_403;

4
Models/KanbanBoard.php
View File

@ -35,7 +35,7 @@ class KanbanBoard implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Name.
@ -59,7 +59,7 @@ class KanbanBoard implements \JsonSerializable
* @var int
* @since 1.0.0
*/
private int $status = BoardStatus::ACTIVE;
public int $status = BoardStatus::ACTIVE;
/**
* Order.

8
Models/KanbanCard.php
View File

@ -37,7 +37,7 @@ class KanbanCard implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Name.
@ -53,7 +53,7 @@ class KanbanCard implements \JsonSerializable
* @var int
* @since 1.0.0
*/
private int $status = CardStatus::ACTIVE;
public int $status = CardStatus::ACTIVE;
/**
* Card type.
@ -61,7 +61,7 @@ class KanbanCard implements \JsonSerializable
* @var int
* @since 1.0.0
*/
private int $type = CardType::TEXT;
public int $type = CardType::TEXT;
/**
* Color schme.
@ -400,7 +400,7 @@ class KanbanCard implements \JsonSerializable
public static function createFromTask(Task $task) : self
{
$card = new self();
$card->ref = $task->getId();
$card->ref = $task->id;
return $card;
}

2
Models/KanbanCardComment.php
View File

@ -34,7 +34,7 @@ class KanbanCardComment implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Description.

2
Models/KanbanColumn.php
View File

@ -30,7 +30,7 @@ class KanbanColumn implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Name.

6
Theme/Backend/kanban-archive.tpl.php
View File

@ -18,8 +18,8 @@ use phpOMS\Uri\UriFactory;
/** @var \Modules\News\Models\NewsArticle[] $boards */
$boards = $this->getData('boards') ?? [];
$previous = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \reset($boards)->getId() . '&ptype=p';
$next = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \end($boards)->getId() . '&ptype=n';
$previous = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \reset($boards)->id . '&ptype=p';
$next = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \end($boards)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?>
@ -72,7 +72,7 @@ echo $this->getData('nav')->render(); ?>
$count = 0;
foreach ($boards as $key => $board) : ++$count;
$url = UriFactory::build('{/base}/kanban/board?{?}&id=' . $board->getId());
$url = UriFactory::build('{/base}/kanban/board?{?}&id=' . $board->id);
?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $this->getHtml(':bStatus' . $board->getStatus()); ?></a>

2
Theme/Backend/kanban-board.tpl.php
View File

@ -23,7 +23,7 @@ $columns = $board->getColumns();
<div id="kanban-column-<?= $i; ?>" class="col-xs-12 col-md-6 col-lg-3 box kanban-column">
<header><?= $this->printHtml($column->name); ?></header>
<?php $j = 0; foreach ($cards as $card) : $j++;
$url = \phpOMS\Uri\UriFactory::build('kanban/card?{?}&id=' . $card->getId());
$url = \phpOMS\Uri\UriFactory::build('kanban/card?{?}&id=' . $card->id);
?>
<section id="kanban-card-<?= $this->printHtml($i . '-' . $j); ?>" class="portlet" draggable="true">
<div class="portlet-head">

4
Theme/Backend/kanban-card.tpl.php
View File

@ -35,7 +35,7 @@ $comments = $card->getComments();
</div>
<div class="portlet-foot">
<?php $files = $card->getMedia(); foreach ($files as $file) : ?>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $file->id);?>"><?= $file->name; ?></a></span>
<?php endforeach; ?>
</div>
</section>
@ -51,7 +51,7 @@ $comments = $card->getComments();
</div>
<div class="portlet-foot">
<?php $files = $comment->getMedia(); foreach ($files as $file) : ?>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $file->id);?>"><?= $file->name; ?></a></span>
<?php endforeach; ?>
</div>
</section>

6
Theme/Backend/kanban-dashboard.tpl.php
View File

@ -17,14 +17,14 @@ use phpOMS\Uri\UriFactory;
/** @var \Modules\Kanban\Models\KanbanBoard[] $boards */
$boards = $this->getData('boards');
$previous = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \reset($boards)->getId() . '&ptype=p';
$next = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \end($boards)->getId() . '&ptype=n';
$previous = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \reset($boards)->id . '&ptype=p';
$next = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \end($boards)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?>
<div class="row">
<?php foreach ($boards as $board) :
$url = UriFactory::build('{/base}/kanban/board?{?}&id=' . $board->getId());
$url = UriFactory::build('{/base}/kanban/board?{?}&id=' . $board->id);
?>
<div class="col-xs-12 col-sm-6 col-lg-3">
<section class="portlet">

8
tests/Controller/ApiControllerTest.php
View File

@ -106,7 +106,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$this->module->apiKanbanBoardCreate($request, $response);
self::assertEquals('Controller Test Board', $response->get('')['response']->name);
self::assertGreaterThan(0, $bId = $response->get('')['response']->getId());
self::assertGreaterThan(0, $bId = $response->get('')['response']->id);
// update
$response = new HttpResponse();
@ -136,7 +136,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$this->module->apiKanbanColumnCreate($request, $response);
self::assertEquals('Controller Test Column', $response->get('')['response']->name);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -173,7 +173,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$this->module->apiKanbanCardCreate($request, $response);
self::assertEquals('Controller Test Card', $response->get('')['response']->name);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -206,7 +206,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->setData('media', \json_encode([1]));
$this->module->apiKanbanCardCommentCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**

8
tests/Models/KanbanBoardMapperTest.php
View File

@ -36,14 +36,14 @@ final class KanbanBoardMapperTest extends \PHPUnit\Framework\TestCase
$board->createdBy = new NullAccount(1);
$id = KanbanBoardMapper::create()->execute($board);
self::assertGreaterThan(0, $board->getId());
self::assertEquals($id, $board->getId());
self::assertGreaterThan(0, $board->id);
self::assertEquals($id, $board->id);
$boardR = KanbanBoardMapper::get()->where('id', $board->getId())->execute();
$boardR = KanbanBoardMapper::get()->where('id', $board->id)->execute();
self::assertEquals($board->name, $boardR->name);
self::assertEquals($board->getStatus(), $boardR->getStatus());
self::assertEquals($board->description, $boardR->description);
self::assertEquals($board->createdBy->getId(), $boardR->createdBy->getId());
self::assertEquals($board->createdBy->id, $boardR->createdBy->id);
self::assertEquals($board->createdAt->format('Y-m-d'), $boardR->createdAt->format('Y-m-d'));
self::assertEquals($board->getColumns(), $boardR->getColumns());
}

4
tests/Models/KanbanBoardTest.php
View File

@ -40,11 +40,11 @@ final class KanbanBoardTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->board->getId());
self::assertEquals(0, $this->board->id);
self::assertEquals(BoardStatus::ACTIVE, $this->board->getStatus());
self::assertEquals('', $this->board->name);
self::assertEquals('', $this->board->description);
self::assertEquals(0, $this->board->createdBy->getId());
self::assertEquals(0, $this->board->createdBy->id);
self::assertInstanceOf('\DateTimeImmutable', $this->board->createdAt);
self::assertEquals([], $this->board->getColumns());
}

8
tests/Models/KanbanCardCommentMapperTest.php
View File

@ -37,13 +37,13 @@ final class KanbanCardCommentMapperTest extends \PHPUnit\Framework\TestCase
$comment->createdBy = new NullAccount(1);
$id = KanbanCardCommentMapper::create()->execute($comment);
self::assertGreaterThan(0, $comment->getId());
self::assertEquals($id, $comment->getId());
self::assertGreaterThan(0, $comment->id);
self::assertEquals($id, $comment->id);
$commentR = KanbanCardCommentMapper::get()->where('id', $comment->getId())->execute();
$commentR = KanbanCardCommentMapper::get()->where('id', $comment->id)->execute();
self::assertEquals($comment->description, $commentR->description);
self::assertEquals($comment->card, $commentR->card);
self::assertEquals($comment->createdBy->getId(), $commentR->createdBy->getId());
self::assertEquals($comment->createdBy->id, $commentR->createdBy->id);
self::assertEquals($comment->createdAt->format('Y-m-d'), $commentR->createdAt->format('Y-m-d'));
}
}

4
tests/Models/KanbanCardCommentTest.php
View File

@ -38,10 +38,10 @@ final class KanbanCardCommentTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->comment->getId());
self::assertEquals(0, $this->comment->id);
self::assertEquals(0, $this->comment->card);
self::assertEquals('', $this->comment->description);
self::assertEquals(0, $this->comment->createdBy->getId());
self::assertEquals(0, $this->comment->createdBy->id);
self::assertInstanceOf('\DateTimeImmutable', $this->comment->createdAt);
self::assertEquals([], $this->comment->getMedia());
}

12
tests/Models/KanbanCardMapperTest.php
View File

@ -46,17 +46,17 @@ final class KanbanCardMapperTest extends \PHPUnit\Framework\TestCase
$card->addTag(new Tag());
$id = KanbanCardMapper::create()->execute($card);
self::assertGreaterThan(0, $card->getId());
self::assertEquals($id, $card->getId());
self::assertGreaterThan(0, $card->id);
self::assertEquals($id, $card->id);
$cardR = KanbanCardMapper::get()->where('id', $card->getId())->execute();
$cardR = KanbanCardMapper::get()->where('id', $card->id)->execute();
self::assertEquals($card->name, $cardR->name);
self::assertEquals($card->description, $cardR->description);
self::assertEquals($card->column, $cardR->column);
self::assertEquals($card->order, $cardR->order);
self::assertEquals($card->getStatus(), $cardR->getStatus());
self::assertEquals($card->getType(), $cardR->getType());
self::assertEquals($card->createdBy->getId(), $cardR->createdBy->getId());
self::assertEquals($card->createdBy->id, $cardR->createdBy->id);
self::assertEquals($card->createdAt->format('Y-m-d'), $cardR->createdAt->format('Y-m-d'));
self::assertEquals($card->ref, $cardR->ref);
}
@ -79,7 +79,7 @@ final class KanbanCardMapperTest extends \PHPUnit\Framework\TestCase
$card->addTag(new Tag());
$id = KanbanCardMapper::create()->execute($card);
self::assertGreaterThan(0, $card->getId());
self::assertEquals($id, $card->getId());
self::assertGreaterThan(0, $card->id);
self::assertEquals($id, $card->id);
}
}

4
tests/Models/KanbanCardTest.php
View File

@ -43,14 +43,14 @@ final class KanbanCardTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->card->getId());
self::assertEquals(0, $this->card->id);
self::assertEquals(CardStatus::ACTIVE, $this->card->getStatus());
self::assertEquals(CardType::TEXT, $this->card->getType());
self::assertEquals('', $this->card->name);
self::assertEquals('', $this->card->description);
self::assertEquals(0, $this->card->column);
self::assertEquals(0, $this->card->order);
self::assertEquals(0, $this->card->createdBy->getId());
self::assertEquals(0, $this->card->createdBy->id);
self::assertInstanceOf('\DateTimeImmutable', $this->card->createdAt);
self::assertEquals([], $this->card->getComments());
self::assertEquals([], $this->card->getTags());

6
tests/Models/KanbanColumnMapperTest.php
View File

@ -36,10 +36,10 @@ final class KanbanColumnMapperTest extends \PHPUnit\Framework\TestCase
$column->order = 1;
$id = KanbanColumnMapper::create()->execute($column);
self::assertGreaterThan(0, $column->getId());
self::assertEquals($id, $column->getId());
self::assertGreaterThan(0, $column->id);
self::assertEquals($id, $column->id);
$columnR = KanbanColumnMapper::get()->where('id', $column->getId())->execute();
$columnR = KanbanColumnMapper::get()->where('id', $column->id)->execute();
self::assertEquals($column->name, $columnR->name);
self::assertEquals($column->board, $columnR->board);
self::assertEquals($column->order, $columnR->order);

2
tests/Models/KanbanColumnTest.php
View File

@ -38,7 +38,7 @@ final class KanbanColumnTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->column->getId());
self::assertEquals(0, $this->column->id);
self::assertEquals('', $this->column->name);
self::assertEquals(0, $this->column->order);
self::assertEquals(0, $this->column->board);

2
tests/Models/NullKanbanBoardTest.php
View File

@ -37,6 +37,6 @@ final class NullKanbanBoardTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullKanbanBoard(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

2
tests/Models/NullKanbanCardCommentTest.php
View File

@ -37,6 +37,6 @@ final class NullKanbanCardCommentTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullKanbanCardComment(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

2
tests/Models/NullKanbanCardTest.php
View File

@ -37,6 +37,6 @@ final class NullKanbanCardTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullKanbanCard(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

2
tests/Models/NullKanbanColumnTest.php
View File

@ -37,6 +37,6 @@ final class NullKanbanColumnTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullKanbanColumn(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}