Beobachtungsaufträge

app/Http/Controllers/BlockListController.php

@@ -3,8 +3,11 @@
 namespace App\Http\Controllers;
 
 use App\Models\Course;
+use App\Models\User;
 use App\Util\HtmlString;
+use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Auth;
 
 class BlockListController extends Controller
 {
@@ -20,14 +23,24 @@ public function index(Course $course)
     }
 
     /**
-     * Display the crib page which visualizes connections between blocks and requirements.
+     * Display the crib page which visualizes connections between blocks and requirements, as well as observation assignments.
      *
+     * @param Request $request
      * @param Course $course
+     * @param User $user
      * @return Response
      */
-    public function crib(Course $course)
+    public function crib(Request $request, Course $course, User $user)
     {
-        return view('crib', ['blockManagementLink' => $this->blockManagementLink($course, 't.views.crib.here')]);
+        $userId = $user->id ?? Auth::id();
+        $request->session()->flash('return_url', $request->url());
+        return view('crib', [
+            'blockManagementLink' => $this->blockManagementLink($course, 't.views.crib.here'),
+            'showObservationAssignments' => $course->observationAssignments()->count(),
+            'userId' => $userId,
+            'trainerObservationAssignments' => $course->observationAssignmentsPerUserAndPerBlock()[$userId] ?? [],
+            'neededObservations' => 1,
+        ]);
     }
 
     /**

app/Http/Controllers/ObservationAssignmentController.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\ObservationAssignmentRequest;
+use App\Models\Course;
+use App\Models\ObservationAssignment;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Redirect;
+
+
+class ObservationAssignmentController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index()
+    {
+        return view('admin.observationAssignments.index');
+    }
+
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  ObservationAssignmentRequest $request
+     * @param Course $course
+
+     * @return RedirectResponse
+     */
+    public function store(ObservationAssignmentRequest $request, Course $course)
+    {
+        $data = $request->validated();
+
+        DB::transaction(function() use ($request,$course, $data){
+
+            $observationAssignment = ObservationAssignment::create(array_merge($data, ['course_id' => $course->id]));
+
+            $observationAssignment->participants()->attach(array_filter(explode(',', $data['participants'])));
+            $observationAssignment->blocks()->attach(array_filter(explode(',', $data['blocks'])));
+            $observationAssignment->users()->attach(array_filter(explode(',', $data['users'])));
+
+            $request->session()->flash('alert-success', __('t.views.admin.observation_assignments.create_success'));
+        });
+
+        return Redirect::route('admin.observationAssignments', ['course' => $course->id]);
+
+    }
+
+
+    /**
+     * Show the form for editing the specified resource.
+     * @param Course $course
+     * @param ObservationAssignment $observationAssignment
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Course $course, ObservationAssignment $observationAssignment)
+    {
+        return view('admin.observationAssignments.edit', ['observationAssignment' => $observationAssignment]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     *
+     * @param  ObservationAssignmentRequest  $request
+     * @param  Course $course
+     * @param ObservationAssignment $observationAssignment
+     * @return RedirectResponse
+     */
+    public function update(ObservationAssignmentRequest $request, Course $course, ObservationAssignment $observationAssignment)
+    {
+        DB::transaction(function () use ($request, $course, $observationAssignment) {
+            $data = $request->validated();
+
+            $observationAssignment->update($data);
+            $observationAssignment->participants()->detach(null);
+            $observationAssignment->participants()->attach(array_filter(explode(',', $data['participants'])));
+            $observationAssignment->blocks()->detach(null);
+            $observationAssignment->blocks()->attach(array_filter(explode(',', $data['blocks'])));
+            $observationAssignment->users()->detach(null);
+            $observationAssignment->users()->attach(array_filter(explode(',', $data['users'])));
+            $request->session()->flash('alert-success', __('t.views.admin.observation_assignments.edit_success'));
+        });
+        return Redirect::route('admin.observationAssignments', ['course' => $course->id]);
+
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Request $request
+     * @param Course $course
+     * @param  ObservationAssignment  $observationAssignment
+     * @return RedirectResponse
+     *
+     */
+    public function destroy(Request $request, Course $course, ObservationAssignment $observationAssignment)
+    {
+        $observationAssignment->delete();
+        $request->session()->flash('alert-success', __('t.views.admin.observation_assignments.delete_success'));
+        return Redirect::route('admin.observationAssignments', ['course' => $course->id]);
+
+    }
+}

app/Http/Controllers/ObservationController.php

@@ -25,6 +25,7 @@ class ObservationController extends Controller {
      * @return Response
      */
     public function create(Request $request) {
+        $this->rememberPreviouslyActiveView($request);
         return view('observation.new', ['participants' => $request->input('participant'), 'block' => $request->input('block')]);
     }
 
@@ -51,13 +52,14 @@ public function store(ObservationRequest $request, Course $course) {
                 $participant = $observation->participants()->first();
                 $route = route('participants.detail', ['course' => $course->id, 'participant' => $participant->id]);
                 $flash->s(" <a href=\"{$route}\">")
-                      ->__('t.views.observations.back_to_participant', ['name' => $participant->scout_name])
+                      ->__('t.views.observations.go_to_participant', ['name' => $participant->scout_name])
                       ->s(' <i class="fas fa-arrow-right"></i></a>');
             }
+
             $request->session()->flash('alert-success', $flash);
         });
 
-        return Redirect::route('observation.new', ['course' => $course->id, 'participant' => $data['participants'], 'block' => $data['block']]);
+        return $this->redirectToPreviouslyActiveView($request, $course, collect([]), route('observation.new', ['course' => $course->id, 'participant' => $data['participants'], 'block' => $data['block']]));
     }
 
     /**
@@ -80,6 +82,7 @@ public function edit(Request $request, Course $course, Observation $observation)
      */
     protected function rememberPreviouslyActiveView(Request $request) {
         $returnTo = $this->extractPathParameter(URL::previous(), 'participants.detail', 'participant');
+        $request->session()->keep(['return_url']);
         $request->session()->flash('participant_before_edit', $request->session()->get('participant_before_edit', $returnTo));
     }
 
@@ -90,15 +93,19 @@ protected function rememberPreviouslyActiveView(Request $request) {
      * @param Request $request
      * @param Course $course
      * @param Collection $returnOptions a collection of participant ids that are legal to be viewed
+     * @param string|null $fallback
      * @return RedirectResponse
      */
-    protected function redirectToPreviouslyActiveView(Request $request, Course $course, Collection $returnOptions) {
+    protected function redirectToPreviouslyActiveView(Request $request, Course $course, Collection $returnOptions, $fallback = null) {
+        if ($request->session()->has('return_url')) return Redirect::to($request->session()->get('return_url'));
+
         $returnTo = $request->session()->get('participant_before_edit');
         if (!$returnOptions->contains($returnTo)) {
             $returnTo = $returnOptions->first();
         }
 
-        return Redirect::to(route('participants.detail', ['course' => $course->id, 'participant' => $returnTo]));
+        if ($returnTo) return Redirect::to(route('participants.detail', ['course' => $course->id, 'participant' => $returnTo]));
+        return Redirect::to($fallback ?? URL::previous());
     }
 
     /**

app/Http/Controllers/ParticipantDetailController.php

@@ -2,12 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Category;
 use App\Models\Course;
 use App\Models\Observation;
 use App\Models\Participant;
-use App\Models\Quali;
-use App\Models\Requirement;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 

app/Http/Requests/ObservationAssignmentRequest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Trainer;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Lang;
+
+
+class ObservationAssignmentRequest extends FormRequest {
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize() {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules() {
+        return [
+            'name' => 'required|max:1023',
+            'blocks' => 'required|regex:/^\d+(,\d+)*$/|allExistInCourse',
+            'participants' => 'required|regex:/^\d+(,\d+)*$/|allExistInCourse',
+            'users' => 'required|regex:/^\d+(,\d+)*$/|allExistInCourse:' . Trainer::class . ',user_id'
+        ];
+    }
+
+
+    public function attributes() {
+        return Lang::get('t.models.observation_assignment');
+    }
+}

app/Models/Block.php

@@ -18,6 +18,8 @@
  * @property Collection $requirement_ids
  * @property Course $course
  * @property Observation[] $observations
+ * @property ObservationAssignment[] $observationAssignments
+ * @property Collection $requirements
  * @property Collection $requirementIds
  * @property int $num_observations
  */
@@ -61,6 +63,52 @@ public function course() {
     public function observations() {
         return $this->hasMany('App\Models\Observation');
     }
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function observationsWithParticipants(){
+
+        return $this->hasMany('App\Models\Observation')->with('participants');
+
+    }
+
+
+    public function observationsMultipleParticipantsId(){
+
+        return $this->hasMany('App\Models\Observation')->with('participants:id');
+
+
+    }
+    public function observationsMultipleParticipants(){
+        return $this->observationsMultipleParticipantsId();
+
+        foreach ($o as $obs){
+            $obj=array_push($obs->participants->map(function ($o){
+                return $o->pluck('id');
+            }));
+        }
+        return $obj;
+   $obj->participants->map(function ($participant){return $participant->pluck('id');});
+    }
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
+    public function observationAssignments() {
+        return $this->belongsToMany('App\Models\ObservationAssignment', 'observation_assignment_blocks')->with('users', 'participants');
+    }
+
+
+    public function observationAssignmentsPerUser() {
+        return $this->course->participants()->select(['users.id as user_id', 'participants.*'])->distinct()
+            ->join('observation_assignment_participants', 'participants.id', 'observation_assignment_participants.participant_id')
+            ->join('observation_assignment_users', 'observation_assignment_participants.observation_assignment_id', 'observation_assignment_users.observation_assignment_id')
+            ->join('observation_assignment_blocks', 'observation_assignment_participants.observation_assignment_id', 'observation_assignment_blocks.observation_assignment_id')
+            ->join('users', 'users.id', 'observation_assignment_users.user_id')
+            ->join('trainers', 'users.id', 'trainers.user_id')
+            ->mergeConstraintsFrom($this->course->users()->getQuery())
+            ->where('observation_assignment_blocks.block_id', $this->id)->get()
+            ->groupBy('user_id');
+    }
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany

app/Models/Course.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 
 /**
  * @property int $id
@@ -25,6 +26,8 @@ class Course extends Model {
      * @var array
      */
     protected $fillable = ['name', 'course_number', 'archived'];
+    protected $observationAssignments;
+
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
@@ -60,7 +63,51 @@ public function participantGroups()
     {
         return $this->hasMany('App\Models\ParticipantGroup', 'course_id');
     }
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function observationAssignments()
+    {
+        return $this->hasMany('App\Models\ObservationAssignment', 'course_id');
+    }
+
+    public function observationAssignmentsPerUserAndPerBlock() {
+        if (!$this->observationAssignments) {
+            $observationAssignmentsQuery = ObservationAssignment::select([
+                'users.id as user_id',
+                'observation_assignment_blocks.block_id as block_id',
+                DB::raw('COUNT(DISTINCT observations.id) as observation_count'),
+                'participants.id as participant_id'
+            ])->distinct()
+                ->join('observation_assignment_participants', 'observation_assignments.id', 'observation_assignment_participants.observation_assignment_id')
+                ->join('observation_assignment_users', 'observation_assignments.id', 'observation_assignment_users.observation_assignment_id')
+                ->join('observation_assignment_blocks', 'observation_assignments.id', 'observation_assignment_blocks.observation_assignment_id')
+                ->join('users', 'users.id', 'observation_assignment_users.user_id')
+                ->join('participants', 'participants.id', 'observation_assignment_participants.participant_id')
+                ->leftJoin('observations_participants', 'participants.id', 'observations_participants.participant_id')
+                ->leftJoin('observations', function($join) {
+                    $join->on('observations.id', 'observations_participants.observation_id');
+                    $join->on('observations.block_id', 'observation_assignment_blocks.block_id');
+                    $join->on('observations.user_id', 'users.id');
+                })
+                ->join('trainers', 'users.id', 'trainers.user_id')
+                ->mergeConstraintsFrom($this->users()->getQuery())
+                ->groupBy('user_id', 'block_id', 'participant_id');
 
+            $this->observationAssignments = $this->participants()->select([
+                'query.user_id as user_id',
+                'query.block_id as block_id',
+                'query.observation_count as observation_count',
+                'participants.*'
+            ])->joinSub($observationAssignmentsQuery, 'query', function ($join) {
+                $join->on('participants.id', 'query.participant_id');
+            })->get()
+                ->groupBy('user_id')
+                ->map->groupBy('block_id');
+        }
+
+        return $this->observationAssignments;
+    }
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */