MS FlowSearch, Ini tLanguageID

GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb

@@ -262,7 +262,7 @@ Partial Class frmFlowSearch
         '
         'BarEditItemDate
         '
-        Me.BarEditItemDate.Caption = "Attribut "
+        Me.BarEditItemDate.Caption = "Attribut Datum"
         Me.BarEditItemDate.Edit = Me.RepositoryItemComboBox1
         Me.BarEditItemDate.EditWidth = 120
         Me.BarEditItemDate.Id = 12

GUIs.ZooFlow/Search/frmFlowSearch.vb

@@ -3,6 +3,7 @@ Imports DevExpress.XtraEditors
 Imports DigitalData.GUIs.Common
 Imports DevExpress.XtraSplashScreen
 Imports DevExpress.XtraBars
+Imports DigitalData.GUIs.ZooFlow.ClassConstants
 
 Public Class frmFlowSearch
     Private Logger As Logger
@@ -37,7 +38,12 @@ Public Class frmFlowSearch
         Try
             TileControlMatch.Groups.Clear()
             Dim oDT As DataTable = ASorDB.GetDatatable("IDB", $"SELECT * FROM VWIDB_BE_ATTRIBUTE", "VWIDB_BE_ATTRIBUTE", "", "ATTR_TITLE")
-            RepositoryItemComboBox1.Items.Add("Erstellt Wann")
+            If My.Application.User.Language = "de-DE" Then
+                RepositoryItemComboBox1.Items.Add(IDB_ADDED_WHEN_String_German)
+            Else
+                RepositoryItemComboBox1.Items.Add(IDB_ADDED_WHEN_String_Englisch)
+            End If
+
             For Each oRow As DataRow In oDT.Rows
                 If oRow.Item("TYPE_ID") = 5 Then
                     RepositoryItemComboBox1.Items.Add(oRow.Item("ATTR_TITLE"))
@@ -64,7 +70,7 @@ Public Class frmFlowSearch
             oEditor = TryCast(RibbonControl1.Manager.ActiveEditor, ComboBoxEdit)
             oEditValue = oEditor.EditValue
 
-            If oEditValue = "Erstellt Wann" Or oEditValue = "Added when" Then
+            If oEditValue = IDB_ADDED_WHEN_String_German Or oEditValue = IDB_ADDED_WHEN_String_Englisch Then
                 SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN"
             Else
                 SEARCH_FACT_DATE_ATTRIBUTE = oEditValue
@@ -104,10 +110,13 @@ Public Class frmFlowSearch
                 If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then
                     oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
                 Else
-                    oSQL = oSQL.Replace("AND MONTH(OBJ.ADDED_WHEN) <> 13", "")
-                    oSQL = oSQL.Replace("--@INNERJOIN_DATE", "INNER JOIN VWIDB_GROUP_DATA_DATE GRP_DATE ON MD.IDB_OBJ_ID = GRP_DATE.IDB_OBJ_ID")
+                    If SEARCH_FACT_DATE = "MONTH(OBJ.ADDED_WHEN) <> 13" Then
+                        SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13"
+                    End If
+                    oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
+                    oSQL = oSQL.Replace("--INNER JOIN VWIDB_GROUP_DATA_DATE", "INNER JOIN VWIDB_GROUP_DATA_DATE")
+                    End If
                 End If
-            End If
             Dim oResultCountAttributes As Integer = 0
             TileControlMatch.Groups.Clear()
 
@@ -480,4 +489,8 @@ Public Class frmFlowSearch
         StartSearch_Full("")
         CheckButton1.Checked = True
     End Sub
+
+    Private Sub BarEditItemDate_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarEditItemDate.ItemClick
+
+    End Sub
 End Class