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

add css version

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-08-16 19:11:58 +02:00
parent d25866b0d0
commit d84e23a06e
7 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Controller/ApiController.php
View File

@ -110,8 +110,8 @@ final class ApiController extends Controller
public function apiUnitSet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
/** @var Unit $old */
$old = clone UnitMapper::get()->where('id', (int) $request->getData('id'))->execute();
$new = $this->updateUnitFromRequest($request);
$old = UnitMapper::get()->where('id', (int) $request->getData('id'))->execute();
$new = $this->updateUnitFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, UnitMapper::class, 'unit', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Unit', 'Unit successfully updated.', $new);
}
@ -125,10 +125,8 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function updateUnitFromRequest(RequestAbstract $request) : Unit
private function updateUnitFromRequest(RequestAbstract $request, Unit $unit) : Unit
{
/** @var Unit $unit */
$unit = UnitMapper::get()->where('id', (int) $request->getData('id'))->execute();
$unit->name = (string) ($request->getData('name') ?? $unit->name);
$unit->descriptionRaw = (string) ($request->getData('description') ?? $unit->descriptionRaw);
$unit->description = Markdown::parse((string) ($request->getData('description') ?? $unit->descriptionRaw));
@ -213,8 +211,7 @@ final class ApiController extends Controller
$unit->descriptionRaw = (string) ($request->getData('description') ?? '');
$unit->description = Markdown::parse((string) ($request->getData('description') ?? ''));
$parent = (int) $request->getData('parent');
$unit->parent = new NullUnit($parent);
$unit->parent = new NullUnit((int) $request->getData('parent'));
$unit->setStatus((int) $request->getData('status'));
return $unit;
@ -350,8 +347,8 @@ final class ApiController extends Controller
public function apiPositionSet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
/** @var Position $old */
$old = clone PositionMapper::get()->where('id', (int) $request->getData('id'))->execute();
$new = $this->updatePositionFromRequest($request);
$old = PositionMapper::get()->where('id', (int) $request->getData('id'))->execute();
$new = $this->updatePositionFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, PositionMapper::class, 'position', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Position', 'Position successfully updated.', $new);
}
@ -365,10 +362,8 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function updatePositionFromRequest(RequestAbstract $request) : Position
private function updatePositionFromRequest(RequestAbstract $request, Position $position) : Position
{
/** @var Position $position */
$position = PositionMapper::get()->where('id', (int) $request->getData('id'))->execute();
$position->name = (string) ($request->getData('name') ?? $position->name);
$position->descriptionRaw = (string) ($request->getData('description') ?? $position->descriptionRaw);
$position->description = Markdown::parse((string) ($request->getData('description') ?? $position->descriptionRaw));
@ -435,12 +430,8 @@ final class ApiController extends Controller
$position->setStatus((int) $request->getData('status'));
$position->descriptionRaw = (string) ($request->getData('description') ?? '');
$position->description = Markdown::parse((string) ($request->getData('description') ?? ''));
$parent = (int) $request->getData('parent');
$position->parent = new NullPosition($parent);
$department = (int) $request->getData('department');
$position->department = new NullDepartment($department);
$position->parent = new NullPosition((int) $request->getData('parent'));
$position->department = new NullDepartment((int) $request->getData('department'));
return $position;
}
@ -508,8 +499,8 @@ final class ApiController extends Controller
public function apiDepartmentSet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
/** @var Department $old */
$old = clone DepartmentMapper::get()->where('id', (int) $request->getData('id'))->execute();
$new = $this->updateDepartmentFromRequest($request);
$old = DepartmentMapper::get()->where('id', (int) $request->getData('id'))->execute();
$new = $this->updateDepartmentFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, DepartmentMapper::class, 'department', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Department', 'Department successfully updated.', $new);
}
@ -523,10 +514,8 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function updateDepartmentFromRequest(RequestAbstract $request) : Department
private function updateDepartmentFromRequest(RequestAbstract $request, Department $department) : Department
{
/** @var Department $department */
$department = DepartmentMapper::get()->where('id', (int) $request->getData('id'))->execute();
$department->name = (string) ($request->getData('name') ?? $department->name);
$department->descriptionRaw = (string) ($request->getData('description') ?? $department->descriptionRaw);
$department->description = Markdown::parse((string) ($request->getData('description') ?? $department->descriptionRaw));
@ -578,7 +567,8 @@ final class ApiController extends Controller
public function apiDepartmentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateDepartmentCreate($request))) {
$response->set('department_create', new FormValidation($val));
$this->fillJsonResponse($request, $response, NotificationLevel::OK, '', 'Invalid form data.', new FormValidation($val));
$response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->header->status = RequestStatusCode::R_400;
return;
@ -613,8 +603,7 @@ final class ApiController extends Controller
$department->name = (string) $request->getData('name');
$department->setStatus((int) $request->getData('status'));
$parent = (int) $request->getData('parent');
$department->parent = new NullDepartment($parent);
$department->parent = new NullDepartment((int) $request->getData('parent'));
$department->unit = new NullUnit((int) ($request->getData('unit') ?? 1));
$department->descriptionRaw = (string) ($request->getData('description') ?? '');
$department->description = Markdown::parse((string) ($request->getData('description') ?? ''));

2
Controller/BackendController.php
View File

@ -115,7 +115,7 @@ final class BackendController extends Controller
{
$response->get('Content')
->getData('head')
->addAsset(AssetType::CSS, 'Modules/Organization/Theme/Backend/css/styles.css');
->addAsset(AssetType::CSS, 'Modules/Organization/Theme/Backend/css/styles.css?v=1.0.0');
$view = new View($this->app->l11nManager, $request, $response);

2
Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php
View File

@ -13,7 +13,7 @@
}
]' formaction=""><i class="fa fa-book"></i></button>
<div class="advancedInput wf-100" id="<?= $this->getId(); ?>">
<input autocomplete="off" class="input" type="text" id="i<?= $this->getId(); ?>" placeholder="&#xf007; Guest"
<input autocomplete="off" class="input" type="text" id="i<?= $this->getId(); ?>"
data-emptyAfter="true"
data-autocomplete="off"
data-src="api/organization/find/department?search={!#i<?= $this->getId(); ?>}">

2
Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php
View File

@ -13,7 +13,7 @@
}
]' formaction=""><i class="fa fa-book"></i></button>
<div class="advancedInput wf-100" id="<?= $this->getId(); ?>">
<input autocomplete="off" class="input" type="text" id="i<?= $this->getId(); ?>" placeholder="&#xf007; Guest"
<input autocomplete="off" class="input" type="text" id="i<?= $this->getId(); ?>"
data-emptyAfter="true"
data-autocomplete="off"
data-src="api/organization/find/position?search={!#i<?= $this->getId(); ?>}">

6
Theme/Backend/Components/UnitTagSelector/unit-selector.tpl.php
View File

@ -5,15 +5,15 @@
{
"key": 1, "listener": "click", "action": [
{"key": 1, "type": "dom.popup", "selector": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "<?= $this->getId(); ?>"},
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/api}organization/find/unit'); ?>", "method": "GET", "request_type": "json"},
{"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1},
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/api}organization/find/unit'); ?>", "method": "GET", "request_type": "json"},
{"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1}
]
}
]' formaction=""><i class="fa fa-book"></i></button>
<div class="advancedInput wf-100" id="<?= $this->getId(); ?>">
<input autocomplete="off" class="input" type="text" id="i<?= $this->getId(); ?>" placeholder="&#xf007; Guest"
<input autocomplete="off" class="input" type="text" id="i<?= $this->getId(); ?>"
data-emptyAfter="true"
data-autocomplete="off"
data-src="api/organization/find/unit?search={!#i<?= $this->getId(); ?>}">

7
Theme/Backend/department-create.tpl.php
View File

@ -20,12 +20,15 @@ echo $this->getData('nav')->render(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">
<div class="portlet">
<form id="fDepartmentCreate" method="PUT" action="<?= UriFactory::build('{/api}{/rootPath}{/lang}/api/organization/department'); ?>">
<form id="fDepartmentCreate"
method="PUT"
action="<?= UriFactory::build('{/api}{/rootPath}{/lang}/api/organization/department'); ?>"
autocomplete="off">
<div class="portlet-head"><?= $this->getHtml('Department'); ?></div>
<div class="portlet-body">
<table class="layout wf-100" style="table-layout: fixed">
<tr><td><label for="iName"><?= $this->getHtml('Name'); ?></label>
<tr><td><input type="text" name="name" id="iName" placeholder="&#xf040; R&D" required>
<tr><td><input type="text" name="name" id="iName" required>
<tr><td><label for="iParent"><?= $this->getHtml('Parent'); ?></label>
<tr><td><?= $this->getData('department-selector')->render('iParent', 'parent', false); ?>
<tr><td><label for="iUnit"><?= $this->getHtml('Unit'); ?></label>

7
Theme/Backend/position-create.tpl.php
View File

@ -21,12 +21,15 @@ echo $this->getData('nav')->render(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">
<div class="portlet">
<form id="fPositionCreate" method="POST" action="<?= UriFactory::build('{/api}{/rootPath}{/lang}/api/organization/position'); ?>">
<form id="fPositionCreate"
method="PUT"
action="<?= UriFactory::build('{/api}{/rootPath}{/lang}/api/organization/position'); ?>"
autocomplete="off">
<div class="portlet-head"><?= $this->getHtml('Position'); ?></div>
<div class="portlet-body">
<table class="layout wf-100" style="table-layout: fixed">
<tr><td><label for="iName"><?= $this->getHtml('Name'); ?></label>
<tr><td><input type="text" name="name" id="iName" placeholder="&#xf040; Karaka" required>
<tr><td><input type="text" name="name" id="iName" required>
<tr><td><label for="iParent"><?= $this->getHtml('Parent'); ?></label>
<tr><td><?= $this->getData('position-selector')->render('iParent', 'parent', false); ?>
<tr><td><label for="iDepartment"><?= $this->getHtml('Department'); ?></label>