wip
This commit is contained in:
@@ -7,7 +7,7 @@ namespace Toby\Domain\Enums;
|
||||
enum EmploymentForm: string
|
||||
{
|
||||
case EmploymentContract = "employment_contract";
|
||||
case ComissionContract = "commission_contract";
|
||||
case CommissionContract = "commission_contract";
|
||||
case B2bContract = "b2b_contract";
|
||||
case BoardMemberContract = "board_member_contract";
|
||||
|
||||
|
@@ -4,6 +4,8 @@ declare(strict_types=1);
|
||||
|
||||
namespace Toby\Eloquent\Models;
|
||||
|
||||
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;
|
||||
@@ -17,6 +19,8 @@ use Toby\Domain\Enums\VacationRequestState;
|
||||
*/
|
||||
class VacationRequestActivity extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected $guarded = [];
|
||||
|
||||
protected $casts = [
|
||||
@@ -33,4 +37,9 @@ class VacationRequestActivity extends Model
|
||||
{
|
||||
return $this->belongsTo(VacationRequest::class);
|
||||
}
|
||||
|
||||
protected static function newFactory(): VacationRequestActivityFactory
|
||||
{
|
||||
return VacationRequestActivityFactory::new();
|
||||
}
|
||||
}
|
||||
|
@@ -24,7 +24,7 @@ class DashboardController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
protected VacationTypeConfigRetriever $configRetriever,
|
||||
protected YearPeriodRetriever $yearPeriodRetriever
|
||||
protected YearPeriodRetriever $yearPeriodRetriever,
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ class DashboardController extends Controller
|
||||
->whereDate("date", Carbon::now())
|
||||
->whereRelation(
|
||||
"vacationRequest",
|
||||
fn(Builder $query) => $query->states(VacationRequestState::successStates())
|
||||
fn(Builder $query) => $query->states(VacationRequestState::successStates()),
|
||||
)
|
||||
->get();
|
||||
|
||||
@@ -51,10 +51,10 @@ class DashboardController extends Controller
|
||||
->get();
|
||||
|
||||
$limit = $request->user()
|
||||
->vacationLimits()
|
||||
->where("year_period_id", $this->yearPeriodRetriever->current()->id)
|
||||
->first()
|
||||
->days ?? 0;
|
||||
->vacationLimits()
|
||||
->where("year_period_id", $this->yearPeriodRetriever->current()->id)
|
||||
->first()
|
||||
->days ?? 0;
|
||||
|
||||
$used = $request->user()
|
||||
->vacations()
|
||||
@@ -62,7 +62,7 @@ class DashboardController extends Controller
|
||||
"vacationRequest",
|
||||
fn(Builder $query) => $query
|
||||
->whereIn("type", $this->getLimitableVacationTypes())
|
||||
->noStates(VacationRequestState::successStates()),
|
||||
->states(VacationRequestState::successStates()),
|
||||
)
|
||||
->count();
|
||||
|
||||
@@ -72,7 +72,7 @@ class DashboardController extends Controller
|
||||
"vacationRequest",
|
||||
fn(Builder $query) => $query
|
||||
->whereIn("type", $this->getLimitableVacationTypes())
|
||||
->noStates(VacationRequestState::pendingStates()),
|
||||
->states(VacationRequestState::pendingStates()),
|
||||
)
|
||||
->count();
|
||||
|
||||
@@ -82,7 +82,7 @@ class DashboardController extends Controller
|
||||
"vacationRequest",
|
||||
fn(Builder $query) => $query
|
||||
->whereIn("type", $this->getNotLimitableVacationTypes())
|
||||
->noStates(VacationRequestState::successStates()),
|
||||
->states(VacationRequestState::successStates()),
|
||||
)
|
||||
->count();
|
||||
|
||||
|
Reference in New Issue
Block a user