edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Andreas Luxbauer
2022-10-12 14:20:57 +02:00
parent 00330cccda
commit 2ca94dcf78
3 changed files with 254 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Aviso/Aviso.vbproj
View File

@@ -528,6 +528,12 @@
<Compile Include="Benachrichtigung\frmAvisoBenachrichtigungReminderBestaetigen.vb"> <Compile Include="Benachrichtigung\frmAvisoBenachrichtigungReminderBestaetigen.vb">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="frmFrachtkostenBerechnen.Designer.vb">
<DependentUpon>frmFrachtkostenBerechnen.vb</DependentUpon>
</Compile>
<Compile Include="frmFrachtkostenBerechnen.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmFreigabeSetzenAnhaenge.Designer.vb"> <Compile Include="frmFreigabeSetzenAnhaenge.Designer.vb">
<DependentUpon>frmFreigabeSetzenAnhaenge.vb</DependentUpon> <DependentUpon>frmFreigabeSetzenAnhaenge.vb</DependentUpon>
</Compile> </Compile>
@@ -828,12 +834,6 @@
<Compile Include="frmZollstopp.vb"> <Compile Include="frmZollstopp.vb">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="frmFrachtkostenBerechnen.Designer.vb">
<DependentUpon>frmFrachtkostenBerechnen.vb</DependentUpon>
</Compile>
<Compile Include="frmFrachtkostenBerechnen.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="GVMS\frmGVMS.Designer.vb"> <Compile Include="GVMS\frmGVMS.Designer.vb">
<DependentUpon>frmGVMS.vb</DependentUpon> <DependentUpon>frmGVMS.vb</DependentUpon>
</Compile> </Compile>
@@ -1062,6 +1062,9 @@
<EmbeddedResource Include="Benachrichtigung\frmAvisoBenachrichtigungReminderBestaetigen.resx"> <EmbeddedResource Include="Benachrichtigung\frmAvisoBenachrichtigungReminderBestaetigen.resx">
<DependentUpon>frmAvisoBenachrichtigungReminderBestaetigen.vb</DependentUpon> <DependentUpon>frmAvisoBenachrichtigungReminderBestaetigen.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="frmFrachtkostenBerechnen.resx">
<DependentUpon>frmFrachtkostenBerechnen.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmFreigabeSetzenAnhaenge.resx"> <EmbeddedResource Include="frmFreigabeSetzenAnhaenge.resx">
<DependentUpon>frmFreigabeSetzenAnhaenge.vb</DependentUpon> <DependentUpon>frmFreigabeSetzenAnhaenge.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
@@ -1213,9 +1216,6 @@
<EmbeddedResource Include="frmZollstopp.resx"> <EmbeddedResource Include="frmZollstopp.resx">
<DependentUpon>frmZollstopp.vb</DependentUpon> <DependentUpon>frmZollstopp.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="frmFrachtkostenBerechnen.resx">
<DependentUpon>frmFrachtkostenBerechnen.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GVMS\frmGVMS.resx"> <EmbeddedResource Include="GVMS\frmGVMS.resx">
<DependentUpon>frmGVMS.vb</DependentUpon> <DependentUpon>frmGVMS.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>

479
Aviso/frmHauptfenster.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

9
Aviso/frmHauptfenster.vb
View File

@@ -1135,9 +1135,10 @@ 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() AS DATE) ) ) " ' 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) ) ) "
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,2,GETDATE()) AS DATE) AND cast(DATEADD(DAY,3,GETDATE()) AS DATE) ) ) "
End Select End Select
End If End If
''Farbe ''Farbe
@@ -1435,9 +1436,9 @@ Public Class frmHauptfenster
' r.DefaultCellStyle.BackColor = Color.LightYellow ' r.DefaultCellStyle.BackColor = Color.LightYellow
'End If 'End If
If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.ToShortDateString) Then 'heute If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(1).ToShortDateString) Then 'heute
r.DefaultCellStyle.BackColor = Color.Orange r.DefaultCellStyle.BackColor = Color.Orange
ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(2).ToShortDateString) Then 'morgen ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(3).ToShortDateString) Then 'morgen
r.DefaultCellStyle.BackColor = Color.LightYellow r.DefaultCellStyle.BackColor = Color.LightYellow
End If End If