{{ __('settings.certificates.driving_license') }}
{{ m.info(__('settings.certificates.info')) }}
+ {% if certificates.drive_confirmed %}
+
{{ __('settings.certificates.drive_confirmed.hint') }}
+ {% endif %}
{{ f.checkbox('drive_car', __('settings.certificates.drive_car'), {
- 'checked': certificates.drive_car,
+ 'checked': certificates.drive_car,
+ 'disabled': certificates.drive_confirmed,
}) }}
+
{{ f.checkbox('drive_3_5t', __('settings.certificates.drive_3_5t'), {
- 'checked': certificates.drive_3_5t,
+ 'checked': certificates.drive_3_5t,
+ 'disabled': certificates.drive_confirmed,
}) }}
+
{{ f.checkbox('drive_7_5t', __('settings.certificates.drive_7_5t'), {
- 'checked': certificates.drive_7_5t,
+ 'checked': certificates.drive_7_5t,
+ 'disabled': certificates.drive_confirmed,
}) }}
+
{{ f.checkbox('drive_12t', __('settings.certificates.drive_12t'), {
- 'checked': certificates.drive_12t,
+ 'checked': certificates.drive_12t,
+ 'disabled': certificates.drive_confirmed,
}) }}
+
{{ f.checkbox('drive_forklift', __('settings.certificates.drive_forklift'), {
- 'checked': certificates.drive_forklift,
+ 'checked': certificates.drive_forklift,
+ 'disabled': certificates.drive_confirmed,
}) }}
{{ f.checkbox('has_car', __('settings.certificates.has_car'), {
diff --git a/src/Controllers/Admin/UserSettingsController.php b/src/Controllers/Admin/UserSettingsController.php
index 0b753f9e..a90ca3c0 100644
--- a/src/Controllers/Admin/UserSettingsController.php
+++ b/src/Controllers/Admin/UserSettingsController.php
@@ -32,11 +32,21 @@ class UserSettingsController extends BaseController
public function certificate(Request $request): Response
{
- if (!config('ifsg_enabled')) {
+ if (!config('ifsg_enabled') && !config('driving_license_enabled')) {
throw new HttpNotFound();
}
- $this->checkPermission('user.ifsg.edit', $this->isIfsgSupporter());
+ if (
+ !(
+ $this->auth->can('user.ifsg.edit')
+ || $this->auth->can('user.drive.edit')
+ || $this->isDriverLicenseSupporter()
+ || $this->isIfsgSupporter()
+ )
+ ) {
+ throw new HttpForbidden();
+ }
+
$user = $this->getUser($request);
return $this->view(
@@ -87,6 +97,54 @@ class UserSettingsController extends BaseController
return $this->redirect->to('/users/' . $user->id . '/certificates');
}
+ public function saveDrivingLicense(Request $request): Response
+ {
+ if (!config('driving_license_enabled')) {
+ throw new HttpNotFound();
+ }
+
+ $this->checkPermission('user.drive.edit', $this->isDriverLicenseSupporter());
+ $user = $this->getUser($request);
+
+ $data = $this->validate($request, [
+ 'drive_car' => 'optional|checked',
+ 'drive_3_5t' => 'optional|checked',
+ 'drive_7_5t' => 'optional|checked',
+ 'drive_12t' => 'optional|checked',
+ 'drive_forklift' => 'optional|checked',
+ 'drive_confirmed' => 'optional|checked',
+ ]);
+
+ $user->license->drive_car = (bool) $data['drive_car'];
+ $user->license->drive_3_5t = (bool) $data['drive_3_5t'];
+ $user->license->drive_7_5t = (bool) $data['drive_7_5t'];
+ $user->license->drive_12t = (bool) $data['drive_12t'];
+ $user->license->drive_forklift = (bool) $data['drive_forklift'];
+ $user->license->drive_confirmed = $data['drive_confirmed'] && (
+ $user->license->drive_car
+ || $user->license->drive_3_5t
+ || $user->license->drive_7_5t
+ || $user->license->drive_12t
+ || $user->license->drive_forklift
+ );
+
+ $user->license->save();
+ $this->addNotification('settings.certificates.success');
+
+ $this->log->info('Certificate "{certificate}" of user {user} ({id}) is {confirmation}.', [
+ 'certificate' => ($user->license->drive_car ? 'car' : '')
+ . ($user->license->drive_3_5t ? ', 3.5t' : '')
+ . ($user->license->drive_7_5t ? ', 7.5t' : '')
+ . ($user->license->drive_12t ? ', 12t' : '')
+ . ($user->license->drive_forklift ? ', forklift' : ''),
+ 'user' => $user->name,
+ 'id' => $user->id,
+ 'confirmation' => $user->license->drive_confirmed ? 'confirmed' : 'unconfirmed',
+ ]);
+
+ return $this->redirect->to('/users/' . $user->id . '/certificates');
+ }
+
public function settingsMenu(User $user): array
{
$menu = [
@@ -95,11 +153,16 @@ class UserSettingsController extends BaseController
],
];
- if (config('ifsg_enabled')) {
+ if (config('ifsg_enabled') || config('driving_license_enabled')) {
$menu[url('/users/' . $user->id . '/certificates')] = [
'title' => 'settings.certificates',
'icon' => 'card-checklist',
- 'permission' => $this->isIfsgSupporter() ? null : 'user.ifsg.edit',
+ 'permission' => (
+ $this->auth->can('user.ifsg.edit')
+ || $this->isIfsgSupporter()
+ || $this->auth->can('user.drive.edit')
+ || $this->isDriverLicenseSupporter()
+ ) ? null : '_',
];
}
@@ -139,4 +202,13 @@ class UserSettingsController extends BaseController
->where('user_angel_type.supporter', true)
->count();
}
+
+ public function isDriverLicenseSupporter(): bool
+ {
+ return (bool) AngelType::whereRequiresDriverLicense(true)
+ ->leftJoin('user_angel_type', 'user_angel_type.angel_type_id', 'angel_types.id')
+ ->where('user_angel_type.user_id', $this->auth->user()?->id)
+ ->where('user_angel_type.supporter', true)
+ ->count();
+ }
}
diff --git a/src/Controllers/SettingsController.php b/src/Controllers/SettingsController.php
index e0c9697b..037568e3 100644
--- a/src/Controllers/SettingsController.php
+++ b/src/Controllers/SettingsController.php
@@ -242,7 +242,10 @@ class SettingsController extends BaseController
public function certificate(): Response
{
- if (!config('ifsg_enabled') && !$this->checkDrivingLicense()) {
+ if (
+ !(config('ifsg_enabled') && $this->checkIfsgCertificate())
+ && !(config('driving_license_enabled') && $this->checkDrivingLicense())
+ ) {
throw new HttpNotFound();
}
@@ -252,6 +255,7 @@ class SettingsController extends BaseController
[
'settings_menu' => $this->settingsMenu(),
'driving_license' => $this->checkDrivingLicense(),
+ 'ifsg' => $this->checkIfsgCertificate(),
'certificates' => $user->license,
]
);
@@ -260,7 +264,7 @@ class SettingsController extends BaseController
public function saveIfsgCertificate(Request $request): Response
{
$user = $this->auth->user();
- if (!config('ifsg_enabled') || $user->license->ifsg_confirmed) {
+ if (!config('ifsg_enabled') || $user->license->ifsg_confirmed || !$this->checkIfsgCertificate()) {
throw new HttpNotFound();
}
@@ -282,7 +286,7 @@ class SettingsController extends BaseController
public function saveDrivingLicense(Request $request): Response
{
- if (!$this->checkDrivingLicense()) {
+ if (!config('driving_license_enabled') || !$this->checkDrivingLicense()) {
throw new HttpNotFound();
}
@@ -297,11 +301,13 @@ class SettingsController extends BaseController
]);
$user->license->has_car = (bool) $data['has_car'];
- $user->license->drive_car = (bool) $data['drive_car'];
- $user->license->drive_3_5t = (bool) $data['drive_3_5t'];
- $user->license->drive_7_5t = (bool) $data['drive_7_5t'];
- $user->license->drive_12t = (bool) $data['drive_12t'];
- $user->license->drive_forklift = (bool) $data['drive_forklift'];
+ if (!$user->license->drive_confirmed) {
+ $user->license->drive_car = (bool) $data['drive_car'];
+ $user->license->drive_3_5t = (bool) $data['drive_3_5t'];
+ $user->license->drive_7_5t = (bool) $data['drive_7_5t'];
+ $user->license->drive_12t = (bool) $data['drive_12t'];
+ $user->license->drive_forklift = (bool) $data['drive_forklift'];
+ }
$user->license->save();
$this->addNotification('settings.certificates.success');
@@ -394,7 +400,10 @@ class SettingsController extends BaseController
$menu[url('/settings/theme')] = 'settings.theme';
}
- if (config('ifsg_enabled') || $this->checkDrivingLicense()) {
+ if (
+ (config('ifsg_enabled') && $this->checkIfsgCertificate())
+ || (config('driving_license_enabled') && $this->checkDrivingLicense())
+ ) {
$menu[url('/settings/certificates')] = ['title' => 'settings.certificates', 'icon' => 'card-checklist'];
}
@@ -429,6 +438,13 @@ class SettingsController extends BaseController
})->isNotEmpty();
}
+ protected function checkIfsgCertificate(): bool
+ {
+ return $this->auth->user()->userAngelTypes->filter(function (AngelType $angelType) {
+ return $angelType->requires_ifsg_certificate;
+ })->isNotEmpty();
+ }
+
private function isRequired(string $key): string
{
$requiredFields = $this->config->get('required_user_fields');
diff --git a/src/Models/User/License.php b/src/Models/User/License.php
index 565ef292..17b5bac0 100644
--- a/src/Models/User/License.php
+++ b/src/Models/User/License.php
@@ -14,6 +14,7 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
* @property bool $drive_3_5t
* @property bool $drive_7_5t
* @property bool $drive_12t
+ * @property bool $drive_confirmed
* @property bool $ifsg_certificate_light
* @property bool $ifsg_certificate
* @property bool $ifsg_confirmed
@@ -24,6 +25,7 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
* @method static QueryBuilder|License[] whereDrive35T($value)
* @method static QueryBuilder|License[] whereDrive75T($value)
* @method static QueryBuilder|License[] whereDrive12T($value)
+ * @method static QueryBuilder|License[] whereDriveConfirmed($value)
* @method static QueryBuilder|License[] whereIfsgCertificateLight($value)
* @method static QueryBuilder|License[] whereIfsgCertificate($value)
* @method static QueryBuilder|License[] whereIfsgConfirmed($value)
@@ -43,6 +45,7 @@ class License extends HasUserModel
'drive_3_5t' => false,
'drive_7_5t' => false,
'drive_12t' => false,
+ 'drive_confirmed' => false,
'ifsg_certificate_light' => false,
'ifsg_certificate' => false,
'ifsg_confirmed' => false,
@@ -61,6 +64,7 @@ class License extends HasUserModel
'drive_3_5t',
'drive_7_5t',
'drive_12t',
+ 'drive_confirmed',
'ifsg_certificate_light',
'ifsg_certificate',
'ifsg_confirmed',
@@ -74,6 +78,7 @@ class License extends HasUserModel
'drive_3_5t' => 'boolean',
'drive_7_5t' => 'boolean',
'drive_12t' => 'boolean',
+ 'drive_confirmed' => 'boolean',
'ifsg_certificate_light' => 'boolean',
'ifsg_certificate' => 'boolean',
'ifsg_confirmed' => 'boolean',
diff --git a/tests/Unit/Controllers/Admin/UserSettingsControllerTest.php b/tests/Unit/Controllers/Admin/UserSettingsControllerTest.php
index 96b9d42a..4d25a99b 100644
--- a/tests/Unit/Controllers/Admin/UserSettingsControllerTest.php
+++ b/tests/Unit/Controllers/Admin/UserSettingsControllerTest.php
@@ -42,11 +42,13 @@ class UserSettingsControllerTest extends ControllerTest
}
/**
- * @covers \Engelsystem\Controllers\Admin\UserSettingsController::checkPermission
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::certificate
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::isIfsgSupporter
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::isDriverLicenseSupporter
*/
public function testCertificateNotAllowed(): void
{
- config(['ifsg_enabled' => true]);
+ config(['ifsg_enabled' => true, 'driving_license_enabled' => true]);
$this->expectException(HttpForbidden::class);
$this->controller->certificate($this->request);
@@ -95,6 +97,22 @@ class UserSettingsControllerTest extends ControllerTest
$this->controller->certificate($this->request);
}
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::certificate
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::checkPermission
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::isDriverLicenseSupporter
+ */
+ public function testDriverLicenseByAngelTypeSupporter(): void
+ {
+ config(['driving_license_enabled' => true]);
+ $this->setExpects($this->response, 'withView', null, $this->response);
+
+ $angelType = AngelType::factory()->create(['requires_driver_license' => true]);
+ $this->user->userAngelTypes()->attach($angelType, ['supporter' => true]);
+
+ $this->controller->certificate($this->request);
+ }
+
/**
* @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveIfsgCertificate
*/
@@ -108,6 +126,7 @@ class UserSettingsControllerTest extends ControllerTest
/**
* @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveIfsgCertificate
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::checkPermission
*/
public function testSaveIfsgCertificateNotAllowed(): void
{
@@ -194,6 +213,91 @@ class UserSettingsControllerTest extends ControllerTest
$this->assertFalse($this->userChanged->license->ifsg_confirmed);
}
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveDrivingLicense
+ */
+ public function testSaveDrivingLicenseDisabled(): void
+ {
+ config(['driving_license_enabled' => false]);
+
+ $this->expectException(HttpNotFound::class);
+ $this->controller->saveDrivingLicense($this->request);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveDrivingLicense
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::checkPermission
+ */
+ public function testSaveDrivingLicenseNotAllowed(): void
+ {
+ config(['driving_license_enabled' => true]);
+
+ $this->expectException(HttpForbidden::class);
+ $this->controller->saveDrivingLicense($this->request);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveDrivingLicense
+ */
+ public function testSaveDrivingLicenseConfirmed(): void
+ {
+ config(['driving_license_enabled' => true]);
+ $this->setExpects($this->auth, 'can', ['user.drive.edit'], true, $this->atLeastOnce());
+
+ $body = [
+ 'drive_car' => true,
+ 'drive_3_5t' => true,
+ 'drive_confirmed' => true,
+ ];
+ $this->request = $this->request->withParsedBody($body);
+
+ $this->response->expects($this->once())
+ ->method('redirectTo')
+ ->with('http://localhost/users/' . $this->userChanged->id . '/certificates')
+ ->willReturn($this->response);
+
+ $this->controller->saveDrivingLicense($this->request);
+ $this->assertTrue($this->log->hasInfoThatContains('Certificate'));
+
+ $this->assertFalse($this->userChanged->license->drive_forklift);
+ $this->assertFalse($this->userChanged->license->drive_12t);
+ $this->assertFalse($this->userChanged->license->drive_7_5t);
+ $this->assertFalse($this->userChanged->license->has_car);
+ $this->assertTrue($this->userChanged->license->drive_car);
+ $this->assertTrue($this->userChanged->license->drive_3_5t);
+ $this->assertTrue($this->userChanged->license->drive_confirmed);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveDrivingLicense
+ */
+ public function testSaveDrivingLicense(): void
+ {
+ config(['driving_license_enabled' => true]);
+ $this->setExpects($this->auth, 'can', ['user.drive.edit'], true, $this->atLeastOnce());
+
+ $body = [
+ 'drive_forklift' => true,
+ 'drive_12t' => true,
+ ];
+ $this->request = $this->request->withParsedBody($body);
+
+ $this->response->expects($this->once())
+ ->method('redirectTo')
+ ->with('http://localhost/users/' . $this->userChanged->id . '/certificates')
+ ->willReturn($this->response);
+
+ $this->controller->saveDrivingLicense($this->request);
+
+ $this->assertFalse($this->userChanged->license->drive_3_5t);
+ $this->assertFalse($this->userChanged->license->drive_7_5t);
+ $this->assertFalse($this->userChanged->license->drive_car);
+ $this->assertFalse($this->userChanged->license->has_car);
+ $this->assertTrue($this->userChanged->license->drive_forklift);
+ $this->assertTrue($this->userChanged->license->drive_12t);
+ $this->assertFalse($this->userChanged->license->drive_confirmed);
+ }
+
/**
* @covers \Engelsystem\Controllers\Admin\UserSettingsController::settingsMenu
*/
diff --git a/tests/Unit/Controllers/SettingsControllerTest.php b/tests/Unit/Controllers/SettingsControllerTest.php
index 8aabac29..d8b47ca5 100644
--- a/tests/Unit/Controllers/SettingsControllerTest.php
+++ b/tests/Unit/Controllers/SettingsControllerTest.php
@@ -689,6 +689,9 @@ class SettingsControllerTest extends ControllerTest
config(['ifsg_enabled' => true, 'ifsg_light_enabled' => true]);
$this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
+ $angelType = AngelType::factory()->create(['requires_ifsg_certificate' => true]);
+ $this->user->userAngelTypes()->attach($angelType);
+
$this->response->expects($this->once())
->method('withView')
->willReturnCallback(function ($view, $data) {
@@ -707,7 +710,6 @@ class SettingsControllerTest extends ControllerTest
public function testCertificateIfsgNotConfigured(): void
{
config(['ifsg_enabled' => false]);
- $this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
$this->expectException(HttpNotFound::class);
$this->controller->certificate();
@@ -718,6 +720,7 @@ class SettingsControllerTest extends ControllerTest
*/
public function testCertificateDrivingLicense(): void
{
+ config(['driving_license_enabled' => true]);
$this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
$angelType = AngelType::factory()->create(['requires_driver_license' => true]);
@@ -752,7 +755,10 @@ class SettingsControllerTest extends ControllerTest
public function testSaveIfsgCertificateLight(): void
{
config(['ifsg_enabled' => true, 'ifsg_light_enabled' => true]);
- $this->setExpects($this->auth, 'user', null, $this->user, $this->once());
+ $this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
+
+ $angelType = AngelType::factory()->create(['requires_ifsg_certificate' => true]);
+ $this->user->userAngelTypes()->attach($angelType);
$body = [
'ifsg_certificate_light' => true,
@@ -776,7 +782,11 @@ class SettingsControllerTest extends ControllerTest
public function testSaveIfsgCertificateLightWhileDisabled(): void
{
config(['ifsg_enabled' => true, 'ifsg_light_enabled' => false]);
- $this->setExpects($this->auth, 'user', null, $this->user, $this->once());
+ $this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
+
+ $angelType = AngelType::factory()->create(['requires_ifsg_certificate' => true]);
+ $this->user->userAngelTypes()->attach($angelType);
+
$this->user->license->ifsg_certificate_light = false;
$this->user->license->save();
@@ -798,11 +808,15 @@ class SettingsControllerTest extends ControllerTest
/**
* @covers \Engelsystem\Controllers\SettingsController::saveIfsgCertificate
+ * @covers \Engelsystem\Controllers\SettingsController::checkIfsgCertificate
*/
public function testSaveIfsgCertificate(): void
{
config(['ifsg_enabled' => true]);
- $this->setExpects($this->auth, 'user', null, $this->user, $this->once());
+ $this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
+
+ $angelType = AngelType::factory()->create(['requires_ifsg_certificate' => true]);
+ $this->user->userAngelTypes()->attach($angelType);
$body = [
'ifsg_certificate' => true,
@@ -826,7 +840,10 @@ class SettingsControllerTest extends ControllerTest
public function testSaveIfsgCertificateBoth(): void
{
config(['ifsg_enabled' => true]);
- $this->setExpects($this->auth, 'user', null, $this->user, $this->once());
+ $this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
+
+ $angelType = AngelType::factory()->create(['requires_ifsg_certificate' => true]);
+ $this->user->userAngelTypes()->attach($angelType);
$body = [
'ifsg_certificate_light' => true,
@@ -851,6 +868,7 @@ class SettingsControllerTest extends ControllerTest
*/
public function testSaveDrivingLicense(): void
{
+ config(['driving_license_enabled' => true]);
$this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
$angelType = AngelType::factory()->create(['requires_driver_license' => true]);
@@ -893,6 +911,7 @@ class SettingsControllerTest extends ControllerTest
*/
public function testApi(): void
{
+ config(['ifsg_enabled' => true]);
$this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
/** @var Response|MockObject $response */
@@ -993,11 +1012,33 @@ class SettingsControllerTest extends ControllerTest
/**
* @covers \Engelsystem\Controllers\SettingsController::settingsMenu
- * @covers \Engelsystem\Controllers\SettingsController::checkOauthHidden
*/
public function testSettingsMenuWithIfsg(): void
{
config(['ifsg_enabled' => true]);
+ $this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
+
+ $angelType = AngelType::factory()->create(['requires_ifsg_certificate' => true]);
+ $this->user->userAngelTypes()->attach($angelType);
+
+ $menu = $this->controller->settingsMenu();
+ $this->assertArrayHasKey('http://localhost/settings/certificates', $menu);
+ $this->assertEquals(
+ ['title' => 'settings.certificates', 'icon' => 'card-checklist'],
+ $menu['http://localhost/settings/certificates']
+ );
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\SettingsController::settingsMenu
+ */
+ public function testSettingsMenuWithDrivingLicense(): void
+ {
+ config(['driving_license_enabled' => true]);
+ $this->setExpects($this->auth, 'user', null, $this->user, $this->atLeastOnce());
+
+ $angelType = AngelType::factory()->create(['requires_driver_license' => true]);
+ $this->user->userAngelTypes()->attach($angelType);
$menu = $this->controller->settingsMenu();
$this->assertArrayHasKey('http://localhost/settings/certificates', $menu);