diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index 85221ef7..b793453c 100644 --- a/ENI-2/ENI2/ENI2/App.config +++ b/ENI-2/ENI2/ENI2/App.config @@ -17,7 +17,7 @@ Sample license text. - Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False + Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index 7516ec77..d34ca813 100644 --- a/ENI-2/ENI2/ENI2/ENI2.csproj +++ b/ENI-2/ENI2/ENI2/ENI2.csproj @@ -14,20 +14,30 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true - publish\ + true + eni2.publish\ true - Disk - false + Web + true Foreground 7 Days false false true - 0 - 1.0.0.%2a - false + http://smnsw01.bsmd.local/eni2.publish/ + http://smnsw01.bsmd.local/eni2.publish/ + http://www.textbausteine.net/ + ENI2 + Informatikbüro Daniel Schick + 3.5.1.0 + true + publish.html + 2 + 3.5.2.%2a false + true + true true @@ -59,7 +69,25 @@ bsmdKey.snk - Resources\containership.ico + Resources\logo_schwarz.ico + + + LocalIntranet + + + true + + + Properties\app.manifest + + + C907F4E529D2646C3EAECBF9ACA831CCC99069A8 + + + ENI2_TemporaryKey.pfx + + + true @@ -175,7 +203,10 @@ + + + SettingsSingleFileGenerator Settings.Designer.cs @@ -212,6 +243,9 @@ bsmd.database + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ENI-2/ENI2/ENI2/Resources/logo_schwarz.ico b/ENI-2/ENI2/ENI2/Resources/logo_schwarz.ico new file mode 100644 index 00000000..14918a44 Binary files /dev/null and b/ENI-2/ENI2/ENI2/Resources/logo_schwarz.ico differ diff --git a/ENI-2/ENI2/ENI2/SucheControl.xaml b/ENI-2/ENI2/ENI2/SucheControl.xaml index 7ea05f80..d72667fb 100644 --- a/ENI-2/ENI2/ENI2/SucheControl.xaml +++ b/ENI-2/ENI2/ENI2/SucheControl.xaml @@ -62,7 +62,7 @@ - + diff --git a/ENI-2/ENI2/ENI2/anmeldungenControl.xaml b/ENI-2/ENI2/ENI2/anmeldungenControl.xaml index da97b96b..7d30aac1 100644 --- a/ENI-2/ENI2/ENI2/anmeldungenControl.xaml +++ b/ENI-2/ENI2/ENI2/anmeldungenControl.xaml @@ -14,7 +14,7 @@ - + diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 10a11fdd..dfd0a171 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs index ce305cd0..4d9f0ebf 100644 --- a/nsw/Source/bsmd.ExcelReadService/Util.cs +++ b/nsw/Source/bsmd.ExcelReadService/Util.cs @@ -2155,7 +2155,9 @@ namespace bsmd.ExcelReadService string crewVisaNo = string.Format("CREW.CrewMemberVisaNumber_{0}", i + 1); string lastName = reader.ReadText(crewLastName); - if (!lastName.IsNullOrEmpty()) + string firstName = reader.ReadText(crewFirstName); + + if (!lastName.IsNullOrEmpty() || !firstName.IsNullOrEmpty()) { CREW crew = crewMessage.GetSublistElementWithIdentifier((i + 1).ToString()) as CREW; if (crew == null) @@ -2167,9 +2169,9 @@ namespace bsmd.ExcelReadService } crew.CrewMemberLastName = lastName; - reader.Conf.ConfirmText(crewLastName, lastName, ExcelReader.ReadState.OK); - crew.CrewMemberFirstName = reader.ReadText(crewFirstName); - reader.Conf.ConfirmText(crewFirstName, crew.CrewMemberFirstName, crew.CrewMemberFirstName.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK); + reader.Conf.ConfirmText(crewLastName, lastName, crew.CrewMemberLastName.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); + crew.CrewMemberFirstName = firstName; + reader.Conf.ConfirmText(crewFirstName, crew.CrewMemberFirstName, crew.CrewMemberFirstName.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); crew.CrewMemberGender = reader.ReadGender(crewGender); crew.CrewMemberDuty = reader.ReadText(crewDuty); reader.Conf.ConfirmText(crewDuty, crew.CrewMemberDuty, ExcelReader.ReadState.OK); @@ -2266,7 +2268,9 @@ namespace bsmd.ExcelReadService string pasVisaNo = string.Format("PAS.PassengerVisaNumber_{0}", i + 1); string lastName = reader.ReadText(pasLastName); - if (!lastName.IsNullOrEmpty()) + string firstName = reader.ReadText(pasFirstName); + + if (!lastName.IsNullOrEmpty() || !firstName.IsNullOrEmpty()) { PAS pas = pasMessage.GetSublistElementWithIdentifier((i + 1).ToString()) as PAS; if (pas == null) @@ -2278,9 +2282,9 @@ namespace bsmd.ExcelReadService } pas.PassengerLastName = lastName; - reader.Conf.ConfirmText(pasLastName, lastName, ExcelReader.ReadState.OK); - pas.PassengerFirstName = reader.ReadText(pasFirstName); - reader.Conf.ConfirmText(pasFirstName, pas.PassengerFirstName, pas.PassengerFirstName.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK); + reader.Conf.ConfirmText(pasLastName, lastName, lastName.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); + pas.PassengerFirstName = firstName; + reader.Conf.ConfirmText(pasFirstName, pas.PassengerFirstName, pas.PassengerFirstName.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); pas.PassengerGender = reader.ReadGender(pasGender); pas.PassengerNationality = reader.ReadNationality(pasNationality); // TODO: Nicht klar ob hier LOCODEs kommen oder nicht diff --git a/nsw/Source/bsmd.database/DBManager.cs b/nsw/Source/bsmd.database/DBManager.cs index 93583ea7..932d88cf 100644 --- a/nsw/Source/bsmd.database/DBManager.cs +++ b/nsw/Source/bsmd.database/DBManager.cs @@ -878,7 +878,10 @@ namespace bsmd.database SqlDataReader reader = this.PerformCommand(cmd); if(reader.Read()) { - core.Shipname = reader.GetString(0); + if (reader.IsDBNull(0)) + core.Shipname = ""; + else + core.Shipname = reader.GetString(0); } reader.Close(); } diff --git a/nsw/Source/bsmd.database/MessageCore.cs b/nsw/Source/bsmd.database/MessageCore.cs index 04adc958..87f968d5 100644 --- a/nsw/Source/bsmd.database/MessageCore.cs +++ b/nsw/Source/bsmd.database/MessageCore.cs @@ -74,6 +74,19 @@ namespace bsmd.database [MaxLength(25)] public string TransitId { get; set; } + /// + /// Display Property für ENI-2 + /// + public string DisplayId + { + get + { + if (!VisitId.IsNullOrEmpty()) return VisitId; + if (!TransitId.IsNullOrEmpty()) return TransitId; + return ""; + } + } + [MaxLength(7)] public string IMO { get; set; } diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 11a59ed5..dbe7ad00 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("3.5.0")] +[assembly: AssemblyInformationalVersion("3.5.2")] [assembly: AssemblyCopyright("Copyright © 2014-2017 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index 5990322e..8339ee7e 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.5.0.*")] +[assembly: AssemblyVersion("3.5.2.*")] diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectKeyInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectKeyInfo.cs index cfc49fff..ac2ad5b7 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectKeyInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectKeyInfo.cs @@ -26,5 +26,5 @@ // documentation for more information on this. // [assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("..\\bsmdKey.snk")] +// [assembly: AssemblyKeyFile("..\\bsmdKey.snk")] [assembly: AssemblyKeyName("")] \ No newline at end of file