[statistics] New filter UI

4 files changed, 50 insertions, 20 deletions

diff --git a/modules-available/statistics/lang/de/filters.json b/modules-available/statistics/lang/de/filters.json
new file mode 100644
index 00000000..3fe97532
--- /dev/null
+++ b/modules-available/statistics/lang/de/filters.json
@@ -0,0 +1,24 @@
+{
+    "badsectors": "Defekte Sektoren",
+    "clientip": "IP-Adresse",
+    "cpumodel": "CPU-Modell",
+    "currentuser": "Aktueller\/Letzter Benutzer",
+    "firstseen": "Erster Boot",
+    "gbram": "RAM (GB)",
+    "hddgb": "ID44 (GB)",
+    "hostname": "Hostname",
+    "kvmstate": "Virtualisierung",
+    "lastboot": "Letzter Boot",
+    "lastseen": "Letzte Aktivit\u00e4t",
+    "live_memfree": "RAM frei (MB)",
+    "live_swapfree": "swap frei (MB)",
+    "live_tmpfree": "ID44 frei (MB)",
+    "location": "Raum\/Ort",
+    "logintime": "Letzter Login",
+    "macaddr": "MAC-Adresse",
+    "machineuuid": "System-UUID",
+    "realcores": "CPU-Kerne (real)",
+    "runtime": "Laufzeit (Stunden)",
+    "state": "Zustand",
+    "systemmodel": "System-Modell"
+}
\ No newline at end of file
diff --git a/modules-available/statistics/lang/de/template-tags.json b/modules-available/statistics/lang/de/template-tags.json
index f48518ab..1916abfa 100644
--- a/modules-available/statistics/lang/de/template-tags.json
+++ b/modules-available/statistics/lang/de/template-tags.json
@@ -1,8 +1,7 @@
 {
     "lang_64bitSupport": "64\u2009Bit Gast-Support",
-    "lang_add": "Hinzuf\u00fcgen",
-    "lang_add_filter": "Filter hinzuf\u00fcgen",
     "lang_address": "Adresse",
+    "lang_apply": "Anwenden",
     "lang_biosDate": "Ver\u00f6ffentlichungsdatum",
     "lang_biosFixes": "BIOS-Fehlerkorrekturen",
     "lang_biosUpdate": "BIOS Update",
@@ -13,7 +12,6 @@
     "lang_cores": "Kerne",
     "lang_cpuCores": "CPU-Kerne",
     "lang_cpuModel": "CPU",
-    "lang_currentUser": "Aktueller\/Letzter Benutzer",
     "lang_details": "Details",
     "lang_devices": "Ger\u00e4te",
     "lang_duration": "Dauer",
@@ -34,7 +32,6 @@
     "lang_kvmSupport": "64\u2009Bit G\u00e4ste",
     "lang_labelFilter": "Aktive Filter (UND-Logik)",
     "lang_lastBoot": "Letzter Boot",
-    "lang_lastLogin": "Letzer Login",
     "lang_lastSeen": "Zuletzt gesehen",
     "lang_listDropdown": "Als Text",
     "lang_location": "Ort",
@@ -50,10 +47,8 @@
     "lang_machineSummary": "Zusammenfassung",
     "lang_maximumAbbrev": "Max.",
     "lang_mediaIntegrityErrors": "\"Media Integrity Errors\"",
-    "lang_memFree": "RAM frei (MB)",
     "lang_memoryStats": "Arbeitsspeicher",
     "lang_mobomodel": "Mainboard",
-    "lang_model": "Modell",
     "lang_modelCount": "Anzahl",
     "lang_modelName": "Modellname",
     "lang_modelNo": "Modell",
@@ -93,7 +88,6 @@
     "lang_roomplan": "Raumplan",
     "lang_runMode": "Betriebsmodus",
     "lang_runmodeMachines": "Mit besonderem Betriebsmodus",
-    "lang_runtimeHours": "Laufzeit (Stunden)",
     "lang_screens": "Bildschirme",
     "lang_serialNo": "Serien-Nr",
     "lang_showList": "Liste",
@@ -101,16 +95,13 @@
     "lang_shutdown": "Herunterfahren",
     "lang_shutdownConfirm": "Ausgew\u00e4hlte Rechner wirklich herunterfahren?",
     "lang_sockets": "Sockel",
-    "lang_subnet": "Subnetz",
     "lang_sureDeletePermanent": "M\u00f6chten Sie diese(n) Rechner wirklich unwiderruflich aus der Datenbank entfernen?\r\n\r\nWichtig: L\u00f6schen verhindert nicht, dass ein Rechner nach erneutem Starten von bwLehrpool wieder in die Datenbank aufgenommen wird.",
     "lang_sureReplaceNoUndo": "Wollen Sie die Daten der ausgew\u00e4hlten Rechner \u00fcbertragen? Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.",
     "lang_swap": "Swap",
-    "lang_swapFree": "swap frei (MB)",
     "lang_tempPart": "Temp. Partition",
     "lang_tempPartStats": "Tempor\u00e4re Partition",
     "lang_thoseAreProjectors": "Diese Modellnamen werden als Beamer behandelt, auch wenn die EDID-Informationen des Ger\u00e4tes anderes berichten.",
     "lang_timebarDesc": "Visuelle Darstellung der letzten Tage. Rote Abschnitte zeigen, wann der Rechner belegt war, gr\u00fcne, wann er nicht verwendet wurde, aber eingeschaltet war. Die leicht abgedunkelten Abschnitte markieren N\u00e4chte (22 bis 8 Uhr).",
-    "lang_tmpFree": "ID44 frei (MB)",
     "lang_tmpGb": "Temp-HDD",
     "lang_total": "Gesamt",
     "lang_usageDetails": "Nutzungsdetails",
diff --git a/modules-available/statistics/lang/en/filters.json b/modules-available/statistics/lang/en/filters.json
new file mode 100644
index 00000000..bd262d32
--- /dev/null
+++ b/modules-available/statistics/lang/en/filters.json
@@ -0,0 +1,24 @@
+{
+    "badsectors": "Bad sectors",
+    "clientip": "IP address",
+    "cpumodel": "CPU model",
+    "currentuser": "Current\/last user",
+    "firstseen": "First boot",
+    "gbram": "RAM (GB)",
+    "hddgb": "ID44 (GB)",
+    "hostname": "Host name",
+    "kvmstate": "Virtualization",
+    "lastboot": "Last boot",
+    "lastseen": "Last activity",
+    "live_memfree": "RAM free (MB)",
+    "live_swapfree": "swap free (MB)",
+    "live_tmpfree": "ID44 free (MB)",
+    "location": "Room\/Location",
+    "logintime": "Last login",
+    "macaddr": "MAC address",
+    "machineuuid": "System UUID",
+    "realcores": "CPU cores (real)",
+    "runtime": "Uptime (hours)",
+    "state": "State",
+    "systemmodel": "System model"
+}
\ No newline at end of file
diff --git a/modules-available/statistics/lang/en/template-tags.json b/modules-available/statistics/lang/en/template-tags.json
index a3260727..fca82b83 100644
--- a/modules-available/statistics/lang/en/template-tags.json
+++ b/modules-available/statistics/lang/en/template-tags.json
@@ -1,8 +1,7 @@
 {
     "lang_64bitSupport": "64\u2009Bit guest support",
-    "lang_add": "Add",
-    "lang_add_filter": "Add Filter",
     "lang_address": "Address",
+    "lang_apply": "Apply",
     "lang_biosDate": "Release date",
     "lang_biosFixes": "BIOS fixes",
     "lang_biosUpdate": "BIOS update",
@@ -13,7 +12,6 @@
     "lang_cores": "Cores",
     "lang_cpuCores": "CPU cores",
     "lang_cpuModel": "CPU",
-    "lang_currentUser": "Current\/last user",
     "lang_details": "Details",
     "lang_devices": "Devices",
     "lang_duration": "Duration",
@@ -34,7 +32,6 @@
     "lang_kvmSupport": "64\u2009Bit guests",
     "lang_labelFilter": "Active filters (AND logic)",
     "lang_lastBoot": "Last boot",
-    "lang_lastLogin": "Last login",
     "lang_lastSeen": "Last seen",
     "lang_listDropdown": "As text",
     "lang_location": "Location",
@@ -50,10 +47,8 @@
     "lang_machineSummary": "Summary",
     "lang_maximumAbbrev": "max.",
     "lang_mediaIntegrityErrors": "Media Integrity Errors",
-    "lang_memFree": "RAM free (MB)",
     "lang_memoryStats": "Memory",
     "lang_mobomodel": "Mainboard",
-    "lang_model": "Model",
     "lang_modelCount": "Count",
     "lang_modelName": "Model name",
     "lang_modelNo": "Model",
@@ -93,7 +88,6 @@
     "lang_roomplan": "Location",
     "lang_runMode": "Mode of operation",
     "lang_runmodeMachines": "With special mode of operation",
-    "lang_runtimeHours": "Runtime (hours)",
     "lang_screens": "Screens",
     "lang_serialNo": "Serial no",
     "lang_showList": "List",
@@ -101,16 +95,13 @@
     "lang_shutdown": "Shutdown",
     "lang_shutdownConfirm": "Shutdown selected machines?",
     "lang_sockets": "Sockets",
-    "lang_subnet": "Subnet",
     "lang_sureDeletePermanent": "Are your sure you want to delete the selected machine(s) from the database? This cannot be undone.\r\n\r\nNote: Deleting machines from the database does not prevent booting up bwLehrpool again, which would recreate their respective database entries.",
     "lang_sureReplaceNoUndo": "Are you sure you want to replace the selected machine pairs? This action cannot be undone.",
     "lang_swap": "swap",
-    "lang_swapFree": "swap free (MB)",
     "lang_tempPart": "Temp. partition",
     "lang_tempPartStats": "Temporary partition",
     "lang_thoseAreProjectors": "These model names will always be treated as beamers, even if the device's EDID data says otherwise.",
     "lang_timebarDesc": "Visual representation of the last few days. Red parts mark periods where the client was occupied, green parts where the client was idle. Dimmed parts mark nights (10pm to 8am).",
-    "lang_tmpFree": "ID44 free (MB)",
     "lang_tmpGb": "Temp HDD",
     "lang_total": "Total",
     "lang_usageDetails": "Detailed usage",