From 96e6549cbe272c127825b060f2b88b5ac01b6804 Mon Sep 17 00:00:00 2001 From: Waldi Date: Tue, 21 Feb 2017 11:05:27 +0100 Subject: [PATCH] =?UTF-8?q?report=20Prof=20eggers=20Stiftung=20und=20das?= =?UTF-8?q?=20l=C3=B6schen=20von=20Zeiterfassungen=20sollte=20wieder=20fun?= =?UTF-8?q?ktionieren.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + BeWo.sln | 19 + BeWo/Core/BeWoUtils.cs | 2 +- BeWo/View/Detail/ServiceRecordEditView.xaml | 6 +- .../Detail/ServiceRecordGroupEditView.xaml | 4 +- BeWo/View/Detail/ServiceRecordView2.xaml | 4 +- BeWo/View/Detail/ServiceRecordView2.xaml.cs | 8 +- .../ListViewModel/ServiceRecordListVM.cs | 2 +- BeWo/ViewModel/ServiceRecordVM.cs | 64 +- .../ProfEggersStiftung.csproj | 90 ++ .../Properties/AssemblyInfo.cs | 36 + .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 892 ++++++++++++++++++ .../ServicesOverviewReport.cs | 66 ++ .../ServicesOverviewReport.resx | 123 +++ Service/Plugins/PluginLoader.cs | 4 +- 16 files changed, 1279 insertions(+), 44 deletions(-) create mode 100644 ReportImp/ProfEggersStiftung/ProfEggersStiftung.csproj create mode 100644 ReportImp/ProfEggersStiftung/Properties/AssemblyInfo.cs create mode 100644 ReportImp/ProfEggersStiftung/Properties/licenses.licx create mode 100644 ReportImp/ProfEggersStiftung/ServicesOverviewReport.Designer.cs create mode 100644 ReportImp/ProfEggersStiftung/ServicesOverviewReport.cs create mode 100644 ReportImp/ProfEggersStiftung/ServicesOverviewReport.resx diff --git a/.gitignore b/.gitignore index 1c84636d2..cc8cbd237 100644 --- a/.gitignore +++ b/.gitignore @@ -198,3 +198,5 @@ /ReportImp/EigentstaendigHennef/obj /ReportImp/RessourceEV/bin /ReportImp/RessourceEV/obj +/ReportImp/ProfEggersStiftung/bin +/ReportImp/ProfEggersStiftung/obj diff --git a/BeWo.sln b/BeWo.sln index d8e4b5af4..e2d6bf009 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -359,6 +359,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EigentstaendigHennef", "Rep EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RessourceEV", "ReportImp\RessourceEV\RessourceEV.csproj", "{703E37E6-1219-490D-BCBD-7258DAB4239A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProfEggersStiftung", "ReportImp\ProfEggersStiftung\ProfEggersStiftung.csproj", "{E660E5A0-8516-4B5B-B3DB-6D46D630F065}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -2626,6 +2628,22 @@ Global {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|Mixed Platforms.Build.0 = Release|Any CPU {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|x86.ActiveCfg = Release|Any CPU {703E37E6-1219-490D-BCBD-7258DAB4239A}.Release|x86.Build.0 = Release|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Debug|.NET.ActiveCfg = Debug|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Debug|.NET.Build.0 = Debug|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Debug|x86.ActiveCfg = Debug|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Debug|x86.Build.0 = Debug|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|.NET.ActiveCfg = Release|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|.NET.Build.0 = Release|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|Any CPU.Build.0 = Release|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|x86.ActiveCfg = Release|Any CPU + {E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2800,5 +2818,6 @@ Global {80A09638-DCBC-46E9-96FA-C7070B40BF3A} = {D8A691C5-146D-4613-86CC-438F02FE9106} {0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2} = {D8A691C5-146D-4613-86CC-438F02FE9106} {703E37E6-1219-490D-BCBD-7258DAB4239A} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {E660E5A0-8516-4B5B-B3DB-6D46D630F065} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection EndGlobal diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index c5d964e77..fa8373a64 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -1562,7 +1562,7 @@ namespace BeWo.Core var StartDatetime = new DateTime(dates.Year, dates.Month, 1, 0, 0, 0); dc.Start = StartDatetime; - dc.End = StartDatetime.AddHours(vm.DurationMonthYearGes.Value); + dc.End = StartDatetime.AddMinutes((double)vm.DurationMonthYearGes*60); } diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml b/BeWo/View/Detail/ServiceRecordEditView.xaml index de5c054c9..3491610b7 100644 --- a/BeWo/View/Detail/ServiceRecordEditView.xaml +++ b/BeWo/View/Detail/ServiceRecordEditView.xaml @@ -249,15 +249,15 @@