Fix missing section and class id for Routine and Syllabus

Section id and class id were added in seed classes but forgot to add these in forms and uploadcontroller.

Author: changeweb

app/Http/Controllers/RoutineController.php

@@ -20,7 +20,20 @@ public function index()
                         ->bySchool(\Auth::user()->school_id)
                         ->where('active',1)
                         ->get();
-        return view('routines.create',['files'=>$files,'section_id' => 0]);
+        $classes = \App\Myclass::bySchool(\Auth::user()->school->id)
+                        ->get();
+        $classeIds = \App\Myclass::bySchool(\Auth::user()->school->id)
+                        ->pluck('id')
+                        ->toArray();
+        $sections = \App\Section::whereIn('class_id',$classeIds)
+                      ->orderBy('section_number')
+                      ->get();
+        return view('routines.create',[
+          'files'=>$files,
+          'classes'=>$classes,
+          'sections'=>$sections,
+          'section_id' => 0
+        ]);
      }
 
     /**
@@ -37,13 +50,26 @@ public function create(int $section_id)
                           ->where('section_id', $section_id)
                           ->where('active',1)
                           ->get();
+          $classes = \App\Myclass::bySchool(\Auth::user()->school->id)
+                          ->get();
+          $classeIds = \App\Myclass::bySchool(\Auth::user()->school->id)
+                          ->pluck('id')
+                          ->toArray();
+          $sections = \App\Section::whereIn('class_id',$classeIds)
+                        ->orderBy('section_number')
+                        ->get();
         } else {
           return '<code>section_id</code> column missing. Run <code>php artisan migrate</code>';
         }
       } catch(Exception $ex){
         return __('Something went wrong!!');
       }
-      return view('routines.create',['files'=>$files,'section_id'=>$section_id]);
+      return view('routines.create',[
+        'files'=>$files,
+        'classes'=>$classes,
+        'sections'=>$sections,
+        'section_id'=>$section_id
+      ]);
     }
 
     /**

app/Http/Controllers/SyllabusController.php

@@ -20,7 +20,9 @@ public function index()
                           ->bySchool(\Auth::user()->school_id)
                           ->where('active',1)
                           ->get();
-        return view('syllabus.course-syllabus',['files'=>$files,'class_id' => 0]);
+        $classes = \App\Myclass::bySchool(\Auth::user()->school->id)
+                          ->get();
+        return view('syllabus.course-syllabus',['files'=>$files,'classes'=>$classes,'class_id' => 0]);
      }
 
     /**
@@ -37,14 +39,16 @@ public function create(int $class_id)
                           ->where('class_id', $class_id)
                           ->where('active',1)
                           ->get();
+          $classes = \App\Myclass::bySchool(\Auth::user()->school->id)
+                          ->get();
         } else {
           return '<code>class_id</code> column missing. Run <code>php artisan migrate</code>';
         }
       } catch(Exception $ex){
         return 'Something went wrong!!';
       }
 
-      return view('syllabus.course-syllabus',['files'=>$files,'class_id'=>$class_id]);
+      return view('syllabus.course-syllabus',['files'=>$files,'classes'=>$classes,'class_id'=>$class_id]);
     }
 
     /**

app/Http/Controllers/UploadController.php

@@ -66,6 +66,7 @@ public function upload(Request $request){
       $tb->title = $request->title;
       $tb->active = 1;
       $tb->school_id = auth()->user()->school_id;
+      $tb->section_id = $request->section_id;
       $tb->user_id = auth()->user()->id;
       $tb->save();
     } else if($request->upload_type == 'syllabus'){
@@ -77,6 +78,7 @@ public function upload(Request $request){
       $tb->title = $request->title;
       $tb->active = 1;
       $tb->school_id = auth()->user()->school_id;
+      $tb->class_id = $request->class_id;
       $tb->user_id = auth()->user()->id;
       $tb->save();
     } else if($request->upload_type == 'profile' && $request->user_id > 0){

resources/views/components/file-uploader.blade.php

@@ -5,6 +5,28 @@
         <input type="text" class="form-control" name="upload-title" id="upload-title" placeholder="@lang('File title here...')" required>
         <br/>
     @endif
+    @if($upload_type == 'routine')
+        <label for="sections">For</label>
+        <select id="sections" class="form-control" name="sections" required>
+            @foreach($classes as $class)
+                @foreach($class->sections as $section)
+                <option value="{{$section->id}}">
+                    @lang('Class'): {{$class->class_number}} -
+                    @lang('Section'): {{$section->section_number}}
+                </option>
+                @endforeach
+            @endforeach
+        </select>
+    @elseif($upload_type == 'syllabus')
+        <label for="classes">Class</label>
+        <select id="classes" class="form-control" name="classes" required>
+            @foreach($classes as $class)
+            <option value="{{$class->id}}">
+                @lang('Class'): {{$class->class_number}}
+            </option>
+            @endforeach
+        </select>
+    @endif
   <input class="form-control-sm" id="fileupload" type="file"  accept=".xlsx,.xls,.doc,.docx,.ppt,.pptx,.txt,.pdf,image/png,image/jpeg" name="file" data-url="{{url('upload/file')}}">
   <br/>
   <div class="progress">
@@ -61,7 +83,13 @@
                             data.context.text(@json( __('File Upload has been canceled')));
                         });
                         @if($upload_type != 'profile')
-                            data.formData = {upload_type: '{{$upload_type}}',title: $('#upload-title').val()};
+                            @if($upload_type == 'routine')
+                                data.formData = {upload_type: '{{$upload_type}}',section_id:$('#sections').val(),title: $('#upload-title').val()};
+                            @elseif($upload_type == 'syllabus')
+                                data.formData = {upload_type: '{{$upload_type}}',class_id:$('#classes').val(),title: $('#upload-title').val()};
+                            @else
+                                data.formData = {upload_type: '{{$upload_type}}',title: $('#upload-title').val()};
+                            @endif
                         @else
                             data.formData = {upload_type: '{{$upload_type}}',user_id: $('#userIdPic').val()};
                         @endif

resources/views/routines/create.blade.php

@@ -18,7 +18,7 @@
                             {{ session('status') }}
                         </div>
                     @endif
-                    @component('components.file-uploader',['upload_type'=>'routine'])
+                    @component('components.file-uploader',['upload_type'=>'routine','classes'=>$classes,'sections'=>$sections])
                     @endcomponent
                     @component('components.uploaded-files-list',['files'=>$files,'parent'=>($section_id !== 0)?'section':'','upload_type'=>'routine'])
                     @endcomponent

resources/views/syllabus/course-syllabus.blade.php

@@ -21,7 +21,7 @@
                             {{ session('status') }}
                         </div>
                     @endif
-                    @component('components.file-uploader',['upload_type'=>'syllabus'])
+                    @component('components.file-uploader',['upload_type'=>'syllabus','classes'=>$classes])
                     @endcomponent
                     @component('components.uploaded-files-list',['files'=>$files,'parent'=>($class_id !== 0)?'class':'','upload_type'=>'syllabus'])
                     @endcomponent