From 35ef7a7cc74cd025443fc43cd42ebc7384a139bf Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Wed, 29 Mar 2023 19:25:21 +0200 Subject: [PATCH] =?UTF-8?q?MoK=20Kalendermodul:=20Ganztagstermine=20werden?= =?UTF-8?q?=20nicht=20mehr=20als=20l=C3=A4nger=20angezeigt=20als=20sie=20s?= =?UTF-8?q?ind;=20Z.B.=20ein=20Ganztagstermin=20am=2029.03.2023=20(Start?= =?UTF-8?q?=2029.03.2023=2000:00,=20Ende=2030.03.2023)=20wird=20nur=20noch?= =?UTF-8?q?=20am=2029.03.2023=20angezeigt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LoginController.cs | 30 ++++++++++--------- .../Controllers/SchedulerController.cs | 14 +++++---- Service/Plugins/PluginLoader.cs | 6 ++-- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/BeWoPlanerMobil/Controllers/LoginController.cs b/BeWoPlanerMobil/Controllers/LoginController.cs index eeae80b18..0025b067f 100644 --- a/BeWoPlanerMobil/Controllers/LoginController.cs +++ b/BeWoPlanerMobil/Controllers/LoginController.cs @@ -151,21 +151,23 @@ namespace BeWoPlanerMobil.Controllers return RedirectToActionPermanent("Main", "Main"); } - if (!String.IsNullOrWhiteSpace(tenant)) - { - var server = GetServerFromTenant(tenant); - if (!String.IsNullOrEmpty(server) && server.Contains("bewoplaner.de")) - { - Log.Info($"Request Url.Host = " + Request.Url.Host); - if (Request.Url.Host != server) - { - var newurl = String.Format("https://{0}/mobil/login/{1}", server, tenant); - Log.Info($"Wrong Server... Redirect to : " + newurl); +#if RELEASE + if (!String.IsNullOrWhiteSpace(tenant)) + { + var server = GetServerFromTenant(tenant); + if (!String.IsNullOrEmpty(server) && server.Contains("bewoplaner.de")) + { + Log.Info($"Request Url.Host = " + Request.Url.Host); + if (Request.Url.Host != server) + { + var newurl = String.Format("https://{0}/mobil/login/{1}", server, tenant); + Log.Info($"Wrong Server... Redirect to : " + newurl); - return Redirect(newurl); - } - } - } + return Redirect(newurl); + } + } + } +#endif MobileSessionFacade.Tenant = tenant; return View("Index"); } diff --git a/BeWoPlanerMobil/Controllers/SchedulerController.cs b/BeWoPlanerMobil/Controllers/SchedulerController.cs index bbcaa89e2..2db5ff777 100644 --- a/BeWoPlanerMobil/Controllers/SchedulerController.cs +++ b/BeWoPlanerMobil/Controllers/SchedulerController.cs @@ -120,6 +120,8 @@ namespace BeWoPlanerMobil.Controllers var appointments = KalenderService.LoadFilteredAppointmentsMitAufgaben(AbstractModel.HasRightToViewEmployeeAppointments, Model.Employee.EmployeeOid.Value, start.Date, end, selectedEmployees, selectedCustomers, selectedResources, false, false, false, false, true, true).ToList(); + var allDayTestAppointment = appointments.FirstOrDefault(f => f.AllDay && f.Subject.Equals("Ganztägiger Termin")); + var tasks = appointments.Where(w => w.IsTask && w.CompletedDate is null).ToList(); // Nur eigene Kliententermine ansehen @@ -138,6 +140,12 @@ namespace BeWoPlanerMobil.Controllers appointments = appointments.Where(a => a.CustomerList.Count == 0).ToList(); } + // Wenn es ein ganztägiger Termin ist, eine Sekunde abziehen und beim Speichern wieder draufaddieren? + foreach(var app in appointments.Where(a => a.AllDay)) + { + app.EndDate = app.EndDate.Value.AddMinutes(-1); + } + var holySweetFlyingFuck = appointments.Where(w => w.IsTask == false && // Aufgaben ausschließen w.StartDate.HasValue && w.EndDate.HasValue && // Datumsangaben haben einen Wert @@ -157,12 +165,6 @@ namespace BeWoPlanerMobil.Controllers holySweetFlyingFuck.AddRange(tasks); - // Wenn es ein ganztägiger Termin ist, eine Sekunde abziehen und beim Speichern wieder draufaddieren? - foreach(var app in holySweetFlyingFuck.Where(a => a.AllDay)) - { - app.EndDate = app.EndDate.Value.AddMinutes(-1); - } - Model.Appointments = holySweetFlyingFuck.Where(w => w.IsTask == Model.ShouldLoadTasks).OrderBy(appointment => appointment.StartDate).ToList(); Model.WeekViewObject = new WeekViewObject(Model.Appointments, Model.SelectedDate.GetInSameCalendarWeek(DayOfWeek.Monday), Model.Employee); diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index f39df32b2..7727969de 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -32,14 +32,14 @@ namespace BeWo.Service.Plugins //t = "1193188501"; // Aids Hilfe Dortmund //t = "7860351957"; // SKF Alsdorf //t = "3311520228"; // Die Düne - //t = "1352143437"; // Sewo + t = "1352143437"; // Sewo //t = "7107514623"; // BeWo Neuss //t = "9098141768"; // Fib e.V. Marburg //t = "1505148718"; // VSD Hamm //t = "5926081834"; // Spektrum //t = "1378137009"; // BeWo Direkt+ //t = "3010479871"; // Aachener Verein - t = "3849764093"; // Club 74 + //t = "3849764093"; // Club 74 //t = "5805202339"; // Wegweiser Betreuungsdienst //t = "2301474784"; // Hauskrankenpflege Leiendecker //t = "8243565510"; // Der Karren @@ -229,7 +229,7 @@ namespace BeWo.Service.Plugins //t = "2141858509"; // INKOMM GmbH //t = "8975059766"; // Quer-Fällt-Ein //t = "8928179244"; // ASB Ruhr e.V. Regionalverband - t = "4423043131"; // Die Perspektive e.V. + //t = "4423043131"; // Die Perspektive e.V. //t = "5263375280"; // LH Wolfsburg //t = "4900722829"; // Evangelische Kirchengemeinde Bottrop //t = "9853685258"; // Input