Merge pull request #12008 from snipe/features/add_default_loc_to_loca…

…tion_view Added default tab to locations
snipe · Oct 21, 2022 · 5acb493 · 5acb493
2 parents 453f2c3 + 515b14a
commit 5acb493
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 16 deletions.
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -33,7 +33,6 @@ public function edit(Request $request)
 
         if (! $request->filled('ids')) {
             return redirect()->back()->with('error', trans('admin/hardware/message.update.no_assets_selected'));
-
         }
 
         // Figure out where we need to send the user after the update is complete, and store that in the session

diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
@@ -43,6 +43,19 @@
                   </a>
               </li>
 
+              <li>
+                  <a href="#rtd_assets" data-toggle="tab">
+                    <span class="hidden-lg hidden-md">
+                        <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
+                    </span>
+                      <span class="hidden-xs hidden-sm">
+                          {{ trans('admin/hardware/form.default_location') }}
+                          {!! (($location->rtd_assets) && ($location->rtd_assets()->AssetsForShow()->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($location->rtd_assets()->AssetsForShow()->count()).'</badge>' : '' !!}
+                    </span>
+                  </a>
+              </li>
+
+
               <li>
                   <a href="#accessories" data-toggle="tab">
                     <span class="hidden-lg hidden-md">
@@ -144,6 +157,38 @@ class="table table-striped snipe-table"
 
                       </div><!-- /.table-responsive -->
               </div><!-- /.tab-pane -->
+
+              <div class="tab-pane" id="rtd_assets">
+                  <h2 class="box-title">{{ trans('admin/hardware/form.default_location') }}</h2>
+
+                  <div class="table table-responsive">
+                      @include('partials.asset-bulk-actions', ['id_divname' => 'RTDassetsBulkEditToolbar', 'id_formname' => 'RTDassets', 'id_button' => 'RTDbulkAssetEditButton'])
+                      <table
+                              data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
+                              data-cookie-id-table="RTDassetsListingTable"
+                              data-pagination="true"
+                              data-id-table="RTDassetsListingTable"
+                              data-search="true"
+                              data-side-pagination="server"
+                              data-show-columns="true"
+                              data-show-export="true"
+                              data-show-refresh="true"
+                              data-sort-order="asc"
+                              data-toolbar="#RTDassetsBulkEditToolbar"
+                              data-bulk-button-id="#RTDbulkAssetEditButton"
+                              data-bulk-form-id="#RTDassetsBulkEditToolbar"
+                              data-click-to-select="true"
+                              id="RTDassetsListingTable"
+                              class="table table-striped snipe-table"
+                              data-url="{{route('api.assets.index', ['rtd_location_id' => $location->id]) }}"
+                              data-export-options='{
+                              "fileName": "export-rtd-locations-{{ str_slug($location->name) }}-assets-{{ date('Y-m-d') }}",
+                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                              }'>
+                      </table>
+
+                  </div><!-- /.table-responsive -->
+              </div><!-- /.tab-pane -->
 
 
 

diff --git a/resources/views/partials/asset-bulk-actions.blade.php b/resources/views/partials/asset-bulk-actions.blade.php
@@ -1,9 +1,10 @@
-<div id="assetsBulkEditToolbar" style="min-width:400px">
-    {{ Form::open([
+<div id="{{ (isset($id_divname)) ? $id_divname : 'assetsBulkEditToolbar' }}" style="min-width:400px">
+{{ Form::open([
       'method' => 'POST',
       'route' => ['hardware/bulkedit'],
       'class' => 'form-inline',
-      'id' => 'assetsBulkForm']) }}
+      'id' => (isset($id_formname)) ? $id_formname : 'assetsBulkForm',
+ ]) }}
 
 
     <label for="bulk_actions">
@@ -21,6 +22,6 @@
         <option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>
     </select>
 
-    <button class="btn btn-primary" id="bulkAssetEditButton" disabled>{{ trans('button.go') }}</button>
+    <button class="btn btn-primary" id="{{ (isset($id_button)) ? $id_button : 'bulkAssetEditButton' }}" disabled>{{ trans('button.go') }}</button>
     {{ Form::close() }}
 </div>
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
@@ -116,32 +116,30 @@ function dateRowCheckStyle(value) {
     // These methods dynamically add/remove hidden input values in the bulk actions form
     $('.snipe-table').on('check.bs.table .btSelectItem', function (row, $element) {
         var buttonName =  $(this).data('bulk-button-id');
-        var formName =  $(this).data('bulk-form-id');
         var tableId =  $(this).data('id-table');
 
         $(buttonName).removeAttr('disabled');
-        $(formName).prepend('<input id="' + tableId + '_checkbox_' + $element.id + '" type="hidden" name="ids[]" value="' + $element.id + '">');
+        $(buttonName).after('<input id="' + tableId + '_checkbox_' + $element.id + '" type="hidden" name="ids[]" value="' + $element.id + '">');
     });
 
-    $('.snipe-table').on('uncheck.bs.table .btSelectItem', function (row, $element) {
-        var tableId =  $(this).data('id-table');
-        $( "#" + tableId + "_checkbox_" + $element.id).remove();
-    });
-
-
-    $('.snipe-table').on('check-all.bs.table', function (event, rowsAfter, rowsBefore) {
+    $('.snipe-table').on('check-all.bs.table', function (event, rowsAfter) {
 
         var buttonName =  $(this).data('bulk-button-id');
         $(buttonName).removeAttr('disabled');
-        var formName =  $(this).data('bulk-form-id');
         var tableId =  $(this).data('id-table');
 
         for (var i in rowsAfter) {
-            $(formName).prepend('<input id="' + tableId + '_checkbox_' + rowsAfter[i].id + '" type="hidden" name="ids[]" value="' + rowsAfter[i].id + '">');
+            $(buttonName).after('<input id="' + tableId + '_checkbox_' + rowsAfter[i].id + '" type="hidden" name="ids[]" value="' + rowsAfter[i].id + '">');
         }
     });
 
 
+    $('.snipe-table').on('uncheck.bs.table .btSelectItem', function (row, $element) {
+        var tableId =  $(this).data('id-table');
+        $( "#" + tableId + "_checkbox_" + $element.id).remove();
+    });
+
+
     // Handle whether or not the edit button should be disabled
     $('.snipe-table').on('uncheck.bs.table', function () {