diff --git a/app/Eloquent/Models/User.php b/app/Eloquent/Models/User.php index 0256927..3d12fa9 100644 --- a/app/Eloquent/Models/User.php +++ b/app/Eloquent/Models/User.php @@ -103,9 +103,9 @@ class User extends Authenticatable } return $query - ->where("first_name", "ILIKE", $text) - ->orWhere("last_name", "ILIKE", $text) - ->orWhere("email", "ILIKE", $text); + ->where("first_name", "ILIKE", "%{$text}%") + ->orWhere("last_name", "ILIKE", "%{$text}%") + ->orWhere("email", "ILIKE", "%{$text}%"); } public function scopeWithVacationLimitIn(Builder $query, YearPeriod $yearPeriod): Builder diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php index 1ea2e0f..6d1cf6d 100644 --- a/app/Infrastructure/Http/Controllers/VacationRequestController.php +++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php @@ -113,7 +113,7 @@ class VacationRequestController extends Controller "users" => UserResource::collection($users), "filters" => [ "status" => $status, - "user" => $user, + "user" => (int)$user, ], ]); } diff --git a/public/img/logo-white.png b/public/img/logo-white.png deleted file mode 100644 index 853f4e3..0000000 Binary files a/public/img/logo-white.png and /dev/null differ diff --git a/public/img/logo-white.svg b/public/img/logo-white.svg new file mode 100644 index 0000000..f5013ac --- /dev/null +++ b/public/img/logo-white.svg @@ -0,0 +1,18 @@ + + + + blumilk + + + + + + + + + + + + + + diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue index 954399f..9e8dc25 100644 --- a/resources/js/Pages/Calendar.vue +++ b/resources/js/Pages/Calendar.vue @@ -3,28 +3,28 @@
-

+

Kalendarz urlopów

-
+
@@ -32,13 +32,13 @@ v-if="nextMonth" as="button" :href="`/vacation/calendar/${nextMonth.value}`" - class="flex items-center justify-center rounded-r-md border border-l-0 border-gray-300 bg-white py-2 pl-4 pr-3 text-gray-400 hover:text-gray-500 focus:relative md:w-9 md:px-2 md:hover:bg-gray-50" + class="flex items-center justify-center rounded-r-md border border-l-0 border-gray-300 bg-white py-2 px-2 text-gray-400 hover:text-gray-500 focus:relative md:w-9 md:px-2 md:hover:bg-gray-50" > @@ -47,7 +47,7 @@
Pobierz plik Excel diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue index ba6e5d1..303e371 100644 --- a/resources/js/Pages/Dashboard.vue +++ b/resources/js/Pages/Dashboard.vue @@ -1,7 +1,7 @@ diff --git a/resources/js/Pages/VacationRequest/Create.vue b/resources/js/Pages/VacationRequest/Create.vue index 4575a21..c5bf011 100644 --- a/resources/js/Pages/VacationRequest/Create.vue +++ b/resources/js/Pages/VacationRequest/Create.vue @@ -1,7 +1,7 @@ diff --git a/resources/js/Pages/VacationRequest/IndexForApprovers.vue b/resources/js/Pages/VacationRequest/IndexForApprovers.vue index a6e4026..3499364 100644 --- a/resources/js/Pages/VacationRequest/IndexForApprovers.vue +++ b/resources/js/Pages/VacationRequest/IndexForApprovers.vue @@ -16,200 +16,194 @@
-
-
-
-
- +
+ + + Pracownik + +
+ - - Pracownik - -
- + Wszyscy + + + - - Wszyscy - - - - {{ form.user.name }} - - - - - + {{ form.user.name }} + + + + + - - - -
  • -
    - Wszyscy pracownicy -
    - - - - -
  • -
    - -
  • -
    - - - {{ user.name }} - -
    - - - -
  • -
    -
    -
    -
    - -
    -
    - - - Status - -
    - + - - {{ form.status.name }} - - - - - - - - - -
  • - {{ status.name }} +
    + Wszyscy +
    - - - -
  • -
    -
    -
    -
    -
    + + + + + + +
  • +
    + + + {{ user.name }} + +
    + + + +
  • +
    + +
    -
    +
    + + + Status + +
    + + + {{ form.status.name }} + + + + + + + + + +
  • + {{ status.name }} + + + + +
  • +
    +
    +
    +
    +
    +
    +
    @@ -232,10 +226,9 @@
    Numer Pracownik Rodzaj urlopu Od Do Dni urlopu Status
    - +
    + +

    {{ request.user.name }} diff --git a/resources/js/Shared/Layout/AppLayout.vue b/resources/js/Shared/Layout/AppLayout.vue index 781ec76..82bac1b 100644 --- a/resources/js/Shared/Layout/AppLayout.vue +++ b/resources/js/Shared/Layout/AppLayout.vue @@ -5,7 +5,7 @@ :years="years" />

    -
    +
    diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue index df9e4a5..3f6a0d3 100644 --- a/resources/js/Shared/MainMenu.vue +++ b/resources/js/Shared/MainMenu.vue @@ -49,11 +49,13 @@
    - + Workflow
    @@ -61,7 +63,8 @@
    Strona główna @@ -74,6 +77,7 @@ :key="item.name" :href="item.href" :class="[$page.component === item.component ? 'bg-blumilk-800 text-white' : 'text-blumilk-100 hover:text-white hover:bg-blumilk-600', 'group flex items-center px-2 py-2 text-base font-medium rounded-md']" + @click="sidebarOpen = false;" > Workflow
    diff --git a/resources/js/Shared/Widgets/VacationStats.vue b/resources/js/Shared/Widgets/VacationStats.vue index 8c380cf..bfdaf1c 100644 --- a/resources/js/Shared/Widgets/VacationStats.vue +++ b/resources/js/Shared/Widgets/VacationStats.vue @@ -1,6 +1,6 @@