Version 3.2.5: weitere Korrekturen

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);

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]

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("")]

nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.4.*")]
+[assembly: AssemblyVersion("3.2.5.*")]
 

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<LastTenPortFacilitiesCalled> ltpfc = new List<LastTenPortFacilitiesCalled>();
@@ -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
 
     }

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

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; }
 

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; }