25 Commits

Author SHA1 Message Date
b6c9566cba Gitignore update 2024-06-07 14:35:13 +02:00
3e4994c4eb Launcher Path beim erneuten Einloggen anzeigen
Waiting entfernt bei "Zurück zu login"
2024-06-07 14:33:47 +02:00
f65cb3da72 Ordnung 2024-06-07 14:20:43 +02:00
6497a7ded5 Working now
- more logs
- download controller + manager überarbeitet
- Retry wird besser angezeigt
- Formatierungen
2024-06-07 13:42:25 +02:00
3f9f42b593 Logik übertragen - weitere Ausarbeitung 2024-06-06 15:42:04 +02:00
e2cf258f36 Download Manager + Download Controller aufgeräumt 2024-06-06 13:02:19 +02:00
6f0c28a7c7 Not Finished
Translation into SharedLauncher.csproj
Uninstall
2024-06-03 11:58:46 +02:00
58aaf05673 temp commit before merge 2024-05-28 11:50:30 +02:00
f3855aaebb Client Logger + Rest zum Testen auf app5 2024-05-27 15:28:40 +02:00
3dcfc8cb0e Debug: Lässt Prozess Killen zu - Release: Blockiert 2024-05-27 09:51:28 +02:00
44dfcad633 Mehr Download File Log Infos
+ Login wird verifiziert
-> immernoch 5 Sekunden zum Validieren

------
LOG File

[#0884 14:38:39]: -----------------------------------
[#0884 14:38:39]: >>> GetUpdatePlan Anfrage <<<
[#0884 14:38:39]: -----------------------------------
[#0884 14:38:39]: Validiere Plan Request.
[#0884 14:38:39]: Plan Request erfolreich validiert. Verifiziere Login.
[#0884 14:38:44]: Login verifiziert. Baue Antwort.
[#0884 14:38:45]: Antwort erfolgreich gebaut.
[#0884 14:38:45]: -----------------------------------

[#3067 14:38:49]: -----------------------------------
[#3067 14:38:49]: >>> GetUpdateFile Anfrage <<<
[#3067 14:38:49]: -----------------------------------
[#3067 14:38:49]: Validiere File Request.
[#3067 14:38:49]: Plan Request erfolreich validiert.
[#3067 14:38:49]: --> File: BeWoPlaner.application
[#3067 14:38:49]: Verifiziere Login.
[#3067 14:38:54]: Login verifiziert. Baue Antwort.
[#3067 14:38:54]: Antwort erfolgreich gebaut.
[#3067 14:38:54]: -----------------------------------

[#0952 14:38:54]: -----------------------------------
[#0952 14:38:54]: >>> GetUpdateFile Anfrage <<<
[#0952 14:38:54]: -----------------------------------
[#0952 14:38:54]: Validiere File Request.
[#0952 14:38:54]: Plan Request erfolreich validiert.
[#0952 14:38:54]: --> File: BeWoPlaner.exe
[#0952 14:38:54]: Verifiziere Login.
[#0952 14:38:59]: Login verifiziert. Baue Antwort.
[#0952 14:38:59]: Antwort erfolgreich gebaut.
[#0952 14:38:59]: -----------------------------------

[#8596 14:39:00]: -----------------------------------
[#8596 14:39:00]: >>> GetUpdateFile Anfrage <<<
[#8596 14:39:00]: -----------------------------------
[#8596 14:39:00]: Validiere File Request.
[#8596 14:39:00]: Plan Request erfolreich validiert.
[#8596 14:39:00]: --> File: BeWoPlaner.exe.config
[#8596 14:39:00]: Verifiziere Login.
[#8596 14:39:05]: Login verifiziert. Baue Antwort.
[#8596 14:39:05]: Antwort erfolgreich gebaut.
[#8596 14:39:05]: -----------------------------------

[#8990 14:39:05]: -----------------------------------
[#8990 14:39:05]: >>> GetUpdateFile Anfrage <<<
[#8990 14:39:05]: -----------------------------------
[#8990 14:39:05]: Validiere File Request.
[#8990 14:39:05]: Plan Request erfolreich validiert.
[#8990 14:39:05]: --> File: BeWoPlaner.exe.manifest
[#8990 14:39:05]: Verifiziere Login.
[#8990 14:39:10]: Login verifiziert. Baue Antwort.
[#8990 14:39:10]: Antwort erfolgreich gebaut.
[#8990 14:39:10]: -----------------------------------

[#4160 14:39:10]: -----------------------------------
[#4160 14:39:10]: >>> GetUpdateFile Anfrage <<<
[#4160 14:39:10]: -----------------------------------
[#4160 14:39:10]: Validiere File Request.
[#4160 14:39:10]: Plan Request erfolreich validiert.
[#4160 14:39:10]: --> File: BeWoPlaner.pdb
[#4160 14:39:10]: Verifiziere Login.
[#4160 14:39:15]: Login verifiziert. Baue Antwort.
[#4160 14:39:15]: Antwort erfolgreich gebaut.
[#4160 14:39:15]: -----------------------------------

[#2569 14:39:15]: -----------------------------------
[#2569 14:39:15]: >>> GetUpdateFile Anfrage <<<
[#2569 14:39:15]: -----------------------------------
[#2569 14:39:15]: Validiere File Request.
[#2569 14:39:15]: Plan Request erfolreich validiert.
[#2569 14:39:15]: --> File: Blacklight.Wpf.Controls.dll
[#2569 14:39:15]: Verifiziere Login.
[#2569 14:39:20]: Login verifiziert. Baue Antwort.
[#2569 14:39:20]: Antwort erfolgreich gebaut.
[#2569 14:39:20]: -----------------------------------

[#2962 14:39:20]: -----------------------------------
[#2962 14:39:20]: >>> GetUpdateFile Anfrage <<<
[#2962 14:39:20]: -----------------------------------
[#2962 14:39:20]: Validiere File Request.
[#2962 14:39:20]: Plan Request erfolreich validiert.
[#2962 14:39:20]: --> File: BS.Shared.dll
[#2962 14:39:20]: Verifiziere Login.
[#2962 14:39:25]: Login verifiziert. Baue Antwort.
[#2962 14:39:25]: Antwort erfolgreich gebaut.
[#2962 14:39:25]: -----------------------------------

[#8131 14:39:25]: -----------------------------------
[#8131 14:39:25]: >>> GetUpdateFile Anfrage <<<
[#8131 14:39:25]: -----------------------------------
[#8131 14:39:25]: Validiere File Request.
[#8131 14:39:25]: Plan Request erfolreich validiert.
[#8131 14:39:25]: --> File: BS.Shared.pdb
[#8131 14:39:25]: Verifiziere Login.
[#8131 14:39:30]: Login verifiziert. Baue Antwort.
[#8131 14:39:30]: Antwort erfolgreich gebaut.
[#8131 14:39:30]: -----------------------------------

[#2429 14:39:30]: -----------------------------------
[#2429 14:39:30]: >>> GetUpdateFile Anfrage <<<
[#2429 14:39:30]: -----------------------------------
[#2429 14:39:30]: Validiere File Request.
[#2429 14:39:30]: Plan Request erfolreich validiert.
[#2429 14:39:30]: --> File: BS.SharedLauncher.dll
[#2429 14:39:30]: Verifiziere Login.
[#2429 14:39:35]: Login verifiziert. Baue Antwort.
[#2429 14:39:35]: Antwort erfolgreich gebaut.
[#2429 14:39:35]: -----------------------------------
2024-05-24 14:41:46 +02:00
7da66cfae0 Merge branch 'master' into BewoRene_feature_Launcher
# Conflicts:
#	BeWoAllReports.sln
2024-05-24 14:24:14 +02:00
03f8d4af5d Project Files
+ Loader Exceptions reduziert
2024-05-24 14:16:08 +02:00
64728f231a Der Launcher sitzt wieder im Sattel 2024-05-24 13:55:00 +02:00
81a8c8dc27 Nicht fertig - erster Teil der master integration in den BeWoLauncher Branch 2024-05-22 17:10:52 +02:00
af4e753071 not complete - folder empty
Merge branch 'master' into BewoRene_feature_Launcher

# Conflicts:
#	BeWo/BeWoApp.xaml.cs
#	BeWo/Loader.cs
#	BeWo/app.config
#	BeWoLauncher/App.config
#	BeWoLauncher/BeWoLauncher.csproj
#	BeWoLauncher/Logic/Behavior/LaunchBehavior.cs
#	BeWoLauncher/View/Frames/InfoFrame.xaml
#	BeWoLauncher/View/Frames/InstallInfoFrame.xaml.cs
#	BeWoOhneReports.sln
#	DownloadServer/Multitenancy/demo.config
#	DownloadServer/Web.config
#	ReportImp/AlphaEv/Properties/Resources.resx
#	ReportImp/Inkomm/Properties/Resources.Designer.cs
#	Service/Multitenancy/DMultitenancyEndpointBehavior.cs
#	Service/Multitenancy/DMultitenancyHeader.cs
#	Service/Multitenancy/DMultitenancyInterceptor.cs
#	Service/ServiceImplementations/DownloadBeWoServiceImp.cs
#	Service/ServiceImplementations/LauncherServiceImp.cs
#	Service/ServiceUtils/Paths/ServerFilePaths.cs
#	Service/ServiceUtils/Update/UpdateConfigReader.cs
#	Service/ServiceUtils/Update/UpdateFileResponseBuilder.cs
#	Service/ServiceUtils/Update/UpdatePlanResponseBuilder.cs
#	SharedLauncher/DataContract/UpdatePlanResponse.cs
#	SharedLauncher/Information/SessionInformation.cs
2024-05-22 13:16:32 +02:00
a4e9b791c5 Force git conflict 2024-05-22 12:59:06 +02:00
4af0180baa remove 2024-05-22 11:44:20 +02:00
b2bae1d512 adding back in 2024-05-22 11:16:04 +02:00
d2a20c4d5c same with SharedLauncher 2024-05-22 11:15:39 +02:00
8e1471a519 add back in 2024-05-22 11:06:36 +02:00
47d8a5996f Remove, add next commit back in 2024-05-22 11:05:36 +02:00
88e0edcc76 Bessere Arbeitsweise -> Keine Exceptions über Service thrown, lieber kapseln
kleine bugs
2024-05-21 16:05:49 +02:00
5b30f4ad14 Ignore Commit - switched file structure 2024-05-21 10:28:08 +02:00
7811c2fb56 removed empty ref 2023-12-05 11:37:34 +01:00
413 changed files with 17110 additions and 242 deletions

9
.gitignore vendored
View File

@@ -9,6 +9,7 @@
/BeWoPlanerAndroid/obj
/BeWoPlanerMobil/bin
/BeWoPlanerMobil/obj
/BeWoTest
/Host/bin
/Host/obj
/Controls/bin
@@ -586,16 +587,8 @@ obj
/SharedLauncher/obj
/BeWoLauncher/bin
/BeWoLauncher/obj
/UnitTests/bin
/UnitTests/obj
/DownloadServer/bin
/DownloadServer/obj
/BeWoTest/bin
/BeWoTest/obj
/UnitTestProject472/bin
/UnitTestProject472/obj
/UnitTestProject45/bin
/UnitTestProject45/obj
/BeWoPlanerMobil/node_modules/.bin/escodegen
/BeWoPlanerMobil/node_modules/.bin/escodegen.cmd
/BeWoPlanerMobil/node_modules/.bin/escodegen.ps1

View File

@@ -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}

View File

@@ -836,6 +836,7 @@
<Compile Include="ConfirmDemoDialog.xaml.cs">
<DependentUpon>ConfirmDemoDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Loader.cs" />
<Compile Include="MultiLanguage\Markup\TranslateExtension.cs" />
<Compile Include="MultiLanguage\ServiceTranslator.cs" />
<Compile Include="ownChat\OwnChatHelper.cs" />
@@ -2515,6 +2516,10 @@
<Project>{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}</Project>
<Name>Controls</Name>
</ProjectReference>
<ProjectReference Include="..\SharedLauncher\SharedLauncher.csproj">
<Project>{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}</Project>
<Name>SharedLauncher</Name>
</ProjectReference>
<ProjectReference Include="..\Shared\Shared.csproj">
<Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
<Name>Shared</Name>

View File

@@ -33,6 +33,7 @@ using ChatController.HauptKlassen;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Grid;
using DevExpress.XtraScheduler;
using BS.SharedLauncher.Information;
namespace BeWo
{
@@ -627,7 +628,15 @@ namespace BeWo
}
}
internal static Uri SiteOfOrigin
internal static Uri SiteOfOrigin
{
get
{
return new Uri(SessionInformation.Connection.CoreServerAddressExact ?? SiteOfOrigin2.ToString());
}
}
internal static Uri SiteOfOrigin2
{
get
{
@@ -639,16 +648,16 @@ namespace BeWo
#endif
if (!String.IsNullOrEmpty(ServerAddress) && String.IsNullOrEmpty(url))
{
{
url = ServerAddress.ToLower();
}
if (url.IndexOf("localhost") < 0)
if (url.IndexOf("localhost") < 0)
{
int i;
if (Int32.TryParse(url, out i))
url = "app" + url;
@@ -656,17 +665,17 @@ namespace BeWo
{
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));
//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);
}
@@ -927,6 +936,16 @@ namespace BeWo
};
FrameworkElement.LanguageProperty.OverrideMetadata(typeof (FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
var args = e.Args;
if (args.Length > 0)
{
var success = SessionInformation.LoadPipe(args[0]);
if(success)
Loader.Load();
}
}
private static void ReloadSettings(List<SettingsDC> settings)
@@ -1177,7 +1196,7 @@ namespace BeWo
if (string.IsNullOrEmpty(username) || !username.Equals(_LoggedOnUser.LoginName, StringComparison.OrdinalIgnoreCase))
{
MessageBox.Show("Das Programm kann nur " + BS.Shared.Translation.Translator.Translate("vom Benutzer") + " '" + _LoggedOnUser.LoginName + "' entsperrt werden.", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
MessageBox.Show("Das Programm kann nur " + BS.SharedLauncher.Translation.Translator.Translate("vom Benutzer") + " '" + _LoggedOnUser.LoginName + "' entsperrt werden.", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
return;
}
@@ -1187,7 +1206,7 @@ namespace BeWo
{
if (!r.Equals(UserValidationResult.UserValid))
{
MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + " und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.SharedLauncher.Translation.Translator.Translate("Benutzernamen") + " und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
return;
}
@@ -1246,7 +1265,7 @@ namespace BeWo
tenant = "5473568546";
#endif
var login = new Login(tenant, serverUrl =>
var login = new ChatController.HauptKlassen.Login(tenant, serverUrl =>
{
if (!string.IsNullOrWhiteSpace(serverUrl))
{

View File

@@ -1754,10 +1754,10 @@ namespace BeWo.Core
case ServiceRecordValidationResult.ServiceRecordOverlapping:
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLS))
{
MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.SharedLauncher.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false;
}
else if (MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
else if (MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.SharedLauncher.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
{
lValid = false;
exitLoop = true;
@@ -1780,7 +1780,7 @@ namespace BeWo.Core
var klient = "diesen Hilfeplan";
if (!string.IsNullOrEmpty(result.CustomerName))
{
klient = BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
klient = BS.SharedLauncher.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
}
var msg = string.Format("Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag ({1:N}) überschritten.", result.ApprovedHours, result.HoursNew, klient);
@@ -1800,7 +1800,7 @@ namespace BeWo.Core
var klient2 = "diesen Hilfeplan";
if (!string.IsNullOrEmpty(result.CustomerName))
{
klient2 = BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
klient2 = BS.SharedLauncher.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordAfterSettlementInvoice))
{
@@ -1897,7 +1897,7 @@ namespace BeWo.Core
else
{
var msg = vm.GroupOid != null
? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne " + BS.Shared.Translation.Translator.Translate("Klienten") + " aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie den gesamten Gruppeneintrag löschen möchten?"
? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne " + BS.SharedLauncher.Translation.Translator.Translate("Klienten") + " aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie den gesamten Gruppeneintrag löschen möchten?"
: "Sind Sie sicher, dass Sie den gewählten Eintrag löschen möchten?";
if (MessageBox.Show(msg, "Eintrag löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning) !=

38
BeWo/Loader.cs Normal file
View File

@@ -0,0 +1,38 @@
using BeWo.ServiceProxy;
using BS.SharedLauncher.Information;
using System;
using System.Collections.Generic;
using System.IO;
using System.IO.Pipes;
using System.Linq;
using System.Windows;
namespace BeWo
{
public static class Loader
{
public static bool Loaded { get; set; }
static Loader()
{
Loaded = false;
}
public static void Load()
{
BeWoApp.UserName = SessionInformation.Login.Username;
BeWoApp.UserPassword = SessionInformation.Login.Password;
BeWoApp.ServerName = SessionInformation.Connection.Servername;
BeWoApp.Tenant = SessionInformation.Login.Tenant;
BeWoApp.ServerAddress = SessionInformation.Connection.CoreServerAddress;
BeWoApp.ShortVersion = SessionInformation.Session.Version;
BeWoApp.Version = "Version " + SessionInformation.Session.Version;
BeWoApp.LoggedOnUser = ServiceFacade.DoUserServiceSync(s => s.LoadUserByNameAndPassword(BeWoApp.UserName, BeWoApp.UserPassword));
BeWoApp.Mandator = ServiceFacade.DoOperationsServiceSync(s => s.GetMandator());
Loaded = true;
}
}
}

View File

@@ -10,7 +10,7 @@ namespace BeWo
Loaded += LockedPage_Loaded;
LblVersion.Content = BeWoApp.Version;
lblGesperrt.Content = $"Gesperrt von " + BS.Shared.Translation.Translator.Translate("BenutzerSingular") + " " + BeWoApp.LoggedOnUser.Employee.FirstName + " " + BeWoApp.LoggedOnUser.Employee.LastName;
lblGesperrt.Content = $"Gesperrt von " + BS.SharedLauncher.Translation.Translator.Translate("BenutzerSingular") + " " + BeWoApp.LoggedOnUser.Employee.FirstName + " " + BeWoApp.LoggedOnUser.Employee.LastName;
}
private void LockedPage_Loaded(object sender, RoutedEventArgs e)

View File

@@ -198,3 +198,5 @@
<Border x:Name="profileEditPopUp" />
</Grid>
</UserControl>

View File

@@ -29,8 +29,8 @@ using BeWo.Security;
using BeWo.ServiceProxy;
using BeWo.View;
using BeWo.View.Detail;
using BS.Shared.Translation;
using Path = System.IO.Path;
using BS.SharedLauncher.Translation;
namespace BeWo
{
@@ -675,7 +675,6 @@ namespace BeWo
}
if (ProfileList.Count == 0 || profileSelectionComboBox.SelectedItem == null)
{
MessageBox.Show(
@@ -769,7 +768,7 @@ namespace BeWo
this.Dispatch(delegate
{
grid_root.Children.Remove(lWaitLayer);
MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + " und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.SharedLauncher.Translation.Translator.Translate("Benutzernamen") + " und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
});
}
if (result == UserValidationResult.EmployeeDeleted)
@@ -1419,4 +1418,4 @@ namespace BeWo
return key1.Equals(key2);
}
}
}
}

View File

@@ -29,7 +29,7 @@ using BeWo.ViewModel;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using Hyperlink = System.Windows.Documents.Hyperlink;
namespace BeWo

View File

@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="BeWoPlaner" Height="768" Width="1024" WindowStartupLocation="CenterScreen" WindowState="Maximized"
BorderThickness="1" Closing="MainWindow_OnClosing">
BorderThickness="1" Closing="MainWindow_OnClosing" SourceInitialized="Window_SourceInitialized">
<Grid x:Name="rootGrid">
</Grid>

View File

@@ -4,7 +4,7 @@ using System.Threading;
using System.Windows;
using BeWo.Core.Config;
using BeWo.MultiLanguage;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Core;
namespace BeWo
@@ -19,7 +19,48 @@ namespace BeWo
InitializeComponent();
ApplicationThemeHelper.ApplicationThemeName = "Office2010Black";
ShowLoginControl();
if (Loader.Loaded)
ShowNewWay();
else
ShowOldWay(false);
//throw new Exception("Loader failed");
}
private void ShowNewWay()
{
Translator t = new Translator(new ServiceTranslator());
//WebRequest.DefaultWebProxy
//System.Net.WebRequest.GetSystemWebProxy()
rootGrid.Children.Clear();
MainControl mc = new MainControl();
mc.IsMaximized = BeWoApp.AppSettings.WindowState == AppSettings.WindowStateType.Maximised;
mc.LogoutClicked += new EventHandler(mc_LogoutClicked);
rootGrid.Children.Add(mc);
}
private void ShowOldWay(bool skiplogin)
{
if (skiplogin)
{
throw new NotImplementedException("47845978233134");
// Muss hier ggf string anpassen
//Loader.Load("tedemo?undemo?pwdemo?ip?sn1?cs?vr1.0.4.1");
//ShowNewWay();
}
else
{
//WebRequest.DefaultWebProxy
//System.Net.WebRequest.GetSystemWebProxy()
var lc = new LoginControl();
rootGrid.Children.Add(lc);
lc.LoginSuccessful += lc_LoginSuccessful;
}
}
private void ShowLoginControl()
@@ -66,7 +107,11 @@ namespace BeWo
{
rootGrid.Children.Clear();
BeWoApp.MainControl = null;
ShowLoginControl();
if(Loader.Loaded)
Application.Current.Shutdown(100);
else
ShowLoginControl();
}
private void MainWindow_OnClosing(object sender, CancelEventArgs e)
@@ -105,5 +150,12 @@ namespace BeWo
Application.Current.Shutdown();
}
private void Window_SourceInitialized(object sender, EventArgs e)
{
Console.WriteLine("GUI geladen");
Thread.Sleep(500);
}
}
}

View File

@@ -1,6 +1,6 @@
using System;
using BS.SharedLauncher.Translation;
using System;
using System.Windows.Markup;
using BS.Shared.Translation;
namespace BeWo.MultiLanguage.Markup
{

View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BeWo.ServiceProxy;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpo.Logger;
namespace BeWo.MultiLanguage

View File

@@ -31,7 +31,7 @@ namespace BeWo
var benutzername = BenutzernamenTextBox.Text;
if (benutzername.Equals(""))
{
MessageBox.Show("Bitte geben Sie einen " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + " an", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
MessageBox.Show("Bitte geben Sie einen " + BS.SharedLauncher.Translation.Translator.Translate("Benutzernamen") + " an", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
@@ -42,7 +42,7 @@ namespace BeWo
{
if(email.Equals("") || !hatEmail)
{
MessageBox.Show("Es konnte " + BS.Shared.Translation.Translator.Translate("kein Benutzer") + " mit diesem Namen gefunden werden oder " + BS.Shared.Translation.Translator.Translate("der Benutzer") + " hat keine E-Mail Adresse hinterlegt\nBitte wenden Sie sich an " + BS.Shared.Translation.Translator.Translate("Ihren Systemadministrator") + ".", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
MessageBox.Show("Es konnte " + BS.SharedLauncher.Translation.Translator.Translate("kein Benutzer") + " mit diesem Namen gefunden werden oder " + BS.SharedLauncher.Translation.Translator.Translate("der Benutzer") + " hat keine E-Mail Adresse hinterlegt\nBitte wenden Sie sich an " + BS.SharedLauncher.Translation.Translator.Translate("Ihren Systemadministrator") + ".", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 698 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 698 B

View File

@@ -29,8 +29,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Bars;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Scheduler;

View File

@@ -359,9 +359,9 @@ namespace BeWo.Scheduler.View
e.Handled = true;
}
public string CountSelectedEmployees => $"{SelectedEmployees.Count} " + BS.Shared.Translation.Translator.Translate("MitarbeiterPlural") + " ausgewählt";
public string CountSelectedEmployees => $"{SelectedEmployees.Count} " + BS.SharedLauncher.Translation.Translator.Translate("MitarbeiterPlural") + " ausgewählt";
public string CountSelectedResources => $"{SelectedResources.Count} Ressourcen ausgewählt";
public string CountSelectedCustomers => $"{SelectedCustomers.Count} " + BS.Shared.Translation.Translator.Translate("Klienten") + " ausgewählt";
public string CountSelectedCustomers => $"{SelectedCustomers.Count} " + BS.SharedLauncher.Translation.Translator.Translate("Klienten") + " ausgewählt";
public string CountSelectedSupportConcepts => $"{SelectedSupportConcepts.Count} Hilfepläne ausgewählt";
public override AppointmentFormController CreateFormController(SchedulerControl schedulerControl, Appointment appointment)
@@ -542,7 +542,7 @@ namespace BeWo.Scheduler.View
if(y.Count == 0)
{
MessageBox.Show("Bitte wählen Sie mindestens " + BS.Shared.Translation.Translator.Translate("einen Klienten") + " aus!");
MessageBox.Show("Bitte wählen Sie mindestens " + BS.SharedLauncher.Translation.Translator.Translate("einen Klienten") + " aus!");
}
else
{

View File

@@ -23,7 +23,7 @@ using BS.Shared.Extensions;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Editors;
using Microsoft.Win32;
using CheckBox = System.Windows.Controls.CheckBox;

View File

@@ -584,7 +584,7 @@ namespace BeWo.SchulbegleitenderDienst
}
else
{
MessageBox.Show("Bitte wählen sie zuerst " + BS.Shared.Translation.Translator.Translate("einen Klienten") + " aus.");
MessageBox.Show("Bitte wählen sie zuerst " + BS.SharedLauncher.Translation.Translator.Translate("einen Klienten") + " aus.");
}
}
}

View File

@@ -550,7 +550,7 @@ namespace BeWo.SchulbegleitenderDienst
}
else
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Bitte wählen sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus."));
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Bitte wählen sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus."));
}
@@ -746,7 +746,7 @@ namespace BeWo.SchulbegleitenderDienst
}
else
{
MessageBox.Show("Bitte wählen Sie " + BS.Shared.Translation.Translator.Translate("eine/n Klient/in") + " und eine Abwesenheitskategorie aus.");
MessageBox.Show("Bitte wählen Sie " + BS.SharedLauncher.Translation.Translator.Translate("eine/n Klient/in") + " und eine Abwesenheitskategorie aus.");
}
@@ -868,21 +868,21 @@ namespace BeWo.SchulbegleitenderDienst
if (e.MenuInfo.Column.FieldName == "Kunde")
{
BarButtonItem x = new BarButtonItem() {Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
BarButtonItem x = new BarButtonItem() {Content = BS.SharedLauncher.Translation.Translator.Translate("Klient/in öffnen") };
x.ItemClick += Kundeninfo_OnClick;
e.Customizations.Add(x);
}
if (e.MenuInfo.Column.FieldName == "KrankerMitarbeiter")
{
BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
x.ItemClick += Mitarbeiterinfo_OnClick;
e.Customizations.Add(x);
}
if (e.MenuInfo.Column.FieldName == "Vertretung")
{
BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
BarButtonItem s = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
s.ItemClick += MitarbeiterVertretunginfo_OnClick;
e.Customizations.Add(s);
}
@@ -905,21 +905,21 @@ namespace BeWo.SchulbegleitenderDienst
if (e.MenuInfo.Column.FieldName == "Kunde")
{
BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Klient/in öffnen") };
x.ItemClick += Kundeninfo_OnClick;
e.Customizations.Add(x);
}
if (e.MenuInfo.Column.FieldName == "KrankerMitarbeiter")
{
BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
x.ItemClick += Mitarbeiterinfo_OnClick;
e.Customizations.Add(x);
}
if (e.MenuInfo.Column.FieldName == "Vertretung")
{
BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
BarButtonItem s = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
s.ItemClick += MitarbeiterVertretunginfo_OnClick;
e.Customizations.Add(s);
}
@@ -946,14 +946,14 @@ namespace BeWo.SchulbegleitenderDienst
if (e.MenuInfo.Column.FieldName == "Kunde") // FieldNames umbennenen
{
BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Klient/in öffnen") };
x.ItemClick += Kundeninfo_OnClick; // bearbeiten
e.Customizations.Add(x);
}
if (e.MenuInfo.Column.FieldName == "MaKrank")
{
BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
x.ItemClick += Mitarbeiterinfo_OnClick; // eee
e.Customizations.Add(x);
}
@@ -963,7 +963,7 @@ namespace BeWo.SchulbegleitenderDienst
e.MenuInfo.Column.FieldName == "VertretungFr" || e.MenuInfo.Column.FieldName == "VertretungSa" ||
e.MenuInfo.Column.FieldName == "VertretungSo")
{
BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
BarButtonItem s = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
s.ItemClick += MitarbeiterVertretunginfoWochenanzeige_OnClick;
e.Customizations.Add(s);
_mitarbeiterVertretungWocheninfo = e.MenuInfo.Column.FieldName;
@@ -986,14 +986,14 @@ namespace BeWo.SchulbegleitenderDienst
if (e.MenuInfo.Column.FieldName == "Kunde") // FieldNames umbennenen
{
BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Klient/in öffnen") };
x.ItemClick += Kundeninfo_OnClick; // bearbeiten
e.Customizations.Add(x);
}
if (e.MenuInfo.Column.FieldName == "MaKrank")
{
BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
x.ItemClick += Mitarbeiterinfo_OnClick; // eee
e.Customizations.Add(x);
}
@@ -1003,7 +1003,7 @@ namespace BeWo.SchulbegleitenderDienst
e.MenuInfo.Column.FieldName == "VertretungFr" || e.MenuInfo.Column.FieldName == "VertretungSa" ||
e.MenuInfo.Column.FieldName == "VertretungSo")
{
BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
BarButtonItem s = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
s.ItemClick += MitarbeiterVertretunginfoWochenanzeige_OnClick;
e.Customizations.Add(s);
_mitarbeiterVertretungWocheninfo = e.MenuInfo.Column.FieldName;
@@ -1026,14 +1026,14 @@ namespace BeWo.SchulbegleitenderDienst
if (e.MenuInfo.Column.FieldName == "Kunde") // FieldNames umbennenen
{
BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Klient/in öffnen") };
x.ItemClick += Kundeninfo_OnClick; // bearbeiten
e.Customizations.Add(x);
}
if (e.MenuInfo.Column.FieldName == "MaKrank")
{
BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
x.ItemClick += Mitarbeiterinfo_OnClick; // eee
e.Customizations.Add(x);
}
@@ -1043,7 +1043,7 @@ namespace BeWo.SchulbegleitenderDienst
e.MenuInfo.Column.FieldName == "VertretungFr" || e.MenuInfo.Column.FieldName == "VertretungSa" ||
e.MenuInfo.Column.FieldName == "VertretungSo")
{
BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
BarButtonItem s = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
s.ItemClick += MitarbeiterVertretunginfoWochenanzeige_OnClick;
e.Customizations.Add(s);
_mitarbeiterVertretungWocheninfo = e.MenuInfo.Column.FieldName;
@@ -1173,12 +1173,12 @@ namespace BeWo.SchulbegleitenderDienst
}
}
else
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
}
else
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
}
}
@@ -1225,12 +1225,12 @@ namespace BeWo.SchulbegleitenderDienst
));
}
else
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
}
else
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
}
}

View File

@@ -16,7 +16,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Utils;
using DevExpress.Xpf.Bars;
using DevExpress.Xpf.Editors;
@@ -283,7 +283,7 @@ namespace BeWo.SchulbegleitenderDienst
}
else
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Bitte wählen Sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus."));
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Bitte wählen Sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus."));
}
@@ -490,7 +490,7 @@ namespace BeWo.SchulbegleitenderDienst
}
else
{
MessageBox.Show("Bitte wählen Sie " + BS.Shared.Translation.Translator.Translate("eine/n Klient/in") + " und eine Abwesenheitskategorie aus.");
MessageBox.Show("Bitte wählen Sie " + BS.SharedLauncher.Translation.Translator.Translate("eine/n Klient/in") + " und eine Abwesenheitskategorie aus.");
}
if(isValid)
@@ -572,7 +572,7 @@ namespace BeWo.SchulbegleitenderDienst
{
if (isOverlapping)
{
MessageBox.Show($"In dem angegebenen Zeitraum({absenceTime.Start.Value:dd.MM.yyyy} - {absenceTime.End.Value:dd.MM.yyyy}) existiert bereits eine Abwesenheit von " + BS.Shared.Translation.Translator.Translate("Klient") + " " + _CurrentCustomer.SimpleDescription + ". Die Abwesenheit konnte nicht angelegt werden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
MessageBox.Show($"In dem angegebenen Zeitraum({absenceTime.Start.Value:dd.MM.yyyy} - {absenceTime.End.Value:dd.MM.yyyy}) existiert bereits eine Abwesenheit von " + BS.SharedLauncher.Translation.Translator.Translate("Klient") + " " + _CurrentCustomer.SimpleDescription + ". Die Abwesenheit konnte nicht angelegt werden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
}
else
{

View File

@@ -15,9 +15,9 @@ using BS.Shared.DataContracts.Compact;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Grid;
using BS.Shared.DataContracts;
using BS.Shared.Translation;
using DevExpress.Xpf.Bars;
using BeWo.Core;
using BS.SharedLauncher.Translation;
namespace BeWo.SchulbegleitenderDienst
{

View File

@@ -879,7 +879,7 @@ namespace BeWo.ServiceProxy
{
var lBeWoFault = (e as FaultException<BeWoFault>).Detail;
String rowUpdated = "Der Datensatz wurde in der Zwischenzeit von " + BS.Shared.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Ihre Änderungen konnten leider NICHT gespeichert werden. Das Problem tritt auf, wenn mehrere " + BS.Shared.Translation.Translator.Translate("BenutzerPlural") + " gleichzeitig den gleichen Datensatz bearbeiten.\n\nSie müssen den Datensatz schließen und erneut öffnen, um die Änderungen vornehmen zu können.";
String rowUpdated = "Der Datensatz wurde in der Zwischenzeit von " + BS.SharedLauncher.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Ihre Änderungen konnten leider NICHT gespeichert werden. Das Problem tritt auf, wenn mehrere " + BS.SharedLauncher.Translation.Translator.Translate("BenutzerPlural") + " gleichzeitig den gleichen Datensatz bearbeiten.\n\nSie müssen den Datensatz schließen und erneut öffnen, um die Änderungen vornehmen zu können.";
switch (lBeWoFault.FaultType)
{
case BeWoFaultType.Concurrency:

View File

@@ -17,7 +17,7 @@ using BeWo.ViewModel.ListViewModel;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Utils;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Grid;

View File

@@ -1,14 +1,11 @@
using BeWo.View.Detail.Report;
using BS.Shared.DataContracts;
using System;
using BS.SharedLauncher.Translation;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media;
using BS.Shared.Translation;
namespace BeWo.View.Controls
{

View File

@@ -12,7 +12,7 @@ using System.Windows.Controls;
using BeWo.Core.Service;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Data.Helpers;
using DevExpress.Xpf.Editors.Settings;

View File

@@ -305,7 +305,7 @@ namespace BeWo.View.Detail.Accounting
lHeaderCaptions.Add("Zeitraum");
lHeaderCaptions.Add("Nummer");
lHeaderCaptions.Add("Datum");
lHeaderCaptions.Add(BS.Shared.Translation.Translator.Translate("EmpfängerSingular"));
lHeaderCaptions.Add(BS.SharedLauncher.Translation.Translator.Translate("EmpfängerSingular"));
lHeaderCaptions.Add("Betrag");
lHeaderCaptions.Add("Bemerkung");
lHeaderCaptions.Add("Bezahlt");

View File

@@ -8,7 +8,7 @@ using System.Windows.Input;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Grid;
namespace BeWo.View.Detail.Accounting

View File

@@ -14,7 +14,7 @@ using BeWo.ViewModel.ListViewModel;
using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using System.Windows.Media;
using System;

View File

@@ -21,9 +21,9 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Core;
using BS.Shared.Translation;
using Microsoft.Win32;
using BS.Shared.Extensions;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Detail
{

View File

@@ -28,7 +28,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Bars;
using DevExpress.Xpf.Docking;
using DevExpress.Xpf.Editors;

View File

@@ -214,7 +214,7 @@ namespace BeWo.View.Detail
{
if (this.ViewModel.EditVM.Employee != null && !BeWoApp.LoggedOnUser.Employee.Equals(this.ViewModel.EditVM.Employee))
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu ändern!"), "BeWoPlaner", MessageBoxButton.OK);
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu ändern!"), "BeWoPlaner", MessageBoxButton.OK);
return;
}
}
@@ -225,7 +225,7 @@ namespace BeWo.View.Detail
{
if (!BeWoApp.LoggedOnUser.Employee.Equals(lSequence.Employee))
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu ändern!"), "BeWoPlaner", MessageBoxButton.OK);
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu ändern!"), "BeWoPlaner", MessageBoxButton.OK);
return;
}
}
@@ -526,7 +526,7 @@ namespace BeWo.View.Detail
{
if (this.ViewModel.EditVM.Employee != null && !BeWoApp.LoggedOnUser.Employee.Equals(this.ViewModel.EditVM.Employee))
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu ändern!"), "BeWoPlaner", MessageBoxButton.OK);
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu ändern!"), "BeWoPlaner", MessageBoxButton.OK);
return;
}
}
@@ -537,7 +537,7 @@ namespace BeWo.View.Detail
{
if (!BeWoApp.LoggedOnUser.Employee.Equals(lSequence.Employee))
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu ändern!"), "BeWoPlaner", MessageBoxButton.OK);
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu ändern!"), "BeWoPlaner", MessageBoxButton.OK);
return;
}
}

View File

@@ -36,7 +36,7 @@ using System.Windows.Threading;
using BeWo.Annotations;
using BeWo.ownChat;
using BeWo.SchulbegleitenderDienst;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.XtraGrid;
using Binding = System.Windows.Data.Binding;
using Button = System.Windows.Controls.Button;

View File

@@ -202,7 +202,7 @@ namespace BeWo.View.Detail
}
catch (FaultException<BeWoFault>)
{
MessageBox.Show("Dieser Datensatz wurde in der Zwischenzeit von " + BS.Shared.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Klicken Sie Ok um den Datansatz erneut zu laden. Ihre Änderungen gehen dabei leider verloren.");
MessageBox.Show("Dieser Datensatz wurde in der Zwischenzeit von " + BS.SharedLauncher.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Klicken Sie Ok um den Datansatz erneut zu laden. Ihre Änderungen gehen dabei leider verloren.");
this.ReloadViewModel(lDataContract.CustomerOid.Value);
}
}

View File

@@ -20,7 +20,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;
using System.Linq;

View File

@@ -25,7 +25,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Editors.Settings;
using DevExpress.Xpf.Grid;

View File

@@ -20,7 +20,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;
using System.Linq;

View File

@@ -131,8 +131,8 @@ namespace BeWo.View.Detail
TemplateTypeString = "Klienten";
ObjectListBox.Background = BeWoApp.CurrentBeWo.Resources["CustomerContentBrush"] as Brush;
fileType = FileAttachmentType.CustomerTemplate;
ChkShowOnlyMyObjects.Content = BS.Shared.Translation.Translator.Translate("Nur meine Klienten anzeigen");
ChkShowArchived.Content = BS.Shared.Translation.Translator.Translate("Archivierte Klienten anzeigen");
ChkShowOnlyMyObjects.Content = BS.SharedLauncher.Translation.Translator.Translate("Nur meine Klienten anzeigen");
ChkShowArchived.Content = BS.SharedLauncher.Translation.Translator.Translate("Archivierte Klienten anzeigen");
}
else if (templateType == typeof(PersonDC))
{

View File

@@ -15,7 +15,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Grid;
namespace BeWo.View.Detail

View File

@@ -20,7 +20,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;

View File

@@ -4,7 +4,7 @@ using BeWo.ViewModel;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Portable.Input;
using DevExpress.Services;
using DevExpress.Xpf.Scheduler;

View File

@@ -15,7 +15,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Grid;
using MouseEventArgs = System.Windows.Input.MouseEventArgs;
using System.Windows.Navigation;

View File

@@ -18,7 +18,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Printing;
using DevExpress.Xpf.PivotGrid;

View File

@@ -22,7 +22,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Utils;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Editors;

View File

@@ -18,7 +18,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Printing;

View File

@@ -14,7 +14,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Detail.Report
{

View File

@@ -22,7 +22,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Printing;

View File

@@ -167,7 +167,7 @@ namespace BeWo.View.Detail
// if (_receiverMap.ContainsKey(e.Data.ToString()))
if (this._receiverList.Contains(e.Data))
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("EmpfängerSingular") + " wurde bereits hinzugefügt");
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("EmpfängerSingular") + " wurde bereits hinzugefügt");
return;
}

View File

@@ -20,7 +20,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;
using System.Linq;

View File

@@ -21,7 +21,7 @@ using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Data.Helpers;
using DevExpress.Xpf.Charts;
using DevExpress.Xpf.Editors;

View File

@@ -28,7 +28,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Mvvm.POCO;
using DevExpress.Utils;
using DevExpress.Xpf.Editors.Settings;

View File

@@ -88,7 +88,7 @@ namespace BeWo.View.Detail
}
catch (FaultException<BeWoFault>)
{
MessageBox.Show("Dieser Datensatz wurde in der Zwischenzeit von " + BS.Shared.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Klicken Sie Ok um den Datensatz erneut zu laden. Ihre Änderungen gehen dabei leider verloren.");
MessageBox.Show("Dieser Datensatz wurde in der Zwischenzeit von " + BS.SharedLauncher.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Klicken Sie Ok um den Datensatz erneut zu laden. Ihre Änderungen gehen dabei leider verloren.");
ReloadViewModel(lDC.TeamOid.Value);
}
}

View File

@@ -20,7 +20,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;
using System.Linq;

View File

@@ -13,7 +13,7 @@ using BeWo.ViewModel.ListViewModel;
using BS.Shared;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Grid;

View File

@@ -20,7 +20,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;
using System.Linq;

View File

@@ -20,7 +20,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;
using System.Linq;

View File

@@ -20,7 +20,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;
using System.Linq;

View File

@@ -29,7 +29,7 @@ namespace BeWo.View.Detail
public override String Title
{
get { return BS.Shared.Translation.Translator.Translate("Benutzergruppen"); }
get { return BS.SharedLauncher.Translation.Translator.Translate("Benutzergruppen"); }
}
private UserGroupVM ViewModel
@@ -68,7 +68,7 @@ namespace BeWo.View.Detail
}
catch (FaultException<BeWoFault>)
{
MessageBox.Show("Dieser Datensatz wurde in der Zwischenzeit von " + BS.Shared.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Klicken Sie Ok um den Datansatz erneut zu laden. Ihre Änderungen gehen dabei leider verloren.");
MessageBox.Show("Dieser Datensatz wurde in der Zwischenzeit von " + BS.SharedLauncher.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Klicken Sie Ok um den Datansatz erneut zu laden. Ihre Änderungen gehen dabei leider verloren.");
ReloadViewModel(lDataContract.UserGroupOid.Value);
}
}
@@ -132,7 +132,7 @@ namespace BeWo.View.Detail
{
if (ServiceFacade.DoUserServiceSync(a => a.CheckUserGroupIsLastWithUserGroupEditRights(ViewModel.DataContract.UserGroupOid.Value)))
{
MessageBox.Show("Die ausgewählten Rechte können der " + BS.Shared.Translation.Translator.Translate("Benutzergruppe") + " nicht entfernt werden, da sie die einzige " + BS.Shared.Translation.Translator.Translate("Benutzergruppe") + " ist, die dazu berechtigt ist, " + BS.Shared.Translation.Translator.Translate("Benutzergruppen") + " zu verwalten.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
MessageBox.Show("Die ausgewählten Rechte können der " + BS.SharedLauncher.Translation.Translator.Translate("Benutzergruppe") + " nicht entfernt werden, da sie die einzige " + BS.SharedLauncher.Translation.Translator.Translate("Benutzergruppe") + " ist, die dazu berechtigt ist, " + BS.SharedLauncher.Translation.Translator.Translate("Benutzergruppen") + " zu verwalten.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
return;
}
}

View File

@@ -47,7 +47,7 @@ namespace BeWo.View.Detail
public override string Title
{
get { return BS.Shared.Translation.Translator.Translate("BenutzerSingular"); }
get { return BS.SharedLauncher.Translation.Translator.Translate("BenutzerSingular"); }
}
internal UserVM ViewModel
@@ -88,7 +88,7 @@ namespace BeWo.View.Detail
if (ViewModel.Employee == null)
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Bitte geben Sie einen Mitarbeiter an."), "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Asterisk);
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Bitte geben Sie einen Mitarbeiter an."), "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Asterisk);
return;
}
}
@@ -138,7 +138,7 @@ namespace BeWo.View.Detail
if (pOid == -1)
{
this.Dispatch(
delegate { MessageBox.Show("Leider besitzen Sie nicht genügend Lizenzen, um " + BS.Shared.Translation.Translator.Translate("einen neuen Benutzer") + " anzulegen!", BS.Shared.Translation.Translator.Translate("BenutzerSingular") + " anlegen", MessageBoxButton.OK, MessageBoxImage.Information); });
delegate { MessageBox.Show("Leider besitzen Sie nicht genügend Lizenzen, um " + BS.SharedLauncher.Translation.Translator.Translate("einen neuen Benutzer") + " anzulegen!", BS.SharedLauncher.Translation.Translator.Translate("BenutzerSingular") + " anlegen", MessageBoxButton.OK, MessageBoxImage.Information); });
}
else
{

View File

@@ -20,7 +20,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;

View File

@@ -17,7 +17,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Grid;

View File

@@ -21,7 +21,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;

View File

@@ -15,7 +15,7 @@ using BS.Shared;
using BS.Shared.Services;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.RichEdit;
using SupportConceptService = BeWo.Core.Service.SupportConceptService;

View File

@@ -31,7 +31,7 @@ using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Bars;
using DevExpress.Xpf.Core;

View File

@@ -1,6 +1,6 @@
using BeWo.ServiceProxy;
using BS.Shared;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using System;
using System.Windows;

View File

@@ -1,6 +1,4 @@
using BeWo.View.Navigation.Filter;
using BS.Shared;
using BS.Shared;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
@@ -8,16 +6,10 @@ using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using DevExpress.Xpf.Accordion;
using DevExpress.Mvvm.UI.Native;
using BeWo.ViewModel;
using DevExpress.XtraEditors;
using DevExpress.Xpf.Grid.TreeList;
using DevExpress.Xpf.Grid;
using DevExpress.XtraPrinting.Native;
using DevExpress.Utils;
using System.Runtime.CompilerServices;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Data;
using BeWo.ServiceProxy;
@@ -33,13 +25,11 @@ using System.Windows.Navigation;
using ContextMenu = System.Windows.Controls.ContextMenu;
using MenuItem = System.Windows.Controls.MenuItem;
using System.Windows.Controls.Primitives;
using TextBox = System.Windows.Controls.TextBox;
using BS.Shared.DataContracts.Compact;
using BeWo.View.Detail;
using System.Text;
using BS.Shared.Translation;
using System.Windows.Data;
using System.Globalization;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Master
{

View File

@@ -112,7 +112,7 @@ namespace BeWo.View
}
else
{
MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + " und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.SharedLauncher.Translation.Translator.Translate("Benutzernamen") + " und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
}
}, true);
}

View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Windows;
@@ -20,10 +19,9 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using Microsoft.Win32;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Navigation
{

View File

@@ -17,8 +17,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using Microsoft.Win32;
namespace BeWo.View.Navigation

View File

@@ -20,7 +20,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Navigation
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using BeWo.Core;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Navigation.Sorter
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using BeWo.Core;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Navigation.Sorter
{

View File

@@ -1,12 +1,9 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using BeWo.Core;
using BeWo.Core.Config;
using BeWo.ServiceProxy;
using BeWo.View.Detail;
using BeWo.View.Navigation.Filter;
@@ -19,9 +16,8 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BeWo.Core.Service;
using BeWo.MultiLanguage;
using BS.Shared.Translation;
using Microsoft.Win32;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Navigation
{

View File

@@ -14,7 +14,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using Microsoft.Win32;
namespace BeWo.View.Navigation

View File

@@ -47,7 +47,7 @@ namespace BeWo.View.Navigation
var ugdc = obj as UserGroupDC;
if (ugdc != null)
{
if (MessageBox.Show("Wollen Sie die " + BS.Shared.Translation.Translator.Translate("Benutzergruppe") + " '" + ugdc.Name + "' wirklich löschen?", "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
if (MessageBox.Show("Wollen Sie die " + BS.SharedLauncher.Translation.Translator.Translate("Benutzergruppe") + " '" + ugdc.Name + "' wirklich löschen?", "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
{
ServiceFacade.DoUserServiceAsync(s => s.DeactivateUserGroup(ugdc.UserGroupOid.Value, ugdc.UserGroupVersion.Value),() => this.Dispatch(() => ReloadData(true)), true);
return true;

View File

@@ -73,9 +73,9 @@ namespace BeWo.View.Navigation
}
else
{
MessageBox.Show("Leider verfügen Sie nicht über genügend Lizenzen, um " + BS.Shared.Translation.Translator.Translate("einen neuen Benutzer") + " anzulegen.\n\n"+
string.Format("Sie verfügen derzeit über {0} kostenpflichtige " + BS.Shared.Translation.Translator.Translate("BenutzerPlural") + "lizenzen.", licenseInfo.MaxLicenseCount)+
"\n\nSie können nun entweder " + BS.Shared.Translation.Translator.Translate("BenutzerPlural") + " löschen oder neue " + BS.Shared.Translation.Translator.Translate("BenutzerPlural") + "lizenzen bestellen. Bitte beachten Sie, dass hierfür das Recht \"Neue Lizenz bestellen\" erforderlich ist.", BS.Shared.Translation.Translator.Translate("BenutzerSingular") + " anlegen", MessageBoxButton.OK,
MessageBox.Show("Leider verfügen Sie nicht über genügend Lizenzen, um " + BS.SharedLauncher.Translation.Translator.Translate("einen neuen Benutzer") + " anzulegen.\n\n"+
string.Format("Sie verfügen derzeit über {0} kostenpflichtige " + BS.SharedLauncher.Translation.Translator.Translate("BenutzerPlural") + "lizenzen.", licenseInfo.MaxLicenseCount)+
"\n\nSie können nun entweder " + BS.SharedLauncher.Translation.Translator.Translate("BenutzerPlural") + " löschen oder neue " + BS.SharedLauncher.Translation.Translator.Translate("BenutzerPlural") + "lizenzen bestellen. Bitte beachten Sie, dass hierfür das Recht \"Neue Lizenz bestellen\" erforderlich ist.", BS.SharedLauncher.Translation.Translator.Translate("BenutzerSingular") + " anlegen", MessageBoxButton.OK,
MessageBoxImage.Information);
@@ -90,7 +90,7 @@ namespace BeWo.View.Navigation
{
if (dc.UserOid != BeWoApp.LoggedOnUser.UserOid.Value)
{
if (MessageBox.Show("Wollen Sie " + BS.Shared.Translation.Translator.Translate("den Benutzer") + "'" + dc.LoginName + "' wirklich löschen?", "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
if (MessageBox.Show("Wollen Sie " + BS.SharedLauncher.Translation.Translator.Translate("den Benutzer") + "'" + dc.LoginName + "' wirklich löschen?", "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
{
ServiceFacade.DoUserServiceAsync(s => s.DeactivateUser(dc.UserOid, dc.UserVersion), () => this.Dispatch(() => ReloadData(true)), true);
@@ -101,7 +101,7 @@ namespace BeWo.View.Navigation
}
else
{
MessageBox.Show("Sie können " + BS.Shared.Translation.Translator.Translate("Ihren eigenen Benutzer") + " nicht löschen!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
MessageBox.Show("Sie können " + BS.SharedLauncher.Translation.Translator.Translate("Ihren eigenen Benutzer") + " nicht löschen!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
}
}

View File

@@ -52,7 +52,7 @@ namespace BeWo.View.Report.Auslastung
TimeSpan timeSpan = config.EndDate.Subtract(config.StartDate);
AuslastungDetailRow header = new AuslastungDetailRow(AuslastungRowTypes.Header);
header.CustomerName = BS.Shared.Translation.Translator.Translate("Klient/in");
header.CustomerName = BS.SharedLauncher.Translation.Translator.Translate("Klient/in");
result.Add(header);

View File

@@ -447,9 +447,9 @@ namespace BeWo.View.Report.Auslastung
List<string> lHeaderCaptions = new List<string>();
List<List<string>> lContent = new List<List<string>>();
lHeaderCaptions.Add(BS.Shared.Translation.Translator.Translate("Mitarbeiter/in"));
lHeaderCaptions.Add(BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in"));
lHeaderCaptions.Add("Nr.");
lHeaderCaptions.Add(BS.Shared.Translation.Translator.Translate("Klient/in"));
lHeaderCaptions.Add(BS.SharedLauncher.Translation.Translator.Translate("Klient/in"));
lHeaderCaptions.Add("FLS");
lHeaderCaptions.Add("Beginn");
lHeaderCaptions.Add("Ende");

View File

@@ -152,7 +152,7 @@ namespace BeWo.View.Report.Auslastung
if (checkbox_all.Visibility == Visibility.Visible && !checkbox_all.IsChecked.Value && _SelectedEmployee == null && BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_AuslastungAllEmployee_View))
{
MessageBox.Show(BS.Shared.Translation.Translator.Translate("Bitte wählen Sie eine/n Mitarbeiter/in aus."), "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Bitte wählen Sie eine/n Mitarbeiter/in aus."), "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}

View File

@@ -11,7 +11,7 @@ using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using DevExpress.Xpf.Core;
namespace BeWo.View.Report.Employee

View File

@@ -3,12 +3,10 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Windows;
using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Report.FLSReport
{
@@ -220,7 +218,8 @@ namespace BeWo.View.Report.FLSReport
headerRow.ShowEinheitInMinuten = config.ShowEinheitInMinuten;
if (config.ReportType == FLSReportType.Employee)
{
headerRow.GroupName = Translator.Translate("Klient/in");
headerRow.GroupName =
Translator.Translate("Klient/in");
}
else if (config.ReportType == FLSReportType.Customer)
{

View File

@@ -22,7 +22,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using Microsoft.Win32;
namespace BeWo.View.Report.FLSReport

View File

@@ -4,11 +4,9 @@ using System.Globalization;
using System.Linq;
using System.Windows;
using BeWo.Core.Service;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Report.MitarbeiterKoelnRing
{

View File

@@ -408,9 +408,9 @@ namespace BeWo.View.Report.MitarbeiterKoelnRing
if (_FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Employee)
{
lHeaderCaptions.Add(BS.Shared.Translation.Translator.Translate("Mitarbeiter/in"));
lHeaderCaptions.Add(BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in"));
if (!_FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows || !_FLSOverview.FLSOverviewConfig.ShowServiceRecords)
lHeaderCaptions.Add(BS.Shared.Translation.Translator.Translate("Klient/in"));
lHeaderCaptions.Add(BS.SharedLauncher.Translation.Translator.Translate("Klient/in"));
}
if (_FLSOverview.FLSOverviewConfig.ShowServiceRecords)
@@ -424,9 +424,9 @@ namespace BeWo.View.Report.MitarbeiterKoelnRing
if (_FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows && _FLSOverview.FLSOverviewConfig.ShowServiceRecords)
{
if (_FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Employee)
lHeaderCaptions.Add(BS.Shared.Translation.Translator.Translate("Klient/in"));
lHeaderCaptions.Add(BS.SharedLauncher.Translation.Translator.Translate("Klient/in"));
else if (_FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Customer)
lHeaderCaptions.Add(BS.Shared.Translation.Translator.Translate("Mitarbeiter/in"));
lHeaderCaptions.Add(BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in"));
else if (_FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Costbearer)
lHeaderCaptions.Add("Kostenträger");
else if (_FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Team)
@@ -632,7 +632,7 @@ namespace BeWo.View.Report.MitarbeiterKoelnRing
String key = "EmployeeContentBrush";
checkbox_sortBySubGroup.Content = BS.Shared.Translation.Translator.Translate("Nach Klienten sortieren");
checkbox_sortBySubGroup.Content = BS.SharedLauncher.Translation.Translator.Translate("Nach Klienten sortieren");
Brush brush = BeWoApp.Current.FindResource(key) as Brush;

View File

@@ -1,37 +1,16 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using BS.Shared.Core;
using System.Windows.Media;
using BS.Shared.Extensions;
using System.Collections;
using System.Text;
using BeWo.Controls;
using BeWo.Core;
using System.Windows.Documents;
using BeWo.Core.Service;
using System.Windows.Threading;
using BeWo.View.Detail;
using BeWo.View.Master;
using BeWo.View.Report.FLSReport;
using BS.Shared.DataContracts.Compact;
using BS.Shared.DataContracts.Reports;
using BS.Shared.DataContracts;
using BeWo.ServiceProxy;
using BS.Shared;
using BeWo.ViewModel;
using DevExpress.Xpf.Core;
using Microsoft.Win32;
using BS.Shared.Translation;
using System.Web.ModelBinding;
using System.ComponentModel;
using System.Windows.Navigation;
using DevExpress.XtraScheduler.Internal;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Report.Rating
{

View File

@@ -28,7 +28,7 @@ namespace BeWo.View.Search
chkboxArchivierteMa.Height = 15;
chkboxArchivierteMa.BorderThickness = new Thickness(0);
chkboxArchivierteMa.HorizontalAlignment = HorizontalAlignment.Stretch;
chkboxArchivierteMa.Content = BS.Shared.Translation.Translator.Translate("Archivierte Mitarbeiter anzeigen");
chkboxArchivierteMa.Content = BS.SharedLauncher.Translation.Translator.Translate("Archivierte Mitarbeiter anzeigen");
chkboxArchivierteMa.IsChecked = false;
chkboxArchivierteMa.Foreground = Brushes.White;
chkboxArchivierteMa.Visibility = Visibility.Collapsed;

View File

@@ -10,7 +10,7 @@ using BeWo.View.Navigation.Filter;
using BS.Shared;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
namespace BeWo.View.Search
{

View File

@@ -7,7 +7,7 @@ using System.Xaml;
using BeWo.ServiceProxy;
using BS.Shared;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using XamlReader = System.Windows.Markup.XamlReader;
namespace BeWo.View

View File

@@ -9,7 +9,7 @@ using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
namespace BeWo.ViewModel
{

View File

@@ -11,7 +11,7 @@ using BeWo.ServiceProxy;
using BeWo.ViewModel;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using BS.SharedLauncher.Translation;
using ChatController.ChatKlassen;
using ChatController.LoginKlassen;
using Button = System.Windows.Controls.Button;

View File

@@ -855,6 +855,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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wabe", "ReportImp\Wabe\Wabe.csproj", "{DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}"
EndProject
Global
@@ -10468,6 +10474,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
{DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|.NET.ActiveCfg = Debug|Any CPU
{DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|.NET.Build.0 = Debug|Any CPU
{DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -10916,6 +10994,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}
{DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution

71
BeWoLauncher/App.config Normal file
View File

@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="BeWoLauncher.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
<security mode="None" />
<!-- mode="Transport" für echten Server und "None" sonst-->
</binding>
<binding name="BeWoBasicEndpointTransport" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
<security mode="None" />
<!-- mode="Transport" für echten Server und "None" sonst-->
</binding>
</basicHttpBinding>
</bindings>
<client>
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpointTransport" contract="BeWoLauncher.ServiceProxy.ILauncherService" name="LauncherServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWoLauncher.ServiceProxy.IDownloadBeWoService" name="DownloadBeWoEndpoint" />
</client>
<behaviors>
<endpointBehaviors>
<behavior name="BeWoServiceBehavior">
<dataContractSerializer maxItemsInObjectGraph="2147483647" />
</behavior>
</endpointBehaviors>
</behaviors>
</system.serviceModel>
<appSettings>
<add key="AutoLogin" value="false" />
<add key="ShowUpdateDelay" value="true" />
<add key="ForceUpdate" value="true" />
<add key="UseUpdater" value="true"/>
<add key="ClientSettingsProvider.ServiceUri" value="" />
<add key="SkipLock" value="true"/>
</appSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<userSettings>
<BeWoLauncher.Properties.Settings>
<setting name="InstallLocation" serializeAs="String">
<value />
</setting>
<setting name="FirstInstallationSuccess" serializeAs="String">
<value>False</value>
</setting>
<setting name="InstallLocationSetSuccess" serializeAs="String">
<value>False</value>
</setting>
</BeWoLauncher.Properties.Settings>
</userSettings>
</configuration>

View File

@@ -0,0 +1,467 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{E3BA193A-A64F-4CE6-91BE-F54E551797BE}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>BeWoLauncher</RootNamespace>
<AssemblyName>BeWoLauncher</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<Deterministic>true</Deterministic>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>C:\Test\Launcher\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<AutorunEnabled>true</AutorunEnabled>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>BeWoPlaner.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>B82672A70F896EAC5E9A22C0D5AED37F0CC0EB1A</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>BeWoLauncher_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Configuration.Install" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="LauncherApp.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Logic\Behavior\LaunchBehavior.cs" />
<Compile Include="Logic\Behavior\ViewSwitchBehavior.cs" />
<Compile Include="Logic\ViewBuilder.cs" />
<Compile Include="MultiLanguage\Markup\TranslateExtension.cs" />
<Compile Include="MultiLanguage\ServiceTranslator.cs" />
<Compile Include="View\Components\ConfirmDemoDialog.xaml.cs">
<DependentUpon>ConfirmDemoDialog.xaml</DependentUpon>
</Compile>
<Compile Include="View\Components\MessageDialog.xaml.cs">
<DependentUpon>MessageDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Logic\Converter\BoolNullCheckConverter.cs" />
<Compile Include="Logic\Converter\BoolReverseConverter.cs" />
<Compile Include="Logic\Converter\BoolVisibilityConverter.cs" />
<Compile Include="Logic\Converter\BoolVisibilityHiddenConverter.cs" />
<Compile Include="Logic\Converter\BoolVisibilityMultiConverter.cs" />
<Compile Include="Logic\Converter\CollectionCountToBoolConverter.cs" />
<Compile Include="Logic\Converter\CollectionCountToVisibilityConverter.cs" />
<Compile Include="Logic\Converter\DataContract2StringConverter.cs" />
<Compile Include="Logic\Converter\Date2CalendarWeekStringConverter.cs" />
<Compile Include="Logic\Converter\DateConverter.cs" />
<Compile Include="Logic\Converter\DateNullValueToEmptyStringConverter.cs" />
<Compile Include="Logic\Converter\DecimalConverter.cs" />
<Compile Include="Logic\Converter\EnumToDescriptionConverter.cs" />
<Compile Include="Logic\Converter\IListT2DataTableConverter.cs" />
<Compile Include="Logic\Converter\IndexBoolConverter.cs" />
<Compile Include="Logic\Converter\Int2DecimalConverter.cs" />
<Compile Include="Logic\Converter\NullableBoolToBoolConverter.cs" />
<Compile Include="Logic\Converter\ObjectBoolConverter.cs" />
<Compile Include="Logic\Converter\ObjectVisibilityConverter.cs" />
<Compile Include="Logic\Converter\OneWayToSourceSwitch.cs" />
<Compile Include="Logic\Converter\ReverseValueEqualsParamVisibilityConverter.cs" />
<Compile Include="Logic\Converter\StringBrushConverter.cs" />
<Compile Include="Logic\Converter\StringFormatConverter.cs" />
<Compile Include="Logic\Converter\StringFormatMulitConverter.cs" />
<Compile Include="Logic\Converter\StringLengthVisibilityConverter.cs" />
<Compile Include="Logic\Converter\StringLengthVisibilityMultiConverter.cs" />
<Compile Include="Logic\Converter\ValueEqualsParamVisibilityConverter.cs" />
<Compile Include="Logic\Controller\DownloadController.cs" />
<Compile Include="Logic\Controller\ProcessController.cs" />
<Compile Include="Logic\Controller\ViewController.cs" />
<Compile Include="View\Frames\FrameBase.cs" />
<Compile Include="View\Frames\InfoFrame.xaml.cs">
<DependentUpon>InfoFrame.xaml</DependentUpon>
</Compile>
<Compile Include="View\Frames\LoadingFrame.xaml.cs">
<DependentUpon>LoadingFrame.xaml</DependentUpon>
</Compile>
<Compile Include="View\Frames\ProgressFrame.xaml.cs">
<DependentUpon>ProgressFrame.xaml</DependentUpon>
</Compile>
<Compile Include="View\FrameView.xaml.cs">
<DependentUpon>FrameView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Frames\InstallInfoFrame.xaml.cs">
<DependentUpon>InstallInfoFrame.xaml</DependentUpon>
</Compile>
<Compile Include="View\Frames\UpdateInfoFrame.xaml.cs">
<DependentUpon>UpdateInfoFrame.xaml</DependentUpon>
</Compile>
<Compile Include="View\Frames\UninstallInfoFrame.xaml.cs">
<DependentUpon>UninstallInfoFrame.xaml</DependentUpon>
</Compile>
<Compile Include="Logic\Utils\LauncherAppdataConfig.cs" />
<Compile Include="Logic\Utils\LauncherPaths.cs" />
<Compile Include="Logic\Utils\Download\DownloadManager.cs" />
<Compile Include="View\Components\PasswortAenderungsView.xaml.cs">
<DependentUpon>PasswortAenderungsView.xaml</DependentUpon>
</Compile>
<Compile Include="Models\ConnectionProfile.cs" />
<Compile Include="View\Windows\PopUpWindow.xaml.cs">
<DependentUpon>PopUpWindow.xaml</DependentUpon>
</Compile>
<Page Include="View\Components\ConfirmDemoDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Components\EnterTenantDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Components\MessageDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Components\ProfileEditView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Components\ExceptionMessageBox.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Components\PasswortAenderungsView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\LoginView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Components\ProxyLoginView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Components\PwVergessenView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Components\WaitLayer2.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Frames\InfoFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Frames\ProgressFrame.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Frames\LoadingFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Styles\OrangeBlack.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\FrameView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Frames\InstallInfoFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Frames\UpdateInfoFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Frames\UninstallInfoFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="LauncherWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="LauncherApp.xaml.cs">
<DependentUpon>LauncherApp.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Logic\Utils\LauncherUtils.cs" />
<Compile Include="View\Components\EnterTenantDialog.xaml.cs">
<DependentUpon>EnterTenantDialog.xaml</DependentUpon>
</Compile>
<Compile Include="View\Components\ProfileEditView.xaml.cs">
<DependentUpon>ProfileEditView.xaml</DependentUpon>
</Compile>
<Compile Include="Logic\Multitenancy\MultitenancyEndpointBehavior.cs" />
<Compile Include="Logic\Multitenancy\MultitenancyHeader.cs" />
<Compile Include="ServiceProxy\LauncherGenerated.cs" />
<Compile Include="ServiceProxy\LauncherServiceFacade.cs" />
<Compile Include="Logic\Multitenancy\MultitenancyInterceptor.cs" />
<Compile Include="Logic\Security\LauncherSecurityHeader.cs" />
<Compile Include="Logic\Security\LauncherSecurityHeaderEndpointBehavior.cs" />
<Compile Include="Logic\Security\LauncherSecurityHeaderInterceptor.cs" />
<Compile Include="View\Components\ExceptionMessageBox.xaml.cs">
<DependentUpon>ExceptionMessageBox.xaml</DependentUpon>
</Compile>
<Compile Include="View\LoginView.xaml.cs">
<DependentUpon>LoginView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Components\ProxyLoginView.xaml.cs">
<DependentUpon>ProxyLoginView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Components\PwVergessenView.xaml.cs">
<DependentUpon>PwVergessenView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Components\WaitLayer2.xaml.cs">
<DependentUpon>WaitLayer2.xaml</DependentUpon>
</Compile>
<Compile Include="LauncherWindow.xaml.cs">
<DependentUpon>LauncherWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="View\Windows\PopUpWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="BeWoLauncher_TemporaryKey.pfx" />
<None Include="LauncherServiceReferences.bat" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Resource Include="View\Icons\16_bulleted_list.png" />
<Resource Include="View\Icons\16_employee.png" />
<Resource Include="View\Icons\16_euro.png" />
<Resource Include="View\Icons\16_female.png" />
<Resource Include="View\Icons\16_male.png" />
<Resource Include="View\Icons\16_report.png" />
<Resource Include="View\Icons\Add24.png" />
<Resource Include="View\Icons\adobe-pdf-icon.png" />
<Resource Include="View\Icons\Alarm.png" />
<Resource Include="View\Icons\AlertsDisabled.png" />
<Resource Include="View\Icons\AnonymousUserDisabled.png" />
<Resource Include="View\Icons\Archiv.png" />
<Resource Include="View\Icons\ArrowLeft.png" />
<Resource Include="View\Icons\ArrowRight.png" />
<Resource Include="View\Icons\bewologo_big.gif" />
<Resource Include="View\Icons\bewoplaner_logo_big.png" />
<Resource Include="View\Icons\bewoplaner_logo_small.png" />
<Resource Include="View\Icons\bslogo.gif" />
<Resource Include="View\Icons\Calendar 1.png" />
<Resource Include="View\Icons\Calendar1Day24.png" />
<Resource Include="View\Icons\Calendar31Day24.png" />
<Resource Include="View\Icons\Calendar5Day24.png" />
<Resource Include="View\Icons\Calendar7Day24.png" />
<Resource Include="View\Icons\CalendarDisabled.png" />
<Resource Include="View\Icons\CashStackDisabled.png" />
<Resource Include="View\Icons\ChartBarDisabled.png" />
<Resource Include="View\Icons\ChartLineDisabled.png" />
<Resource Include="View\Icons\ClipboardDisabled.png" />
<Resource Include="View\Icons\CoinsDisabled.png" />
<Resource Include="View\Icons\ConfigurationDisabled.png" />
<Resource Include="View\Icons\ConfigurationToolsDisabled.png" />
<Resource Include="View\Icons\ContactCardDisabled.png" />
<Resource Include="View\Icons\ContactCardWebDisabled.png" />
<Resource Include="View\Icons\Copy.png" />
<Resource Include="View\Icons\Cut.png" />
<Resource Include="View\Icons\delete.png" />
<Resource Include="View\Icons\Delete24.png" />
<Resource Include="View\Icons\Document48.png" />
<Resource Include="View\Icons\DocumentWithAdd.png" />
<Resource Include="View\Icons\DocumentWithAdd2.png" />
<Resource Include="View\Icons\edit.png" />
<Resource Include="View\Icons\Email.png" />
<Resource Include="View\Icons\excel.png" />
<Resource Include="View\Icons\Favorites16.png" />
<Resource Include="View\Icons\Favorites32.png" />
<Resource Include="View\Icons\FavoritesDisabled32.png" />
<Resource Include="View\Icons\Folder.png" />
<Resource Include="View\Icons\glucklicher.png" />
<Resource Include="View\Icons\Haeckchen.png" />
<Resource Include="View\Icons\Help.png" />
<Resource Include="View\Icons\HelpDisabled.png" />
<Resource Include="View\Icons\History24.png" />
<Resource Include="View\Icons\HistoryDisabled - Kopie.png" />
<Resource Include="View\Icons\HistoryDisabled.png" />
<Resource Include="View\Icons\Home.png" />
<Resource Include="View\Icons\HomeDisabled - Kopie.png" />
<Resource Include="View\Icons\HomeDisabled.png" />
<Resource Include="View\Icons\IDBadgeDisabled - Kopie.png" />
<Resource Include="View\Icons\IDBadgeDisabled.png" />
<Resource Include="View\Icons\InternetDisabled - Kopie.png" />
<Resource Include="View\Icons\InternetDisabled.png" />
<Resource Include="View\Icons\Keywords.png" />
<Resource Include="View\Icons\KeywordsDisabled.png" />
<Resource Include="View\Icons\klient-avatar.png" />
<Resource Include="View\Icons\Light Bulb.png" />
<Resource Include="View\Icons\Logout - Kopie.png" />
<Resource Include="View\Icons\Logout.png" />
<Resource Include="View\Icons\LogoutDisabled.png" />
<Resource Include="View\Icons\ManufacturingDisabled - Kopie.png" />
<Resource Include="View\Icons\ManufacturingDisabled.png" />
<Resource Include="View\Icons\massnahme.png" />
<Resource Include="View\Icons\MenuDisabled.png" />
<Resource Include="View\Icons\mitarbeiter-avatar.png" />
<Resource Include="View\Icons\mitarbeiter-team-avatar.png" />
<Resource Include="View\Icons\new.png" />
<Resource Include="View\Icons\Newspaper.png" />
<Resource Include="View\Icons\ObjectsDisabled.png" />
<Resource Include="View\Icons\OfficeBulidingBlackDisabled.png" />
<Resource Include="View\Icons\Paste.png" />
<Resource Include="View\Icons\Paste24.png" />
<Resource Include="View\Icons\Redo - Kopie.png" />
<Resource Include="View\Icons\Redo.png" />
<Resource Include="View\Icons\Rename24 - Kopie.png" />
<Resource Include="View\Icons\Rename24.png" />
<Resource Include="View\Icons\RSS Newsfeed - Kopie.png" />
<Resource Include="View\Icons\RSS Newsfeed.png" />
<Resource Include="View\Icons\Save - Kopie.png" />
<Resource Include="View\Icons\Save.png" />
<Resource Include="View\Icons\Search - Kopie.png" />
<Resource Include="View\Icons\Search.png" />
<Resource Include="View\Icons\SMS24_2.png" />
<Resource Include="View\Icons\sortiert.png" />
<Resource Include="View\Icons\Symbol Delete.png" />
<Resource Include="View\Icons\Symbol Edit.png" />
<Resource Include="View\Icons\Symbol Help.png" />
<Resource Include="View\Icons\SymbolRefresh32.png" />
<Resource Include="View\Icons\SymbolRefresh32Disabled - Kopie.png" />
<Resource Include="View\Icons\SymbolRefresh32Disabled.png" />
<Resource Include="View\Icons\TechSupportWhiteDisabled.png" />
<Resource Include="View\Icons\trauriges-smiley.png" />
<Resource Include="View\Icons\Undo - Kopie.png" />
<Resource Include="View\Icons\Undo.png" />
<Resource Include="View\Icons\unsortiert.png" />
<Resource Include="View\Icons\User Business Male.png" />
<Resource Include="View\Icons\User Home Boy.png" />
<Resource Include="View\Icons\User Home Girl.png" />
<Resource Include="View\Icons\UserBusinessMaleDisabled - Kopie.png" />
<Resource Include="View\Icons\UserBusinessMaleDisabled.png" />
<Resource Include="View\Icons\UserGroupBusinessDisabled - Kopie.png" />
<Resource Include="View\Icons\UserGroupBusinessDisabled.png" />
<Resource Include="View\Icons\UserGroupDisabled - Kopie.png" />
<Resource Include="View\Icons\UserGroupDisabled.png" />
<Resource Include="View\Icons\UserGroupHome24bw.png" />
<Resource Include="View\Icons\UserHomeBoyDisabled.png" />
<Resource Include="View\Icons\UserHomeMaleDisabled.png" />
<Resource Include="View\Icons\UserHomeMaleDisabled32.png" />
<Resource Include="View\Icons\UserMaleBlackDisabled.png" />
<Resource Include="View\Icons\warning-16x16.png" />
<Resource Include="View\Icons\WeitereNachrichtLaden.png" />
<Resource Include="View\Icons\word.png" />
<Resource Include="View\Icons\ziel.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="BeWoPlaner.ico" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SharedLauncher\SharedLauncher.csproj">
<Project>{efe05c79-e0dd-4311-8b90-a8da7ebdf36f}</Project>
<Name>SharedLauncher</Name>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

Binary file not shown.

BIN
BeWoLauncher/BeWoPlaner.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

View File

@@ -0,0 +1,14 @@
<Application x:Class="BeWoLauncher.LauncherApp"
x:ClassModifier="public"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:BeWoLauncher"
Exit="Application_Exit">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Styles/OrangeBlack.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>

View File

@@ -0,0 +1,99 @@
using BeWoLauncher.Components;
using BeWoLauncher.Logic;
using BeWoLauncher.Logic.Controller;
using BeWoLauncher.ServiceProxy;
using BeWoLauncher.WindowImp;
using BS.SharedLauncher;
using BS.SharedLauncher.Information;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.IO.Pipes;
using System.Linq;
using System.Reflection;
using System.Security.Policy;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Threading;
using System.Xml;
namespace BeWoLauncher
{
/// <summary>
/// Interaktionslogik für "App.xaml"
/// </summary>
public partial class LauncherApp : Application
{
public static string ShortVersion => "3";
public static string Version => "Version 3.0";
public LauncherApp()
{
}
protected override void OnStartup(StartupEventArgs e)
{
MainWindow = new LauncherWindow();
MainWindow.Show();
base.OnStartup(e);
ProcessController.StartLauncher();
Dispatcher.UnhandledException += (s, ex)
=>
{
if (ex.Exception == null || String.IsNullOrEmpty(ex.Exception.Message) ||
(!ex.Exception.ToString().Contains("DevExpress.Xpf.Bars.Customization.CustomizationControl.OnLoaded")
&& !ex.Exception.ToString().Contains("DevExpress.Xpf.Grid.Native.SelectionStrategyCellBase.IsCellSelected")))
{
ShowError("Unbehandelter Fehler", ex.Exception, true);
}
ex.Handled = true;
};
FrameworkElement.LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
}
private void Application_Exit(object sender, ExitEventArgs e)
{
ProcessController.KillOwnPlanerProcess();
}
#region ShowError
public static void ShowError(Exception ex) => ShowError(null, ex, true);
public static void ShowError(string message, Exception ex, bool showDetails)
{
ShowError(message, ex.ToString(), showDetails);
}
public static void ShowError(string message, string ex, bool showDetails)
{
ViewController.EndWaiting();
if (ViewController.CurrentWindow is null)
{
MessageBox.Show(ex, message);
}
else
{
ViewController.CurrentWindow.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action)(() =>
ViewController.CurrentWindow.ShowControlAsModalPopUp(new ExceptionMessageBox(message, ex, showDetails))));
}
}
#endregion
}
}

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More