Layout Sendungen/LKWDetails
This commit is contained in:
@@ -1138,9 +1138,9 @@ Public Class frmHauptfenster
|
||||
sqlStr &= " AND (Status = 3 ) "
|
||||
Case Color.Orange
|
||||
' sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(GETDATE() AS DATE) ) ) "
|
||||
sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(DATEADD(DAY, 1,GETDATE()) AS DATE) ) ) "
|
||||
sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(DATEADD(DAY, " & getDaysVorschreiben(1) & ",GETDATE()) AS DATE) ) ) "
|
||||
Case Color.Yellow
|
||||
sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY,2,GETDATE()) AS DATE) AND cast(DATEADD(DAY,3,GETDATE()) AS DATE) ) ) "
|
||||
sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY," & getDaysVorschreiben(2) & ",GETDATE()) AS DATE) AND cast(DATEADD(DAY," & getDaysVorschreiben(3) & ",GETDATE()) AS DATE) ) ) "
|
||||
End Select
|
||||
End If
|
||||
''Farbe
|
||||
@@ -1439,9 +1439,15 @@ Public Class frmHauptfenster
|
||||
' r.DefaultCellStyle.BackColor = Color.LightYellow
|
||||
'End If
|
||||
|
||||
If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(1).ToShortDateString) Then 'heute
|
||||
'If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(1).ToShortDateString) Then 'heute
|
||||
' r.DefaultCellStyle.BackColor = Color.Orange
|
||||
'ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(3).ToShortDateString) Then 'morgen
|
||||
' r.DefaultCellStyle.BackColor = Color.LightYellow
|
||||
'End If
|
||||
|
||||
If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(getDateVorschreiben(1).ToShortDateString) Then 'heute
|
||||
r.DefaultCellStyle.BackColor = Color.Orange
|
||||
ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(3).ToShortDateString) Then 'morgen
|
||||
ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(getDateVorschreiben(3).ToShortDateString) Then 'morgen
|
||||
r.DefaultCellStyle.BackColor = Color.LightYellow
|
||||
End If
|
||||
|
||||
@@ -1478,6 +1484,25 @@ Public Class frmHauptfenster
|
||||
|
||||
|
||||
|
||||
Function getDateVorschreiben(addDays) As Date
|
||||
Dim FT As New VERAG_PROG_ALLGEMEIN.cFeiertage(Now.Year) 'Evtl Jahressprung, darum neu definieren
|
||||
|
||||
While FT.isFeiertag(Now.AddDays(addDays), VERAG_PROG_ALLGEMEIN.cAllgemein.GET_LAND()) Or FT.isWeekend(Now.AddDays(addDays))
|
||||
addDays += 1
|
||||
End While
|
||||
Return Now.AddDays(addDays)
|
||||
End Function
|
||||
|
||||
Function getDaysVorschreiben(addDays) As Integer
|
||||
Dim FT As New VERAG_PROG_ALLGEMEIN.cFeiertage(Now.Year) 'Evtl Jahressprung, darum neu definieren
|
||||
|
||||
While FT.isFeiertag(Now.AddDays(addDays), VERAG_PROG_ALLGEMEIN.cAllgemein.GET_LAND()) Or FT.isWeekend(Now.AddDays(addDays))
|
||||
addDays += 1
|
||||
End While
|
||||
Return addDays
|
||||
End Function
|
||||
|
||||
|
||||
Private Sub dgvSendungen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles gridMyAviso.CellClick
|
||||
Try
|
||||
If e.RowIndex > 0 Then
|
||||
@@ -5371,6 +5396,7 @@ Public Class AvisoStatusFunctions
|
||||
|
||||
SendFreigabeEmail(Aviso)
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cMessenger.SET_LKWCHAT_INAKTIV(Aviso.AvisoID)
|
||||
|
||||
If True Then
|
||||
|
||||
|
||||
Reference in New Issue
Block a user