From 41f1de86b777f1c47aad942667418542030be6c6 Mon Sep 17 00:00:00 2001 From: leiweibau <105860611+leiweibau@users.noreply.github.com> Date: Mon, 23 May 2022 17:13:47 +0200 Subject: [PATCH] Remove hyphen from On-line and Off-line JS Fix for "Online" and "Offline" on the Device-List and the Device-Details-Page --- front/deviceDetails.php | 4 ++-- front/devices.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/front/deviceDetails.php b/front/deviceDetails.php index e260e4a7..a28da225 100644 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -1033,7 +1033,7 @@ function getDeviceData (readAllData=false) { } // Status - $('#deviceStatus').html (deviceData['dev_Status']); + $('#deviceStatus').html (deviceData['dev_Status'].replace('-', '')); switch (deviceData['dev_Status']) { case 'On-line': icon='fa fa-check'; color='text-green'; break; case 'Off-line': icon='fa fa-close'; color='text-gray'; break; @@ -1078,7 +1078,7 @@ function getDeviceData (readAllData=false) { $('#txtFirstConnection').val (deviceData['dev_FirstConnection']); $('#txtLastConnection').val (deviceData['dev_LastConnection']); $('#txtLastIP').val (deviceData['dev_LastIP']); - $('#txtStatus').val (deviceData['dev_Status']); + $('#txtStatus').val (deviceData['dev_Status'].replace('-', '')); if (deviceData['dev_StaticIP'] == 1) {$('#chkStaticIP').iCheck('check');} else {$('#chkStaticIP').iCheck('uncheck');} $('#txtScanCycle').val (deviceData['dev_ScanCycle'] +' min'); diff --git a/front/devices.php b/front/devices.php index c784b3a9..664061dc 100644 --- a/front/devices.php +++ b/front/devices.php @@ -263,7 +263,7 @@ function initializeDatatable () { default: color='aqua'; break; }; - $(td).html (''+ cellData +''); + $(td).html (''+ cellData.replace('-', '') +''); } }, ],