diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 8d065b07..d7ff2844 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -37,7 +37,7 @@ true publish.html 0 - 6.9.5.0 + 6.9.6.0 false true true diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs index b46b06a8..d671c050 100644 --- a/ENI2/Excel/ExcelWriter.cs +++ b/ENI2/Excel/ExcelWriter.cs @@ -117,7 +117,11 @@ namespace ENI2.Excel if (message.Elements[0] is POBD pobd) this.WriteMessage(pobd); break; case Message.NotificationClass.PRE72H: - if (message.Elements[0] is PRE72H pre72h) this.WriteMessage(pre72h); + if (message.Elements[0] is PRE72H pre72h) + { + this.WriteMessage(pre72h); + this.WritePRE72H(pre72h); + } break; case Message.NotificationClass.SEC: if (message.Elements[0] is SEC sec) this.WriteMessage(sec); @@ -167,7 +171,7 @@ namespace ENI2.Excel WriteCore(core); - } + } public void Save() { @@ -993,6 +997,35 @@ namespace ENI2.Excel #endregion + #region PRE72H + + private void WritePRE72H(PRE72H pre72h) + { + if(pre72h != null) + { + if(pre72h.TankerHullConfiguration.HasValue) + { + switch(pre72h.TankerHullConfiguration.Value) + { + case 0: WriteText("PRE72H.TankerHullConfiguration", "SINGLE HULL"); break; + case 1: WriteText("PRE72H.TankerHullConfiguration", "SINGLE HULL WITH SBT"); break; + case 2: WriteText("PRE72H.TankerHullConfiguration", "DOUBLE HULL"); break; + } + } + if(pre72h.ConditionCargoBallastTanks.HasValue) + { + switch(pre72h.ConditionCargoBallastTanks.Value) + { + case 0: WriteText("PRE72H.ConditionCargoBallastTanks", "FULL"); break; + case 1: WriteText("PRE72H.ConditionCargoBallastTanks", "EMPTY"); break; + case 2: WriteText("PRE72H.ConditionCargoBallastTanks", "INERTED"); break; + } + } + } + } + + #endregion + #endregion #region write simple things @@ -1088,7 +1121,7 @@ namespace ENI2.Excel { if (v != null) { - _nameDict[lookupName].RefersToRange.Value = ((DateTime)v).ToShortTimeString(); + _nameDict[lookupName].RefersToRange.Value = ((DateTime)v).ToLocalTime().ToShortTimeString(); } } diff --git a/ENI2/Report/ReportDocument.cs b/ENI2/Report/ReportDocument.cs index af15e803..2d06dbf2 100644 --- a/ENI2/Report/ReportDocument.cs +++ b/ENI2/Report/ReportDocument.cs @@ -1381,10 +1381,10 @@ namespace ENI2.Report row.Cells[7].AddParagraph(towa.TowageOnArrivalDraught_DMT.HasValue ? towa.TowageOnArrivalDraught_DMT.Value.ToString("N1") : ""); row.Cells[8].AddParagraph(towa.TowageOnArrivalRemarks ?? ""); row.Cells[9].AddParagraph(towa.TowageOnArrivalOperatorCompanyName ?? ""); - row.Cells[10].AddParagraph(towa.TowageOnArrivalOperatorStreetNameAndNumber); - row.Cells[11].AddParagraph(towa.TowageOnArrivalOperatorPostalCode); + row.Cells[10].AddParagraph(towa.TowageOnArrivalOperatorStreetNameAndNumber ?? ""); + row.Cells[11].AddParagraph(towa.TowageOnArrivalOperatorPostalCode ?? ""); row.Cells[12].AddParagraph(towa.TowageOnArrivalOperatorCountry ?? ""); - row.Cells[13].AddParagraph(towa.TowageOnArrivalOperatorPhone); + row.Cells[13].AddParagraph(towa.TowageOnArrivalOperatorPhone ?? ""); row.Cells[14].AddParagraph(towa.TowageOnArrivalOperatorFax ?? ""); row.Cells[15].AddParagraph(towa.TowageOnArrivalOperatorEmail ?? ""); } diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs index a5a028c3..56433034 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("6.9.5")] +[assembly: AssemblyInformationalVersion("6.9.6")] [assembly: AssemblyCopyright("Copyright © 2014-2021 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 013d810e..d1d2dc6c 100644 --- a/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("6.9.5.*")] +[assembly: AssemblyVersion("6.9.6.*")]