Merge pull request #3059 from SCADA-LTS/feature/#3058_Improve_content…

…_of_list_of_points_in_BacNet_source_in_data_sources_list_view #3058 Improve content of list of points in BacNet source in data sources list view
SCADA-LTS · Dec 18, 2024 · 017ee5c · 017ee5c
2 parents 284961e + e986b13
commit 017ee5c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPDataSourceVO.java b/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPDataSourceVO.java
@@ -75,7 +75,7 @@ public ExportCodes getEventCodes() {
 
     @Override
     public LocalizableMessage getConnectionDescription() {
-        return new LocalizableMessage("dsEdit.bacnetIp.dsconn", deviceId);
+        return new LocalizableMessage("common.tp.description", Common.getPeriodDescription(updatePeriodType, updatePeriods), new LocalizableMessage("common.default", " / Device ID: " + getDeviceId() + " / " + getBroadcastAddress() + ":" + getPort()));
     }
 
     @Override

diff --git a/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPPointLocatorVO.java b/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPPointLocatorVO.java
@@ -59,7 +59,8 @@ public PointLocatorRT createRuntime() {
     }
 
     public LocalizableMessage getConfigurationDescription() {
-        return new LocalizableMessage("common.default", remoteDeviceIp);
+        ObjectType objectType = new ObjectType(getObjectTypeId());
+        return new LocalizableMessage("common.default", remoteDeviceIp + " / " + objectType.toString() + " / Obj Instance number: " + getObjectInstanceNumber());
     }
 
     @JsonRemoteProperty