diff --git a/.gitignore b/.gitignore index abea730e8..56dcb6c90 100644 --- a/.gitignore +++ b/.gitignore @@ -481,3 +481,7 @@ /ReportImp/BetreuungsbueroFrankRoehrig/obj /ReportImp/BeWoMundo/obj/Debug /ReportImp/BeWoMundo/obj/Release +/ReportImp/Kimm/obj/Debug +/ReportImp/Kimm/obj/Release +/ReportImp/KommAmbulanteDienste/obj/Debug +/ReportImp/KommAmbulanteDienste/obj/Release diff --git a/BeWo/View/Detail/Report/QueryView.xaml.cs b/BeWo/View/Detail/Report/QueryView.xaml.cs index 8e37b77c1..a2769a239 100644 --- a/BeWo/View/Detail/Report/QueryView.xaml.cs +++ b/BeWo/View/Detail/Report/QueryView.xaml.cs @@ -169,7 +169,10 @@ namespace BeWo.View.Detail.Report String dummy = ""; items.Add(dummy); - items.AddRange(customValues); + if (customValues != null) + { + items.AddRange(customValues); + } combobox.ItemsSource = items; combobox.SelectedItem = items[0]; diff --git a/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs b/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs index a7728c708..68c581ccd 100644 --- a/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs +++ b/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs @@ -146,7 +146,12 @@ namespace BeWo.View.Report.Kilometerauswertung SelectedMonthIndex = monthIndex < 0 ? 11 : monthIndex; + InitYearComboBox(); + if (DateTime.Now.Month == 1) + { + SelectedYearIndex = 1; + } ServiceFacade.DoEmployeeServiceAsync(s => s.GetActiveCompactCustomersForEmployee(BeWoApp.LoggedOnEmployeeOid), allCustomers => { diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index 01810596f..9ce224d89 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -605,6 +605,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVZMedikusGmbH", "ReportImp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoMundo", "ReportImp\BeWoMundo\BeWoMundo.csproj", "{28A05739-2642-4CBA-AC84-1E9C58BCA2E5}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KommAmbulanteDienste", "ReportImp\KommAmbulanteDienste\KommAmbulanteDienste.csproj", "{A368A18F-0D5F-49EB-885A-CEED97B5A5C5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetreuungsbueroFrankRoehrig", "ReportImp\BetreuungsbueroFrankRoehrig\BetreuungsbueroFrankRoehrig.csproj", "{C252012D-4EE1-4262-B599-28297AE41E9C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kimm", "ReportImp\Kimm\Kimm.csproj", "{CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -4828,6 +4834,54 @@ Global {28A05739-2642-4CBA-AC84-1E9C58BCA2E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU {28A05739-2642-4CBA-AC84-1E9C58BCA2E5}.Release|x86.ActiveCfg = Release|Any CPU {28A05739-2642-4CBA-AC84-1E9C58BCA2E5}.Release|x86.Build.0 = Release|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Debug|.NET.ActiveCfg = Debug|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Debug|.NET.Build.0 = Debug|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Debug|x86.ActiveCfg = Debug|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Debug|x86.Build.0 = Debug|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Release|.NET.ActiveCfg = Release|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Release|.NET.Build.0 = Release|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Release|Any CPU.Build.0 = Release|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Release|x86.ActiveCfg = Release|Any CPU + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5}.Release|x86.Build.0 = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|.NET.ActiveCfg = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|.NET.Build.0 = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|x86.ActiveCfg = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|x86.Build.0 = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|.NET.ActiveCfg = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|.NET.Build.0 = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|Any CPU.Build.0 = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|x86.ActiveCfg = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|x86.Build.0 = Release|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Debug|.NET.ActiveCfg = Debug|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Debug|.NET.Build.0 = Debug|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Debug|x86.ActiveCfg = Debug|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Debug|x86.Build.0 = Debug|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Release|.NET.ActiveCfg = Release|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Release|.NET.Build.0 = Release|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Release|Any CPU.Build.0 = Release|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Release|x86.ActiveCfg = Release|Any CPU + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -5126,6 +5180,9 @@ Global {34882C5F-D3BD-4642-832D-7D5A96A45E5E} = {D8A691C5-146D-4613-86CC-438F02FE9106} {D71875ED-CD52-43D9-B066-843E891EDA0E} = {D8A691C5-146D-4613-86CC-438F02FE9106} {28A05739-2642-4CBA-AC84-1E9C58BCA2E5} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {A368A18F-0D5F-49EB-885A-CEED97B5A5C5} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {C252012D-4EE1-4262-B599-28297AE41E9C} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index 5268c62bb..3c96d0219 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -612,7 +612,7 @@ - True + False False 8808 / diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index 84d4b3bf1..18b34d072 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -20,22 +20,22 @@ - + - - - - + + + + - - - - - - + + + + + + - +