diff --git a/BeWo.sln b/BeWo.sln index bf2ff7d4a..76739badf 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30523.141 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1209 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}" EndProject @@ -403,6 +403,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Humanitas", "ReportImp\Huma EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonischesWerkHerne", "ReportImp\DiakonischesWerkHerne\DiakonischesWerkHerne.csproj", "{25AE0253-30AC-4E85-9FA4-2F8FADA62787}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabGmbH", "ReportImp\SabGmbH\SabGmbH.csproj", "{491FE69C-49BF-4003-85CE-755DE9C99E7C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoWalzPaiva", "ReportImp\BeWoWalzPaiva\BeWoWalzPaiva.csproj", "{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenshilfeFrankfurtOder", "ReportImp\LebenshilfeFrankfurtOder\LebenshilfeFrankfurtOder.csproj", "{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -3010,6 +3016,54 @@ Global {25AE0253-30AC-4E85-9FA4-2F8FADA62787}.Release|Mixed Platforms.Build.0 = Release|Any CPU {25AE0253-30AC-4E85-9FA4-2F8FADA62787}.Release|x86.ActiveCfg = Release|Any CPU {25AE0253-30AC-4E85-9FA4-2F8FADA62787}.Release|x86.Build.0 = Release|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|.NET.ActiveCfg = Debug|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|.NET.Build.0 = Debug|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|x86.ActiveCfg = Debug|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|x86.Build.0 = Debug|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|.NET.ActiveCfg = Release|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|.NET.Build.0 = Release|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|Any CPU.Build.0 = Release|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|x86.ActiveCfg = Release|Any CPU + {491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|x86.Build.0 = Release|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|.NET.ActiveCfg = Debug|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|.NET.Build.0 = Debug|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|x86.ActiveCfg = Debug|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|x86.Build.0 = Debug|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|.NET.ActiveCfg = Release|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|.NET.Build.0 = Release|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|Any CPU.Build.0 = Release|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|x86.ActiveCfg = Release|Any CPU + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|x86.Build.0 = Release|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|.NET.ActiveCfg = Debug|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|.NET.Build.0 = Debug|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|x86.ActiveCfg = Debug|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|x86.Build.0 = Debug|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|.NET.ActiveCfg = Release|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|.NET.Build.0 = Release|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|Any CPU.Build.0 = Release|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|x86.ActiveCfg = Release|Any CPU + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3207,6 +3261,9 @@ Global {062698EA-8477-4F07-BF2A-CE4FAE4DCFA3} = {D8A691C5-146D-4613-86CC-438F02FE9106} {DB03F765-7CE2-40A6-B469-BCEBE61ACF9E} = {D8A691C5-146D-4613-86CC-438F02FE9106} {25AE0253-30AC-4E85-9FA4-2F8FADA62787} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {491FE69C-49BF-4003-85CE-755DE9C99E7C} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {FE709CF1-6579-4A69-8E43-5C3BF7BD96D7} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 6d1210159..1ea4f146b 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -39,16 +39,16 @@ false true false - http://app.beyondsoft.de/dev/ + http://app.beyondsoft.de/ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.187 + 2.0.1.193 true publish.htm false true - 188 + 194 2.0.1.%2a false true @@ -100,6 +100,7 @@ + @@ -305,6 +306,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -972,6 +977,9 @@ ValueListEntryEditControl.xaml + + OwnChatSettingsView.xaml + RatingTypeView.xaml @@ -2491,6 +2499,16 @@ True Assembly + + False + + + + + Include + True + Assembly + False @@ -2511,6 +2529,16 @@ True Assembly + + False + + + + + Include + True + Assembly + False @@ -2899,6 +2927,10 @@ + + + + diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index e8b054f48..171fc3671 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -2,7 +2,7 @@ D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\ - http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/|http://fortis-bewoplaner.fortis-ev.org.local/ + http://app.beyondsoft.de/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/ diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index b7427ad98..e8b0f4739 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -44,7 +44,7 @@ namespace BeWo public static MainControl MainControl; public static string ShortVersion = "3"; - public static string Version = "Version 3.0 TEST"; + public static string Version = "Version 3.0"; public static int RenderTier = 0; @@ -231,7 +231,10 @@ namespace BeWo AppSettings.IsWohnheimAllowed = val != null && val.Equals("1"); val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowChat"); - AppSettings.IsChatAllowed = val != null && val.Equals("1"); + AppSettings.ShowOwnChat = val != null && val.Equals("1"); + + val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowOwnChatSettings"); + AppSettings.ShowOwnChatSettings = val != null && val.Equals("1"); val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "IsServiceRecordNoticeMandatory"); if (val != null && val.Equals("0")) diff --git a/BeWo/ConfirmDemoDialog.xaml b/BeWo/ConfirmDemoDialog.xaml index 397ffa08e..2dc733b88 100644 --- a/BeWo/ConfirmDemoDialog.xaml +++ b/BeWo/ConfirmDemoDialog.xaml @@ -26,15 +26,16 @@ + WICHTIG! Bitte tragen Sie keine echten Daten bei Ihren Tests ein, da es sich um einen öffentlichen Testzugang handelt, auf den jeder Zugriff hat! - + + - diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index 814287163..ee6cdb468 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -343,7 +343,9 @@ namespace BeWo.Core.Config public bool IsWohnheimAllowed { get; set; } - public bool IsChatAllowed { get; set; } + public bool ShowOwnChat { get; set; } + + public bool ShowOwnChatSettings { get; set; } public bool IsMedicationAllowed { get; set; } diff --git a/BeWo/Core/SupportConceptGoalTreeItem.cs b/BeWo/Core/SupportConceptGoalTreeItem.cs index cc6f0cdc2..35681ccdb 100644 --- a/BeWo/Core/SupportConceptGoalTreeItem.cs +++ b/BeWo/Core/SupportConceptGoalTreeItem.cs @@ -25,24 +25,51 @@ namespace BeWo.Core GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) : GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType); + public bool IsZiel + { + get + { + return IsOfType(ValueListEntryType.SupportConceptGoalCategoryType); + } + } + + public bool IsIndZiel + { + get + { + return IsOfType(ValueListEntryType.SupportConceptIndividualGoalCategoryType); + } + } + public bool IsMassnahme { get { - bool ism = false; - if (GoalEntryVM != null) - { - ism = GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType); - } - else if (GoalEntryDC != null) - { - ism = GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType); - } + return IsOfType(ValueListEntryType.SupportConceptGoalType); + } + } - return ism; + public bool IsIndMassnahme + { + get + { + return IsOfType(ValueListEntryType.SupportConceptIndividualGoalType); + } + } + + public bool IsOfType(ValueListEntryType t) + { + + if (GoalEntryVM != null) + { + return GoalEntryVM.Type == t; + } + else if (GoalEntryDC != null) + { + return GoalEntryDC.Type == t; } - + return false; } //public bool IsGoal => GoalEntryVM != null ? // GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) : diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs index 1d57ba61c..f15d2ec9b 100644 --- a/BeWo/MainControl.xaml.cs +++ b/BeWo/MainControl.xaml.cs @@ -28,6 +28,7 @@ using BeWo.ViewModel; using BS.Shared; using BS.Shared.DataContracts; using BS.Shared.Extensions; +using BS.Shared.Translation; using DevExpress.Xpf.Editors; using DevExpress.Xpf.Grid; using DevExpress.Xpf.Scheduler; @@ -1198,6 +1199,20 @@ namespace BeWo www.beyondsoft.de */ + var tvLabel = new Label + { + Content = "Support per Fernwartung", + FontWeight = FontWeights.Bold, + Margin = new Thickness(40, 5, 5, 5) + }; + + var textBlockTeamViewer = new TextBlock + { + Foreground = Brushes.Black, + Margin = new Thickness(45, 5, 5, 5), + Text = Translator.Translate("Wenn Sie in einem Telefonat mit einem unserer Support-Mitarbeiter aufgefordert werden\nden Teamviewer zu installieren, so können Sie ihn hier herunterladen.") + }; + var supportToolLink = new TextBlock { Foreground = Brushes.Black, @@ -1278,21 +1293,24 @@ namespace BeWo var centeredStackPanel = new StackPanel {Orientation = Orientation.Vertical, VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center}; var mailStackPanel = new StackPanel {Orientation = Orientation.Horizontal}; var phoneStackPanel = new StackPanel {Orientation = Orientation.Horizontal}; + var tvStackPanel = new StackPanel { Orientation = Orientation.Horizontal }; - mailStackPanel.Children.Add(mailButton); + mailStackPanel.Children.Add(mailButton); mailStackPanel.Children.Add(mailLabel); - phoneStackPanel.Children.Add(phoneButton); phoneStackPanel.Children.Add(phoneLabel); + centeredStackPanel.Children.Add(mailStackPanel); centeredStackPanel.Children.Add(textBlockMail); centeredStackPanel.Children.Add(phoneStackPanel); centeredStackPanel.Children.Add(textBlockPhone); - centeredStackPanel.Children.Add(supportToolLink); + centeredStackPanel.Children.Add(tvLabel); + centeredStackPanel.Children.Add(textBlockTeamViewer); + centeredStackPanel.Children.Add(supportToolLink); centeredStackPanel.Children.Add(cancelButton); diff --git a/BeWo/Ressources/Icons/imassnahme.png b/BeWo/Ressources/Icons/imassnahme.png new file mode 100644 index 000000000..41d5804f5 Binary files /dev/null and b/BeWo/Ressources/Icons/imassnahme.png differ diff --git a/BeWo/Ressources/Icons/iziel.png b/BeWo/Ressources/Icons/iziel.png new file mode 100644 index 000000000..1258083c0 Binary files /dev/null and b/BeWo/Ressources/Icons/iziel.png differ diff --git a/BeWo/Ressources/Icons/massnahme.png b/BeWo/Ressources/Icons/massnahme.png index 26fd4e390..46b2b0fcd 100644 Binary files a/BeWo/Ressources/Icons/massnahme.png and b/BeWo/Ressources/Icons/massnahme.png differ diff --git a/BeWo/Ressources/Icons/ziel.png b/BeWo/Ressources/Icons/ziel.png index c8db1f45e..c4c543c01 100644 Binary files a/BeWo/Ressources/Icons/ziel.png and b/BeWo/Ressources/Icons/ziel.png differ diff --git a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs index a2101aac4..440c1f0f9 100644 --- a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs +++ b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs @@ -332,7 +332,7 @@ namespace BeWo.Scheduler.View } public string CountSelectedEmployees => $"{SelectedEmployees.Count} Mitarbeiter ausgewählt"; - public string CountSelectedResources => $"{SelectedResources.Count} Resourcen ausgewählt"; + public string CountSelectedResources => $"{SelectedResources.Count} Ressourcen ausgewählt"; public string CountSelectedCustomers => $"{SelectedCustomers.Count} Klienten ausgewählt"; public string CountSelectedSupportConcepts => $"{SelectedSupportConcepts.Count} Hilfepläne ausgewählt"; diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 02a095c9e..e93c32fd4 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -4997,6 +4997,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetUrlaubskontoByEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.UrlaubskontoDC GetUrlaubskontoByEmployee(long empOid, int year); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetOwnChatSettingsUrl", ReplyAction="http://tempuri.org/IOperationsService/GetOwnChatSettingsUrlResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetOwnChatSettingsUrlBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + string GetOwnChatSettingsUrl(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsBeWoFault" + "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] @@ -6106,6 +6110,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetUrlaubskontoByEmployee(empOid, year); } + public string GetOwnChatSettingsUrl() + { + return base.Channel.GetOwnChatSettingsUrl(); + } + public System.Collections.Generic.List InsertNewAdditionalServiceBookings(System.Collections.Generic.List pAdditionalServiceBookings) { return base.Channel.InsertNewAdditionalServiceBookings(pAdditionalServiceBookings); diff --git a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs index 52bc26e92..709ced7f3 100644 --- a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs +++ b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs @@ -6,6 +6,7 @@ using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Input; using BeWo.Core.Service; +using BS.Shared; using BS.Shared.DataContracts; using BS.Shared.DataContracts.ClientPartials; @@ -219,7 +220,7 @@ namespace BeWo.View.Controls private void SetPopUpVisible(bool visible) { - if (!ShowRatingPanel) + if (!ShowRatingPanel || !BeWoApp.LoggedOnUser.HasRight(UserRightType.BewertenInZeiterfassung)) { return; } diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs index a282f0267..847e0593b 100644 --- a/BeWo/View/Detail/CustomerView.xaml.cs +++ b/BeWo/View/Detail/CustomerView.xaml.cs @@ -77,8 +77,7 @@ namespace BeWo.View.Detail private GridControl grid_bedarfsmvl; private GridControl grid_costBearers; private GridControl grid_Familys; - private bool DoOwnChatSync = false; - + private ObservableSortCollection _AlleEintragKategorien; public static bool DarfBargeldtransaktionenBearbeiten @@ -151,7 +150,7 @@ namespace BeWo.View.Detail tabitem_stundenplan.Visibility = Visibility.Collapsed; } - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.IsChatAllowed) + if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.ShowOwnChat) { tabitem_chatservice.Visibility = Visibility.Collapsed; } @@ -396,17 +395,6 @@ namespace BeWo.View.Detail { _saveInProgress = true; - if (BeWoApp.AppSettings.IsChatAllowed) - { - if (ViewModel.DataContract.FirstName != ViewModel.FirstName || - ViewModel.DataContract.LastName != ViewModel.LastName || - ViewModel.DataContract.CustomerAlias != ViewModel.CustomerAlias || - ViewModel.EmployeeRelations.IsDirty - || ViewModel.TerminationDate != ViewModel.DataContract.TerminationDate) - { - DoOwnChatSync = true; - } - } var cdc = ViewModel.CommitToDataContract(); @@ -417,7 +405,6 @@ namespace BeWo.View.Detail if (ViewModel.IsNew) { - DoOwnChatSync = true; ServiceFacade.DoCustomerServiceAsync(s => s.InsertNewCustomer(cdc), AfterSave); } else @@ -516,10 +503,6 @@ namespace BeWo.View.Detail ReloadViewModel(oid); - if (DoOwnChatSync && BeWoApp.AppSettings.IsChatAllowed) - { - //BeWoUtils.OwnChatSynchronisationVeranlassen(); - } } }); } diff --git a/BeWo/View/Detail/EmployeeView.xaml.cs b/BeWo/View/Detail/EmployeeView.xaml.cs index af4c85d87..43b31da60 100644 --- a/BeWo/View/Detail/EmployeeView.xaml.cs +++ b/BeWo/View/Detail/EmployeeView.xaml.cs @@ -37,9 +37,7 @@ namespace BeWo.View.Detail private GridControl _GridAbsenceTimes; private GridControl _GridOvertimes; private GridControl _GridCustomers; - - private bool _DoOwnChatSync; - + private bool _InitTabIndex; private readonly ObservableSortCollection _EintragKategorien; @@ -50,7 +48,7 @@ namespace BeWo.View.Detail combobox_brush.ItemTemplateSelector = new ComboBoxTemplateSelector(combobox_brush); ViewModel = pEmployeeDC; - var noticeVisible = false; + var extendedPropsVisible = false; if (BeWoApp.Mandator.BeWoClientType == 3) @@ -58,26 +56,14 @@ namespace BeWo.View.Detail //Köln Ring extendedPropsVisible = true; } - else if (BeWoApp.Mandator.BeWoClientType == 4) - { - //Betreuwo - if (BeWoApp.LoggedOnUser.HasRight(UserRightType.Employee_AllowEditExtendedProperties)) - { - noticeVisible = true; - } - } - - if (!noticeVisible) - { - noticeGroup.Visibility = Visibility.Collapsed; - } + if (!extendedPropsVisible) { extendedPropertyGroup.Visibility = Visibility.Collapsed; } - if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.IsChatAllowed) + if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.ShowOwnChat) { tabitem_chatservice.Visibility = Visibility.Collapsed; } @@ -90,15 +76,8 @@ namespace BeWo.View.Detail OvertimeTabItem.Visibility = BeWoApp.LoggedOnUser.HasRight(UserRightType.OvertimeView) ? Visibility.Visible : Visibility.Collapsed; - if (BeWoApp.Mandator != null && BeWoApp.Mandator.AllowSbd || BeWoApp.AppSettings.ShowArbeitszeiten) - { - tabitem_arbeitszeit.Visibility = Visibility.Visible; - } - else - { - tabitem_arbeitszeit.Visibility = Visibility.Collapsed; - } - + tabitem_arbeitszeit.Visibility = Visibility.Visible; + if (pEmployeeDC.VarFields == null || pEmployeeDC.VarFields.VMList.Count == 0) { tabitem_varFields.Visibility = Visibility.Collapsed; @@ -113,10 +92,6 @@ namespace BeWo.View.Detail tabitem_schuldienst.Visibility = Visibility.Collapsed; } -#if DEBUG - tabitem_arbeitszeit.Visibility = Visibility.Visible; -#endif - // HACK: Force the devexpress grid to end editing when the mouse is over savebutton // by setting the focus to another element. MouseMove += (s, e) => @@ -251,15 +226,7 @@ namespace BeWo.View.Detail return; } - if(BeWoApp.AppSettings.IsChatAllowed) - { - if (ViewModel.DataContract.FirstName != ViewModel.FirstName || ViewModel.DataContract.LastName != ViewModel.LastName) - { - - _DoOwnChatSync = true; - } - } - + var lDataContract = ViewModel.CommitToDataContract(); try @@ -267,8 +234,7 @@ namespace BeWo.View.Detail if(ViewModel.IsNew) { IsDoneWithInsertOrUpdate = false; - _DoOwnChatSync = true; - + ServiceFacade.DoEmployeeServiceAsync(s => s.InsertNewEmployee(lDataContract), ReloadViewModel); } else @@ -344,10 +310,6 @@ namespace BeWo.View.Detail PreselectEmployeeBrush(); - if (_DoOwnChatSync && BeWoApp.AppSettings.IsChatAllowed) - { - //BeWoUtils.OwnChatSynchronisationVeranlassen(); - } })); } diff --git a/BeWo/View/Detail/OwnChatSettingsView.xaml b/BeWo/View/Detail/OwnChatSettingsView.xaml new file mode 100644 index 000000000..d8572393b --- /dev/null +++ b/BeWo/View/Detail/OwnChatSettingsView.xaml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +