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

NSW 6.0 Abschluss 6.0.6

Browse Source
This commit is contained in:
Daniel Schick 2020-03-31 15:56:50 +00:00
parent 6254085f84
commit 34c6da96d6
10 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ENI-2/ENI2/ENI2/ENI2.csproj
View File

@ -34,7 +34,7 @@
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion> <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>6.0.5.%2a</ApplicationVersion> <ApplicationVersion>6.0.5.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>

BIN
Stundensheet.xlsx
View File

Binary file not shown.

BIN
nsw/Source/bsmd.POService/misc/Sammelrechnung.xlsx Normal file
View File

Binary file not shown.

BIN
nsw/Source/bsmd.POService/misc/Sammelrechnung_SEAGO_KW_08.xlsx Normal file
View File

Binary file not shown.

BIN
nsw/Source/bsmd.POService/misc/Sammelrechnung_Test.xlsx Normal file
View File

Binary file not shown.

4
nsw/Source/bsmd.ReportGenerator/ReportService.cs
View File

@ -21,9 +21,9 @@ namespace bsmd.ReportGenerator
{ {
private Timer _timer; private Timer _timer;
private object _timerlock = new object(); private readonly object _timerlock = new object();
private bool processRunning = false; private bool processRunning = false;
private ILog _log = LogManager.GetLogger(typeof(ReportService)); private readonly ILog _log = LogManager.GetLogger(typeof(ReportService));
public ReportService() public ReportService()
{ {

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

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("6.0.5")] [assembly: AssemblyInformationalVersion("6.0.6")]
[assembly: AssemblyCopyright("Copyright © 2014-2020 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2020 schick Informatik")]
[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("6.0.5.*")] [assembly: AssemblyVersion("6.0.6.*")]

4
nsw/Source/bsmd.hisnord/Request.cs
View File

@ -1356,7 +1356,7 @@ namespace bsmd.hisnord
hn_pas.Passenger[i].PassengerIdentityDocumentExpiryDateSpecified = pas.PassengerIdentityDocumentExpiryDate.HasValue; hn_pas.Passenger[i].PassengerIdentityDocumentExpiryDateSpecified = pas.PassengerIdentityDocumentExpiryDate.HasValue;
if (pas.PassengerIdentityDocumentExpiryDate.HasValue) if (pas.PassengerIdentityDocumentExpiryDate.HasValue)
hn_pas.Passenger[i].PassengerIdentityDocumentExpiryDate = pas.PassengerIdentityDocumentExpiryDate.Value; hn_pas.Passenger[i].PassengerIdentityDocumentExpiryDate = pas.PassengerIdentityDocumentExpiryDate.Value;
if(pas.PassengerIdentityDocumentIssuingState.Trim().Length == 2) if(pas.PassengerIdentityDocumentIssuingState?.Trim().Length == 2)
hn_pas.Passenger[i].PassengerIdentityDocumentIssuingState = pas.PassengerIdentityDocumentIssuingState; hn_pas.Passenger[i].PassengerIdentityDocumentIssuingState = pas.PassengerIdentityDocumentIssuingState;
} }
@ -1404,7 +1404,7 @@ namespace bsmd.hisnord
hn_crew.CrewMember[i].CrewmemberIdentityDocumentExpiryDateSpecified = crew.CrewMemberIdentityDocumentExpiryDate.HasValue; hn_crew.CrewMember[i].CrewmemberIdentityDocumentExpiryDateSpecified = crew.CrewMemberIdentityDocumentExpiryDate.HasValue;
if (crew.CrewMemberIdentityDocumentExpiryDate.HasValue) if (crew.CrewMemberIdentityDocumentExpiryDate.HasValue)
hn_crew.CrewMember[i].CrewmemberIdentityDocumentExpiryDate = crew.CrewMemberIdentityDocumentExpiryDate.Value; hn_crew.CrewMember[i].CrewmemberIdentityDocumentExpiryDate = crew.CrewMemberIdentityDocumentExpiryDate.Value;
if(crew.CrewMemberIdentityDocumentIssuingState.Trim().Length == 2) if(crew.CrewMemberIdentityDocumentIssuingState?.Trim().Length == 2)
hn_crew.CrewMember[i].CrewMemberIdentityDocumentIssuingState = crew.CrewMemberIdentityDocumentIssuingState; hn_crew.CrewMember[i].CrewMemberIdentityDocumentIssuingState = crew.CrewMemberIdentityDocumentIssuingState;
} }

2
nsw/Source/bsmd.hisnord/transmitter.cs
View File

@ -90,6 +90,8 @@ namespace bsmd.hisnord
{ {
transmitterProcess.Kill(); transmitterProcess.Kill();
_log.Info("Transmitter killed"); _log.Info("Transmitter killed");
if (useTest) processTestId = null;
else processId = null;
} }
catch (Exception e) catch (Exception e)
{ {