Merge branch 'main' into #43-vacation-summary-for-employee

# Conflicts:
#	app/Infrastructure/Http/Controllers/HolidayController.php
#	app/Infrastructure/Http/Controllers/VacationLimitController.php
#	app/Infrastructure/Http/Controllers/VacationRequestController.php
#	composer.lock
#	resources/js/Pages/Holidays/Index.vue
#	resources/js/Pages/VacationRequest/Create.vue
This commit is contained in:
Adrian Hopek
2022-03-02 10:01:14 +01:00
51 changed files with 1993 additions and 1401 deletions

View File

@@ -12,8 +12,9 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Toby\Domain\Enums\VacationRequestState;
use Spatie\ModelStates\HasStates;
use Toby\Domain\Enums\VacationType;
use Toby\Domain\States\VacationRequest\VacationRequestState;
/**
* @property int $id
@@ -34,6 +35,7 @@ use Toby\Domain\Enums\VacationType;
class VacationRequest extends Model
{
use HasFactory;
use HasStates;
protected $guarded = [];
@@ -69,26 +71,14 @@ class VacationRequest extends Model
return $this->hasMany(Vacation::class);
}
public function changeStateTo(VacationRequestState $state): void
public function scopeStates(Builder $query, VacationRequestState|array $states): Builder
{
$this->state = $state;
$this->save();
return $query->whereState("state", $states);
}
public function hasFlowSkipped(): bool
public function scopeNoStates(Builder $query, VacationRequestState|array $states): Builder
{
return $this->flow_skipped;
}
public function scopeStates(Builder $query, array $states): Builder
{
return $query->whereIn("state", $states);
}
public function scopeNoStates(Builder $query, array $states): Builder
{
return $query->whereNotIn("state", $states);
return $query->whereNotState("state", $states);
}
public function scopeOverlapsWith(Builder $query, self $vacationRequest): Builder
@@ -97,6 +87,11 @@ class VacationRequest extends Model
->where("to", ">=", $vacationRequest->from);
}
public function hasFlowSkipped(): bool
{
return $this->flow_skipped;
}
protected static function newFactory(): VacationRequestFactory
{
return VacationRequestFactory::new();

View File

@@ -8,7 +8,7 @@ use Database\Factories\VacationRequestActivityFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Toby\Domain\Enums\VacationRequestState;
use Toby\Domain\States\VacationRequest\VacationRequestState;
/**
* @property int $id