Added Assets Assigned to tab

Signed-off-by: snipe <snipe@snipe.net>

app/Http/Controllers/Api/LocationsController.php

@@ -27,7 +27,7 @@ class LocationsController extends Controller
         $allowed_columns = [
             'id', 'name', 'address', 'address2', 'city', 'state', 'country', 'zip', 'created_at',
             'updated_at', 'manager_id', 'image',
-            'assigned_assets_count', 'users_count', 'assets_count', 'currency', 'ldap_ou', ];
+            'assigned_assets_count', 'users_count', 'assets_count','assigned_assets_count', 'assets_location_count', 'rtd_assets_count', 'currency', 'ldap_ou', ];
 
         $locations = Location::with('parent', 'manager', 'children')->select([
             'locations.id',
@@ -46,7 +46,8 @@ class LocationsController extends Controller
             'locations.ldap_ou',
             'locations.currency',
         ])->withCount('assignedAssets as assigned_assets_count')
-            ->withCount('assets as assets_count')
+            ->withCount('assets as assets_location_count')
+            ->withCount('rtd_assets as rtd_assets_count')
             ->withCount('users as users_count');
 
         if ($request->filled('search')) {
@@ -156,8 +157,10 @@ class LocationsController extends Controller
                 'locations.currency',
             ])
             ->withCount('assignedAssets as assigned_assets_count')
-            ->withCount('assets as assets_count')
-            ->withCount('users as users_count')->findOrFail($id);
+            ->withCount('assets as assets_location_count')
+            ->withCount('rtd_assets as rtd_assets_count')
+            ->withCount('users as users_count')
+            ->findOrFail($id);
 
         return (new LocationsTransformer)->transformLocation($location);
     }

app/Http/Transformers/LocationsTransformer.php

@@ -44,7 +44,8 @@ class LocationsTransformer
                 'country' => ($location->country) ? e($location->country) : null,
                 'zip' => ($location->zip) ? e($location->zip) : null,
                 'assigned_assets_count' => (int) $location->assigned_assets_count,
-                'assets_count'    => (int) $location->assets_count,
+                'assets_location_count'    => (int) $location->assets_location_count,
+                'rtd_assets_count'    => (int) $location->rtd_assets_count,
                 'users_count'    => (int) $location->users_count,
                 'currency' =>  ($location->currency) ? e($location->currency) : null,
                 'ldap_ou' =>  ($location->ldap_ou) ? e($location->ldap_ou) : null,

app/Presenters/LocationPresenter.php

@@ -51,21 +51,32 @@ class LocationPresenter extends Presenter
             ],
 
             [
-                'field' => 'assets_count',
+                'field' => 'assets_location_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
-                'title' =>  trans('admin/locations/table.assets_rtd'),
+                'title' =>  trans('admin/locations/message.current_location'),
                 'visible' => true,
             ],
+
+            [
+                'field' => 'rtd_assets_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('admin/hardware/form.default_location'),
+                'visible' => false,
+            ],
+
             [
                 'field' => 'assigned_assets_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
-                'title' =>  trans('admin/locations/table.assets_checkedout'),
+                'title' =>  trans('admin/locations/message.assigned_assets'),
                 'visible' => true,
             ],
+
             [
                 'field' => 'users_count',
                 'searchable' => false,

resources/lang/en/admin/locations/message.php

@@ -6,6 +6,8 @@ return array(
     'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+    'assigned_assets' => 'Assigned Assets',
+    'current_location' => 'Current Location',
 
 
     'create' => array(

resources/views/locations/view.blade.php

@@ -37,12 +37,13 @@
                         <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
                     </span>
                     <span class="hidden-xs hidden-sm">
-                          {{ trans('general.assets') }}
+                          {{ trans('admin/locations/message.current_location') }}
                           {!! (($location->assets) && ($location->assets()->AssetsForShow()->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($location->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
                     </span>
                   </a>
               </li>
 
+
               <li>
                   <a href="#rtd_assets" data-toggle="tab">
                     <span class="hidden-lg hidden-md">
@@ -55,6 +56,18 @@
                   </a>
               </li>
 
+              <li>
+                  <a href="#assets_assigned" 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/locations/message.assigned_assets') }}
+                          {!! (($location->rtd_assets) && ($location->assignedAssets()->AssetsForShow()->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($location->assignedAssets()->AssetsForShow()->count()).'</badge>' : '' !!}
+                    </span>
+                  </a>
+              </li>
+
 
               <li>
                   <a href="#accessories" data-toggle="tab">
@@ -127,7 +140,7 @@
               </div><!-- /.tab-pane -->
 
               <div class="tab-pane" id="assets">
-                      <h2 class="box-title">{{ trans('general.assets') }}</h2>
+                      <h2 class="box-title">{{ trans('admin/locations/message.current_location') }}</h2>
 
                       <div class="table table-responsive">
                           @include('partials.asset-bulk-actions')
@@ -158,6 +171,40 @@
                       </div><!-- /.table-responsive -->
               </div><!-- /.tab-pane -->
 
+              <div class="tab-pane" id="assets_assigned">
+                  <h2 class="box-title">
+                      {{ trans('admin/locations/message.assigned_assets') }}
+                  </h2>
+
+                  <div class="table table-responsive">
+                      @include('partials.asset-bulk-actions', ['id_divname' => 'AssignedAssetsBulkEditToolbar', 'id_formname' => 'assignedAssetsBulkForm', 'id_button' => 'AssignedbulkAssetEditButton'])
+                      <table
+                              data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
+                              data-cookie-id-table="assetsAssignedListingTable"
+                              data-pagination="true"
+                              data-id-table="assetsAssignedListingTable"
+                              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="#AssignedAssetsBulkEditToolbar"
+                              data-bulk-button-id="#AssignedbulkAssetEditButton"
+                              data-bulk-form-id="#assignedAssetsBulkForm"
+                              data-click-to-select="true"
+                              id="assetsListingTable"
+                              class="table table-striped snipe-table"
+                              data-url="{{route('api.assets.index', ['assigned_to' => $location->id, 'assigned_type' => \App\Models\Location::class]) }}"
+                              data-export-options='{
+                              "fileName": "export-locations-{{ str_slug($location->name) }}-assets-{{ date('Y-m-d') }}",
+                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                              }'>
+                      </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>