diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index ef924ff4..0e7c1de7 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 3c3070c3..38c8cfdf 100644 --- a/nsw/Source/bsmd.ExcelReadService/Util.cs +++ b/nsw/Source/bsmd.ExcelReadService/Util.cs @@ -961,6 +961,18 @@ namespace bsmd.ExcelReadService if (sheetValue.HasValue) property.SetValue(dbEntity, (int)sheetValue.Value); } + else if(property.PropertyType == typeof(byte?)) + { + double? sheetValue = reader.ReadNumber(lookupNameAttribute.LookupName); + if (sheetValue.HasValue) + property.SetValue(dbEntity, (byte)sheetValue.Value); + } + else if(property.PropertyType == typeof(Boolean?)) + { + bool? sheetValue = reader.ReadBoolean(lookupNameAttribute.LookupName); + if (sheetValue.HasValue) + property.SetValue(dbEntity, sheetValue); + } else { _log.DebugFormat("unhandled property type: {0}", property.PropertyType); diff --git a/nsw/Source/bsmd.database/MDH.cs b/nsw/Source/bsmd.database/MDH.cs index 0b45dfd4..b626c32a 100644 --- a/nsw/Source/bsmd.database/MDH.cs +++ b/nsw/Source/bsmd.database/MDH.cs @@ -42,7 +42,7 @@ namespace bsmd.database [ShowReport] [Validation1(ValidationCode.NOT_NULL)] - [LookupName("MDH.ValidSanitaryControlExemptionOrCertificateOnBoard")] + // [LookupName("MDH.ValidSanitaryControlExemptionOrCertificateOnBoard")] public bool? MDHSimplification { get; set; } [ShowReport] diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 81926017..fd44fc42 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.2.4")] +[assembly: AssemblyInformationalVersion("3.2.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 ea4c06b2..bab49757 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.2.4.*")] +[assembly: AssemblyVersion("3.2.5.*")] diff --git a/nsw/Source/bsmd.database/SEC.cs b/nsw/Source/bsmd.database/SEC.cs index 1f968393..11203fbc 100644 --- a/nsw/Source/bsmd.database/SEC.cs +++ b/nsw/Source/bsmd.database/SEC.cs @@ -14,7 +14,7 @@ using System.Collections.Generic; namespace bsmd.database { - public class SEC : DatabaseEntity + public class SEC : DatabaseEntity, ISublistContainer { private List ltpfc = new List(); @@ -275,6 +275,14 @@ namespace bsmd.database } } + int ISublistContainer.NumberOfExcelRows + { + get + { + return 1; + } + } + #endregion #region Validation @@ -313,6 +321,26 @@ namespace bsmd.database } + ISublistElement ISublistContainer.GetSublistElementWithIdentifier(string identifier) + { + // sinnlos, weil es zwei sublisten gibt + foreach (ISublistElement sElem in this.LastTenPortFacilitesCalled) + { + if (sElem.Identifier.Equals(identifier)) return sElem; + } + return null; + } + + void ISublistContainer.SaveElements() + { + foreach (LastTenPortFacilitiesCalled l10c in this.LastTenPortFacilitesCalled) + DBManager.Instance.Save(l10c); + + foreach(ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2s in this.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled) + DBManager.Instance.Save(s2s); + + } + #endregion } diff --git a/nsw/Source/bsmd.database/TIEFD.cs b/nsw/Source/bsmd.database/TIEFD.cs index 9a88a212..312d6da0 100644 --- a/nsw/Source/bsmd.database/TIEFD.cs +++ b/nsw/Source/bsmd.database/TIEFD.cs @@ -25,7 +25,7 @@ namespace bsmd.database #region Properties [ShowReport] [Validation(ValidationCode.DRAUGHT_IMPLAUSIBLE)] - [LookupName("TIEFA.DraughtUponDeparture_DMT")] + [LookupName("TIEFD.DraughtUponDeparture_DMT")] public double? DraughtUponDeparture_DMT { get; set; } public override string Subtitle diff --git a/nsw/Source/bsmd.database/TOWA.cs b/nsw/Source/bsmd.database/TOWA.cs index 8bcca71f..00c57341 100644 --- a/nsw/Source/bsmd.database/TOWA.cs +++ b/nsw/Source/bsmd.database/TOWA.cs @@ -36,34 +36,42 @@ namespace bsmd.database public string TowageOnArrivalFlag { get; set; } [ShowReport] + [LookupName("TOWA.TowageOnArrivalOperatorCompanyName")] [MaxLength(100)] public string TowageOnArrivalOperatorCompanyName { get; set; } [ShowReport] + [LookupName("TOWA.TowageOnArrivalOperatorStreetAndNumber")] [MaxLength(100)] public string TowageOnArrivalOperatorStreetNameAndNumber { get; set; } [ShowReport] + [LookupName("TOWA.TowageOnArrivalOperatorPostalCode")] [MaxLength(24)] public string TowageOnArrivalOperatorPostalCode { get; set; } [ShowReport] + [LookupName("TOWA.TowageOnArrivalOperatorPostalCode")] [MaxLength(100)] public string TowageOnArrivalOperatorCity { get; set; } [ShowReport] + [LookupName("TOWA.TowageOnArrivalOperatorCountry")] [MaxLength(100)] public string TowageOnArrivalOperatorCountry { get; set; } [ShowReport] + [LookupName("TOWA.TowageOnArrivalOperatorPhone")] [MaxLength(100)] public string TowageOnArrivalOperatorPhone { get; set; } [ShowReport] + [LookupName("TOWA.TowageOnArrivalOperatorFax")] [MaxLength(100)] public string TowageOnArrivalOperatorFax { get; set; } [ShowReport] + [LookupName("TOWA.TowageOnArrivalOperatorEMail")] [MaxLength(100)] public string TowageOnArrivalOperatorEmail { get; set; } @@ -94,6 +102,7 @@ namespace bsmd.database public double? TowageOnArrivalDraught_DMT { get; set; } [ShowReport] + [LookupName("TOWA.TowageOnArrivalRemarks")] [MaxLength(255)] public string TowageOnArrivalRemarks { get; set; } diff --git a/nsw/Source/bsmd.database/TOWD.cs b/nsw/Source/bsmd.database/TOWD.cs index 40aeeb76..6b0be6e4 100644 --- a/nsw/Source/bsmd.database/TOWD.cs +++ b/nsw/Source/bsmd.database/TOWD.cs @@ -36,34 +36,42 @@ namespace bsmd.database public string TowageOnDepartureFlag { get; set; } [ShowReport] + [LookupName("TOWD.TowageOnDepartureOperatorCompanyName")] [MaxLength(100)] public string TowageOnDepartureOperatorCompanyName { get; set; } [ShowReport] + [LookupName("TOWD.TowageOnDepartureOperatorStreetAndNumber")] [MaxLength(100)] public string TowageOnDepartureOperatorStreetNameAndNumber { get; set; } [ShowReport] + [LookupName("TOWD.TowageOnDepartureOperatorPostalCode")] [MaxLength(24)] public string TowageOnDepartureOperatorPostalCode { get; set; } [ShowReport] + [LookupName("TOWA.TowageOnArrivalOperatorCity")] [MaxLength(100)] public string TowageOnDepartureOperatorCity { get; set; } [ShowReport] + [LookupName("TOWD.TowageOnDepartureOperatorCountry")] [MaxLength(100)] public string TowageOnDepartureOperatorCountry { get; set; } [ShowReport] + [LookupName("TOWD.TowageOnDepartureOperatorPhone")] [MaxLength(100)] public string TowageOnDepartureOperatorPhone { get; set; } [ShowReport] + [LookupName("TOWD.TowageOnDepartureOperatorFax")] [MaxLength(100)] public string TowageOnDepartureOperatorFax { get; set; } [ShowReport] + [LookupName("TOWD.TowageOnDepartureOperatorEMail")] [MaxLength(100)] public string TowageOnDepartureOperatorEmail { get; set; }