[statistics] Adapt hw-data parsing to new json format for display

5 files changed, 183 insertions, 58 deletions

diff --git a/modules-available/statistics/templates/hints-hdd-grow.html b/modules-available/statistics/templates/hints-hdd-grow.html
new file mode 100644
index 00000000..dd856700
--- /dev/null
+++ b/modules-available/statistics/templates/hints-hdd-grow.html
@@ -0,0 +1,65 @@
+<h2>{{lang_hddUnused}}</h2>
+
+<p>{{lang_hddUnusedId44}}</p>
+
+<table class="table">
+	<thead>
+	<tr>
+		<th>{{lang_machine}}</th>
+		<th>{{lang_unused}}</th>
+		<th>{lang_id44size}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#id44}}
+	<tr>
+		<td>
+			<a class="slx-bold" href="?do=statistics&amp;uuid={{machineuuid}}">
+				{{hostname}}{{^hostname}}{{clientip}}{{/hostname}}
+			</a>
+			<div class="small">{{machineuuid}}</div>
+		</td>
+		<td>
+			{{unused_s}}
+		</td>
+		<td>
+			{{id44mb_s}}
+		</td>
+	</tr>
+	{{/id44}}
+	</tbody>
+</table>
+
+<p>{{lang_hddUnusedId45}}</p>
+
+<table class="table">
+	<thead>
+	<tr>
+		<th>{{lang_machine}}</th>
+		<th>{{lang_unused}}</th>
+		<th>{lang_id45size}}</th>
+		<th>{lang_id44size}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#id45}}
+	<tr>
+		<td>
+			<a class="slx-bold" href="?do=statistics&amp;uuid={{machineuuid}}">
+				{{hostname}}{{^hostname}}{{clientip}}{{/hostname}}
+			</a>
+			<div class="small">{{machineuuid}}</div>
+		</td>
+		<td>
+			{{unused_s}}
+		</td>
+		<td>
+			{{id45mb_s}}
+		</td>
+		<td>
+			{{id44mb_s}}
+		</td>
+	</tr>
+	{{/id45}}
+	</tbody>
+</table>
\ No newline at end of file
diff --git a/modules-available/statistics/templates/hints-ram-underclocked.html b/modules-available/statistics/templates/hints-ram-underclocked.html
index e1f19c4f..fffd3322 100644
--- a/modules-available/statistics/templates/hints-ram-underclocked.html
+++ b/modules-available/statistics/templates/hints-ram-underclocked.html
@@ -10,7 +10,7 @@
     <th>{lang_speedCurrent}}</th>
     <th>{{lang_speedDesign}}</th>
     <th>{{lang_manufacturer}}</th>
-    <th>{{lang_serialNumber}}</th>
+    <th>{{lang_serialNo}}</th>
   </tr>
   </thead>
   <tbody>
diff --git a/modules-available/statistics/templates/js-pciquery.html b/modules-available/statistics/templates/js-pciquery.html
new file mode 100644
index 00000000..5d4df867
--- /dev/null
+++ b/modules-available/statistics/templates/js-pciquery.html
@@ -0,0 +1,24 @@
+<script>
+	document.addEventListener('DOMContentLoaded', function() {
+		var missing = {{{missing_ids}}};
+		var doQuery = function() {
+			if (missing && missing.length > 0) {
+				$.ajax({
+					url: '?do=statistics', dataType: "json", method: "POST", data: {
+						token: TOKEN,
+						action: 'json-lookup',
+						list: missing.splice(0, 10) // Query 10 at a time max
+					}
+				}).done(function (data) {
+					if (!data)
+						return;
+					for (var k in data) {
+						$('.query-' + k.replace(':', '-')).text(data[k]);
+					}
+					doQuery();
+				});
+			}
+		}
+		doQuery();
+	});
+</script>
\ No newline at end of file
diff --git a/modules-available/statistics/templates/machine-hdds.html b/modules-available/statistics/templates/machine-hdds.html
index 4d0409f9..84feccfd 100644
--- a/modules-available/statistics/templates/machine-hdds.html
+++ b/modules-available/statistics/templates/machine-hdds.html
@@ -4,24 +4,27 @@
 		<div class="col-md-6">
 			<div class="panel panel-default">
 				<div class="panel-heading">
-					<b>{{s_ModelFamily}}</b> {{dev}}
+					<b>{{model_family}}{{^model_family}}{{model}}{{/model_family}}</b> {{dev}}
 				</div>
 				<div class="panel-body">
-					{{#s_DeviceModel}}
-					<div>{{lang_modelNo}}: {{s_DeviceModel}}, {{lang_serialNo}}: {{s_SerialNumber}}</div>
-					{{/s_DeviceModel}}
-					{{#s_ReallocatedSectorCt}}
-					<div class="red">{{lang_reallocatedSectors}}: {{s_ReallocatedSectorCt}}</div>
-					{{/s_ReallocatedSectorCt}}
-					{{#s_CurrentPendingSector}}
-					<div class="red">{{lang_pendingSectors}}: {{s_CurrentPendingSector}}</div>
-					{{/s_CurrentPendingSector}}
-					{{#s_PowerOnHours}}
-					<div>{{lang_powerOnTime}}: {{s_PowerOnHours}}&thinsp;{{lang_hours}} ({{PowerOnTime}})</div>
-					{{/s_PowerOnHours}}
-					{{#s_MediaandDataIntegrityErrors}}
-					<div class="red">{{lang_mediaIntegrityErrors}}: {{s_MediaandDataIntegrityErrors}}</div>
-					{{/s_MediaandDataIntegrityErrors}}
+					{{#model}}
+					<div>{{lang_modelNo}}: {{model}}, {{lang_serialNo}}: {{serial_number}}</div>
+					{{/model}}
+					{{#smart_status_failed}}
+					<div class="red">{{lang_smartSelfTestFailed}}</div>
+					{{/smart_status_failed}}
+					{{#attr_5.raw}}
+					<div class="red">{{lang_reallocatedSectors}}: {{attr_5.raw}}</div>
+					{{/attr_5.raw}}
+					{{#attr_197.raw}}
+					<div class="red">{{lang_pendingSectors}}: {{attr_197.raw}}</div>
+					{{/attr_197.raw}}
+					{{#PowerOnTime}}
+					<div>{{lang_powerOnTime}}: {{PowerOnTime}}</div>
+					{{/PowerOnTime}}
+					{{#media_errors}}
+					<div class="red">{{lang_mediaIntegrityErrors}}: {{media_errors}}</div>
+					{{/media_errors}}
 					<div class="row">
 						<div class="col-sm-7">
 							<table class="table table-condensed table-striped table-responsive">
@@ -32,13 +35,16 @@
 								</tr>
 								{{#partitions}}
 									<tr id="{{id}}">
+										<td>{{index}}</td>
+										<td class="text-right text-nowrap">{{size_s}}</td>
 										<td>{{name}}</td>
-										<td class="text-right text-nowrap">{{size}}&thinsp;GiB</td>
-										<td>{{type}}</td>
 									</tr>
 								{{/partitions}}
 							</table>
-							<div class="slx-bold">{{lang_total}}: {{size}}&thinsp;GiB</div>
+							<div class="slx-bold">{{lang_total}}: {{size_s}}</div>
+							{{#unused_s}}
+							<div class="slx-bold">{{lang_unused}}: {{unused_s}}</div>
+							{{/unused_s}}
 						</div>
 						<div class="col-sm-5">
 							<canvas id="{{devid}}-chart" style="width:100%;height:250px"></canvas>
@@ -46,7 +52,7 @@
 								document.addEventListener("DOMContentLoaded", function() {
 									var data = {{{json}}};
 									var sel = false;
-									new Chart(document.getElementById('{{devid}}-chart').getContext('2d')).Pie(data, { 
+									new Chart(document.getElementById('{{devid}}-chart').getContext('2d')).Pie(data, {
 										animation: false,
 										tooltipTemplate: "<%if (label){%><%=label%><%}%>",
 										customTooltips: function(tooltip) {
diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html
index 568099e0..71df723d 100644
--- a/modules-available/statistics/templates/machine-main.html
+++ b/modules-available/statistics/templates/machine-main.html
@@ -220,11 +220,11 @@
 						<td class="text-nowrap">{{lang_cpuModel}}</td>
 						<td>
 							{{cpumodel}}
-							{{#Sockets}}
+							{{#cpu.sockets}}
 							<div class="small">
-								{{lang_sockets}}: {{Sockets}}, {{lang_cores}}: {{Realcores}}, {{lang_virtualCores}}: {{Virtualcores}}
+								{{lang_sockets}}: {{cpu.sockets}}, {{lang_cores}}: {{cpu.cores}}, {{lang_virtualCores}}: {{cpu.threads}}
 							</div>
-							{{/Sockets}}
+							{{/cpu.sockets}}
 							{{#live_cpuload_s}}
 							<div class="meter">
 								<div class="text left">{{lang_cpuload}}</div>
@@ -243,13 +243,12 @@
 					</tr>
 					<tr>
 						<td class="text-nowrap">{{lang_pcmodel}}</td>
-						<td>{{pcmodel}} ({{pcmanufacturer}})</td>
+						<td>{{system.Product Name}} ({{system.Manufacturer}})</td>
 					</tr>
 					<tr>
 						<td class="text-nowrap">{{lang_mobomodel}}</td>
-						<td>{{mobomodel}} ({{mobomanufacturer}})</td>
+						<td>{{mainboard.Product Name}} ({{mainboard.Manufacturer}})</td>
 					</tr>
-					{{#biosdate}}
 					<tr>
 						<td class="text-nowrap">
 							<div>{{lang_biosVersion}}</div>
@@ -257,19 +256,23 @@
 						</td>
 						<td class="text-nowrap">
 							<div id="bios-panel" class="pull-right"style="max-width:30%">{{{bioshtml}}}</div>
-							<div>{{biosversion}} (<b>{{biosrevision}}</b>)</div>
-							<div>{{biosdate}}</div>
+							<div>{{bios.Version}} (<b>{{bios.BIOS Revision}}</b>)</div>
+							<div>{{bios.Release Date}}</div>
 						</td>
 					</tr>
-					{{/biosdate}}
 					<tr class="{{ramclass}}">
 						<td class="text-nowrap">{{lang_ram}}</td>
 						<td>
 							<div>
 								{{gbram}}&thinsp;GiB
-								{{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}}
-								{{ramtype}}
+								{{#Memory Maximum Capacity}}
+								/ {{lang_maximumAbbrev}} {{Memory Maximum Capacity}}
+								{{/Memory Maximum Capacity}}
+								{{#Memory Slot Count}}
+								({{Memory Slot Count}} {{lang_slots}})
+								{{/Memory Slot Count}}
 							</div>
+							<div>{{ramtype}}</div>
 							{{#live_memsize}}
 							<div class="meter">
 								<div class="text left">{{lang_ram}}</div>
@@ -286,17 +289,36 @@
 							{{/live_swapsize}}
 						</td>
 					</tr>
-					{{#extram}}
 					<tr>
-						<td class="text-nowrap">{{lang_ramSlots}}</td>
-						<td>
-							{{ramslotcount}}:
-							{{#ramslot}}
-							[ <span title="{{manuf}}">{{size}}</span> ]
-							{{/ramslot}}
+						<td colspan="2">
+							<table class="table-responsive slx-table text-nowrap">
+								<thead>
+								<tr class="small">
+									<td>{{lang_slot}}</td>
+									<td></td>
+									<td>{{lang_speed}}</td>
+									<td>{{lang_manufacturer}}</td>
+									<td>{{lang_serialNo}}</td>
+								</tr>
+								</thead>
+							{{#ram}}
+								{{#Speed}}
+								<tr>
+									<td>
+										{{Locator}},
+										{{Bank Locator}}
+										{{^Bank Locator}}{{#Set}}Set {{Set}}{{/Set}}{{/Bank Locator}}
+									</td>
+									<td class="slx-bold">{{Size}}</td>
+									<td>{{#Configured Memory Speed}}{{Configured Memory Speed}} / {{/Configured Memory Speed}}{{Speed}}</td>
+									<td>{{Manufacturer}}</td>
+									<td>{{Serial Number}}</td>
+								</tr>
+								{{/Speed}}
+							{{/ram}}
+							</table>
 						</td>
 					</tr>
-					{{/extram}}
 					<tr class="{{hddclass}}">
 						<td class="text-nowrap">{{lang_tempPart}}</td>
 						<td>
@@ -304,11 +326,19 @@
 									{{gbtmp}}&thinsp;GiB
 							</div>
 							{{#live_tmpsize}}
-								<div class="meter">
-									<div class="text right">{{live_tmpfree_s}} {{lang_free}}</div>
-									<div class="bar" style="width:{{live_tmppercent}}%"></div>
-								</div>
+							<div class="meter">
+								<div class="text right">{{live_tmpfree_s}} {{lang_free}}</div>
+								<div class="bar" style="width:{{live_tmppercent}}%"></div>
+							</div>
 							{{/live_tmpsize}}
+						</td>
+					</tr>
+					<tr>
+						<td class="text-nowrap">{{lang_persistentPart}}</td>
+						<td>
+							<div>
+								{{gbid45}}&thinsp;GiB
+							</div>
 							{{#live_id45size}}
 							<div class="meter">
 								<div class="text right">{{live_id45free_s}} {{lang_free}}</div>
@@ -362,16 +392,26 @@
 				</table>
 				<h4>{{lang_devices}}</h4>
 				{{#lspci1}}
-				<div><span class="{{lookupClass}}">{{class}}</span></div>
+				<div><span>{{class_s}}</span></div>
 				{{#entries}}
-				<div class="small">&emsp;└ <span class="{{lookupVen}}">{{ven}}</span> <span class="{{lookupDev}}">{{dev}}</span></div>
+				<div class="small">
+					&emsp;└
+					<span{{^vendor_s}} class="query-{{vendor}}"{{/vendor_s}}>{{vendor_s}}</span>
+					<span{{^device_s}} class="query-{{vendor}}-{{device}}"{{/device_s}}>{{device_s}}</span>
+					<span>[{{vendor}}:{{device}}]</span>
+				</div>
 				{{/entries}}
 				{{/lspci1}}
 				<div id="lspci" class="collapse">
 					{{#lspci2}}
-						<div><span class="{{lookupClass}}">{{class}}</span></div>
+					<div><span>{{class_s}}</span></div>
 					{{#entries}}
-						<div class="small">&emsp;└ <span class="{{lookupVen}}">{{ven}}</span> <span class="{{lookupDev}}">{{dev}}</span></div>
+					<div class="small">
+						&emsp;└
+						<span{{^vendor_s}} class="query-{{vendor}}"{{/vendor_s}}>{{vendor_s}}</span>
+						<span{{^device_s}} class="query-{{vendor}}-{{device}}"{{/device_s}}>{{device_s}}</span>
+						<span>[{{vendor}}:{{device}}]</span>
+					</div>
 					{{/entries}}
 					{{/lspci2}}
 				</div>
@@ -380,13 +420,3 @@
 		</div>
 	</div>
 </div>
-<script type="application/javascript"><!--
-document.addEventListener("DOMContentLoaded", function () {
-	$('span.do-lookup').each(function () {
-		$(this).load('?do=statistics&lookup=' + $(this).text());
-	});
-	{{#biosurl}}
-	$('#bios-panel').load('{{{biosurl}}}');
-	{{/biosurl}}
-}, false);
-// --></script>