Skip to content

Commit f2a4d09

Browse files
authored
Merge pull request #89 from SenaxInc/copilot/modify-website-preview-columns
Remove Client, %Full, Status columns; add 24hr Change column; change level to ft/in format
2 parents a6ac585 + c58be22 commit f2a4d09

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

TankAlarm-112025-Viewer-BluesOpta/TankAlarm-112025-Viewer-BluesOpta.ino

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,10 @@ static const char VIEWER_DASHBOARD_HTML[] PROGMEM = R"HTML(
235235
<table>
236236
<thead>
237237
<tr>
238-
<th>Client</th>
239238
<th>Site</th>
240239
<th>Tank</th>
241-
<th>Level (in)</th>
242-
<th>% Full</th>
243-
<th>Status</th>
240+
<th>Level (ft/in)</th>
241+
<th>24hr Change</th>
244242
<th>Updated</th>
245243
</tr>
246244
</thead>
@@ -374,20 +372,18 @@ static const char VIEWER_DASHBOARD_HTML[] PROGMEM = R"HTML(
374372
const rows = state.selected ? state.tanks.filter(t => t.client === state.selected) : state.tanks;
375373
if (!rows.length) {
376374
const tr = document.createElement('tr');
377-
tr.innerHTML = '<td colspan="7">No tank data available</td>';
375+
tr.innerHTML = '<td colspan="5">No tank data available</td>';
378376
tbody.appendChild(tr);
379377
return;
380378
}
381379
rows.forEach(tank => {
382380
const tr = document.createElement('tr');
383381
if (tank.alarm) tr.classList.add('alarm');
384382
tr.innerHTML = `
385-
<td><code>${escapeHtml(tank.client, '--')}</code></td>
386383
<td>${escapeHtml(tank.site, '--')}</td>
387384
<td>${escapeHtml(tank.label || 'Tank')} #${escapeHtml((tank.tank ?? '?'))}</td>
388-
<td>${formatNumber(tank.levelInches)}</td>
389-
<td>${formatNumber(tank.percent)}</td>
390-
<td>${statusBadge(tank)}</td>
385+
<td>${formatFeetInches(tank.levelInches)}</td>
386+
<td>--</td>
391387
<td>${formatEpoch(tank.lastUpdate)}</td>`;
392388
tbody.appendChild(tr);
393389
});
@@ -401,8 +397,11 @@ static const char VIEWER_DASHBOARD_HTML[] PROGMEM = R"HTML(
401397
return `<span class="status-pill alarm">${label}</span>`;
402398
}
403399
404-
function formatNumber(val) {
405-
return (typeof val === 'number' && isFinite(val)) ? val.toFixed(1) : '--';
400+
function formatFeetInches(inches) {
401+
if (typeof inches !== 'number' || !isFinite(inches) || inches < 0) return '--';
402+
const feet = Math.floor(inches / 12);
403+
const remainingInches = inches - (feet * 12);
404+
return `${feet}' ${remainingInches.toFixed(1)}"`;
406405
}
407406
408407
function formatEpoch(epoch) {

0 commit comments

Comments
 (0)