From 6fb405f95541550f3f19f91b515fabd81287057d Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 13 Apr 2017 18:11:13 +0000 Subject: [PATCH] Version 3.5.2.*: ENI-2 jetzt mit ClickOnce Installation --- ENI-2/ENI2/ENI2/App.config | 2 +- ENI-2/ENI2/ENI2/ENI2.csproj | 48 +++++++++++++++--- ENI-2/ENI2/ENI2/ENI2_TemporaryKey.pfx | Bin 0 -> 1609 bytes ENI-2/ENI2/ENI2/MainWindow.xaml | 2 +- .../ENI2/Properties/Resources.Designer.cs | 10 ++++ ENI-2/ENI2/ENI2/Properties/Resources.resx | 3 ++ .../ENI2/ENI2/Properties/Settings.Designer.cs | 4 +- ENI-2/ENI2/ENI2/Properties/Settings.settings | 2 +- ENI-2/ENI2/ENI2/Properties/app.manifest | 46 +++++++++++++++++ ENI-2/ENI2/ENI2/Resources/logo_schwarz.ico | Bin 0 -> 25485 bytes ENI-2/ENI2/ENI2/SucheControl.xaml | 2 +- ENI-2/ENI2/ENI2/anmeldungenControl.xaml | 2 +- Stundensheet.xlsx | Bin 29278 -> 29326 bytes nsw/Source/bsmd.ExcelReadService/Util.cs | 20 +++++--- nsw/Source/bsmd.database/DBManager.cs | 5 +- nsw/Source/bsmd.database/MessageCore.cs | 13 +++++ .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- .../Properties/AssemblyProjectKeyInfo.cs | 2 +- 19 files changed, 139 insertions(+), 26 deletions(-) create mode 100644 ENI-2/ENI2/ENI2/ENI2_TemporaryKey.pfx create mode 100644 ENI-2/ENI2/ENI2/Properties/app.manifest create mode 100644 ENI-2/ENI2/ENI2/Resources/logo_schwarz.ico 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 0000000000000000000000000000000000000000..14918a44160efe0541e518f6bb7e6927380bb41c GIT binary patch literal 25485 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 - + 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 10a11fdd284f0255fb71be55bd0f27b47b486033..dfd0a171ca32d0870983ca1718bff9f8488c454c 100644 GIT binary patch delta 17839 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 ZaX0*i002F&1X2J1 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