Jingga/oms-ContractManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ContractManagement.git synced 2026-02-13 00:48: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:05 +00:00
parent 46389c0dcc
commit e4a929f0e1
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Controller/ApiController.php
View File

@ -104,7 +104,7 @@ final class ApiController extends Controller
private function createContractDir(Contract $contract) : string private function createContractDir(Contract $contract) : string
{ {
return '/Modules/ContractManagement/Contract/' return '/Modules/ContractManagement/Contract/'
. $contract->getId(); . $contract->id;
} }
/** /**
@ -178,7 +178,7 @@ final class ApiController extends Controller
foreach ($uploaded as $file) { foreach ($uploaded as $file) {
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
$file->getId(), $file->id,
$request->getDataInt('type'), $request->getDataInt('type'),
MediaMapper::class, MediaMapper::class,
'types', 'types',
@ -191,7 +191,7 @@ final class ApiController extends Controller
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
(int) $request->getData('contract'), (int) $request->getData('contract'),
\reset($uploaded)->getId(), \reset($uploaded)->id,
ContractMapper::class, 'files', '', $request->getOrigin() ContractMapper::class, 'files', '', $request->getOrigin()
); );

2
Models/Contract.php
View File

@ -36,7 +36,7 @@ class Contract
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $id = 0; public int $id = 0;
public ?int $parent = null; public ?int $parent = null;

2
Models/ContractType.php
View File

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

8
Theme/Backend/contract-list.tpl.php
View File

@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
*/ */
$contracts = $this->getData('contracts') ?? []; $contracts = $this->getData('contracts') ?? [];
$previous = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \reset($contracts)->getId() . '&ptype=p'; $previous = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \reset($contracts)->id . '&ptype=p';
$next = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \end($contracts)->getId() . '&ptype=n'; $next = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \end($contracts)->id . '&ptype=n';
$now = new \DateTime('now'); $now = new \DateTime('now');
@ -73,7 +73,7 @@ echo $this->getData('nav')->render(); ?>
</label> </label>
<tbody> <tbody>
<?php foreach ($contracts as $key => $value) : <?php foreach ($contracts as $key => $value) :
$url = UriFactory::build('{/base}/contract/single?{?}&id=' . $value->getId()); $url = UriFactory::build('{/base}/contract/single?{?}&id=' . $value->id);
$type = 'ok'; $type = 'ok';
if (($value->end->getTimestamp() < $now->getTimestamp() && $value->end->getTimestamp() + 7776000 > $now->getTimestamp()) if (($value->end->getTimestamp() < $now->getTimestamp() && $value->end->getTimestamp() + 7776000 > $now->getTimestamp())
@ -88,7 +88,7 @@ echo $this->getData('nav')->render(); ?>
?> ?>
<tr tabindex="0" data-href="<?= $url; ?>"> <tr tabindex="0" data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->title); ?></a> <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->title); ?></a>
<td data-label="<?= $this->getHtml('Account'); ?>"><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->account->getId()); ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a> <td data-label="<?= $this->getHtml('Account'); ?>"><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->account->id); ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>
<td data-label="<?= $this->getHtml('End'); ?>"><a href="<?= $url; ?>"><span class="tag <?= $type; ?>"><?= $value->end !== null ? $value->end->format('Y-m-d') : ''; ?></span></a> <td data-label="<?= $this->getHtml('End'); ?>"><a href="<?= $url; ?>"><span class="tag <?= $type; ?>"><?= $value->end !== null ? $value->end->format('Y-m-d') : ''; ?></span></a>
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>

6
tests/Controller/ApiControllerTest.php
View File

@ -107,7 +107,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->setData('language', ISO639x1Enum::_EN); $request->setData('language', ISO639x1Enum::_EN);
$this->module->apiContractTypeCreate($request, $response); $this->module->apiContractTypeCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId()); self::assertGreaterThan(0, $response->get('')['response']->id);
} }
/** /**
@ -141,7 +141,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->setData('language', ISO639x1Enum::_DE); $request->setData('language', ISO639x1Enum::_DE);
$this->module->apiContractTypeL11nCreate($request, $response); $this->module->apiContractTypeL11nCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId()); self::assertGreaterThan(0, $response->get('')['response']->id);
} }
/** /**
@ -177,7 +177,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->setData('type', '1'); $request->setData('type', '1');
$this->module->apiContractCreate($request, $response); $this->module->apiContractCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId()); self::assertGreaterThan(0, $response->get('')['response']->id);
} }
/** /**

2
tests/Models/ContractTest.php
View File

@ -39,7 +39,7 @@ final class ContractTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->contract->getId()); self::assertEquals(0, $this->contract->id);
self::assertEquals([], $this->contract->getFiles()); self::assertEquals([], $this->contract->getFiles());
} }

2
tests/Models/ContractTypeTest.php
View File

@ -39,7 +39,7 @@ final class ContractTypeTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->type->getId()); self::assertEquals(0, $this->type->id);
self::assertEquals('', $this->type->getL11n()); self::assertEquals('', $this->type->getL11n());
} }

2
tests/Models/NullContractTest.php
View File

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

2
tests/Models/NullContractTypeTest.php
View File

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