From 1779da3be06a0ea53b4857ee7182d07d7ee5f590 Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Sun, 14 Apr 2024 09:52:00 +1000
Subject: [PATCH] CSS icon button fix  #629 & DB fucntion test

---
 front/css/app.css                       | 5 +++++
 front/deviceDetails.php                 | 2 +-
 front/php/templates/language/en_us.json | 2 +-
 front/php/templates/notification.php    | 2 +-
 server/database.py                      | 8 +++++++-
 server/helper.py                        | 7 +++++++
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/front/css/app.css b/front/css/app.css
index 0669546f..d0d81e79 100755
--- a/front/css/app.css
+++ b/front/css/app.css
@@ -942,6 +942,11 @@ input[readonly] {
     height: 1.5em !important;
 }
 
+#modal-input-textarea
+{
+    width: 100%;
+}
+
 
 /* ----------------------------------------------------------------- */
 /* NETWORK page */
diff --git a/front/deviceDetails.php b/front/deviceDetails.php
index 2d1af76d..fa8be620 100755
--- a/front/deviceDetails.php
+++ b/front/deviceDetails.php
@@ -1652,7 +1652,7 @@ function askAddIcon () {
   }
 
   // Add new icon as base64 string 
-  showModalInput ('<?= lang('DevDetail_button_AddIcon');?>', '<?= lang('DevDetail_button_AddIcon_Help');?>',
+  showModalInput ('<i class="fa fa-square-plus pointer"></i> <?= lang('DevDetail_button_AddIcon');?>', '<?= lang('DevDetail_button_AddIcon_Help');?>',
     '<?= lang('Gen_Cancel');?>', '<?= lang('Gen_Okay');?>', 'addAsBase64');
 }
 
diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json
index 8a506cb0..976e38bd 100755
--- a/front/php/templates/language/en_us.json
+++ b/front/php/templates/language/en_us.json
@@ -168,7 +168,7 @@
     "DevDetail_Vendor_hover": "Vendor should be auto-detected. You can overwrite or add your custom value.",
     "DevDetail_WOL_Title": "<i class=\"fa fa-power-off\"></i> Wake-on-LAN",
     "DevDetail_button_AddIcon": "Add new Icon",
-    "DevDetail_button_AddIcon_Help": "Paste in an SVG html tag or Font Awesome icon. Read the <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/ICONS.md\" target=\"_blank\">Icons docs</a> for details.",
+    "DevDetail_button_AddIcon_Help": "Paste in an SVG html tag or Font Awesome html tag icon. Read the <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/ICONS.md\" target=\"_blank\">Icons docs</a> for details.",
     "DevDetail_button_AddIcon_Tooltip": "Add a new Icon to this device that is not yet available in the dropdown.",
     "DevDetail_button_Delete": "Delete Device",
     "DevDetail_button_DeleteEvents": "Delete Events",
diff --git a/front/php/templates/notification.php b/front/php/templates/notification.php
index 588ebd5e..2bf69f1a 100755
--- a/front/php/templates/notification.php
+++ b/front/php/templates/notification.php
@@ -95,7 +95,7 @@
 </div>
 
 <!-- Modal input -->
-<div class="modal  fade" id="modal-input" style="display: none;">
+<div class="modal modal-warning fade" id="modal-input" style="display: none;">
   <div class="modal-dialog">
     <div class="modal-content">
 
diff --git a/server/database.py b/server/database.py
index b04768b4..64e42a24 100755
--- a/server/database.py
+++ b/server/database.py
@@ -7,7 +7,7 @@ import base64
 from const import fullDbPath, sql_devices_stats, sql_devices_all
 
 from logger import mylog
-from helper import json_obj, initOrSetParam, row_to_json, timeNowTZ #, updateState
+from helper import json_obj, initOrSetParam, row_to_json, timeNowTZ, split_string #, updateState
 from appevent import AppEvent_obj
 
 
@@ -83,6 +83,12 @@ class DB():
         Check the current tables in the DB and upgrade them if neccessary
         """
 
+        # Registering UDF (User Defined Functions)
+        # 
+        resultUDF =  self.sql_connection.create_function("split_string", 2, split_string)  # Register the UDF
+        mylog('none',f'[upgradeDB] resultUDF: {resultUDF}')
+
+
         # indicates, if Online_History table is available
         onlineHistoryAvailable = self.sql.execute("""
             SELECT name FROM sqlite_master WHERE type='table'
diff --git a/server/helper.py b/server/helper.py
index 122c30c3..67e253d3 100755
--- a/server/helper.py
+++ b/server/helper.py
@@ -597,6 +597,13 @@ def cleanDeviceName(str, match_IP):
 # String manipulation methods
 #-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
+# Define the split_string function
+def split_string(input_str, delimiter):
+    # remove any wrapping brackets
+    input_str = input_str.replace('[','').replace(']','')
+    return input_str.split(delimiter)
+
 #-------------------------------------------------------------------------------
 
 def bytes_to_string(value):