diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index 5279f713..04112b8e 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -869,7 +869,8 @@ Public Class usrCntlSpeditionsBuchSuche If displayFilter Then rpt.lblFilterTxt.Visible = displayFilter rpt.txtFilter.Visible = displayFilter - rpt.txtFilter.Text = SQL.getStringReplaceScalarVar(getSpedBuchWhere, getSpedbuchList) + rpt.txtFilter.Text = generateReadableFilter(SQL.getStringReplaceScalarVar(getSpedBuchWhere, getSpedbuchList)) + Else If txtUeberschr.Text <> "" Then rpt.txtFilter.Text = txtUeberschr.Text @@ -995,7 +996,7 @@ Public Class usrCntlSpeditionsBuchSuche If displayFilter Then rpt.lblFilterTxt.Visible = displayFilter rpt.txtFilter.Visible = displayFilter - rpt.txtFilter.Text = SQL.getStringReplaceScalarVar(getSpedBuchWhere, getSpedbuchList) + rpt.txtFilter.Text = generateReadableFilter(SQL.getStringReplaceScalarVar(getSpedBuchWhere, getSpedbuchList)) Else If txtUeberschr.Text <> "" Then rpt.txtFilter.Text = txtUeberschr.Text @@ -1103,7 +1104,8 @@ Public Class usrCntlSpeditionsBuchSuche If displayFilter Then rpt.lblFilterTxt.Visible = displayFilter rpt.txtFilter.Visible = displayFilter - rpt.txtFilter.Text = SQL.getStringReplaceScalarVar(getSpedBuchWhere, getSpedbuchList) + rpt.txtFilter.Text = generateReadableFilter(SQL.getStringReplaceScalarVar(getSpedBuchWhere, getSpedbuchList)) + Else If txtUeberschr.Text <> "" Then rpt.txtFilter.Text = txtUeberschr.Text @@ -2022,7 +2024,7 @@ Public Class usrCntlSpeditionsBuchSuche If displayFilter Then rpt.lblFilterTxt.Visible = displayFilter rpt.txtFilter.Visible = displayFilter - rpt.txtFilter.Text = SQL.getStringReplaceScalarVar(SpedBuchWhere, SpedBuchList) + rpt.txtFilter.Text = generateReadableFilter(SQL.getStringReplaceScalarVar(SpedBuchWhere, SpedBuchList)) Else If txtUeberschr.Text <> "" Then rpt.txtFilter.Text = txtUeberschr.Text @@ -2331,4 +2333,31 @@ Public Class usrCntlSpeditionsBuchSuche End Try Me.Cursor = Cursors.Default End Sub + + Private Function generateReadableFilter(text As String) As String + + text = text.ToLower() + text = text.Replace("=1", " ist wahr ") + text = text.Replace("=0", " ist falsch ") + text = text.Replace("=", " ist ") + text = text.Replace("[", "") + text = text.Replace("]", "") + text = text.Replace("(", "") + text = text.Replace(")", "") + text = text.Replace(":", "") + text = text.Replace("select", " Felder: ") + text = text.Replace("from", " Tabelle: ") + text = text.Replace("like", " wie ") + text = text.Replace("and", " und ") + text = text.Replace("inner join", " Untertabelle: ") + text = text.Replace("left join", " Untertabelle: ") + text = text.Replace("right join", " Untertabelle: ") + text = text.Replace("between", " zwischen ") + text = text.Replace("00", "") + text = text.Replace("speditionsbuch.", "") + text = text.Replace("%", "*") + + Return text + + End Function End Class