From bbe3aa1727f8521b43cd03c7bc2c12de8f37deeb Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 19 Jan 2017 16:55:59 +0000 Subject: [PATCH] Version 3.3.8 Korrekturen Kiel Canal --- Stundensheet.xlsx | Bin 25794 -> 25831 bytes nsw/Source/bsmd.ExcelReadService/Util.cs | 77 +++++++++++------- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- 4 files changed, 48 insertions(+), 33 deletions(-) diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 924cccfcd5a9dfc2f868f00478c23eaa93f33a0a..98ab49dde131279c77db281a5fa8cd2ce1d52253 100644 GIT binary patch delta 14397 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 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.*")]