From 610a773620ffc23826e1adc5484f7d544fa4d40d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 23 May 2017 14:32:21 -0700
Subject: [PATCH] Use activity report for view-assets

---
 resources/views/account/view-assets.blade.php | 47 ++++++++-----------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index fcd43fb99..2a5d3df78 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -224,37 +224,24 @@ View Assets for  {{ $user->present()->fullName() }}
       <div class="box-body">
         @if (count($userlog) > 0)
         <div class="table-responsive">
-          <table class="table table-striped" id="example">
+          <table
+                  class="table table-striped snipe-table"
+                  name="userActivityReport"
+                  id="table"
+                  data-cookie="false"
+                  data-cookie-id-table="userHistoryTable-{{ config('version.hash_version') }}"
+                  data-url="{{route('api.activity.list', ['user_id' => $user->id, 'order' => 'desc']) }}">
             <thead>
-              <tr>
-                <th class="col-md-1"></th>
-                <th class="col-md-2"><span class="line"></span>{{ trans('table.action') }}</th>
-                <th class="col-md-4"><span class="line"></span>{{ trans('general.asset') }}</th>
-                <th class="col-md-2"><span class="line"></span>{{ trans('table.by') }}</th>
-                <th class="col-md-3">{{ trans('general.date') }}</th>
-              </tr>
+            <tr>
+              <th data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"></th>
+              <th class="col-sm-3" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
+              <th class="col-sm-3" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
+              <th class="col-sm-3" data-field="action_type">{{ trans('general.action') }}</th>
+              <th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
+            </tr>
             </thead>
             <tbody>
-              @foreach ($userlog as $log)
-              @php $result = $log->present()->forDataTable();
-              @endphp
-              <tr>
-                <td class="text-center">
-                  {!! $result['icon'] !!}
-                </td>
-                <td>
-                  {{ $result['action_type'] }}
-                </td>
-                <td>
-                  {!! $result['item'] !!}
-                </td>
-                <td>
-                  {!! $result['admin'] !!}
-                </td>
-                <td>{{ $result['created_at'] }}</td>
-              </tr>
-              @endforeach
-            </tbody>
+
           </table>
         </div> <!--.table-responsive-->
 
@@ -272,3 +259,7 @@ View Assets for  {{ $user->present()->fullName() }}
 </div> <!-- .row-->
 
 @stop
+
+@section('moar_scripts')
+  @include ('partials.bootstrap-table')
+@stop