diff --git a/Host/ReportView.aspx.cs b/Host/ReportView.aspx.cs index 0513841a2..f400fcbca 100644 --- a/Host/ReportView.aspx.cs +++ b/Host/ReportView.aspx.cs @@ -751,8 +751,11 @@ namespace Host long wOid = int.Parse(Request.Params["wid"]); int sortIndex = int.Parse(Request.Params["si"]); bool aufsteigend = int.Parse(Request.Params["order"]) == 0 ? false : true; - long creator = int.Parse(Request.Params["creator"]); - + long creator = 1; + string creatorParam = Request.Params["creator"]; + if (creatorParam != null) + creator = int.Parse(Request.Params["creator"]); + List feiertage = new List(); if (Request.Params["ft"] != null) diff --git a/Report/ReportObjects/RosterRO.cs b/Report/ReportObjects/RosterRO.cs index aeebe16da..4b857815b 100644 --- a/Report/ReportObjects/RosterRO.cs +++ b/Report/ReportObjects/RosterRO.cs @@ -15,7 +15,7 @@ namespace BeWo.Report.ReportObjects public List RosterReportRows { get; set; } public int FirstWeekDay { get; set; } public List Feiertage { get; set; } - + public EmployeeDC Creator { get; set; } public RosterRO() { RosterReportRows = new List(); @@ -84,7 +84,7 @@ namespace BeWo.Report.ReportObjects return res; } public static RosterRO CreateNew(List dienstEintragDCs, List dienstvertretungDCs, List employee, - List dienstInfoDCs, BS.Shared.DataContracts.Compact.CompactWohnheimDC compactWohnheimDC, int year, int month, List feiertage, int sortingIndex, bool aufsteigend) + List dienstInfoDCs, BS.Shared.DataContracts.Compact.CompactWohnheimDC compactWohnheimDC, int year, int month, List feiertage, int sortingIndex, bool aufsteigend, EmployeeDC creator) { var dt = new DateTime(year, month, 1); // Result @@ -93,7 +93,8 @@ namespace BeWo.Report.ReportObjects WohnheimName = compactWohnheimDC.WohnheimName, ReportDateTime = dt, FirstWeekDay = ((int)dt.DayOfWeek - 1) % 7, - Feiertage = feiertage + Feiertage = feiertage, + Creator = creator }; // WD V F Formel // Mo 1 0 (tag - 1) / 7