Commit ae9856a3 authored by LucBUTGH's avatar LucBUTGH
Browse files

Merge branch 'master' of https://forge.info.unicaen.fr/git/but-info-sae3-2024-groupe3

parents 07f9f562 5d32091a

public/js/create_dive.js

+16 −0
Original line number Diff line number Diff line 
    document.addEventListener('DOMContentLoaded', function () {

        var currentDate = new Date();

        var Hour = this.document.getElementById("SelectHour");

        var maxDate = new Date(currentDate.getFullYear(), 11, 1);

        var formattedMaxDate = maxDate.toISOString().split('T')[0];

        var dayInput = document.getElementById('dayInput');

        dayInput.max = formattedMaxDate;

    });



    document.getElementById('dayInput').addEventListener('change', function () {

        var selectedDate = new Date(this.value);

        var dayOfWeek = selectedDate.getDay();



        var selectHour = document.getElementById('SelectHour');



        selectHour.options[1].disabled = false;

        selectHour.options[2].disabled = false;



        if (dayOfWeek === 0) {

            selectHour.options[1].disabled = true;

            selectHour.options[2].disabled = true;

        }

    });

resources/views/components/footer.blade.php

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  <div class='md:flex md:flex-col items-start w-full md:px-12 '>

    <ul class='text-white text-md'>

      <li class=''>Nous Contacter !</li>

      <li class=''>Email - contact@Tiercas.fr</li>

      <li class=''>Email - contact@Carantec.fr</li>

      <li class=''>Tel - 02 30 30 03 30</li>

    </ul>

  </div>

resources/views/create_dive.blade.php

+4 −7
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ 
            @if (isset($previousDives))

                <div id="Historique">

                    <p style="font-size: 35px">Historique de plongées crées</p>

                    <hr

                        style="height: 3px;background-color: black;margin-left: 10%;margin-bottom: 15px;margin-top: 5px; width : 80%">

                    <hr style="height: 3px;background-color: black;margin-left: 10%;margin-bottom: 15px;margin-top: 5px; width : 80%">

                    <table class="arrayhistory">

                        <tr class="history">

                            <th>Date</th>
@@ -56,13 +55,11 @@ class="fa-solid fa-xmark"></i></button></form> 
                        </div>

                        <div class="divideFlexBig Column">

                            @if (isset($precedent))

                                <input class="inputTime" required type="date" name="day" id="dayInput"

                                    value="{{ $precedent->DS_DATE }}">

                                <input class="inputTime" required type="date" name="day" id="dayInput" value="{{ $precedent->DS_DATE }}">

                            @else

                                <input class="inputTime" required type="date" name="day" id="dayInput"

                                    min="<?php echo date('Y-m-d'); ?>" max="" />

                                <input class="inputTime" required type="date" name="day" id="dayInput" min="<?php echo date('Y-m-d'); ?>" max="" />

                            @endif

                            <select required name="hour" id="hour" style="width: 160px; margin-bottom: 15px;">

                            <select id="SelectHour" required name="hour" id="hour" style="width: 160px; margin-bottom: 15px;">

                                <option value="Matin">Matin</option>

                                <option value="Apres-midi">Après midi</option>

                                <option value="Soir">Soir</option>

routes/web.php

+44 −11
Original line number Diff line number Diff line
@@ -13,24 +13,18 @@ 
use App\Http\Controllers\DiveSessionUpdate;

use App\Http\Controllers\HomepageController;

use App\Http\Controllers\DivingNumberController;

use App\Http\Controllers\AdherentController;

use App\Http\Controllers\DivingSignUpController;

use App\Http\Controllers\DiveSessionCreation;

use App\Http\Controllers\ManageAdherentController;

use App\Http\Controllers\DiveSessionDelete;

use App\Http\Controllers\DiveDeletion;

use App\Http\Controllers\DivesListManage;

use App\Http\Controllers\ModificationDives;

use App\Http\Controllers\DiveCreation;

use App\Http\Controllers\SecuritySheets\PreviewStrategy;

use App\Http\Controllers\SecuritySheets\SecuritySheetController;



use App\Http\Controllers\AdherentController;

use App\Http\Controllers\DivingSignUpController;

use App\Http\Controllers\DiveSessionCreation;

use App\Http\Controllers\DiveSessionUpdate;

use App\Http\Controllers\AuthController;

use App\Http\Controllers\ModificationDives;

use Illuminate\Support\Facades\Route;

use Illuminate\Http\Request;

/*

|--------------------------------------------------------------------------

| Web Routes
@@ -185,7 +179,6 @@ 


Route::get('/session/{ds_code}', [DiversBySession::class,'getDiversBySession']);



<<<<<<< HEAD

/**

 * List all the diving sessions of the user, as well as its remaining sessions for the current year.

 */
@@ -226,7 +219,48 @@ 
Route::middleware('App\Http\Middleware\rightChecker')

    ->get('manage/dives', [DivesList::class, 'showManagementList'])

->name('manage_dives_dir');

=======



/**

 * List all the diving sessions of the user, as well as its remaining sessions for the current year.

 */

Route::get('/divings', [DivingNumberController::class, 'index'])->name('divings');



/**

 * Leads to a page that shows each divers and their number and allows to select a period.

 */

Route::get('/alldivings', [DivingNumberController::class, 'allIndex'])->name('alldivings');



/**

 * Leads to a page that show each divers and their number of diving sessions for the selected period (not set by default).

 * @param $afterthe the first day of the filtering period (if unset, the page will show divings until the "before" date)

 * @param $beforethe the last day of the filtering period (if unset, the page will show divings starting from the "after" date)

 */

Route::get('/alldivings?{afterthe}&{beforethe}', [DivingNumberController::class, 'filteredSearch({afterthe}, {beforethe})']);



/**

 * Leads to a page that allows to manage every member and change their roles.

 * Only accessible to the diving section manager.

 */

Route::middleware('App\Http\Middleware\rightChecker')

    ->get('manage/members', [ManageAdherentController::class, 'index'])

    ->name('manage_members');



/**

 * Updates every user's roles.

 * Only accessible to the diving section manager.

 */

Route::middleware('App\Http\Middleware\rightChecker')

    ->post('manage/members/roles', [ManageAdherentController::class, 'update'])

    ->name('updateMembersRole');



Route::middleware('App\Http\Middleware\rightChecker')

    ->get('dive/{id}', [DivesList::class, 'show'])

    ->name('dives_show');



Route::middleware('App\Http\Middleware\rightChecker')

    ->get('manage/dives', [DivesList::class, 'showManagementList'])

->name('manage_dives_dir');



Route::get('/modificationdives', [ModificationDives::class, 'index']);



Route::get('modificationdives/members/{ds_code}', function($ds_code){
@@ -250,4 +284,3 @@ 
});



Route::get('/modificationdives/members/{ds_code}/ajoutadherent/{level}', [AdherentController::class, 'searchByName']);
 
 No newline at end of file
 
>>>>>>> creation-adherent-sur-creneau-de-plongee