hiding save report format button when showing existing report

Trodrige · Trodrige · commit 00a4f2217d38 · 2018-07-23T18:42:20.000+01:00
diff --git a/Modules/ReportGenerator/Http/Controllers/ReportFormatController.php b/Modules/ReportGenerator/Http/Controllers/ReportFormatController.php
@@ -134,6 +134,7 @@ public function update(Request $request)
 
         $report_format->title = $request->title;
         $report_format->description = $request->description;
+        $report_format->system_feature_id = $request->system_feature_id;
         $report_format->save();
 
         if(!$report_format){ // If for some reason system feature isn't created, fire error message
diff --git a/Modules/ReportGenerator/Http/Controllers/ReportGeneratorController.php b/Modules/ReportGenerator/Http/Controllers/ReportGeneratorController.php
@@ -62,19 +62,20 @@ public function getComponents(Request $request)
 
         $option_ids = serialize($option_ids);
         return response()->json([
-            'redirecturl' => $protocol_host.'/reportgenerator/report/'.$option_ids,
+            'option_ids' => $option_ids,
             'success' => 'Received Option IDs',
-            'option_ids' => $option_ids
+            'redirecturl' => $protocol_host.'/reportgenerator/report/'.$option_ids
         ]);
     }
 
     /**
      * Use option_ids from getComponents() above,
      * get data and show the generated report.
      * @param Array $option_ids : selected draggable_components
+     * @param Boolean $hide: hide or show 'Save report format' button
      * @return Response $data : holds retrieved data
      */
-    public function showReport($option_ids)
+    public function showReport($option_ids, $hide = False)
     {
         $option_ids = unserialize($option_ids);
         $notes = []; // store the notes for each dragged component.
@@ -99,14 +100,15 @@ public function showReport($option_ids)
         }
 
         // These are used in menu and the select field in the form to add new report format
-        $system_features = SystemFeature::all();
         $report_formats = ReportFormat::all();
+        $system_features = SystemFeature::all();
 
         return view('reportgenerator::report')->with([
                 'data' => $data,
+                'hide' => $hide,
                 'column_names' => $column_names,
-                'system_features' => $system_features,
                 'report_formats' => $report_formats,
+                'system_features' => $system_features,
                 'option_ids' => serialize($option_ids)
         ]);
     }
@@ -121,13 +123,13 @@ public function view($report_format_id)
          $draggable_components = ReportFormat::find($report_format_id)->draggable_components()->get();
 
          $option_ids = [];
-         foreach ($draggable_components as $draggable_component) {
+         foreach ($draggable_components as $draggable_component) { // Get the option_ids of each $draggable_component
              $option_ids[] = $draggable_component->option_id;
          }
 
-         $option_ids = serialize($option_ids);
+         $option_ids = serialize($option_ids); // serialize option_ids in preparation for showReport method
 
-         return ReportGeneratorController::showReport($option_ids); // call showReport method above
+         return ReportGeneratorController::showReport($option_ids, True); // call showReport method above
 
      }
 
diff --git a/Modules/ReportGenerator/Resources/views/layouts/master.blade.php b/Modules/ReportGenerator/Resources/views/layouts/master.blade.php
@@ -43,7 +43,7 @@
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ $system_feature->name }}</a>
                             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                                 @foreach($system_feature->report_formats as $report_format)
-                                    <a class="dropdown-item" href="#">{{ $report_format->title }}</a>
+                                    <a class="dropdown-item" href="{{ url('/reportgenerator/report_format/view/'.$report_format->id) }}">{{ $report_format->title }}</a>
                                 @endforeach
                             </div>
                         </li>
@@ -191,6 +191,14 @@
                             {{ method_field('PATCH') }}
                             <input type="hidden" name="_token" id="csrf-token" value="{{ Session::token() }}" />
                             <div class="form-group"><input type="hidden" name="id" id="id"></div>
+                            <div class="form-group">
+                                <label for="system_feature_name">Select system feature</label>
+                                <select class="form-control" name="system_feature_id" id="system_feature_id">
+                                    @foreach($system_features as $system_feature)
+                                        <option value="{{ $system_feature->id }}">{{ $system_feature->name }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
                             <div class="form-group">
                                 <label for="title">Title</label>
                                 <input type="text" name="title" class="form-control" id="title" placeholder="Enter title">
@@ -206,7 +214,7 @@
                     </div>
                 </div>
             </div>
-        </div><!-- /#edit-system-feature -->
+        </div><!-- /#edit-report-format -->
 
         <!-- Delete report format modal-->
         <div class="modal fade" id="delete-report-format" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
diff --git a/Modules/ReportGenerator/Resources/views/report.blade.php b/Modules/ReportGenerator/Resources/views/report.blade.php
@@ -12,7 +12,9 @@
     </button>
     <div class="collapse navbar-collapse" id="navbarSupportedButtons">
         <ul class="navbar-nav mr-auto" style="margin-left: 500px !important">
-            <button type="button" class="btn btn-info" data-toggle="modal" data-target="#add-report-format">Save report as</button>&nbsp;
+            @if(!$hide)
+                <button type="button" class="btn btn-info" data-toggle="modal" data-target="#add-report-format">Save report as</button>&nbsp;
+            @endif
             <button type="button" class="btn btn-info" onclick="printReport('report_div')">Print</button>&nbsp;
             <button type="button" class="btn btn-info" data-toggle="modal" data-target="#add-system-feature">PDF</button>&nbsp;
             <button type="button" class="btn btn-info" data-toggle="modal" data-target="#add-system-feature">TXT</button>&nbsp;
diff --git a/Modules/ReportGenerator/Resources/views/report_formats.blade.php b/Modules/ReportGenerator/Resources/views/report_formats.blade.php
@@ -10,6 +10,7 @@
                 <th scope="col">#</th>
                 <th scope="col">Title</th>
                 <th scope="col">Description</th>
+                <th scope="col">System Feature</th>
                 <th scope="col">Actions</th>
             </tr>
         </thead>
@@ -19,9 +20,11 @@
                   <th scope="row">{{ $report_format->id }}</th>
                   <td>{{ $report_format->title }}</td>
                   <td>{{ $report_format->description }}</td>
+                  <td>{{ $report_format->system_feature->name }}</td>
+
                   <td>
                       <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-primary btn-sm" href="#" role="button" data-toggle="modal" data-target="#edit-report-format" data-id="{{ $report_format->id }}" data-system-feature-name= "{{ $report_format->system_feature->name }}" 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>
                 </tr>
diff --git a/public/assets/js/master.js b/public/assets/js/master.js
@@ -128,6 +128,7 @@ $(document).ready(function() {
     $('#edit-report-format').on('show.bs.modal', function(e){
         $('#edit-report-format #title').val($(e.relatedTarget).data('title'));
         $('#edit-report-format #description').val($(e.relatedTarget).data('description'));
+        $('#edit-report-format #system_feature_id').select($(e.relatedTarget).data('system_feature_id'));
         $('#edit-report-format-form').submit(function(){
             var id = $('#edit-report-format #id').val($(e.relatedTarget).data('id'));
             $("#edit-report-format-form").attr("action", "report_format/" + id);
