WebUI: Missing "Zeichenkette" filter element in variables

[Schello805]

I actually find a new issue. It is the missing filtering element "Zeichenkette" in the overview of the variables of the Raspberrymatic and also in the variables selection, during generating a programm.

[jens-maus]

Thanks for the report. However, the same applies to a plain CCU2 because there "Zeichenkette" is also not part of the Filter section. Thus, this isn't really a bug in RaspberryMatic but more a feature request. Thus, I will change it accordingly and flag it accordingly.

[jp112sdl]

Wäre auch ein Filtern nach CUXD möglich (sofern man das Addon installiert hat)?

[HMside]

With this three patches we can include the filter for string-variables. This patches are created with the RaspberryMatic files note with the CCU2 files.

/www/webui/webui.js

--- webui.js.orig
+++ webui.js
@@ -24834,6 +24834,7 @@
     this.bTypeValueList = false;
     this.bTypeNumber = false;
     this.bTypeAlarm = false;
+    this.bTypeString = false;
     this.bColLeft = false;
     this.bColCenter = false;
     this.bNameLeft = false;
@@ -25080,6 +25081,12 @@
             if (!bRet) { bRet = true; }
           }
         }
+        if (this.bTypeString) {
+          if (obj['type'] == "string")
+          {
+            if (!bRet) { bRet = true; }
+          }
+        }
         return bRet;
       }
     }
@@ -25133,6 +25140,7 @@
     if (this.bTypeValueList) return true;
     if (this.bTypeNumber) return true;
     if (this.bTypeAlarm) return true;
+    if (this.bTypeString) return true;
     return false; 
   },
     
@@ -25209,6 +25217,7 @@
     this.bTypeValueList = false;
     this.bTypeNumber = false;
     this.bTypeAlarm = false;
+    this.bTypeString = false;
     conInfo("Alle Filter wurden zurückgesetzt.");
   }
 };
@@ -25241,6 +25250,7 @@
       $("cbValueList").checked = fltObj.bTypeValueList;
       $("cbNumber").checked = fltObj.bTypeNumber;
       $("cbAlarm").checked = fltObj.bTypeAlarm;
+      $("cbString").checked = fltObj.bTypeString;
       break;
     case "btnFilterIfaceSub":
       $("cbSend").checked = fltObj.isFilterType(FIL_IFACE_S); 
@@ -25367,7 +25377,8 @@
       fltObj.bTypeLogic = $("cbLogic").checked;
       fltObj.bTypeValueList = $("cbValueList").checked;
       fltObj.bTypeNumber = $("cbNumber").checked;
-      fltObj.bTypeAlarm = $("cbAlarm").checked; 
+      fltObj.bTypeAlarm = $("cbAlarm").checked;
+      fltObj.bTypeString = $("cbString").checked;
       break;
     case "colPos":
       fltObj.bColLeft = $("cbColLeft").checked; 

/www/rega/pages/msg/sysVarsSelection.htm

--- sysVarsSelection.htm.orig
+++ sysVarsSelection.htm
@@ -117,6 +117,9 @@
                 <td>${lblAlarm}</td>
                 <td><input type="checkbox" id="cbAlarm" /></td>
               </tr>
+                <td>${lblString}</td>
+                <td><input type="checkbox" id="cbString" /></td>
+              </tr>
             </table>
             <div class='FilterSetButton' onclick='setAFilter(fltSVS, "vartypes");updateTable();$("btnFilterVarTypeSub").hide();'>${filterSet}</div>
             <div class='FilterSetButton' onclick="$('btnFilterVarTypeSub').hide();">${filterClose}</div>

/www/rega/pages/tabs/admin/systemvars.htm

--- systemvars.htm.orig
+++ systemvars.htm
@@ -101,6 +101,10 @@
             <td>${lblAlarm}</td>
             <td><input type="checkbox" id="cbAlarm" /></td>
           </tr>
+          <tr>
+            <td>${lblString}</td>
+            <td><input type="checkbox" id="cbString" /></td>
+          </tr>
         </table>
         <div class='FilterSetButton' onclick='setAFilter(fltSYV, "vartypes");updateTable();$("btnFilterVarTypeSub").hide();'>${filterSet}</div>
         <div class='FilterSetButton' onclick="$('btnFilterVarTypeSub').hide();">${filterClose}</div>