Commit dccf97db authored by Julien Sailly's avatar Julien Sailly
Browse files

Merge branch 'api-test-palanquee' into filters-display

parents 2f641668 1d2148c6

app/Http/Controllers/DivesAPI.php

+8 −1
Original line number Diff line number Diff line
@@ -3,11 +3,18 @@ 
namespace App\Http\Controllers;



use App\Models\DivingSession;

use App\Models\User;



class DivesAPI extends Controller

{

    function getDivers($diveID): array

    {

        return DivingSession::find($diveID)->getParticipants();

        $participants = User::select('*')

            ->join('CAR_REGISTRATION', 'CAR_REGISTRATION.US_ID', '=', 'CAR_USER.US_ID')

            ->join('CAR_DIVING_SESSION', 'CAR_DIVING_SESSION.DS_CODE', '=', 'CAR_REGISTRATION.DS_CODE')

            ->join('CAR_DIVING_LOCATION', 'CAR_DIVING_LOCATION.DL_ID', '=', 'CAR_DIVING_SESSION.DL_ID')

            ->where('CAR_REGISTRATION.DS_CODE', $diveID);

        $participants = $participants->get()->toArray();

        return $participants;

    }

}

app/Http/Controllers/DivesList.php

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace App\Http\Controllers;



use App\Models\DivingGroup;

use App\Models\DivingSession;

use App\Models\Prerogative;

use App\Models\User;

app/Models/DivingSession.php

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ public function getParticipants(): array{ 


        foreach($registrations as $registration){

            if($registration->REG_ACTIVE === 1){

                $participants[] = User::find($registration->US_ID);

                $participants[] = User::find($registration->US_ID)->join('CAR_REGISTRATION', 'CAR_REGISTRATION.US_ID', '=', 'CAR_USER.US_ID')->where('CAR_REGISTRATION.DS_CODE', $this->DS_CODE)->first();

            }

        }

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
        "laravel/framework": "^8.75",

        "laravel/sanctum": "^2.11",

        "laravel/tinker": "^2.5",

        "spipu/html2pdf": "^5.2.8"

        "spipu/html2pdf": "^5.2"

    },

    "require-dev": {

        "facade/ignition": "^2.5",

resources/views/dive_infos_palanque.blade.php

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
                    <ul class="ps-5 mt-2 space-y-1 list-disc list-inside">

                        <li>Directeur de plongée : {{ $director->US_FIRST_NAME . " " . strtoupper($director->US_NAME) }}</li>

                        <li>Sécurité de surface : {{ $security->US_FIRST_NAME . " " . strtoupper($security->US_NAME) }}</li>

                        <li>Créateur de la plongée : {{ $creator->US_FIRST_NAME . " " . strtoupper($creator->US_NAME) }}</li>

                    </ul>

                </li>

                <li>Nombre de plongeurs : {{ $dive->DS_DIVERS_COUNT }}</li>