From 514c19ce3d29ef3f227b22a2ea9ed7c75fc653bc Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 10 Nov 2020 02:25:15 +0100 Subject: [PATCH] cb, letzte Bugfixes vor Version --- BeWo.sln | 61 ++- BeWo/BeWo.csproj | 38 +- BeWo/BeWo.csproj.user | 2 +- BeWo/BeWoApp.xaml.cs | 7 +- BeWo/ConfirmDemoDialog.xaml | 5 +- BeWo/Core/Config/AppSettings.cs | 4 +- BeWo/Core/SupportConceptGoalTreeItem.cs | 49 ++- BeWo/MainControl.xaml.cs | 24 +- BeWo/Ressources/Icons/imassnahme.png | Bin 0 -> 505 bytes BeWo/Ressources/Icons/iziel.png | Bin 0 -> 422 bytes BeWo/Ressources/Icons/massnahme.png | Bin 2480 -> 497 bytes BeWo/Ressources/Icons/ziel.png | Bin 1812 -> 295 bytes .../View/SchedulerAppointmentEditForm.xaml.cs | 2 +- BeWo/ServiceProxy/Generated.cs | 9 + .../Controls/ComboBoxTreeViewControl.xaml.cs | 3 +- BeWo/View/Detail/CustomerView.xaml.cs | 21 +- BeWo/View/Detail/EmployeeView.xaml.cs | 54 +-- BeWo/View/Detail/OwnChatSettingsView.xaml | 42 ++ BeWo/View/Detail/OwnChatSettingsView.xaml.cs | 23 + BeWo/View/Detail/RatingEditView.xaml.cs | 8 + .../FlexibleReportLayoutSaveControl.xaml | 2 +- .../Detail/Report/FlexibleReportView.xaml | 36 +- .../Detail/Report/FlexibleReportView.xaml.cs | 22 + BeWo/View/Detail/SupportConceptView.xaml | 6 +- BeWo/View/Detail/SupportConceptView.xaml.cs | 7 +- BeWo/View/Detail/TeamView.xaml.cs | 6 - BeWo/View/Detail/UserView.xaml.cs | 4 - BeWo/View/HomeView.xaml | 7 +- BeWo/View/HomeView.xaml.cs | 13 +- BeWo/View/Master/AdministrationView.xaml | 2 +- BeWo/View/Master/AdministrationView.xaml.cs | 7 + BeWo/View/Master/ReportView.xaml.cs | 12 +- BeWo/View/PasswortAenderungsView.xaml.cs | 4 - BeWo/View/Report/Rating/RatingReportView.xaml | 8 +- .../Report/Rating/RatingReportView.xaml.cs | 24 +- BeWo/ViewModel/SupportConceptVM.cs | 6 +- BeWo/ViewModel/UserGroupVM.cs | 18 +- BeWo/ownChat/ownChatHelper.cs | 41 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 2 +- Report/DefaultReportCreator.cs | 50 ++- .../BewertungsstatistikReport.designer.cs | 6 +- Report/ReportObjects/BewertungsstatistikRO.cs | 2 + Report/ReportObjects/ServicesOverviewRO.cs | 1 + .../AidsInitiativeBonn.csproj | 6 +- .../Properties/licenses.licx | 1 + .../CustomReportCreator.cs | 2 +- .../LeistungsnachweisEntlastungsleistungen.cs | 36 +- .../LeistungsnachweisKurzzeitpflege.cs | 36 +- .../LeistungsnachweisVerhinderungspflege.cs | 39 +- .../Utils/FrankfurtOderHelper.cs | 54 +++ ReportImp/SabGmbH/Export/EGeckoExporter.cs | 17 - ReportImp/SabGmbH/Export/LohnExporter.cs | 81 ++-- .../Export/Lohnschnittstellenhelper.cs | 82 ++-- .../MitarbeiterVertraege.cs | 10 +- .../MitarbeiterVertraege.designer.cs | 405 ++---------------- .../CompactCustomerDC_Customer.cs | 8 +- .../DCEntityMapper/UserGroupDC_UserGroup.cs | 24 +- Service/Plugins/CustomerService.cs | 15 +- Service/Plugins/DataExporter.cs | 118 ++--- .../ServiceContracts/IOperationsService.cs | 4 + .../CustomerServiceImp.cs | 2 +- .../OperationsServiceImp.cs | 34 +- .../ResourceServiceImp.cs | 5 +- .../ServiceImplementations/UserServiceImp.cs | 6 + Shared/BeWoEntityEnums.cs | 5 + Shared/Core/EnumTranslations.cs | 17 +- 66 files changed, 815 insertions(+), 830 deletions(-) create mode 100644 BeWo/Ressources/Icons/imassnahme.png create mode 100644 BeWo/Ressources/Icons/iziel.png create mode 100644 BeWo/View/Detail/OwnChatSettingsView.xaml create mode 100644 BeWo/View/Detail/OwnChatSettingsView.xaml.cs 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 0000000000000000000000000000000000000000..41d5804f5eb2912457cfd82b944c39ce7eeee308 GIT binary patch literal 505 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGqB>(^xB>_oNB=7(L0gg#TK~zXf?Up}M z!cY*0SH~euk`|J10INV?GMvU%OF4?2L&F(tr0@oe6Tmcj020F31)5m7@ht-K{$-TH z8NTAZx7+-}mnF&B_3bMhlXKdS#?b?|iUxO=?C>Yt^xxRw|0}wneamXtPv)-CbPT6u z1-{jwK96NFi`SDZpD&8U@dj5G^>^U^f+Q`*QT{MYMlp4`WN~``_&$z`B&E(FLPefy z;5vR;v64qIofZIw=Tgl@d=CPk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!Gcbs$f-s|Jkje+325V0j#}E(iWS`Uf&pCJ>U|E{UmXXJ()RE?Q zp}}AU(DIi*?Hqtk2}r?-P8hr@n_L-Hr>}qc1U<}exFf34L zsNnYCli^Uf)#RP;$qQs$YC8W};bvFk`TiFN8W|Sp?AY+*rKiDR8_%wUL+;Ej5d|-A ze%YMRwy|WA+zdx9g$zce0*+~15sZx78k{m52eKJc8<`m^bbjoVjY`?XzGLIw3QnC} z8I&9h|8-FTFl-q- MUHx3vIVCg!0Bo|wPPmq1#7Y zwKOVP=PDfh9?%-(hEYJlFmyF+|4c)>3X8`kOprPS;7sW13bucmxPk{>PeJSyFfokw zXGmjL@xe;~Dd1xm?N>**{>n& zFAzY<9__PzAH!Pv4FUln68-3J8kAQC_d;7pif*kZpyCg3iH zZT1_40v0iRebdRi&3=Pez!XDU;e2-X<8)YMzd!6G|+ zZdoM&;Q^=NC*3}s6zh3?AC~Vf;PvNpX92)3)1uk3iXTXz00000NkvXXu0mjf#IwU2 delta 2455 zcmV;I326551F#bziBL{Q4GJ0x0000DNk~Le0000$0000$2nGNE0IF$m-jN|Re+flN zL_t(|Ugev2Och-gzzq{DdnTo3&6-IUFJ9yl&tljfP@_f- z)&Oqbz74Ulu@D{}4liH67l}#EBERmirje0MDL1QyRN* z<3=egtGAS#oUAcI<;s<%$B!TLCtSynL!fWpzN`Vv56B>SagYguCPzU1fBN+)|Lxm1 zXw;|?tX;d7@~&by1LWrBLS9}T>0`%^B`H(0TO;sW6%F&|&EqQosi~$6tMZ#j?22(n(h>?-LFlNjc*6ibT18mx~ zi8ZkM^bz$iSkz_$Yg*)9P*6|+U%q@H-5y>y0FHm8RjXDc^{7>=7RfVb&X6?caGh(c z0c_j0jWyeN-2nKce~^wHJCf9+Lx&C|FJHb)(j0X!abzCwx&hw4eM?g8`bg^0qD2dm zVk1P-8vg$NByZiiMbaK#H-HRoZX6*rG?b)lIBV3bS(D_~uU|>p!|Mj9TemLBhYuf; z)T2(FI;`2IsHli!U|=9gdwAUdZQ8UU>FByGyS=thFON}Ce^IR2#_I;?)29!~2M->Q z)Z^2qPpnzzpP|E80~k1PAZxbqx&hMC(pUpX$O>l7HqW0wCn;}^%$YWA8c7@~a__Q- z*A0LTkzL&N>(|3VQ>ktX^c)fM@r_;o{$CGs4&eCl;cF!MBG#0V)aE=~#v2#~~BmliBoz;|#C!=4T1=jX$P3m4$Uix(go z2{AD-@cHv+=-jz8mA`)dny$MInc)XPjBBL_cnYtte*(_1Yu7H42?+@#J;4uUfP44u zkyIa?xDEFN!?SnqUZwkg{P>Ztx{sk>kih8f zk|j%|BS(%eMN#fr*HS2-@Z0#zc@xyJ5h90i4rft)XZLTa8Ds+|=~X;D6_= zQt$4c5|l%h1`Qf0J4Xa3QQUc&_Y9i`*uH%`H5@Ierf1Kdke;3nVodTC+X%lNX3w6@ zf4MT`24f=-dkuA#E43n(ogf~x;9+WEVIk#ZcJAB>$;rv2TNq&J(xpmJLCyU6^I^`M zIh=Ex`}gldlO|0#2hgosH~2@#AkLK!dcy-baNqzWB_)-4g4j5GIYHfcu|1{31+nppd=!E!H#y zlW^3y)Dq!!YU)<4S`{aHF4aj(m!14g6U+e+QsTeg6D; zz6#`ls?Pw-!S@H$ZaBU>xN6lZ&RGEsP#)k@6Mlr|Nw}NDMvU)niEwWoq^tR;pB~k|btqX~KjFlIRV5H%nq;V>O=>ULKd| z%|*DmT*GzH z*y{UY&{Vj!TryQj+F}W12E$3fItQ#*7)7&!YeDi9bo1fe5h>-UH_&;(Y V84f--K8gSU002ovPDHLkV1nuVsNnzr diff --git a/BeWo/Ressources/Icons/ziel.png b/BeWo/Ressources/Icons/ziel.png index c8db1f45e1e0d80ee9654ce8c48023d68647b3e5..c4c543c019565200dab461e195e11b050e910cf1 100644 GIT binary patch delta 253 zcmVZ zL_t(&L)DsDY)oGq$J<&;Ta*}Ec`ET>2|{e871fgVK~fT8dC*jZC=uepHko)6L_|nE z2rrT@)B_^g25qIN2Mq8?J2U^!!}Rw%zu#GY_uRAI zriMbHl>akn{F^wwfB$~v$`vZTe*is@STZs)(2O%@&QOn%1P3s7>{$66!Pc!?nHmj= z3}DivNo>1DK|uj+u1Qz`IXO9OwGpJ#!yO5jg}S=Bh7TX!-Q7)H1xEIuL4&9`67N~4 zuC6XCE6cg{VDR9oRvsN8z)~xyS=MNPlmoHyte`b5)5dfa| z=FOYgC?k9K?xj;G8B2GH8tT2xfTwpggCsiB|7ym|9z(@|DdMze~( z3gGbJ!>nHgUh&S(PP!V|v}qHabWE8tg=P!h2hh~i#Ag(_yunDOb;C%QV)f6&mtJVxHXe@_n$F9X=IV+ZT8uwuoEmoHz^&mAvbykKS{ zEiEnd5O@~Ai4!MSgAw!zJ)-CD-@j>Tik0f@*|YTUDu7q7Ua@Q)RaI3q$Hv5o6Ir5; zZQHgU~;lGm?avvdu=-%nfY0kB8`&WB9(l=Sp;Rv_qkc_h6Y#BFVD>(;Fs zIB+0!0XD{zyraClfBfgqpHu{oA3vrfVIZ!-gdpz`tkl=n)5$wnw8p`M2WilVE`UXg z7O^B19UUF?^9UShShQf&s8KZNh#~;&fmxCbILOk~BbF{*%Ay6ewY4(p`vm7_U*-s7gNz#zI-_rW-6iw`t|E4W$YG5jvOgvfXA_H z*)nVjFsz~4{bJkm=FOY)=g&jd^WedQ*|TR;F(Esme}}7AuhO97+_`f!8*%>%Ra8{a z;En|g7BHt^+_-TxSojwJ9{j?E3z8#ivG!8Ni^dU*TxEe%G(W1z9I z5yvy^G+J9*rFRdfPoLhsdpDK%5(oq+39encM#)GxfIWNmDDSeHo13?6*+L~sdIp08 zkBX9Oe@vGVb|r)dF-9la$^-#2BcuTX22i)bVGuui_H6Rx$x;RzHf*?X;Q|$n=g*&S z-@Y9yI&~d5X*_)RQ2$u(-@iX+&KxRwWB^nI7cX8!q8l8>z<~n?m?}7a{5TCd?%usi zvkQX3AhQ`!1RxD=a0q}&8rC~aaPQtdnq9y=e-?Uqq*Nl`A1vYeEgirMssEhX3x*CI zO38wk0h~N}GA}RBdJ}m4`gKZ1Oov?ul(&lnz2Ma=q~y?{L-bbB)z$UG0yfoHkC|V9 zIe-}~c-aG1Dl04fem@lz85tSaKA1>LOEXh49zBm9J)$I-K7BeR3o!*C?{2$*U^(v5+Rjt*>HsicHIXHc>s=>k~4emy0D@_#=Jpcj(o6{@MJVIwrK z($QvvVh|%}>=BSoJuYAa_x0;n(`9B+QIY=0ss;@;^+57~ZAJJYJCeK$88)+~Opl0a z5QOuWuY_>w)G7IZBN7f^>eQ*smjqzl#i?30&JE!~91I4rs+&&Y@dqu*&d#Rdl9ZJH Y0LDvyAq?bVG5`Po07*qoM6N<$g0W^s&Hw-a 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +