diff --git a/.gitignore b/.gitignore index 1de662f5f..f834f7bc1 100644 --- a/.gitignore +++ b/.gitignore @@ -203,3 +203,7 @@ /ReportImp/PraunheimerWerkstaettenGmbh/obj /ReportImp/PraunheimerWerkstaettenGmbh/bin /ReportImp/LebenshilfeAhrweiler/obj +/ReportImp/HphBersenbrueckAtz/obj +/ReportImp/HphBersenbrueckAtz/bin +/ReportImp/BetreuungsBueroScholzReport/bin +/ReportImp/BetreuungsBueroScholzReport/obj diff --git a/BeWo.sln b/BeWo.sln index ba3e5c616..4c26fb9f2 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.9 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}" EndProject @@ -365,6 +365,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PraunheimerWerkstaettenGmbh EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenshilfeAhrweiler", "ReportImp\LebenshilfeAhrweiler\LebenshilfeAhrweiler.csproj", "{120AC4B5-D4A2-4EBB-A17B-1A30623CF3ED}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HphBersenbrueckAtz", "ReportImp\HphBersenbrueckAtz\HphBersenbrueckAtz.csproj", "{56D310FE-DB98-4EFE-8527-DF94628657F8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetreuungsBueroScholzReport", "ReportImp\BetreuungsBueroScholzReport\BetreuungsBueroScholzReport.csproj", "{606566D9-B8B5-4522-A2B4-175F4BCE98DD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -2680,6 +2684,38 @@ Global {120AC4B5-D4A2-4EBB-A17B-1A30623CF3ED}.Release|Mixed Platforms.Build.0 = Release|Any CPU {120AC4B5-D4A2-4EBB-A17B-1A30623CF3ED}.Release|x86.ActiveCfg = Release|Any CPU {120AC4B5-D4A2-4EBB-A17B-1A30623CF3ED}.Release|x86.Build.0 = Release|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Debug|.NET.ActiveCfg = Debug|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Debug|.NET.Build.0 = Debug|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Debug|x86.ActiveCfg = Debug|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Debug|x86.Build.0 = Debug|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Release|.NET.ActiveCfg = Release|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Release|.NET.Build.0 = Release|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Release|Any CPU.Build.0 = Release|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Release|x86.ActiveCfg = Release|Any CPU + {56D310FE-DB98-4EFE-8527-DF94628657F8}.Release|x86.Build.0 = Release|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Debug|.NET.ActiveCfg = Debug|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Debug|.NET.Build.0 = Debug|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Debug|x86.ActiveCfg = Debug|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Debug|x86.Build.0 = Debug|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|.NET.ActiveCfg = Release|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|.NET.Build.0 = Release|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|Any CPU.Build.0 = Release|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|x86.ActiveCfg = Release|Any CPU + {606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2857,5 +2893,7 @@ Global {E660E5A0-8516-4B5B-B3DB-6D46D630F065} = {D8A691C5-146D-4613-86CC-438F02FE9106} {BCCF055F-CF10-43D6-B618-136665D2A687} = {D8A691C5-146D-4613-86CC-438F02FE9106} {120AC4B5-D4A2-4EBB-A17B-1A30623CF3ED} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {56D310FE-DB98-4EFE-8527-DF94628657F8} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {606566D9-B8B5-4522-A2B4-175F4BCE98DD} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection EndGlobal diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 0a8c237f6..d364a12c3 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -191,7 +191,8 @@ namespace BeWo int maxDaysEditServiceRecordsAllowed = 0; int hilfeplanAuslaufAuswahl = 3; int anzTageZeiterfassErfolgt = 0; - bool printerSettingsUseLandscape = false; + int zeiterfassungsSchwellwert = 80; + bool printerSettingsUseLandscape = false; bool printerSettingsUseMargins = false; bool printerSettingsUsePaperKind = false; var hideServiceRecordInsertedByAndInsertedOn = false; @@ -280,8 +281,15 @@ namespace BeWo { anzTageZeiterfassErfolgt = resultzeitplan; } + + val = GetSettingValue(_Mandator.Settings, "ZeiterfassungsSchwellwert"); + int resultschwell; + if (Int32.TryParse(val, out resultschwell)) + { + zeiterfassungsSchwellwert = resultschwell; + } - val = GetSettingValue(_Mandator.Settings, "ShowDistanceFields"); + val = GetSettingValue(_Mandator.Settings, "ShowDistanceFields"); if (val != null && val.Equals("1")) { showServiceRecordsDistanceFields = true; @@ -416,7 +424,8 @@ namespace BeWo AppSettings.HilfeplanAuslaufAuswahl = hilfeplanAuslaufAuswahl; AppSettings.LastSelectedStundenkontoIntervall = lastSelectedStundenkontoIntervall; AppSettings.AnzTageZeiterfassErfolgt = anzTageZeiterfassErfolgt; - AppSettings.TimeRecordingMenuName = timeRecordingMenuName; + AppSettings.ZeiterfassungsSchwellwert = zeiterfassungsSchwellwert; + AppSettings.TimeRecordingMenuName = timeRecordingMenuName; AppSettings.ShowDistanceFields = showServiceRecordsDistanceFields; AppSettings.ShowSignatures = showSignatures; AppSettings.ShowCustomerDistanceFields = showCustomerDistanceFields; diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index 06f13894d..5ce863e34 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -79,6 +79,8 @@ namespace BeWo.Core.Config public int AnzTageZeiterfassErfolgt { get; set; } + public int ZeiterfassungsSchwellwert { get; set; } + public bool HideServiceRecordInsertedByAndInsertedOn { get; set; } public bool ShowAdvisedAttendedFlag { get; set; } diff --git a/BeWo/View/Detail/MandatorView.xaml b/BeWo/View/Detail/MandatorView.xaml index b7cbb0fd7..772320d2e 100644 --- a/BeWo/View/Detail/MandatorView.xaml +++ b/BeWo/View/Detail/MandatorView.xaml @@ -92,6 +92,7 @@ + @@ -109,16 +110,23 @@ Anzahl Tage in der die Zeiterfassung erfolgen muss (0 für unbegrenzt) + + Schwellwert für die Zeiterfassung in % + + - + + + - + - + - + diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml b/BeWo/View/Detail/ServiceRecordEditView.xaml index 501e8e712..5a1e9da45 100644 --- a/BeWo/View/Detail/ServiceRecordEditView.xaml +++ b/BeWo/View/Detail/ServiceRecordEditView.xaml @@ -146,8 +146,8 @@