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

Version 3.3.7

Browse Source 
Nochmal eine kleine Anpassung in den Sheets vorgenommen, zur Vermeidung doppelter Namen.
This commit is contained in:
Daniel Schick 2017-01-19 14:01:03 +00:00
parent 3cecac36c8
commit 598fe61233
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Stundensheet.xlsx
View File

Binary file not shown.

BIN
nsw/Dänemark/NSW-DK-Excel-Arrival.xltx
View File

Binary file not shown.

BIN
nsw/Dänemark/NSW-DK-Excel-Departure.xltx
View File

Binary file not shown.

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

@ -197,7 +197,10 @@ namespace bsmd.ExcelReadService
Util.ScanMessage(tiefa, reader); Util.ScanMessage(tiefa, reader);
if (!tiefa.DraughtUponArrival_DMT.HasValue && tiefaMessage.IsNew) if (!tiefa.DraughtUponArrival_DMT.HasValue && tiefaMessage.IsNew)
messages.Remove(tiefaMessage); messages.Remove(tiefaMessage);
}
reader.Conf.ConfirmNumber("TIEFA.DraughtUponArrival_DMT_DK", tiefa.DraughtUponArrival_DMT, tiefa.DraughtUponArrival_DMT.HasValue ? ExcelReader.ReadState.OK : ExcelReader.ReadState.FAIL);
}
#endregion #endregion
@ -216,7 +219,10 @@ namespace bsmd.ExcelReadService
Util.ScanMessage(tiefd, reader); Util.ScanMessage(tiefd, reader);
if (!tiefd.DraughtUponDeparture_DMT.HasValue && tiefdMessage.IsNew) if (!tiefd.DraughtUponDeparture_DMT.HasValue && tiefdMessage.IsNew)
messages.Remove(tiefdMessage); messages.Remove(tiefdMessage);
}
reader.Conf.ConfirmNumber("TIEFD.DraughtUponDeparture_DMT_DK", tiefd.DraughtUponDeparture_DMT, tiefd.DraughtUponDeparture_DMT.HasValue ? ExcelReader.ReadState.OK : ExcelReader.ReadState.FAIL);
}
#endregion #endregion
@ -1009,7 +1015,9 @@ namespace bsmd.ExcelReadService
callPurpose.CallPurposeCode = ((int?) reader.ReadNumber(callPurposeCodeKey)) ?? 0; callPurpose.CallPurposeCode = ((int?) reader.ReadNumber(callPurposeCodeKey)) ?? 0;
callPurpose.CallPurposeDescription = callPurposeDescription; callPurpose.CallPurposeDescription = callPurposeDescription;
reader.Conf.ConfirmText(callPurposeDescriptionKey, callPurposeDescription, callPurposeDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); reader.Conf.ConfirmText(callPurposeDescriptionKey, callPurposeDescription, callPurposeDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
} if(i==1)
reader.Conf.ConfirmText("NOA_NOD.CallPuposeDescription_1_DK", callPurposeDescription, callPurposeDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
}
} }
} }
@ -2154,6 +2162,7 @@ namespace bsmd.ExcelReadService
// copy poc/imo/eta to return sheet // copy poc/imo/eta to return sheet
poc = reader.ReadText("Visit.PortOfCall"); poc = reader.ReadText("Visit.PortOfCall");
reader.Conf.ConfirmText("Visit.PortOfCall", poc, ExcelReader.ReadState.OK); reader.Conf.ConfirmText("Visit.PortOfCall", poc, ExcelReader.ReadState.OK);
reader.Conf.ConfirmText("Visit.PortOfCall_DK", poc, ExcelReader.ReadState.OK);
imo = reader.ReadText("Visit.IMONumber"); imo = reader.ReadText("Visit.IMONumber");
reader.Conf.ConfirmText("Visit.IMONumber", imo, ExcelReader.ReadState.OK); reader.Conf.ConfirmText("Visit.IMONumber", imo, ExcelReader.ReadState.OK);
eta = reader.ReadDateTime("NOA_NOD.ETADateToPortOfCall", "NOA_NOD.ETATimeToPortOfCall"); eta = reader.ReadDateTime("NOA_NOD.ETADateToPortOfCall", "NOA_NOD.ETATimeToPortOfCall");
@ -2240,13 +2249,14 @@ namespace bsmd.ExcelReadService
} }
reader.Conf.ConfirmText("Visit.PortOfCall", poc, ExcelReader.ReadState.OK); reader.Conf.ConfirmText("Visit.PortOfCall", poc, ExcelReader.ReadState.OK);
reader.Conf.ConfirmText("Visit.PortOfCall_DK", poc, ExcelReader.ReadState.OK);
} }
else else
{ {
reader.Conf.ConfirmText("Visit.PortOfCall", poc, ExcelReader.ReadState.FAIL); reader.Conf.ConfirmText("Visit.PortOfCall", poc, ExcelReader.ReadState.FAIL);
} reader.Conf.ConfirmText("Visit.PortOfCall_DK", poc, ExcelReader.ReadState.FAIL);
}
} }

2
nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("3.3.6")] [assembly: AssemblyInformationalVersion("3.3.7")]
[assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
View File

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