dschick/git_bsmd
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Abrechnung Januar 2019

Browse Source
This commit is contained in:
Daniel Schick 2019-02-01 06:12:28 +00:00
parent 38099838a3
commit 4bb7f7e14c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Stundensheet.xlsx
View File

Binary file not shown.

12
nsw/Source/bsmd.ExcelReadService/Util.cs
View File

@ -1198,7 +1198,7 @@ namespace bsmd.ExcelReadService
} }
} }
string lastPort = reader.ReadText("NOA_NOD.LastPort")?.Trim(); string lastPort = reader.ReadText("NOA_NOD.LastPort")?.Trim().ToUpper();
if (lastPort != null) if (lastPort != null)
{ {
@ -1218,11 +1218,10 @@ namespace bsmd.ExcelReadService
reader.Conf.ConfirmText("NOA_NOD.LastPort", lastPort, noa_nod.LastPort.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); reader.Conf.ConfirmText("NOA_NOD.LastPort", lastPort, noa_nod.LastPort.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
string nextPort = reader.ReadText("NOA_NOD.NextPort"); string nextPort = reader.ReadText("NOA_NOD.NextPort")?.Trim().ToUpper();
bool? isValidSSNPort = false; bool? isValidSSNPort = false;
if (!nextPort.IsNullOrEmpty()) if (!nextPort.IsNullOrEmpty())
{ {
noa_nod.NextPort = nextPort.Trim();
if (noa_nod.NextPort.Length > 5) if (noa_nod.NextPort.Length > 5)
noa_nod.NextPort = noa_nod.NextPort.Substring(0, 5); //trunc noa_nod.NextPort = noa_nod.NextPort.Substring(0, 5); //trunc
isValidSSNPort = !LocodeDB.SSNPortNameFromLocode(noa_nod.NextPort).IsNullOrEmpty(); isValidSSNPort = !LocodeDB.SSNPortNameFromLocode(noa_nod.NextPort).IsNullOrEmpty();
@ -2666,7 +2665,8 @@ namespace bsmd.ExcelReadService
poc = reader.ReadText("Visit.PortOfCall"); poc = reader.ReadText("Visit.PortOfCall");
if (poc != null) if (poc != null)
{ {
// Prüfen auf Transit // Prüfen auf Transit
if (poc.IndexOf("CANAL", StringComparison.OrdinalIgnoreCase) >= 0 || poc.Equals("ZZNOK", StringComparison.OrdinalIgnoreCase)) if (poc.IndexOf("CANAL", StringComparison.OrdinalIgnoreCase) >= 0 || poc.Equals("ZZNOK", StringComparison.OrdinalIgnoreCase))
{ {
@ -2717,6 +2717,8 @@ namespace bsmd.ExcelReadService
if (poc != null) if (poc != null)
{ {
poc = poc.ToUpper();
// setup returning confirmation sheets according to PoC // setup returning confirmation sheets according to PoC
if (poc.Substring(0, 2) == "DK") if (poc.Substring(0, 2) == "DK")
reader.SetConfirmation(Properties.Settings.Default.ConfirmationDK); reader.SetConfirmation(Properties.Settings.Default.ConfirmationDK);