diff --git a/Controller/ApiEquipmentAttributeController.php b/Controller/ApiEquipmentAttributeController.php index 5ca5867..1878fa4 100755 --- a/Controller/ApiEquipmentAttributeController.php +++ b/Controller/ApiEquipmentAttributeController.php @@ -447,7 +447,6 @@ final class ApiEquipmentAttributeController extends Controller */ public function apiEquipmentAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { - return; // @todo: I don't think values can be deleted? Only Attributes // However, It should be possible to remove UNUSED default values // either here or other function? diff --git a/Models/InspectionMapper.php b/Models/InspectionMapper.php index 4aaf231..786bc3e 100755 --- a/Models/InspectionMapper.php +++ b/Models/InspectionMapper.php @@ -36,14 +36,14 @@ final class InspectionMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'equipmgmt_equipment_inspection_id' => ['name' => 'equipmgmt_equipment_inspection_id', 'type' => 'int', 'internal' => 'id'], + 'equipmgmt_equipment_inspection_id' => ['name' => 'equipmgmt_equipment_inspection_id', 'type' => 'int', 'internal' => 'id'], 'equipmgmt_equipment_inspection_equipment' => ['name' => 'equipmgmt_equipment_inspection_equipment', 'type' => 'int', 'internal' => 'reference'], - 'equipmgmt_equipment_inspection_description' => ['name' => 'equipmgmt_equipment_inspection_description', 'type' => 'string', 'internal' => 'description'], - 'equipmgmt_equipment_inspection_status' => ['name' => 'equipmgmt_equipment_inspection_status', 'type' => 'int', 'internal' => 'status'], - 'equipmgmt_equipment_inspection_interval' => ['name' => 'equipmgmt_equipment_inspection_interval', 'type' => 'int', 'internal' => 'interval'], - 'equipmgmt_equipment_inspection_next' => ['name' => 'equipmgmt_equipment_inspection_next', 'type' => 'DateTime', 'internal' => 'next'], - 'equipmgmt_equipment_inspection_date' => ['name' => 'equipmgmt_equipment_inspection_date', 'type' => 'DateTime', 'internal' => 'date'], - 'equipmgmt_equipment_inspection_type' => ['name' => 'equipmgmt_equipment_inspection_type', 'type' => 'int', 'internal' => 'type'], + 'equipmgmt_equipment_inspection_description' => ['name' => 'equipmgmt_equipment_inspection_description', 'type' => 'string', 'internal' => 'description'], + 'equipmgmt_equipment_inspection_status' => ['name' => 'equipmgmt_equipment_inspection_status', 'type' => 'int', 'internal' => 'status'], + 'equipmgmt_equipment_inspection_interval' => ['name' => 'equipmgmt_equipment_inspection_interval', 'type' => 'int', 'internal' => 'interval'], + 'equipmgmt_equipment_inspection_next' => ['name' => 'equipmgmt_equipment_inspection_next', 'type' => 'DateTime', 'internal' => 'next'], + 'equipmgmt_equipment_inspection_date' => ['name' => 'equipmgmt_equipment_inspection_date', 'type' => 'DateTime', 'internal' => 'date'], + 'equipmgmt_equipment_inspection_type' => ['name' => 'equipmgmt_equipment_inspection_type', 'type' => 'int', 'internal' => 'type'], ]; /** diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 57277bc..348310b 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -43,6 +43,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase * @var \Modules\EquipmentManagement\Controller\ApiController */ protected ModuleAbstract $module; + protected ModuleAbstract $attrModule; /** @@ -69,7 +70,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $account = new Account(); TestUtils::setMember($account, 'id', 1); - $permission = new AccountPermission(); + $permission = new AccountPermission(); $permission->unit = 1; $permission->app = 2; $permission->setPermission( @@ -85,7 +86,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->app->accountManager->add($account); $this->app->router = new WebRouter(); - $this->module = $this->app->moduleManager->get('EquipmentManagement', 'Api'); + $this->module = $this->app->moduleManager->get('EquipmentManagement', 'Api'); $this->attrModule = $this->app->moduleManager->get('EquipmentManagement', 'ApiAttribute'); TestUtils::setMember($this->module, 'app', $this->app);