diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 24716fb8..54ab7d05 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.ExcelReadService/App.config b/nsw/Source/bsmd.ExcelReadService/App.config
index 2177f47e..d31d17f2 100644
--- a/nsw/Source/bsmd.ExcelReadService/App.config
+++ b/nsw/Source/bsmd.ExcelReadService/App.config
@@ -1,59 +1,128 @@
-
-
-
-
-
-
-
-
-
-
-
- replace me!
-
-
- 300
-
-
- Reference Excel Sheet
-
-
- True
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False
+
+
+ 300
+
+
+ Reference Excel Sheet
+
+
+ True
+
+
+
+
+ report@bsmd.de
+ hsok@gmx.de
+ bald@puls200.de
+ d.schick@gmx.de
+ hollmann@bsmd.de
+
+
+
+
+ False
+
+
+
+
+ E:\svnlager\BSMD\nsw\Deutschland\BSMD-Formblatt.xlsx
+
+
+
+
+
+
+ E:\svnlager\BSMD\nsw\Dänemark\NSW-DK-Excel-Arrival.xlsx
+ E:\svnlager\BSMD\nsw\Dänemark\NSW-DK-Excel-Departure.xlsx
+
+
+
+
+
+
+ excel@textbausteine.net
+
+
+ 3kjasWss.;.
+
+
+ pop3.strato.de
+
+
+ 995
+
+
+ mail.strato.de
+
+
+ excel@textbausteine.net
+
+
+ 3kjasWss.;.
+
+
+ excel@textbausteine.net
+
+
+ nsw@textbausteine.net
+
+
+ E:\temp\excel
+
+
+
- report@bsmd.de
- hsok@gmx.de
- bald@puls200.de
- d.schick@gmx.de
- hollmann@bsmd.de
+
+
+
+
-
- False
-
-
-
-
- E:\svnlager\BSMD\nsw\Deutschland\BSMD-Formblatt.xlsx
-
-
-
-
-
-
- E:\svnlager\BSMD\nsw\Dänemark\NSW-DK-Excel-Arrival.xlsx
- E:\svnlager\BSMD\nsw\Dänemark\NSW-DK-Excel-Departure.xlsx
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index e7f7435e..5d77a3bf 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -18,7 +18,7 @@ namespace bsmd.ExcelReadService
{
public static class Util
{
- private static ILog _log = LogManager.GetLogger(typeof(Util));
+ private static readonly ILog _log = LogManager.GetLogger(typeof(Util));
internal static bool ProcessSheet(ExcelReader reader, out string readMessage, out MessageCore messageCore)
{
@@ -1290,7 +1290,7 @@ namespace bsmd.ExcelReadService
was.DeleteElements();
Util.ScanMessage(was, reader);
was.WasteDisposalDelivery = reader.ReadDelivery("WAS.WasteDisposalDelivery");
- if ((was.LastWasteDisposalPort != null) && (was.LastWasteDisposalPort.Length > 5))
+ if (was.LastWasteDisposalPort?.Length > 5)
{
string lastWasteDisposalPort = reader.ReadText("WAS.LastWasteDisposalPort");
List deliveryLocodes = LocodeDB.AllLocodesForCityName(lastWasteDisposalPort);
@@ -1435,7 +1435,7 @@ namespace bsmd.ExcelReadService
was.Waste.Remove(waste);
// 24.3.: - Für Waste-Type 15: Wenn in dieser Zeile andere Werte enthalten, als die nachfolgenden, ist die ganze Zeile rot zu markieren.
- bool highlightRow15 = !(waste.WasteType == null);
+ bool highlightRow15 = waste.WasteType != null;
highlightRow15 &= (waste.WasteDisposalAmount_MTQ > 0);
highlightRow15 &= (waste.WasteCapacity_MTQ > 0);
highlightRow15 &= (waste.WasteAmountRetained_MTQ > 0);
@@ -1829,7 +1829,7 @@ namespace bsmd.ExcelReadService
if (l10fc.PortFacilityGISISCode.IsNullOrEmpty() || l10fc.PortFacilityGISISCode == "0")
l10fc.PortFacilityGISISCode = "0000";
- if((l10fc.PortFacilityGISISCode != null) && (l10fc.PortFacilityGISISCode.Length < 4))
+ if(l10fc.PortFacilityGISISCode?.Length < 4)
{
while (l10fc.PortFacilityGISISCode.Length < 4) l10fc.PortFacilityGISISCode = "0" + l10fc.PortFacilityGISISCode;
}
@@ -2204,7 +2204,7 @@ namespace bsmd.ExcelReadService
}
if (reader.Mode == ExcelReader.CountryMode.DE)
{
- if ((ladg.CargoCodeNST != null) && (ladg.CargoCodeNST.Length == 1))
+ if (ladg.CargoCodeNST?.Length == 1)
ladg.CargoCodeNST = "0" + ladg.CargoCodeNST;
if ((ladg.CargoCodeNST != null) && (ladg.CargoCodeNST.Length != 2))
@@ -2707,7 +2707,7 @@ namespace bsmd.ExcelReadService
// okay, könnte DK Locode etc sein..
if(poc == null)
{
- if((aGermanPortName != null) && (aGermanPortName.Length == 5)) // possible locode?
+ if(aGermanPortName?.Length == 5) // possible locode?
{
if (LocodeDB.PortNameFromLocode(aGermanPortName) != null)
poc = aGermanPortName;
diff --git a/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj b/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj
index e71a2e77..c2b638db 100644
--- a/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj
+++ b/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj
@@ -39,7 +39,7 @@
..\packages\log4net.2.0.8\lib\net45-full\log4net.dll
True
-
+
True
diff --git a/nsw/Source/bsmd.database/DBManager.cs b/nsw/Source/bsmd.database/DBManager.cs
index d0341e7e..d69b7421 100644
--- a/nsw/Source/bsmd.database/DBManager.cs
+++ b/nsw/Source/bsmd.database/DBManager.cs
@@ -23,12 +23,12 @@ namespace bsmd.database
private SqlConnection _con;
private static DBManager _instance;
- private static ILog _log = LogManager.GetLogger(typeof(DBManager));
+ private static readonly ILog _log = LogManager.GetLogger(typeof(DBManager));
private static Dictionary allReportingParties;
private static Dictionary allPortAreas;
- private object _lock = new object();
+ private readonly object _lock = new object();
private bool _closeConnectionAfterUse = false;
- private List truncatedFieldCollection = new List();
+ private readonly List truncatedFieldCollection = new List();
#endregion
@@ -50,9 +50,7 @@ namespace bsmd.database
{
get
{
- if (_instance == null)
- _instance = new DBManager();
- return _instance;
+ return _instance ?? (_instance = new DBManager());
}
}
@@ -91,13 +89,13 @@ namespace bsmd.database
public void Disconnect()
{
- if ((this._con != null) && (this._con.State == ConnectionState.Open))
+ if (this._con?.State == ConnectionState.Open)
this._con.Close();
}
public bool IsConnected
{
- get { return (this._con != null) && (this._con.State == ConnectionState.Open); }
+ get { return (this._con?.State == ConnectionState.Open); }
}
@@ -346,7 +344,7 @@ namespace bsmd.database
Message statMessage = this.GetMessage(core, Message.NotificationClass.STAT);
- if ((statMessage != null) && (statMessage.Elements.Count > 0))
+ if (statMessage?.Elements.Count > 0)
{
STAT stat = statMessage.Elements[0] as STAT;
if (stat != null)
@@ -406,7 +404,7 @@ namespace bsmd.database
{
Message aMessage = new Message();
SqlCommand cmd = new SqlCommand();
- Message.LoadFilter filter = Message.LoadFilter.BY_ID;
+ const Message.LoadFilter filter = Message.LoadFilter.BY_ID;
aMessage.PrepareLoadCommand(cmd, filter, id);
SqlDataReader reader = this.PerformCommand(cmd);
@@ -429,7 +427,7 @@ namespace bsmd.database
{
MessageCore aCore = new MessageCore();
SqlCommand cmd = new SqlCommand();
- Message.LoadFilter filter = Message.LoadFilter.BY_ID;
+ const Message.LoadFilter filter = Message.LoadFilter.BY_ID;
aCore.PrepareLoadCommand(cmd, filter, id);
SqlDataReader reader = this.PerformCommand(cmd);
@@ -460,7 +458,7 @@ namespace bsmd.database
{
MessageCore aCore = new MessageCore();
SqlCommand cmd = new SqlCommand();
- Message.LoadFilter filter = Message.LoadFilter.BY_VISITID;
+ const Message.LoadFilter filter = Message.LoadFilter.BY_VISITID;
aCore.PrepareLoadCommand(cmd, filter, visitId);
SqlDataReader reader = this.PerformCommand(cmd);
@@ -489,7 +487,7 @@ namespace bsmd.database
{
MessageCore aCore = new MessageCore();
SqlCommand cmd = new SqlCommand();
- Message.LoadFilter filter = Message.LoadFilter.BY_TRANSITID;
+ const Message.LoadFilter filter = Message.LoadFilter.BY_TRANSITID;
aCore.PrepareLoadCommand(cmd, filter, transitId);
SqlDataReader reader = this.PerformCommand(cmd);
@@ -520,7 +518,7 @@ namespace bsmd.database
{
MessageCore aCore = new MessageCore();
SqlCommand cmd = new SqlCommand();
- Message.LoadFilter filter = Message.LoadFilter.IMO_ETA_POC;
+ const Message.LoadFilter filter = Message.LoadFilter.IMO_ETA_POC;
aCore.PrepareLoadCommand(cmd, filter, imo, eta, poc);
SqlDataReader reader = this.PerformCommand(cmd);
List cores = aCore.LoadList(reader);
@@ -544,9 +542,9 @@ namespace bsmd.database
foreach (Message message in coreMessages)
{
- if (message is ISublistContainer)
+ if (message is ISublistContainer sublistContainer)
{
- ((ISublistContainer)message).DeleteElements();
+ (sublistContainer).DeleteElements();
}
this.Delete(message);
}
@@ -694,8 +692,8 @@ namespace bsmd.database
{
if(message.MessageNotificationClass == Message.NotificationClass.HAZD)
{
- if(derivedMessage is HAZ)
- ((HAZ)derivedMessage).IsDeparture = true;
+ if(derivedMessage is HAZ hAZ)
+ (hAZ).IsDeparture = true;
}
message.Elements.Add(derivedMessage);
derivedMessage.MessageHeader = message;