From 7fc66e555e31899e57830f8ff4bbfd4fb6ce5575 Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Fri, 24 Jan 2025 16:28:24 +0100 Subject: [PATCH 1/2] MoK: Abmeldecountdown steht jetzt unter dem Namen des angemeldeten Benutzers. --- BeWoPlanerMobil/BeWoPlanerMobil.csproj | 33 +- BeWoPlanerMobil/Content/style.css | 14 + BeWoPlanerMobil/Content/style.css.map | 2 +- BeWoPlanerMobil/Content/style.scss | 14 + .../Scripts/ownSoft-Scripts/mobileUtils.js | 1 - .../ownSoft-Scripts/view-scripts/main.js | 5 +- .../Views/Customer/Customer.cshtml | 4 +- .../Customer/CustomerBargeldkassen.cshtml | 12 +- ...omerBargeldtransaktionenFormPartial.cshtml | 4 +- .../Views/Customer/DocumentPartial.cshtml | 8 +- .../Views/Main/GroupBookingFormPartial.cshtml | 4 +- BeWoPlanerMobil/Views/Main/Main.cshtml | 20 +- .../Views/Main/MultiBookingFormPartial.cshtml | 4 +- .../Views/Main/SingleBookingPartial.cshtml | 4 +- BeWoPlanerMobil/Views/Report/Report.cshtml | 6 +- BeWoPlanerMobil/Views/Shared/_Layout.cshtml | 33 +- BeWoPlanerMobil/Web.config | 587 +++++++++--------- BeWoPlanerMobil/packages.config | 14 +- 18 files changed, 394 insertions(+), 375 deletions(-) diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index a1c5ed314..143707bd9 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -1,6 +1,6 @@  - + @@ -176,10 +176,10 @@ False - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll + ..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + ..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll ..\packages\log4net.2.0.15\lib\net45\log4net.dll @@ -188,6 +188,9 @@ ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\packages\Microsoft.AspNet.WebHelpers.3.3.0\lib\net45\Microsoft.Web.Helpers.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -224,7 +227,7 @@ - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll + ..\packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.Helpers.dll ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll @@ -232,24 +235,24 @@ ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll + + ..\packages\Microsoft.AspNet.Mvc.5.3.0\lib\net45\System.Web.Mvc.dll ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll + ..\packages\Microsoft.AspNet.Razor.3.3.0\lib\net45\System.Web.Razor.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll + ..\packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll + ..\packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll + ..\packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.Razor.dll @@ -266,10 +269,10 @@ ..\packages\WebGrease.1.6.0\lib\WebGrease.dll - ..\packages\Microsoft.AspNet.WebPages.Data.3.2.7\lib\net45\WebMatrix.Data.dll + ..\packages\Microsoft.AspNet.WebPages.Data.3.3.0\lib\net45\WebMatrix.Data.dll - ..\packages\Microsoft.AspNet.WebPages.WebData.3.2.7\lib\net45\WebMatrix.WebData.dll + ..\packages\Microsoft.AspNet.WebPages.WebData.3.3.0\lib\net45\WebMatrix.WebData.dll @@ -728,12 +731,12 @@ - - + + - + - -
- -
-
-
-
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+ +
+
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/BeWoPlanerMobil/packages.config b/BeWoPlanerMobil/packages.config index 279fcae2e..4fb3e65df 100644 --- a/BeWoPlanerMobil/packages.config +++ b/BeWoPlanerMobil/packages.config @@ -3,23 +3,23 @@ - + - + - + - - - - + + + + From 32d82107c1914c9bb8c22c03a74ca0248399c317 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Mon, 27 Jan 2025 14:19:12 +0100 Subject: [PATCH 2/2] MH: VacationService Resturlaub Vorjahr auch einblenden ohne Nutzung --- Service/Plugins/VacationService.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Service/Plugins/VacationService.cs b/Service/Plugins/VacationService.cs index 49ba905c0..5e1a2c5a4 100644 --- a/Service/Plugins/VacationService.cs +++ b/Service/Plugins/VacationService.cs @@ -547,7 +547,22 @@ namespace BeWo.Service.Plugins Herkunft = string.Format("EmpOid:{0} Urlaubskonto:{1}", emp.EmployeeOid, year), Tooltip = null, IsDeletable = false - }) ; + }); + } + else if (urlaubskonten.ContainsKey(year - 1) && urlaubskonten[year - 1].Resturlaub > 0) + { + var vorherigesKonto = urlaubskonten[year - 1]; + aktuellesKonto.Value.ResturlaubVorjahrTotal += vorherigesKonto.Resturlaub; + aktuellesKonto.Value.ResturlaubVorjahr += vorherigesKonto.Resturlaub; + + dcs.Add(new UrlaubskontoDarstellungDC() + { + Erlaeuterung = "Resturlaub aus " + (year - 1) + " :", + AnzahlTage = string.Format("+{0:0.00}", aktuellesKonto.Value.ResturlaubVorjahrTotal), + Herkunft = string.Format("EmpOid:{0} Urlaubskonto:{1}", emp.EmployeeOid, year), + Tooltip = null, + IsDeletable = false + }); } var expDate = GetExpirationDate(year); if (expDate != null)