diff --git a/lib/proportions.js b/lib/proportions.js index 4d2125ab..7c024651 100644 --- a/lib/proportions.js +++ b/lib/proportions.js @@ -10,6 +10,8 @@ define(['d3-interpolate', 'snabbdom', 'utils/version', 'filters/genericnode', 'h var statusTable; var fwTable; + var baseTable; + var depTable; var hwTable; var geoTable; var autoTable; @@ -96,6 +98,10 @@ define(['d3-interpolate', 'snabbdom', 'utils/version', 'filters/genericnode', 'h return d ? 'online' : 'offline'; }); var fwDict = count(nodes, ['firmware', 'release']); + var baseDict = count(nodes, ['firmware', 'base']); + var deprecationDict = count(nodes, ['model'], function (d) { + return config.deprecated && d && config.deprecated.includes(d) ? _.t('yes') : _.t('no'); + }); var hwDict = count(nodes, ['model']); var geoDict = count(nodes, ['location'], function (d) { return d && d.longitude && d.latitude ? _.t('yes') : _.t('no'); @@ -124,6 +130,10 @@ define(['d3-interpolate', 'snabbdom', 'utils/version', 'filters/genericnode', 'h return b[1] - a[1]; })); fwTable = fillTable('node.firmware', fwTable, fwDict.sort(versionCompare)); + baseTable = fillTable('node.baseversion', baseTable, baseDict.sort(versionCompare)); + depTable = fillTable('node.deprecationStatus', depTable, deprecationDict.sort(function (a, b) { + return b[1] - a[1]; + })); hwTable = fillTable('node.hardware', hwTable, hwDict.sort(function (a, b) { return b[1] - a[1]; })); @@ -147,6 +157,8 @@ define(['d3-interpolate', 'snabbdom', 'utils/version', 'filters/genericnode', 'h self.render = function render(el) { self.renderSingle(el, 'node.status', statusTable); self.renderSingle(el, 'node.firmware', fwTable); + self.renderSingle(el, 'node.baseversion', baseTable); + self.renderSingle(el, 'node.deprecationStatus', depTable); self.renderSingle(el, 'node.hardware', hwTable); self.renderSingle(el, 'node.visible', geoTable); self.renderSingle(el, 'node.update', autoTable); diff --git a/locale/cz.json b/locale/cz.json index e1e74387..43caff47 100644 --- a/locale/cz.json +++ b/locale/cz.json @@ -14,6 +14,8 @@ "deactivated": "deaktivováno", "status": "Stav", "firmware": "Verze firmwaru", + "baseversion": "Base version", + "deprecationStatus": "Deprecation Status", "hardware": "Model hardwaru", "visible": "Visible on the map", "update": "Automatický update", diff --git a/locale/de.json b/locale/de.json index e4802196..7738fc4c 100644 --- a/locale/de.json +++ b/locale/de.json @@ -14,6 +14,8 @@ "deactivated": "deaktiviert", "status": "Status", "firmware": "Firmware-Version", + "baseversion": "Base Version", + "deprecationStatus": "Veralterungsstatus", "hardware": "Geräte-Modell", "visible": "Auf der Karte sichtbar", "update": "Auto-Update", diff --git a/locale/en.json b/locale/en.json index 77342a96..9d7329cd 100644 --- a/locale/en.json +++ b/locale/en.json @@ -14,6 +14,8 @@ "deactivated": "deactivated", "status": "Status", "firmware": "Firmware version", + "baseversion": "Base version", + "deprecationStatus": "Deprecation Status", "hardware": "Hardware model", "visible": "Visible on the map", "update": "Auto update", diff --git a/locale/fr.json b/locale/fr.json index 4dc6a204..577ebd56 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -14,6 +14,8 @@ "deactivated": "désactivé", "status": "Statut", "firmware": "Version firmware", + "baseversion": "Base version", + "deprecationStatus": "Deprecation Status", "hardware": "Modèle matériel", "visible": "Visible sur la carte", "update": "Mise à jour automatique", diff --git a/locale/ru.json b/locale/ru.json index ecf388a7..3794edb0 100644 --- a/locale/ru.json +++ b/locale/ru.json @@ -14,6 +14,8 @@ "deactivated": "деактивировано", "status": "Статус", "firmware": "Версия прошивки", + "baseversion": "Base version", + "deprecationStatus": "Deprecation Status", "hardware": "Тип оборудования", "visible": "Видно на карте", "update": "Автообновление", diff --git a/locale/tr.json b/locale/tr.json index bab9c0e7..ff61e501 100644 --- a/locale/tr.json +++ b/locale/tr.json @@ -14,6 +14,8 @@ "deactivated": "devredışı bırakıldı", "status": "Durum", "firmware": "Yazılım versiyonu", + "baseversion": "Base version", + "deprecationStatus": "Deprecation Status", "hardware": "Donanım modeli", "visible": "Harita üzerinde görünür", "update": "Otomatik güncelleme",