View existing report from selected report format

Author: Trodrige

Modules/ReportGenerator/Entities/DraggableComponent.php

@@ -42,6 +42,6 @@ class DraggableComponent extends Model
     */
     public function report_formats()
     {
-        return $this->belongsToMany('Modules\ReportGenerator\Entities\ReportFormat');
+        return $this->belongsToMany('Modules\ReportGenerator\Entities\ReportFormat')->withTimestamps();
     }
 }

Modules/ReportGenerator/Entities/ReportFormat.php

@@ -42,7 +42,7 @@ class ReportFormat extends Model
     */
     public function draggable_components()
     {
-        return $this->belongsToMany('Modules\ReportGenerator\Entities\DraggableComponent');
+        return $this->belongsToMany('Modules\ReportGenerator\Entities\DraggableComponent')->withTimestamps();
     }
 
     /**

Modules/ReportGenerator/Http/Controllers/ReportGeneratorController.php

@@ -111,6 +111,26 @@ public function showReport($option_ids)
         ]);
     }
 
+    /**
+     * Get option_ids for report from selected report_format
+     * @param: Request $report_format_id
+     * @return: showReport($option_ids)
+     */
+     public function view($report_format_id)
+     {
+         $draggable_components = ReportFormat::find($report_format_id)->draggable_components()->get();
+
+         $option_ids = [];
+         foreach ($draggable_components as $draggable_component) {
+             $option_ids[] = $draggable_component->option_id;
+         }
+
+         $option_ids = serialize($option_ids);
+
+         return ReportGeneratorController::showReport($option_ids); // call showReport method above
+
+     }
+
     /**
      * Show the form for creating a new resource.
      * @return Response

Modules/ReportGenerator/Http/routes.php

@@ -4,9 +4,11 @@
 {
     Route::get('/', 'ReportGeneratorController@index');
 
-    Route::get('/generate', 'ReportGeneratorController@getComponents');
+    Route::get('/generate', 'ReportGeneratorController@getComponents'); // get all option_ids for selected components and call the route below
 
-    Route::get('/report/{option_ids}', 'ReportGeneratorController@showReport');
+    Route::get('/report/{option_ids}', 'ReportGeneratorController@showReport')->name('showReport'); // show report from generated report page
+
+    Route::get('/report_format/view/{report_format_id}', 'ReportGeneratorController@view'); // show report from report_format page
 
     /*** System Feature routes ***/
     Route::resource('system_feature', 'SystemFeatureController');

Modules/ReportGenerator/Resources/views/layouts/master.blade.php

@@ -52,10 +52,10 @@
 
                     <a class="nav-link" href="{{ url('reportgenerator/report_format') }}" role="button" aria-haspopup="true" aria-expanded="false"><strong>Report formats</strong></a>
                 </ul>
-                <form class="form-inline my-2 my-lg-0">
+                <!-- <form class="form-inline my-2 my-lg-0">
                   <input class="form-control mr-sm-2" type="search" placeholder="Search system features" aria-label="Search">
                   <button class="btn btn-success my-2 my-sm-0" type="submit">Search</button>
-                </form>
+              </form> -->
             </div>
         </nav><!-- /.navbar -->
         @if(session('error'))

Modules/ReportGenerator/Resources/views/report_formats.blade.php

@@ -20,7 +20,7 @@
                   <td>{{ $report_format->title }}</td>
                   <td>{{ $report_format->description }}</td>
                   <td>
-                      <a class="btn btn-success btn-sm" href="#" role="button" data-toggle="modal" data-target="#view-report-format" data-id="{{ $report_format->id }}" data-title="{{ $report_format->title }}" data-description="{{ $report_format->description }}"> View</a>
+                      <a class="btn btn-success btn-sm" href="{{ url('/reportgenerator/report_format/view/'.$report_format->id) }}" role="button"> View</a>
                       <a class="btn btn-primary btn-sm" href="#" role="button" data-toggle="modal" data-target="#edit-report-format" data-id="{{ $report_format->id }}" data-title="{{ $report_format->title }}" data-description="{{ $report_format->description }}"> Edit</a>
                       <a class="btn btn-danger btn-sm" href="#" role="button" data-toggle="modal" data-target="#delete-report-format" data-id="{{ $report_format->id }}" data-title="{{ $report_format->title }}"> Delete</a>
                   </td>