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

bis 3.2.25: kleinere und Kleinste Korrekturen

Browse Source
This commit is contained in:
Daniel Schick 2016-11-23 07:10:19 +00:00
parent 8a760dae4d
commit d1b4044582
6 changed files with 45 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.

21
Zugang_BSMD-Server-Bux_DanielSchick_20150222.txt
View File

@ -17,8 +17,29 @@ SMNSW01 [NSW-Server], 192.168.2.4, vorher: www.schiffsmelder.com:41624
SMSPLASH01 [Dashface-Server], 192.168.2.5, vorher: www.schiffsmelder.com:41625 SMSPLASH01 [Dashface-Server], 192.168.2.5, vorher: www.schiffsmelder.com:41625
SMAIS01 [AIS-Server], 192.168.2.11
SMDEV01 [Devel-System], 192.168.2.6
für alle Server: für alle Server:
User: Administrator User: Administrator
PW: $chegVAN99! PW: $chegVAN99!
hallo12345 hallo12345
daniel.schick#
yycYYC321
daniel.schick#
Winter2015
bscw,dkz.it.de:
mippel
$jj$.ASD12
Gast-WLAN:
AksSD231.23ddf
Test-Email Konto für Excel-Versand / Import:
excel@textbausteine.net
3kjasWss.;.

18
nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
View File

@ -329,9 +329,21 @@ namespace bsmd.ExcelReadService
// TODO: weitere varianten ausprobieren // TODO: weitere varianten ausprobieren
if (date != null) if (date != null)
this.HighlightLookup(lookup, ReadState.OK); {
if ((date.Value < new DateTime(1900, 1, 1)) || (date.Value > new DateTime(2030, 1, 1)))
{
date = null;
this.HighlightLookup(lookup, ReadState.WARN);
}
else
{
this.HighlightLookup(lookup, ReadState.OK);
}
}
else else
this.HighlightLookup(lookup, ReadState.WARN); {
this.HighlightLookup(lookup, ReadState.FAIL);
}
} }
return date; return date;
@ -468,7 +480,7 @@ namespace bsmd.ExcelReadService
} }
else else
{ {
this.HighlightLookup(lookup, ReadState.WARN); this.HighlightLookup(lookup, ReadState.FAIL);
} }
} }
} }

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

@ -329,6 +329,9 @@ namespace bsmd.ExcelReadService
stat.PortOfRegistry = LocodeDB.LocodeFromCity(stat.PortOfRegistry, stat.Flag); stat.PortOfRegistry = LocodeDB.LocodeFromCity(stat.PortOfRegistry, stat.Flag);
} }
if (!stat.Flag.IsNullOrEmpty() && (stat.Flag.Length > 2))
reader.HighlightLookup("STAT.Flag", ExcelReader.ReadState.FAIL);
string transportMode = reader.ReadText("STAT.TransportMode"); string transportMode = reader.ReadText("STAT.TransportMode");
if(transportMode != null) if(transportMode != null)
{ {
@ -994,6 +997,8 @@ namespace bsmd.ExcelReadService
crew.CrewMemberGender = reader.ReadGender(crewGender); crew.CrewMemberGender = reader.ReadGender(crewGender);
crew.CrewMemberDuty = reader.ReadText(crewDuty); crew.CrewMemberDuty = reader.ReadText(crewDuty);
crew.CrewMemberNationality = reader.ReadText(crewNationality); crew.CrewMemberNationality = reader.ReadText(crewNationality);
if (!crew.CrewMemberNationality.IsNullOrEmpty() && (crew.CrewMemberNationality.Length > 2))
reader.HighlightLookup(crewNationality, ExcelReader.ReadState.FAIL);
crew.CrewMemberPlaceOfBirth = reader.ReadText(crewPlaceOfBirth); crew.CrewMemberPlaceOfBirth = reader.ReadText(crewPlaceOfBirth);
crew.CrewMemberDateOfBirth = reader.ReadDate(crewDateOfBirth); crew.CrewMemberDateOfBirth = reader.ReadDate(crewDateOfBirth);
crew.CrewMemberIdentityDocumentType = reader.ReadIdentityDocumentType(crewIdentDocType); crew.CrewMemberIdentityDocumentType = reader.ReadIdentityDocumentType(crewIdentDocType);
@ -1042,6 +1047,8 @@ namespace bsmd.ExcelReadService
pas.PassengerFirstName = reader.ReadText(pasFirstName); pas.PassengerFirstName = reader.ReadText(pasFirstName);
pas.PassengerGender = reader.ReadGender(pasGender); pas.PassengerGender = reader.ReadGender(pasGender);
pas.PassengerNationality = reader.ReadText(pasNationality); pas.PassengerNationality = reader.ReadText(pasNationality);
if (!pas.PassengerNationality.IsNullOrEmpty() && pas.PassengerNationality.Length > 2)
reader.HighlightLookup(pasNationality, ExcelReader.ReadState.FAIL);
// TODO: Nicht klar ob hier LOCODEs kommen oder nicht // TODO: Nicht klar ob hier LOCODEs kommen oder nicht
pas.PassengerPortOfEmbarkation = reader.ReadTextNoWhitespace(pasEmbarkation); pas.PassengerPortOfEmbarkation = reader.ReadTextNoWhitespace(pasEmbarkation);
pas.PassengerPortOfDisembarkation = reader.ReadTextNoWhitespace(pasDebarkation); pas.PassengerPortOfDisembarkation = reader.ReadTextNoWhitespace(pasDebarkation);

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.2.22")] [assembly: AssemblyInformationalVersion("3.2.25")]
[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.2.22.*")] [assembly: AssemblyVersion("3.2.25.*")]