Fix project view DPT

XKNX · Jan 20, 2024 · 1d38f76 · 1d38f76
1 parent d8fdce6
commit 1d38f76
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/localize/languages/de.json b/src/localize/languages/de.json
@@ -30,7 +30,7 @@
   "group_monitor_connected_waiting_telegrams": "Grouppenmonitor ist verbunden und wartet auf Telegramme",
   "group_monitor_value": "Wert",
   "group_monitor_waiting_to_connect": "Warte auf Websocket-Verbindung",
-  "project_view_title": "ETS Project",
+  "project_view_title": "Projekt",
   "project_view_upload": "Keine Projektdaten gefunden. Wechsle zum Info Tab und lade eine Projektdatei hoch.",
   "project_view_version_l1": "Die Version von `XKNXProject` welche für die Verarbeitung des ETS Projektes verwendet wurde, war:",
   "project_view_version_l2": "minimal unterstützte Version",

diff --git a/src/localize/languages/en.json b/src/localize/languages/en.json
@@ -30,7 +30,7 @@
   "group_monitor_connected_waiting_telegrams": "Group monitor is connected and waiting for telegrams",
   "group_monitor_value": "Value",
   "group_monitor_waiting_to_connect": "Waiting for websocket connection",
-  "project_view_title": "ETS Project",
+  "project_view_title": "Project",
   "project_view_upload": "To use the project viewr please upload a KNX project on Info tab first!",
   "project_view_version_l1": "The `XKNXProject` version used for parsing the ETS project was:",
   "project_view_version_l2": "minimum version required",

diff --git a/src/views/project_view.ts b/src/views/project_view.ts
@@ -20,8 +20,7 @@ import { compare } from "compare-versions";
 import { HomeAssistant, Route } from "@ha/types";
 import { KNX } from "../types/knx";
 import type { GroupRangeSelectionChangedEvent } from "../components/knx-project-tree-view";
-import { DPT, GroupAddress } from "../types/websocket";
-import { dptToString } from "../utils/format";
+import { GroupAddress } from "../types/websocket";
 import { KNXLogger } from "../tools/knx-logger";
 
 const logger = new KNXLogger("knx-project-view");
@@ -66,7 +65,7 @@ export class KNXProjectView extends LitElement {
 
   private _columns = memoize((narrow, _language): DataTableColumnContainer<GroupAddress> => {
     const addressWidth = "100px";
-    const dptWidth = "80px";
+    const dptWidth = "82px";
 
     return {
       address: {
@@ -94,9 +93,13 @@ export class KNXProjectView extends LitElement {
         sortable: true,
         filterable: true,
         title: this.knx.localize("project_view_table_dpt"),
-        type: "numeric",
         width: dptWidth,
-        template: (dpt: DPT | null) => dptToString(dpt),
+        template: (ga: GroupAddress) =>
+          ga.dpt
+            ? html`<span style="display:inline-block;width:24px;text-align:right;"
+                  >${ga.dpt.main}</span
+                >${ga.dpt.sub ? "." + ga.dpt.sub.toString().padStart(3, "0") : ""} `
+            : "",
       },
     };
   });