v0.0.13 - Tweaks

web/root/docs/assets.md

@@ -21,7 +21,7 @@
   <div class="col-lg-8">
     <div class="input-group">
       <span class="input-group-btn">
-        <button class="btn btn-primary" type="button" title="Filter Devices" onclick="draw_asset_table()"><span class="fas fa-filter"></span></button>
+        <button class="btn btn-primary" type="button" title="Filter Devices" onclick="draw_asset_table()"><span class="fas fa-search"></span></button>
       </span>
       <input id="asset-filter" type="text" class="form-control" placeholder="Search for...">
       <span class="input-group-btn">

web/root/docs/js/skq-it-am.js

@@ -677,7 +677,11 @@ if (document.getElementById("asset-table")) {
 
       for (a in assets) {
         let asset = {}
-        asset['Asset ID'] = '<span title="'+ a + '">' + a.substring(0, 4) + '..' + a.substring((a.length-5), (a.length-1)) + '</span>'
+        asset['Asset ID'] = '<span title="ITAM ID: '+ a + '">' + a.substring(0, 4) + '..' + a.substring((a.length-5), (a.length-1)) + '</span>'
+        if (assets[a].hasOwnProperty('HW_SERIAL_NUMBER')) {
+          asset['Asset ID'] += "<br>\n" + '<span class="fas fa-tag"></span> <span title="Serial Number: '+ assets[a]['HW_SERIAL_NUMBER'] + '">' + assets[a]['HW_SERIAL_NUMBER'].substring(0, 4) + '..' + assets[a]['HW_SERIAL_NUMBER'].substring((assets[a]['HW_SERIAL_NUMBER'].length-5), (assets[a]['HW_SERIAL_NUMBER'].length-1)) + '</span>'
+        }
+
         asset['Hostname'] = assets[a]['AM_HOSTNAME']
         switch (assets[a]['KERNEL']) {
           case 'Linux':
@@ -721,7 +725,6 @@ if (document.getElementById("asset-table")) {
 
 
         asset['Hardware'] = assets[a]['HW_MAKE'] + '<br>(' + assets[a]['HW_MODEL'] + ')'
-        asset['Serial No.'] = assets[a]['HW_SERIAL_NUMBER']
         asset['Specifications'] = '<span class="fas fa-microchip"></span> ' + assets[a]['HW_CPU_CORES'] + "x " + assets[a]['HW_CPU_MODEL'] + "<br>\n"
         asset['Specifications'] += '<span class="fas fa-memory"></span> ' + assets[a]['HW_RAM_MB'] + " MB RAM<br>\n"
         // asset['Specifications'] += '<span class="fas fa-hdd"></span> ' + "UNKNOWN GB Disk<br>\n"

web/root/site/assets.html

@@ -147,7 +147,7 @@
   <div class="col-lg-8">
     <div class="input-group">
       <span class="input-group-btn">
-        <button class="btn btn-primary" type="button" title="Filter Devices" onclick="draw_asset_table()"><span class="fas fa-filter"></span></button>
+        <button class="btn btn-primary" type="button" title="Filter Devices" onclick="draw_asset_table()"><span class="fas fa-search"></span></button>
       </span>
       <input id="asset-filter" type="text" class="form-control" placeholder="Search for...">
       <span class="input-group-btn">

web/root/site/js/skq-it-am.js

@@ -677,7 +677,11 @@ if (document.getElementById("asset-table")) {
 
       for (a in assets) {
         let asset = {}
-        asset['Asset ID'] = '<span title="'+ a + '">' + a.substring(0, 4) + '..' + a.substring((a.length-5), (a.length-1)) + '</span>'
+        asset['Asset ID'] = '<span title="ITAM ID: '+ a + '">' + a.substring(0, 4) + '..' + a.substring((a.length-5), (a.length-1)) + '</span>'
+        if (assets[a].hasOwnProperty('HW_SERIAL_NUMBER')) {
+          asset['Asset ID'] += "<br>\n" + '<span class="fas fa-tag"></span> <span title="Serial Number: '+ assets[a]['HW_SERIAL_NUMBER'] + '">' + assets[a]['HW_SERIAL_NUMBER'].substring(0, 4) + '..' + assets[a]['HW_SERIAL_NUMBER'].substring((assets[a]['HW_SERIAL_NUMBER'].length-5), (assets[a]['HW_SERIAL_NUMBER'].length-1)) + '</span>'
+        }
+
         asset['Hostname'] = assets[a]['AM_HOSTNAME']
         switch (assets[a]['KERNEL']) {
           case 'Linux':
@@ -721,7 +725,6 @@ if (document.getElementById("asset-table")) {
 
 
         asset['Hardware'] = assets[a]['HW_MAKE'] + '<br>(' + assets[a]['HW_MODEL'] + ')'
-        asset['Serial No.'] = assets[a]['HW_SERIAL_NUMBER']
         asset['Specifications'] = '<span class="fas fa-microchip"></span> ' + assets[a]['HW_CPU_CORES'] + "x " + assets[a]['HW_CPU_MODEL'] + "<br>\n"
         asset['Specifications'] += '<span class="fas fa-memory"></span> ' + assets[a]['HW_RAM_MB'] + " MB RAM<br>\n"
         // asset['Specifications'] += '<span class="fas fa-hdd"></span> ' + "UNKNOWN GB Disk<br>\n"