Commit e8e09c61 authored by Julien Ait azzouzene's avatar Julien Ait azzouzene
Browse files

💄 ui: add prerogative to user list when adding to diving

parent 60893621

app/Http/Controllers/AdherentController.php

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ class AdherentController extends Controller 
    static function index($ds_code, $pre_code): View

    {



        $adherents = User::selectRaw('US_FIRST_NAME,US_NAME,US_LICENCE_ID, CAR_USER.US_ID, PRE_MAX_DEPTH')

        $adherents = User::selectRaw('US_FIRST_NAME,US_NAME,US_LICENCE_ID, CAR_USER.US_ID, PRE_MAX_DEPTH, CAR_USER.PRE_CODE')

        ->join('CAR_PREROGATIVE','CAR_PREROGATIVE.PRE_CODE','=','CAR_USER.PRE_CODE')

        ->where('PRE_MAX_DEPTH', '>=', AdherentController::getMaxDepthByPrerogativeCode($pre_code))

        ->get();

app/Http/Controllers/ModificationDives.php

+4 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static function modificationMembers(string $ds_code){ 
            'US_NAME' => $pilote_temp[0]['US_NAME'],

            'US_LICENCE_ID' => $pilote_temp[0]['US_LICENCE_ID'],

            'US_ID' => $pilote_temp[0]['US_ID'],

            'PRE_CODE' => '',

            'ROL_LABEL' => "Pilote"

        ];
@@ -94,6 +95,7 @@ static function modificationMembers(string $ds_code){ 
            'US_NAME' => $securite_temp[0]['US_NAME'],

            'US_LICENCE_ID' => $securite_temp[0]['US_LICENCE_ID'],

            'US_ID' => $securite_temp[0]['US_ID'],

            'PRE_CODE' => '',

            'ROL_LABEL' => "Sécurité de surface"

        ];
@@ -107,10 +109,11 @@ static function modificationMembers(string $ds_code){ 
            'US_NAME' => $directeur_temp[0]['US_NAME'],

            'US_LICENCE_ID' => $directeur_temp[0]['US_LICENCE_ID'],

            'US_ID' => $directeur_temp[0]['US_ID'],

            'PRE_CODE' => '',

            'ROL_LABEL' => "Directeur"

        ];



        $plongeurs = User::selectRaw('US_FIRST_NAME,US_NAME,US_LICENCE_ID, ROL_LABEL, CAR_USER.US_ID')

        $plongeurs = User::selectRaw('US_FIRST_NAME,US_NAME,US_LICENCE_ID, ROL_LABEL, CAR_USER.US_ID, CAR_USER.PRE_CODE')

        ->join('CAR_PREROGATIVE','CAR_PREROGATIVE.PRE_CODE','=','CAR_USER.PRE_CODE')

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

        ->join('CAR_ROLE','CAR_ROLE_ATTRIBUTION.ROL_CODE','=','CAR_ROLE.ROL_CODE')

resources/views/modification_members_of_session.blade.php

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
                <th scope="col" class="px-6 py-4">Prénom</th>

                <th scope="col" class="px-6 py-4">Nom</th>

                <th scope="col" class="px-6 py-4">Rôle</th>

                <th scope="col" class="px-6 py-4">Prérogative</th>

            </tr>

            </thead>

            <tbody>
@@ -20,6 +21,7 @@ 
                    <td class="px-6 py-4">{{ $person['US_NAME'] }}</td>

                    <td class="px-6 py-4">{{ $person['US_FIRST_NAME'] }}</td>

                    <td class="px-6 py-4">{{$person['ROL_LABEL']}}</td>

                    <td class="px-6 py-4">{{$person['PRE_CODE']}}</td>





                    @if($person['ROL_LABEL'] == 'Plongeur')