continue implementations

This commit is contained in:
Dennis Eichhorn 2024-01-12 00:30:21 +00:00
parent d4972ec74b
commit 2b10e0c5a3
27 changed files with 28 additions and 111 deletions

View File

@ -273,6 +273,11 @@
"type": "TINYINT(1)",
"null": false
},
"equipmgmt_attr_type_repeatable": {
"name": "equipmgmt_attr_type_repeatable",
"type": "TINYINT(1)",
"null": false
},
"equipmgmt_attr_type_required": {
"description": "Every equipment must have this attribute type if set to true.",
"name": "equipmgmt_attr_type_required",

View File

@ -61,7 +61,23 @@ final class ApiEquipmentAttributeController extends Controller
return;
}
$type = EquipmentAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('type'))->execute();
$type = EquipmentAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('type'))->execute();
if (!$type->repeatable) {
$attr = EquipmentAttributeMapper::count()
->with('type')
->where('type/id', (int) $request->getData('type'))
->where('ref', (int) $request->getData('ref'))
->execute();
if ($attr > 0) {
$response->header->status = RequestStatusCode::R_409;
$this->createInvalidCreateResponse($request, $response, $val);
return;
}
}
$attribute = $this->createAttributeFromRequest($request, $type);
$this->createModel($request->header->account, $attribute, EquipmentAttributeMapper::class, 'attribute', $request->getOrigin());
$this->createStandardCreateResponse($request, $response, $attribute);

View File

@ -156,12 +156,10 @@ final class BackendController extends Controller
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008402001, $request, $response);
/** @var \Model\Setting $settings */
$settings = $this->app->appSettings->get(null, [
SettingsEnum::DEFAULT_LOCALIZATION,
]);
$settings = $this->app->appSettings->get(null, SettingsEnum::DEFAULT_LOCALIZATION);
$view->data['attributeView'] = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response);
$view->data['attributeView']->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute();
$view->data['attributeView']->data['default_localization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute();
$view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response);
$view->data['equipment-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response);
@ -252,12 +250,10 @@ final class BackendController extends Controller
$view->data['units'] = $units;
/** @var \Model\Setting $settings */
$settings = $this->app->appSettings->get(null, [
SettingsEnum::DEFAULT_LOCALIZATION,
]);
$settings = $this->app->appSettings->get(null, SettingsEnum::DEFAULT_LOCALIZATION);
$view->data['attributeView'] = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response);
$view->data['attributeView']->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute();
$view->data['attributeView']->data['default_localization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute();
$view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response);
$view->data['equipment-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response);

View File

@ -42,6 +42,7 @@ final class EquipmentAttributeTypeMapper extends DataMapperFactory
'equipmgmt_attr_type_datatype' => ['name' => 'equipmgmt_attr_type_datatype', 'type' => 'int', 'internal' => 'datatype'],
'equipmgmt_attr_type_fields' => ['name' => 'equipmgmt_attr_type_fields', 'type' => 'int', 'internal' => 'fields'],
'equipmgmt_attr_type_custom' => ['name' => 'equipmgmt_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'],
'equipmgmt_attr_type_repeatable' => ['name' => 'equipmgmt_attr_type_repeatable', 'type' => 'bool', 'internal' => 'repeatable'],
'equipmgmt_attr_type_pattern' => ['name' => 'equipmgmt_attr_type_pattern', 'type' => 'string', 'internal' => 'validationPattern'],
'equipmgmt_attr_type_required' => ['name' => 'equipmgmt_attr_type_required', 'type' => 'bool', 'internal' => 'isRequired'],
];

View File

@ -59,6 +59,7 @@ final class EquipmentAttributeValueMapper extends DataMapperFactory
'mapper' => EquipmentAttributeValueL11nMapper::class,
'table' => 'equipmgmt_attr_value_l11n',
'self' => 'equipmgmt_attr_value_l11n_value',
'column' => 'content',
'external' => null,
],
];

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -24,7 +24,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => 'Ein',
'End' => 'Ende',
'Equipment' => 'Equipment',
'Equipments' => 'Equipment',
'Files' => 'Dateien',
'History' => 'Historie',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -24,7 +24,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => 'Ein',
'End' => 'End',
'Equipment' => 'Equipment',
'Equipments' => 'Equipments',
'Files' => 'Files',
'History' => 'History',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',

View File

@ -13,10 +13,6 @@
declare(strict_types=1);
return ['EquipmentManagement' => [
':status1' => '',
':status2' => '',
':status3' => '',
':status4' => '',
'Attributes' => '',
'Costs' => '',
'Date' => '',
@ -24,7 +20,6 @@ return ['EquipmentManagement' => [
'EIN' => '',
'Ein' => '',
'End' => '',
'Equipment' => '',
'Equipments' => '',
'Files' => '',
'History' => '',