kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

- small changes (#98)

Browse Source 
* - added some test

* - cr fix

* wip

* wip

* Update resources/js/Shared/MainMenu.vue

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
This commit is contained in:
Adrian Hopek
2022-03-30 10:33:18 +02:00
committed by GitHub
parent ab16af1ca9
commit 08421b8a69
40 changed files with 323 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Infrastructure/Http/Controllers/DashboardController.php
View File

@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Toby\Infrastructure\Http\Controllers;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
use Inertia\Response;
@@ -29,10 +28,7 @@ class DashboardController extends Controller
$absences = Vacation::query()
->with(["user", "vacationRequest"])
->whereDate("date", $now)
->whereRelation(
"vacationRequest",
fn(Builder $query) => $query->states(VacationRequestStatesRetriever::successStates()),
)
->approved()
->get();
if ($user->can("listAll", VacationRequest::class)) {

2
app/Infrastructure/Http/Controllers/GoogleController.php
View File

@@ -36,6 +36,6 @@ class GoogleController extends Controller
$auth->guard()->login($user, true);
return redirect()->route("dashboard");
return redirect()->intended();
}
}

6
app/Infrastructure/Http/Controllers/MonthlyUsageController.php
View File

@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Toby\Infrastructure\Http\Controllers;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Inertia\Response;
use Toby\Domain\Enums\Month;
@@ -26,10 +25,7 @@ class MonthlyUsageController extends Controller
$currentUser = $request->user();
$users = User::query()
->whereRelation(
"vacationlimits",
fn(Builder $query) => $query->where("year_period_id", $currentYearPeriod->id)->whereNotNull("days"),
)
->withVacationLimitIn($currentYearPeriod)
->where("id", "!=", $currentUser->id)
->orderBy("last_name")
->orderBy("first_name")

5
app/Infrastructure/Http/Controllers/UserController.php
View File

@@ -8,6 +8,7 @@ use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Inertia\Response;
use Toby\Domain\Actions\CreateUserAction;
use Toby\Domain\Enums\EmploymentForm;
use Toby\Domain\Enums\Role;
use Toby\Eloquent\Models\User;
@@ -54,11 +55,11 @@ class UserController extends Controller
/**
* @throws AuthorizationException
*/
public function store(UserRequest $request): RedirectResponse
public function store(UserRequest $request, CreateUserAction $createUserAction): RedirectResponse
{
$this->authorize("manageUsers");
User::query()->create($request->data());
$createUserAction->execute($request->data());
return redirect()
->route("users.index")

10
app/Infrastructure/Http/Controllers/VacationRequestController.php
View File

@@ -103,10 +103,7 @@ class VacationRequestController extends Controller
->paginate();
$users = User::query()
->whereRelation(
"vacationlimits",
fn(Builder $query) => $query->where("year_period_id", $yearPeriod->id)->whereNotNull("days"),
)
->withVacationLimitIn($yearPeriod)
->orderBy("last_name")
->orderBy("first_name")
->get();
@@ -164,10 +161,7 @@ class VacationRequestController extends Controller
$yearPeriod = $yearPeriodRetriever->selected();
$users = User::query()
->whereRelation(
"vacationlimits",
fn(Builder $query) => $query->where("year_period_id", $yearPeriod->id)->whereNotNull("days"),
)
->withVacationLimitIn($yearPeriod)
->orderBy("last_name")
->orderBy("first_name")
->get();