From 655e81d38d604e7be8a4d7a575eaa27b98fe7c8b Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Fri, 7 Feb 2020 15:21:36 +0100 Subject: [PATCH] Validierung im Abwesenheitsview verbessert. --- BeWo/View/Detail/AbsenceTimesView.xaml.cs | 5 +- BeWo/ViewModel/AbsenceTimeVM.cs | 23 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj | 418 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 1 + BeWoPlanerMobil/Content/BeWoMobileStyle.css | 30 +- .../Controllers/CustomerController.cs | 2 +- .../Controllers/LoginController.cs | 4 +- BeWoPlanerMobil/Controllers/MainController.cs | 14 +- BeWoPlanerMobil/Global.asax.cs | 1 + BeWoPlanerMobil/Models/AbstractModel.cs | 8 + BeWoPlanerMobil/Models/CustomerModel.cs | 5 - BeWoPlanerMobil/Models/MainModel.cs | 32 +- BeWoPlanerMobil/Models/SchedulerModel.cs | 11 +- BeWoPlanerMobil/Scripts/initialization.js | 2 +- BeWoPlanerMobil/Scripts/mainView.js | 2 +- BeWoPlanerMobil/TestWebService.asmx.cs | 37 +- .../Util/TextbausteinDisplayItem.cs | 25 + BeWoPlanerMobil/Views/Login/Index.cshtml | 73 +- BeWoPlanerMobil/Views/Main/Main.cshtml | 1261 +- BeWoPlanerMobil/Views/Shared/_Layout.cshtml | 176 +- BeWoPlanerMobil/Views/Web.config | 16 +- BeWoPlanerMobil/Web.config | 47 +- BeWoPlanerMobil/packages.config | 47 +- Data/Data.csproj | 15 +- Shared/Core/Utils.cs | 11 +- .../Content/App.config.transform | 5 - .../Content/Web.config.transform | 5 - .../EntityFramework.5.0.0.nupkg | Bin 1118060 -> 0 bytes .../lib/net40/EntityFramework.dll | Bin 1118296 -> 0 bytes .../lib/net40/EntityFramework.xml | 18061 ---------------- .../lib/net45/EntityFramework.dll | Bin 1116760 -> 0 bytes .../lib/net45/EntityFramework.xml | 17968 --------------- .../tools/EntityFramework.PS3.psd1 | Bin 24418 -> 0 bytes .../EntityFramework.PowerShell.Utility.dll | Bin 15960 -> 0 bytes .../tools/EntityFramework.PowerShell.dll | Bin 134744 -> 0 bytes .../tools/EntityFramework.psd1 | Bin 24428 -> 0 bytes .../tools/EntityFramework.psm1 | 777 - .../tools/Redirect.VS11.config | 18 - .../tools/Redirect.config | 14 - .../tools/about_EntityFramework.help.txt | 30 - packages/EntityFramework.5.0.0/tools/init.ps1 | 176 - .../EntityFramework.5.0.0/tools/install.ps1 | 170 - .../EntityFramework.5.0.0/tools/migrate.exe | Bin 130136 -> 0 bytes .../Microsoft.AspNet.Mvc.4.0.20710.0.nupkg | Bin 276266 -> 0 bytes .../lib/net40/System.Web.Mvc.dll | Bin 506976 -> 0 bytes .../lib/net40/System.Web.Mvc.xml | 10254 --------- ...t.AspNet.Mvc.FixedDisplayModes.1.0.0.nupkg | Bin 25024 -> 0 bytes .../Microsoft.Web.Mvc.FixedDisplayModes.dll | Bin 23664 -> 0 bytes .../Microsoft.AspNet.Providers.Core.1.2.nupkg | Bin 101348 -> 0 bytes .../lib/net40/System.Web.Providers.dll | Bin 270936 -> 0 bytes .../readme.html | 377 - ...crosoft.AspNet.Providers.LocalDB.1.1.nupkg | Bin 22987 -> 0 bytes .../content/web.config.transform | 33 - .../tools/Install.ps1 | 220 - .../Microsoft.AspNet.Razor.2.0.20715.0.nupkg | Bin 136744 -> 0 bytes .../lib/net40/System.Web.Razor.dll | Bin 266888 -> 0 bytes .../lib/net40/System.Web.Razor.xml | 4359 ---- ...rosoft.AspNet.Web.Optimization.1.0.0.nupkg | Bin 39385 -> 0 bytes .../lib/net40/System.Web.Optimization.dll | Bin 54912 -> 0 bytes .../Microsoft.AspNet.WebApi.4.0.20710.0.nupkg | Bin 12685 -> 0 bytes ...oft.AspNet.WebApi.Client.4.0.20710.0.nupkg | Bin 99197 -> 0 bytes .../lib/net40/System.Net.Http.Formatting.dll | Bin 168544 -> 0 bytes .../lib/net40/System.Net.Http.Formatting.xml | 1489 -- ...osoft.AspNet.WebApi.Core.4.0.20710.0.nupkg | Bin 186509 -> 0 bytes .../content/web.config.transform | 13 - .../lib/net40/System.Web.Http.dll | Bin 323168 -> 0 bytes .../lib/net40/System.Web.Http.xml | 4679 ---- ...ft.AspNet.WebApi.WebHost.4.0.20710.0.nupkg | Bin 49404 -> 0 bytes .../lib/net40/System.Web.Http.WebHost.dll | Bin 73312 -> 0 bytes .../lib/net40/System.Web.Http.WebHost.xml | 136 - ...icrosoft.AspNet.WebPages.2.0.20710.0.nupkg | Bin 229643 -> 0 bytes .../lib/net40/System.Web.Helpers.dll | Bin 138352 -> 0 bytes .../lib/net40/System.Web.Helpers.xml | 833 - .../net40/System.Web.WebPages.Deployment.dll | Bin 41048 -> 0 bytes .../net40/System.Web.WebPages.Deployment.xml | 41 - .../lib/net40/System.Web.WebPages.Razor.dll | Bin 39536 -> 0 bytes .../lib/net40/System.Web.WebPages.Razor.xml | 224 - .../lib/net40/System.Web.WebPages.dll | Bin 204400 -> 0 bytes .../lib/net40/System.Web.WebPages.xml | 2624 --- .../Microsoft.Net.Http.2.0.20710.0.nupkg | Bin 116143 -> 0 bytes .../lib/net40/System.Net.Http.WebRequest.dll | Bin 16480 -> 0 bytes .../lib/net40/System.Net.Http.WebRequest.xml | 63 - .../lib/net40/System.Net.Http.dll | Bin 180832 -> 0 bytes .../lib/net40/System.Net.Http.xml | 2308 -- .../lib/net45/_._ | 1 - .../Scripts/jquery.unobtrusive-ajax.js | 163 - .../Scripts/jquery.unobtrusive-ajax.min.js | 5 - ....jQuery.Unobtrusive.Ajax.2.0.30116.0.nupkg | Bin 15625 -> 0 bytes .../Scripts/jquery.validate.unobtrusive.js | 367 - .../jquery.validate.unobtrusive.min.js | 5 - ...y.Unobtrusive.Validation.2.0.30116.0.nupkg | Bin 18416 -> 0 bytes .../Content/Scripts/modernizr-2.6.2.js | 1393 -- .../Modernizr.2.6.2/Modernizr.2.6.2.nupkg | Bin 30438 -> 0 bytes packages/Modernizr.2.6.2/Tools/common.ps1 | 75 - packages/Modernizr.2.6.2/Tools/install.ps1 | 12 - packages/Modernizr.2.6.2/Tools/uninstall.ps1 | 6 - .../WebGrease.1.3.0/WebGrease.1.3.0.nupkg | Bin 783077 -> 0 bytes .../WebGrease.1.3.0/lib/Antlr3.Runtime.dll | Bin 105544 -> 0 bytes packages/WebGrease.1.3.0/lib/WebGrease.dll | Bin 1054792 -> 0 bytes packages/WebGrease.1.3.0/tools/WG.exe | Bin 1147464 -> 0 bytes .../Content/Scripts/jquery-1.8.2-vsdoc.js | 7011 ------ .../Content/Scripts/jquery-1.8.2.js | 9440 -------- .../Content/Scripts/jquery-1.8.2.min.js | 2 - packages/jQuery.1.8.2/Tools/common.ps1 | 117 - packages/jQuery.1.8.2/Tools/install.ps1 | 41 - .../Tools/jquery-1.8.2.intellisense.js | 2494 --- packages/jQuery.1.8.2/Tools/uninstall.ps1 | 41 - packages/jQuery.1.8.2/jQuery.1.8.2.nupkg | Bin 195047 -> 0 bytes .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 0 bytes .../images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 0 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 0 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 0 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 0 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 0 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 0 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 0 bytes .../base/images/ui-icons_222222_256x240.png | Bin 4369 -> 0 bytes .../base/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 0 bytes .../base/images/ui-icons_454545_256x240.png | Bin 4369 -> 0 bytes .../base/images/ui-icons_888888_256x240.png | Bin 4369 -> 0 bytes .../base/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 0 bytes .../Content/Content/themes/base/jquery-ui.css | 464 - .../themes/base/jquery.ui.accordion.css | 19 - .../Content/themes/base/jquery.ui.all.css | 11 - .../themes/base/jquery.ui.autocomplete.css | 53 - .../Content/themes/base/jquery.ui.base.css | 21 - .../Content/themes/base/jquery.ui.button.css | 38 - .../Content/themes/base/jquery.ui.core.css | 38 - .../themes/base/jquery.ui.datepicker.css | 66 - .../Content/themes/base/jquery.ui.dialog.css | 21 - .../themes/base/jquery.ui.progressbar.css | 11 - .../themes/base/jquery.ui.resizable.css | 20 - .../themes/base/jquery.ui.selectable.css | 10 - .../Content/themes/base/jquery.ui.slider.css | 24 - .../Content/themes/base/jquery.ui.tabs.css | 18 - .../Content/themes/base/jquery.ui.theme.css | 247 - .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 0 bytes .../images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 0 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 0 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 0 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 0 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 0 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 0 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 0 bytes .../images/ui-icons_222222_256x240.png | Bin 4369 -> 0 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 0 bytes .../images/ui-icons_454545_256x240.png | Bin 4369 -> 0 bytes .../images/ui-icons_888888_256x240.png | Bin 4369 -> 0 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 0 bytes .../themes/base/minified/jquery-ui.min.css | 5 - .../base/minified/jquery.ui.accordion.min.css | 5 - .../minified/jquery.ui.autocomplete.min.css | 5 - .../base/minified/jquery.ui.button.min.css | 5 - .../base/minified/jquery.ui.core.min.css | 5 - .../minified/jquery.ui.datepicker.min.css | 5 - .../base/minified/jquery.ui.dialog.min.css | 5 - .../minified/jquery.ui.progressbar.min.css | 5 - .../base/minified/jquery.ui.resizable.min.css | 5 - .../minified/jquery.ui.selectable.min.css | 5 - .../base/minified/jquery.ui.slider.min.css | 5 - .../base/minified/jquery.ui.tabs.min.css | 5 - .../base/minified/jquery.ui.theme.min.css | 5 - .../Content/Scripts/jquery-ui-1.8.24.js | 11377 ---------- .../Content/Scripts/jquery-ui-1.8.24.min.js | 5 - .../Tools/common.ps1 | 75 - .../Tools/install.ps1 | 12 - .../Tools/uninstall.ps1 | 6 - .../jQuery.UI.Combined.1.8.24.nupkg | Bin 237806 -> 0 bytes .../Content/Scripts/jquery.validate-vsdoc.js | 1291 -- .../Content/Scripts/jquery.validate.js | 1248 -- .../Content/Scripts/jquery.validate.min.js | 4 - .../jQuery.Validation.1.10.0.nupkg | Bin 41974 -> 0 bytes .../Content/Scripts/knockout-2.2.0.debug.js | 3577 --- .../Content/Scripts/knockout-2.2.0.js | 85 - .../knockoutjs.2.2.0/knockoutjs.2.2.0.nupkg | Bin 69965 -> 0 bytes 175 files changed, 1146 insertions(+), 105976 deletions(-) delete mode 100644 packages/EntityFramework.5.0.0/Content/App.config.transform delete mode 100644 packages/EntityFramework.5.0.0/Content/Web.config.transform delete mode 100644 packages/EntityFramework.5.0.0/EntityFramework.5.0.0.nupkg delete mode 100644 packages/EntityFramework.5.0.0/lib/net40/EntityFramework.dll delete mode 100644 packages/EntityFramework.5.0.0/lib/net40/EntityFramework.xml delete mode 100644 packages/EntityFramework.5.0.0/lib/net45/EntityFramework.dll delete mode 100644 packages/EntityFramework.5.0.0/lib/net45/EntityFramework.xml delete mode 100644 packages/EntityFramework.5.0.0/tools/EntityFramework.PS3.psd1 delete mode 100644 packages/EntityFramework.5.0.0/tools/EntityFramework.PowerShell.Utility.dll delete mode 100644 packages/EntityFramework.5.0.0/tools/EntityFramework.PowerShell.dll delete mode 100644 packages/EntityFramework.5.0.0/tools/EntityFramework.psd1 delete mode 100644 packages/EntityFramework.5.0.0/tools/EntityFramework.psm1 delete mode 100644 packages/EntityFramework.5.0.0/tools/Redirect.VS11.config delete mode 100644 packages/EntityFramework.5.0.0/tools/Redirect.config delete mode 100644 packages/EntityFramework.5.0.0/tools/about_EntityFramework.help.txt delete mode 100644 packages/EntityFramework.5.0.0/tools/init.ps1 delete mode 100644 packages/EntityFramework.5.0.0/tools/install.ps1 delete mode 100644 packages/EntityFramework.5.0.0/tools/migrate.exe delete mode 100644 packages/Microsoft.AspNet.Mvc.4.0.20710.0/Microsoft.AspNet.Mvc.4.0.20710.0.nupkg delete mode 100644 packages/Microsoft.AspNet.Mvc.4.0.20710.0/lib/net40/System.Web.Mvc.dll delete mode 100644 packages/Microsoft.AspNet.Mvc.4.0.20710.0/lib/net40/System.Web.Mvc.xml delete mode 100644 packages/Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0/Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0.nupkg delete mode 100644 packages/Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0/lib/net40/Microsoft.Web.Mvc.FixedDisplayModes.dll delete mode 100644 packages/Microsoft.AspNet.Providers.Core.1.2/Microsoft.AspNet.Providers.Core.1.2.nupkg delete mode 100644 packages/Microsoft.AspNet.Providers.Core.1.2/lib/net40/System.Web.Providers.dll delete mode 100644 packages/Microsoft.AspNet.Providers.Core.1.2/readme.html delete mode 100644 packages/Microsoft.AspNet.Providers.LocalDB.1.1/Microsoft.AspNet.Providers.LocalDB.1.1.nupkg delete mode 100644 packages/Microsoft.AspNet.Providers.LocalDB.1.1/content/web.config.transform delete mode 100644 packages/Microsoft.AspNet.Providers.LocalDB.1.1/tools/Install.ps1 delete mode 100644 packages/Microsoft.AspNet.Razor.2.0.20715.0/Microsoft.AspNet.Razor.2.0.20715.0.nupkg delete mode 100644 packages/Microsoft.AspNet.Razor.2.0.20715.0/lib/net40/System.Web.Razor.dll delete mode 100644 packages/Microsoft.AspNet.Razor.2.0.20715.0/lib/net40/System.Web.Razor.xml delete mode 100644 packages/Microsoft.AspNet.Web.Optimization.1.0.0/Microsoft.AspNet.Web.Optimization.1.0.0.nupkg delete mode 100644 packages/Microsoft.AspNet.Web.Optimization.1.0.0/lib/net40/System.Web.Optimization.dll delete mode 100644 packages/Microsoft.AspNet.WebApi.4.0.20710.0/Microsoft.AspNet.WebApi.4.0.20710.0.nupkg delete mode 100644 packages/Microsoft.AspNet.WebApi.Client.4.0.20710.0/Microsoft.AspNet.WebApi.Client.4.0.20710.0.nupkg delete mode 100644 packages/Microsoft.AspNet.WebApi.Client.4.0.20710.0/lib/net40/System.Net.Http.Formatting.dll delete mode 100644 packages/Microsoft.AspNet.WebApi.Client.4.0.20710.0/lib/net40/System.Net.Http.Formatting.xml delete mode 100644 packages/Microsoft.AspNet.WebApi.Core.4.0.20710.0/Microsoft.AspNet.WebApi.Core.4.0.20710.0.nupkg delete mode 100644 packages/Microsoft.AspNet.WebApi.Core.4.0.20710.0/content/web.config.transform delete mode 100644 packages/Microsoft.AspNet.WebApi.Core.4.0.20710.0/lib/net40/System.Web.Http.dll delete mode 100644 packages/Microsoft.AspNet.WebApi.Core.4.0.20710.0/lib/net40/System.Web.Http.xml delete mode 100644 packages/Microsoft.AspNet.WebApi.WebHost.4.0.20710.0/Microsoft.AspNet.WebApi.WebHost.4.0.20710.0.nupkg delete mode 100644 packages/Microsoft.AspNet.WebApi.WebHost.4.0.20710.0/lib/net40/System.Web.Http.WebHost.dll delete mode 100644 packages/Microsoft.AspNet.WebApi.WebHost.4.0.20710.0/lib/net40/System.Web.Http.WebHost.xml delete mode 100644 packages/Microsoft.AspNet.WebPages.2.0.20710.0/Microsoft.AspNet.WebPages.2.0.20710.0.nupkg delete mode 100644 packages/Microsoft.AspNet.WebPages.2.0.20710.0/lib/net40/System.Web.Helpers.dll delete mode 100644 packages/Microsoft.AspNet.WebPages.2.0.20710.0/lib/net40/System.Web.Helpers.xml delete mode 100644 packages/Microsoft.AspNet.WebPages.2.0.20710.0/lib/net40/System.Web.WebPages.Deployment.dll delete mode 100644 packages/Microsoft.AspNet.WebPages.2.0.20710.0/lib/net40/System.Web.WebPages.Deployment.xml delete mode 100644 packages/Microsoft.AspNet.WebPages.2.0.20710.0/lib/net40/System.Web.WebPages.Razor.dll delete mode 100644 packages/Microsoft.AspNet.WebPages.2.0.20710.0/lib/net40/System.Web.WebPages.Razor.xml delete mode 100644 packages/Microsoft.AspNet.WebPages.2.0.20710.0/lib/net40/System.Web.WebPages.dll delete mode 100644 packages/Microsoft.AspNet.WebPages.2.0.20710.0/lib/net40/System.Web.WebPages.xml delete mode 100644 packages/Microsoft.Net.Http.2.0.20710.0/Microsoft.Net.Http.2.0.20710.0.nupkg delete mode 100644 packages/Microsoft.Net.Http.2.0.20710.0/lib/net40/System.Net.Http.WebRequest.dll delete mode 100644 packages/Microsoft.Net.Http.2.0.20710.0/lib/net40/System.Net.Http.WebRequest.xml delete mode 100644 packages/Microsoft.Net.Http.2.0.20710.0/lib/net40/System.Net.Http.dll delete mode 100644 packages/Microsoft.Net.Http.2.0.20710.0/lib/net40/System.Net.Http.xml delete mode 100644 packages/Microsoft.Net.Http.2.0.20710.0/lib/net45/_._ delete mode 100644 packages/Microsoft.jQuery.Unobtrusive.Ajax.2.0.30116.0/Content/Scripts/jquery.unobtrusive-ajax.js delete mode 100644 packages/Microsoft.jQuery.Unobtrusive.Ajax.2.0.30116.0/Content/Scripts/jquery.unobtrusive-ajax.min.js delete mode 100644 packages/Microsoft.jQuery.Unobtrusive.Ajax.2.0.30116.0/Microsoft.jQuery.Unobtrusive.Ajax.2.0.30116.0.nupkg delete mode 100644 packages/Microsoft.jQuery.Unobtrusive.Validation.2.0.30116.0/Content/Scripts/jquery.validate.unobtrusive.js delete mode 100644 packages/Microsoft.jQuery.Unobtrusive.Validation.2.0.30116.0/Content/Scripts/jquery.validate.unobtrusive.min.js delete mode 100644 packages/Microsoft.jQuery.Unobtrusive.Validation.2.0.30116.0/Microsoft.jQuery.Unobtrusive.Validation.2.0.30116.0.nupkg delete mode 100644 packages/Modernizr.2.6.2/Content/Scripts/modernizr-2.6.2.js delete mode 100644 packages/Modernizr.2.6.2/Modernizr.2.6.2.nupkg delete mode 100644 packages/Modernizr.2.6.2/Tools/common.ps1 delete mode 100644 packages/Modernizr.2.6.2/Tools/install.ps1 delete mode 100644 packages/Modernizr.2.6.2/Tools/uninstall.ps1 delete mode 100644 packages/WebGrease.1.3.0/WebGrease.1.3.0.nupkg delete mode 100644 packages/WebGrease.1.3.0/lib/Antlr3.Runtime.dll delete mode 100644 packages/WebGrease.1.3.0/lib/WebGrease.dll delete mode 100644 packages/WebGrease.1.3.0/tools/WG.exe delete mode 100644 packages/jQuery.1.8.2/Content/Scripts/jquery-1.8.2-vsdoc.js delete mode 100644 packages/jQuery.1.8.2/Content/Scripts/jquery-1.8.2.js delete mode 100644 packages/jQuery.1.8.2/Content/Scripts/jquery-1.8.2.min.js delete mode 100644 packages/jQuery.1.8.2/Tools/common.ps1 delete mode 100644 packages/jQuery.1.8.2/Tools/install.ps1 delete mode 100644 packages/jQuery.1.8.2/Tools/jquery-1.8.2.intellisense.js delete mode 100644 packages/jQuery.1.8.2/Tools/uninstall.ps1 delete mode 100644 packages/jQuery.1.8.2/jQuery.1.8.2.nupkg delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-bg_flat_75_ffffff_40x100.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-bg_glass_65_ffffff_1x400.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-bg_glass_75_dadada_1x400.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-icons_222222_256x240.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-icons_2e83ff_256x240.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-icons_454545_256x240.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-icons_888888_256x240.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/images/ui-icons_cd0a0a_256x240.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery-ui.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.accordion.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.all.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.autocomplete.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.base.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.button.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.core.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.datepicker.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.dialog.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.progressbar.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.resizable.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.selectable.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.slider.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.tabs.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/jquery.ui.theme.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-bg_flat_0_aaaaaa_40x100.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-bg_flat_75_ffffff_40x100.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-bg_glass_55_fbf9ee_1x400.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-bg_glass_65_ffffff_1x400.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-bg_glass_75_dadada_1x400.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-bg_glass_75_e6e6e6_1x400.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-bg_glass_95_fef1ec_1x400.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-bg_highlight-soft_75_cccccc_1x100.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-icons_222222_256x240.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-icons_2e83ff_256x240.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-icons_454545_256x240.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-icons_888888_256x240.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/images/ui-icons_cd0a0a_256x240.png delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery-ui.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.accordion.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.autocomplete.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.button.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.core.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.datepicker.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.dialog.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.progressbar.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.resizable.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.selectable.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.slider.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.tabs.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Content/themes/base/minified/jquery.ui.theme.min.css delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Scripts/jquery-ui-1.8.24.js delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Content/Scripts/jquery-ui-1.8.24.min.js delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Tools/common.ps1 delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Tools/install.ps1 delete mode 100644 packages/jQuery.UI.Combined.1.8.24/Tools/uninstall.ps1 delete mode 100644 packages/jQuery.UI.Combined.1.8.24/jQuery.UI.Combined.1.8.24.nupkg delete mode 100644 packages/jQuery.Validation.1.10.0/Content/Scripts/jquery.validate-vsdoc.js delete mode 100644 packages/jQuery.Validation.1.10.0/Content/Scripts/jquery.validate.js delete mode 100644 packages/jQuery.Validation.1.10.0/Content/Scripts/jquery.validate.min.js delete mode 100644 packages/jQuery.Validation.1.10.0/jQuery.Validation.1.10.0.nupkg delete mode 100644 packages/knockoutjs.2.2.0/Content/Scripts/knockout-2.2.0.debug.js delete mode 100644 packages/knockoutjs.2.2.0/Content/Scripts/knockout-2.2.0.js delete mode 100644 packages/knockoutjs.2.2.0/knockoutjs.2.2.0.nupkg diff --git a/BeWo/View/Detail/AbsenceTimesView.xaml.cs b/BeWo/View/Detail/AbsenceTimesView.xaml.cs index 92f47d1fc..514e780d0 100644 --- a/BeWo/View/Detail/AbsenceTimesView.xaml.cs +++ b/BeWo/View/Detail/AbsenceTimesView.xaml.cs @@ -32,7 +32,10 @@ namespace BeWo.View.Detail private void AddAbsenceTimes() { - AbsenceTimes?.AddNewVMToList(); + AbsenceTimes?.NewVM.ValidateDates(() => + { + AbsenceTimes?.AddNewVMToList(); + }); } private void RemoveAbsenceTime() diff --git a/BeWo/ViewModel/AbsenceTimeVM.cs b/BeWo/ViewModel/AbsenceTimeVM.cs index 96509f75a..985a3c44b 100644 --- a/BeWo/ViewModel/AbsenceTimeVM.cs +++ b/BeWo/ViewModel/AbsenceTimeVM.cs @@ -188,8 +188,8 @@ namespace BeWo.ViewModel pDataContract.Reason = _Reason; } - pDataContract.Start = _Start; - pDataContract.End = _End; + pDataContract.Start = _Start; + pDataContract.End = _End; pDataContract.Notice = _Notice; pDataContract.KrankheitsMeldung = _KrankheitsMeldung; @@ -203,7 +203,8 @@ namespace BeWo.ViewModel { var me = (IDataErrorInfo)this; var error = me[nameof(Start)] + - me[nameof(End)]; + me[nameof(End)] + + me[nameof(Reason)]; return error; } @@ -213,14 +214,19 @@ namespace BeWo.ViewModel { get { - if (Start == null) + if (columnName.Equals(nameof(Start)) && Start == null) { - return "Das Startdatum muss einen Wert haben."; + return "Das Startdatum muss einen Wert haben.\n"; } - if (End != null && End.Value < Start) + if (columnName.Equals(nameof(End)) && End != null && End.Value < Start) { - return "Das Startdatum muss vor dem Enddatum liegen."; + return "Das Startdatum muss vor dem Enddatum liegen.\n"; + } + + if (columnName.Equals(nameof(Reason)) && Reason == null) + { + return "Die Kategorie darf nicht leer sein.\n"; } return null; @@ -233,9 +239,10 @@ namespace BeWo.ViewModel if (!string.IsNullOrEmpty(error)) { - MessageBox.Show("Das Startdatum muss vor dem Enddatum liegen.", "Ungültige Datumsangaben", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show(error, "Ungültige Eingabe", MessageBoxButton.OK, MessageBoxImage.Error); FirePropertyChanged(nameof(Start)); FirePropertyChanged(nameof(End)); + FirePropertyChanged(nameof(Reason)); } else { diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index 3eb38f90c..75e55575d 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -1,5 +1,7 @@  + + Debug @@ -8,7 +10,7 @@ 2.0 {284B02ED-114A-426C-9162-31BB6CF05589} - {E3E379DF-F4C6-4180-9B81-6769533ABE47};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties BeWoPlanerMobil @@ -23,6 +25,9 @@ + + + 3.7 true @@ -45,6 +50,9 @@ false + + ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll + False @@ -52,11 +60,20 @@ + + ..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.SqlServer.dll + False ..\Lib\log4net.dll + + ..\packages\Microsoft.AspNet.WebHelpers.3.2.7\lib\net45\Microsoft.Web.Helpers.dll + False ..\Lib\MySql.Data.dll @@ -76,6 +93,17 @@ + + + ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll + + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + + + ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll + + @@ -84,74 +112,52 @@ + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll + + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll + + + ..\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.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.WebPages.3.2.7\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.2.7\lib\net45\System.Web.WebPages.Razor.dll + - - ..\packages\EntityFramework.5.0.0\lib\net40\EntityFramework.dll - True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - True - ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - - - True - ..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll - - - ..\packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll - - - True - ..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.WebRequest.dll - - - ..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll - - - ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll - - - True - ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll - - - ..\packages\Microsoft.AspNet.Web.Optimization.1.0.0\lib\net40\System.Web.Optimization.dll - - - ..\packages\Microsoft.AspNet.Providers.Core.1.2\lib\net40\System.Web.Providers.dll - - - True - ..\packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll - - - True - ..\packages\WebGrease.1.3.0\lib\WebGrease.dll + + ..\packages\WebGrease.1.6.0\lib\WebGrease.dll - - True - ..\packages\WebGrease.1.3.0\lib\Antlr3.Runtime.dll + + ..\packages\Microsoft.AspNet.WebPages.Data.3.2.7\lib\net45\WebMatrix.Data.dll + + + ..\packages\Microsoft.AspNet.WebPages.WebData.3.2.7\lib\net45\WebMatrix.WebData.dll @@ -198,6 +204,8 @@ + + @@ -224,24 +232,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -263,6 +407,11 @@ + + + + + @@ -290,11 +439,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + @@ -318,6 +612,16 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + - - - - - - -
- -
- -
-
- - - - -
- - -
- - - - - - - - - -

- - - - -
- - -
- - -
- - -
- - - - -
- - -
- - - - -
- - -
- - - - - - - - - -
- - -
- - - - -
-
- - - - - -
- -
- -
-
- -
-
- -
-
- -
-
- -
-
- - - - - - - - - - - - - -
- - - - - - - - - - - - -
- } - - - - - - @{ - var shouldShowServiceRecordList = "display: block"; - - if (Model.IsInGroupBookingMode && !Model.IsInEditingMode) - { - shouldShowServiceRecordList = "display: none"; - } - } - - @using (Html.BeginForm("LoadServiceRecords", "Main", FormMethod.Post, new { id = "selectSCForm2", style = shouldShowServiceRecordList })) - { -
-
- -
-
- } - - -
- -
- @foreach (var record in Model.ServiceRecords) - { -
- -
- - - - - - - - - - - @{ - if (Model.ShowDistanceField && record.DistanceInMeter != null && record.DistanceInMeter.Value > 0) - { - - - - - } - } - - - - - - - - - - - - - - - - - - - - - - @{ - if (Model.Dokutypes.Length >= 1) - { - - - - - } - else if (record.Notice2 == null && record.Notice3 == null && record.Notice4 == null && record.Notice5 == null && Model.Dokutypes.Length == 0) - { - - - - - } - else if (record.Notice2 != null || record.Notice3 != null || record.Notice4 != null || record.Notice5 != null) - { - - - - - } - } - @{if (record.Notice2 != null) - { - if (Model.Dokutypes.Length >= 2) - { - if (!record.Notice2.Equals("") && Model.Dokutypes[1] != null) - { - - - - - } - } - else if (!record.Notice2.Equals("")) - { - - - - - } - } - - if (record.Notice3 != null) - { - if (Model.Dokutypes.Length >= 3) - { - if (!record.Notice3.Equals("") && Model.Dokutypes[2] != null) - { - - - - - } - } - else if (!record.Notice3.Equals("")) - { - - - - - } - } - - if (record.Notice4 != null) - { - if (Model.Dokutypes.Length >= 4) - { - if (!record.Notice4.Equals("") && Model.Dokutypes[3] != null) - { - - - - - } - } - else if (!record.Notice4.Equals("")) - { - - - - - } - } - - if (record.Notice5 != null) - { - if (Model.Dokutypes.Length == 5) - { - if (!record.Notice5.Equals("") && Model.Dokutypes[4] != null) - { - - - - - } - } - else if (!record.Notice5.Equals("")) - { - - - - - } - } - } - - @{if (Model.ShowSignature) - { - - - - -} - } - -
-
- @using (Html.BeginForm("SetSelectedGroupServiceRecord", "Main", FormMethod.Post, new { id = "editGroupServiceRecord_" + record.ServiceRecordOid.Value })) - { - - } - - - - - - @{ - if (record.SignatureOid == null && Model.ShowSignature) - { - - } - } - - @{ - if (record.SignatureOid.HasValue) - { - using (Html.BeginForm("LoadSignatureImage", "Main", FormMethod.Post, new { id = String.Format("signatureLoadingForm{0}", record.SignatureOid.Value), style = "display:inline;" })) - { - - - } - } - } -
-
Minuten (gerundet): - @{ - var rd = MobileUtils.GetDecimalValueWithMaxDecimal(record.RoundedDuration, 2); - - if (record.ServiceDescription.Category.Percentage > 0 && record.ServiceDescription.Category.Percentage < 100) - { - rd = rd * record.ServiceDescription.Category.Percentage / 100; - } - - @(record.GroupOid != null ? string.Format("{0:###0.#} ({0:###0.#})", rd) : string.Format("{0:###0.#} ({1:###0.#})", (record.End.Value - record.Start.Value).TotalMinutes, rd)) - } - -
Gefahrene Kilometer:@record.DistanceInMeter.ToString()
Ziele: - @{ - if (record.Goals != null) - { - foreach (var goal in record.Goals) - { - @(goal.TypeDescription) - if (record.Goals.IndexOf(goal) < record.Goals.Count - 1) - { - @(", ") - } - } - } - } -
Leistungskategorie:@record.ServiceDescription.CategoryName
Leistung:@record.ServiceDescription.Name
Mitarbeiter:@record.Employee
Angelegt am:@record.InsertedOn
@Model.Dokutypes[0].TypeDescription:@record.Notice
Dokumentation:@record.Notice
Dokumentation:@record.Notice
@Model.Dokutypes[1].TypeDescription: @record.Notice2
Dokumentation 2: @record.Notice2
@Model.Dokutypes[2].TypeDescription: @record.Notice3
Dokumentation 3: @record.Notice3
@Model.Dokutypes[3].TypeDescription: @record.Notice4
Dokumentation 4: @record.Notice4
@Model.Dokutypes[4].TypeDescription: @record.Notice5
Dokumentation 5: @record.Notice5
Unterschrieben: - @{if (record.SignatureOid == null || record.SignatureOid < 1) - { - @Html.Raw("NEIN") - } - else - { - @Html.Raw("JA") - } - } -
-
-
- } -
- - - - - - -
-

Eintrag löschen

-

Sind Sie sicher, dass Sie den Eintrag löschen möchten?

-
- @using (Html.BeginForm("DeleteServiceRecord", "Main", FormMethod.Post, new { id = "deletionForm" })) - { - - - - } -
-
- -
-

Speichern erfolgreich

-

-
- - -
-
- - - -
-
- -
- -
-
-
-
- - -
-
- - @foreach (var hp in Model.SupportConceptListObjectsForGroupBooking) - { - - - - - - - - } -
- - - @hp.NameAndDateOfBirth -
-

@hp.SupportConceptTimeSpan

-
-
-
- - @foreach (var gruppe in Model.GroupOfPeopleListItems) - { - - - - - } -
- - - @gruppe.Text -
-
-
-
- -
-
-
- @using (Html.BeginForm("AddEmployeesToGroupBooking", "Main", FormMethod.Post, new { id = "groupBookingEmployeeSelectionForm" })) - { - var i = 0; - - @foreach (var ma in Model.EmployeeListItems) - { - - - - - i++; - } -
- a.EmployeeOid == long.Parse(ma.Value))) { @Html.Raw("checked=\"checked\"") } /> - - @ma.Text -
- } -
-
- -@{ - if (!string.IsNullOrEmpty(Model.SignatureImage)) - { -
-
- Unterschrift -
- } -} - -
-

Validierung

-

-
- - -
-
- -
-

Unterschrift

- -
- - - - - - - - - - - - - - - - - -
- Hilfeplan: -
- Kategorie: -
- Leistung: -
- Datum / Uhrzeit: -
- - -
- -
- - -
- -
- -
- -
- - - + +
+
+ @if(AbstractModel.HasRightToSeeAllSupportConcepts) + { +
+ @using(Html.BeginForm("SetShowOnlyOwnSupportConcepts", "Main", FormMethod.Post)) + { +
+ @Html.CheckBoxFor(m => m.ShowOnlyOwnSupportConcepts, new { onchange = "submitForm(this)", @class = "custom-control-input" }) + @Html.LabelFor(m => m.ShowOnlyOwnSupportConcepts, new { @class = "custom-control-label" }) +
+ } +
+ } + +
+ @using(Html.BeginForm("SetShowExpiredSupportConcepts", "Main", FormMethod.Post)) + { +
+ @Html.CheckBoxFor(m => m.ShowExpiredSupportConcepts, new { onchange = "submitForm(this)", @class = "custom-control-input" }) + @Html.LabelFor(m => m.ShowExpiredSupportConcepts, new { @class = "custom-control-label" }) +
+ } +
+ @if(AbstractModel.HasRightForGroupBookings) + { +
+ @using(Html.BeginForm("SetGroupBookingMode", "Main", FormMethod.Post)) + { +
+ @Html.CheckBoxFor(m => m.IsInGroupBookingMode, new { onchange = "submitForm(this)", @class = "custom-control-input" }) + @Html.LabelFor(m => m.IsInGroupBookingMode, new { @class = "custom-control-label" }) +
+ } +
+ } +
+ + @if(Model != null && !Model.IsInGroupBookingMode) + { + using(Html.BeginForm("SelectSupportConcept", "Main", FormMethod.Post, new { Id = "selectSupportConceptForm" })) + { + var selectedSuportConceptTimeSpanColorClass = Model.SelectedSupportConceptListObject.IsAboutToExpire ? "text-bewo-is-about-to-expire" : Model.SelectedSupportConceptListObject.ExpiresInThreeMonthsOrLess ? "text-bewo-expires-in-three-months" : "text-dark"; + + + + + } + + using(Html.BeginForm("CreateServiceRecord", "Main", FormMethod.Post, new { onreset = "serviceDescriptionSelectOnReset()", id = "serviceRecordCreationForm" })) + { +
+
+
+ +
+
+ +
+
+
+ @Html.LabelFor(m => m.SelectedEmployeeOid) + @Html.DropDownListFor(m => m.SelectedEmployeeOid, Model.EmployeeListItems, new { id = "employeesDropDown", @class = "form-control", onchange = "setSelectedEmployee()" }) +
+
+
+
+
+
+ @Html.LabelFor(m => m.SelectedServiceCategoryOid) + @Html.DropDownListFor(m => m.SelectedServiceCategoryOid, Model.ServiceCategoryListItems, new { onchange = "loadServiceDescriptions()", @class = "form-control", Id = "category-select" }) +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+ +
+
+
+
+ @if(Model.NumberOfDokuTypes == 0) + { +
+ + +
+ } + else + { + +
+ @for(var i = 0; i < Model.Dokutypes.Length; i++) + { + var textareaName = i + 1 < 1 ? "Dokumentation" : "Dokumentation" + (i + 1); + +
+ +
+ } +
+ } +
+ +
+
+ } + +
+
+ @using(Html.BeginForm("LoadServiceRecords", "Main", FormMethod.Post, new { id = "selectServiceRecordForm" })) + { + + } +
+
+ +
+
+ +
+
+ } + + @if(Model != null) + { + foreach(var serviceRecord in Model.ServiceRecords) + { +

@serviceRecord.Start - @serviceRecord.End

+ } + } + + +
diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index 217d3e3cb..2e766c3ee 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -6,16 +6,15 @@ @ViewBag.Title - - + @* - - - - + + + + @@ -27,7 +26,6 @@ - @@ -37,80 +35,120 @@ - + *@ + + + + + + + + + + + + + + + + + + - Lade... + @if (Model != null) + { + + } + + -
-
- -
-

Fehler

-

Ein Fehler ist aufgetreten

-
-
- -
-
- -