diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 4301a47730..12ef1575f8 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -88,84 +88,29 @@

{{ trans('general.recent_activity') }}

- +
- +
- - - - - - + + + + + + - - @if (count($recent_activity) > 0) - @foreach ($recent_activity as $activity) - - - - - - - - - - - - @endforeach - @endif -
{{ trans('general.date') }}{{ trans('general.admin') }}{{ trans('table.actions') }}{{ trans('table.item') }}To{{ trans('general.date') }}{{ trans('general.admin') }}{{ trans('general.action') }}{{ trans('general.item') }}To
- @if ($activity->itemType()=="asset") - - @elseif ($activity->itemType()=="accessory") - - @elseif ($activity->itemType()=="consumable") - - @elseif ($activity->itemType()=="license") - - @elseif ($activity->itemType()=="component") - - @else - - @endif - {{ date("M d, Y g:iA", strtotime($activity->created_at)) }} - @if (($activity->action_type!='requested') && ($activity->action_type!="request_canceled")) - @if ($activity->user) - {{ $activity->user->fullName() }} - @else - Deleted Admin - @endif - @endif - - {{ strtolower(trans('general.'.str_replace(' ','_',$activity->action_type))) }} - - @if (($activity->item) && ($activity->itemType()=="asset")) - {{ $activity->item->asset_tag }} - {{ $activity->item->showAssetName() }} - @elseif ($activity->item) - {{ $activity->item->name }} - @endif - - - @if (($activity->userasassetlog) && ($activity->action_type=="uploaded") && ($activity->itemType()=="user")) - {{ $activity->userasassetlog->fullName() }} - @elseif (($activity->item) && ($activity->target instanceof \App\Models\Asset)) - {{ $activity->target->showAssetName() }} - @elseif (($activity->item) && ($activity->target instanceof \App\Models\User)) - {{ $activity->target->fullName() }} - @elseif ($activity->action_type=='requested') - {{ $activity->user->fullName() }} - @endif - -
@@ -229,8 +174,24 @@ + + + @stop