diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 5736d8f02..ec9588375 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -153,6 +153,7 @@ ..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll + 3.5 @@ -246,7 +247,7 @@ MSBuild:Compile Designer - + Designer MSBuild:Compile @@ -690,7 +691,7 @@ MSBuild:Compile Designer - + BSLogoControl.xaml @@ -736,6 +737,7 @@ MainDictionary.xaml + @@ -780,6 +782,7 @@ + UploadDialog.xaml @@ -787,8 +790,8 @@ LockedPage.xaml - - MainView.xaml + + MainPage.xaml @@ -2296,20 +2299,17 @@ {8a83c4dc-a0b1-4a51-ae1d-366d7a05b298} ChatController - - {e3ba193a-a64f-4ce6-91be-f54e551797be} - BeWoLauncher - {D5E53B0F-BF5A-41E8-93E2-0F32845FC729} Controls - + {efe05c79-e0dd-4311-8b90-a8da7ebdf36f} - SharedLite + SharedLauncher + False - {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} Shared diff --git a/BeWo/BeWoApp.cs b/BeWo/BeWoApp.cs deleted file mode 100644 index 81fb4851b..000000000 --- a/BeWo/BeWoApp.cs +++ /dev/null @@ -1,989 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Markup; -using System.Windows.Media; -using System.Windows.Threading; - -using BeWo.Core; -using BeWo.Core.Config; -using BeWo.ServiceProxy; -using BeWo.View; -using BeWo.View.Navigation; -using BeWo.View.Navigation.Filter; - -using BS.Shared; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; -using BS.Shared.Extensions; -using BS.Shared.Core; - -using ChatController.HauptKlassen; -using DevExpress.Xpf.Core; -using DevExpress.Xpf.Grid; -using BeWoLauncher.Views.Interface; -using BeWoLauncher; -using BeWoLauncher.Cache; -using BS.SharedLite; - -namespace BeWo -{ - /// - /// Interaction logic for App.xaml - /// - public class BeWoApp : INotifyPropertyChanged - { - private static BeWoApp app; - - private static FrameworkElement _lockedContent; - - public static string ShortVersion = "3"; - public static string Version = "Version 3.0 TEST"; - - public static int RenderTier = 0; - - private static AppSettings _AppSettings; - - private static CompactEmployeeDC _CompactLoggedOnEmployee; - private static EmployeeDC _LoggedOnEmployee; - - private static UserDC _LoggedOnUser; - - private static MandatorDC _Mandator; - private static int _LockUITime = 30; - private static List OpenDevExpressEditForms = new List(); - - private static DocumentWatcher _DocumentWatcher; - - internal static PasswortSecurityStrength PasswortStrength; - - public static MainView MainView { get; set; } - //public static Window MainWindow { get; set; } - public static WindowCollection Windows{ get; set; } - public static Application CurrentApplication { get; set; } - - public BeWoApp(Application application) - { - CurrentApplication = application; - Windows = new WindowCollection(); - app = this; - - app.Resources.MergedDictionaries.Add(new MainDictionary()); - - //Licenser.LicenseKey = "DGF20-AUTJ7-3K8MD-DNNA"; - DataControlBase.AllowInfiniteGridSize = true; - //Timeline.DesiredFrameRateProperty.OverrideMetadata(typeof(Timeline), - // new FrameworkPropertyMetadata { DefaultValue = 30 }); - - RenderTier = RenderCapability.Tier >> 16; - - //AppDomain.CurrentDomain.UnhandledException += (s, ex) => ShowError(null, ex.ExceptionObject as Exception, true); - - FrameworkElement.LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag))); - } - - public static void Init2(MainView mainView) - { - MainView = mainView; - - mainView.GetParent().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")) - { - MainView.GetParent().ShowError(null, ex.Exception, true); - } - ex.Handled = true; - }; - } - - public static BeWoApp CurrentBeWo => app; - public Window MainWindow => MainView.GetParent(); - - public ResourceDictionary Resources { get; set; } - - public static Dictionary ICD10Diagnosis { get; set; } - - public static EmployeeDC LoggedOnEmployee - { - get { return _LoggedOnEmployee; } - - set { _LoggedOnEmployee = value; } - } - - public static long? LoggedOnEmployeeOid => _LoggedOnEmployee?.EmployeeOid; - - public static CompactEmployeeDC CompactLoggedOnEmployee - { - get => _CompactLoggedOnEmployee; - - set => _CompactLoggedOnEmployee = value; - } - - public ObservableCollection LoggedOnUsersRights - { - get - { - if (LoggedOnUser != null) - return LoggedOnUser.GetGrantedRights().ToObservableCollection(); - return null; - } - } - - public DocumentWatcher DocumentWatcher - { - get - { - if (_DocumentWatcher == null) - { - _DocumentWatcher = new DocumentWatcher(); - } - - return _DocumentWatcher; - } - } - - public static AppSettings AppSettings - { - get - { - if (_AppSettings == null) - { - RestoreAppSettings(); - } - - return _AppSettings; - } - } - - internal static UserDC LoggedOnUser - { - get => _LoggedOnUser; - - set - { - _LoggedOnUser = value; - if (_LoggedOnUser != null) - { - var settings = _LoggedOnUser.Settings; - - ServiceFacade.DoEmployeeServiceAsync(s => s.LoadEmployee(value.Employee.EmployeeOid), - r => - { - _LoggedOnEmployee = r; - - ServiceFacade.DoEmployeeServiceAsync(s => s.LoadCompactEmployee(value.Employee.EmployeeOid), r2 => { _CompactLoggedOnEmployee = r2; }); - - MainView.GetParent().Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action)(() => MainView.InitOffeneTermine())); - }); - } - - CurrentBeWo.FirePropertyChanged("LoggedOnUsersRights"); - } - } - - internal static MandatorDC Mandator - { - get => _Mandator; - - set - { - _Mandator = value; - - bool showDatevFields = false; - bool isServiceRecordNoticeMandatory = true; - bool isPasswordSecurityActiv = false; - bool showServiceRecordsDistanceFields = false; - bool showHilfeplanBezeichnung = false; - bool showArbeitszeiten = false; - bool showCustomerDistanceFields = false; - bool showAdditionalService = false; - bool showRoundedDurationInEmployeeAnalysis = true; - bool showTeamNews = false; - bool showMarker = false; - bool showAnnualReport = false; - int maxDaysEditServiceRecordsAllowed = 0; - int hilfeplanAuslaufAuswahl = 3; - int anzTageZeiterfassErfolgt = 0; - int zeiterfassungsSchwellwert = 80; - bool printerSettingsUseLandscape = false; - bool printerSettingsUseMargins = false; - bool printerSettingsUsePaperKind = false; - var hideServiceRecordInsertedByAndInsertedOn = false; - bool isEndDateVisible = false; - bool isOnlyYearMonthVisible = false; - bool isZeiterfassDateNormal = true; - bool isZeiterfassungInStdMin = false; - int lastSelectedStundenkontoIntervall = 3; - bool showSignatures = false; - bool showRtfTextfield = false; - bool showPivotGrid = false; - bool showUrlaubsplanung = false; - bool dontShowSpitzabrechnung = false; - bool showDienstplanung = false; - - - AppSettings.ShowAdvisedAttendedFlag = false; - String timeRecordingMenuName = ""; - - if (_Mandator != null) - { - string val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowMedication"); - AppSettings.IsMedicationAllowed = val != null && val.Equals("1"); - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowScheduler"); - AppSettings.IsSchedulerAllowed = val != null && val.Equals("1"); - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowWohnheime"); - AppSettings.IsWohnheimAllowed = val != null && val.Equals("1"); - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowChat"); - AppSettings.IsChatAllowed = val != null && val.Equals("1"); - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "IsServiceRecordNoticeMandatory"); - if (val != null && val.Equals("0")) - { - isServiceRecordNoticeMandatory = false; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "IsPasswordSecurityActiv"); - if (val != null && val.Equals("1")) - { - isPasswordSecurityActiv = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "IsEndDateVisible"); - if (val != null && val.Equals("1")) - { - isEndDateVisible = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "IsOnlyYearMonthVisible"); - if (val != null && val.Equals("1")) - { - isOnlyYearMonthVisible = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "IsZeiterfassungInStdMin"); - if (val != null && val.Equals("1")) - { - isZeiterfassungInStdMin = true; - } - if (!isZeiterfassungInStdMin) - { - AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten; - } - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "IsZeiterfassDateNormal"); - if (val != null && val.Equals("0")) - { - isZeiterfassDateNormal = false; - } - - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "MaxDaysEditServiceRecordsAllowed"); - int result; - if (Int32.TryParse(val, out result)) - { - maxDaysEditServiceRecordsAllowed = result; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "HilfeplanAuslaufAuswahl"); - int resultplan; - if (Int32.TryParse(val, out resultplan)) - { - hilfeplanAuslaufAuswahl = resultplan; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "LastSelectedStundenkontoIntervall"); - int resultinterval; - if (Int32.TryParse(val, out resultinterval)) - { - lastSelectedStundenkontoIntervall = resultinterval; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "AnzTageZeiterfassErfolgt"); - int resultzeitplan; - if (Int32.TryParse(val, out resultzeitplan)) - { - anzTageZeiterfassErfolgt = resultzeitplan; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ZeiterfassungsSchwellwert"); - int resultschwell; - if (Int32.TryParse(val, out resultschwell)) - { - zeiterfassungsSchwellwert = resultschwell; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowDistanceFields"); - if (val != null && val.Equals("1")) - { - showServiceRecordsDistanceFields = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowHilfeplanBezeichnung"); - if (val != null && val.Equals("1")) - { - showHilfeplanBezeichnung = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowArbeitszeiten"); - if (val != null && val.Equals("1")) - { - showArbeitszeiten = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowRessources"); - AppSettings.ShowRessources = val != null && val.Equals("1"); - - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowTeamNews"); - if (val != null && val.Equals("1")) - { - showTeamNews = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowPivotGrid"); - if (val != null && val.Equals("1")) - { - showPivotGrid = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowUrlaubsplanung"); - if (val != null && val.Equals("1")) - { - showUrlaubsplanung = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "dontShowSpitzabrechnung"); - if (val != null && val.Equals("1")) - { - dontShowSpitzabrechnung = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowDienstplanung"); - if (val != null && val.Equals("1")) - { - showDienstplanung = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowMarker"); - if (val != null && val.Equals("1")) - { - showMarker = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowAnnualReport"); - if (val != null && val.Equals("1")) - { - showAnnualReport = true; - } - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowCustomerDistanceFields"); - if (val != null && val.Equals("1")) - { - showCustomerDistanceFields = true; - } - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowAdditionalService"); - if (val != null && val.Equals("1")) - { - showAdditionalService = true; - } - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowRoundedDurationInEmployeeAnalysis"); - if (val != null && val.Equals("0")) - { - showRoundedDurationInEmployeeAnalysis = false; - } - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowDatevFields"); - if (val != null && val.Equals("1")) - { - showDatevFields = true; - } - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "PrinterSettingsUseLandscape"); - if (val != null && val.Equals("1")) - { - printerSettingsUseLandscape = true; - } - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "PrinterSettingsUseMargins"); - if (val != null && val.Equals("1")) - { - printerSettingsUseMargins = true; - } - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "PrinterSettingsUsePaperKind"); - if (val != null && val.Equals("1")) - { - printerSettingsUsePaperKind = true; - } - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "HideServiceRecordInsertedByAndInsertedOn"); - if (val != null && val.Equals("1")) - { - hideServiceRecordInsertedByAndInsertedOn = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowSignature"); - if (val != null && val.Equals("1")) - { - showSignatures = true; - } - - val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowRtfTextfield"); - if (val != null && val.Equals("1")) - { - showRtfTextfield = true; - } - - - switch (_Mandator.BeWoClientType) - { - case 1: - //Die Kette - showDatevFields = true; - AppSettings.ShowAdvisedAttendedFlag = true; - break; - case 2: - //Datev - showDatevFields = true; - break; - case 3: - ////Köln Ring - showDatevFields = true; - timeRecordingMenuName = "Dokumentation"; - break; - case 4: - //Betreuwo - break; - - case 5: - //Kontakt und Krisenhilfe - AppSettings.ShowLargeCustomerNotice = true; - break; - case 6: - // Nur Jahresbericht - break; - case 7: - //IBP - showDatevFields = true; - break; - case 8: - //LH Würzburg - break; - case 9: - //Caritas Frankfurt+Aids Hilfe Gießen + Alle mit Korridor (Kostenträger Hessen) - break; - case 10: - //Integra - showDatevFields = true; - break; - case 11: - //Hannover - showDatevFields = true; - break; - } - } - - AppSettings.ShowDatevFields = showDatevFields; - AppSettings.IsServiceRecordNoticeMandatory = isServiceRecordNoticeMandatory; - AppSettings.IsPasswordSecurityActiv = isPasswordSecurityActiv; - AppSettings.IsEndDateVisible = isEndDateVisible; - AppSettings.IsOnlyYearMonthVisible = isOnlyYearMonthVisible; - AppSettings.IsZeiterfassDateNormal = isZeiterfassDateNormal; - AppSettings.IsZeiterfassungInStdMin = isZeiterfassungInStdMin; - AppSettings.MaxDaysEditServiceRecordsAllowed = maxDaysEditServiceRecordsAllowed; - AppSettings.HilfeplanAuslaufAuswahl = hilfeplanAuslaufAuswahl; - AppSettings.LastSelectedStundenkontoIntervall = lastSelectedStundenkontoIntervall; - AppSettings.AnzTageZeiterfassErfolgt = anzTageZeiterfassErfolgt; - AppSettings.ZeiterfassungsSchwellwert = zeiterfassungsSchwellwert; - AppSettings.TimeRecordingMenuName = timeRecordingMenuName; - AppSettings.ShowDistanceFields = showServiceRecordsDistanceFields; - AppSettings.ShowHilfeplanBezeichnung = showHilfeplanBezeichnung; - AppSettings.ShowArbeitszeiten = showArbeitszeiten; - AppSettings.ShowSignatures = showSignatures; - AppSettings.ShowRtfTextfield = showRtfTextfield; - AppSettings.ShowCustomerDistanceFields = showCustomerDistanceFields; - AppSettings.ShowAdditionalService = showAdditionalService; - AppSettings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis; - AppSettings.HideServiceRecordInsertedByAndInsertedOn = hideServiceRecordInsertedByAndInsertedOn; - AppSettings.ShowTeamNews = showTeamNews; - AppSettings.ShowMarker = showMarker; - AppSettings.ShowAnnualReport = showAnnualReport; - AppSettings.PrinterSettingsUseLandscape = printerSettingsUseLandscape; - AppSettings.PrinterSettingsUseMargins = printerSettingsUseMargins; - AppSettings.PrinterSettingsUsePaperKind = printerSettingsUsePaperKind; - AppSettings.ShowPivotGrid = showPivotGrid; - AppSettings.ShowUrlaubsplanung = showUrlaubsplanung; - AppSettings.DontShowSpitzabrechnung = dontShowSpitzabrechnung; - AppSettings.ShowDienstplanung = showDienstplanung; - - BS.Shared.Settings.ApplicationSettings.SupportConceptExpirationLimitInMonths = AppSettings.HilfeplanAuslaufAuswahl; - } - } - - internal static void ShowError(string p, Exception e, bool v) - { - BeWoLaApp.ShowError(p, e, v); - } - - public static int LockUITime - { - get - { - var lockTime = _Mandator.Settings.SplitToKeyValuePairList(";", "=").FirstOrDefault(f => f.Key.Equals("TimeUntilUILock")).Value; - - if (_LoggedOnUser != null && lockTime != null) - { - return Convert.ToInt32(lockTime); - } - - return _LockUITime; - } - - set - { - _LockUITime = value; - - if (_LoggedOnUser == null) - { - return; - } - - AutoLockUI.LockUITime = value; - AutoLockUI.StopTimer(); - AutoLockUI.StartAutoLockUIOption(); - } - } - - public event PropertyChangedEventHandler PropertyChanged; - - public static string GetAndCreateUserAppDataPath() - { - try - { - string localAppData = Environment.GetFolderPath( - Environment.SpecialFolder.LocalApplicationData); - string companyFilePath - = Path.Combine(localAppData, "beyondSoft"); - - if (!Directory.Exists(companyFilePath)) - Directory.CreateDirectory(companyFilePath); - - string bewoFilePath - = Path.Combine(companyFilePath, "BeWoPlaner"); - - if (!Directory.Exists(bewoFilePath)) - Directory.CreateDirectory(bewoFilePath); - - return bewoFilePath; - } - catch (Exception ex) - { - MessageBox.Show( - "Fehler beim Anlegen des Anwendungsordners. Sie besitzen nicht die erforderlichen Rechte, bitte wenden Sie sich an Ihren Systemadministrator.\n" + - ex.Message, "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation); - } - return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - } - - internal static bool HasLoggedOnUserRight(UserRightType[] pRight) - { - if (LoggedOnUser != null) - { - return pRight == null || (pRight.Length == 1 && pRight[0] == UserRightType.None) || LoggedOnUser.GetGrantedRights().Exists( - right => - { - var rightAsString = pRight.ToString(); - var vals = rightAsString.Split(","); - - foreach (var urt in pRight) - { - if (urt == right) - { - return true; - } - } - - return false; - }); - } - - return false; - } - - internal static void SaveAppSettings() - { - if (_AppSettings != null && _LoggedOnUser != null && _AppSettings.IsDirty) - { - _AppSettings.IsDirty = false; - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "WindowStateType", ((int)_AppSettings.WindowState).ToString(), _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "LastSelectedServiceRecordTimeInterval", ((int)_AppSettings.LastSelectedServiceRecordTimeInterval).ToString(), _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterInZeiterfassung", ((int)_AppSettings.CustomerFilterInZeiterfassung).ToString(), _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterSupportConcepts", ((int)_AppSettings.CustomerFilterSupportConcepts).ToString(), _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterCustomers", ((int)_AppSettings.CustomerFilterCustomers).ToString(), _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "ShowExpiredSupportConcepts", _AppSettings.ShowExpiredSupportConcepts ? "1" : "0", _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "ShowServiceRecordGridControl", _AppSettings.ShowServiceRecordGridControl ? "1" : "0", _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "StartupPanelMaximized", _AppSettings.StartupPanelMaximized, _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "HideServiceRecordInsertedByAndInsertedOn", _AppSettings.HideServiceRecordInsertedByAndInsertedOn ? "1" : "0", _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "DocumentationFontSize", _AppSettings.DocumentationFontSize.ToString(), _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "ZeigeNurMeineTermine", _AppSettings.ZeigeNurMeineTermine ? "1" : "0", _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "LastSelectedServiceRecordTimeIntervalDays", _AppSettings.LastSelectedServiceRecordTimeIntervalDays.ToString(), _LoggedOnUser.Settings); - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "LetzteZeiterfassungsDauer", ((int)_AppSettings.LetzteZeiterfassungsDauer).ToString(), _LoggedOnUser.Settings); - - string val = string.Empty; - if (_AppSettings.StartupPanelOrder != null) - { - foreach (string item in _AppSettings.StartupPanelOrder) - { - if (val.Length > 0) - { - val += "|"; - } - - val += item; - } - } - - UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, "StartupPanelOrder", val, _LoggedOnUser.Settings); - - ServiceFacade.DoUserServiceAsync(s => s.UpdateUserSettings(_LoggedOnUser.UserOid.Value, _LoggedOnUser.Settings), ReloadSettings, false); - } - } - - internal void FirePropertyChanged(string pPropertyName) - { - if (PropertyChanged != null) - { - PropertyChanged(this, new PropertyChangedEventArgs(pPropertyName)); - } - } - - public static void InitAutoUILocking() - { - EventManager.RegisterClassHandler(typeof(Window), UIElement.PreviewMouseDownEvent, new MouseButtonEventHandler(OnPreviewMouseDown)); - EventManager.RegisterClassHandler(typeof(Window), UIElement.PreviewKeyDownEvent, new KeyEventHandler(OnPreviewKeyDown)); - - var settingsKeyValuePairList = _Mandator.Settings.SplitToKeyValuePairList(";", "=").ToList(); - - var x = settingsKeyValuePairList.FirstOrDefault(f => f.Key.Equals("TimeUntilUILock")).Value ?? "NULL"; - - var y = _LockUITime; - - AutoLockUI.LockUITime = Convert.ToInt32(settingsKeyValuePairList.FirstOrDefault(f => f.Key.Equals("TimeUntilUILock")).Value ?? LockUITime.ToString()); - - - AutoLockUI.DoAutoLockUIEvent += AutoLockUIDoAutoLockUIEvent; - AutoLockUI.StartAutoLockUIOption(); - } - - private static void ReloadSettings(List settings) - { - if (_LoggedOnUser != null) - _LoggedOnUser.Settings = settings; - } - - private static void RestoreAppSettings() - { - if (_LoggedOnUser != null) - { - _AppSettings = new AppSettings(); - var settings = _LoggedOnUser.Settings; - - var val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "WindowStateType", settings); - if (int.TryParse(val, out var result)) - { - _AppSettings.WindowState = (AppSettings.WindowStateType)result; - } - - val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "LastSelectedServiceRecordTimeInterval", settings); - if (int.TryParse(val, out result)) - { - _AppSettings.LastSelectedServiceRecordTimeInterval = (ServiceRecordTimeInterval)result; - } - - val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterInZeiterfassung", settings); - if (int.TryParse(val, out result)) - { - _AppSettings.CustomerFilterInZeiterfassung = (CustomerFilterEnum)result; - } - - val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterSupportConcepts", settings); - if (int.TryParse(val, out result)) - { - _AppSettings.CustomerFilterSupportConcepts = (CustomerFilterEnum)result; - } - - val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterCustomers", settings); - if (int.TryParse(val, out result)) - { - _AppSettings.CustomerFilterCustomers = (CustomerFilterEnum)result; - } - - val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "ShowServiceRecordGridControl", settings); - _AppSettings.ShowServiceRecordGridControl = val == "1"; - - val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "ShowExpiredSupportConcepts", settings); - _AppSettings.ShowExpiredSupportConcepts = val != "0"; - - - - _AppSettings.StartupPanelMaximized = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "StartupPanelMaximized", settings); - - _AppSettings.DocumentationFontSize = Convert.ToDouble(UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "DocumentationFontSize", settings)); - - //val = GetSettingValue(SettingsType.ApplicationSettings, "ZeigeNurMeineTermine"); - //_AppSettings.ZeigeNurMeineTermine = val != "0"; - - _AppSettings.ZeigeNurMeineTermine = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "ZeigeNurMeineTermine", settings) == "1"; - - val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "LastSelectedServiceRecordTimeIntervalDays", settings); - if (val != null) - { - _AppSettings.LastSelectedServiceRecordTimeIntervalDays = Convert.ToInt32(UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "LastSelectedServiceRecordTimeIntervalDays", settings)); - } - - - val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "LetzteZeiterfassungsDauer", settings); - if (val != null) - { - var x = Convert.ToInt32(UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "LetzteZeiterfassungsDauer", settings)); - _AppSettings.LetzteZeiterfassungsDauer = x == 0 ? ZeiterfassungsDauer.Minuten : ZeiterfassungsDauer.Stunden; - } - - val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, "StartupPanelOrder", settings); - if (val != null) - { - _AppSettings.StartupPanelOrder = new List(); - var panels = val.Split('|'); - - foreach (var item in panels) - { - _AppSettings.StartupPanelOrder.Add(item); - } - } - - _AppSettings.IsDirty = false; - } - - } - - private void BtnOpenServiceRecordView_Click(object sender, RoutedEventArgs e) - { - var btn = sender as Button; - if (btn == null) return; - - var dc = btn.Tag as CompactSupportConceptDC; - - if (dc == null) return; - - if (MainView != null) - MainView.NavigateToServiceRecordView(dc.SupportConceptOid); - } - - private void Togglebutton_maximise_Checked(object sender, RoutedEventArgs e) - { - if (MainView != null) - MainView.Maximize(); - } - - private void Togglebutton_maximise_Unchecked(object sender, RoutedEventArgs e) - { - if (MainView != null) - MainView.Minimize(); - } - - private void TogglebuttonChat_maximise_Unchecked(object sender, RoutedEventArgs e) - { - if (MainView.HomeView.ServiceChatView != null) - MainView.HomeView.ServiceChatView.Normal(); - } - - private void TogglebuttonChat_maximise_Checked(object sender, RoutedEventArgs e) - { - if (MainView.HomeView.ServiceChatView != null) - MainView.HomeView.ServiceChatView.Maximize(); - } - - private void TogglebuttonChat_Minimize_Checked(object sender, RoutedEventArgs e) - { - if (MainView.HomeView.ServiceChatView != null) - MainView.HomeView.ServiceChatView.Minimize(); - } - - private void FrameLeftMouseDown(object sender, MouseButtonEventArgs e) - { - var border = (Border)sender; - var borderParent = (Grid)border.Parent; - DependencyObject template = borderParent.TemplatedParent; - var parent = new Window(); - - var x = (FrameworkElement)template; - if (x != null) - { - var y = new FrameworkElement(); - while (y != null) - { - y = (FrameworkElement)x.Parent; - if (y != null) - x = y; - } - - if (x is Window) - { - parent = (Window)x; - parent.DragMove(); - } - } - } - - private static void AutoLockUIDoAutoLockUIEvent() - { - if (ConnectionInformation.Username.Equals("BSAdmin")) - { - AutoLockUI.StartAutoLockUIOption(); - return; - } - - if (MainView.Content is LockedPage) - { - AutoLockUI.StartAutoLockUIOption(); - return; - } - - _lockedContent = MainView.Content as FrameworkElement; - - //if (_lockedContent is Grid && (_lockedContent as Grid).Children.Contains(LoginControl)) - //{ - // AutoLockUI.StartAutoLockUIOption(); - // return; - //} - - var openWindowCollection = Windows; - foreach (var blubb in openWindowCollection) - { - var abc = (Window)blubb; - - if (!abc.Title.Equals("BeWoPlaner") && blubb.GetType() == typeof(WindowContentHolder)) - { - abc.Close(); - } - } - - MainView.HideCurrentModalViewWindows(); - - var lockedPage = new LockedPage(); - lockedPage.ButtonLogin.Click += UnlockBeWoPlaner; - - CurrentApplication.MainWindow.Content = lockedPage; - - CurrentApplication.Dispatcher.Invoke(new Action(() => CurrentApplication.MainWindow?.Activate())); - - AutoLockUI.StartAutoLockUIOption(); - } - - private static void UnlockBeWoPlaner(object sender, RoutedEventArgs e) - { - var lbtn = (Button)sender; - - var lbtnParent = (Grid)lbtn.Parent; - var mainWindowUIElements = new UIElement[lbtnParent.Children.Count]; - lbtnParent.Children.CopyTo(mainWindowUIElements, 0); - - var elementList = mainWindowUIElements.ToList(); - var username = ((TextBox)elementList.Where(el => el is TextBox && ((TextBox)el).Name.Equals("TextBoxUsername")).ToList()[0]).Text; - var password = ((PasswordBox)elementList.Where(el => el is PasswordBox && ((PasswordBox)el).Name.Equals("PasswordBoxPassword")).ToList()[0]).Password; - - if (string.IsNullOrEmpty(username) || !username.Equals(_LoggedOnUser.LoginName, StringComparison.OrdinalIgnoreCase)) - { - MessageBox.Show("Das Programm kann nur vom Benutzer '" + _LoggedOnUser.LoginName + "' entsperrt werden.", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation); - return; - } - - username = $"{username}//Version=Sperrung aufgehoben"; - - ServiceFacade.DoUserServiceAsync(u => u.IsUserValid(username, password, ""), r => - { - if (!r.Equals(UserValidationResult.UserValid)) - { - MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den Benutzernamen und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation); - return; - } - - AutoLockUI.HasJustBeenUnlocked = true; - - CurrentApplication.Dispatcher.Invoke(delegate - { - CurrentApplication.MainWindow.Content = _lockedContent; - - MainView.ShowCurrentModalViewWindowsAgain(); - }); - }, true); - } - - private static void OnPreviewMouseDown(object sender, MouseButtonEventArgs e) - { - AutoLockUI.ResetLockUITimer(); - } - - private static void OnPreviewKeyDown(object sender, KeyEventArgs e) - { - AutoLockUI.ResetLockUITimer(); - } - - private void Hyperlink_Hilfeplan_Reaktivieren_Click(object sender, RoutedEventArgs e) - { - var scNavView = (SupportConceptNavigationView)MainView.ActiveView; - - if (scNavView != null) - { - var supportConcept = (CompactSupportConceptDC)((Hyperlink)sender).Tag; - scNavView.MainNavigationView_OnReactivateObject(supportConcept); - } - } - - public static void GetChatServerUrlAsync(Action callback) - { - if (string.IsNullOrWhiteSpace(ConnectionInformation.ServerName)) - { - var tenant = ConnectionInformation.Tenant; - -#if DEBUG - tenant = "5473568546"; -#endif - - var login = new Login(tenant, serverUrl => - { - if (!string.IsNullOrWhiteSpace(serverUrl)) - { - callback(serverUrl); - } - }); - } - else - { - callback?.Invoke(ConnectionInformation.ChatServerAddress); - } - } - public static void Cleanup() - { - _lockedContent = null; - _AppSettings = null; - _CompactLoggedOnEmployee = null; - _LoggedOnEmployee = null; - _LoggedOnUser = null; - _Mandator = null; - } - - public static void InitBlubb() - { - var timer = new System.Threading.Timer( - e => MainView.AufOffeneTerminePruefen(), null, TimeSpan.Zero, TimeSpan.FromMinutes(1) - ); - } - } -} \ No newline at end of file diff --git a/BeWo/Converter/AnonymizationRight2VisibilityConverter.cs b/BeWo/Converter/AnonymizationRight2VisibilityConverter.cs index b36b10730..1f93bd952 100644 --- a/BeWo/Converter/AnonymizationRight2VisibilityConverter.cs +++ b/BeWo/Converter/AnonymizationRight2VisibilityConverter.cs @@ -21,10 +21,10 @@ namespace BeWo.Converter switch(parameter.ToString()) { case "Customer": - hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_Anonymization); + hasRight = MainSession.LoggedOnUser.HasRight(UserRightType.Customer_Anonymization); break; case "Employee": - hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Employee_Anonymization); + hasRight = MainSession.LoggedOnUser.HasRight(UserRightType.Employee_Anonymization); break; } diff --git a/BeWo/Converter/ClientType2VisibilityConverter.cs b/BeWo/Converter/ClientType2VisibilityConverter.cs index 3ba40289b..1a68dd4cc 100644 --- a/BeWo/Converter/ClientType2VisibilityConverter.cs +++ b/BeWo/Converter/ClientType2VisibilityConverter.cs @@ -19,7 +19,7 @@ namespace BeWo.Converter { Int32.TryParse((string)parameter, out clienttype); - if (clienttype == BeWoApp.Mandator.BeWoClientType) + if (clienttype == MainSession.Mandator.BeWoClientType) { return Visibility.Visible; } diff --git a/BeWo/Converter/CustomerDCPrintURLConverter.cs b/BeWo/Converter/CustomerDCPrintURLConverter.cs index 1ccdb964c..5a2be263a 100644 --- a/BeWo/Converter/CustomerDCPrintURLConverter.cs +++ b/BeWo/Converter/CustomerDCPrintURLConverter.cs @@ -7,6 +7,7 @@ using BeWo.Core; using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; +using BS.SharedLauncher.Information; namespace BeWo.Converter { @@ -21,7 +22,7 @@ namespace BeWo.Converter return null; } - string url = BeWoLauncher.Cache.ConnectionInformation.CoreServerAddressOrigin + "/ReportView.aspx?cOid=" + lDC.CustomerOid + "&type=" + Utils.EnumName(ReportTypes.CustomerData); + string url = ConnectionInformation.CoreServerAddressOrigin + "/ReportView.aspx?cOid=" + lDC.CustomerOid + "&type=" + Utils.EnumName(ReportTypes.CustomerData); url = BeWoWpfUtils.GetHTMLEncodedURL(url); return new Uri(url); diff --git a/BeWo/Converter/DeleteForGoodRight2VisibilityConverter.cs b/BeWo/Converter/DeleteForGoodRight2VisibilityConverter.cs index a4006d403..2f79d9391 100644 --- a/BeWo/Converter/DeleteForGoodRight2VisibilityConverter.cs +++ b/BeWo/Converter/DeleteForGoodRight2VisibilityConverter.cs @@ -21,13 +21,13 @@ namespace BeWo.Converter switch(parameter.ToString()) { case "Customer": - hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_Full_Delete); + hasRight = MainSession.LoggedOnUser.HasRight(UserRightType.Customer_Full_Delete); break; case "Employee": - hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Employee_Full_Delete); + hasRight = MainSession.LoggedOnUser.HasRight(UserRightType.Employee_Full_Delete); break; case "Person": - hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Person_Full_Delete); + hasRight = MainSession.LoggedOnUser.HasRight(UserRightType.Person_Full_Delete); break; } diff --git a/BeWo/Converter/DownloadURLConverter.cs b/BeWo/Converter/DownloadURLConverter.cs index f83a1c956..05ae7b5d8 100644 --- a/BeWo/Converter/DownloadURLConverter.cs +++ b/BeWo/Converter/DownloadURLConverter.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Windows.Data; using BeWo.Core; -using BeWoLauncher.Cache; +using BS.SharedLauncher.Information; namespace BeWo.Converter { diff --git a/BeWo/Converter/InvoiceBaseDCPrintURLConverter.cs b/BeWo/Converter/InvoiceBaseDCPrintURLConverter.cs index df16897ed..1aeb99ffe 100644 --- a/BeWo/Converter/InvoiceBaseDCPrintURLConverter.cs +++ b/BeWo/Converter/InvoiceBaseDCPrintURLConverter.cs @@ -4,7 +4,7 @@ using System.Windows.Data; using BeWo.Core; using BeWo.ViewModel; -using BeWoLauncher.Cache; +using BS.SharedLauncher.Information; namespace BeWo.Converter { diff --git a/BeWo/Converter/ReactivationRight2VisibilityConverter.cs b/BeWo/Converter/ReactivationRight2VisibilityConverter.cs index 973938e6c..345f4b53d 100644 --- a/BeWo/Converter/ReactivationRight2VisibilityConverter.cs +++ b/BeWo/Converter/ReactivationRight2VisibilityConverter.cs @@ -20,19 +20,19 @@ namespace BeWo.Converter switch (parameter.ToString()) { case "Person": - hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.PersonAllowReactivation); + hasRight = MainSession.LoggedOnUser.HasRight(UserRightType.PersonAllowReactivation); break; case "Organisation": - hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.OrganisationAllowReactivation); + hasRight = MainSession.LoggedOnUser.HasRight(UserRightType.OrganisationAllowReactivation); break; case "SupportConcept": - hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptAllowReactivation); + hasRight = MainSession.LoggedOnUser.HasRight(UserRightType.SupportConceptAllowReactivation); break; case "Customer": - hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerAllowReactivation); + hasRight = MainSession.LoggedOnUser.HasRight(UserRightType.CustomerAllowReactivation); break; case "Employee": - hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.EmployeeAllowReactivation); + hasRight = MainSession.LoggedOnUser.HasRight(UserRightType.EmployeeAllowReactivation); break; } diff --git a/BeWo/Converter/Rights2DefaultBooleanConverter.cs b/BeWo/Converter/Rights2DefaultBooleanConverter.cs index dc966913a..158adb38a 100644 --- a/BeWo/Converter/Rights2DefaultBooleanConverter.cs +++ b/BeWo/Converter/Rights2DefaultBooleanConverter.cs @@ -23,7 +23,7 @@ namespace BeWo.Converter rightsList.AddRange(rights.Select(rightString => (UserRightType) Enum.Parse(typeof (UserRightType), rightString.Trim()))); - tmp = BeWoApp.HasLoggedOnUserRight(rightsList.ToArray()) ? DefaultBoolean.True : DefaultBoolean.False; + tmp = MainSession.HasLoggedOnUserRight(rightsList.ToArray()) ? DefaultBoolean.True : DefaultBoolean.False; } return tmp; diff --git a/BeWo/Converter/SettlementDCPrintURLConverter.cs b/BeWo/Converter/SettlementDCPrintURLConverter.cs index 7cd4f4343..86c2c7cc3 100644 --- a/BeWo/Converter/SettlementDCPrintURLConverter.cs +++ b/BeWo/Converter/SettlementDCPrintURLConverter.cs @@ -4,9 +4,9 @@ using System.Windows.Data; using BeWo.Core; using BeWo.ViewModel; -using BeWoLauncher.Cache; using BS.Shared.Core; using BS.Shared.DataContracts; +using BS.SharedLauncher.Information; namespace BeWo.Converter { diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index 827c0c04c..4567ee8ee 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -56,7 +56,7 @@ using RestSharp; using Control = System.Windows.Controls.Control; using Utils = BS.Shared.Core.Utils; using Brush = System.Windows.Media.Brush; -using BeWoLauncher.Cache; +using BS.SharedLauncher.Information; namespace BeWo.Core { @@ -126,7 +126,7 @@ namespace BeWo.Core Width = 500, WindowStartupLocation = WindowStartupLocation.CenterOwner, GroupBoxContent = control, - Owner = BeWoApp.CurrentApplication.MainWindow, + Owner = Session.GetWindow(), rootGroupBox = { Header = "Layout speichern" } }; @@ -151,9 +151,9 @@ namespace BeWo.Core //var newUri = navigateUriString.Replace(typeString, "template=" + (selectedTemplate.Oid.HasValue ? selectedTemplate.Oid.Value.ToString() : "-1")); - BeWoApp.MainView.StartWaiting(); + MainSession.MainPage.StartWaiting(); - StartGetReportStreamAsync(GetReportStreamForWPFControl, newUri, ms => BeWoApp.MainView.Dispatch(delegate + StartGetReportStreamAsync(GetReportStreamForWPFControl, newUri, ms => MainSession.MainPage.Dispatch(delegate { if (callback != null) { @@ -167,9 +167,9 @@ namespace BeWo.Core } else { - BeWoApp.MainView.StartWaiting(); + MainSession.MainPage.StartWaiting(); - StartGetReportStreamAsync(GetReportStreamForWPFControl, navigateUriString, ms => BeWoApp.MainView.Dispatch(delegate + StartGetReportStreamAsync(GetReportStreamForWPFControl, navigateUriString, ms => MainSession.MainPage.Dispatch(delegate { if (callback != null) { @@ -246,8 +246,8 @@ namespace BeWo.Core } catch (Exception e) { - BeWoApp.ShowError(null, e, true); - BeWoApp.MainView.EndWaiting(); + Session.ShowError(null, e, true); + MainSession.MainPage.EndWaiting(); } }, null); @@ -392,10 +392,10 @@ namespace BeWo.Core Title = viewModel.ToString() }; - BeWoApp.MainView.OpenedModalViewWindows.Add(CurrentModalViewWindow); + MainSession.MainPage.OpenedModalViewWindows.Add(CurrentModalViewWindow); _ModalViewWindowsToUpdate.Add(CurrentModalViewWindow); - foreach (var window in BeWoApp.MainView.OpenedModalViewWindows.Where(window => !BeWoApp.MainView.OpenedModalViewWindows.Last().Equals(window))) + foreach (var window in MainSession.MainPage.OpenedModalViewWindows.Where(window => !MainSession.MainPage.OpenedModalViewWindows.Last().Equals(window))) { ShowModalBackground(window.RootGrid); } @@ -405,15 +405,15 @@ namespace BeWo.Core public static void RemoveModalViewWindow() { - if(BeWoApp.MainView.OpenedModalViewWindows.Count > 1 && CurrentModalViewWindow != null) + if(MainSession.MainPage.OpenedModalViewWindows.Count > 1 && CurrentModalViewWindow != null) { - var nextToLastWindowWithModalBackground = BeWoApp.MainView.OpenedModalViewWindows.ElementAt(BeWoApp.MainView.OpenedModalViewWindows.Count - 2); + var nextToLastWindowWithModalBackground = MainSession.MainPage.OpenedModalViewWindows.ElementAt(MainSession.MainPage.OpenedModalViewWindows.Count - 2); nextToLastWindowWithModalBackground.RootGrid.Children.RemoveAt(1); } - BeWoApp.MainView.OpenedModalViewWindows.Remove(CurrentModalViewWindow); + MainSession.MainPage.OpenedModalViewWindows.Remove(CurrentModalViewWindow); - CurrentModalViewWindow = BeWoApp.MainView.OpenedModalViewWindows.Count > 0 ? BeWoApp.MainView.OpenedModalViewWindows.ElementAt(BeWoApp.MainView.OpenedModalViewWindows.Count - 1) : null; + CurrentModalViewWindow = MainSession.MainPage.OpenedModalViewWindows.Count > 0 ? MainSession.MainPage.OpenedModalViewWindows.ElementAt(MainSession.MainPage.OpenedModalViewWindows.Count - 1) : null; } public static bool CheckViewIsCalledFromWindow(BeWoView view) @@ -446,10 +446,10 @@ namespace BeWo.Core public static void UpdateAllViews(T updatedObject) where T : IFilterableDC { - var activeView = BeWoApp.MainView.ActiveView; + var activeView = MainSession.MainPage.ActiveView; UpdateView(activeView, updatedObject); - if(BeWoApp.MainView.OpenedModalViewWindows.Count <= 0) + if(MainSession.MainPage.OpenedModalViewWindows.Count <= 0) { return; } @@ -933,7 +933,7 @@ namespace BeWo.Core else if(typeof(T) == typeof(CompactSupportConceptDC)) { var updatedSupportConcept = new CompactSupportConceptDC(); - ServiceFacade.DoCustomerServiceSync(s => updatedSupportConcept = s.LoadCompactSupportConceptDC((pUpdateObject as CompactSupportConceptDC).SupportConceptOid, BeWoApp.LoggedOnEmployee.EmployeeOid)); + ServiceFacade.DoCustomerServiceSync(s => updatedSupportConcept = s.LoadCompactSupportConceptDC((pUpdateObject as CompactSupportConceptDC).SupportConceptOid, MainSession.LoggedOnEmployee.EmployeeOid)); if(equityInvoiceView?.SelectedSupportConcept != null) { @@ -1069,9 +1069,9 @@ namespace BeWo.Core pSupportConceptView.popupedit_employee.Text = updatedEmployee.ToString(); } - if(BeWoApp.LoggedOnUser.Employee.EmployeeOid.Equals(updatedEmployee.EmployeeOid)) + if(MainSession.LoggedOnUser.Employee.EmployeeOid.Equals(updatedEmployee.EmployeeOid)) { - BeWoApp.LoggedOnUser.Employee = updatedEmployee; + MainSession.LoggedOnUser.Employee = updatedEmployee; } pSupportConceptView.popupedit_employee.Text = updatedEmployee.ToString(); @@ -1264,7 +1264,7 @@ namespace BeWo.Core pUserView.ViewModel.Employee = updatedEmployee; var myView = new BeWoView(); - BeWoApp.MainView.Views.TryGetValue(UIContext.User, out myView); + MainSession.MainPage.Views.TryGetValue(UIContext.User, out myView); if(myView is UserNavigationView naviView) { @@ -1568,15 +1568,15 @@ namespace BeWo.Core private static void UpdateLoggedInEmployee(long employeeOid) { - if (employeeOid != BeWoApp.LoggedOnUser.Employee.EmployeeOid) + if (employeeOid != MainSession.LoggedOnUser.Employee.EmployeeOid) return; - ServiceFacade.DoEmployeeServiceSync(s => BeWoApp.LoggedOnUser.Employee = s.LoadCompactEmployee(BeWoApp.LoggedOnUser.Employee.EmployeeOid)); + ServiceFacade.DoEmployeeServiceSync(s => MainSession.LoggedOnUser.Employee = s.LoadCompactEmployee(MainSession.LoggedOnUser.Employee.EmployeeOid)); - if (BeWoApp.MainView.HomeButtonPanel == null) + if (MainSession.MainPage.HomeButtonPanel == null) return; - //BeWoApp.MainView.HomeView.txtHeader.Text = BeWoApp.LoggedOnUser.Employee.ToString(); + //MainSession.MainPage.HomeView.txtHeader.Text = MainSession.LoggedOnUser.Employee.ToString(); } public static void WriteExcelFile(string content, string path) @@ -1678,7 +1678,7 @@ namespace BeWo.Core var dc = vm.CommitToDataContract(); - dc.Employee = selectedEmployee ?? BeWoApp.LoggedOnUser.Employee; + dc.Employee = selectedEmployee ?? MainSession.LoggedOnUser.Employee; dc.SupportConcept = scDc; dc.CostBearer = cbDc; @@ -1733,12 +1733,12 @@ namespace BeWo.Core var r = new List(); - var maxdays = BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed; + var maxdays = MainSession.AppSettings.MaxDaysEditServiceRecordsAllowed; - if (withoutClient && BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed <= 0) + if (withoutClient && MainSession.AppSettings.MaxDaysEditServiceRecordsAllowed <= 0) maxdays = -1; - if (BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowEditAfterMaxDaysInNextMonth)) + if (MainSession.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowEditAfterMaxDaysInNextMonth)) maxdays = -1; var test = dc.Start; @@ -1761,20 +1761,20 @@ namespace BeWo.Core exitLoop = true; break; case ServiceRecordValidationResult.OutOfEditLimit: - MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da bereits der " + BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed + ". des nachfolgenden Monats überschritten ist.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); + MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da bereits der " + MainSession.AppSettings.MaxDaysEditServiceRecordsAllowed + ". des nachfolgenden Monats überschritten ist.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); lValid = false; exitLoop = true; break; case ServiceRecordValidationResult.FristAbgelaufen: - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecordAllowEditAfterMindays)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ServiceRecordAllowEditAfterMindays)) { - if (BeWoApp.AppSettings.AnzTageZeiterfassErfolgt == 1) + if (MainSession.AppSettings.AnzTageZeiterfassErfolgt == 1) { MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da die Zeiterfassung innerhalb von einem Tag erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); } else { - MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da die Zeiterfassung innerhalb von " + BeWoApp.AppSettings.AnzTageZeiterfassErfolgt + " Tagen erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); + MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da die Zeiterfassung innerhalb von " + MainSession.AppSettings.AnzTageZeiterfassErfolgt + " Tagen erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); } lValid = false; @@ -1788,7 +1788,7 @@ namespace BeWo.Core break; case ServiceRecordValidationResult.ServiceRecordOverlapping: - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLS)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLS)) { MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag (" + result.Message + " bei Klient/in " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information); lValid = false; @@ -1801,7 +1801,7 @@ namespace BeWo.Core break; case ServiceRecordValidationResult.EmployeeOverlapping: - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLSForEmployee)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLSForEmployee)) { MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag von " + result.EmployeeName + "\n(" + result.Message + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information); lValid = false; @@ -1823,7 +1823,7 @@ namespace BeWo.Core "Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag überschritten. ({1:N}).", result.ApprovedHours, result.HoursNew, klient); - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved)) { MessageBox.Show(msg + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information); lValid = false; @@ -1840,7 +1840,7 @@ namespace BeWo.Core { klient2 = "Klient/in " + result.CustomerName; } - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordAfterSettlementInvoice)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.BookServiceRecordAfterSettlementInvoice)) { MessageBox.Show(String.Format("Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für {0} erstellt wurde.", klient2), "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning); lValid = false; @@ -1883,7 +1883,7 @@ namespace BeWo.Core var dc = vm.CommitToDataContract(); - var emp = BeWoApp.LoggedOnUser.Employee; + var emp = MainSession.LoggedOnUser.Employee; var r = new List(); @@ -1956,7 +1956,7 @@ namespace BeWo.Core var serienTermine = (List)variablen["serienTermine"]; var mehrtaegigeTermine = (List)variablen["mehrtaegigeTermine"]; - ServiceFacade.DoReportServiceAsync(strom => strom.CreateKalenderReport(appointmentIds, employeeOid, serienTermine, selectedDays, mehrtaegigeTermine), ms => BeWoApp.MainView.Dispatch(() => ShowReportWindow(ms, title))); + ServiceFacade.DoReportServiceAsync(strom => strom.CreateKalenderReport(appointmentIds, employeeOid, serienTermine, selectedDays, mehrtaegigeTermine), ms => MainSession.MainPage.Dispatch(() => ShowReportWindow(ms, title))); break; case ReportEnum.KassenbuchReportEnum: @@ -1967,7 +1967,7 @@ namespace BeWo.Core var kasse = (BargeldkassenDC) variablen["bargeldkasse"]; - ServiceFacade.DoReportServiceAsync(strom => strom.CreateKassenbuchReportImZeitraum(zeitraum,endzeitraum, kasse, objectOid, objectTid), ms => BeWoApp.MainView.Dispatch(() => ShowReportWindow(ms, title))); + ServiceFacade.DoReportServiceAsync(strom => strom.CreateKassenbuchReportImZeitraum(zeitraum,endzeitraum, kasse, objectOid, objectTid), ms => MainSession.MainPage.Dispatch(() => ShowReportWindow(ms, title))); break; case ReportEnum.ZahlungsbelegEnum: @@ -1975,7 +1975,7 @@ namespace BeWo.Core var objectOid2 = Convert.ToInt64(variablen["objectoid"]); var objectTid2 = (TableID) Enum.Parse(typeof(TableID), variablen["objecttid"].ToString()); - ServiceFacade.DoReportServiceAsync(strom => strom.CreateKassenbelegReport(transaktion, objectOid2, objectTid2), ms => BeWoApp.MainView.Dispatch(() => ShowReportWindow(ms, title))); + ServiceFacade.DoReportServiceAsync(strom => strom.CreateKassenbelegReport(transaktion, objectOid2, objectTid2), ms => MainSession.MainPage.Dispatch(() => ShowReportWindow(ms, title))); break; } @@ -1999,9 +1999,9 @@ namespace BeWo.Core ms.Close(); ms.Dispose(); - //report.DefaultPrinterSettingsUsing.UseLandscape = BeWoApp.AppSettings.PrinterSettingsUseLandscape; - //report.DefaultPrinterSettingsUsing.UseMargins = BeWoApp.AppSettings.PrinterSettingsUseMargins; - //report.DefaultPrinterSettingsUsing.UsePaperKind = BeWoApp.AppSettings.PrinterSettingsUsePaperKind; + //report.DefaultPrinterSettingsUsing.UseLandscape = MainSession.AppSettings.PrinterSettingsUseLandscape; + //report.DefaultPrinterSettingsUsing.UseMargins = MainSession.AppSettings.PrinterSettingsUseMargins; + //report.DefaultPrinterSettingsUsing.UsePaperKind = MainSession.AppSettings.PrinterSettingsUsePaperKind; BeWoWindow window = null; @@ -2013,7 +2013,7 @@ namespace BeWo.Core documentPreviewControl.Loaded += CustomizeReportPreviewToolBar; documentPreviewControl.SnapsToDevicePixels = true; - window = new BeWoWindow { GroupBoxContent = documentPreviewControl, Owner = BeWoApp.CurrentApplication.MainWindow }; + window = new BeWoWindow { GroupBoxContent = documentPreviewControl, Owner = Session.GetWindow() }; ThemeManager.SetTheme(window, Theme.Office2010Black); } @@ -2031,7 +2031,7 @@ namespace BeWo.Core documentPreviewControl.Visibility = Visibility.Visible; - BeWoApp.MainView.EndWaiting(); + MainSession.MainPage.EndWaiting(); } public static PasswortSecurityStrength CheckPasswordSecurity(string paswd) @@ -2105,7 +2105,7 @@ namespace BeWo.Core { if (employees.Count == 0) { - employees.Add(BeWoApp.CompactLoggedOnEmployee); + employees.Add(MainSession.CompactLoggedOnEmployee); } // Gruppenbuchungen @@ -2135,7 +2135,7 @@ namespace BeWo.Core { if(employees.Count == 0) { - employees.Add(BeWoApp.CompactLoggedOnEmployee); + employees.Add(MainSession.CompactLoggedOnEmployee); } // Gruppenbuchungen @@ -2147,7 +2147,7 @@ namespace BeWo.Core public static void OwnChatSynchronisationVeranlassen() { - if (!BeWoApp.Mandator.Apikey.IsNullOrEmpty()) + if (!MainSession.Mandator.Apikey.IsNullOrEmpty()) { try { @@ -2157,22 +2157,22 @@ namespace BeWo.Core tenant = "5473568546"; #endif - BeWoApp.GetChatServerUrlAsync(serverUrl => + MainSession.GetChatServerUrlAsync(serverUrl => { - var client = new RestClient($"{serverUrl}/api/ownchat/sync/schedule/{BeWoApp.Mandator.Apikey}/{tenant}"); + var client = new RestClient($"{serverUrl}/api/ownchat/sync/schedule/{MainSession.Mandator.Apikey}/{tenant}"); var request = new RestRequest(); client.ExecuteAsync(request, null); }); -// var serverUrl = BeWoApp.GetChatServerURL(); +// var serverUrl = MainSession.GetChatServerURL(); // if (!string.IsNullOrEmpty(serverUrl)) // { //#if DEBUG -// var endurl = serverUrl + "/api/ownchat/sync/schedule/" + BeWoApp.Mandator.Apikey + "/5473568546"; +// var endurl = serverUrl + "/api/ownchat/sync/schedule/" + MainSession.Mandator.Apikey + "/5473568546"; //#else -// var endurl = serverUrl + "/api/ownchat/sync/schedule/" + BeWoApp.Mandator.Apikey + "/" + BeWoLauncher.Cache.ConnectionInformation.Tenant; +// var endurl = serverUrl + "/api/ownchat/sync/schedule/" + MainSession.Mandator.Apikey + "/" + ConnectionInformation.Tenant; //#endif // WebRequest request = WebRequest.Create(endurl); @@ -2194,19 +2194,19 @@ namespace BeWo.Core public static bool HasRights(IEnumerable pUserRightTypes) { - return BeWoApp.HasLoggedOnUserRight(pUserRightTypes.ToArray()); + return MainSession.HasLoggedOnUserRight(pUserRightTypes.ToArray()); } public static bool HasRight(UserRightType pUserRightType) { - return BeWoApp.LoggedOnUser.HasRight(pUserRightType); + return MainSession.LoggedOnUser.HasRight(pUserRightType); } public static bool CheckSchedulerRights(Appointment pAppointment, bool pIsNew, SchedulerRightsCheckType pCheckType) { var storage = pAppointment.GetCustomFieldStorage(); - return Utils.CheckSchedulerRights(storage.CustomerList, storage.ResourceList, storage.EmployeeList.ToList(), storage.Originator, pIsNew, pCheckType, BeWoApp.LoggedOnUser); + return Utils.CheckSchedulerRights(storage.CustomerList, storage.ResourceList, storage.EmployeeList.ToList(), storage.Originator, pIsNew, pCheckType, MainSession.LoggedOnUser); } } } diff --git a/BeWo/Core/DocumentWatcher.cs b/BeWo/Core/DocumentWatcher.cs index eff4c5861..6a4744afd 100644 --- a/BeWo/Core/DocumentWatcher.cs +++ b/BeWo/Core/DocumentWatcher.cs @@ -4,6 +4,7 @@ using BeWo.ViewModel; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; +using BS.SharedLauncher.Information; using System; using System.Collections.Generic; using System.IO; @@ -84,7 +85,7 @@ namespace BeWo.Core { if (!offeneDialoge.ContainsKey(e.FullPath) ) { - BeWoApp.CurrentApplication.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action)delegate + Session.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action)delegate { var dialog = new UploadDialog(e.FullPath, x); diff --git a/BeWo/Core/DownloadLinkEngine.cs b/BeWo/Core/DownloadLinkEngine.cs index 8a5e1f84b..f031b93c6 100644 --- a/BeWo/Core/DownloadLinkEngine.cs +++ b/BeWo/Core/DownloadLinkEngine.cs @@ -1,4 +1,4 @@ -using BeWoLauncher.Cache; +using BS.SharedLauncher.Information; using System; using System.ComponentModel; @@ -57,7 +57,7 @@ namespace BeWo.Core public Uri GenerateNewExcelLink() { this._ExcelFileId = Guid.NewGuid() + ".xls"; - //alles nach dem ? wird beim klick auf word/excel export im jeweiligen view erstellt tenant=" + BeWoLauncher.Cache.ConnectionInformation.Tenant + "&username=" + BeWoLauncher.Cache.ConnectionInformation.Username + "&token=" + BeWoApp.LoggedOnUser.RC2Password + "& + //alles nach dem ? wird beim klick auf word/excel export im jeweiligen view erstellt tenant=" + ConnectionInformation.Tenant + "&username=" + ConnectionInformation.Username + "&token=" + MainSession.LoggedOnUser.RC2Password + "& this._ExcelUri = new Uri(ConnectionInformation.CoreServerAddressOrigin + "/Download.aspx?fileid=" + this._ExcelFileId); if (this.PropertyChanged != null) @@ -72,7 +72,7 @@ namespace BeWo.Core { this._WordFileId = Guid.NewGuid() + ".doc"; //alles nach dem ? wird beim klick auf word/excel export im jeweiligen view erstellt - this._WordUri = new Uri(ConnectionInformation.CoreServerAddressOrigin + "/Download.aspx?tenant=" + BeWoLauncher.Cache.ConnectionInformation.Tenant + "&username=" + BeWoLauncher.Cache.ConnectionInformation.Username + "&token=" + BeWoApp.LoggedOnUser.RC2Password + "&fileid=" + this._WordFileId); + this._WordUri = new Uri(ConnectionInformation.CoreServerAddressOrigin + "/Download.aspx?tenant=" + ConnectionInformation.Tenant + "&username=" + ConnectionInformation.Username + "&token=" + MainSession.LoggedOnUser.RC2Password + "&fileid=" + this._WordFileId); if (this.PropertyChanged != null) { diff --git a/BeWo/Core/Service/Cache.cs b/BeWo/Core/Service/Cache.cs index 9fe1669e2..1f8cc9e65 100644 --- a/BeWo/Core/Service/Cache.cs +++ b/BeWo/Core/Service/Cache.cs @@ -128,7 +128,7 @@ namespace BeWo.Core.Service if (this.mActiveSupportConceptCostbearerList == null) { ServiceFacade.DoOperationsServiceAsync( - s => s.GetAllActiveSupportConceptCostbearer(false, true, BeWoApp.LoggedOnEmployee.EmployeeOid.Value), + s => s.GetAllActiveSupportConceptCostbearer(false, true, MainSession.LoggedOnEmployee.EmployeeOid.Value), r => { r.Sort((x, y) => (x.LastName + ", " + x.FirstName).CompareTo(y.LastName + ", " + y.FirstName)); @@ -149,7 +149,7 @@ namespace BeWo.Core.Service // { // var list = ServiceFacade.DoOperationsServiceSync( - // s => s.GetAllActiveSupportConceptCostbearer(false, true, BeWoApp.LoggedOnEmployee.EmployeeOid.Value)); + // s => s.GetAllActiveSupportConceptCostbearer(false, true, MainSession.LoggedOnEmployee.EmployeeOid.Value)); // list.Sort((x, y) => { return (x.LastName + ", " + x.FirstName).CompareTo(y.LastName + ", " + y.FirstName); }); // this.mActiveSupportConceptCostbearerList = list; @@ -166,7 +166,7 @@ namespace BeWo.Core.Service if (this.mActiveAndApprovedSupportConceptCostbearerList == null) { ServiceFacade.DoOperationsServiceAsync( - s => s.GetAllActiveSupportConceptCostbearer(true, true, BeWoApp.LoggedOnEmployee.EmployeeOid.Value), + s => s.GetAllActiveSupportConceptCostbearer(true, true, MainSession.LoggedOnEmployee.EmployeeOid.Value), r => { r.Sort((x, y) => { return (x.LastName + ", " + x.FirstName).CompareTo(y.LastName + ", " + y.FirstName); }); @@ -295,7 +295,7 @@ namespace BeWo.Core.Service if (this.mSupportConceptTree == null) { ServiceFacade.DoOperationsServiceAsync( - s => s.GetSupportConceptTreeByEmployee(BeWoApp.LoggedOnUser.Employee.EmployeeOid), + s => s.GetSupportConceptTreeByEmployee(MainSession.LoggedOnUser.Employee.EmployeeOid), lTree => { lTree.DoForEach(n => n.RecursivelySetParentOnChilds()); @@ -453,7 +453,7 @@ namespace BeWo.Core.Service if (mAllCompactCustomers == null) { ServiceFacade.DoCustomerServiceAsync( - s => s.GetAllActiveAndArchivedCustomersCompact(BeWoApp.LoggedOnEmployee.EmployeeOid.Value), + s => s.GetAllActiveAndArchivedCustomersCompact(MainSession.LoggedOnEmployee.EmployeeOid.Value), r => { r.Sort((x, y) => (x.LastName + ", " + x.FirstName).CompareTo(y.LastName + ", " + y.FirstName)); @@ -472,7 +472,7 @@ namespace BeWo.Core.Service { if (mAllCompactCustomers == null) { - ServiceFacade.DoCustomerServiceSync(cs => mAllCompactCustomers = cs.GetAllActiveAndArchivedCustomersCompact(BeWoApp.LoggedOnEmployee.EmployeeOid.Value)); + ServiceFacade.DoCustomerServiceSync(cs => mAllCompactCustomers = cs.GetAllActiveAndArchivedCustomersCompact(MainSession.LoggedOnEmployee.EmployeeOid.Value)); mAllCompactCustomers.Sort((x, y) => (x.LastName + ", " + x.FirstName).CompareTo(y.LastName + ", " + y.FirstName)); } diff --git a/BeWo/Core/Service/SupportConceptService.cs b/BeWo/Core/Service/SupportConceptService.cs index ed7fac0ea..5c018db33 100644 --- a/BeWo/Core/Service/SupportConceptService.cs +++ b/BeWo/Core/Service/SupportConceptService.cs @@ -309,18 +309,18 @@ namespace BeWo.Core.Service } - dc.Employee = BeWoApp.LoggedOnUser.Employee; + dc.Employee = MainSession.LoggedOnUser.Employee; dc.Customer = customerCompact; if (customerCompact != null) { dc.SupportConcept = HoleHilfeplanAusListe(scList, customerCompact, firstTime, lastTime); } - if (BeWoApp.AppSettings.IsEndDateVisible) + if (MainSession.AppSettings.IsEndDateVisible) { dc.ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitEndDatum; } - else if (BeWoApp.AppSettings.IsOnlyYearMonthVisible) + else if (MainSession.AppSettings.IsOnlyYearMonthVisible) { dc.ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitMonatJahr; } diff --git a/BeWo/LockedPage.xaml b/BeWo/LockedPage.xaml index 678dad83f..c07359352 100644 --- a/BeWo/LockedPage.xaml +++ b/BeWo/LockedPage.xaml @@ -15,7 +15,7 @@ - + diff --git a/BeWo/LockedPage.xaml.cs b/BeWo/LockedPage.xaml.cs index 86ef169ef..ba8642aba 100644 --- a/BeWo/LockedPage.xaml.cs +++ b/BeWo/LockedPage.xaml.cs @@ -9,8 +9,8 @@ namespace BeWo InitializeComponent(); Loaded += LockedPage_Loaded; - LblVersion.Content = BeWoApp.Version; - lblGesperrt.Content = $"Gesperrt von Benutzer {BeWoApp.LoggedOnUser.Employee.FirstName} {BeWoApp.LoggedOnUser.Employee.LastName}"; + LblVersion.Content = MainSession.Version; + lblGesperrt.Content = $"Gesperrt von Benutzer {MainSession.LoggedOnUser.Employee.FirstName} {MainSession.LoggedOnUser.Employee.LastName}"; } private void LockedPage_Loaded(object sender, RoutedEventArgs e) diff --git a/BeWo/MainDictionary.xaml b/BeWo/MainDictionary.xaml index 714edd1e3..73bd991e9 100644 --- a/BeWo/MainDictionary.xaml +++ b/BeWo/MainDictionary.xaml @@ -1,7 +1,6 @@  - - + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + - - - - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/BeWo/View/Detail/Accounting/GeneralInvoiceView.xaml.cs b/BeWo/View/Detail/Accounting/GeneralInvoiceView.xaml.cs index 1900dc71a..98a8a8eaf 100644 --- a/BeWo/View/Detail/Accounting/GeneralInvoiceView.xaml.cs +++ b/BeWo/View/Detail/Accounting/GeneralInvoiceView.xaml.cs @@ -37,7 +37,7 @@ namespace BeWo.View.Detail.Accounting _EditView = new GeneralInvoiceItemEditView(); _EditView.EditingFinished += (s, e) => { - MainView.CloseCurrentPopUp(); + MainPage.CloseCurrentPopUp(); ReloadViewModel(); }; } @@ -100,7 +100,7 @@ namespace BeWo.View.Detail.Accounting delegate { _EditView.ViewModel = ViewModel.NewVM; - MainView.ShowControlAsModalPopup(_EditView); + MainPage.ShowControlAsModalPopup(_EditView); }); } @@ -117,17 +117,17 @@ namespace BeWo.View.Detail.Accounting private void btnEdit_Click(object sender, RoutedEventArgs e) { _EditView.ViewModel = BeWoWpfUtils.GetTag(sender); - MainView.ShowControlAsModalPopup(_EditView); + MainPage.ShowControlAsModalPopup(_EditView); } private void button_add_Click(object sender, RoutedEventArgs e) { ViewModel.NewVM.DataContract.Type = InvoiceType.General; - ViewModel.NewVM.CreatorFirstName = BeWoApp.LoggedOnEmployee.FirstName; - ViewModel.NewVM.CreatorLastName = BeWoApp.LoggedOnEmployee.LastName; - ViewModel.NewVM.SenderFirstName = BeWoApp.LoggedOnEmployee.FirstName; - ViewModel.NewVM.SenderLastName = BeWoApp.LoggedOnEmployee.LastName; - ViewModel.NewVM.SenderOrganisation = BeWoApp.Mandator.Name; + ViewModel.NewVM.CreatorFirstName = MainSession.LoggedOnEmployee.FirstName; + ViewModel.NewVM.CreatorLastName = MainSession.LoggedOnEmployee.LastName; + ViewModel.NewVM.SenderFirstName = MainSession.LoggedOnEmployee.FirstName; + ViewModel.NewVM.SenderLastName = MainSession.LoggedOnEmployee.LastName; + ViewModel.NewVM.SenderOrganisation = MainSession.Mandator.Name; ViewModel.NewVM.InvoiceDate = DateTime.Now.Date; ViewModel.NewVM.AccountingPeriodStart = DateTime.Now.Date.AddDays(-DateTime.Now.Day + 1).AddMonths(-1); ViewModel.NewVM.AccountingPeriodEnd = DateTime.Now.Date.AddDays(-DateTime.Now.Day); @@ -135,7 +135,7 @@ namespace BeWo.View.Detail.Accounting ViewModel.NewVM.InvoiceItems.NewVM.ItemPeriodEnd = ViewModel.NewVM.AccountingPeriodEnd; ViewModel.NewVM.InvoiceItems.AddNewVMToList(); - foreach (ContactDC iContactDC in BeWoApp.LoggedOnEmployee.ContactInformations) + foreach (ContactDC iContactDC in MainSession.LoggedOnEmployee.ContactInformations) { if (iContactDC.ContactType == ContactType.business_Fax) { @@ -232,7 +232,7 @@ namespace BeWo.View.Detail.Accounting private void Popupedit_Recipient_OnPreviewMouseDoubleClick(object sender, MouseButtonEventArgs e) { - if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit) sender, e) || _SelectedOrganisation == null || !BeWoApp.LoggedOnUser.HasRight(UserRightType.OrganisationView_Edit)) + if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit) sender, e) || _SelectedOrganisation == null || !MainSession.LoggedOnUser.HasRight(UserRightType.OrganisationView_Edit)) return; VMFactory.CreateOrganisationVMAsync(_SelectedOrganisation.OrganisationOid, @@ -250,7 +250,7 @@ namespace BeWo.View.Detail.Accounting { _SelectedOrganisation = p; popupedit_Recipient.Focus(); - MainView.CloseCurrentPopUp(); + MainPage.CloseCurrentPopUp(); })); } } diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml index 8072ce729..e0fef4828 100644 --- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml +++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml @@ -1,5 +1,11 @@ - - + + + + diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs index 081eadaf5..f003e29f8 100644 --- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs +++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs @@ -59,31 +59,31 @@ namespace BeWo.View.Detail.Accounting this._EquityInvoiceItemEditView.EditingFinished += (s, e) => { - this.MainView.CloseCurrentPopUp(); + this.MainPage.CloseCurrentPopUp(); ServiceFacade.DoAccountingServiceAsync(se => se.LoadInvoiceBaseByOid(this._EquityInvoiceItemEditView.ViewModel.DataContract.InvoiceBaseOid.Value), cb => this.RefreshItemInList(cb)); }; this._GeneralInvoiceItemEditView.EditingFinished += (s, e) => { - this.MainView.CloseCurrentPopUp(); + this.MainPage.CloseCurrentPopUp(); ServiceFacade.DoAccountingServiceAsync(se => se.LoadInvoiceBaseByOid(this._GeneralInvoiceItemEditView.ViewModel.DataContract.InvoiceBaseOid.Value), cb => this.RefreshItemInList(cb)); }; this._SettlementInvoiceItemEditView.EditingFinished += (s, e) => { - this.MainView.CloseCurrentPopUp(); + this.MainPage.CloseCurrentPopUp(); ServiceFacade.DoAccountingServiceAsync(se => se.LoadInvoiceBaseByOid(this._SettlementInvoiceItemEditView.ViewModel.DataContract.InvoiceBaseOid.Value), cb => this.RefreshItemInList(cb)); }; this._SettlementInvoiceItemEditView2.EditingFinished += (s, e) => { - this.MainView.CloseCurrentPopUp(); + this.MainPage.CloseCurrentPopUp(); ServiceFacade.DoAccountingServiceAsync(se => se.LoadInvoiceBaseByOid(this._SettlementInvoiceItemEditView2.ViewModel.DataContract.InvoiceBaseOid.Value), cb => this.RefreshItemInList(cb)); }; this._ServiceInvoiceItemEditView.EditingFinished += (s, e) => { - this.MainView.CloseCurrentPopUp(); + this.MainPage.CloseCurrentPopUp(); ServiceFacade.DoAccountingServiceAsync(se => se.LoadInvoiceBaseByOid(this._ServiceInvoiceItemEditView.ViewModel.DataContract.InvoiceBase.InvoiceBaseOid.Value), cb => this.RefreshItemInList(cb)); }; } @@ -190,12 +190,12 @@ namespace BeWo.View.Detail.Accounting { case InvoiceType.CustomerEquity: this._EquityInvoiceItemEditView.ViewModel = vm; - this.MainView.ShowControlAsModalPopup(this._EquityInvoiceItemEditView); + this.MainPage.ShowControlAsModalPopup(this._EquityInvoiceItemEditView); break; case InvoiceType.General: this._GeneralInvoiceItemEditView.ViewModel = vm; - this.MainView.ShowControlAsModalPopup(this._GeneralInvoiceItemEditView); + this.MainPage.ShowControlAsModalPopup(this._GeneralInvoiceItemEditView); break; case InvoiceType.Settlement: @@ -207,12 +207,12 @@ namespace BeWo.View.Detail.Accounting if (cb.InvoiceItems == null || cb.InvoiceItems.Count == 0 || cb.DifferentHourlyRateCount > 0) { this._SettlementInvoiceItemEditView.ViewModel = new SettlementVM(cb); - this.MainView.ShowControlAsModalPopup(this._SettlementInvoiceItemEditView); + this.MainPage.ShowControlAsModalPopup(this._SettlementInvoiceItemEditView); } else { this._SettlementInvoiceItemEditView2.ViewModel = new SettlementVM(cb); - this.MainView.ShowControlAsModalPopup(this._SettlementInvoiceItemEditView2); + this.MainPage.ShowControlAsModalPopup(this._SettlementInvoiceItemEditView2); } })); break; @@ -224,7 +224,7 @@ namespace BeWo.View.Detail.Accounting delegate { this._ServiceInvoiceItemEditView.ViewModel = new ServiceInvoiceVM(cb); - this.MainView.ShowControlAsModalPopup(this._ServiceInvoiceItemEditView); + this.MainPage.ShowControlAsModalPopup(this._ServiceInvoiceItemEditView); })); break; } @@ -286,7 +286,7 @@ namespace BeWo.View.Detail.Accounting vm.TypeString, vm.CustomerName, vm.AccountingPeriodString, vm.InvoiceNumber, vm.InvoiceDate.Value.ToShortDateString(), vm.RecipientString, string.Format("{0:0.00}", vm.TotalAmount), vm.Notice, vm.IsPaid ? "Ja" : "" })); } - var path = BeWoApp.GetAndCreateUserAppDataPath() + "\\Rechnungen.xls"; + var path = MainSession.GetAndCreateUserAppDataPath() + "\\Rechnungen.xls"; var sf = new SaveFileDialog { FileName = Path.GetFileName(path), Filter = "Microsoft Excel 97-2003-Arbeitsblatt|*.xls|Alle Dateien|*.*" }; if (sf.ShowDialog() != true) diff --git a/BeWo/View/Detail/Accounting/ServiceInvoiceCreatePopUpView.xaml b/BeWo/View/Detail/Accounting/ServiceInvoiceCreatePopUpView.xaml index ff58df91a..3cd2cead5 100644 --- a/BeWo/View/Detail/Accounting/ServiceInvoiceCreatePopUpView.xaml +++ b/BeWo/View/Detail/Accounting/ServiceInvoiceCreatePopUpView.xaml @@ -9,7 +9,7 @@ HorizontalAlignment="Stretch" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:r="clr-namespace:BeWo.Security" VerticalAlignment="Stretch" Focusable="True" xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"> - + @@ -18,8 +18,8 @@ Padding="0,0,0,0" /> - - + + diff --git a/BeWo/View/Detail/Accounting/ServiceInvoiceItemEditView.xaml b/BeWo/View/Detail/Accounting/ServiceInvoiceItemEditView.xaml index c1ddb917d..bd1f32485 100644 --- a/BeWo/View/Detail/Accounting/ServiceInvoiceItemEditView.xaml +++ b/BeWo/View/Detail/Accounting/ServiceInvoiceItemEditView.xaml @@ -8,7 +8,7 @@ xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> - + @@ -17,7 +17,7 @@ VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" /> - + @@ -36,7 +36,7 @@ - + @@ -85,7 +85,7 @@ TextWrapping="Wrap" Height="23" Text="{Binding InvoiceBase.Notice}" /> - + @@ -130,7 +130,7 @@ Text="{Binding Path=RecipientPostBox}" Height="23" /> - @@ -171,7 +171,7 @@ Height="23" /> - @@ -332,7 +332,7 @@ - + @@ -344,7 +344,7 @@ - + @@ -518,13 +518,13 @@ - - + + - - + + diff --git a/BeWo/View/Detail/Accounting/ServiceInvoiceView.xaml b/BeWo/View/Detail/Accounting/ServiceInvoiceView.xaml index c40e44a65..e835559eb 100644 --- a/BeWo/View/Detail/Accounting/ServiceInvoiceView.xaml +++ b/BeWo/View/Detail/Accounting/ServiceInvoiceView.xaml @@ -4,6 +4,7 @@ xmlns:val="clr-namespace:BeWo.Validation" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" + xmlns:conv="clr-namespace:BeWo.Converter" xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:r="clr-namespace:BeWo.Security" xmlns:localsearch="clr-namespace:BeWo.View.Search" @@ -13,8 +14,14 @@ xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" x:Class="BeWo.View.Detail.Accounting.ServiceInvoiceView" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" mc:Ignorable="d"> + + + + + + - + diff --git a/BeWo/View/Detail/Accounting/ServiceInvoiceView.xaml.cs b/BeWo/View/Detail/Accounting/ServiceInvoiceView.xaml.cs index 64d745862..7975e7dcd 100644 --- a/BeWo/View/Detail/Accounting/ServiceInvoiceView.xaml.cs +++ b/BeWo/View/Detail/Accounting/ServiceInvoiceView.xaml.cs @@ -18,7 +18,7 @@ using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; -using BeWoLauncher.Cache; +using BS.SharedLauncher.Information; namespace BeWo.View.Detail.Accounting { @@ -50,13 +50,13 @@ namespace BeWo.View.Detail.Accounting this._EditView.EditingFinished += (s, e) => { this.RefreshViewModel(); - this.MainView.CloseCurrentPopUp(); + this.MainPage.CloseCurrentPopUp(); }; this._CreatePopUpView = new ServiceInvoiceCreatePopUpView(); this._CreatePopUpView.Closed += (s, e) => { - this.MainView.CloseCurrentPopUp(); + this.MainPage.CloseCurrentPopUp(); ServiceFacade.DoAccountingServiceAsync(svc => svc.InsertNewServiceInvoices(e.Data), this.RefreshViewModel); }; @@ -229,7 +229,7 @@ namespace BeWo.View.Detail.Accounting private void btnEdit_Click(object sender, RoutedEventArgs e) { this._EditView.ViewModel = BeWoWpfUtils.GetTag(sender); - this.MainView.ShowControlAsModalPopup(this._EditView); + this.MainPage.ShowControlAsModalPopup(this._EditView); } private void button_createInvoice_Click(object sender, RoutedEventArgs e) @@ -240,7 +240,7 @@ namespace BeWo.View.Detail.Accounting r => this.Dispatch(() => { this._CreatePopUpView.ServiceInvoiceDcs = r; - this.MainView.ShowControlAsModalPopup(this._CreatePopUpView); + this.MainPage.ShowControlAsModalPopup(this._CreatePopUpView); })); } @@ -284,7 +284,7 @@ namespace BeWo.View.Detail.Accounting private void Popupedit_CostBeaerer_OnPreviewMouseDoubleClick(object sender, MouseButtonEventArgs e) { - if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit)sender, e) || ViewModel.SelectedCostBearer == null || !BeWoApp.LoggedOnUser.HasRight(UserRightType.OrganisationView_AllowEditCostBearer)) + if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit)sender, e) || ViewModel.SelectedCostBearer == null || !MainSession.LoggedOnUser.HasRight(UserRightType.OrganisationView_AllowEditCostBearer)) return; VMFactory.CreateOrganisationVMAsync(ViewModel.SelectedCostBearer.OrganisationOid, @@ -301,13 +301,13 @@ namespace BeWo.View.Detail.Accounting { ViewModel.SelectedCostBearer = p; popupedit_CostBeaerer.Focus(); - MainView.CloseCurrentPopUp(); + MainPage.CloseCurrentPopUp(); })); } private void Popupedit_supportConcept_OnPreviewMouseDoubleClick(object sender, MouseButtonEventArgs e) { - if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit)sender, e) || ViewModel.SelectedSupportConcept == null || !BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_Edit)) + if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit)sender, e) || ViewModel.SelectedSupportConcept == null || !MainSession.LoggedOnUser.HasRight(UserRightType.SupportConceptView_Edit)) return; VMFactory.CreateSupportConceptVMAsync(ViewModel.SelectedSupportConcept.SupportConceptOid, diff --git a/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView.xaml b/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView.xaml index 5edfe3cb9..d5a5d1ea3 100644 --- a/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView.xaml +++ b/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView.xaml @@ -3,10 +3,14 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:val="clr-namespace:BeWo.Validation" + xmlns:conv="clr-namespace:BeWo.Converter" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> + + + - + @@ -16,7 +20,7 @@ - + @@ -31,7 +35,7 @@ - + @@ -70,7 +74,7 @@ Text="{Binding Path=RecipientPostBox}" Height="23" /> - @@ -109,7 +113,7 @@ Height="23" /> - + @@ -172,7 +176,7 @@ - + diff --git a/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml b/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml index 3fd728184..563a42527 100644 --- a/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml +++ b/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml @@ -4,14 +4,18 @@ xmlns:localViewModel="clr-namespace:BeWo.ViewModel" xmlns:localViewDetail="clr-namespace:BeWo.View.Detail.Accounting" xmlns:val="clr-namespace:BeWo.Validation" xmlns:proxy="clr-namespace:BeWo.ServiceProxy" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" + xmlns:conv="clr-namespace:BeWo.Converter" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:r="clr-namespace:BeWo.Security" VerticalAlignment="Stretch" Focusable="True" xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"> + + + - + @@ -20,7 +24,7 @@ VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" /> - + @@ -35,7 +39,7 @@ - + @@ -74,7 +78,7 @@ Text="{Binding Path=RecipientPostBox}" Height="23" /> - @@ -113,7 +117,7 @@ Height="23" /> - + @@ -176,7 +180,7 @@ - + diff --git a/BeWo/View/Detail/Accounting/SettlementInvoiceView.xaml b/BeWo/View/Detail/Accounting/SettlementInvoiceView.xaml index 209e62bb9..a08354277 100644 --- a/BeWo/View/Detail/Accounting/SettlementInvoiceView.xaml +++ b/BeWo/View/Detail/Accounting/SettlementInvoiceView.xaml @@ -1,9 +1,15 @@ - - + + + + + - + diff --git a/BeWo/View/Detail/Accounting/SettlementInvoiceView.xaml.cs b/BeWo/View/Detail/Accounting/SettlementInvoiceView.xaml.cs index 4da6f09ac..36038b9ab 100644 --- a/BeWo/View/Detail/Accounting/SettlementInvoiceView.xaml.cs +++ b/BeWo/View/Detail/Accounting/SettlementInvoiceView.xaml.cs @@ -40,7 +40,7 @@ namespace BeWo.View.Detail.Accounting { // OpenViewModel(_EditView.ViewModel); this.ReloadViewModel(); - this.MainView.CloseCurrentPopUp(); + this.MainPage.CloseCurrentPopUp(); }; this._EditView2 = new SettlementInvoiceItemEditView2(); @@ -48,7 +48,7 @@ namespace BeWo.View.Detail.Accounting { // OpenViewModel(_EditView.ViewModel); this.ReloadViewModel(); - this.MainView.CloseCurrentPopUp(); + this.MainPage.CloseCurrentPopUp(); }; } @@ -79,9 +79,9 @@ namespace BeWo.View.Detail.Accounting // String url = ConnectionInformation.CoreServerAddressOrigin.ToString() // + "/ReportView.aspx?dcid=" // + vm.DataContract.SettlementIvoiceOid.ToString() - // + "&tenant=" + BeWoLauncher.Cache.ConnectionInformation.Tenant - // + "&username=" + BeWoLauncher.Cache.ConnectionInformation.Username - // + "&rc2password=" + BeWoApp.LoggedOnUser.RC2Password + // + "&tenant=" + ConnectionInformation.Tenant + // + "&username=" + ConnectionInformation.Username + // + "&rc2password=" + MainSession.LoggedOnUser.RC2Password // + "&type=" + Utils.EnumName(ReportTypes.Settlement); // url = BeWoWpfUtils.GetHTMLEncodedURL(url); @@ -117,12 +117,12 @@ namespace BeWo.View.Detail.Accounting if (ShowOldEditView(vm)) { this._EditView.ViewModel = vm; - this.MainView.ShowControlAsModalPopup(this._EditView); + this.MainPage.ShowControlAsModalPopup(this._EditView); } else { this._EditView2.ViewModel = vm; - this.MainView.ShowControlAsModalPopup(this._EditView2); + this.MainPage.ShowControlAsModalPopup(this._EditView2); } } } @@ -141,12 +141,12 @@ namespace BeWo.View.Detail.Accounting if (ShowOldEditView(vm)) { this._EditView.ViewModel = new SettlementVM(dc); - this.MainView.ShowControlAsModalPopup(this._EditView); + this.MainPage.ShowControlAsModalPopup(this._EditView); } else { this._EditView2.ViewModel = new SettlementVM(dc); - this.MainView.ShowControlAsModalPopup(this._EditView2); + this.MainPage.ShowControlAsModalPopup(this._EditView2); } }); }); @@ -171,7 +171,7 @@ namespace BeWo.View.Detail.Accounting private void Popupedit_CostBeaerer_OnPreviewMouseDoubleClick(object sender, MouseButtonEventArgs e) { - if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit)sender, e) || _SelectedSupportConcept == null || !BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_Edit)) + if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit)sender, e) || _SelectedSupportConcept == null || !MainSession.LoggedOnUser.HasRight(UserRightType.SupportConceptView_Edit)) return; VMFactory.CreateSupportConceptVMAsync(_SelectedSupportConcept.SupportConceptOid, diff --git a/BeWo/View/Detail/AccountingTransactionBookingView.xaml b/BeWo/View/Detail/AccountingTransactionBookingView.xaml index 576d7a89e..771c5507a 100644 --- a/BeWo/View/Detail/AccountingTransactionBookingView.xaml +++ b/BeWo/View/Detail/AccountingTransactionBookingView.xaml @@ -5,6 +5,7 @@ xmlns:localViewControls="clr-namespace:BeWo.View.Controls" xmlns:val="clr-namespace:BeWo.Validation" xmlns:proxy="clr-namespace:BeWo.ServiceProxy" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" + xmlns:conv="clr-namespace:BeWo.Converter" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" Height="Auto" Width="Auto" @@ -12,6 +13,7 @@ VerticalAlignment="Stretch" Focusable="True" KeyUp="AccountingTransactionBookingView_OnKeyUp" xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"> + @@ -21,7 +23,7 @@ @@ -236,7 +240,7 @@ - + @@ -256,7 +260,7 @@ - + @@ -670,37 +674,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (); //this.Dispatch(() => Cache.GetInstance().GetAllActiveSupportConceptsCompact(x => this.Dispatch(() => { SupportConceptSelectionControl.SupportConceptList = x; }))); - ServiceFacade.DoEmployeeServiceSync(e => MultiEmployeeControlAddServ.SelectedEmployees.Add(e.LoadCompactEmployee(BeWoApp.LoggedOnEmployee.EmployeeOid.Value))); + ServiceFacade.DoEmployeeServiceSync(e => MultiEmployeeControlAddServ.SelectedEmployees.Add(e.LoadCompactEmployee(MainSession.LoggedOnEmployee.EmployeeOid.Value))); _SelectedEmployee = MultiEmployeeControlAddServ.SelectedEmployees.First(); @@ -471,7 +471,7 @@ namespace BeWo.View.Detail set { - _SelectedEmployee = BeWoApp.LoggedOnUser.Employee; + _SelectedEmployee = MainSession.LoggedOnUser.Employee; PopupeditEmployee.Text = _SelectedEmployee.ToString(); DataContext = value; @@ -480,7 +480,7 @@ namespace BeWo.View.Detail _ViewModel.ServiceRecordListChanged += _ViewModel_ServiceRecordListChanged; - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecordView_Create) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.CreateAll)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ServiceRecordView_Create) && !MainSession.LoggedOnUser.HasRight(UserRightType.CreateAll)) { NewObjectInfoGrid.IsEnabled = false; ButtonAdd.IsEnabled = false; @@ -924,7 +924,7 @@ namespace BeWo.View.Detail long scOid = 0; long cOid = 0; long cb2scOid = 0; - var eOid = BeWoApp.LoggedOnUser.Employee.EmployeeOid; + var eOid = MainSession.LoggedOnUser.Employee.EmployeeOid; if (selectedNode != null && selectedNode.SupportConceptTreeNodeDC != null) { @@ -1257,7 +1257,7 @@ namespace BeWo.View.Detail lContent.AddRange(list.Select(vm => new List {String.Format("{0:d}", (vm.StartTime != null && vm.StartTime.Value.Second == 0 ? vm.DateAndTime : vm.Date)), vm.AssistanceDuration.ToString(), vm.RoundedDuration.ToString(), vm.Employee != null ? vm.Employee.ToString() : string.Empty, vm.Customer != null ? vm.Customer.ToString() : string.Empty, vm.SupportConcept != null ? vm.SupportConcept.ToString() : string.Empty, vm.CostBearer != null ? vm.CostBearer.ToString() : string.Empty, vm.Category != null ? vm.Category.ToString() : string.Empty, vm.ServiceDescription != null ? vm.ServiceDescription.ToString() : string.Empty, vm.Notice})); } - var path = BeWoApp.GetAndCreateUserAppDataPath() + "\\Dokumentation.xls"; + var path = MainSession.GetAndCreateUserAppDataPath() + "\\Dokumentation.xls"; var sf = new SaveFileDialog { FileName = Path.GetFileName(path), Filter = "Microsoft Excel 97-2003-Arbeitsblatt|*.xls|Alle Dateien|*.*" }; if (sf.ShowDialog() != true) return; @@ -1317,7 +1317,7 @@ namespace BeWo.View.Detail public override void ModalPopUpCloseInvoked() { - MainView.CloseCurrentPopUp(); + MainPage.CloseCurrentPopUp(); } public override void ModalPopUpSaveInvoked() @@ -1342,7 +1342,7 @@ namespace BeWo.View.Detail }; _AdditionalServiceGroupOfPeoplePopUp.GroupOfPeopleSavedOrUpdated += AdditionalServiceGroupOfPeoplePopUp_AdditionalServiceGroupOfPeopleSavedOrUpdated; - BeWoApp.MainView.ShowControlAsModalPopup(_AdditionalServiceGroupOfPeoplePopUp); + MainSession.MainPage.ShowControlAsModalPopup(_AdditionalServiceGroupOfPeoplePopUp); _AdditionalServiceGroupOfPeoplePopUp.Focus(); }) ); @@ -1355,7 +1355,7 @@ namespace BeWo.View.Detail private static void AdditionalServiceGroupOfPeoplePopUp_AdditionalServiceGroupOfPeopleSavedOrUpdated(object sender, EventArgs e) { - BeWoApp.MainView.CloseCurrentPopUp(); + MainSession.MainPage.CloseCurrentPopUp(); } private void MultiAddServGroupOfPeopleSelectionControl_OnPropertyChanged(object sender, PropertyChangedEventArgs e) diff --git a/BeWo/View/Detail/AssessmentSheetCategoryView.xaml b/BeWo/View/Detail/AssessmentSheetCategoryView.xaml index 137b68496..e3f39aa30 100644 --- a/BeWo/View/Detail/AssessmentSheetCategoryView.xaml +++ b/BeWo/View/Detail/AssessmentSheetCategoryView.xaml @@ -1,8 +1,19 @@ - - + + + + + - + diff --git a/BeWo/View/Detail/AssessmentSheetEntryView.xaml.cs b/BeWo/View/Detail/AssessmentSheetEntryView.xaml.cs index d507ff2f3..f0f984f0b 100644 --- a/BeWo/View/Detail/AssessmentSheetEntryView.xaml.cs +++ b/BeWo/View/Detail/AssessmentSheetEntryView.xaml.cs @@ -24,7 +24,7 @@ using BS.Shared.Extensions; using DevExpress.Xpf.Grid; using DevExpress.Xpf.Docking; -using BeWoLauncher.Cache; +using BS.SharedLauncher.Information; namespace BeWo.View.Detail { @@ -56,7 +56,7 @@ namespace BeWo.View.Detail this.InitDateCombos(); - this.mSaveAllowed = BeWoApp.LoggedOnUser.HasRight(UserRightType.AssessmentSheet_Edit) && BeWoApp.LoggedOnUser.HasRight(UserRightType.AssessmentSheet_Delete); + this.mSaveAllowed = MainSession.LoggedOnUser.HasRight(UserRightType.AssessmentSheet_Edit) && MainSession.LoggedOnUser.HasRight(UserRightType.AssessmentSheet_Delete); _AdditionalServices = ServiceFacade.DoOperationsServiceSync(o => o.GetAllAdditionalService()); @@ -149,7 +149,7 @@ namespace BeWo.View.Detail var list = this._ViewModel.ServiceRecords.Where(i => i.Date.Value.Day.Equals(day)).ToList(); ServiceRecordPopUp popUp = new ServiceRecordPopUp(list); - BeWoApp.MainView.ShowControlAsModalPopup(popUp); + MainSession.MainPage.ShowControlAsModalPopup(popUp); } } } @@ -714,8 +714,8 @@ namespace BeWo.View.Detail public void AssessmentSheetValueControl_MouseDown(object sender, MouseButtonEventArgs e) { - if (BeWoApp.LoggedOnUser.HasRight(UserRightType.AssessmentSheet_Edit) - && BeWoApp.LoggedOnUser.HasRight(UserRightType.AssessmentSheet_Delete)) + if (MainSession.LoggedOnUser.HasRight(UserRightType.AssessmentSheet_Edit) + && MainSession.LoggedOnUser.HasRight(UserRightType.AssessmentSheet_Delete)) { _EditRow = grid.GetRow(grid.View.GetRowHandleByMouseEventArgs(e)) as AssessmentSheetRow; @@ -894,7 +894,7 @@ namespace BeWo.View.Detail private void UpdatePrintUrl(long customerOid, DateTime dtStart, DateTime dtEnd) { - long eOid = BeWoApp.LoggedOnUser.Employee.EmployeeOid; + long eOid = MainSession.LoggedOnUser.Employee.EmployeeOid; string url = ConnectionInformation.CoreServerAddressOrigin + "/ReportView.aspx" + "?eOid=" + eOid + "&cOid=" + customerOid + "&m=" + dtStart.Month + "&y=" + dtStart.Year + "&type=" + Utils.EnumName(ReportTypes.AssessmentSheetReport); diff --git a/BeWo/View/Detail/AssessmentSheetValueView.xaml b/BeWo/View/Detail/AssessmentSheetValueView.xaml index 1a91435d1..77d5a74a9 100644 --- a/BeWo/View/Detail/AssessmentSheetValueView.xaml +++ b/BeWo/View/Detail/AssessmentSheetValueView.xaml @@ -1,7 +1,12 @@ - - + + + + + - + diff --git a/BeWo/View/Detail/AuszahlungsartenAddView.xaml b/BeWo/View/Detail/AuszahlungsartenAddView.xaml index 569fc76f3..d32c3f37b 100644 --- a/BeWo/View/Detail/AuszahlungsartenAddView.xaml +++ b/BeWo/View/Detail/AuszahlungsartenAddView.xaml @@ -2,13 +2,17 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" + xmlns:conv="clr-namespace:BeWo.Converter" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:val="clr-namespace:BeWo.Validation" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> - + + + + - + diff --git a/BeWo/View/Detail/BookingView.xaml b/BeWo/View/Detail/BookingView.xaml index 7bee36601..7584ca74a 100644 --- a/BeWo/View/Detail/BookingView.xaml +++ b/BeWo/View/Detail/BookingView.xaml @@ -2,6 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" + xmlns:conv="clr-namespace:BeWo.Converter" xmlns:localDetailView="clr-namespace:BeWo.View.Detail" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" @@ -9,9 +10,16 @@ xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:calendar="clr-namespace:BeWo.Controls.Controls.Calendar;assembly=BeWo.Controls" xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"> + + + + + + + - + @@ -27,7 +35,7 @@ - + @@ -176,7 +184,7 @@ - + @@ -259,7 +267,7 @@ - + diff --git a/BeWo/View/Detail/BookingView.xaml.cs b/BeWo/View/Detail/BookingView.xaml.cs index 54b1855b5..f6db8ac6c 100644 --- a/BeWo/View/Detail/BookingView.xaml.cs +++ b/BeWo/View/Detail/BookingView.xaml.cs @@ -74,7 +74,7 @@ namespace BeWo.View.Detail this.ReloadViewModel(); - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Create) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.CreateAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Edit) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.EditAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Delete) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.DeleteAll)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Create) && !MainSession.LoggedOnUser.HasRight(UserRightType.CreateAll) && !MainSession.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Edit) && !MainSession.LoggedOnUser.HasRight(UserRightType.EditAll) && !MainSession.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Delete) && !MainSession.LoggedOnUser.HasRight(UserRightType.DeleteAll)) { this.groupBoxBookingNewEdit.IsEnabled = false; this.expander_edit_booking.IsEnabled = false; @@ -83,26 +83,26 @@ namespace BeWo.View.Detail } else { - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Create) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.CreateAll)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Create) && !MainSession.LoggedOnUser.HasRight(UserRightType.CreateAll)) { this.expander_new_booking.IsEnabled = false; this.expander_new_booking.Visibility = Visibility.Collapsed; } - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Edit) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.EditAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Delete) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.DeleteAll)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Edit) && !MainSession.LoggedOnUser.HasRight(UserRightType.EditAll) && !MainSession.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Delete) && !MainSession.LoggedOnUser.HasRight(UserRightType.DeleteAll)) { this.expander_edit_booking.IsEnabled = false; this.expander_edit_booking.Visibility = Visibility.Collapsed; } else { - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Edit) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.EditAll)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Edit) && !MainSession.LoggedOnUser.HasRight(UserRightType.EditAll)) { this.button_editBooking.IsEnabled = false; this.button_editBooking.Visibility = Visibility.Collapsed; } - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Delete) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.DeleteAll)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_Delete) && !MainSession.LoggedOnUser.HasRight(UserRightType.DeleteAll)) { this.button_deleteBooking.IsEnabled = false; this.button_deleteBooking.Visibility = Visibility.Collapsed; @@ -232,11 +232,11 @@ namespace BeWo.View.Detail private void DeleteBooking() { - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_AllowEditResourcesFromOtherEmployees)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_AllowEditResourcesFromOtherEmployees)) { if (this.ViewModel.EditVM != null) { - if (this.ViewModel.EditVM.Employee != null && !BeWoApp.LoggedOnUser.Employee.Equals(this.ViewModel.EditVM.Employee)) + if (this.ViewModel.EditVM.Employee != null && !MainSession.LoggedOnUser.Employee.Equals(this.ViewModel.EditVM.Employee)) { MessageBox.Show("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu löschen!", "BeWoPlaner", MessageBoxButton.OK); return; @@ -247,7 +247,7 @@ namespace BeWo.View.Detail var lSequence = this.ViewModel.GetAppointmentsSequence(this.ViewModel.EditAppointment); if (lSequence != null && lSequence.Employee != null) { - if (!BeWoApp.LoggedOnUser.Employee.Equals(lSequence.Employee)) + if (!MainSession.LoggedOnUser.Employee.Equals(lSequence.Employee)) { MessageBox.Show("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu löschen!", "BeWoPlaner", MessageBoxButton.OK); return; @@ -544,11 +544,11 @@ namespace BeWo.View.Detail private void button_editBooking_Click(object sender, RoutedEventArgs e) { - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_AllowEditResourcesFromOtherEmployees)) + if (!MainSession.LoggedOnUser.HasRight(UserRightType.ResourceBookingView_AllowEditResourcesFromOtherEmployees)) { if (this.ViewModel.EditVM != null) { - if (this.ViewModel.EditVM.Employee != null && !BeWoApp.LoggedOnUser.Employee.Equals(this.ViewModel.EditVM.Employee)) + if (this.ViewModel.EditVM.Employee != null && !MainSession.LoggedOnUser.Employee.Equals(this.ViewModel.EditVM.Employee)) { MessageBox.Show("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu ändern!", "BeWoPlaner", MessageBoxButton.OK); return; @@ -559,7 +559,7 @@ namespace BeWo.View.Detail var lSequence = this.ViewModel.GetAppointmentsSequence(this.ViewModel.EditAppointment); if (lSequence != null && lSequence.Employee != null) { - if (!BeWoApp.LoggedOnUser.Employee.Equals(lSequence.Employee)) + if (!MainSession.LoggedOnUser.Employee.Equals(lSequence.Employee)) { MessageBox.Show("Sie besitzen nicht die erforderlichen Rechte um eine Buchung eines anderen Mitarbeiters zu ändern!", "BeWoPlaner", MessageBoxButton.OK); return; @@ -759,7 +759,7 @@ namespace BeWo.View.Detail var combobox = (ComboBox) sender; var selectedI = combobox.SelectedItem as CompactEmployeeDC; - if (selectedI == null || !BeWoApp.LoggedOnUser.HasRight(UserRightType.EmployeeView_View)) + if (selectedI == null || !MainSession.LoggedOnUser.HasRight(UserRightType.EmployeeView_View)) return; VMFactory.CreateEmployeeVMAsync(selectedI.EmployeeOid, diff --git a/BeWo/View/Detail/BudgetView.xaml b/BeWo/View/Detail/BudgetView.xaml index a431b07e8..1c332695b 100644 --- a/BeWo/View/Detail/BudgetView.xaml +++ b/BeWo/View/Detail/BudgetView.xaml @@ -9,7 +9,7 @@ xmlns:dxe2="clr-namespace:DevExpress.XtraEditors;assembly=DevExpress.XtraEditors.v17.1" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> - + diff --git a/BeWo/View/Detail/CustomerHistoryView.xaml b/BeWo/View/Detail/CustomerHistoryView.xaml index fb70782ef..b19580bf5 100644 --- a/BeWo/View/Detail/CustomerHistoryView.xaml +++ b/BeWo/View/Detail/CustomerHistoryView.xaml @@ -14,7 +14,7 @@ xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"> - + @@ -30,7 +30,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/BeWo/View/Detail/CustomerView.xaml b/BeWo/View/Detail/CustomerView.xaml index b27621116..dfba884f4 100644 --- a/BeWo/View/Detail/CustomerView.xaml +++ b/BeWo/View/Detail/CustomerView.xaml @@ -8,7 +8,7 @@ xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:localSearchView="clr-namespace:BeWo.View.Search" xmlns:r="clr-namespace:BeWo.Security" - xmlns:converter="clr-namespace:BeWo.Converter" + xmlns:conv="clr-namespace:BeWo.Converter" xmlns:detail="clr-namespace:BeWo.View.Detail" xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared" xmlns:controls="clr-namespace:BeWo.View.Controls" @@ -17,8 +17,15 @@ x:Name="CustomerBeWoView" VerticalAlignment="Stretch" Focusable="True" GotFocus="UserControl_GotFocus"> - - + + + + + + + + + @@ -311,7 +318,7 @@ - + @@ -327,13 +334,13 @@ - + - + @@ -466,7 +473,7 @@ - + @@ -500,7 +507,7 @@ + Style="{DynamicResource ObjectEditGroupBox}"> @@ -531,7 +538,7 @@ + Style="{DynamicResource ObjectEditGroupBox}" Margin="8,8,0,0"> @@ -580,7 +587,7 @@ - + @@ -686,7 +693,7 @@ - + @@ -767,7 +774,7 @@ - + @@ -800,7 +807,7 @@ - + @@ -888,7 +895,7 @@ - + @@ -995,7 +1002,7 @@ - + @@ -1038,7 +1045,7 @@ + Style="{DynamicResource ObjectEditGroupBox}" Margin="0 20 0 0" MinHeight="120"> @@ -1051,7 +1058,7 @@ - + @@ -1078,7 +1085,7 @@ + Style="{DynamicResource ObjectEditGroupBox}" Margin="0 20 0 0"> @@ -1357,7 +1364,7 @@ - + - @@ -1551,7 +1558,7 @@ - + @@ -1593,7 +1600,7 @@ - + @@ -1635,7 +1642,7 @@ - +