diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs index 8eb0d05c0..669c43cc9 100644 --- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs +++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs @@ -432,54 +432,8 @@ namespace BeWo.Scheduler.View ConstructObject(); } - // ToDo: In den Cache verschieben private static void GetCacheObjects(Action, List, Dictionary>> callback) { - //Cache.GetInstance().GetAllActiveEmployeesCompact(allEmployees => - //{ - // this.Dispatch(() => - // { - // Cache.GetInstance().GetAllActiveCustomersCompact(allCustomers => - // { - // this.Dispatch(() => - // { - // Cache.GetInstance().GetCategories2ResourcesDictionary(resourceDictionary => - // { - // this.Dispatch(() => - // { - // if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen)) - // { - // allEmployees = new List {BeWoApp.CompactLoggedOnEmployee}; - // } - - // var darfKlientenAnsichtSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyTeams) || BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers) || BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View); - // var darfTermineAllerKlientenSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderKliententermineAlleAnsehen); - - // if(darfKlientenAnsichtSehen) - // { - // if(!darfTermineAllerKlientenSehen || !BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View)) - // { - // allCustomers = allCustomers.Where(w => w.IsRelatedToEmployee).ToList(); - // } - // } - // else - // { - // allCustomers.Clear(); - // } - - // if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAnsehen)) - // { - // resourceDictionary.Clear(); - // } - - // callback(allCustomers, allEmployees, resourceDictionary); - // }); - // }); - // }); - // }); - // }); - //}); - Cache.GetInstance().GetSchedulerObjects(callback); } diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index cb3036a75..25635f6a3 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -4387,6 +4387,11 @@ + + + + + @@ -5036,6 +5041,13 @@ + + + + + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/BeWoPlanerMobil/Controllers/ReportViewerController.cs b/BeWoPlanerMobil/Controllers/ReportViewerController.cs index a399a9e20..d81c8ad76 100644 --- a/BeWoPlanerMobil/Controllers/ReportViewerController.cs +++ b/BeWoPlanerMobil/Controllers/ReportViewerController.cs @@ -47,8 +47,6 @@ namespace BeWoPlanerMobil.Controllers public ActionResult ReportViewer() { - TempData["ErrorTest"] = "Das ist nur ein Test."; - Model.Report = null; var month = DateTime.Today.Month; @@ -217,8 +215,6 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public ActionResult LoadMitarbeiterstundenkonto(string parameters) { - TempData["PartialViewErrorTest"] = "Das ist nur ein Test."; - if(Model?.Employee?.EmployeeOid is null) { return Logout(); diff --git a/BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml b/BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml index 3f90114e2..4df97d389 100644 --- a/BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml +++ b/BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml @@ -1,12 +1,6 @@ @using BeWoPlanerMobil.Util @model BeWoPlanerMobil.Models.ReportViewerModel - -