diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 5fad25037..0267ff7b6 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -2469,7 +2469,11 @@ namespace BeWoPlanerMobil.Controllers result = GetAllServiceCategory2ServiceDescriptionDict(); } - return result.OrderBy(kvp => kvp.Key.Position).ToDictionary(category2Descriptions => category2Descriptions.Key, category2Descriptions => category2Descriptions.Value.OrderBy(serviceDescription => serviceDescription.Position).ToList()); + var categories2Descriptions = result.OrderBy(kvp => kvp.Key.Position).ToDictionary(category2Descriptions => category2Descriptions.Key, category2Descriptions => category2Descriptions.Value.OrderBy(serviceDescription => serviceDescription.Position).ToList()); + + //var x = categories2Descriptions.Where(x => x.Key.OhneHilfeplan.) + + return categories2Descriptions; } @@ -2477,7 +2481,12 @@ namespace BeWoPlanerMobil.Controllers { var result = new Dictionary>(); - var allServiceDescriptions = OperationsService.GetAllServiceDescriptions().Where(sd => sd.Category.ActivationType == ActivationTypeId.Active && sd.ActivationType == ActivationTypeId.Active && sd.Category.OhneHilfeplan != AccountingvisibilityType.NichtKlientenbezogen).ToList(); + var allServiceDescriptions = OperationsService.GetAllServiceDescriptions() + .Where(sd => sd.Category.ActivationType == ActivationTypeId.Active && + sd.ActivationType == ActivationTypeId.Active && + sd.Category.OhneHilfeplan != AccountingvisibilityType.Never && + sd.Category.OhneHilfeplan != AccountingvisibilityType.NichtKlientenbezogen) + .ToList(); foreach (var serviceDescription in allServiceDescriptions) { diff --git a/Host/Content/images/ajax-loader.gif b/Host/Content/images/ajax-loader.gif index 57f5624e7..fd1a189c2 100644 Binary files a/Host/Content/images/ajax-loader.gif and b/Host/Content/images/ajax-loader.gif differ diff --git a/Host/Host.csproj b/Host/Host.csproj index 2d8a29af7..d9626a215 100644 --- a/Host/Host.csproj +++ b/Host/Host.csproj @@ -98,26 +98,26 @@ - - ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.11\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\Microsoft.CodeAnalysis.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.3.2.1\lib\netstandard2.0\Microsoft.CodeAnalysis.dll - - ..\packages\Microsoft.CodeAnalysis.CSharp.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.3.2.1\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.3.2.1\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Workspaces.dll - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.3.2.1\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.3.2.1\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.3.2.1\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/Report/app.config b/Report/app.config index 7b8188acc..282d16ab7 100644 --- a/Report/app.config +++ b/Report/app.config @@ -60,7 +60,7 @@ - + @@ -74,6 +74,10 @@ + + + + diff --git a/ReportService/app.config b/ReportService/app.config index 2b75f4bdd..a584fe321 100644 --- a/ReportService/app.config +++ b/ReportService/app.config @@ -66,6 +66,14 @@ + + + + + + + + diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 13fd69224..5c1734bbe 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -179,7 +179,7 @@ namespace BeWo.Service.Plugins //t = "5809130435"; // Lebenshilfe Kusel //t = "3367947706"; // PaS Mönchengladbach //t = "2331203795"; // BeWo für dich - t = "5426234256"; // SKM Leverkusen + //t = "5426234256"; // SKM Leverkusen //t = "4137042939"; // MLG Lebengestalten / Haus Müllestumpe //t = "5260936181"; // LORI //t = "1931553444"; // HIBA @@ -235,7 +235,7 @@ namespace BeWo.Service.Plugins //t = "8975059766"; // Quer-Fällt-Ein //t = "8928179244"; // ASB Ruhr e.V. Regionalverband //t = "4423043131"; // Die Perspektive e.V. - //t = "5263375280"; // LH Wolfsburg + t = "5263375280"; // LH Wolfsburg //t = "4900722829"; // Evangelische Kirchengemeinde Bottrop //t = "9853685258"; // Input //t = "7622428090"; // Freie gemeinnützige Beratungsstelle für Psychotherapie e.V. (BfpDus) (Panama) @@ -305,7 +305,7 @@ namespace BeWo.Service.Plugins //t = "5427523619"; // Christopherus-Haus Familienhilfe //t = "8251343124"; // Rat Plus Tat //t = "6819347851"; // Awo Kreisverband Plön - t = "2385915144"; // AKGG GmbH + //t = "2385915144"; // AKGG GmbH //t = "8002913382"; // AKGG GmbH (MID) //t = "5155880294"; // BHV Bergische Hauspflege //t = "8366649557"; // Münchner Aids-Hilfe e.V. diff --git a/Service/app.config b/Service/app.config index 234d11349..198960538 100644 --- a/Service/app.config +++ b/Service/app.config @@ -64,7 +64,7 @@ - + @@ -78,6 +78,10 @@ + + + + diff --git a/Service/packages.config b/Service/packages.config index 707fd162c..91f2ec78c 100644 --- a/Service/packages.config +++ b/Service/packages.config @@ -1,16 +1,16 @@  - + - + - - - - - - + + + + + + @@ -30,6 +30,6 @@ - + \ No newline at end of file