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

#90 - user profile (#125)

Browse Source 
* fix css focuses

* #90 - wip

* #90 - fix to generate PDF

* #90 - wip

* #90 - wip

* #90 - wip

* #90 - wip

* #90 - fix to calendar

* #90 - wip

* #90 - fix

* #90 - fix lint

* #90 - fix

* Apply suggestions from code review

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* #90 - cr fixes

* #90 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
This commit is contained in:
Adrian Hopek
2022-04-14 11:58:45 +02:00
committed by GitHub
parent 459b62500e
commit cc981b02b4
62 changed files with 765 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ use Toby\Domain\Enums\Month;
use Toby\Domain\UserVacationStatsRetriever;
use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\User;
use Toby\Infrastructure\Http\Resources\UserResource;
use Toby\Infrastructure\Http\Resources\SimpleUserResource;
class MonthlyUsageController extends Controller
{
@@ -27,8 +27,8 @@ class MonthlyUsageController extends Controller
$users = User::query()
->withVacationLimitIn($currentYearPeriod)
->where("id", "!=", $currentUser->id)
->orderBy("last_name")
->orderBy("first_name")
->orderByProfileField("last_name")
->orderByProfileField("first_name")
->get();
if ($currentUser->hasVacationLimit($currentYearPeriod)) {
@@ -45,7 +45,7 @@ class MonthlyUsageController extends Controller
$remaining = $limit - $used - $pending;
$monthlyUsage[] = [
"user" => new UserResource($user),
"user" => new SimpleUserResource($user),
"months" => $vacationsByMonth,
"stats" => [
"used" => $used,