diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index eb152e13b..6f17efee4 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -272,6 +272,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -428,7 +432,7 @@ MSBuild:Compile Designer - + Designer MSBuild:Compile @@ -557,6 +561,7 @@ + EnterTenantDialog.xaml @@ -698,7 +703,7 @@ - + @@ -723,7 +728,7 @@ - + BargeldkassenView.xaml @@ -734,6 +739,9 @@ ChatProgressBarView.xaml + + TextModuleTreeViewControl.xaml + ServiceRecordRTFWindowView.xaml @@ -857,8 +865,8 @@ MedikamentenverordnungslistenEditView.xaml - - TextbausteinView.xaml + + TextModuleView.xaml ChatView.xaml @@ -920,7 +928,7 @@ ResourcesTreeSearchView.xaml - + SupportEMailControl.xaml @@ -933,6 +941,7 @@ ReportView.xaml + diff --git a/BeWo/Converter/BoolReverseConverter.cs b/BeWo/Converter/BoolReverseConverter.cs index 596d58877..022d53c7e 100644 --- a/BeWo/Converter/BoolReverseConverter.cs +++ b/BeWo/Converter/BoolReverseConverter.cs @@ -10,7 +10,7 @@ namespace BeWo.Converter { if (value is bool) { - return !((bool) value); + return !(bool) value; } return false; diff --git a/BeWo/Converter/BoolVisibilityConverter.cs b/BeWo/Converter/BoolVisibilityConverter.cs index ce68fff68..608be9519 100644 --- a/BeWo/Converter/BoolVisibilityConverter.cs +++ b/BeWo/Converter/BoolVisibilityConverter.cs @@ -14,18 +14,19 @@ namespace BeWo.Converter return Visibility.Visible; } - bool lMode = true; - if (parameter is string) + var lMode = true; + var s = parameter as string; + if (s != null) { - bool.TryParse((string) parameter, out lMode); + bool.TryParse(s, out lMode); } if (lMode) { - return (!(bool)value) ? Visibility.Collapsed : Visibility.Visible; + return !(bool)value ? Visibility.Collapsed : Visibility.Visible; } - return ((bool)value) ? Visibility.Collapsed : Visibility.Visible; + return (bool)value ? Visibility.Collapsed : Visibility.Visible; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/BeWo/Core/Service/GoalService.cs b/BeWo/Core/Service/GoalService.cs index a0fdc781f..40db6eebc 100644 --- a/BeWo/Core/Service/GoalService.cs +++ b/BeWo/Core/Service/GoalService.cs @@ -14,7 +14,7 @@ namespace BeWo.Core.Service { public static List GetGoalTree(IEnumerable goalCategories, List indGoalCategories, List pAllGoals, bool removeEmptyGoalCategories) { - List allCategories = new List(); + var allCategories = new List(); if (goalCategories != null && pAllGoals != null && pAllGoals.Count > 0) { foreach (var goalCat in goalCategories) @@ -41,8 +41,6 @@ namespace BeWo.Core.Service } } - - var sortedCategories = allCategories.OrderBy(s => s.TypeDescription).ToList(); var sortedGoals = pAllGoals.OrderBy(s => s.TypeDescription).ToList(); @@ -122,12 +120,15 @@ namespace BeWo.Core.Service private static void RemoveCategoriesWithoutSelectedGoals(ICollection goalList, List sortedGoals) { var cats2Remove = new List(); + foreach (var cat in goalList) { RemoveCategoriesWithoutSelectedGoals(cat.Children, sortedGoals); if (!ContainsAnyGoal(cat, sortedGoals)) + { cats2Remove.Add(cat); + } } foreach (var cat in cats2Remove) @@ -136,7 +137,6 @@ namespace BeWo.Core.Service } } - private static bool ContainsAnyGoal(SupportConceptGoalDC cat, IEnumerable goals) { foreach (var goal in goals) @@ -271,6 +271,7 @@ namespace BeWo.Core.Service } private static List InsertedGoals; + public static IEnumerable SaveIndividualGoalsAndMassnahmenRecursively(SupportConceptGoalTreeItem treeItem) { InsertedGoals = new List(); diff --git a/BeWo/Core/Service/SupportConceptService.cs b/BeWo/Core/Service/SupportConceptService.cs index e3a5d25e4..b91d3e9b0 100644 --- a/BeWo/Core/Service/SupportConceptService.cs +++ b/BeWo/Core/Service/SupportConceptService.cs @@ -174,89 +174,92 @@ namespace BeWo.Core.Service } } - public static List CreateServiceTree(IList serviceCategories, IList serviceDescriptions, IList serviceAccountings) - { - List treeList = new List(); + public static List CreateServiceTree(IList serviceCategories, IList serviceDescriptions, IList serviceAccountings) + { + var treeList = new List(); - if (serviceCategories != null && serviceDescriptions != null) - { - List sortedCategories = serviceCategories.Where(sd => !sd.OhneHilfeplan.HasValue ||sd.OhneHilfeplan.Value == AccountingvisibilityType.Beides || sd.OhneHilfeplan.Value == AccountingvisibilityType.NurKlientenbezogen).OrderBy(s => s.Name).ToList(); - List serviceAccountingsCopy = new List(); - List descriptions = serviceDescriptions.OrderBy(s => s.Name).ToList(); + if(serviceCategories != null && serviceDescriptions != null) + { + var sortedCategories = serviceCategories.Where(sd => !sd.OhneHilfeplan.HasValue || sd.OhneHilfeplan.Value == AccountingvisibilityType.Beides || sd.OhneHilfeplan.Value == AccountingvisibilityType.NurKlientenbezogen).OrderBy(s => s.Name).ToList(); + var serviceAccountingsCopy = new List(); + var descriptions = serviceDescriptions.OrderBy(s => s.Name).ToList(); - if (serviceAccountings != null) - { - foreach (var serviceAccountingDc in serviceAccountings) - { - descriptions.Remove(serviceAccountingDc.ServiceDescription); - serviceAccountingsCopy.Add(serviceAccountingDc); - } - } + if(serviceAccountings != null) + { + foreach(var serviceAccountingDc in serviceAccountings) + { + descriptions.Remove(serviceAccountingDc.ServiceDescription); + serviceAccountingsCopy.Add(serviceAccountingDc); + } + } - foreach (var serviceDescriptionDc in descriptions) - { - ServiceAccountingDC accountingDc = new ServiceAccountingDC(); - accountingDc.ServiceDescription = serviceDescriptionDc; + foreach(var serviceDescriptionDc in descriptions) + { + var accountingDc = new ServiceAccountingDC(); + accountingDc.ServiceDescription = serviceDescriptionDc; - serviceAccountingsCopy.Add(accountingDc); - } - List sortedAccountings = serviceAccountingsCopy.OrderBy(acc => acc.ServiceDescription.Name).ToList(); + serviceAccountingsCopy.Add(accountingDc); + } - Dictionary categoryDict = new Dictionary(); + var sortedAccountings = serviceAccountingsCopy.OrderBy(acc => acc.ServiceDescription.Name).ToList(); - foreach (ServiceCategoryDC category in sortedCategories) - { - ServiceCategoryTreeItem treeItem = new ServiceCategoryTreeItem(); - treeItem.ServiceCategory = category; - treeItem.IsExpanded = true; - categoryDict.Add(category.ServiceCategoryOid.Value, treeItem); - treeList.Add(treeItem); - } + var categoryDict = new Dictionary(); - foreach (ServiceAccountingDC sa in sortedAccountings) - { - ServiceCategoryTreeItem childItem = new ServiceCategoryTreeItem(); - childItem.ServiceAccounting = sa; + foreach(var category in sortedCategories) + { + var treeItem = new ServiceCategoryTreeItem + { + ServiceCategory = category, + IsExpanded = true + }; - if (sa.ServiceDescription.Category != null && categoryDict.ContainsKey(sa.ServiceDescription.Category.ServiceCategoryOid.Value)) - { - ServiceCategoryTreeItem parentItem = categoryDict[sa.ServiceDescription.Category.ServiceCategoryOid.Value]; - childItem.Parent = parentItem; + categoryDict.Add(category.ServiceCategoryOid.Value, treeItem); + treeList.Add(treeItem); + } - //if (selectedDescriptions != null) - //{ - // foreach (var existingSd in selectedDescriptions) - // { - // if (existingSd.Equals(sd)) - // { - // childItem.IsChecked = true; - // } - // } + foreach(var sa in sortedAccountings) + { + var childItem = new ServiceCategoryTreeItem {ServiceAccounting = sa}; - // childItem.PropertyChanged += (s, e) => - // { - // ServiceCategoryTreeItem selectedSd = s as ServiceCategoryTreeItem; - // if (selectedSd != null && selectedSd.ServiceDescription != null) - // { - // if (selectedSd.IsChecked) - // { - // selectedDescriptions.Add(selectedSd.ServiceDescription); - // } - // else - // { - // selectedDescriptions.Remove(selectedSd.ServiceDescription); - // } - // } - // }; - //} + if(sa.ServiceDescription.Category != null && categoryDict.ContainsKey(sa.ServiceDescription.Category.ServiceCategoryOid.Value)) + { + var parentItem = categoryDict[sa.ServiceDescription.Category.ServiceCategoryOid.Value]; + childItem.Parent = parentItem; - parentItem.Children.Add(childItem); - } - } - } + //if (selectedDescriptions != null) + //{ + // foreach (var existingSd in selectedDescriptions) + // { + // if (existingSd.Equals(sd)) + // { + // childItem.IsChecked = true; + // } + // } - return treeList; - } + // childItem.PropertyChanged += (s, e) => + // { + // ServiceCategoryTreeItem selectedSd = s as ServiceCategoryTreeItem; + // if (selectedSd != null && selectedSd.ServiceDescription != null) + // { + // if (selectedSd.IsChecked) + // { + // selectedDescriptions.Add(selectedSd.ServiceDescription); + // } + // else + // { + // selectedDescriptions.Remove(selectedSd.ServiceDescription); + // } + // } + // }; + //} + + parentItem.Children.Add(childItem); + } + } + } + + return treeList; + } public static FlatSupportConceptTreeNodeDC CreateFlatSupportConceptItem(CompactSupportConceptDC dc, CompactOrganisationDC orga) { diff --git a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs index 9430a7eba..70e0074ce 100644 --- a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs +++ b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs @@ -139,7 +139,7 @@ namespace BeWo.Scheduler.ViewModel { SchedulerAppointmentVM found = null; - foreach (var vm in Appointments.OfType().Where(vm => vm.DataContract.Equals(dc))) + foreach (var vm in Appointments.OfType().Where(vm => vm.DataContract != null && vm.DataContract.Equals(dc))) { found = vm; } diff --git a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstBearbeitungsView.xaml.cs b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstBearbeitungsView.xaml.cs index b365b4e69..7e54fa3e3 100644 --- a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstBearbeitungsView.xaml.cs +++ b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstBearbeitungsView.xaml.cs @@ -272,7 +272,7 @@ namespace BeWo.SchulbegleitenderDienst public void GetAllTokensAndSetAll() { // var x = - ServiceFacade.DoOperationsServiceAsync(r => r.GetAllTokens(SchulbegleitenderZugehörigkeitsTyp.Klient, _klientOid), x => this.Dispatch( + ServiceFacade.DoOperationsServiceAsync(r => r.GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp.Klient, _klientOid), x => this.Dispatch( delegate { List wunschliste = new List(); @@ -312,7 +312,7 @@ namespace BeWo.SchulbegleitenderDienst //var x = ServiceFacade.DoOperationsServiceAsync( - r => r.GetAllTokens(SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter, 0), x =>this.Dispatch(delegate + r => r.GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter, 0), x =>this.Dispatch(delegate { List wunschliste = new List(); List ausschlussliste = new List(); diff --git a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstMitarbeiterBearbeitungsView.xaml.cs b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstMitarbeiterBearbeitungsView.xaml.cs index 74d1fb2d1..e7c28c1a7 100644 --- a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstMitarbeiterBearbeitungsView.xaml.cs +++ b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstMitarbeiterBearbeitungsView.xaml.cs @@ -126,7 +126,7 @@ namespace BeWo.SchulbegleitenderDienst private void SetMitarbeiterKriteria() { - var tokenlist = ServiceFacade.DoOperationsServiceSync(r => r.GetAllTokens(SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter, _employeeOid)); + var tokenlist = ServiceFacade.DoOperationsServiceSync(r => r.GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter, _employeeOid)); foreach (var tkList in tokenlist) { @@ -151,7 +151,7 @@ namespace BeWo.SchulbegleitenderDienst ServiceFacade.DoOperationsServiceAsync( - r => r.GetAllTokens(SchulbegleitenderZugehörigkeitsTyp.Klient, 0), x => this.Dispatch(delegate + r => r.GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp.Klient, 0), x => this.Dispatch(delegate { List wunschliste = new List(); List ausschlussliste = new List(); diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index a591b22ea..0df74b149 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -2888,24 +2888,24 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateBeWoFoldersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void UpdateBeWoFolders(System.Collections.Generic.List dcs); - // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadDocument) übereinstimmt. + // CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadDocument) [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadDocument", ReplyAction="http://tempuri.org/IStreamingService/UploadDocumentResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BeWo.ServiceProxy.UploadResult UploadDocument(BeWo.ServiceProxy.UploadPackage request); - // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UpdatePackage) von Nachricht "UpdatePackage" nicht mit dem Standardwert (UpdateDocument) übereinstimmt. + // CODEGEN: Generating message contract since the wrapper name (UpdatePackage) of message UpdatePackage does not match the default value (UpdateDocument) [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UpdateDocument", ReplyAction="http://tempuri.org/IStreamingService/UpdateDocumentResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BeWo.ServiceProxy.UploadResult UpdateDocument(BeWo.ServiceProxy.UpdatePackage request); - // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadChatPackage) von Nachricht "UploadChatPackage" nicht mit dem Standardwert (CreateNewSpeziallStreamChatMessagesDC) übereinstimmt. + // CODEGEN: Generating message contract since the wrapper name (UploadChatPackage) of message UploadChatPackage does not match the default value (CreateNewSpeziallStreamChatMessagesDC) [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDC", ReplyAction="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCRespons" + "e")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCBeWoFau" + "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BeWo.ServiceProxy.UploadChatResult CreateNewSpeziallStreamChatMessagesDC(BeWo.ServiceProxy.UploadChatPackage request); - // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadImportFile) übereinstimmt. + // CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadImportFile) [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadImportFile", ReplyAction="http://tempuri.org/IStreamingService/UploadImportFileResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadImportFileBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BeWo.ServiceProxy.UploadImportFileResult UploadImportFile(BeWo.ServiceProxy.UploadPackage request); @@ -4000,6 +4000,11 @@ namespace BeWo.ServiceProxy public interface IOperationsService { + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipient", ReplyAction="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipientResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipientBeWoFault" + + "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List FindUnreadChatMessagesForRecipient(long personOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDCResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewEmployeeAPPCodeDC(long employeeOid); @@ -4100,7 +4105,7 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllTokens", ReplyAction="http://tempuri.org/IOperationsService/GetAllTokensResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllTokensBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List GetAllTokens(BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid); + System.Collections.Generic.List GetAllTokens(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteToken", ReplyAction="http://tempuri.org/IOperationsService/DeleteTokenResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteTokenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] @@ -4108,15 +4113,15 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeletTokenRelation", ReplyAction="http://tempuri.org/IOperationsService/DeletTokenRelationResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeletTokenRelationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - void DeletTokenRelation(BS.Shared.DataContracts.Compact.CompactTokenDC token, System.Nullable oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp typ); + void DeletTokenRelation(BS.Shared.DataContracts.Compact.CompactTokenDC token, System.Nullable oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp typ); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewToken", ReplyAction="http://tempuri.org/IOperationsService/InsertNewTokenResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewTokenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - void InsertNewToken(string beschreibung, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid); + void InsertNewToken(string beschreibung, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewRelationToken", ReplyAction="http://tempuri.org/IOperationsService/InsertNewRelationTokenResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewRelationTokenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - void InsertNewRelationToken(BS.Shared.DataContracts.Compact.CompactTokenDC token, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid); + void InsertNewRelationToken(BS.Shared.DataContracts.Compact.CompactTokenDC token, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateToken", ReplyAction="http://tempuri.org/IOperationsService/UpdateTokenResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateTokenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] @@ -4142,11 +4147,11 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoTokenWunschOperation", ReplyAction="http://tempuri.org/IOperationsService/DoTokenWunschOperationResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoTokenWunschOperationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - void DoTokenWunschOperation(int art, System.Nullable Oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary verfuegbarerWunschToken, string token); + void DoTokenWunschOperation(int art, System.Nullable Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary verfuegbarerWunschToken, string token); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoTokenAusschlussOperation", ReplyAction="http://tempuri.org/IOperationsService/DoTokenAusschlussOperationResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoTokenAusschlussOperationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - void DoTokenAusschlussOperation(int art, System.Nullable Oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary verfuegbarerAusschlussToken, string token); + void DoTokenAusschlussOperation(int art, System.Nullable Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary verfuegbarerAusschlussToken, string token); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateServiceDescriptions", ReplyAction="http://tempuri.org/IOperationsService/UpdateServiceDescriptionsResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateServiceDescriptionsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] @@ -4397,26 +4402,30 @@ namespace BeWo.ServiceProxy "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List FindServiceRecordsForLastDays(System.Nullable costbearer2SupportConceptOid, int days, System.Nullable employeeOid); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllTextbausteine", ReplyAction="http://tempuri.org/IOperationsService/GetAllTextbausteineResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllTextbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List GetAllTextbausteine(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllTextModules", ReplyAction="http://tempuri.org/IOperationsService/GetAllTextModulesResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllTextModulesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetAllTextModules(); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewTextbausteine", ReplyAction="http://tempuri.org/IOperationsService/InsertNewTextbausteineResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewTextbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List InsertNewTextbausteine(System.Collections.Generic.List pTextbausteine); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetTextModules", ReplyAction="http://tempuri.org/IOperationsService/GetTextModulesResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetTextModulesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetTextModules(bool pShouldShowAllTextModules, long pEmployeeOid, bool pHasRightToSeeAllTextModules, bool pIsInAdministrationView); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateTextbausteine", ReplyAction="http://tempuri.org/IOperationsService/UpdateTextbausteineResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateTextbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - void UpdateTextbausteine(System.Collections.Generic.List pTextbausteine); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewTextModules", ReplyAction="http://tempuri.org/IOperationsService/InsertNewTextModulesResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewTextModulesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List InsertNewTextModules(System.Collections.Generic.List pTextbausteine); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteTextbausteine", ReplyAction="http://tempuri.org/IOperationsService/DeleteTextbausteineResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteTextbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - void DeleteTextbausteine(System.Collections.Generic.Dictionary pOid2Version); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateTextModules", ReplyAction="http://tempuri.org/IOperationsService/UpdateTextModulesResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateTextModulesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void UpdateTextModules(System.Collections.Generic.List pTextbausteine); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetTextbausteineByServiceCategory", ReplyAction="http://tempuri.org/IOperationsService/GetTextbausteineByServiceCategoryResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetTextbausteineByServiceCategoryBeWoFaultF" + - "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List GetTextbausteineByServiceCategory(long pServiceCategoryOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteTextModules", ReplyAction="http://tempuri.org/IOperationsService/DeleteTextModulesResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteTextModulesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void DeleteTextModules(System.Collections.Generic.Dictionary pOid2Version); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetTextModulesByServiceCategory", ReplyAction="http://tempuri.org/IOperationsService/GetTextModulesByServiceCategoryResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetTextModulesByServiceCategoryBeWoFaultFau" + + "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetTextModulesByServiceCategory(long pServiceCategoryOid); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/FindServiceRecordsInSpan", ReplyAction="http://tempuri.org/IOperationsService/FindServiceRecordsInSpanResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/FindServiceRecordsInSpanBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] @@ -4450,11 +4459,6 @@ namespace BeWo.ServiceProxy "ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipient", ReplyAction="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipientResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipientBeWoFault" + - "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List FindUnreadChatMessagesForRecipient(long personOid); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void DeactivateInvoices(System.Collections.Generic.List invoices); @@ -4770,6 +4774,11 @@ namespace BeWo.ServiceProxy { } + public System.Collections.Generic.List FindUnreadChatMessagesForRecipient(long personOid) + { + return base.Channel.FindUnreadChatMessagesForRecipient(personOid); + } + public BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewEmployeeAPPCodeDC(long employeeOid) { return base.Channel.CreateNewEmployeeAPPCodeDC(employeeOid); @@ -4875,7 +4884,7 @@ namespace BeWo.ServiceProxy base.Channel.UpdateAbsenceTime(abs); } - public System.Collections.Generic.List GetAllTokens(BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid) + public System.Collections.Generic.List GetAllTokens(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid) { return base.Channel.GetAllTokens(zugehoerigkeitsTyp, oid); } @@ -4885,17 +4894,17 @@ namespace BeWo.ServiceProxy base.Channel.DeleteToken(token); } - public void DeletTokenRelation(BS.Shared.DataContracts.Compact.CompactTokenDC token, System.Nullable oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp typ) + public void DeletTokenRelation(BS.Shared.DataContracts.Compact.CompactTokenDC token, System.Nullable oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp typ) { base.Channel.DeletTokenRelation(token, oid, typ); } - public void InsertNewToken(string beschreibung, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid) + public void InsertNewToken(string beschreibung, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid) { base.Channel.InsertNewToken(beschreibung, typ, zugehoerigkeitsTyp, oid); } - public void InsertNewRelationToken(BS.Shared.DataContracts.Compact.CompactTokenDC token, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid) + public void InsertNewRelationToken(BS.Shared.DataContracts.Compact.CompactTokenDC token, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable oid) { base.Channel.InsertNewRelationToken(token, typ, zugehoerigkeitsTyp, oid); } @@ -4925,12 +4934,12 @@ namespace BeWo.ServiceProxy return base.Channel.KlientenAbschlagsInfoListe(start, end); } - public void DoTokenWunschOperation(int art, System.Nullable Oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary verfuegbarerWunschToken, string token) + public void DoTokenWunschOperation(int art, System.Nullable Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary verfuegbarerWunschToken, string token) { base.Channel.DoTokenWunschOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerWunschToken, token); } - public void DoTokenAusschlussOperation(int art, System.Nullable Oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary verfuegbarerAusschlussToken, string token) + public void DoTokenAusschlussOperation(int art, System.Nullable Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary verfuegbarerAusschlussToken, string token) { base.Channel.DoTokenAusschlussOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerAusschlussToken, token); } @@ -5190,29 +5199,34 @@ namespace BeWo.ServiceProxy return base.Channel.FindServiceRecordsForLastDays(costbearer2SupportConceptOid, days, employeeOid); } - public System.Collections.Generic.List GetAllTextbausteine() + public System.Collections.Generic.List GetAllTextModules() { - return base.Channel.GetAllTextbausteine(); + return base.Channel.GetAllTextModules(); } - public System.Collections.Generic.List InsertNewTextbausteine(System.Collections.Generic.List pTextbausteine) + public System.Collections.Generic.List GetTextModules(bool pShouldShowAllTextModules, long pEmployeeOid, bool pHasRightToSeeAllTextModules, bool pIsInAdministrationView) { - return base.Channel.InsertNewTextbausteine(pTextbausteine); + return base.Channel.GetTextModules(pShouldShowAllTextModules, pEmployeeOid, pHasRightToSeeAllTextModules, pIsInAdministrationView); } - public void UpdateTextbausteine(System.Collections.Generic.List pTextbausteine) + public System.Collections.Generic.List InsertNewTextModules(System.Collections.Generic.List pTextbausteine) { - base.Channel.UpdateTextbausteine(pTextbausteine); + return base.Channel.InsertNewTextModules(pTextbausteine); } - public void DeleteTextbausteine(System.Collections.Generic.Dictionary pOid2Version) + public void UpdateTextModules(System.Collections.Generic.List pTextbausteine) { - base.Channel.DeleteTextbausteine(pOid2Version); + base.Channel.UpdateTextModules(pTextbausteine); } - public System.Collections.Generic.List GetTextbausteineByServiceCategory(long pServiceCategoryOid) + public void DeleteTextModules(System.Collections.Generic.Dictionary pOid2Version) { - return base.Channel.GetTextbausteineByServiceCategory(pServiceCategoryOid); + base.Channel.DeleteTextModules(pOid2Version); + } + + public System.Collections.Generic.List GetTextModulesByServiceCategory(long pServiceCategoryOid) + { + return base.Channel.GetTextModulesByServiceCategory(pServiceCategoryOid); } public System.Collections.Generic.List FindServiceRecordsInSpan(long pCostBearer2SupportConceptOid, BS.Shared.Core.DateTimeSpan period) @@ -5250,11 +5264,6 @@ namespace BeWo.ServiceProxy return base.Channel.GetIsChatActiveCustomerAPPCodeDC(customerOid, activeType); } - public System.Collections.Generic.List FindUnreadChatMessagesForRecipient(long personOid) - { - return base.Channel.FindUnreadChatMessagesForRecipient(personOid); - } - public void DeactivateInvoices(System.Collections.Generic.List invoices) { base.Channel.DeactivateInvoices(invoices); diff --git a/BeWo/ServiceProxy/ServiceFacade.cs b/BeWo/ServiceProxy/ServiceFacade.cs index 3e2d335de..0eafc25d4 100644 --- a/BeWo/ServiceProxy/ServiceFacade.cs +++ b/BeWo/ServiceProxy/ServiceFacade.cs @@ -510,7 +510,7 @@ namespace BeWo.ServiceProxy public static void GetAll(Action> pCallBack) { - if (typeof(T).Equals(typeof(CompactCustomerDC))) + if (typeof(T) == typeof(CompactCustomerDC)) { long? oid = null; @@ -534,27 +534,27 @@ namespace BeWo.ServiceProxy pCallBack(list.Cast().ToList()); }); } - else if (typeof(T).Equals(typeof(CompactEmployeeDC))) + else if (typeof(T) == typeof(CompactEmployeeDC)) { DoEmployeeServiceAsync(s => s.GetAllActiveEmployeesCompact().Cast().ToList(), r => pCallBack(r)); } - else if (typeof(T).Equals(typeof(CompactTeamDC))) + else if (typeof(T) == typeof(CompactTeamDC)) { DoEmployeeServiceAsync(s => s.GetAllTeamsCompact().Cast().ToList(), r => pCallBack(r)); } - else if (typeof(T).Equals(typeof(CompactOrganisationDC))) + else if (typeof(T) == typeof(CompactOrganisationDC)) { DoCustomerServiceAsync(s => s.GetAllActiveOrganisationsCompact().Cast().ToList(), r => pCallBack(r)); } - else if (typeof(T).Equals(typeof(CompactPersonDC))) + else if (typeof(T) == typeof(CompactPersonDC)) { DoCustomerServiceAsync(s => s.GetAllActivePersonsCompact().Cast().ToList(), r => pCallBack(r)); } - else if (typeof(T).Equals(typeof(CompactSupportConceptDC))) + else if (typeof(T) == typeof(CompactSupportConceptDC)) { DoCustomerServiceAsync(s => s.GetAllActiveSupportConceptsCompact().Cast().ToList(), r => pCallBack(r)); } - else if (typeof(T).Equals(typeof(CompactUserDC))) + else if (typeof(T) == typeof(CompactUserDC)) { DoUserServiceAsync(s => s.GetAllUsersCompact().Cast().ToList(), r => pCallBack(r), true); } @@ -562,9 +562,9 @@ namespace BeWo.ServiceProxy { DoResourceServiceAsync(s => s.GetAllResources().Cast().ToList(), pCallBack, true); } - else if (typeof (T) == typeof (TextbausteinDC)) + else if (typeof (T) == typeof (TextModuleDC)) { - DoOperationsServiceAsync(s => s.GetAllTextbausteine().Cast().ToList(), pCallBack); + DoOperationsServiceAsync(s => s.GetAllTextModules().Cast().ToList(), pCallBack); } else { diff --git a/BeWo/Styles/OrangeBlack.xaml b/BeWo/Styles/OrangeBlack.xaml index 230ac45a1..cfb730804 100644 --- a/BeWo/Styles/OrangeBlack.xaml +++ b/BeWo/Styles/OrangeBlack.xaml @@ -14,7 +14,7 @@ xmlns:Blacklight_Wpf_Controls="clr-namespace:Blacklight.Wpf.Controls;assembly=Blacklight.Wpf.Controls"> - + @@ -1786,8 +1786,6 @@ - - - + @@ -2262,10 +2260,8 @@ - + - - @@ -2285,7 +2281,6 @@ - diff --git a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml index ead2fef36..fce5d6e4c 100644 --- a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml +++ b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml @@ -1,92 +1,89 @@  - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -