update readme file

Abdoulrachard · Jul 12, 2024 · ac92b42 · ac92b42
1 parent 4a7004c
commit ac92b42
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 16 deletions.
diff --git a/docs/Capture d’écran (401).png b/docs/Capture d’écran (401).png
diff --git a/docs/user-dashboard.png b/docs/user-dashboard.png
diff --git a/docs/view-timetable.png b/docs/view-timetable.png
diff --git a/resources/views/admin/form/timetable.blade.php b/resources/views/admin/form/timetable.blade.php
@@ -17,11 +17,7 @@
                 <select  id="timetableinput" name="level" class="form-control @error('level') is-invalid @enderror">
                     <option value="" >Choisi une classe</option>
                     @foreach($levels as $level )
-<<<<<<< HEAD
                     <option value="{{ $level->id }}"  @selected(old('level', $timetable->level_id === $level->id))>{{ $level->label }}</option>
-=======
-                    <option value="{{ $level->id }}"  @selected(old('level', $timetable->level === $level->id))>{{ $level->label }}</option>
->>>>>>> aedb544907549f8df0790b40af1a71722d98d9fc
                     @endforeach
                 </select>
                 <div class="invalid-feedback">
@@ -36,11 +32,7 @@
                 <select  id="timetableinput" name="subject" class="form-control @error('subject') is-invalid @enderror">
                     <option value="">Choisi une matière</option>
                     @foreach($subjects as $subject )
-<<<<<<< HEAD
                      <option value="{{ $subject->id }}" @selected( old('subject',$timetable->subject_id === $subject->id))>{{ $subject->label }}</option>
-=======
-                     <option value="{{ $subject->id }}" @selected( old('subject',$timetable->subject === $subject->id))>{{ $subject->label }}</option>
->>>>>>> aedb544907549f8df0790b40af1a71722d98d9fc
                     @endforeach
                 </select>
                 <div class="invalid-feedback">
@@ -56,11 +48,7 @@
                 <select  id="timetableinput" name="teacher" class="form-control @error('teacher') is-invalid @enderror">
                     <option value="">Choisi un proff</option>
                     @foreach($teachers as $teacher )
-<<<<<<< HEAD
                     <option value="{{ $teacher->id }}" @selected(old('teacher',$timetable->user_id === $teacher->id))>{{ $teacher->lastname }} {{ $teacher->firstname }}</option>
-=======
-                    <option value="{{ $teacher->id }}" @selected(old('teacher',$timetable->teacher === $teacher->id))>{{ $teacher->lastname }} {{ $teacher->firstname }}</option>
->>>>>>> aedb544907549f8df0790b40af1a71722d98d9fc
                     @endforeach
                 </select>
                 <div class="invalid-feedback">
@@ -74,11 +62,7 @@
                 <select id="timetableinput" name="classroom" class="form-control @error('classroom') is-invalid @enderror">
                     <option value="">Choisi une salle</option>
                     @foreach($classrooms as $classroom) 
-<<<<<<< HEAD
                         <option value="{{ $classroom->id }}" @selected(old('classroom',$timetable->classroom_id === $classroom->id))>{{ $classroom->label }}</option>
-=======
-                        <option value="{{ $classroom->id }}" @selected(old('classroom',$timetable->classroom === $classroom->id))>{{ $classroom->label }}</option>
->>>>>>> aedb544907549f8df0790b40af1a71722d98d9fc
                     @endforeach
                 </select>
                 <div class="invalid-feedback">