policies updated

This commit is contained in:
Benjamin Takats
2022-12-01 17:39:17 +01:00
parent 5d958dd177
commit 8237e1abfd
7 changed files with 83 additions and 38 deletions

View File

@@ -11,17 +11,20 @@ class Participant extends Model
/** /**
* The attributes that aren't mass assignable. * The attributes that aren't mass assignable.
*
* @var array * @var array
*/ */
protected $guarded = []; protected $guarded = [];
/** /**
* The attributes that should be cast to native types. * The attributes that should be cast to native types.
*
* @var array * @var array
*/ */
protected $casts = [ protected $casts = [
'id' => 'integer', 'id' => 'integer',
]; ];
public function registrations()
{
return $this->hasMany(\App\Models\Registration::class);
}
} }

View File

@@ -23,7 +23,7 @@ class Course extends Resource
* The single value that should be used to represent the resource when being displayed. * The single value that should be used to represent the resource when being displayed.
* @var string * @var string
*/ */
public static $title = 'id'; public static $title = 'name';
/** /**
* The columns that should be searched. * The columns that should be searched.
@@ -31,6 +31,7 @@ class Course extends Resource
*/ */
public static $search = [ public static $search = [
'id', 'id',
'name',
]; ];
public static function relatableLecturers(NovaRequest $request, $query, Field $field) public static function relatableLecturers(NovaRequest $request, $query, Field $field)

View File

@@ -2,56 +2,70 @@
namespace App\Nova; namespace App\Nova;
use Laravel\Nova\Fields\ID; use Carbon\CarbonInterval;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Laravel\Nova\Fields\DateTime;
use Laravel\Nova\Fields\BelongsTo; use Laravel\Nova\Fields\BelongsTo;
use Laravel\Nova\Fields\DateTime;
use Laravel\Nova\Fields\Field;
use Laravel\Nova\Fields\ID;
use Laravel\Nova\Http\Requests\NovaRequest;
class Event extends Resource class Event extends Resource
{ {
/** /**
* The model the resource corresponds to. * The model the resource corresponds to.
*
* @var string * @var string
*/ */
public static $model = \App\Models\Event::class; public static $model = \App\Models\Event::class;
/**
* The single value that should be used to represent the resource when being displayed.
*
* @var string
*/
public static $title = 'id';
/** /**
* The columns that should be searched. * The columns that should be searched.
*
* @var array * @var array
*/ */
public static $search = [ public static $search = [
'id', 'id',
'course.name',
]; ];
public static function relatableCourses(NovaRequest $request, $query, Field $field)
{
if ($field instanceof BelongsTo) {
$query->whereHas('lecturer', function ($query) use ($request) {
$query->where('team_id', $request->user()->id);
});
}
return $query;
}
public function title()
{
return $this->from.' - '.$this->venue->name.' - '.$this->course->name;
}
/** /**
* Get the fields displayed by the resource. * Get the fields displayed by the resource.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return array * @return array
*/ */
public function fields(Request $request) public function fields(Request $request)
{ {
return [ return [
ID::make()->sortable(), ID::make()
->sortable(),
DateTime::make('From') DateTime::make('From')
->rules('required'), ->rules('required')
->step(CarbonInterval::minutes(30)),
DateTime::make('To') DateTime::make('To')
->rules('required'), ->rules('required')
->step(CarbonInterval::minutes(30)),
BelongsTo::make('Course'), BelongsTo::make('Course'),
BelongsTo::make('Venue'), BelongsTo::make('Venue')
->searchable(),
]; ];
} }
@@ -60,6 +74,7 @@ class Event extends Resource
* Get the cards available for the request. * Get the cards available for the request.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return array * @return array
*/ */
public function cards(Request $request) public function cards(Request $request)
@@ -71,6 +86,7 @@ class Event extends Resource
* Get the filters available for the resource. * Get the filters available for the resource.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return array * @return array
*/ */
public function filters(Request $request) public function filters(Request $request)
@@ -82,6 +98,7 @@ class Event extends Resource
* Get the lenses available for the resource. * Get the lenses available for the resource.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return array * @return array
*/ */
public function lenses(Request $request) public function lenses(Request $request)
@@ -93,6 +110,7 @@ class Event extends Resource
* Get the actions available for the resource. * Get the actions available for the resource.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return array * @return array
*/ */
public function actions(Request $request) public function actions(Request $request)

View File

@@ -2,45 +2,44 @@
namespace App\Nova; namespace App\Nova;
use Laravel\Nova\Fields\ID;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Laravel\Nova\Fields\ID;
use Laravel\Nova\Fields\Text; use Laravel\Nova\Fields\Text;
class Participant extends Resource class Participant extends Resource
{ {
/** /**
* The model the resource corresponds to. * The model the resource corresponds to.
*
* @var string * @var string
*/ */
public static $model = \App\Models\Participant::class; public static $model = \App\Models\Participant::class;
/**
* The single value that should be used to represent the resource when being displayed.
*
* @var string
*/
public static $title = 'id';
/** /**
* The columns that should be searched. * The columns that should be searched.
*
* @var array * @var array
*/ */
public static $search = [ public static $search = [
'id', 'id',
'first_name',
'last_name',
]; ];
public function title()
{
return $this->first_name.' '.$this->last_name;
}
/** /**
* Get the fields displayed by the resource. * Get the fields displayed by the resource.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return array * @return array
*/ */
public function fields(Request $request) public function fields(Request $request)
{ {
return [ return [
ID::make()->sortable(), ID::make()
->sortable(),
Text::make('First name') Text::make('First name')
->rules('required', 'string'), ->rules('required', 'string'),
@@ -48,7 +47,6 @@ class Participant extends Resource
Text::make('Last name') Text::make('Last name')
->rules('required', 'string'), ->rules('required', 'string'),
]; ];
} }
@@ -56,6 +54,7 @@ class Participant extends Resource
* Get the cards available for the request. * Get the cards available for the request.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return array * @return array
*/ */
public function cards(Request $request) public function cards(Request $request)
@@ -67,6 +66,7 @@ class Participant extends Resource
* Get the filters available for the resource. * Get the filters available for the resource.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return array * @return array
*/ */
public function filters(Request $request) public function filters(Request $request)
@@ -78,6 +78,7 @@ class Participant extends Resource
* Get the lenses available for the resource. * Get the lenses available for the resource.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return array * @return array
*/ */
public function lenses(Request $request) public function lenses(Request $request)
@@ -89,6 +90,7 @@ class Participant extends Resource
* Get the actions available for the resource. * Get the actions available for the resource.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return array * @return array
*/ */
public function actions(Request $request) public function actions(Request $request)

View File

@@ -30,7 +30,7 @@ class EventPolicy
*/ */
public function view(User $user, Event $event) public function view(User $user, Event $event)
{ {
// return $user->is_lecturer;
} }
/** /**
@@ -41,7 +41,7 @@ class EventPolicy
*/ */
public function create(User $user) public function create(User $user)
{ {
// return $user->is_lecturer;
} }
/** /**
@@ -53,7 +53,7 @@ class EventPolicy
*/ */
public function update(User $user, Event $event) public function update(User $user, Event $event)
{ {
// return $user->belongsToTeam($event->course->lecturer->team);
} }
/** /**

View File

@@ -14,6 +14,7 @@ class ParticipantPolicy
* Determine whether the user can view any models. * Determine whether the user can view any models.
* *
* @param \App\Models\User $user * @param \App\Models\User $user
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function viewAny(User $user) public function viewAny(User $user)
@@ -26,17 +27,24 @@ class ParticipantPolicy
* *
* @param \App\Models\User $user * @param \App\Models\User $user
* @param \App\Models\Participant $participant * @param \App\Models\Participant $participant
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function view(User $user, Participant $participant) public function view(User $user, Participant $participant)
{ {
// if ($participant->registrations) {
return $participant->whereHas('registrations.event.course.lecturer',
fn($q) => $q->where('team_id', $user->current_team_id))
->exists();
}
return false;
} }
/** /**
* Determine whether the user can create models. * Determine whether the user can create models.
* *
* @param \App\Models\User $user * @param \App\Models\User $user
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function create(User $user) public function create(User $user)
@@ -49,6 +57,7 @@ class ParticipantPolicy
* *
* @param \App\Models\User $user * @param \App\Models\User $user
* @param \App\Models\Participant $participant * @param \App\Models\Participant $participant
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function update(User $user, Participant $participant) public function update(User $user, Participant $participant)
@@ -61,6 +70,7 @@ class ParticipantPolicy
* *
* @param \App\Models\User $user * @param \App\Models\User $user
* @param \App\Models\Participant $participant * @param \App\Models\Participant $participant
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function delete(User $user, Participant $participant) public function delete(User $user, Participant $participant)
@@ -73,6 +83,7 @@ class ParticipantPolicy
* *
* @param \App\Models\User $user * @param \App\Models\User $user
* @param \App\Models\Participant $participant * @param \App\Models\Participant $participant
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function restore(User $user, Participant $participant) public function restore(User $user, Participant $participant)
@@ -85,6 +96,7 @@ class ParticipantPolicy
* *
* @param \App\Models\User $user * @param \App\Models\User $user
* @param \App\Models\Participant $participant * @param \App\Models\Participant $participant
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function forceDelete(User $user, Participant $participant) public function forceDelete(User $user, Participant $participant)

View File

@@ -14,6 +14,7 @@ class RegistrationPolicy
* Determine whether the user can view any models. * Determine whether the user can view any models.
* *
* @param \App\Models\User $user * @param \App\Models\User $user
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function viewAny(User $user) public function viewAny(User $user)
@@ -26,17 +27,21 @@ class RegistrationPolicy
* *
* @param \App\Models\User $user * @param \App\Models\User $user
* @param \App\Models\Registration $registration * @param \App\Models\Registration $registration
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function view(User $user, Registration $registration) public function view(User $user, Registration $registration)
{ {
// return $registration->whereHas('event.course.lecturer',
fn($q) => $q->where('team_id', $user->current_team_id))
->exists();
} }
/** /**
* Determine whether the user can create models. * Determine whether the user can create models.
* *
* @param \App\Models\User $user * @param \App\Models\User $user
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function create(User $user) public function create(User $user)
@@ -49,6 +54,7 @@ class RegistrationPolicy
* *
* @param \App\Models\User $user * @param \App\Models\User $user
* @param \App\Models\Registration $registration * @param \App\Models\Registration $registration
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function update(User $user, Registration $registration) public function update(User $user, Registration $registration)
@@ -61,6 +67,7 @@ class RegistrationPolicy
* *
* @param \App\Models\User $user * @param \App\Models\User $user
* @param \App\Models\Registration $registration * @param \App\Models\Registration $registration
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function delete(User $user, Registration $registration) public function delete(User $user, Registration $registration)
@@ -73,6 +80,7 @@ class RegistrationPolicy
* *
* @param \App\Models\User $user * @param \App\Models\User $user
* @param \App\Models\Registration $registration * @param \App\Models\Registration $registration
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function restore(User $user, Registration $registration) public function restore(User $user, Registration $registration)
@@ -85,6 +93,7 @@ class RegistrationPolicy
* *
* @param \App\Models\User $user * @param \App\Models\User $user
* @param \App\Models\Registration $registration * @param \App\Models\Registration $registration
*
* @return \Illuminate\Auth\Access\Response|bool * @return \Illuminate\Auth\Access\Response|bool
*/ */
public function forceDelete(User $user, Registration $registration) public function forceDelete(User $user, Registration $registration)