From 465872fe1f8ee3705d1aa0331a239090255cc2dc Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Wed, 23 Mar 2016 14:10:48 +0000 Subject: [PATCH] 3.0.5 --- Stundensheet.xlsx | Bin 21270 -> 21310 bytes nsw/Source/SQL/purge.sql | 10 +++++ nsw/Source/bsmd.database/HAZ.cs | 25 +++++++---- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.dbh/Request.cs | 19 ++++---- nsw/Source/bsmd.herberg.FormService/Util.cs | 42 ++++++++++++++++-- 7 files changed, 76 insertions(+), 24 deletions(-) diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 5446d2eb179ac61acc566a18c721864c65f30cec..26819c4110dc581653eec2f3d049870e9ed1314d 100644 GIT binary patch delta 10395 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 delta 10372 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 @@ -89,6 +84,18 @@ namespace bsmd.database #region DatabaseEntity implementation + + public new string Tablename + { + get + { + if (this._isDeparture) + return "[dbo].[HAZD]"; + else + return "[dbo].[HAZA]"; + } + } + public override void PrepareSave(System.Data.IDbCommand cmd) { SqlCommand scmd = cmd as SqlCommand; diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 2a63217f..dfca7500 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.0.4")] +[assembly: AssemblyInformationalVersion("3.0.5")] [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 df71804a..ba7a8d5e 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.0.4.*")] +[assembly: AssemblyVersion("3.0.5.*")] diff --git a/nsw/Source/bsmd.dbh/Request.cs b/nsw/Source/bsmd.dbh/Request.cs index bfc01b63..20cf2067 100644 --- a/nsw/Source/bsmd.dbh/Request.cs +++ b/nsw/Source/bsmd.dbh/Request.cs @@ -556,7 +556,7 @@ namespace bsmd.dbh rootStat.MMSINumber = stat.MMSINumber; rootStat.Flag = stat.Flag; if (stat.LengthOverall_MTR.HasValue) rootStat.LengthOverall_MTR = Decimal.Round((decimal) (stat.LengthOverall_MTR.Value), 2); - if (stat.Beam_MTR.HasValue) rootStat.Beam_MTR = Decimal.Round((decimal) (stat.Beam_MTR.Value)); + if (stat.Beam_MTR.HasValue) rootStat.Beam_MTR = Decimal.Round((decimal) (stat.Beam_MTR.Value), 2); if (stat.GrossTonnage.HasValue) rootStat.GrossTonnage = stat.GrossTonnage.Value; rootStat.PortOfRegistry = stat.PortOfRegistry; rootStat.ShipType = stat.ShipType; @@ -899,16 +899,17 @@ namespace bsmd.dbh rww.WasteDescription = was.Waste[j-5].WasteDescription; if (was.Waste[j - 5].WasteType.HasValue) rww.WasteType = (WasteType) (was.Waste[j - 5].WasteType.Value - 1); // im generierten Code ist das 0-basiert - if (was.Waste[j - 5].WasteDisposalAmount_MTQ.HasValue) - rww.WasteDisposalAmount_MTQ = decimal.Round((decimal)was.Waste[j - 5].WasteDisposalAmount_MTQ.Value,3); + + rww.WasteDisposalAmount_MTQ = decimal.Round((decimal) (was.Waste[j - 5].WasteDisposalAmount_MTQ ?? 0), 3); + rww.WasteDetails = new RootWASWasteWasteDetails(); - if (was.Waste[j - 5].WasteCapacity_MTQ.HasValue) - rww.WasteDetails.WasteCapacity_MTQ = decimal.Round((decimal)was.Waste[j - 5].WasteCapacity_MTQ.Value,3); - if (was.Waste[j - 5].WasteAmountRetained_MTQ.HasValue) - rww.WasteDetails.WasteAmountRetained_MTQ = decimal.Round((decimal)was.Waste[j - 5].WasteAmountRetained_MTQ.Value,3); + + rww.WasteDetails.WasteCapacity_MTQ = decimal.Round((decimal) (was.Waste[j - 5].WasteCapacity_MTQ ?? 0),3); + rww.WasteDetails.WasteAmountRetained_MTQ = decimal.Round((decimal) (was.Waste[j - 5].WasteAmountRetained_MTQ ?? 0),3); + rww.WasteDetails.WasteAmountGeneratedTillNextPort_MTQ = decimal.Round((decimal) (was.Waste[j - 5].WasteAmountGeneratedTillNextPort_MTQ ?? 0), 3); rww.WasteDetails.WasteDisposalPort = was.Waste[j - 5].WasteDisposalPort; - if (was.Waste[j - 5].WasteAmountGeneratedTillNextPort_MTQ.HasValue) - rww.WasteDetails.WasteAmountGeneratedTillNextPort_MTQ = decimal.Round((decimal)was.Waste[j - 5].WasteAmountGeneratedTillNextPort_MTQ.Value, 3); + if (rww.WasteDetails.WasteDisposalPort.IsNullOrEmpty()) rww.WasteDetails.WasteDisposalPort = "ZZUKN"; + } } } diff --git a/nsw/Source/bsmd.herberg.FormService/Util.cs b/nsw/Source/bsmd.herberg.FormService/Util.cs index 98f59db9..0a7636fe 100644 --- a/nsw/Source/bsmd.herberg.FormService/Util.cs +++ b/nsw/Source/bsmd.herberg.FormService/Util.cs @@ -468,8 +468,9 @@ namespace bsmd.herberg.FormService if (mdh != null) { try - { + { if (vDict.ContainsKey("Simplification")) mdh.MDHSimplification = vDict["Simplification"].Equals("Y"); + else mdh.MDHSimplification = false; if (vDict.ContainsKey("PortOfCallWhereCompleteMDHNotified")) mdh.PortOfCallWhereCompleteMDHNotified = vDict["PortOfCallWhereCompleteMDHNotified"]; if (vDict.ContainsKey("NonAccidentialDeathsDuringVoyage")) mdh.NonAccidentalDeathsDuringVoyage = vDict["NonAccidentialDeathsDuringVoyage"].Equals("Y"); if (vDict.ContainsKey("NonAccidentialDeathsDuringVoyageCount")) mdh.NonAccidentalDeathsDuringVoyageCount = Int32.Parse(vDict["NonAccidentialDeathsDuringVoyageCount"]); @@ -923,7 +924,7 @@ namespace bsmd.herberg.FormService if (vDict.ContainsKey("ConstructionCharacteristicsOfShip")) info.ConstructionCharacteristicsOfShip = vDict["ConstructionCharacteristicsOfShip"]; if (vDict.ContainsKey("FumigatedBulkCargo") && !vDict["FumigatedBulkCargo"].IsNullOrEmpty()) { - info.FumigatedBulkCargo = (byte)Enum.Parse(typeof(Enums.FumigatedBulkCargo), vDict["FumigatedBulkCargo"]); + info.FumigatedBulkCargo = vDict["FumigatedBulkCargo"].Equals("0") ? (byte) 1 : (byte) 0; _log.DebugFormat("FumigatedBulkCargo {0} parsed to {1}", vDict["FumigatedBulkCargo"], info.FumigatedBulkCargo); } else @@ -1050,9 +1051,12 @@ namespace bsmd.herberg.FormService if (pDict.ContainsKey("PassengerVisaNumber")) pas.PassengerVisaNumber = pDict["PassengerVisaNumber"]; if (pDict.ContainsKey("PassengerPortCodeOfEmbarkation") && pDict.ContainsKey("PassengerCountryCodeOfEmbarkation")) pas.PassengerPortOfEmbarkation = pDict["PassengerCountryCodeOfEmbarkation"] + pDict["PassengerPortCodeOfEmbarkation"]; + if (pas.PassengerPortOfEmbarkation.IsNullOrEmpty()) pas.PassengerPortOfEmbarkation = "ZZUKN"; if (pDict.ContainsKey("PassengerPortCodeOfDisembarkation") && pDict.ContainsKey("PassengerCountryCodeOfDisembarkation")) - pas.PassengerPortOfDisembarkation = pDict["PassengerCountryCodeOfEmbarkation"] + pDict["PassengerPortCodeOfDisembarkation"]; + pas.PassengerPortOfDisembarkation = pDict["PassengerCountryCodeOfDisembarkation"] + pDict["PassengerPortCodeOfDisembarkation"]; + if (pas.PassengerPortOfDisembarkation.IsNullOrEmpty()) pas.PassengerPortOfDisembarkation = "ZZUKN"; if (pDict.ContainsKey("PassengerInTransit")) pas.PassengerInTransit = pDict["PassengerInTransit"].Equals("Y"); + else pas.PassengerInTransit = false; } catch (Exception ex) { @@ -1125,11 +1129,17 @@ namespace bsmd.herberg.FormService waste.WasteType = (byte) wCounter; if (vDict.ContainsKey(wda)) waste.WasteDisposalAmount_MTQ = Extensions.TryParseDouble(vDict[wda]); + else waste.WasteDisposalAmount_MTQ = 0; if (vDict.ContainsKey(wc)) waste.WasteCapacity_MTQ = Extensions.TryParseDouble(vDict[wc]); + else waste.WasteCapacity_MTQ = 0; if (vDict.ContainsKey(war)) waste.WasteAmountRetained_MTQ = Extensions.TryParseDouble(vDict[war]); + else waste.WasteAmountRetained_MTQ = 0; if (vDict.ContainsKey(wagtnp)) waste.WasteAmountGeneratedTillNextPort_MTQ = Extensions.TryParseDouble(vDict[wagtnp]); + else waste.WasteAmountGeneratedTillNextPort_MTQ = 0; if ((vDict.ContainsKey(wdpc)) && (vDict.ContainsKey(wdcc))) waste.WasteDisposalPort = vDict[wdcc] + vDict[wdpc]; + else waste.WasteDisposalPort = "ZZUKN"; if (vDict.ContainsKey(wd)) waste.WasteDescription = vDict[wd]; + else waste.WasteDescription = "-"; if (!waste.WasteDisposalPort.IsNullOrEmpty() && waste.WasteDisposalPort.Length > 5) { @@ -1250,6 +1260,7 @@ namespace bsmd.herberg.FormService try { if (vDict.ContainsKey("Simplification")) sec.SECSimplification = vDict["Simplification"].Equals("Y"); + else sec.SECSimplification = false; if (vDict.ContainsKey("PortOfCallWhereCompleteSECNotified")) sec.PortOfCallWhereCompleteSECNotified = vDict["PortOfCallWhereCompleteSECNotified"]; if (vDict.ContainsKey("CSOLastName")) sec.CSOLastName = vDict["CSOLastName"]; if (vDict.ContainsKey("CSOFirstName")) sec.CSOFirstName = vDict["CSOFirstName"]; @@ -1538,6 +1549,7 @@ namespace bsmd.herberg.FormService HAZ newHaz = new HAZ(); newHaz.MessageHeader = theMessage; theMessage.MessageNotificationClass = isDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA; + newHaz.IsDeparture = isDeparture; theMessage.Elements.Add(newHaz); } HAZ haz = theMessage.Elements[0] as HAZ; @@ -1562,6 +1574,9 @@ namespace bsmd.herberg.FormService } Dictionary> subDict = null; + + #region IMDG + if (groupedRowVals.ContainsKey("HAZ.IMDG")) { subDict = groupedRowVals["HAZ.IMDG"]; @@ -1637,6 +1652,10 @@ namespace bsmd.herberg.FormService } } + #endregion + + #region IBC + if (groupedRowVals.ContainsKey("HAZ.IBC")) { subDict = groupedRowVals["HAZ.IBC"]; @@ -1676,6 +1695,10 @@ namespace bsmd.herberg.FormService } } + #endregion + + #region IGC + if (groupedRowVals.ContainsKey("HAZ.IGC")) { subDict = groupedRowVals["HAZ.IGC"]; @@ -1715,6 +1738,10 @@ namespace bsmd.herberg.FormService } } + #endregion + + #region IMSBC + if (groupedRowVals.ContainsKey("HAZ.IMSBC")) { subDict = groupedRowVals["HAZ.IMSBC"]; @@ -1754,6 +1781,10 @@ namespace bsmd.herberg.FormService } } + #endregion + + #region MARPOL + if (groupedRowVals.ContainsKey("HAZ.MARPOLAnnexI")) { subDict = groupedRowVals["HAZ.MARPOLAnnexI"]; @@ -1790,7 +1821,10 @@ namespace bsmd.herberg.FormService saveMessages.Add(marpolPosition); } } - } + } + + #endregion + } catch (Exception ex) {