From c605984db08d76622fb43f61d13ea282576eae85 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 24 Oct 2017 19:21:53 -0700
Subject: [PATCH] =?UTF-8?q?Added=20nicer=20table=20formatting=20for=20?=
 =?UTF-8?q?=E2=80=9Cassets=20checked=20out=20to=20this=20user=E2=80=9D=20t?=
 =?UTF-8?q?able?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/hardware/checkout.blade.php | 43 ++++++++++++++++-----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index f7bb2998ab..d8e8ff6b3b 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -166,7 +166,7 @@ $(function() {
 
         $.ajax({
             type: 'GET',
-            url: '{{url('/') }}/api/v1/users/' + userid + '/assets',
+            url: '{{ url('/') }}/api/v1/users/' + userid + '/assets',
             headers: {
                 "X-Requested-With": 'XMLHttpRequest',
                 "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
@@ -176,20 +176,45 @@ $(function() {
             success: function (data) {
                 $('#current_assets_box').fadeIn();
 
-                var table_html = '<div class="row"><div class="col-md-12"><table class="table table-striped"><thead><tr><td>{{ trans('admin/hardware/form.name') }}</td><td>{{ trans('admin/hardware/form.tag') }}</td></tr></thead><tbody>';
+                var table_html = '<div class="row">';
+                table_html += '<div class="col-md-12">';
+                table_html += '<table class="table table-striped">';
+                table_html += '<thead><tr>';
+                table_html += '<th></th>';
+                table_html += '<th>{{ trans('admin/hardware/form.name') }}</th>';
+                table_html += '<th>{{ trans('admin/hardware/form.tag') }}</th>';
+                table_html += '<th>{{ trans('admin/hardware/form.serial') }}</th>';
+                table_html += '</tr></thead><tbody>';
 
                 $('#current_assets_content').append('');
 
-                for (var i in data) {
-                    var asset = data[i];
-                    table_html += '<tr><td class="col-md-8"><a href="{{ url('/') }}/hardware/' + asset.id + '">' + asset.name;
-                    if (asset.model.name!='') {
-                        table_html += " (" + asset.model.name + ")";
+                if (data.rows.length > 0) {
 
+                    for (var i in data.rows) {
+                        var asset = data.rows[i];
+                        table_html += '<tr>';
+                        if (asset.image != null) {
+                            table_html += '<td class="col-md-1"><a href="' + asset.image + '" data-toggle="lightbox" data-type="image"><img src="' + asset.image + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;"></a></td>';
+                        } else {
+                            table_html += "<td></td> ";
+                        }
+                        table_html += '<td><a href="{{ url('/') }}/hardware/' + asset.id + '">';
+
+                        if ((asset.name == '') && (asset.name != null)) {
+                            table_html += " " + asset.model.name;
+                        } else {
+                            table_html += asset.name;
+                            table_html += " (" + asset.model.name + ")";
+                        }
+
+                        table_html += '</a></td>';
+                        table_html += '<td class="col-md-4">' + asset.asset_tag + '</td>';
+                        table_html += '<td class="col-md-4">' + asset.serial + '</td>';
+                        table_html += "</tr>";
                     }
-                    table_html += "</a></td><td class=\"col-md-4\">" + asset.asset_tag + "</td></tr>";
+                } else {
+                    table_html += '<tr><td colspan="4">No assets checked out to '+ $('.js-data-user-ajax').find('option:selected').text() + ' yet!</td></tr>';
                 }
-
                 $('#current_assets_content').html(table_html + '</tbody></table></div></div>');
 
             },