diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index c45a235f..76833c23 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -78,6 +78,9 @@
+
+
+
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index b9826380..afb27ee0 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -236,6 +236,11 @@ namespace ENI2.Controls
// no ETA means done
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;
+
}
diff --git a/ENI2/Excel/ExcelSimpleWriter.cs b/ENI2/Excel/ExcelSimpleWriter.cs
index 774f8798..0082c94e 100644
--- a/ENI2/Excel/ExcelSimpleWriter.cs
+++ b/ENI2/Excel/ExcelSimpleWriter.cs
@@ -40,9 +40,10 @@ namespace ENI2.Excel
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] = md.ColA;
+ ws.Cells[i + 2, 1] = md.ColA;
ws.Cells[i + 2, 2].NumberFormat = "TT/hh:mm";
ws.Cells[i + 2, 2] = md.ColB;
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, 13] = md.ColM ;
// 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,
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
index f7751bd2..5a2b562d 100644
--- a/bsmd.database/MaerskData.cs
+++ b/bsmd.database/MaerskData.cs
@@ -49,7 +49,9 @@ namespace bsmd.database
[Description("In the past, id or not")]
DONE,
[Description("no ETA found on data record")]
- NO_ETA
+ NO_ETA,
+ [Description("VISIT-ID was cancelled")]
+ CANCELLED
}
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 2dc6a129..9c3c590a 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.9.0")]
-[assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")]
+[assembly: AssemblyInformationalVersion("7.10.0")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 schick Informatik")]
[assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index 3d2ff33a..d380561d 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
using System.Reflection;
-[assembly: AssemblyVersion("7.9.0.*")]
+[assembly: AssemblyVersion("7.10.0.*")]