diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 04f71bec28..2fdde4554f 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -67,10 +67,10 @@ View Assets for {{ $user->present()->fullName() }} {{ $asset->serial }} @if (($asset->image) && ($asset->image!='')) - + @elseif (($asset->model) && ($asset->model->image!='')) - + @endif diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 89eb5354b5..749e530068 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -317,44 +317,7 @@ success: function (data) { var myPieChart = new Chart(ctx,{ type : 'doughnut', - data : { - "labels": [ - "Ready to Deploy (1,273)", - "Pending (50)", - "Archived (50)" - ], - "datasets": [ - { - "data": [ - 1273, - 50, - 50, - ], - "backgroundColor": [ - "#f56954", - "#00a65a", - "#f39c12", - "#00c0ef", - "#3c8dbc", - "#d2d6de", - "#3c8dbc", - "#3c8dbc", - "#3c8dbc" - ], - "hoverBackgroundColor": [ - "#f56954", - "#00a65a", - "#f39c12", - "#00c0ef", - "#3c8dbc", - "#d2d6de", - "#3c8dbc", - "#3c8dbc", - "#3c8dbc" - ] - } - ] -}, + data : data, options: pieOptions }); }, diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php index d110bbcdc1..5bd709b9cf 100755 --- a/resources/views/models/view.blade.php +++ b/resources/views/models/view.blade.php @@ -96,7 +96,7 @@
@if ($model->image) - + @endif diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php index 28e225a7b3..7d0271be7d 100755 --- a/resources/views/suppliers/view.blade.php +++ b/resources/views/suppliers/view.blade.php @@ -278,7 +278,7 @@ @if ($supplier->image!='')
- {{ $supplier->name }} + {{ $supplier->name }}
@endif