diff --git a/BeWo.sln b/BeWo.sln index 5896d25d3..f622d3d94 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -601,6 +601,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MalteserJohanniterJohannesh EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoLauncher", "BeWoLauncher\BeWoLauncher.csproj", "{E3BA193A-A64F-4CE6-91BE-F54E551797BE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedLauncher", "SharedLauncher\SharedLauncher.csproj", "{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DownloadServer", "DownloadServer\DownloadServer.csproj", "{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -4796,6 +4802,54 @@ Global {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.Build.0 = Release|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Release|x86.ActiveCfg = Release|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Release|x86.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|.NET.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|.NET.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|x86.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|x86.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|.NET.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|.NET.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Any CPU.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|x86.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|x86.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|.NET.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|.NET.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|x86.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|x86.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|.NET.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|.NET.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Any CPU.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|x86.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|x86.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|.NET.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|.NET.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|x86.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|x86.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|.NET.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|.NET.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Any CPU.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|x86.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -5092,6 +5146,8 @@ Global {AD3876F3-40C0-47CF-BA36-687139903F87} = {D8A691C5-146D-4613-86CC-438F02FE9106} {28331CB1-17FD-4B58-A837-E0249CAAC535} = {D8A691C5-146D-4613-86CC-438F02FE9106} {47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} + {E3BA193A-A64F-4CE6-91BE-F54E551797BE} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 1c47a2283..5e4efb670 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -632,10 +632,55 @@ namespace BeWo { get { - return new Uri(SessionInformation.Connection.CoreServerAddressExact); + return new Uri(SessionInformation.Connection.CoreServerAddressExact ?? SiteOfOrigin2.ToString()); } } + internal static Uri SiteOfOrigin2 + { + get + { + String url = ""; +#if DEBUG + url = String.Format("http://localhost:3777/Host"); + //return new Uri("https://app5.bewoplaner.de/service"); + //url = String.Format("app1.bewoplaner.de/service"); +#endif + + if (!String.IsNullOrEmpty(ServerAddress) && String.IsNullOrEmpty(url)) + { + url = ServerAddress.ToLower(); + } + + + if (url.IndexOf("localhost") < 0) + { + int i; + + + if (Int32.TryParse(url, out i)) + url = "app" + url; + + if (url.IndexOf('.') < 0) + { + url += ".bewoplaner.de"; + } + + //if (url.IndexOf("/service45") < 0) + //{ + // url += "/service45"; + //} + if (url.IndexOf("/service") < 0) + { + url += "/service"; + } + + return new Uri(String.Format("https://{0}", url)); + } + return new Uri(url); + } + } + public static int LockUITime { get @@ -896,8 +941,10 @@ namespace BeWo if (args.Length > 0) { - SessionInformation.LoadPipe(args[0]); - Loader.Load(); + var success = SessionInformation.LoadPipe(args[0]); + + if(success) + Loader.Load(); } } diff --git a/BeWo/MainWindow.xaml.cs b/BeWo/MainWindow.xaml.cs index 87e35e9c8..dea3d0ecc 100644 --- a/BeWo/MainWindow.xaml.cs +++ b/BeWo/MainWindow.xaml.cs @@ -23,8 +23,8 @@ namespace BeWo if (Loader.Loaded) ShowNewWay(); else - //ShowOldWay(false); - throw new Exception("Loader failed"); + ShowOldWay(false); + //throw new Exception("Loader failed"); } private void ShowNewWay() diff --git a/BeWo/Ressources/Icons/AB.png b/BeWo/Ressources/Icons/AB.png new file mode 100644 index 000000000..0cdf9eb89 Binary files /dev/null and b/BeWo/Ressources/Icons/AB.png differ diff --git a/BeWo/Ressources/Icons/BoyAndGirl.png b/BeWo/Ressources/Icons/BoyAndGirl.png new file mode 100644 index 000000000..0cdf9eb89 Binary files /dev/null and b/BeWo/Ressources/Icons/BoyAndGirl.png differ diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index 371216a8f..b3cc74267 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -852,6 +852,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VereinBeratungTherapie", "R EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AkkuratDienstleistungsgesellschaft", "ReportImp\AkkuratDienstleistungsgesellschaft\AkkuratDienstleistungsgesellschaft.csproj", "{AE5234BB-D0E3-4735-B965-D0397564334E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DownloadServer", "DownloadServer\DownloadServer.csproj", "{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoLauncher", "BeWoLauncher\BeWoLauncher.csproj", "{E3BA193A-A64F-4CE6-91BE-F54E551797BE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedLauncher", "SharedLauncher\SharedLauncher.csproj", "{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -10463,6 +10469,78 @@ Global {AE5234BB-D0E3-4735-B965-D0397564334E}.Release|Mixed Platforms.Build.0 = Release|Any CPU {AE5234BB-D0E3-4735-B965-D0397564334E}.Release|x86.ActiveCfg = Release|Any CPU {AE5234BB-D0E3-4735-B965-D0397564334E}.Release|x86.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|.NET.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|.NET.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|x86.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|x86.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|x86.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|.NET.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|.NET.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Any CPU.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|x86.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|x86.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|.NET.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|.NET.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|x86.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|x86.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|x86.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|.NET.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|.NET.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Any CPU.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|x86.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|x86.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|.NET.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|.NET.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|x86.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|x86.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|x86.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|.NET.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|.NET.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Any CPU.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|x86.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -10887,6 +10965,8 @@ Global {40C28D21-E6A0-400D-B8E8-27341D580BD5} = {D8A691C5-146D-4613-86CC-438F02FE9106} {89BD2C63-5B2E-4BA0-BCEF-B66997A8CBAC} = {D8A691C5-146D-4613-86CC-438F02FE9106} {AE5234BB-D0E3-4735-B965-D0397564334E} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} + {E3BA193A-A64F-4CE6-91BE-F54E551797BE} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWoSmallReports.sln b/BeWoSmallReports.sln index 73e8d99bc..6754edc0b 100644 --- a/BeWoSmallReports.sln +++ b/BeWoSmallReports.sln @@ -754,6 +754,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLWV", "ReportImp\TestLW EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedLauncher", "SharedLauncher\SharedLauncher.csproj", "{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoLauncher", "BeWoLauncher\BeWoLauncher.csproj", "{E3BA193A-A64F-4CE6-91BE-F54E551797BE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DownloadServer", "DownloadServer\DownloadServer.csproj", "{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -9208,6 +9214,78 @@ Global {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.Build.0 = Release|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Release|x86.ActiveCfg = Release|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Release|x86.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|.NET.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|.NET.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|x86.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|x86.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.DebugRemote|x86.Build.0 = Debug|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|.NET.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|.NET.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Any CPU.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|x86.ActiveCfg = Release|Any CPU + {EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|x86.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|.NET.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|.NET.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|x86.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|x86.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.DebugRemote|x86.Build.0 = Debug|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|.NET.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|.NET.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Any CPU.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|x86.ActiveCfg = Release|Any CPU + {E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|x86.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|.NET.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|.NET.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|x86.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|x86.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.DebugRemote|x86.Build.0 = Debug|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|.NET.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|.NET.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Any CPU.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|x86.ActiveCfg = Release|Any CPU + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -9583,6 +9661,8 @@ Global {8725A58B-AB80-4906-9B13-2D4144FF09EA} = {D8A691C5-146D-4613-86CC-438F02FE9106} {BA124454-FE85-4909-8271-62544E13CAA8} = {D8A691C5-146D-4613-86CC-438F02FE9106} {47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} + {E3BA193A-A64F-4CE6-91BE-F54E551797BE} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} + {18019E8C-C6DA-4B1B-9C2B-908BC14911AB} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index a0002e9f5..769cd8b25 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -3,7 +3,7 @@ BeWo2.0 true - Debug|Any CPU + Release|Any CPU false diff --git a/SharedLauncher/Information/Connection.cs b/SharedLauncher/Information/Connection.cs index 0b0df6f92..db19cfb40 100644 --- a/SharedLauncher/Information/Connection.cs +++ b/SharedLauncher/Information/Connection.cs @@ -83,29 +83,40 @@ namespace BS.SharedLauncher.Information { get { - String url = CoreServerAddress?.ToLower(); + try + { + + String url = CoreServerAddress?.ToLower(); + + if (string.IsNullOrEmpty(url)) + return null; + + // Localhost + if (url.IndexOf("localhost") >= 0) + return new Uri(url).ToString(); + + // Just Number + if (int.TryParse(url, out int i)) + url = "app" + url; + + // Kein Https + if (url.IndexOf("https://") < 0) + url = "https://" + url; + + // Kein Punkt + if (url.IndexOf('.') < 0) + url += ".bewoplaner.de"; + + // Kein Slash + if (url.IndexOf("/service") < 0) + url += "/service"; - // Localhost - if (url.IndexOf("localhost") >= 0) return new Uri(url).ToString(); - - // Just Number - if (int.TryParse(url, out int i)) - url = "app" + url; - - // Kein Https - if (url.IndexOf("https://") < 0) - url = "https://" + url; - - // Kein Punkt - if (url.IndexOf('.') < 0) - url += ".bewoplaner.de"; - - // Kein Slash - if (url.IndexOf("/service") < 0) - url += "/service"; - - return new Uri(url).ToString(); + } + catch(Exception e) + { + return null; + } } } } diff --git a/SharedLauncher/Information/SessionInformation.cs b/SharedLauncher/Information/SessionInformation.cs index ee4f38250..157424da9 100644 --- a/SharedLauncher/Information/SessionInformation.cs +++ b/SharedLauncher/Information/SessionInformation.cs @@ -99,7 +99,7 @@ namespace BS.SharedLauncher.Information Loaded = true; } - public static void LoadPipe(string pipe) + public static bool LoadPipe(string pipe) { try { @@ -131,10 +131,12 @@ namespace BS.SharedLauncher.Information Load(connection, login, session); } } + + return true; } catch (Exception ex) { - throw ex; + return false; } }