diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 924cccfc..98ab49dd 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs index 275c8e92..d8137368 100644 --- a/nsw/Source/bsmd.ExcelReadService/Util.cs +++ b/nsw/Source/bsmd.ExcelReadService/Util.cs @@ -986,40 +986,43 @@ namespace bsmd.ExcelReadService } NOA_NOD noa_nod = noa_nodMessage.Elements[0] as NOA_NOD; - if (messageCore.IsTransit) - noa_nod.ETAToKielCanal = messageCore.ETAKielCanal; - else { + if (messageCore.IsTransit) + { + noa_nod.ETAToKielCanal = messageCore.ETAKielCanal; + } + else + { - noa_nod.ETAToPortOfCall = messageCore.ETA; - reader.Conf.ConfirmDate("NOA_NOD.ETAToPortOfCall", noa_nod.ETAToPortOfCall, ExcelReader.ReadState.OK); + noa_nod.ETAToPortOfCall = messageCore.ETA; + reader.Conf.ConfirmDate("NOA_NOD.ETAToPortOfCall", noa_nod.ETAToPortOfCall, ExcelReader.ReadState.OK); - for (int i = 1; i <= noa_nod.NumberOfExcelRows; i++) - { - string callPurposeDescriptionKey = string.Format("NOA_NOD.CallPuposeDescription_{0}", i); - string callPurposeCodeKey = string.Format("NOA_NOD.CallPurposeCode_{0}", i); - string callPurposeDescription = reader.ReadText(callPurposeDescriptionKey); - string callPurposeCode = reader.ReadText(callPurposeCodeKey); + for (int i = 1; i <= noa_nod.NumberOfExcelRows; i++) + { + string callPurposeDescriptionKey = string.Format("NOA_NOD.CallPuposeDescription_{0}", i); + string callPurposeCodeKey = string.Format("NOA_NOD.CallPurposeCode_{0}", i); + string callPurposeDescription = reader.ReadText(callPurposeDescriptionKey); + string callPurposeCode = reader.ReadText(callPurposeCodeKey); - if (!callPurposeCode.IsNullOrEmpty()) - { + if (!callPurposeCode.IsNullOrEmpty()) + { - CallPurpose callPurpose = noa_nod.GetSublistElementWithIdentifier(i.ToString()) as CallPurpose; - if(callPurpose == null) - { - callPurpose = new CallPurpose(); - callPurpose.NOA_NOD = noa_nod; - callPurpose.Identifier = i.ToString(); - noa_nod.CallPurposes.Add(callPurpose); - } - - callPurpose.CallPurposeCode = ((int?) reader.ReadNumber(callPurposeCodeKey)) ?? 0; - callPurpose.CallPurposeDescription = callPurposeDescription; - reader.Conf.ConfirmText(callPurposeDescriptionKey, callPurposeDescription, callPurposeDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); - if(i==1) + CallPurpose callPurpose = noa_nod.GetSublistElementWithIdentifier(i.ToString()) as CallPurpose; + if (callPurpose == null) + { + callPurpose = new CallPurpose(); + callPurpose.NOA_NOD = noa_nod; + callPurpose.Identifier = i.ToString(); + noa_nod.CallPurposes.Add(callPurpose); + } + + callPurpose.CallPurposeCode = ((int?)reader.ReadNumber(callPurposeCodeKey)) ?? 0; + callPurpose.CallPurposeDescription = callPurposeDescription; + reader.Conf.ConfirmText(callPurposeDescriptionKey, callPurposeDescription, callPurposeDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); + if (i == 1) reader.Conf.ConfirmText("NOA_NOD.CallPuposeDescription_1_DK", callPurposeDescription, callPurposeDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); } - } - } + } + } string lastPort = reader.ReadText("NOA_NOD.LastPort"); if (!lastPort.IsNullOrEmpty()) lastPort = lastPort.Trim(); @@ -1068,8 +1071,16 @@ namespace bsmd.ExcelReadService reader.Conf.ConfirmText("NOA_NOD.NextPort", nextPort, noa_nod.NextPort.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); - noa_nod.ETDFromPortOfCall = reader.ReadDateTime("NOA_NOD.ETDDateFromPortOfCall", "NOA_NOD.ETDTimeFromPortOfCall"); - reader.Conf.ConfirmDate("NOA_NOD.ETDFromPortOfCall", noa_nod.ETDFromPortOfCall, ExcelReader.ReadState.OK); + if(messageCore.IsTransit) + { + noa_nod.ETDFromKielCanal = reader.ReadDateTime("NOA_NOD.ETDDateFromPortOfCall", "NOA_NOD.ETDTimeFromPortOfCall"); + reader.Conf.ConfirmDate("NOA_NOD.ETDFromPortOfCall", noa_nod.ETDFromKielCanal, ExcelReader.ReadState.OK); + } else + { + noa_nod.ETDFromPortOfCall = reader.ReadDateTime("NOA_NOD.ETDDateFromPortOfCall", "NOA_NOD.ETDTimeFromPortOfCall"); + reader.Conf.ConfirmDate("NOA_NOD.ETDFromPortOfCall", noa_nod.ETDFromPortOfCall, ExcelReader.ReadState.OK); + } + noa_nod.ETDFromLastPort = reader.ReadDateTime("NOA_NOD.ETDDateFromLastPort", "NOA_NOD.ETDTimeFromLastPort"); noa_nod.ETAToNextPort = reader.ReadDateTime("NOA_NOD.ETADateToNextPort", "NOA_NOD.ETATimeToNextPort"); // DK @@ -2294,7 +2305,11 @@ namespace bsmd.ExcelReadService result.HerbergEmailContactReportingVessel = reader.ReadText("ShipMail"); - result.ETA = eta; + if (result.IsTransit) + result.ETAKielCanal = eta; + else + result.ETA = eta; + if (result.IMO.Length > 7) { _log.WarnFormat("IMO {0} is longer than 7 chars, truncating!", result.IMO); diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index faaa74df..9bdf4408 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("3.3.7")] +[assembly: AssemblyInformationalVersion("3.3.8")] [assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index 0db61f59..4e608b66 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.3.7.*")] +[assembly: AssemblyVersion("3.3.8.*")]