diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index eb517d5b0..77e84b1e1 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -118,7 +118,7 @@ - + AiPromptbausteinDetailView.xaml diff --git a/BeWo/Scheduler/Converter/AptToServRecsIconVisibilityConverter.cs b/BeWo/Scheduler/Converter/AptToServRecsIconVisibilityConverter.cs index 6b697b730..4a9d6fe7f 100644 --- a/BeWo/Scheduler/Converter/AptToServRecsIconVisibilityConverter.cs +++ b/BeWo/Scheduler/Converter/AptToServRecsIconVisibilityConverter.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Windows; using System.Windows.Data; using BeWo.Scheduler.ViewModel; -using BS.Shared.DataContracts; namespace BeWo.Scheduler.Converter { diff --git a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs index dd8845fcb..8ebd9a0c4 100644 --- a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs +++ b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs @@ -18,7 +18,6 @@ using BeWo.Core.Service; using BeWo.ViewModel; using BeWo.ServiceProxy; using BeWo.View.Detail; -using BS.Shared.DataContracts; using BS.Shared.Extensions; using BS.Shared; using BS.Shared.Core; diff --git a/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs b/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs index ecea0f1dd..621122f37 100644 --- a/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs +++ b/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs @@ -31,7 +31,6 @@ using BeWo.View.Detail; using BeWo.ViewModel.ListViewModel; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; using DevExpress.Xpf.Core; using DevExpress.Xpf.Editors; diff --git a/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs b/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs index 7af20fdc8..0205a4853 100644 --- a/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs +++ b/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs @@ -7,6 +7,8 @@ // der Code erneut generiert wird. // //------------------------------------------------------------------------------ +using BS.Shared.DataContracts.Feature.AI; + namespace BeWo.ServiceProxy { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -54,19 +56,19 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/SendNewMessage", ReplyAction="http://tempuri.org/IAiEnhancedService/SendNewMessageResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/SendNewMessageBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List SendNewMessage(long conversation, string message); + System.Collections.Generic.List SendNewMessage(long conversation, string message); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/GetAiPromptbausteine", ReplyAction="http://tempuri.org/IAiEnhancedService/GetAiPromptbausteineResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/GetAiPromptbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List GetAiPromptbausteine(); + System.Collections.Generic.List GetAiPromptbausteine(); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/CreateAiPromptbausteine", ReplyAction="http://tempuri.org/IAiEnhancedService/CreateAiPromptbausteineResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CreateAiPromptbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List CreateAiPromptbausteine(System.Collections.Generic.List aiPromptbausteinDC); + System.Collections.Generic.List CreateAiPromptbausteine(System.Collections.Generic.List aiPromptbausteinDC); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/UpdateAiPromptbausteine", ReplyAction="http://tempuri.org/IAiEnhancedService/UpdateAiPromptbausteineResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/UpdateAiPromptbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.Dictionary UpdateAiPromptbausteine(System.Collections.Generic.List aiPromptbausteinDCs); + System.Collections.Generic.Dictionary UpdateAiPromptbausteine(System.Collections.Generic.List aiPromptbausteinDCs); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/DeleteAiPromptbausteine", ReplyAction="http://tempuri.org/IAiEnhancedService/DeleteAiPromptbausteineResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/DeleteAiPromptbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] @@ -152,22 +154,22 @@ namespace BeWo.ServiceProxy base.Channel.DeleteAiConversation(conversation_oid); } - public System.Collections.Generic.List SendNewMessage(long conversation, string message) + public System.Collections.Generic.List SendNewMessage(long conversation, string message) { return base.Channel.SendNewMessage(conversation, message); } - public System.Collections.Generic.List GetAiPromptbausteine() + public System.Collections.Generic.List GetAiPromptbausteine() { return base.Channel.GetAiPromptbausteine(); } - public System.Collections.Generic.List CreateAiPromptbausteine(System.Collections.Generic.List aiPromptbausteinDC) + public System.Collections.Generic.List CreateAiPromptbausteine(System.Collections.Generic.List aiPromptbausteinDC) { return base.Channel.CreateAiPromptbausteine(aiPromptbausteinDC); } - public System.Collections.Generic.Dictionary UpdateAiPromptbausteine(System.Collections.Generic.List aiPromptbausteinDCs) + public System.Collections.Generic.Dictionary UpdateAiPromptbausteine(System.Collections.Generic.List aiPromptbausteinDCs) { return base.Channel.UpdateAiPromptbausteine(aiPromptbausteinDCs); } diff --git a/BeWo/Services/BeWoControlFactory.cs b/BeWo/Services/BeWoControlFactory.cs index f2f793462..1cb406a88 100644 --- a/BeWo/Services/BeWoControlFactory.cs +++ b/BeWo/Services/BeWoControlFactory.cs @@ -1,8 +1,6 @@ using BeWo.View.Controls; using BeWo.View.Detail.AI; using BeWo.ViewModel; -using BeWo.ViewModel.View; -using BeWo.ViewModel.View.Administration; using BeWo.ViewModel.View.AI; using BS.Shared; using System; diff --git a/BeWo/Services/BeWoWindowFactory.cs b/BeWo/Services/BeWoWindowFactory.cs index 9e4d2a489..282794926 100644 --- a/BeWo/Services/BeWoWindowFactory.cs +++ b/BeWo/Services/BeWoWindowFactory.cs @@ -1,6 +1,5 @@ using BeWo.View.Detail.AI; using BeWo.View.Windows; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.AI; using BS.Shared; using DevExpress.Mvvm.Native; diff --git a/BeWo/Services/BeWoWindowService.cs b/BeWo/Services/BeWoWindowService.cs index 6cee3b205..eac8a8df4 100644 --- a/BeWo/Services/BeWoWindowService.cs +++ b/BeWo/Services/BeWoWindowService.cs @@ -2,11 +2,10 @@ using BeWo.View.Detail.AI; using BeWo.View.Windows; using BeWo.ViewModel; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.Administration; using BeWo.ViewModel.View.AI; +using BeWo.ViewModel.View.Dialogs; using BS.Shared; -using BS.Shared.DataContracts; using System; using System.Collections.Generic; using System.Linq; diff --git a/BeWo/Services/IControlFactory.cs b/BeWo/Services/IControlFactory.cs index 488c0681b..f6d03a2cd 100644 --- a/BeWo/Services/IControlFactory.cs +++ b/BeWo/Services/IControlFactory.cs @@ -1,6 +1,4 @@ using BeWo.ViewModel; -using BeWo.ViewModel.View; -using BeWo.ViewModel.View.Administration; using BeWo.ViewModel.View.AI; using BS.Shared; using System; diff --git a/BeWo/Services/IWindowService.cs b/BeWo/Services/IWindowService.cs index 6e4fc615d..87eea994c 100644 --- a/BeWo/Services/IWindowService.cs +++ b/BeWo/Services/IWindowService.cs @@ -1,5 +1,4 @@ using BeWo.ViewModel; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.Administration; using BeWo.ViewModel.View.AI; using BS.Shared; diff --git a/BeWo/View/Controls/DPCtrlMonth.cs b/BeWo/View/Controls/DPCtrlMonth.cs index eee0fb048..00ff2274b 100644 --- a/BeWo/View/Controls/DPCtrlMonth.cs +++ b/BeWo/View/Controls/DPCtrlMonth.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/BeWo/View/Controls/DPCtrlWeek.cs b/BeWo/View/Controls/DPCtrlWeek.cs index dcf0c7480..00ff8cc49 100644 --- a/BeWo/View/Controls/DPCtrlWeek.cs +++ b/BeWo/View/Controls/DPCtrlWeek.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/BeWo/View/Controls/DienstplanerControl.xaml.cs b/BeWo/View/Controls/DienstplanerControl.xaml.cs index 157f4b6a8..8a507ee06 100644 --- a/BeWo/View/Controls/DienstplanerControl.xaml.cs +++ b/BeWo/View/Controls/DienstplanerControl.xaml.cs @@ -7,7 +7,6 @@ using System.Windows.Media; using BeWo.View.Detail; using BeWo.View.Detail.Report; using BeWo.ViewModel; -using BS.Shared.DataContracts; namespace BeWo.View.Controls { diff --git a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs index d362e83ff..b5c7068fb 100644 --- a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs +++ b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs @@ -4,7 +4,6 @@ using BeWo.View.Windows; using BeWo.ViewModel; using BeWo.ViewModel.Light; using BeWo.ViewModel.ListViewModel; -using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.DataContracts.Light; using BS.Shared.Extensions; using DevExpress.Xpf.Grid; diff --git a/BeWo/View/Controls/ListboxSelectControl.xaml.cs b/BeWo/View/Controls/ListboxSelectControl.xaml.cs index 73a37bf3b..dba9a68ff 100644 --- a/BeWo/View/Controls/ListboxSelectControl.xaml.cs +++ b/BeWo/View/Controls/ListboxSelectControl.xaml.cs @@ -11,7 +11,6 @@ using BeWo.Annotations; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.Extensions; namespace BeWo.View.Controls diff --git a/BeWo/View/Controls/MonthPicker.xaml.cs b/BeWo/View/Controls/MonthPicker.xaml.cs index 831edea2a..b79f50900 100644 --- a/BeWo/View/Controls/MonthPicker.xaml.cs +++ b/BeWo/View/Controls/MonthPicker.xaml.cs @@ -9,7 +9,6 @@ using System.Windows.Media; using BeWo.View.Detail; using BeWo.View.Detail.Report; using BeWo.ViewModel; -using BS.Shared.DataContracts; namespace BeWo.View.Controls { diff --git a/BeWo/View/Controls/NewsItemEditControl.xaml.cs b/BeWo/View/Controls/NewsItemEditControl.xaml.cs index 3b30a53ae..884e35ac9 100644 --- a/BeWo/View/Controls/NewsItemEditControl.xaml.cs +++ b/BeWo/View/Controls/NewsItemEditControl.xaml.cs @@ -6,7 +6,6 @@ using System.Windows.Input; using BeWo.Validation; using BeWo.ViewModel; using BS.Shared.Core; -using BS.Shared.DataContracts.Compact; namespace BeWo.View.Controls { diff --git a/BeWo/View/Detail/AI/AiConversationChatView.xaml.cs b/BeWo/View/Detail/AI/AiConversationChatView.xaml.cs index 88d3146b0..8d74827e8 100644 --- a/BeWo/View/Detail/AI/AiConversationChatView.xaml.cs +++ b/BeWo/View/Detail/AI/AiConversationChatView.xaml.cs @@ -2,7 +2,6 @@ using BeWo.ServiceProxy; using BeWo.ViewModel; using BeWo.ViewModel.ListViewModel; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.AI; using BS.Shared.Extensions; using DevExpress.Mvvm; diff --git a/BeWo/View/Detail/AI/AiPromptbausteinSelectionView.xaml.cs b/BeWo/View/Detail/AI/AiPromptbausteinSelectionView.xaml.cs index de4f536d1..bcd88c54c 100644 --- a/BeWo/View/Detail/AI/AiPromptbausteinSelectionView.xaml.cs +++ b/BeWo/View/Detail/AI/AiPromptbausteinSelectionView.xaml.cs @@ -29,6 +29,8 @@ namespace BeWo.View.Detail.AI InitializeComponent(); DataContext = ViewModel = viewModel; + + Loaded += (s, e) => VMFactory.CreateAiPromptbausteinTreeListAsync(vm => ViewModel.UpdateVMList(vm)); } private void treeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs e) diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs index f2eed939f..f7e94506e 100644 --- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs +++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs @@ -22,7 +22,6 @@ using BeWo.ViewModel.ListViewModel.Light; using BS.Shared; using BS.Shared.AppSender; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.DataContracts.Light; using BS.Shared.Extensions; diff --git a/BeWo/View/Detail/Administration/AiPromptbausteinTreeView.xaml.cs b/BeWo/View/Detail/Administration/AiPromptbausteinTreeView.xaml.cs index 04dc904e1..6524f13bc 100644 --- a/BeWo/View/Detail/Administration/AiPromptbausteinTreeView.xaml.cs +++ b/BeWo/View/Detail/Administration/AiPromptbausteinTreeView.xaml.cs @@ -29,9 +29,11 @@ namespace BeWo.View.Detail.Administration InitializeComponent(); DataContext = ViewModel = new AiPromptbausteinTreeViewModel(BeWoApp.MainControl.WindowService); + + Loaded += (s, e) => VMFactory.CreateAiPromptbausteinTreeListAsync(vm => ViewModel.UpdateVMList(vm)); } - public AiPromptbausteinTreeViewModel ViewModel{ get; set; } + public AiPromptbausteinTreeViewModel ViewModel { get; set; } private void OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e) { @@ -83,7 +85,7 @@ namespace BeWo.View.Detail.Administration { ViewModel.EditPromptbausteinCommand.Execute(null); e.Handled = true; - } + } } private TreeViewItem _LastTreeViewItem; diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs index afaa01b02..c6085cc75 100644 --- a/BeWo/View/Detail/CustomerView.xaml.cs +++ b/BeWo/View/Detail/CustomerView.xaml.cs @@ -55,7 +55,6 @@ using BeWo.View.Navigation; using DevExpress.Mvvm; using System.Collections; using BeWo.Core.Commands; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.AI; namespace BeWo.View.Detail diff --git a/BeWo/View/Detail/DateiBearbeiten.xaml.cs b/BeWo/View/Detail/DateiBearbeiten.xaml.cs index 59ec504bf..5159a07ce 100644 --- a/BeWo/View/Detail/DateiBearbeiten.xaml.cs +++ b/BeWo/View/Detail/DateiBearbeiten.xaml.cs @@ -16,9 +16,6 @@ using BeWo.Core.Service; using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Detail/GoalImportControl.xaml.cs b/BeWo/View/Detail/GoalImportControl.xaml.cs index 204a12851..9e795255e 100644 --- a/BeWo/View/Detail/GoalImportControl.xaml.cs +++ b/BeWo/View/Detail/GoalImportControl.xaml.cs @@ -14,8 +14,6 @@ using System.Windows.Controls; using System.Windows.Data; using BeWo.ViewModel; using BS.Shared; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; using DevExpress.Data; using DevExpress.Mvvm.Native; using DevExpress.Xpf.Grid; diff --git a/BeWo/View/Detail/InformationView.xaml.cs b/BeWo/View/Detail/InformationView.xaml.cs index 27376f2a5..75b9b90e6 100644 --- a/BeWo/View/Detail/InformationView.xaml.cs +++ b/BeWo/View/Detail/InformationView.xaml.cs @@ -17,8 +17,6 @@ using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Detail/OwnChatSettingsView.xaml.cs b/BeWo/View/Detail/OwnChatSettingsView.xaml.cs index cda7cb6c6..4cb8d9c7b 100644 --- a/BeWo/View/Detail/OwnChatSettingsView.xaml.cs +++ b/BeWo/View/Detail/OwnChatSettingsView.xaml.cs @@ -2,7 +2,6 @@ using System.Windows; using BeWo.ServiceProxy; using BeWo.ViewModel; -using BS.Shared.DataContracts; using BS.Shared.Extensions; namespace BeWo.View.Detail diff --git a/BeWo/View/Detail/RatingEditView.xaml.cs b/BeWo/View/Detail/RatingEditView.xaml.cs index 1cdc5eee9..f6180450b 100644 --- a/BeWo/View/Detail/RatingEditView.xaml.cs +++ b/BeWo/View/Detail/RatingEditView.xaml.cs @@ -16,9 +16,6 @@ using BeWo.Core.Service; using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Detail/Report/AbwesenheitsPrintControl.xaml.cs b/BeWo/View/Detail/Report/AbwesenheitsPrintControl.xaml.cs index 1433090e8..6ff5d4194 100644 --- a/BeWo/View/Detail/Report/AbwesenheitsPrintControl.xaml.cs +++ b/BeWo/View/Detail/Report/AbwesenheitsPrintControl.xaml.cs @@ -1,5 +1,4 @@ using BeWo.ServiceProxy; -using BS.Shared.DataContracts.Compact; using DevExpress.Xpf.Core; using System; using System.Collections.Generic; diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs index 9247f194e..0f8cedcca 100644 --- a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs +++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs @@ -16,7 +16,6 @@ using BeWo.ViewModel; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BS.Shared.Translation; using DevExpress.Xpf.Core; diff --git a/BeWo/View/Detail/Suchergebnis.xaml.cs b/BeWo/View/Detail/Suchergebnis.xaml.cs index 8757ab7cd..8b5a1cb05 100644 --- a/BeWo/View/Detail/Suchergebnis.xaml.cs +++ b/BeWo/View/Detail/Suchergebnis.xaml.cs @@ -16,9 +16,6 @@ using BeWo.Core.Service; using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Detail/SupportConceptGoalRatingView.xaml.cs b/BeWo/View/Detail/SupportConceptGoalRatingView.xaml.cs index 9f0e28f44..e9f7f7fc7 100644 --- a/BeWo/View/Detail/SupportConceptGoalRatingView.xaml.cs +++ b/BeWo/View/Detail/SupportConceptGoalRatingView.xaml.cs @@ -19,7 +19,6 @@ using BeWo.ViewModel; using BeWo.ViewModel.ListViewModel; using BS.Shared; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; using BS.Shared.Extensions; using BS.Shared.Translation; using DevExpress.Data.Helpers; diff --git a/BeWo/View/Detail/SupportConceptGoalView.xaml.cs b/BeWo/View/Detail/SupportConceptGoalView.xaml.cs index 99ad2299a..ab1bebbc7 100644 --- a/BeWo/View/Detail/SupportConceptGoalView.xaml.cs +++ b/BeWo/View/Detail/SupportConceptGoalView.xaml.cs @@ -13,7 +13,6 @@ using BeWo.ViewModel; using BS.Shared; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; using BS.Shared.Extensions; namespace BeWo.View.Detail diff --git a/BeWo/View/Detail/SupportConceptView.xaml.cs b/BeWo/View/Detail/SupportConceptView.xaml.cs index 2363e0b99..c6e2bbcfc 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml.cs +++ b/BeWo/View/Detail/SupportConceptView.xaml.cs @@ -25,7 +25,6 @@ using BeWo.ViewModel; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BS.Shared.Translation; diff --git a/BeWo/View/Detail/UrlaubskontoView.xaml.cs b/BeWo/View/Detail/UrlaubskontoView.xaml.cs index 7c55c3a04..b0193d78b 100755 --- a/BeWo/View/Detail/UrlaubskontoView.xaml.cs +++ b/BeWo/View/Detail/UrlaubskontoView.xaml.cs @@ -17,8 +17,6 @@ using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Detail/UrlaubstagSchenkenView.xaml.cs b/BeWo/View/Detail/UrlaubstagSchenkenView.xaml.cs index 18c3a7ac0..1de413e51 100644 --- a/BeWo/View/Detail/UrlaubstagSchenkenView.xaml.cs +++ b/BeWo/View/Detail/UrlaubstagSchenkenView.xaml.cs @@ -17,8 +17,6 @@ using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Detail/Urlaubsuebersicht.xaml.cs b/BeWo/View/Detail/Urlaubsuebersicht.xaml.cs index bae0dd2e3..fd4f1f971 100644 --- a/BeWo/View/Detail/Urlaubsuebersicht.xaml.cs +++ b/BeWo/View/Detail/Urlaubsuebersicht.xaml.cs @@ -17,8 +17,6 @@ using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs index 921cf2cf9..4d8df9705 100644 --- a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs +++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs @@ -1,7 +1,6 @@ using BeWo.Core; using BeWo.ViewModel; using BeWo.ViewModel.ListViewModel; -using BS.Shared.DataContracts; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs index 43e69af3c..b63bdde9f 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs @@ -7,7 +7,6 @@ using BeWo.ViewModel; using BeWo.ViewModel.ListViewModel; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; namespace BeWo.View.Detail.Zeiterfassung { diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs index 01ef7cf33..a03bf3302 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs @@ -55,7 +55,6 @@ using BeWo.AI; using BeWo.View.Detail.AI; using BeWo.View.Windows; using BeWo.Core.Commands; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.AI; namespace BeWo.View.Detail.Zeiterfassung diff --git a/BeWo/View/Document/DokumenteView.xaml.cs b/BeWo/View/Document/DokumenteView.xaml.cs index 256e7c35a..4a9a292cf 100644 --- a/BeWo/View/Document/DokumenteView.xaml.cs +++ b/BeWo/View/Document/DokumenteView.xaml.cs @@ -35,7 +35,6 @@ using MenuItem = System.Windows.Controls.MenuItem; using GroupBox = System.Windows.Controls.GroupBox; using System.Windows.Controls.Primitives; using TextBox = System.Windows.Controls.TextBox; -using BS.Shared.DataContracts.Compact; using BeWo.View.Detail; using System.Text; using BS.Shared.Translation; diff --git a/BeWo/View/Document/RtfEditView.xaml.cs b/BeWo/View/Document/RtfEditView.xaml.cs index 5350f977f..b4bb046a7 100644 --- a/BeWo/View/Document/RtfEditView.xaml.cs +++ b/BeWo/View/Document/RtfEditView.xaml.cs @@ -16,9 +16,6 @@ using BeWo.Core.Service; using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Document/SingleTemplateSelectionView.xaml.cs b/BeWo/View/Document/SingleTemplateSelectionView.xaml.cs index 0fbdba056..0b91f9e37 100644 --- a/BeWo/View/Document/SingleTemplateSelectionView.xaml.cs +++ b/BeWo/View/Document/SingleTemplateSelectionView.xaml.cs @@ -17,8 +17,6 @@ using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Document/TemplatePrintSelection.xaml.cs b/BeWo/View/Document/TemplatePrintSelection.xaml.cs index c768c229b..fa0afceae 100644 --- a/BeWo/View/Document/TemplatePrintSelection.xaml.cs +++ b/BeWo/View/Document/TemplatePrintSelection.xaml.cs @@ -17,8 +17,6 @@ using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Document/VorlageEditView.xaml.cs b/BeWo/View/Document/VorlageEditView.xaml.cs index 362498233..12793616c 100644 --- a/BeWo/View/Document/VorlageEditView.xaml.cs +++ b/BeWo/View/Document/VorlageEditView.xaml.cs @@ -17,8 +17,6 @@ using BS.Shared; using BS.Shared.Extensions; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.ClientPartials; -using BS.Shared.DataContracts.Compact; using BS.Shared.Services; using BS.Shared.Translation; using DevExpress.Xpf.RichEdit; diff --git a/BeWo/View/Master/AdministrationView.xaml.cs b/BeWo/View/Master/AdministrationView.xaml.cs index 175d97fd8..17c98b0c8 100644 --- a/BeWo/View/Master/AdministrationView.xaml.cs +++ b/BeWo/View/Master/AdministrationView.xaml.cs @@ -572,8 +572,7 @@ namespace BeWo.View.Master r => this.Dispatch(() => AddView(TabitemAiPromptbausteine, new AiPromptbausteinView(r)))); return; case nameof(TabitemAiPromptbausteineTree): - VMFactory.CreateAiPromptbausteinListAsync( - r => this.Dispatch(() => AddView(TabitemAiPromptbausteineTree, new AiPromptbausteinTreeView()))); + AddView(TabitemAiPromptbausteineTree, new AiPromptbausteinTreeView()); return; } diff --git a/BeWo/View/Master/AiConversationView.xaml.cs b/BeWo/View/Master/AiConversationView.xaml.cs index 1a824fe5b..8a8158aef 100644 --- a/BeWo/View/Master/AiConversationView.xaml.cs +++ b/BeWo/View/Master/AiConversationView.xaml.cs @@ -1,6 +1,5 @@ using BeWo.ServiceProxy; using BeWo.ViewModel.ListViewModel; -using BS.Shared.DataContracts; using BS.Shared.Extensions; using DevExpress.Mvvm; using System; diff --git a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs index 78c3a46a9..fe552d81c 100644 --- a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs +++ b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs @@ -32,7 +32,6 @@ using BeWo.View.Windows; using System.Collections; using System.Windows.Input; using BeWo.Core.Commands; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.AI; namespace BeWo.View.Navigation diff --git a/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs b/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs index fddf0a7f2..0c167d40a 100644 --- a/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs +++ b/BeWo/View/Navigation/EmployeeNavigationView.xaml.cs @@ -15,7 +15,6 @@ using BeWo.View.Detail; using BeWo.View.Navigation.Sorter; using BeWo.View.Windows; using BeWo.ViewModel; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.AI; using BS.Shared; using BS.Shared.Core; diff --git a/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs b/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs index b7344065e..5e4820405 100644 --- a/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs +++ b/BeWo/View/Navigation/OrganisationNavigationView.xaml.cs @@ -11,7 +11,6 @@ using BeWo.ServiceProxy; using BeWo.View.Detail; using BeWo.View.Navigation.Sorter; using BeWo.ViewModel; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.AI; using BS.Shared; using BS.Shared.Core; diff --git a/BeWo/View/Navigation/PersonNavigationView.xaml.cs b/BeWo/View/Navigation/PersonNavigationView.xaml.cs index 87e3a4b84..bfc272347 100644 --- a/BeWo/View/Navigation/PersonNavigationView.xaml.cs +++ b/BeWo/View/Navigation/PersonNavigationView.xaml.cs @@ -20,7 +20,6 @@ using BeWo.View.Windows; using System.Collections; using System.Windows.Input; using BeWo.Core.Commands; -using BeWo.ViewModel.View; using DevExpress.XtraBars.Docking; using BeWo.ViewModel.View.AI; diff --git a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs index ac4a9d45a..bd500d090 100644 --- a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs +++ b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs @@ -27,7 +27,6 @@ using DevExpress.Mvvm; using System.Collections; using System.Windows.Input; using BeWo.Core.Commands; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.AI; namespace BeWo.View.Navigation diff --git a/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs b/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs index 16000e651..8383f2840 100644 --- a/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs +++ b/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs @@ -20,7 +20,6 @@ using BeWo.View.Detail; using BeWo.View.Master; using BeWo.View.Report.FLSReport; using BS.Shared.DataContracts.Compact; -using BS.Shared.DataContracts.Reports; using BS.Shared.DataContracts; using BeWo.ServiceProxy; using BS.Shared; diff --git a/BeWo/View/Report/Rating/RatingReportView.xaml.cs b/BeWo/View/Report/Rating/RatingReportView.xaml.cs index c24479dd2..18cde51d3 100644 --- a/BeWo/View/Report/Rating/RatingReportView.xaml.cs +++ b/BeWo/View/Report/Rating/RatingReportView.xaml.cs @@ -20,7 +20,6 @@ using BeWo.View.Detail; using BeWo.View.Master; using BeWo.View.Report.FLSReport; using BS.Shared.DataContracts.Compact; -using BS.Shared.DataContracts.Reports; using BS.Shared.DataContracts; using BeWo.ServiceProxy; using BS.Shared; diff --git a/BeWo/View/Search/SupportConceptGroupSearchView.cs b/BeWo/View/Search/SupportConceptGroupSearchView.cs index 8e7f3ce8e..95d0308d7 100644 --- a/BeWo/View/Search/SupportConceptGroupSearchView.cs +++ b/BeWo/View/Search/SupportConceptGroupSearchView.cs @@ -9,7 +9,6 @@ using System.Linq; using System.Windows.Media.Imaging; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.Extensions; using BeWo.View.Detail; using BeWo.View.Navigation.Sorter; diff --git a/BeWo/ViewModel/AbstractDCMapperVM.cs b/BeWo/ViewModel/AbstractDCMapperVM.cs index 9272d1e54..3e07d21af 100644 --- a/BeWo/ViewModel/AbstractDCMapperVM.cs +++ b/BeWo/ViewModel/AbstractDCMapperVM.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; -using DevExpress.Xpf.Accordion; +using DevExpress.Xpf.Accordion; using System; using System.Collections.Generic; diff --git a/BeWo/ViewModel/AdditionalServiceBookingVM.cs b/BeWo/ViewModel/AdditionalServiceBookingVM.cs index 89a56dc6c..fa4b86833 100644 --- a/BeWo/ViewModel/AdditionalServiceBookingVM.cs +++ b/BeWo/ViewModel/AdditionalServiceBookingVM.cs @@ -4,7 +4,6 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BeWo.Validation; diff --git a/BeWo/ViewModel/AdditionalServiceGroupOfPeopleRelationVM.cs b/BeWo/ViewModel/AdditionalServiceGroupOfPeopleRelationVM.cs index 817562dcd..95ca8c3aa 100644 --- a/BeWo/ViewModel/AdditionalServiceGroupOfPeopleRelationVM.cs +++ b/BeWo/ViewModel/AdditionalServiceGroupOfPeopleRelationVM.cs @@ -6,7 +6,6 @@ using BeWo.ServiceProxy; using BeWo.Validation; using BS.Shared.Extensions; -using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts; namespace BeWo.ViewModel diff --git a/BeWo/ViewModel/AiConfigVM.cs b/BeWo/ViewModel/AiConfigVM.cs index 9d30580c3..3403bbb3a 100644 --- a/BeWo/ViewModel/AiConfigVM.cs +++ b/BeWo/ViewModel/AiConfigVM.cs @@ -1,7 +1,6 @@ using System; using BS.Shared; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Feature.AI; namespace BeWo.ViewModel diff --git a/BeWo/ViewModel/AiConversationMessageVM.cs b/BeWo/ViewModel/AiConversationMessageVM.cs index babbaf597..19bf5ef1a 100644 --- a/BeWo/ViewModel/AiConversationMessageVM.cs +++ b/BeWo/ViewModel/AiConversationMessageVM.cs @@ -1,7 +1,6 @@ using System; using BS.Shared; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Feature.AI; using Newtonsoft.Json; diff --git a/BeWo/ViewModel/AiConversationVM.cs b/BeWo/ViewModel/AiConversationVM.cs index 1fc58ea71..469cf013b 100644 --- a/BeWo/ViewModel/AiConversationVM.cs +++ b/BeWo/ViewModel/AiConversationVM.cs @@ -6,7 +6,6 @@ using System.Runtime.Serialization; using BeWo.ServiceProxy; using BeWo.ViewModel.ListViewModel; using BS.Shared; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Feature.AI; using DevExpress.Mvvm; using DevExpress.Xpf.Core.Native; diff --git a/BeWo/ViewModel/AiPromptbausteinTreeVM.cs b/BeWo/ViewModel/AiPromptbausteinTreeVM.cs index edaff3aa5..f17bc1ab9 100644 --- a/BeWo/ViewModel/AiPromptbausteinTreeVM.cs +++ b/BeWo/ViewModel/AiPromptbausteinTreeVM.cs @@ -7,7 +7,6 @@ using BeWo.ServiceProxy; using BeWo.Validation; using BeWo.ViewModel.ListViewModel; using BS.Shared; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Feature.AI; using BS.Shared.Extensions; diff --git a/BeWo/ViewModel/CustomerWohnhilfeVM.cs b/BeWo/ViewModel/CustomerWohnhilfeVM.cs index e8dd345a2..18db5409b 100644 --- a/BeWo/ViewModel/CustomerWohnhilfeVM.cs +++ b/BeWo/ViewModel/CustomerWohnhilfeVM.cs @@ -1,6 +1,5 @@ using BeWo.ViewModel.Wohnhilfe; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Wohnhilfe; using DevExpress.Mvvm; using System; diff --git a/BeWo/ViewModel/FeiertagVM.cs b/BeWo/ViewModel/FeiertagVM.cs index f1ec3fd9b..9b9c4628d 100644 --- a/BeWo/ViewModel/FeiertagVM.cs +++ b/BeWo/ViewModel/FeiertagVM.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using BeWo.ServiceProxy; using BeWo.Validation; using BeWo.ViewModel.ListViewModel; -using BS.Shared.DataContracts.Compact; namespace BeWo.ViewModel { diff --git a/BeWo/ViewModel/GkvAbrechnungVM.cs b/BeWo/ViewModel/GkvAbrechnungVM.cs index d8bc44614..a82e18dca 100644 --- a/BeWo/ViewModel/GkvAbrechnungVM.cs +++ b/BeWo/ViewModel/GkvAbrechnungVM.cs @@ -10,7 +10,6 @@ using BeWo.Validation; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.Extensions; using BS.Shared.Interface; diff --git a/BeWo/ViewModel/GoalRatingVM.cs b/BeWo/ViewModel/GoalRatingVM.cs index 120d8454a..b1b5f8b58 100644 --- a/BeWo/ViewModel/GoalRatingVM.cs +++ b/BeWo/ViewModel/GoalRatingVM.cs @@ -7,7 +7,6 @@ using BeWo.ViewModel.ListViewModel; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; namespace BeWo.ViewModel diff --git a/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs b/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs index 9182b2792..d8b57560e 100644 --- a/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs +++ b/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs @@ -9,8 +9,6 @@ using BeWo.ServiceProxy; using BeWo.Validation; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.DataContracts.Light; using BS.Shared.Extensions; diff --git a/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs b/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs index ac386576c..3a844ef56 100644 --- a/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs +++ b/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs @@ -4,7 +4,6 @@ using System.Collections.ObjectModel; using System.ComponentModel; using System.Linq; using System.Windows; -using BS.Shared.DataContracts; using BS.Shared.Extensions; namespace BeWo.ViewModel.ListViewModel diff --git a/BeWo/ViewModel/ListViewModel/AiConversationListVM.cs b/BeWo/ViewModel/ListViewModel/AiConversationListVM.cs index c7d52f542..40d2ba878 100644 --- a/BeWo/ViewModel/ListViewModel/AiConversationListVM.cs +++ b/BeWo/ViewModel/ListViewModel/AiConversationListVM.cs @@ -3,7 +3,6 @@ using BeWo.Core.Commands; using BeWo.ServiceProxy; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Feature.AI; using BS.Shared.Extensions; using ChatController.Utilities.Extensions; diff --git a/BeWo/ViewModel/ListViewModel/AiConversationMessageListVM.cs b/BeWo/ViewModel/ListViewModel/AiConversationMessageListVM.cs index 4f315f1b5..756f63ab1 100644 --- a/BeWo/ViewModel/ListViewModel/AiConversationMessageListVM.cs +++ b/BeWo/ViewModel/ListViewModel/AiConversationMessageListVM.cs @@ -1,5 +1,5 @@ using BeWo.ServiceProxy; -using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Feature.AI; using BS.Shared.Extensions; using ChatController.Utilities.Extensions; using DevExpress.Mvvm; diff --git a/BeWo/ViewModel/ListViewModel/AiPromptbausteinTreeListVM.cs b/BeWo/ViewModel/ListViewModel/AiPromptbausteinTreeListVM.cs index 04b571402..a669cb207 100644 --- a/BeWo/ViewModel/ListViewModel/AiPromptbausteinTreeListVM.cs +++ b/BeWo/ViewModel/ListViewModel/AiPromptbausteinTreeListVM.cs @@ -1,7 +1,5 @@ using System.Collections.Generic; using System.Linq; - -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Feature.AI; namespace BeWo.ViewModel.ListViewModel @@ -10,11 +8,10 @@ namespace BeWo.ViewModel.ListViewModel { public AiPromptbausteinTreeListVM() : this(null) { - - //if (BeWoApp.IsInDesignMode) - //{ + if (BeWoApp.IsInDesignMode) + { InitDesigner(); - //} + } } public AiPromptbausteinTreeListVM(IEnumerable pDataContracts = null, AiPromptbausteinTreeVM aiPromptbausteinTreeVM = null) : base(pDataContracts) diff --git a/BeWo/ViewModel/ListViewModel/CustomerWohnhilfeListVM.cs b/BeWo/ViewModel/ListViewModel/CustomerWohnhilfeListVM.cs index 1cfa4e929..c39190baf 100644 --- a/BeWo/ViewModel/ListViewModel/CustomerWohnhilfeListVM.cs +++ b/BeWo/ViewModel/ListViewModel/CustomerWohnhilfeListVM.cs @@ -1,6 +1,5 @@ using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Wohnhilfe; using DevExpress.Mvvm; using System; diff --git a/BeWo/ViewModel/ListViewModel/Light/GkvAbrechnungLightListVM.cs b/BeWo/ViewModel/ListViewModel/Light/GkvAbrechnungLightListVM.cs index 0e603efc9..25818f392 100644 --- a/BeWo/ViewModel/ListViewModel/Light/GkvAbrechnungLightListVM.cs +++ b/BeWo/ViewModel/ListViewModel/Light/GkvAbrechnungLightListVM.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using BeWo.ViewModel.Light; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.DataContracts.Light; namespace BeWo.ViewModel.ListViewModel.Light diff --git a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs index da93cc0b4..0f65c401f 100644 --- a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs +++ b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs @@ -15,9 +15,11 @@ using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; +using BS.Shared.DataContracts.Feature.AI.Functions.ServiceRecords; using BS.Shared.Extensions; using BS.Shared.Services; using DevExpress.Mvvm; +using DevExpress.Xpf.Editors.ExpressionEditor; using Microsoft.VisualBasic; using Newtonsoft.Json; using DispatcherObject = System.Windows.Threading.DispatcherObject; @@ -178,9 +180,26 @@ namespace BeWo.ViewModel.ListViewModel if (prompt is null || prompt.IsKategorie) throw new NotImplementedException(); - // Information aufbereiten + // 1. Information aufbereiten + // 1.1 Prompt + var prompt_oid = prompt.DataContract.Oid.Value; + var prompt_version = prompt.DataContract.Version; + + // 1.2 Hilfeplan + var support_concept = SelectedCustomerNode.SupportConceptTreeNodeDC.SupportConcept; + var support_concept_oid = support_concept.SupportConceptOid; + var support_concept_version = support_concept.SupportConceptVersion; + + // 1.3 Aktuelles Doku Feld + var doku_feld = PrototypeVM.Notice; // Service Aufruf + var req = new AiFunctionDocRequest() + { + AiPromptbaustein = new BeWoRefDC(prompt_oid, prompt_version), + SupportConcept = new BeWoRefDC(support_concept_oid, support_concept_version), + Dokumentation = doku_feld, + }; // Ergebnis AktuellerDokutext = "Ergebnis"; diff --git a/BeWo/ViewModel/RatingTypeVM.cs b/BeWo/ViewModel/RatingTypeVM.cs index cb9c0a6b0..47db2be5a 100644 --- a/BeWo/ViewModel/RatingTypeVM.cs +++ b/BeWo/ViewModel/RatingTypeVM.cs @@ -7,7 +7,6 @@ using BeWo.ViewModel.ListViewModel; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; namespace BeWo.ViewModel diff --git a/BeWo/ViewModel/RatingVM.cs b/BeWo/ViewModel/RatingVM.cs index b89d90e33..dacba4c13 100644 --- a/BeWo/ViewModel/RatingVM.cs +++ b/BeWo/ViewModel/RatingVM.cs @@ -7,7 +7,6 @@ using BeWo.ViewModel.ListViewModel; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; namespace BeWo.ViewModel diff --git a/BeWo/ViewModel/ServiceAccountingVM.cs b/BeWo/ViewModel/ServiceAccountingVM.cs index b3089f03a..aa6d92622 100644 --- a/BeWo/ViewModel/ServiceAccountingVM.cs +++ b/BeWo/ViewModel/ServiceAccountingVM.cs @@ -5,7 +5,6 @@ using BS.Shared; using BeWo.Validation; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; namespace BeWo.ViewModel { diff --git a/BeWo/ViewModel/SupportConceptPeriodStatisticsVM.cs b/BeWo/ViewModel/SupportConceptPeriodStatisticsVM.cs index cb2adbc9e..2eec2985f 100644 --- a/BeWo/ViewModel/SupportConceptPeriodStatisticsVM.cs +++ b/BeWo/ViewModel/SupportConceptPeriodStatisticsVM.cs @@ -8,7 +8,6 @@ using BeWo.ViewModel.ListViewModel; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.Extensions; namespace BeWo.ViewModel diff --git a/BeWo/ViewModel/VMFactory.cs b/BeWo/ViewModel/VMFactory.cs index 16fe7e875..6fa764e1b 100644 --- a/BeWo/ViewModel/VMFactory.cs +++ b/BeWo/ViewModel/VMFactory.cs @@ -6,7 +6,6 @@ using BeWo.Core.Service; using BeWo.SchulbegleitenderDienst.ViewModel; using BeWo.ServiceProxy; using BeWo.ViewModel.ListViewModel; -using BeWo.ViewModel.View; using BeWo.ViewModel.View.AI; using BS.Shared; using BS.Shared.Core; @@ -936,11 +935,18 @@ namespace BeWo.ViewModel internal static void CreateAiPromptbausteinListAsync(Action rtn_viewmodel) { - ServiceFacade.DoAiEnhancedServiceAsnyc(x => x.GetAiPromptbausteine(), cb => - { - var list = new AiPromptbausteinListVM(cb); - rtn_viewmodel(list); - }); + //ServiceFacade.DoOperationsServiceAsync(x => x.GetAiPrompt(), cb => + //{ + // var list = new AiPromptbausteinListVM(cb); + // rtn_viewmodel(list); + //}); + } + + internal static void CreateAiPromptbausteinTreeListAsync(Action get_viewmodel) + { + ServiceFacade.DoAiEnhancedServiceAsnyc( + req => req.GetAiPromptbausteine(), + res => get_viewmodel(new AiPromptbausteinTreeListVM(res))); } } } \ No newline at end of file diff --git a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs index f2bbf0631..8cb516d0b 100644 --- a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs +++ b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; -using BS.Shared; +using BS.Shared; using BS.Shared.DataContracts.Feature.AI; using System; using System.Collections.Generic; @@ -9,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; using BeWo.ViewModel.ListViewModel; +using BeWo.ViewModel.View.Dialogs; using System.Windows.Input; using BS.Shared.Core; using DevExpress.Mvvm; diff --git a/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs b/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs index f44d022a8..153875cc5 100644 --- a/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs +++ b/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs @@ -1,5 +1,7 @@ -using BeWo.Services; +using BeWo.ServiceProxy; +using BeWo.Services; using BeWo.ViewModel.ListViewModel; +using BeWo.ViewModel.View.Dialogs; using DevExpress.Mvvm; using System; using System.Collections.Generic; @@ -20,10 +22,10 @@ namespace BeWo.ViewModel.View.AI SendCommand = new DelegateCommand(Send, isPrompt); - //if (BeWoApp.IsInDesignMode) - //{ + if (BeWoApp.IsInDesignMode) + { ListVM = new AiPromptbausteinTreeListVM(); - //} + } } public AiPromptbausteinSelectionViewModel(AiPromptbausteinTreeListVM viewModel) : this() @@ -34,7 +36,7 @@ namespace BeWo.ViewModel.View.AI public event EventHandler PromptAccepted; public AiPromptbausteinTreeVM SelectedNode { get; set; } - public AiPromptbausteinTreeListVM ListVM { get; set; } + public AiPromptbausteinTreeListVM ListVM { get; private set; } public ICommand SendCommand { get; set; } @@ -44,5 +46,11 @@ namespace BeWo.ViewModel.View.AI CloseDialogCommand.Execute(null); } + + public void UpdateVMList(AiPromptbausteinTreeListVM new_list) + { + ListVM = new_list; + FirePropertyChanged(nameof(ListVM)); + } } } diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinDetailViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinDetailViewModel.cs index c7df6c5a7..2484bc9d2 100644 --- a/BeWo/ViewModel/View/Administration/AiPromptbausteinDetailViewModel.cs +++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinDetailViewModel.cs @@ -1,4 +1,5 @@ using BeWo.ViewModel.ListViewModel; +using BeWo.ViewModel.View.Dialogs; using DevExpress.Mvvm; using DevExpress.Xpf.Docking; using System; diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs index f1f877233..cc454ee82 100644 --- a/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs +++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs @@ -16,13 +16,10 @@ namespace BeWo.ViewModel.View.Administration public AiPromptbausteinTreeViewModel() { - ListVM = new AiPromptbausteinTreeListVM(); - } - public AiPromptbausteinTreeViewModel(IWindowService windowService) - { - WindowService = windowService; - - ListVM = new AiPromptbausteinTreeListVM(); + if (BeWoApp.IsInDesignMode) + { + ListVM = new AiPromptbausteinTreeListVM(); + } Func isObject = () => SelectedNode is object; Func isKategorie = () => SelectedNode?.IsKategorie ?? false; @@ -39,9 +36,13 @@ namespace BeWo.ViewModel.View.Administration PastePromptbausteinCommand = new DelegateCommand(PastePromptbaustein, canCopy); DeletePromptbausteinCommand = new DelegateCommand(DeletePromptbaustein, isObject); } + public AiPromptbausteinTreeViewModel(IWindowService windowService) : this() + { + WindowService = windowService; + } public AiPromptbausteinTreeVM SelectedNode { get; set; } - public AiPromptbausteinTreeListVM ListVM { get; set; } + public AiPromptbausteinTreeListVM ListVM { get; private set; } public bool CopySingleTreeNode { get; set; } public AiPromptbausteinTreeVM CopyTreeNode { get; set; } @@ -57,6 +58,12 @@ namespace BeWo.ViewModel.View.Administration public ICommand PastePromptbausteinCommand { get; set; } public ICommand DeletePromptbausteinCommand { get; set; } + public void UpdateVMList(AiPromptbausteinTreeListVM new_list) + { + ListVM = new_list; + FirePropertyChanged(nameof(ListVM)); + } + public void Add(bool isKategorie) { var parent = SelectedNode?.Children ?? ListVM; diff --git a/BeWo/ViewModel/View/DialogViewModel.cs b/BeWo/ViewModel/View/Dialogs/DialogViewModel.cs similarity index 92% rename from BeWo/ViewModel/View/DialogViewModel.cs rename to BeWo/ViewModel/View/Dialogs/DialogViewModel.cs index 16728f5b7..ce110536e 100644 --- a/BeWo/ViewModel/View/DialogViewModel.cs +++ b/BeWo/ViewModel/View/Dialogs/DialogViewModel.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Input; -namespace BeWo.ViewModel.View +namespace BeWo.ViewModel.View.Dialogs { public class DialogViewModel : WindowViewModel { diff --git a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichBundVM.cs b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichBundVM.cs index 9651dd54a..4bb7cb5e5 100644 --- a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichBundVM.cs +++ b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichBundVM.cs @@ -4,7 +4,6 @@ using System.Linq; using BeWo.Validation; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Wohnhilfe; namespace BeWo.ViewModel.Wohnhilfe diff --git a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitVM.cs b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitVM.cs index c08633c60..201fc684b 100644 --- a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitVM.cs +++ b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitVM.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Wohnhilfe; namespace BeWo.ViewModel.Wohnhilfe diff --git a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs index d0aa630b5..b52f94f56 100644 --- a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs +++ b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Wohnhilfe; namespace BeWo.ViewModel.Wohnhilfe diff --git a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturVM.cs b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturVM.cs index 925d3af50..d4003bd6b 100644 --- a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturVM.cs +++ b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturVM.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Wohnhilfe; namespace BeWo.ViewModel.Wohnhilfe diff --git a/BeWo/ownChat/ChatServiceCustomer.xaml.cs b/BeWo/ownChat/ChatServiceCustomer.xaml.cs index 8f3c5733a..919d95aac 100644 --- a/BeWo/ownChat/ChatServiceCustomer.xaml.cs +++ b/BeWo/ownChat/ChatServiceCustomer.xaml.cs @@ -26,7 +26,6 @@ using BeWo.PasswortSecurity; using BeWo.ViewModel; using BeWo.ServiceProxy; using BeWo.View.Detail; -using BS.Shared.DataContracts; using BS.Shared.Extensions; using BS.Shared; using BS.Shared.Core; diff --git a/Dakota/DakotaUtils.cs b/Dakota/DakotaUtils.cs index ae7cd19a0..561118132 100644 --- a/Dakota/DakotaUtils.cs +++ b/Dakota/DakotaUtils.cs @@ -1,7 +1,5 @@ using BeWo.Data.Entities; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.Exceptions; using Dakota.Models; using System; diff --git a/Dakota/Logic/DakotaInfoCreator.cs b/Dakota/Logic/DakotaInfoCreator.cs index d53e881da..55caa3b2b 100644 --- a/Dakota/Logic/DakotaInfoCreator.cs +++ b/Dakota/Logic/DakotaInfoCreator.cs @@ -1,6 +1,5 @@ using BeWo.Data.Entities; using BS.Shared; -using BS.Shared.DataContracts; using Dakota.Models.Infos; using Dakota.Models.Schlüssels; using System; diff --git a/Dakota/Models/DakotaFile.cs b/Dakota/Models/DakotaFile.cs index f338002f2..949104af6 100644 --- a/Dakota/Models/DakotaFile.cs +++ b/Dakota/Models/DakotaFile.cs @@ -1,5 +1,4 @@ using BeWo.Data.Entities; -using BS.Shared.DataContracts; using Dakota.Models; using Dakota.Models.Auftragsdatei; using Dakota.Models.Blocke; diff --git a/Dakota/Models/Infos/InfoDateiNutzdaten.cs b/Dakota/Models/Infos/InfoDateiNutzdaten.cs index bda270587..56615c6b1 100644 --- a/Dakota/Models/Infos/InfoDateiNutzdaten.cs +++ b/Dakota/Models/Infos/InfoDateiNutzdaten.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; -using Dakota.Models.Schlüssels; +using Dakota.Models.Schlüssels; using System; using System.Collections.Generic; diff --git a/Data/Access/FinanceDAO.cs b/Data/Access/FinanceDAO.cs index 1fa0332b5..24608cd99 100644 --- a/Data/Access/FinanceDAO.cs +++ b/Data/Access/FinanceDAO.cs @@ -1,6 +1,4 @@ using BeWo.Data.Entities; -using BS.Shared.DataContracts.GkvAbrechnung; -using BS.Shared.DataContracts; using NHibernate.Criterion; using System; using System.Collections.Generic; diff --git a/Data/Entities/AbwesenheitsInformationPrint.cs b/Data/Entities/AbwesenheitsInformationPrint.cs index 8effdcf6a..c65b6b4a7 100644 --- a/Data/Entities/AbwesenheitsInformationPrint.cs +++ b/Data/Entities/AbwesenheitsInformationPrint.cs @@ -1,5 +1,4 @@ using BS.Shared; -using BS.Shared.DataContracts; using System; using System.Collections.Generic; using System.Linq; diff --git a/Data/Entities/AiConversation.cs b/Data/Entities/AiConversation.cs index 93a974a6a..a5672769d 100644 --- a/Data/Entities/AiConversation.cs +++ b/Data/Entities/AiConversation.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts.Feature.AI; -using BS.Shared.DataContracts; using Newtonsoft.Json; namespace BeWo.Data.Entities diff --git a/Data/Entities/AiModel.cs b/Data/Entities/AiModel.cs index bfc7dd224..d2a26f686 100644 --- a/Data/Entities/AiModel.cs +++ b/Data/Entities/AiModel.cs @@ -1,5 +1,4 @@ using BS.Shared; -using BS.Shared.DataContracts.Feature.AI; using System; using System.Diagnostics; using System.Xml.Linq; diff --git a/Data/Entities/Light/GkvAbrechnungLight.cs b/Data/Entities/Light/GkvAbrechnungLight.cs index b01ba392d..7781a6aa0 100644 --- a/Data/Entities/Light/GkvAbrechnungLight.cs +++ b/Data/Entities/Light/GkvAbrechnungLight.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Light; -using BS.Shared.Interface; +using BS.Shared.Interface; using BS.Shared; using System; using System.Collections.Generic; @@ -7,7 +6,6 @@ using System.Linq; using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; -using BS.Shared.DataContracts.GkvAbrechnung; namespace BeWo.Data.Entities.Light { diff --git a/Data/Entities/Quittierungsbelegsstatus.cs b/Data/Entities/Quittierungsbelegsstatus.cs index f33634c68..b02556535 100644 --- a/Data/Entities/Quittierungsbelegsstatus.cs +++ b/Data/Entities/Quittierungsbelegsstatus.cs @@ -1,5 +1,4 @@ using BS.Shared; -using BS.Shared.DataContracts.Compact; using System; using System.Collections.Generic; using System.Linq; diff --git a/Data/Entities/ResourceAppointment.cs b/Data/Entities/ResourceAppointment.cs index e2ee16100..3b6230e5b 100644 --- a/Data/Entities/ResourceAppointment.cs +++ b/Data/Entities/ResourceAppointment.cs @@ -1,7 +1,6 @@ using System; using BS.Shared; -using BS.Shared.DataContracts.Compact; namespace BeWo.Data.Entities { diff --git a/Data/Entities/TwoFactorCode.cs b/Data/Entities/TwoFactorCode.cs index 9bf27a1c9..b22478e16 100644 --- a/Data/Entities/TwoFactorCode.cs +++ b/Data/Entities/TwoFactorCode.cs @@ -1,5 +1,4 @@ using BS.Shared; -using BS.Shared.DataContracts; using System; using System.Collections.Generic; using System.Linq; diff --git a/Data/SessionFacade.cs b/Data/SessionFacade.cs index c36f3cca9..7db40cc7b 100644 --- a/Data/SessionFacade.cs +++ b/Data/SessionFacade.cs @@ -1,7 +1,6 @@ using System.Web; using BeWo.Data.Access; using BeWo.Data.Entities; -using BS.Shared.DataContracts; namespace BeWo.Data { diff --git a/Host/GkvAbrechnungClient.aspx.cs b/Host/GkvAbrechnungClient.aspx.cs index 8128336bc..589adcc7b 100644 --- a/Host/GkvAbrechnungClient.aspx.cs +++ b/Host/GkvAbrechnungClient.aspx.cs @@ -4,7 +4,6 @@ using BeWo.Data.Entities; using BeWo.Service.ServiceImplementations; using BS.Shared; using BS.Shared.AppSender; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.Exceptions; using Newtonsoft.Json; diff --git a/Host/GkvAbrechnungServer.aspx.cs b/Host/GkvAbrechnungServer.aspx.cs index 92b75c054..6f16f780e 100644 --- a/Host/GkvAbrechnungServer.aspx.cs +++ b/Host/GkvAbrechnungServer.aspx.cs @@ -1,6 +1,5 @@ using BS.Shared; using BS.Shared.AppSender; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.Exceptions; using Dakota.Logic; diff --git a/Report/DefaultReports/Invoices/SbdRechnung.cs b/Report/DefaultReports/Invoices/SbdRechnung.cs index 9150a834d..896168ae0 100644 --- a/Report/DefaultReports/Invoices/SbdRechnung.cs +++ b/Report/DefaultReports/Invoices/SbdRechnung.cs @@ -9,7 +9,6 @@ using BeWo.Service.DCEntityMapper; using BeWo.Service.Plugins; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.Services; using DevExpress.XtraReports.UI; diff --git a/Report/ReportObjects/CustomerListRO.cs b/Report/ReportObjects/CustomerListRO.cs index 52b33d3a6..57f384076 100644 --- a/Report/ReportObjects/CustomerListRO.cs +++ b/Report/ReportObjects/CustomerListRO.cs @@ -5,7 +5,6 @@ using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Service.DCEntityMapper; using BS.Shared.Core; -using BS.Shared.DataContracts.Compact; namespace BeWo.Report.ReportObjects { diff --git a/Report/ReportObjects/LwlPrueflisteRO.cs b/Report/ReportObjects/LwlPrueflisteRO.cs index 5925e9976..d8801ca33 100644 --- a/Report/ReportObjects/LwlPrueflisteRO.cs +++ b/Report/ReportObjects/LwlPrueflisteRO.cs @@ -5,7 +5,6 @@ using BeWo.Data.Access; using BeWo.Data.ICD10; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; namespace BeWo.Report.ReportObjects { diff --git a/Report/ReportObjects/RatingRO.cs b/Report/ReportObjects/RatingRO.cs index fae124c0f..d3de47876 100644 --- a/Report/ReportObjects/RatingRO.cs +++ b/Report/ReportObjects/RatingRO.cs @@ -7,7 +7,6 @@ using BeWo.Data.ICD10; using BeWo.Service.DCEntityMapper; using BS.Shared; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; namespace BeWo.Report.ReportObjects { diff --git a/Report/ReportObjects/ServiceRecordChangesAfterInvoiceDateRO.cs b/Report/ReportObjects/ServiceRecordChangesAfterInvoiceDateRO.cs index 5e2d1d488..364f8e826 100644 --- a/Report/ReportObjects/ServiceRecordChangesAfterInvoiceDateRO.cs +++ b/Report/ReportObjects/ServiceRecordChangesAfterInvoiceDateRO.cs @@ -7,7 +7,6 @@ using BeWo.Service.DCEntityMapper; using BeWo.Service.Plugins; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts.Compact; namespace BeWo.Report.ReportObjects { diff --git a/Server/Components/AICore/Context/Entry/Detail/CustomerDetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/CustomerDetailContextEntry.cs index ea491a294..211605f1b 100644 --- a/Server/Components/AICore/Context/Entry/Detail/CustomerDetailContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Detail/CustomerDetailContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; -using System; +using System; using System.Text.Json.Serialization; namespace AICore.Context.Entry.Detail diff --git a/Server/Components/AICore/Context/Entry/Detail/DetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/DetailContextEntry.cs index fa1b066f2..d03dc4d24 100644 --- a/Server/Components/AICore/Context/Entry/Detail/DetailContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Detail/DetailContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; - + namespace AICore.Context.Entry.Detail { internal abstract class DetailContextEntry : BaseContextEntry diff --git a/Server/Components/AICore/Context/Entry/Detail/EmployeeDetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/EmployeeDetailContextEntry.cs index 0ce2725e9..01702207a 100644 --- a/Server/Components/AICore/Context/Entry/Detail/EmployeeDetailContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Detail/EmployeeDetailContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; - + namespace AICore.Context.Entry.Detail { internal class EmployeeDetailContextEntry : DetailContextEntry diff --git a/Server/Components/AICore/Context/Entry/Detail/OrganisationDetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/OrganisationDetailContextEntry.cs index 2c19fb116..32eb53cff 100644 --- a/Server/Components/AICore/Context/Entry/Detail/OrganisationDetailContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Detail/OrganisationDetailContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; - + namespace AICore.Context.Entry.Detail { internal class OrganisationDetailContextEntry : DetailContextEntry diff --git a/Server/Components/AICore/Context/Entry/Detail/PersonDetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/PersonDetailContextEntry.cs index b8ed1a667..667ad215f 100644 --- a/Server/Components/AICore/Context/Entry/Detail/PersonDetailContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Detail/PersonDetailContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; - + namespace AICore.Context.Entry.Detail { internal class PersonDetailContextEntry : DetailContextEntry diff --git a/Server/Components/AICore/Context/Entry/Detail/SupportConceptDetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/SupportConceptDetailContextEntry.cs index 214d05596..0a872872b 100644 --- a/Server/Components/AICore/Context/Entry/Detail/SupportConceptDetailContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Detail/SupportConceptDetailContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; - + namespace AICore.Context.Entry.Detail { internal class SupportConceptDetailContextEntry : DetailContextEntry diff --git a/Server/Components/AICore/Context/Entry/Navigation/CustomerNavigationContextEntry.cs b/Server/Components/AICore/Context/Entry/Navigation/CustomerNavigationContextEntry.cs index 96c7da150..52def2aff 100644 --- a/Server/Components/AICore/Context/Entry/Navigation/CustomerNavigationContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Navigation/CustomerNavigationContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using System; +using System; using System.Collections.Generic; using System.Text.Json.Serialization; diff --git a/Server/Components/AICore/Context/Entry/Navigation/EmployeeNavigationContextEntry.cs b/Server/Components/AICore/Context/Entry/Navigation/EmployeeNavigationContextEntry.cs index 073e3d223..4ad65978e 100644 --- a/Server/Components/AICore/Context/Entry/Navigation/EmployeeNavigationContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Navigation/EmployeeNavigationContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace AICore.Context.Entry.Navigation { diff --git a/Server/Components/AICore/Context/Entry/Navigation/NavigationContextEntry.cs b/Server/Components/AICore/Context/Entry/Navigation/NavigationContextEntry.cs index 0ed3b1981..1e6c6937b 100644 --- a/Server/Components/AICore/Context/Entry/Navigation/NavigationContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Navigation/NavigationContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; - + namespace AICore.Context.Entry.Navigation { internal abstract class NavigationContextEntry : BaseContextEntry diff --git a/Server/Components/AICore/Context/Entry/Navigation/OrganisationNavigationContextEntry.cs b/Server/Components/AICore/Context/Entry/Navigation/OrganisationNavigationContextEntry.cs index b8acc39b9..23be58431 100644 --- a/Server/Components/AICore/Context/Entry/Navigation/OrganisationNavigationContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Navigation/OrganisationNavigationContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace AICore.Context.Entry.Navigation { diff --git a/Server/Components/AICore/Context/Entry/Navigation/PersonNavigationContextEntry.cs b/Server/Components/AICore/Context/Entry/Navigation/PersonNavigationContextEntry.cs index 553bb3c0b..94ba67294 100644 --- a/Server/Components/AICore/Context/Entry/Navigation/PersonNavigationContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Navigation/PersonNavigationContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using System; +using System; using System.Text.Json.Serialization; namespace AICore.Context.Entry.Navigation diff --git a/Server/Components/AICore/Context/Entry/Navigation/ServiceRecordContextEntry.cs b/Server/Components/AICore/Context/Entry/Navigation/ServiceRecordContextEntry.cs index 2e98e845b..5ebf56553 100644 --- a/Server/Components/AICore/Context/Entry/Navigation/ServiceRecordContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Navigation/ServiceRecordContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; -using System; +using System; using System.Text.Json.Serialization; namespace AICore.Context.Entry.Navigation diff --git a/Server/Components/AICore/Context/Entry/Navigation/SupportConceptNavigationContextEntry.cs b/Server/Components/AICore/Context/Entry/Navigation/SupportConceptNavigationContextEntry.cs index 04e0bc67c..617669262 100644 --- a/Server/Components/AICore/Context/Entry/Navigation/SupportConceptNavigationContextEntry.cs +++ b/Server/Components/AICore/Context/Entry/Navigation/SupportConceptNavigationContextEntry.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using System; +using System; using System.Collections.Generic; using System.Text.Json.Serialization; diff --git a/Server/Components/AICore/Context/EntryMapper/Navigation/EmployeeNavigationContextEntryMapper.cs b/Server/Components/AICore/Context/EntryMapper/Navigation/EmployeeNavigationContextEntryMapper.cs index 6b8dc80db..70622f6c8 100644 --- a/Server/Components/AICore/Context/EntryMapper/Navigation/EmployeeNavigationContextEntryMapper.cs +++ b/Server/Components/AICore/Context/EntryMapper/Navigation/EmployeeNavigationContextEntryMapper.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AICore.Context.Entry.Navigation; using BS.Shared.DataContracts.Compact; -using BS.Shared.DataContracts; using BS.Shared; using BS.Shared.Extensions; diff --git a/Server/Components/AICore/Context/EntryMapper/Navigation/PersonNavigationContextEntryMapper.cs b/Server/Components/AICore/Context/EntryMapper/Navigation/PersonNavigationContextEntryMapper.cs index 05cea4c38..b5cd24f08 100644 --- a/Server/Components/AICore/Context/EntryMapper/Navigation/PersonNavigationContextEntryMapper.cs +++ b/Server/Components/AICore/Context/EntryMapper/Navigation/PersonNavigationContextEntryMapper.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using AICore.Context.Entry.Navigation; -using BS.Shared.DataContracts; using BS.Shared; using BS.Shared.Extensions; using BS.Shared.DataContracts.Compact; diff --git a/Server/Components/AICore/Context/Interfaces/IContextSummary.cs b/Server/Components/AICore/Context/Interfaces/IContextSummary.cs index f02def2ca..1574b8102 100644 --- a/Server/Components/AICore/Context/Interfaces/IContextSummary.cs +++ b/Server/Components/AICore/Context/Interfaces/IContextSummary.cs @@ -1,5 +1,4 @@ using AICore.Context.Entry.Navigation; -using BS.Shared.DataContracts; using System; using System.Collections.Generic; using System.Linq; diff --git a/Server/Components/AICore/Context/Summary/Detail/CustomerDetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/CustomerDetailContextSummary.cs index 6f23f0607..fb83c4ea7 100644 --- a/Server/Components/AICore/Context/Summary/Detail/CustomerDetailContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Detail/CustomerDetailContextSummary.cs @@ -1,5 +1,4 @@ using AICore.Context.Entry.Detail; -using BS.Shared.DataContracts; namespace AICore.Context.Summary.Detail { diff --git a/Server/Components/AICore/Context/Summary/Detail/DetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/DetailContextSummary.cs index 8a99b41eb..c2b19bbad 100644 --- a/Server/Components/AICore/Context/Summary/Detail/DetailContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Detail/DetailContextSummary.cs @@ -1,5 +1,4 @@ using AICore.Context.Entry.Detail; -using BS.Shared.DataContracts; namespace AICore.Context.Summary.Detail { diff --git a/Server/Components/AICore/Context/Summary/Detail/EmployeeDetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/EmployeeDetailContextSummary.cs index a4f1f8334..5934b6c6e 100644 --- a/Server/Components/AICore/Context/Summary/Detail/EmployeeDetailContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Detail/EmployeeDetailContextSummary.cs @@ -1,5 +1,4 @@ using AICore.Context.Entry.Detail; -using BS.Shared.DataContracts; namespace AICore.Context.Summary.Detail { diff --git a/Server/Components/AICore/Context/Summary/Detail/OrganisationDetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/OrganisationDetailContextSummary.cs index b55176c1e..c5bd93b2b 100644 --- a/Server/Components/AICore/Context/Summary/Detail/OrganisationDetailContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Detail/OrganisationDetailContextSummary.cs @@ -1,5 +1,4 @@ using AICore.Context.Entry.Detail; -using BS.Shared.DataContracts; namespace AICore.Context.Summary.Detail { diff --git a/Server/Components/AICore/Context/Summary/Detail/PersonDetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/PersonDetailContextSummary.cs index 2c95c40d6..7499c7fb2 100644 --- a/Server/Components/AICore/Context/Summary/Detail/PersonDetailContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Detail/PersonDetailContextSummary.cs @@ -1,5 +1,4 @@ using AICore.Context.Entry.Detail; -using BS.Shared.DataContracts; namespace AICore.Context.Summary.Detail { diff --git a/Server/Components/AICore/Context/Summary/Detail/SupportConceptDetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/SupportConceptDetailContextSummary.cs index 028c1a5c4..b7fa2233a 100644 --- a/Server/Components/AICore/Context/Summary/Detail/SupportConceptDetailContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Detail/SupportConceptDetailContextSummary.cs @@ -1,5 +1,4 @@ using AICore.Context.Entry.Detail; -using BS.Shared.DataContracts; namespace AICore.Context.Summary.Detail { diff --git a/Server/Components/AICore/Context/Summary/Navigation/CustomerNavigationContextSummary.cs b/Server/Components/AICore/Context/Summary/Navigation/CustomerNavigationContextSummary.cs index 743d79518..503235b83 100644 --- a/Server/Components/AICore/Context/Summary/Navigation/CustomerNavigationContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Navigation/CustomerNavigationContextSummary.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using AICore.Context.Entry.Navigation; -using BS.Shared.DataContracts.Compact; namespace AICore.Context.Summary.Navigation { diff --git a/Server/Components/AICore/Context/Summary/Navigation/EmployeeNavigationContextSummary.cs b/Server/Components/AICore/Context/Summary/Navigation/EmployeeNavigationContextSummary.cs index 74e8ad4ff..4ab8f9c06 100644 --- a/Server/Components/AICore/Context/Summary/Navigation/EmployeeNavigationContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Navigation/EmployeeNavigationContextSummary.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using AICore.Context.Entry.Navigation; -using BS.Shared.DataContracts.Compact; namespace AICore.Context.Summary.Navigation { diff --git a/Server/Components/AICore/Context/Summary/Navigation/NavigationContextSummary.cs b/Server/Components/AICore/Context/Summary/Navigation/NavigationContextSummary.cs index 362fc28f2..3f2854691 100644 --- a/Server/Components/AICore/Context/Summary/Navigation/NavigationContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Navigation/NavigationContextSummary.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using AICore.Context.Entry.Navigation; -using BS.Shared.DataContracts; namespace AICore.Context.Summary.Navigation { diff --git a/Server/Components/AICore/Context/Summary/Navigation/OrganisationNavigationContextSummary.cs b/Server/Components/AICore/Context/Summary/Navigation/OrganisationNavigationContextSummary.cs index 3011be8df..830018766 100644 --- a/Server/Components/AICore/Context/Summary/Navigation/OrganisationNavigationContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Navigation/OrganisationNavigationContextSummary.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using AICore.Context.Entry.Navigation; -using BS.Shared.DataContracts.Compact; namespace AICore.Context.Summary.Navigation { diff --git a/Server/Components/AICore/Context/Summary/Navigation/PersonNavigationContextSummary.cs b/Server/Components/AICore/Context/Summary/Navigation/PersonNavigationContextSummary.cs index 674066151..ba3589422 100644 --- a/Server/Components/AICore/Context/Summary/Navigation/PersonNavigationContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Navigation/PersonNavigationContextSummary.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using AICore.Context.Entry.Navigation; -using BS.Shared.DataContracts.Compact; namespace AICore.Context.Summary.Navigation { diff --git a/Server/Components/AICore/Context/Summary/Navigation/ServiceRecordNavigationContextSummary.cs b/Server/Components/AICore/Context/Summary/Navigation/ServiceRecordNavigationContextSummary.cs index 589d33b79..8288025eb 100644 --- a/Server/Components/AICore/Context/Summary/Navigation/ServiceRecordNavigationContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Navigation/ServiceRecordNavigationContextSummary.cs @@ -1,5 +1,4 @@ using AICore.Context.Entry.Navigation; -using BS.Shared.DataContracts; using System.Collections.Generic; namespace AICore.Context.Summary.Navigation diff --git a/Server/Components/AICore/Context/Summary/Navigation/SupportConceptNavigationContextSummary.cs b/Server/Components/AICore/Context/Summary/Navigation/SupportConceptNavigationContextSummary.cs index 29182c01f..ca385a837 100644 --- a/Server/Components/AICore/Context/Summary/Navigation/SupportConceptNavigationContextSummary.cs +++ b/Server/Components/AICore/Context/Summary/Navigation/SupportConceptNavigationContextSummary.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using AICore.Context.Entry.Navigation; -using BS.Shared.DataContracts.Compact; namespace AICore.Context.Summary.Navigation { diff --git a/Server/Components/AICore/Prompt/Core/AiPromptBuilder.cs b/Server/Components/AICore/Prompt/Core/AiPromptBuilder.cs index 8af2c09e9..eb4f95f7f 100644 --- a/Server/Components/AICore/Prompt/Core/AiPromptBuilder.cs +++ b/Server/Components/AICore/Prompt/Core/AiPromptBuilder.cs @@ -3,8 +3,6 @@ using AICore.Context.SummaryParser; using BeWo.ServerUtils.Core; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Exceptions; using BS.Shared.Translation; using System; diff --git a/Server/Components/AICore/Prompt/Core/AiUtils.cs b/Server/Components/AICore/Prompt/Core/AiUtils.cs index 785443b36..f20ec8beb 100644 --- a/Server/Components/AICore/Prompt/Core/AiUtils.cs +++ b/Server/Components/AICore/Prompt/Core/AiUtils.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; -using BS.Shared.Exceptions; +using BS.Shared.Exceptions; using BS.Shared.Interface.Feature.AICore; using System.Collections.Generic; diff --git a/Service/Core/ServiceHelper.cs b/Service/Core/ServiceHelper.cs index 782d4ef11..a918f37e1 100644 --- a/Service/Core/ServiceHelper.cs +++ b/Service/Core/ServiceHelper.cs @@ -10,8 +10,6 @@ using System.Text; using System.Threading.Tasks; using BeWo.Service.ServiceContracts; using BS.Shared.Attributes; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Light; using BS.Shared.Extensions; using NHibernate.Hql.Ast.ANTLR.Tree; using BeWo.Service.ServiceUtils; diff --git a/Service/Core/ServiceValidator.cs b/Service/Core/ServiceValidator.cs index cc225ff66..43f2e1c44 100644 --- a/Service/Core/ServiceValidator.cs +++ b/Service/Core/ServiceValidator.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Service/DCEntityMapper/AdditionalServiceBookingDC_AdditionalServiceBooking.cs b/Service/DCEntityMapper/AdditionalServiceBookingDC_AdditionalServiceBooking.cs index 1c7cc7d63..be14ddc84 100644 --- a/Service/DCEntityMapper/AdditionalServiceBookingDC_AdditionalServiceBooking.cs +++ b/Service/DCEntityMapper/AdditionalServiceBookingDC_AdditionalServiceBooking.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BeWo.Data.Access; using BeWo.Data.Entities; diff --git a/Service/DCEntityMapper/AiConfigDC_AiConfig.cs b/Service/DCEntityMapper/AiConfigDC_AiConfig.cs index 92b4ec653..eb4bcadb7 100644 --- a/Service/DCEntityMapper/AiConfigDC_AiConfig.cs +++ b/Service/DCEntityMapper/AiConfigDC_AiConfig.cs @@ -6,7 +6,6 @@ using BeWo.Data.Entities; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Feature.AI; namespace BeWo.Service.DCEntityMapper diff --git a/Service/DCEntityMapper/AiConversationDC_AiConversation.cs b/Service/DCEntityMapper/AiConversationDC_AiConversation.cs index cca18136d..e9ee4dfa9 100644 --- a/Service/DCEntityMapper/AiConversationDC_AiConversation.cs +++ b/Service/DCEntityMapper/AiConversationDC_AiConversation.cs @@ -7,7 +7,6 @@ using BeWo.Data.Entities; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Feature.AI; using BS.Shared.Extensions; diff --git a/Service/DCEntityMapper/AiConversationMessageDC_AiConversationMessage.cs b/Service/DCEntityMapper/AiConversationMessageDC_AiConversationMessage.cs index 108da0350..ff61d3503 100644 --- a/Service/DCEntityMapper/AiConversationMessageDC_AiConversationMessage.cs +++ b/Service/DCEntityMapper/AiConversationMessageDC_AiConversationMessage.cs @@ -7,7 +7,7 @@ using BeWo.Data.Entities; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Feature.AI; namespace BeWo.Service.DCEntityMapper { diff --git a/Service/DCEntityMapper/AiModelDC_AiModel.cs b/Service/DCEntityMapper/AiModelDC_AiModel.cs index b22d4b009..85f1e1741 100644 --- a/Service/DCEntityMapper/AiModelDC_AiModel.cs +++ b/Service/DCEntityMapper/AiModelDC_AiModel.cs @@ -6,7 +6,6 @@ using BeWo.Data.Entities; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Feature.AI; namespace BeWo.Service.DCEntityMapper diff --git a/Service/DCEntityMapper/AiSettingsDC_AiSettings.cs b/Service/DCEntityMapper/AiSettingsDC_AiSettings.cs index 5186908ad..ceee85ec1 100644 --- a/Service/DCEntityMapper/AiSettingsDC_AiSettings.cs +++ b/Service/DCEntityMapper/AiSettingsDC_AiSettings.cs @@ -7,7 +7,6 @@ using BeWo.Data.Entities; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Wohnhilfe; namespace BeWo.Service.DCEntityMapper { diff --git a/Service/DCEntityMapper/CompactInvoiceBaseDC_InvoiceBase.cs b/Service/DCEntityMapper/CompactInvoiceBaseDC_InvoiceBase.cs index e24f8960e..7312f00e3 100644 --- a/Service/DCEntityMapper/CompactInvoiceBaseDC_InvoiceBase.cs +++ b/Service/DCEntityMapper/CompactInvoiceBaseDC_InvoiceBase.cs @@ -6,7 +6,6 @@ using BeWo.Data.Access; using BeWo.Data.Entities; using BS.Shared; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Light; using DevExpress.CodeParser; diff --git a/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs b/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs index 98629fb5d..42f0e782f 100644 --- a/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs +++ b/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using BS.Shared.DataContracts; using BeWo.Data.Access; using BeWo.Data.Entities; diff --git a/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs b/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs index 7c6bdf354..8e42416ab 100644 --- a/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs +++ b/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs @@ -6,7 +6,6 @@ using BeWo.Data.Entities; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Wohnhilfe; namespace BeWo.Service.DCEntityMapper diff --git a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs index f0339cd64..aab6b3388 100644 --- a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs +++ b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs @@ -3,7 +3,6 @@ using BeWo.Data.Entities; using BeWo.Data.Entities.Light; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.Extensions; using BS.Shared.Interface; diff --git a/Service/DCEntityMapper/GkvTransferProtokollDC_GkvTransferprotokoll.cs b/Service/DCEntityMapper/GkvTransferProtokollDC_GkvTransferprotokoll.cs index 34b8e990e..6eebbe581 100644 --- a/Service/DCEntityMapper/GkvTransferProtokollDC_GkvTransferprotokoll.cs +++ b/Service/DCEntityMapper/GkvTransferProtokollDC_GkvTransferprotokoll.cs @@ -1,7 +1,6 @@ using BeWo.Data.Access; using BeWo.Data.Entities; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.GkvAbrechnung; using NHibernate.Linq; using System; diff --git a/Service/DCEntityMapper/ImageDC_Image.cs b/Service/DCEntityMapper/ImageDC_Image.cs index a2f6a6536..a8e8f374e 100644 --- a/Service/DCEntityMapper/ImageDC_Image.cs +++ b/Service/DCEntityMapper/ImageDC_Image.cs @@ -7,7 +7,6 @@ using BeWo.Data.Entities; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Wohnhilfe; namespace BeWo.Service.DCEntityMapper { diff --git a/Service/DCEntityMapper/Light/GkvAbrechnungLightDC_GkvAbrechnungLight.cs b/Service/DCEntityMapper/Light/GkvAbrechnungLightDC_GkvAbrechnungLight.cs index c22aa778e..be5373b21 100644 --- a/Service/DCEntityMapper/Light/GkvAbrechnungLightDC_GkvAbrechnungLight.cs +++ b/Service/DCEntityMapper/Light/GkvAbrechnungLightDC_GkvAbrechnungLight.cs @@ -1,8 +1,6 @@ using BeWo.Data.Entities; using BeWo.Data.Entities.Light; using BS.Shared; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Light; using BS.Shared.Extensions; using System; diff --git a/Service/DCEntityMapper/Light/GkvTransferProtokollLightDC_GkvTransferprotokollLight.cs b/Service/DCEntityMapper/Light/GkvTransferProtokollLightDC_GkvTransferprotokollLight.cs index 80599ad95..a8b657e2c 100644 --- a/Service/DCEntityMapper/Light/GkvTransferProtokollLightDC_GkvTransferprotokollLight.cs +++ b/Service/DCEntityMapper/Light/GkvTransferProtokollLightDC_GkvTransferprotokollLight.cs @@ -1,9 +1,6 @@ using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Data.Entities.Light; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; -using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.DataContracts.Light; using NHibernate.Linq; using System; diff --git a/Service/DCEntityMapper/Light/InvoiceBaseLightDC_InvoiceBaseLight.cs b/Service/DCEntityMapper/Light/InvoiceBaseLightDC_InvoiceBaseLight.cs index 9b6b826ae..f3a7d95e4 100644 --- a/Service/DCEntityMapper/Light/InvoiceBaseLightDC_InvoiceBaseLight.cs +++ b/Service/DCEntityMapper/Light/InvoiceBaseLightDC_InvoiceBaseLight.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using BS.Shared.DataContracts; using BeWo.Data.Access; using BeWo.Data.Entities; using BS.Shared; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BS.Shared.DataContracts.Light; using BeWo.Data.Entities.Light; diff --git a/Service/DCEntityMapper/Light/OrganisationLightDC_OrganisationLight.cs b/Service/DCEntityMapper/Light/OrganisationLightDC_OrganisationLight.cs index 0895b67a2..e73bfe3e9 100644 --- a/Service/DCEntityMapper/Light/OrganisationLightDC_OrganisationLight.cs +++ b/Service/DCEntityMapper/Light/OrganisationLightDC_OrganisationLight.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using BS.Shared.DataContracts; using BeWo.Data.Access; using BeWo.Data.Entities; using BS.Shared; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BS.Shared.DataContracts.Light; using BeWo.Data.Entities.Light; diff --git a/Service/Dienstplanung/Mitarbeiterstundenkonto.cs b/Service/Dienstplanung/Mitarbeiterstundenkonto.cs index 1924976bf..50bca5ab1 100644 --- a/Service/Dienstplanung/Mitarbeiterstundenkonto.cs +++ b/Service/Dienstplanung/Mitarbeiterstundenkonto.cs @@ -6,7 +6,6 @@ using BS.Shared.Core; using BeWo.Data.Access; using BeWo.Data.Entities; using BS.Shared; -using BS.Shared.DataContracts; using BS.Shared.Extensions; using System.Diagnostics; diff --git a/Service/Import/Perseh/BereichMitZielenUndMassnahmen.cs b/Service/Import/Perseh/BereichMitZielenUndMassnahmen.cs index ae63ab1d1..6829cef0a 100644 --- a/Service/Import/Perseh/BereichMitZielenUndMassnahmen.cs +++ b/Service/Import/Perseh/BereichMitZielenUndMassnahmen.cs @@ -1,5 +1,4 @@ using BeWo.Data; -using BS.Shared.DataContracts; using DevExpress.Pdf; using System; using System.Collections.Generic; diff --git a/Service/Invoicing/EquityInvoiceCreation.cs b/Service/Invoicing/EquityInvoiceCreation.cs index 060ee401c..8ba9ab6a0 100644 --- a/Service/Invoicing/EquityInvoiceCreation.cs +++ b/Service/Invoicing/EquityInvoiceCreation.cs @@ -11,8 +11,6 @@ using BeWo.Service.ServiceImplementations; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BS.Shared.Services; diff --git a/Service/Invoicing/GeneralInvoiceCreation.cs b/Service/Invoicing/GeneralInvoiceCreation.cs index e3ed8daef..0520e6f58 100644 --- a/Service/Invoicing/GeneralInvoiceCreation.cs +++ b/Service/Invoicing/GeneralInvoiceCreation.cs @@ -11,8 +11,6 @@ using BeWo.Service.ServiceImplementations; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BS.Shared.Services; diff --git a/Service/Invoicing/IBPSettlementInvoiceCreation.cs b/Service/Invoicing/IBPSettlementInvoiceCreation.cs index bbd3f5a60..f4b06b032 100644 --- a/Service/Invoicing/IBPSettlementInvoiceCreation.cs +++ b/Service/Invoicing/IBPSettlementInvoiceCreation.cs @@ -5,7 +5,6 @@ using System.Text; using BeWo.Data.Entities; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; using BS.Shared.Services; namespace BeWo.Service.Invoicing diff --git a/Service/Invoicing/LVRInvoiceCreation.cs b/Service/Invoicing/LVRInvoiceCreation.cs index 5cce70b29..7f64a78c2 100644 --- a/Service/Invoicing/LVRInvoiceCreation.cs +++ b/Service/Invoicing/LVRInvoiceCreation.cs @@ -4,8 +4,6 @@ using System.Linq; using System.Text; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BS.Shared.Services; using BeWo.Data.Access; diff --git a/Service/Invoicing/SettlementInvoiceCreation.cs b/Service/Invoicing/SettlementInvoiceCreation.cs index 51f089f8b..fe27be3df 100644 --- a/Service/Invoicing/SettlementInvoiceCreation.cs +++ b/Service/Invoicing/SettlementInvoiceCreation.cs @@ -6,7 +6,6 @@ using BeWo.Service.Plugins; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BS.Shared.Services; using BeWo.Data; diff --git a/Service/MessageContracts/UploadImportFileResult.cs b/Service/MessageContracts/UploadImportFileResult.cs index 08cd07489..65a7ea924 100644 --- a/Service/MessageContracts/UploadImportFileResult.cs +++ b/Service/MessageContracts/UploadImportFileResult.cs @@ -1,6 +1,5 @@ using System.ServiceModel; -using BS.Shared.DataContracts; namespace BeWo.Service.MessageContracts { diff --git a/Service/Plugins/AiService.cs b/Service/Plugins/AiService.cs index 637faa5f4..3159d4dca 100644 --- a/Service/Plugins/AiService.cs +++ b/Service/Plugins/AiService.cs @@ -13,7 +13,6 @@ using BeWo.Service.ServiceContracts; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using Newtonsoft.Json; diff --git a/Service/Plugins/AiService2.cs b/Service/Plugins/AiService2.cs index eccf35c59..d6aa9ba25 100644 --- a/Service/Plugins/AiService2.cs +++ b/Service/Plugins/AiService2.cs @@ -22,7 +22,6 @@ using BeWo.Service.ServiceUtils; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Feature.AI; using BS.Shared.Exceptions; using BS.Shared.Extensions; diff --git a/Service/Plugins/OperationService.cs b/Service/Plugins/OperationService.cs index 2c914d4f8..b2fd93621 100644 --- a/Service/Plugins/OperationService.cs +++ b/Service/Plugins/OperationService.cs @@ -9,7 +9,6 @@ using BeWo.ServiceUtils.History; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; namespace BeWo.Service.Plugins diff --git a/Service/Plugins/SchulbegleitenderDienstService.cs b/Service/Plugins/SchulbegleitenderDienstService.cs index ef45aa6d2..6e21e96fe 100644 --- a/Service/Plugins/SchulbegleitenderDienstService.cs +++ b/Service/Plugins/SchulbegleitenderDienstService.cs @@ -9,7 +9,6 @@ using BeWo.ServiceUtils.History; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using DevExpress.Mvvm.Native; diff --git a/Service/Plugins/TimeSheetService.cs b/Service/Plugins/TimeSheetService.cs index 45932b3b6..ed1e8dc97 100644 --- a/Service/Plugins/TimeSheetService.cs +++ b/Service/Plugins/TimeSheetService.cs @@ -16,7 +16,6 @@ using BeWo.Service.Plugins; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using DevExpress.XtraReports.UI; diff --git a/Service/Plugins/TranslationDictionary.cs b/Service/Plugins/TranslationDictionary.cs index ac0b2b946..afdf1394e 100644 --- a/Service/Plugins/TranslationDictionary.cs +++ b/Service/Plugins/TranslationDictionary.cs @@ -8,7 +8,6 @@ using BeWo.Service.DCEntityMapper; using BS.Shared; using BS.Shared.Core; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; namespace BeWo.Service.Plugins diff --git a/Service/Plugins/VacationService.cs b/Service/Plugins/VacationService.cs index 30858aa92..0d20e290c 100644 --- a/Service/Plugins/VacationService.cs +++ b/Service/Plugins/VacationService.cs @@ -9,7 +9,6 @@ using BeWo.Service.ServiceImplementations; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; namespace BeWo.Service.Plugins diff --git a/Service/Security/Right2Methods.cs b/Service/Security/Right2Methods.cs index 76d40ad32..f88efba97 100644 --- a/Service/Security/Right2Methods.cs +++ b/Service/Security/Right2Methods.cs @@ -13,7 +13,6 @@ using BeWo.Data; using BeWo.Data.Access; using BeWo.Data.Entities; using BS.Shared; -using BS.Shared.DataContracts; namespace BeWo.Service.Security { diff --git a/Service/ServiceContracts/IAiEnhancedService.cs b/Service/ServiceContracts/IAiEnhancedService.cs index 998d5b80d..ecae32f2f 100644 --- a/Service/ServiceContracts/IAiEnhancedService.cs +++ b/Service/ServiceContracts/IAiEnhancedService.cs @@ -1,7 +1,6 @@ using BeWo.Data.Entities; using BS.Shared; using BS.Shared.Attributes; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Feature.AI; using System; using System.Collections.Generic; @@ -68,21 +67,21 @@ namespace BeWo.Service.ServiceContracts [FaultContract(typeof(BeWoFault))] [OperationContract] //[RequirePermission(UserRightType.AiModulePromptbausteineView)] - IEnumerable GetAiPromptbausteine(); + IEnumerable GetAiPromptbausteine(); [FaultContract(typeof(BeWoFault))] [OperationContract] - [RequirePermission(UserRightType.AiModulePromptbausteineAdd)] - IEnumerable CreateAiPromptbausteine(IEnumerable aiPromptbausteinDC); + //[RequirePermission(UserRightType.AiModulePromptbausteineAdd)] + IEnumerable CreateAiPromptbausteine(IEnumerable aiPromptbausteinDC); [FaultContract(typeof(BeWoFault))] [OperationContract] - [RequirePermission(UserRightType.AiModulePromptbausteineEdit)] - Dictionary UpdateAiPromptbausteine(IEnumerable aiPromptbausteinDCs); + //[RequirePermission(UserRightType.AiModulePromptbausteineEdit)] + Dictionary UpdateAiPromptbausteine(IEnumerable aiPromptbausteinDCs); [FaultContract(typeof(BeWoFault))] [OperationContract] - [RequirePermission(UserRightType.AiModulePromptbausteineRemove)] + //[RequirePermission(UserRightType.AiModulePromptbausteineRemove)] void DeleteAiPromptbausteine(Dictionary oid2version); } diff --git a/Service/ServiceContracts/IOperationsEnhancedService.cs b/Service/ServiceContracts/IOperationsEnhancedService.cs index 9465a3a95..45d7211f7 100644 --- a/Service/ServiceContracts/IOperationsEnhancedService.cs +++ b/Service/ServiceContracts/IOperationsEnhancedService.cs @@ -1,8 +1,6 @@ using BeWo.Data.Entities; using BS.Shared; using BS.Shared.Attributes; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Feature.AI; using System; using System.Collections.Generic; using System.Linq; diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs index ebe9ce08b..a801181de 100644 --- a/Service/ServiceImplementations/AccountingServiceImp.cs +++ b/Service/ServiceImplementations/AccountingServiceImp.cs @@ -4,7 +4,6 @@ using System.Linq; using System.ServiceModel; using BeWo.Data; using BeWo.Service.Plugins; -using BS.Shared.DataContracts.Compact; using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Service.Core; @@ -23,7 +22,6 @@ using Dakota.Models; using System.Net; using System.Collections.Specialized; using Newtonsoft.Json; -using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.Extensions; using BS.Shared.Exceptions; using BS.Shared.AppSender; diff --git a/Service/ServiceImplementations/AiEnhancedServiceImp.cs b/Service/ServiceImplementations/AiEnhancedServiceImp.cs index 52ba6c6d1..fd0845989 100644 --- a/Service/ServiceImplementations/AiEnhancedServiceImp.cs +++ b/Service/ServiceImplementations/AiEnhancedServiceImp.cs @@ -2,7 +2,6 @@ using BeWo.Service.Plugins; using BeWo.Service.ServiceContracts; using BS.Shared; -using BS.Shared.DataContracts; using BS.Shared.DataContracts.Feature.AI; using System.Collections.Generic; using System.ServiceModel; @@ -47,24 +46,24 @@ namespace BeWo.Service.ServiceImplementations return plugin; } - public IEnumerable GetAiPromptbausteine() + public IEnumerable GetAiPromptbausteine() { - var dc = new AiPromptbausteinDC(); + var dc = new AiPromptbausteinTreeDC(); - dc.Oid = 1; - dc.IsParent = false; - dc.Version = 1; - dc.Text = "Beispiel"; + //dc.Oid = 1; + //dc.IsParent = false; + //dc.Version = 1; + //dc.Text = "Beispiel"; - return new List { dc }; + return new List { dc }; } - public IEnumerable CreateAiPromptbausteine(IEnumerable aiPromptbausteinDC) + public IEnumerable CreateAiPromptbausteine(IEnumerable aiPromptbausteinDC) { throw new System.NotImplementedException(); } - public Dictionary UpdateAiPromptbausteine(IEnumerable aiPromptbausteinDCs) + public Dictionary UpdateAiPromptbausteine(IEnumerable aiPromptbausteinDCs) { throw new System.NotImplementedException(); } diff --git a/Service/ServiceImplementations/GkvAccountingServiceImp.cs b/Service/ServiceImplementations/GkvAccountingServiceImp.cs index c942763f3..dc7ffef55 100644 --- a/Service/ServiceImplementations/GkvAccountingServiceImp.cs +++ b/Service/ServiceImplementations/GkvAccountingServiceImp.cs @@ -11,7 +11,6 @@ using BS.Shared.AppSender; using BS.Shared.Attributes; using BS.Shared.Core; using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.DataContracts.Light; using BS.Shared.Exceptions; diff --git a/Service/ServiceImplementations/OperationsEnhancedServiceImp.cs b/Service/ServiceImplementations/OperationsEnhancedServiceImp.cs index 20c0c4cde..c24a7c401 100644 --- a/Service/ServiceImplementations/OperationsEnhancedServiceImp.cs +++ b/Service/ServiceImplementations/OperationsEnhancedServiceImp.cs @@ -5,8 +5,6 @@ using BeWo.Data.Security; using BeWo.Service.DCEntityMapper; using BeWo.Service.ServiceContracts; using BS.Shared; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Feature.AI; using DevExpress.Entity.Model.Metadata; using Newtonsoft.Json; using System; diff --git a/Service/ServiceUtils/DistanceCalculator/GoogleDistanceMatrixAPI.cs b/Service/ServiceUtils/DistanceCalculator/GoogleDistanceMatrixAPI.cs index f5d493ac2..89f0caaf4 100644 --- a/Service/ServiceUtils/DistanceCalculator/GoogleDistanceMatrixAPI.cs +++ b/Service/ServiceUtils/DistanceCalculator/GoogleDistanceMatrixAPI.cs @@ -1,5 +1,4 @@ using BeWo.Data.Entities; -using BS.Shared.DataContracts; using Newtonsoft.Json; using System; using System.Collections.Generic; diff --git a/Service/ServiceUtils/DistanceCalculator/IDistanceAPI.cs b/Service/ServiceUtils/DistanceCalculator/IDistanceAPI.cs index 9204b8712..6b654acbc 100644 --- a/Service/ServiceUtils/DistanceCalculator/IDistanceAPI.cs +++ b/Service/ServiceUtils/DistanceCalculator/IDistanceAPI.cs @@ -1,5 +1,4 @@ using BeWo.Data.Entities; -using BS.Shared.DataContracts; using System; using System.Collections.Generic; using System.Linq; diff --git a/Shared/Core/ApiResponseUtils.cs b/Shared/Core/ApiResponseUtils.cs index d5c691a64..4ccda0532 100644 --- a/Shared/Core/ApiResponseUtils.cs +++ b/Shared/Core/ApiResponseUtils.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Shared/Core/Validator.cs b/Shared/Core/Validator.cs index 24acd3b4a..e64b45779 100644 --- a/Shared/Core/Validator.cs +++ b/Shared/Core/Validator.cs @@ -1,5 +1,4 @@ using BS.Shared.DataContracts; -using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.Exceptions; using BS.Shared.Interface; using System; diff --git a/Shared/Core/ValidatorExtended.cs b/Shared/Core/ValidatorExtended.cs index e8b008b28..84b1a66d5 100644 --- a/Shared/Core/ValidatorExtended.cs +++ b/Shared/Core/ValidatorExtended.cs @@ -1,6 +1,4 @@ -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.GkvAbrechnung; -using BS.Shared.Exceptions; +using BS.Shared.Exceptions; using BS.Shared.Extensions; using BS.Shared.Interface; using System; diff --git a/Shared/DataContracts/AdditionalServiceBookingDC.cs b/Shared/DataContracts/AdditionalServiceBookingDC.cs index a7649805e..519dd7b7c 100644 --- a/Shared/DataContracts/AdditionalServiceBookingDC.cs +++ b/Shared/DataContracts/AdditionalServiceBookingDC.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Runtime.Serialization; -using BS.Shared.DataContracts.Compact; namespace BS.Shared.DataContracts { diff --git a/Shared/DataContracts/BargeldtransaktionDC.cs b/Shared/DataContracts/BargeldtransaktionDC.cs index 40995ca43..35ed0731c 100644 --- a/Shared/DataContracts/BargeldtransaktionDC.cs +++ b/Shared/DataContracts/BargeldtransaktionDC.cs @@ -1,6 +1,5 @@ using System; using System.Runtime.Serialization; -using BS.Shared.DataContracts.Compact; namespace BS.Shared.DataContracts { diff --git a/Shared/DataContracts/BeWoDataContract.cs b/Shared/DataContracts/BeWoDataContract.cs index bb68c201c..6ee84d1b3 100644 --- a/Shared/DataContracts/BeWoDataContract.cs +++ b/Shared/DataContracts/BeWoDataContract.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; namespace BS.Shared.DataContracts { - [DataContract] public abstract class BeWoDataContract : IDataContract { diff --git a/Shared/DataContracts/BeWoRefDC.cs b/Shared/DataContracts/BeWoRefDC.cs new file mode 100644 index 000000000..624506bdf --- /dev/null +++ b/Shared/DataContracts/BeWoRefDC.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace BS.Shared.DataContracts +{ + [DataContract] + public class BeWoRefDC + { + public BeWoRefDC() + { + + } + public BeWoRefDC(long oid, long? version = null) + { + Oid = oid; + Version = version; + } + + [DataMember] public long Oid { get; set; } + [DataMember] public long? Version { get; set; } + } +} diff --git a/Shared/DataContracts/ClientPartials/AdditionalServiceGroupOfPeopleRelationDC.cs b/Shared/DataContracts/ClientPartials/AdditionalServiceGroupOfPeopleRelationDC.cs index 84cd6ab9f..70eb6b628 100644 --- a/Shared/DataContracts/ClientPartials/AdditionalServiceGroupOfPeopleRelationDC.cs +++ b/Shared/DataContracts/ClientPartials/AdditionalServiceGroupOfPeopleRelationDC.cs @@ -1,5 +1,4 @@ using BS.Shared.Core; -using BS.Shared.DataContracts.Compact; namespace BS.Shared.DataContracts { diff --git a/Shared/DataContracts/DienstplanerRootDC.cs b/Shared/DataContracts/DienstplanerRootDC.cs index 9d98c108c..0b3b12fdb 100644 --- a/Shared/DataContracts/DienstplanerRootDC.cs +++ b/Shared/DataContracts/DienstplanerRootDC.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; diff --git a/Shared/DataContracts/Feature/AI/AiConversationMessageDC.cs b/Shared/DataContracts/Feature/AI/AiConversationMessageDC.cs index 1429b0f58..d4ec5ff0c 100644 --- a/Shared/DataContracts/Feature/AI/AiConversationMessageDC.cs +++ b/Shared/DataContracts/Feature/AI/AiConversationMessageDC.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Feature.AI; -using BS.Shared.Interface.Feature.AICore; +using BS.Shared.Interface.Feature.AICore; using Newtonsoft.Json; using System; using System.Collections.Generic; @@ -8,7 +7,7 @@ using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; -namespace BS.Shared.DataContracts +namespace BS.Shared.DataContracts.Feature.AI { [DataContract] public class AiConversationMessageDC : BeWoDataContract, IAiConversationMessage diff --git a/Shared/DataContracts/AiPromptbausteinTreeDC.cs b/Shared/DataContracts/Feature/AI/AiPromptbausteinTreeDC.cs similarity index 94% rename from Shared/DataContracts/AiPromptbausteinTreeDC.cs rename to Shared/DataContracts/Feature/AI/AiPromptbausteinTreeDC.cs index 088183852..7158b63b7 100644 --- a/Shared/DataContracts/AiPromptbausteinTreeDC.cs +++ b/Shared/DataContracts/Feature/AI/AiPromptbausteinTreeDC.cs @@ -4,7 +4,7 @@ using System.Runtime.Serialization; using BS.Shared.DataContracts.Compact; -namespace BS.Shared.DataContracts +namespace BS.Shared.DataContracts.Feature.AI { [DataContract] public partial class AiPromptbausteinTreeDC : BeWoDataContract diff --git a/Shared/DataContracts/Feature/AI/Functions/ServiceRecords/AiFunctionDocRequest.cs b/Shared/DataContracts/Feature/AI/Functions/ServiceRecords/AiFunctionDocRequest.cs new file mode 100644 index 000000000..f951bd0ab --- /dev/null +++ b/Shared/DataContracts/Feature/AI/Functions/ServiceRecords/AiFunctionDocRequest.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace BS.Shared.DataContracts.Feature.AI.Functions.ServiceRecords +{ + [DataContract] + public class AiFunctionDocRequest + { + [DataMember] + public BeWoRefDC SupportConcept { get; set; } + + [DataMember] + public BeWoRefDC AiPromptbaustein { get; set; } + + [DataMember] + public string Dokumentation { get; set; } + } +} diff --git a/Shared/DataContracts/Feature/Wohnhilfe/CustomerWohnhilfeDC.cs b/Shared/DataContracts/Feature/Wohnhilfe/CustomerWohnhilfeDC.cs index 0853697a8..480be0dd8 100644 --- a/Shared/DataContracts/Feature/Wohnhilfe/CustomerWohnhilfeDC.cs +++ b/Shared/DataContracts/Feature/Wohnhilfe/CustomerWohnhilfeDC.cs @@ -1,5 +1,4 @@ using BS.Shared.Core; -using BS.Shared.DataContracts.Wohnhilfe; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Shared/DataContracts/FlexibleReportDummyDC.cs b/Shared/DataContracts/FlexibleReportDummyDC.cs index 1cd6cb41b..0dd57126a 100644 --- a/Shared/DataContracts/FlexibleReportDummyDC.cs +++ b/Shared/DataContracts/FlexibleReportDummyDC.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; diff --git a/Shared/DataContracts/FlexibleReportEntryDC.cs b/Shared/DataContracts/FlexibleReportEntryDC.cs index 0d4cfe95a..b86f2a68e 100644 --- a/Shared/DataContracts/FlexibleReportEntryDC.cs +++ b/Shared/DataContracts/FlexibleReportEntryDC.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using BS.Shared; +using BS.Shared; using System; using System.Collections.Generic; using System.Linq; diff --git a/Shared/DataContracts/FlexibleReportFilterDC.cs b/Shared/DataContracts/FlexibleReportFilterDC.cs index b1ce0c45d..9fc2d4764 100644 --- a/Shared/DataContracts/FlexibleReportFilterDC.cs +++ b/Shared/DataContracts/FlexibleReportFilterDC.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; diff --git a/Shared/DataContracts/FlexibleReportResultDC.cs b/Shared/DataContracts/FlexibleReportResultDC.cs index b28c28944..828136ff2 100644 --- a/Shared/DataContracts/FlexibleReportResultDC.cs +++ b/Shared/DataContracts/FlexibleReportResultDC.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; diff --git a/Shared/DataContracts/GoalRatingDC.cs b/Shared/DataContracts/GoalRatingDC.cs index 7fa32ba1c..f266a677e 100644 --- a/Shared/DataContracts/GoalRatingDC.cs +++ b/Shared/DataContracts/GoalRatingDC.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Runtime.Serialization; -using BS.Shared.DataContracts.Compact; namespace BS.Shared.DataContracts { diff --git a/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvAbrechnungDC.cs b/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvAbrechnungDC.cs index b02330e00..898ebb725 100644 --- a/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvAbrechnungDC.cs +++ b/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvAbrechnungDC.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; -using BS.Shared.DataContracts.Compact; using BS.Shared.Interface; namespace BS.Shared.DataContracts.GkvAbrechnung diff --git a/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvClientSumResponseJson.cs b/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvClientSumResponseJson.cs index 57c9164a7..9fd922229 100644 --- a/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvClientSumResponseJson.cs +++ b/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvClientSumResponseJson.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using Newtonsoft.Json; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; diff --git a/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvTransferProtokollDC.cs b/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvTransferProtokollDC.cs index 195cbb849..1d01cb206 100644 --- a/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvTransferProtokollDC.cs +++ b/Shared/DataContracts/Invoicing/GkvAbrechnung/GkvTransferProtokollDC.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Runtime.Serialization; -using BS.Shared.DataContracts.Compact; using BS.Shared.Interface; namespace BS.Shared.DataContracts.GkvAbrechnung diff --git a/Shared/DataContracts/Light/GkvAbrechnungLightDC.cs b/Shared/DataContracts/Light/GkvAbrechnungLightDC.cs index 849478550..5d45f3652 100644 --- a/Shared/DataContracts/Light/GkvAbrechnungLightDC.cs +++ b/Shared/DataContracts/Light/GkvAbrechnungLightDC.cs @@ -1,6 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using BS.Shared.DataContracts.GkvAbrechnung; -using BS.Shared.Interface; +using BS.Shared.Interface; using System; using System.Collections.Generic; using System.Linq; diff --git a/Shared/DataContracts/NotizenEintragDC.cs b/Shared/DataContracts/NotizenEintragDC.cs index 3f1ef92c3..2fc4f9871 100644 --- a/Shared/DataContracts/NotizenEintragDC.cs +++ b/Shared/DataContracts/NotizenEintragDC.cs @@ -1,6 +1,5 @@ using System; using System.Runtime.Serialization; -using BS.Shared.DataContracts.Compact; namespace BS.Shared.DataContracts { diff --git a/Shared/DataContracts/RatingDC.cs b/Shared/DataContracts/RatingDC.cs index a5640882d..3c6b6c30a 100644 --- a/Shared/DataContracts/RatingDC.cs +++ b/Shared/DataContracts/RatingDC.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Runtime.Serialization; -using BS.Shared.DataContracts.Compact; namespace BS.Shared.DataContracts { diff --git a/Shared/DataContracts/Reports/AccountingReportDC.cs b/Shared/DataContracts/Reports/AccountingReportDC.cs index 5291d3a6d..8c96e0520 100644 --- a/Shared/DataContracts/Reports/AccountingReportDC.cs +++ b/Shared/DataContracts/Reports/AccountingReportDC.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Runtime.Serialization; -using BS.Shared.DataContracts.Compact; namespace BS.Shared.DataContracts.Reports { diff --git a/Shared/DataContracts/UrlaubsplanerRootDC.cs b/Shared/DataContracts/UrlaubsplanerRootDC.cs index 3e89dda87..797ee2b4a 100644 --- a/Shared/DataContracts/UrlaubsplanerRootDC.cs +++ b/Shared/DataContracts/UrlaubsplanerRootDC.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.Compact; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; diff --git a/Shared/Extensions/GkvAbrechnungExtensions.cs b/Shared/Extensions/GkvAbrechnungExtensions.cs index 21b967856..e696f4762 100644 --- a/Shared/Extensions/GkvAbrechnungExtensions.cs +++ b/Shared/Extensions/GkvAbrechnungExtensions.cs @@ -1,5 +1,4 @@ -using BS.Shared.DataContracts.GkvAbrechnung; -using BS.Shared.Interface; +using BS.Shared.Interface; using System; using System.Collections.Generic; using System.Linq; diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index f2439caa1..e5756e1d1 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -183,7 +183,8 @@ - + + @@ -202,6 +203,7 @@ + diff --git a/WohneinheitUnitTest/WohneinheitUnitTest1.cs b/WohneinheitUnitTest/WohneinheitUnitTest1.cs index 9c2544ebc..faa21fe13 100644 --- a/WohneinheitUnitTest/WohneinheitUnitTest1.cs +++ b/WohneinheitUnitTest/WohneinheitUnitTest1.cs @@ -1,6 +1,5 @@ using BeWo.Data.Access; using BeWo.Data.Entities; -using BS.Shared.DataContracts; using Microsoft.VisualStudio.TestTools.UnitTesting; using System;