#38 - wip

app/Domain/Listeners/HandleCreatedVacationRequest.php

@@ -20,6 +20,12 @@ class HandleCreatedVacationRequest
     {
         $vacationRequest = $event->vacationRequest;
 
+        if ($vacationRequest->shouldSkipFlow()) {
+            $this->stateManager->approve($vacationRequest);
+
+            return;
+        }
+
         if ($this->configRetriever->needsTechnicalApproval($vacationRequest->type)) {
             $this->stateManager->waitForTechnical($vacationRequest);
 

app/Eloquent/Models/User.php

@@ -58,6 +58,11 @@ class User extends Authenticatable
         return $this->hasMany(VacationRequest::class);
     }
 
+    public function createdVacationRequests(): HasMany
+    {
+        return $this->hasMany(VacationRequest::class, "creator_id");
+    }
+
     public function vacations(): HasMany
     {
         return $this->hasMany(Vacation::class);

app/Eloquent/Models/VacationRequest.php

@@ -22,7 +22,9 @@ use Toby\Domain\Enums\VacationType;
  * @property Carbon $from
  * @property Carbon $to
  * @property string $comment
+ * @property boolean $skip_flow
  * @property User $user
+ * @property User $creator
  * @property YearPeriod $yearPeriod
  * @property Collection $activities
  * @property Collection $vacations
@@ -47,6 +49,11 @@ class VacationRequest extends Model
         return $this->belongsTo(User::class);
     }
 
+    public function creator(): BelongsTo
+    {
+        return $this->belongsTo(User::class, "creator_id");
+    }
+
     public function yearPeriod(): BelongsTo
     {
         return $this->belongsTo(YearPeriod::class);
@@ -69,6 +76,11 @@ class VacationRequest extends Model
         $this->save();
     }
 
+    public function shouldSkipFlow(): bool
+    {
+        return $this->skip_flow;
+    }
+
     public function scopeStates(Builder $query, array $states): Builder
     {
         return $query->whereIn("state", $states);

app/Infrastructure/Http/Controllers/VacationRequestController.php

@@ -15,8 +15,10 @@ use Toby\Domain\VacationDaysCalculator;
 use Toby\Domain\VacationRequestStateManager;
 use Toby\Domain\Validation\VacationRequestValidator;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
 use Toby\Infrastructure\Http\Requests\VacationRequestRequest;
+use Toby\Infrastructure\Http\Resources\UserResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestResource;
 
@@ -63,6 +65,7 @@ class VacationRequestController extends Controller
     {
         return inertia("VacationRequest/Create", [
             "vacationTypes" => VacationType::casesToSelect(),
+            "users" => UserResource::collection(User::all()),
         ]);
     }
 
@@ -73,7 +76,7 @@ class VacationRequestController extends Controller
         VacationDaysCalculator $vacationDaysCalculator,
     ): RedirectResponse {
         /** @var VacationRequest $vacationRequest */
-        $vacationRequest = $request->user()->vacationRequests()->make($request->data());
+        $vacationRequest = $request->user()->createdVacationRequests()->make($request->data());
         $vacationRequestValidator->validate($vacationRequest);
 
         $vacationRequest->save();

app/Infrastructure/Http/Requests/VacationRequestRequest.php

@@ -16,9 +16,11 @@ class VacationRequestRequest extends FormRequest
     public function rules(): array
     {
         return [
+            "user" => ["required", "exists:users,id"],
             "type" => ["required", new Enum(VacationType::class)],
             "from" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
             "to" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
+            "skipFlow" => ["required", "boolean"],
             "comment" => ["nullable"],
         ];
     }
@@ -28,11 +30,13 @@ class VacationRequestRequest extends FormRequest
         $from = $this->get("from");
 
         return [
+            "user_id" => $this->get("user"),
             "type" => $this->get("type"),
             "from" => $from,
             "to" => $this->get("to"),
             "year_period_id" => YearPeriod::findByYear(Carbon::create($from)->year)->id,
             "comment" => $this->get("comment"),
+            "skip_flow" => $this->boolean("skipFlow"),
         ];
     }
 }

database/migrations/2022_01_26_100039_create_vacation_requests_table.php

@@ -14,6 +14,7 @@ return new class() extends Migration {
         Schema::create("vacation_requests", function (Blueprint $table): void {
             $table->id();
             $table->string("name");
+            $table->foreignIdFor(User::class, "creator_id")->constrained("users")->cascadeOnDelete();
             $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
             $table->foreignIdFor(YearPeriod::class)->constrained()->cascadeOnDelete();
             $table->string("type");
@@ -21,6 +22,7 @@ return new class() extends Migration {
             $table->date("from");
             $table->date("to");
             $table->text("comment")->nullable();
+            $table->boolean("skip_flow")->default(false);
             $table->timestamps();
         });
     }

database/seeders/DatabaseSeeder.php

@@ -77,6 +77,7 @@ class DatabaseSeeder extends Seeder
             VacationRequest::factory()
                 ->count(10)
                 ->for($user)
+                ->for($user, "creator")
                 ->sequence(fn() => [
                     "year_period_id" => $yearPeriods->random()->id,
                 ])

resources/js/Composables/yearPeriodInfo.js

@@ -0,0 +1,12 @@
+import {computed} from 'vue'
+import {usePage} from '@inertiajs/inertia-vue3'
+
+export default function useCurrentYearPeriodInfo() {
+  const minDate = computed(() => new Date(usePage().props.value.years.current, 0, 1))
+  const maxDate = computed(() => new Date(usePage().props.value.years.current, 11, 31))
+
+  return {
+    minDate,
+    maxDate,
+  }
+}

resources/js/Pages/Holidays/Create.vue

@@ -48,6 +48,7 @@
             id="date"
             v-model="form.date"
             placeholder="Wybierz datę"
+            :config="{minDate, maxDate}"
             class="block w-full max-w-lg shadow-sm rounded-md sm:text-sm"
             :class="{ 'border-red-300 text-red-900 focus:outline-none focus:ring-red-500 focus:border-red-500': form.errors.date, 'focus:ring-blumilk-500 focus:border-blumilk-500 sm:text-sm border-gray-300': !form.errors.date }"
           />
@@ -81,8 +82,9 @@
 </template>
 
 <script>
-import { useForm } from '@inertiajs/inertia-vue3'
+import {useForm} from '@inertiajs/inertia-vue3'
 import FlatPickr from 'vue-flatpickr-component'
+import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
 
 export default {
   name: 'HolidayCreate',
@@ -95,7 +97,13 @@ export default {
       date: null,
     })
 
-    return { form }
+    const {minDate, maxDate} = useCurrentYearPeriodInfo()
+
+    return {
+      form,
+      minDate,
+      maxDate,
+    }
   },
   methods: {
     createHoliday() {

resources/js/Pages/VacationRequest/Create.vue

@@ -28,6 +28,76 @@
           </div>
         </div>
       </div>
+      <Listbox
+        v-model="form.user"
+        as="div"
+        class="sm:grid sm:grid-cols-3 py-4 items-center"
+      >
+        <ListboxLabel class="block text-sm font-medium text-gray-700">
+          Osoba składająca wniosek
+        </ListboxLabel>
+        <div class="mt-1 relative sm:mt-0 sm:col-span-2">
+          <ListboxButton
+            class="bg-white relative w-full max-w-lg border rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-default sm:text-sm focus:ring-1"
+            :class="{ 'border-red-300 text-red-900 focus:outline-none focus:ring-red-500 focus:border-red-500': form.errors.type, 'focus:ring-blumilk-500 focus:border-blumilk-500 sm:text-sm border-gray-300': !form.errors.type }"
+          >
+            <span class="flex items-center">
+              <img
+                :src="form.user.avatar"
+                class="flex-shrink-0 h-6 w-6 rounded-full"
+              >
+              <span class="ml-3 block truncate">{{ form.user.name }}</span>
+            </span>
+            <span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
+              <SelectorIcon class="h-5 w-5 text-gray-400" />
+            </span>
+          </ListboxButton>
+
+          <transition
+            leave-active-class="transition ease-in duration-100"
+            leave-from-class="opacity-100"
+            leave-to-class="opacity-0"
+          >
+            <ListboxOptions
+              class="absolute z-10 mt-1 w-full max-w-lg bg-white shadow-lg max-h-60 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm"
+            >
+              <ListboxOption
+                v-for="user in users.data"
+                :key="user.id"
+                v-slot="{ active, selected }"
+                as="template"
+                :value="user"
+              >
+                <li :class="[active ? 'text-white bg-indigo-600' : 'text-gray-900', 'cursor-default select-none relative py-2 pl-3 pr-9']">
+                  <div class="flex items-center">
+                    <img
+                      :src="user.avatar"
+                      alt=""
+                      class="flex-shrink-0 h-6 w-6 rounded-full"
+                    >
+                    <span :class="[selected ? 'font-semibold' : 'font-normal', 'ml-3 block truncate']">
+                      {{ user.name }}
+                    </span>
+                  </div>
+
+                  <span
+                    v-if="selected"
+                    :class="[active ? 'text-white' : 'text-indigo-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
+                  >
+                    <CheckIcon class="h-5 w-5" />
+                  </span>
+                </li>
+              </ListboxOption>
+            </ListboxOptions>
+          </transition>
+          <p
+            v-if="form.errors.type"
+            class="mt-2 text-sm text-red-600"
+          >
+            {{ form.errors.type }}
+          </p>
+        </div>
+      </Listbox>
       <Listbox
         v-model="form.type"
         as="div"
@@ -161,6 +231,25 @@
           />
         </div>
       </div>
+      <div class="sm:grid sm:grid-cols-3 py-4 items-center">
+        <label
+          for="skipFlow"
+          class="block text-sm font-medium text-gray-700"
+        >
+          Natychmiastowo zatwierdź wniosek
+        </label>
+        <div class="mt-1 sm:mt-0 sm:col-span-2">
+          <Switch
+            id="skipFlow"
+            v-model="form.skipFlow"
+            :class="[form.skipFlow ? 'bg-blumilk-500' : 'bg-gray-200', 'relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blumilk-500']"
+          >
+            <span
+              :class="[form.skipFlow ? 'translate-x-5' : 'translate-x-0', 'pointer-events-none inline-block h-5 w-5 rounded-full bg-white shadow transform ring-0 transition ease-in-out duration-200']"
+            />
+          </Switch>
+        </div>
+      </div>
       <div class="flex justify-end py-3">
         <div class="space-x-3">
           <InertiaLink
@@ -183,16 +272,18 @@
 </template>
 
 <script>
-import {useForm, usePage} from '@inertiajs/inertia-vue3'
+import {useForm} from '@inertiajs/inertia-vue3'
 import FlatPickr from 'vue-flatpickr-component'
-import {Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions} from '@headlessui/vue'
+import {Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions, Switch} from '@headlessui/vue'
 import {CheckIcon, SelectorIcon, XCircleIcon} from '@heroicons/vue/solid'
-import {reactive, ref, computed} from 'vue'
+import {reactive, ref} from 'vue'
 import axios from 'axios'
+import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
 
 export default {
   name: 'VacationRequestCreate',
   components: {
+    Switch,
     FlatPickr,
     Listbox,
     ListboxButton,
@@ -204,6 +295,14 @@ export default {
     XCircleIcon,
   },
   props: {
+    auth: {
+      type: Object,
+      default: () => null,
+    },
+    users: {
+      type: Object,
+      default: () => null,
+    },
     vacationTypes: {
       type: Object,
       default: () => null,
@@ -215,15 +314,16 @@ export default {
   },
   setup(props) {
     const form = useForm({
+      user: props.users.data.find(user => user.id === props.auth.user.id),
       from: null,
       to: null,
       type: props.vacationTypes[0],
       comment: null,
+      skipFlow: false,
     })
 
     const estimatedDays = ref([])
-    const minDate = computed(() => new Date(usePage().props.value.years.current, 0, 1))
+    const {minDate, maxDate} = useCurrentYearPeriodInfo()
-    const maxDate = computed(() => new Date(usePage().props.value.years.current, 11, 31))
 
     const disableDates = [
       date => (date.getDay() === 0 || date.getDay() === 6),
@@ -254,6 +354,7 @@ export default {
         .transform(data => ({
           ...data,
           type: data.type.value,
+          user: data.user.id,
         }))
         .post('/vacation-requests')
     },