Jahresbericht um Option "Stichtagsbezogen auswerten" und "Nicht bewilligte Hilfepläne berücksichtigen" erweitert.

Host/ReportView.aspx.cs

@@ -24,6 +24,7 @@ using BeWo.Service.DCEntityMapper;
 using BS.Shared.ReportRequests;
 
 using SecurityUtils = BeWo.Service.Security.SecurityUtils;
+using DevExpress.DataProcessing;
 
 namespace Host
 {
@@ -784,8 +785,33 @@ namespace Host
 
 		private XtraReport CreateJahresbericht()
 		{
-			int year = int.Parse(Request.Params["y"]);
-			long? cbOid = null;
+            int year = DateTime.Now.Year - 1;
+            if (Request.Params["y"] != null)
+			{
+                year = int.Parse(Request.Params["y"]);
+            }
+            DateTime start = new DateTime(year, 1, 1);
+            DateTime end = new DateTime(year, 12, 31);
+			bool showOnlyApprovedSupportConcepts = true;
+            bool stichtagsbezogen = true;
+
+            if (Request.Params["start"] != null)
+            {
+                start = DateTime.Parse(Request.Params["start"]);
+            }
+            if (Request.Params["end"] != null)
+            {
+                end = DateTime.Parse(Request.Params["end"]);
+            }
+            if (Request.Params["appr"] != null)
+            {
+				showOnlyApprovedSupportConcepts = "0".Equals(Request.Params["appr"]) ? false : true;
+            }
+            if (Request.Params["stichtag"] != null)
+            {
+                stichtagsbezogen = "0".Equals(Request.Params["stichtag"]) ? false : true;
+            }
+            long? cbOid = null;
 			if (Request.Params["cb"] != null)
 				cbOid = long.Parse(Request.Params["cb"]);
 
@@ -797,7 +823,19 @@ namespace Host
 			if (Request.Params["art"] != null)
 				artOid = long.Parse(Request.Params["art"]);
 
-			return reportCreator.CreateJahresberichtReport(year, cbOid, teamOid, artOid);
+
+			var config = new AnnualReportConfigDC
+			{
+				CostbearerOid = cbOid,
+				TeamOid = teamOid,
+				CustomerCareTypeValueListEntryOid = artOid,
+				StartDate = start,
+				EndDate = end,
+				ShowOnlyApprovedSupportConcepts = showOnlyApprovedSupportConcepts,
+				StichtagsbezogenAuswerten = stichtagsbezogen
+			};
+
+			return reportCreator.CreateJahresberichtReport(config);
 		}
 
 		private XtraReport CreateEmployeeDataReport()