This commit is contained in:
2021-06-24 23:05:48 +02:00
parent e625acc609
commit f2f992547d
134 changed files with 72921 additions and 2011 deletions

View File

@@ -40,8 +40,8 @@
Sub init(kdNr, Optional Kategorie = "", Optional simpleView = False, Optional preferedKategorie = "", Optional preferedKategorieOtherIN = "")
loaded = False
If simpleView Then Panel1.Visible = False 'showhideOptions(False)
cboKategorie.changeItem(Kategorie)
If simpleView Then Panel1.Height = 0 : Panel1.Visible = False 'showhideOptions(False)
cboKategorie.changeItem(Kategorie)
cbx.Checked = False
initDGV(kdNr, simpleView, preferedKategorie, preferedKategorieOtherIN)
loaded = True
@@ -75,9 +75,10 @@
Dim order = " ORDER BY kdb_AenderungAm desc"
Dim katIN = " "
If preferedKategorie <> "" Then
order = " ORDER BY CASE WHEN kdb_kategorie = '" & preferedKategorie & "' THEN 1 ELSE 2 END desc, kdb_AenderungAm desc "
If katIN <> "" Then order = " AND kdb_kategorie IN(" & preferedKategorieOtherIN & ",'" & preferedKategorie & "') "
order = " ORDER BY CASE WHEN kdb_kategorie = '" & preferedKategorie & "' THEN 1 ELSE 2 END ASC, kdb_AenderungAm desc "
If preferedKategorieOtherIN <> "" Then katIN = " AND kdb_kategorie IN(" & preferedKategorieOtherIN & ",'" & preferedKategorie & "') "
End If
.DataSource = SQL.loadDgvBySql("Select kdb_id, kdb_AenderungAm,kdb_text,kdb_mitId,kdb_mitName,kdb_EingetragenAm,kdb_kategorie, kdb_hervorheben,kdb_history FROM [tblKundenBesonderheiten] where kdb_KundenNr=" & kdNr & " And kdb_visible=1 " & katIN & where & " " & order, "FMZOLL")