Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO
This commit is contained in:
@@ -1135,7 +1135,7 @@ Public Class frmHauptfenster
|
|||||||
Case Color.Red
|
Case Color.Red
|
||||||
sqlStr &= " AND (Status = 3 ) "
|
sqlStr &= " AND (Status = 3 ) "
|
||||||
Case Color.Orange
|
Case Color.Orange
|
||||||
sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(GETDATE()) ) ) "
|
sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(GETDATE() AS DATE) ) ) "
|
||||||
Case Color.Yellow
|
Case Color.Yellow
|
||||||
sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY, 1,GETDATE()) AS DATE) AND cast(DATEADD(DAY, 2,GETDATE()) AS DATE) ) ) "
|
sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY, 1,GETDATE()) AS DATE) AND cast(DATEADD(DAY, 2,GETDATE()) AS DATE) ) ) "
|
||||||
End Select
|
End Select
|
||||||
|
|||||||
2
Aviso/frmRoutendauerBerechnen.Designer.vb
generated
2
Aviso/frmRoutendauerBerechnen.Designer.vb
generated
@@ -140,7 +140,7 @@ Partial Class frmRoutendauerBerechnen
|
|||||||
Me.txbAbgangsdatum._numbersOnlyTrennzeichen = False
|
Me.txbAbgangsdatum._numbersOnlyTrennzeichen = False
|
||||||
Me.txbAbgangsdatum._Prozent = False
|
Me.txbAbgangsdatum._Prozent = False
|
||||||
Me.txbAbgangsdatum._ShortDateNew = True
|
Me.txbAbgangsdatum._ShortDateNew = True
|
||||||
Me.txbAbgangsdatum._ShortDateOnly = True
|
Me.txbAbgangsdatum._ShortDateOnly = False
|
||||||
Me.txbAbgangsdatum._TimeOnly = False
|
Me.txbAbgangsdatum._TimeOnly = False
|
||||||
Me.txbAbgangsdatum._TimeOnly_Seconds = False
|
Me.txbAbgangsdatum._TimeOnly_Seconds = False
|
||||||
Me.txbAbgangsdatum._value = ""
|
Me.txbAbgangsdatum._value = ""
|
||||||
|
|||||||
Reference in New Issue
Block a user