Skills update

app/Http/Controllers/DemandController.php

@@ -41,8 +41,13 @@ public function index(Request $request): View
         // Collect resources with contracts in the next 12 months
         $resources = Resource::whereIn(
             'id',
-            Contract::whereBetween('start_date', [$startDate, $endDate])
-                ->orWhereBetween('end_date', [$startDate, $endDate])
+            Contract::where(function ($q) use ($startDate, $endDate) {
+                $q->where('start_date', '<=', $endDate)
+                    ->where(function ($q) use ($startDate) {
+                        $q->where('end_date', '>=', $startDate)
+                            ->orWhereNull('end_date');
+                    });
+            })
                 ->pluck('resources_id')
                 ->unique()
                 ->values()

app/Http/Controllers/ResourceController.php

@@ -9,6 +9,8 @@
 use App\Models\Project;
 use App\Models\Leave;
 use App\Models\Resource;
+use App\Models\ResourceSkill;
+use App\Models\Skill;
 use Carbon\Carbon;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -154,7 +156,22 @@ public function show($id): View
     {
         $resource = Resource::find($id);
 
-        return view('resource.show', compact('resource'));
+        // Get the skills for the resource
+        $resourceSkills = ResourceSkill::where('resources_id', $id)
+            ->select('skills_id', 'proficiency_levels')
+            ->pluck( 'proficiency_levels', 'skills_id')
+            ->toArray();
+
+        $skills = Skill::whereIn('id', array_keys($resourceSkills))->get(['id', 'skill_name']);
+        foreach ($resourceSkills as $skillId => $proficiencyLevel) {
+            $resourceSkills[$skillId] = [
+                'proficiency_level' => $proficiencyLevel,
+                'skill_name' => $skills->firstWhere('id', $skillId)->skill_name,
+            ];
+        }
+        $skills = $resourceSkills;
+
+        return view('resource.show', compact('resource', 'skills'));
     }
 
     /**
@@ -213,15 +230,7 @@ public function allocations($id): View
         return view('resource.allocations', compact('resource', 'allocationArray','projects', 'nextTwelveMonths'));
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     */
-    public function edit($id): View
-    {
-        $resource = Resource::find($id);
-
-        return view('resource.edit', compact('resource'));
-    }
+
 
     /**
      * Update the specified resource in storage.

app/Http/Controllers/ResourceSkillController.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\ResourceSkill;
+use App\Models\Skill;
+use App\Models\Resource;
+use App\Models\Contract;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use App\Http\Requests\ResourceSkillRequest;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\View\View;
+use Illuminate\Support\Facades\Log;
+use Carbon\Carbon;
+
+class ResourceSkillController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index(Request $request): View
+    {
+        $resourceSkills = ResourceSkill::paginate();
+
+        return view('resource-skill.index', compact('resourceSkills'))
+            ->with('i', ($request->input('page', 1) - 1) * $resourceSkills->perPage());
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create(Request $request): View
+    {
+        $resourceId = $request->query('id');
+        $resource = null;
+        if ($resourceId) {
+            $resource = Resource::findOrFail($resourceId);
+            // Log::info("resource id = " . $resource->full_name);
+
+            $skills = ResourceSkill::where('resources_id', $resource->id)->get();
+
+            $allSkills = Skill::all();
+            $unassignedSkills = $allSkills->diff($skills);
+            // Log::info("unassigned skills = " . print_r($unassignedSkills, true));
+            $resources = null;
+
+        } else {
+            $resource = new Resource();
+            $resource->id = 0;
+
+            $currentContracts = Contract::where('end_date', '>=', Carbon::today())->pluck('resources_id');
+            $resources = Resource::whereIn('id', $currentContracts)->get();
+
+            $allSkills = Skill::all();
+            $unassignedSkills = $allSkills;
+        }
+
+
+
+        $resourceSkill = new ResourceSkill();
+
+        return view('resource-skill.create', compact('resourceSkill', 'resource', 'unassignedSkills','resources'));
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(ResourceSkillRequest $request): RedirectResponse
+    {
+        ResourceSkill::create($request->validated());
+
+        return Redirect::route('resource-skills.index')
+            ->with('success', 'ResourceSkill created successfully.');
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show($id): View
+    {
+        $resourceSkill = ResourceSkill::find($id);
+
+        return view('resource-skill.show', compact('resourceSkill'));
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id): View
+    {
+        $resourceSkill = ResourceSkill::find($id);
+
+        return view('resource-skill.edit', compact('resourceSkill'));
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(ResourceSkillRequest $request, ResourceSkill $resourceSkill): RedirectResponse
+    {
+        $resourceSkill->update($request->validated());
+
+        return Redirect::route('resource-skills.index')
+            ->with('success', 'ResourceSkill updated successfully');
+    }
+
+    public function destroy($id): RedirectResponse
+    {
+        ResourceSkill::find($id)->delete();
+
+        return Redirect::route('resource-skills.index')
+            ->with('success', 'ResourceSkill deleted successfully');
+    }
+}

app/Http/Controllers/SkillController.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Skill;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use App\Http\Requests\SkillRequest;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\View\View;
+
+class SkillController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index(Request $request): View
+    {
+        $skills = Skill::paginate();
+
+        return view('skill.index', compact('skills'))
+            ->with('i', ($request->input('page', 1) - 1) * $skills->perPage());
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create(): View
+    {
+        $skill = new Skill();
+
+        return view('skill.create', compact('skill'));
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(SkillRequest $request): RedirectResponse
+    {
+        $validated = $request->validated();
+        $validated['sfia_level'] = (int) $validated['sfia_level'];
+
+        Skill::create($validated);
+
+        return Redirect::route('skills.index')
+            ->with('success', 'Skill created successfully.');
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show($id): View
+    {
+        $skill = Skill::find($id);
+
+        return view('skill.show', compact('skill'));
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id): View
+    {
+        $skill = Skill::find($id);
+
+        return view('skill.edit', compact('skill'));
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(SkillRequest $request, Skill $skill): RedirectResponse
+    {
+        $skill->update($request->validated());
+
+        return Redirect::route('skills.index')
+            ->with('success', 'Skill updated successfully');
+    }
+
+    public function destroy($id): RedirectResponse
+    {
+        Skill::find($id)->delete();
+
+        return Redirect::route('skills.index')
+            ->with('success', 'Skill deleted successfully');
+    }
+}

app/Http/Requests/ResourceSkillRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ResourceSkillRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+			'resources_id' => 'required',
+			'skills_id' => 'required',
+			'proficiency_levels' => 'required',
+        ];
+    }
+}

app/Http/Requests/SkillLibraryRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SkillLibraryRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+			'skill_name' => 'required|string',
+			'skill_description' => 'string',
+        ];
+    }
+}

app/Http/Requests/SkillRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SkillRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+			'skill_name' => 'required|string',
+			'skill_description' => 'string',
+			'sfia_code' => 'string',
+            'sfia_level' => 'integer',
+        ];
+    }
+}

app/Http/Resources/ResourceSkillResource.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ResourceSkillResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return parent::toArray($request);
+    }
+}