dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neuer Status CANCELLED für Maersk Anmeldungen

Browse Source
This commit is contained in:
Daniel Schick 2023-03-08 12:14:48 +01:00
parent 3072796e55
commit 654746b704
6 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ENI2/Controls/MaerskListControl.xaml
View File

@ -78,6 +78,9 @@
<DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.NO_ID_AND_DUE}"> <DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.NO_ID_AND_DUE}">
<Setter Property="Background" Value="Red"></Setter> <Setter Property="Background" Value="Red"></Setter>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.CANCELLED}">
<Setter Property="Foreground" Value="DarkGray"/>
</DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</local:ENIDataGrid.RowStyle> </local:ENIDataGrid.RowStyle>

5
ENI2/Controls/MaerskListControl.xaml.cs
View File

@ -236,6 +236,11 @@ namespace ENI2.Controls
// no ETA means done // no ETA means done
md.Status = MaerskData.MDStatus.NO_ETA; md.Status = MaerskData.MDStatus.NO_ETA;
} }
// if there is an declaration and it has been cancelled.. override the state to CANCELLED
if (md.MessageCore != null && (md.MessageCore.Cancelled ?? false))
md.Status = MaerskData.MDStatus.CANCELLED;
} }

11
ENI2/Excel/ExcelSimpleWriter.cs
View File

@ -40,9 +40,10 @@ namespace ENI2.Excel
for (int i = 0; i < data.Count; i++) for (int i = 0; i < data.Count; i++)
{ {
MaerskData md = data[i]; MaerskData md = data[i];
ws.Cells[i + 2, 1].NumberFormat = "TT/hh:mm"; ws.Cells[i + 2, 1].NumberFormat = "TT/hh:mm";
ws.Cells[i + 2, 1] = md.ColA; ws.Cells[i + 2, 1] = md.ColA;
ws.Cells[i + 2, 2].NumberFormat = "TT/hh:mm"; ws.Cells[i + 2, 2].NumberFormat = "TT/hh:mm";
ws.Cells[i + 2, 2] = md.ColB; ws.Cells[i + 2, 2] = md.ColB;
ws.Cells[i + 2, 3] = md.ColC; ws.Cells[i + 2, 3] = md.ColC;
@ -57,6 +58,12 @@ namespace ENI2.Excel
ws.Cells[i + 2, 12] = md.ColL; ws.Cells[i + 2, 12] = md.ColL;
ws.Cells[i + 2, 13] = md.ColM ; ws.Cells[i + 2, 13] = md.ColM ;
// ws.Cells[i + 2, 14] = md.Remark; // ws.Cells[i + 2, 14] = md.Remark;
if((md.MessageCore != null) && (md.MessageCore.Cancelled ?? false))
{
ws.Rows[i + 2].Font.Strikethrough = true;
}
} }
wb.SaveAs(filename, XlFileFormat.xlOpenXMLWorkbook, Type.Missing, Type.Missing, Type.Missing, wb.SaveAs(filename, XlFileFormat.xlOpenXMLWorkbook, Type.Missing, Type.Missing, Type.Missing,

4
bsmd.database/MaerskData.cs
View File

@ -49,7 +49,9 @@ namespace bsmd.database
[Description("In the past, id or not")] [Description("In the past, id or not")]
DONE, DONE,
[Description("no ETA found on data record")] [Description("no ETA found on data record")]
NO_ETA NO_ETA,
[Description("VISIT-ID was cancelled")]
CANCELLED
} }

4
bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("7.9.0")] [assembly: AssemblyInformationalVersion("7.10.0")]
[assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2023 schick Informatik")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("7.9.0.*")] [assembly: AssemblyVersion("7.10.0.*")]