ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: RosterRO Fix

Browse Source
This commit is contained in:
Marcel Hirschle
2022-12-29 13:57:48 +01:00
parent c9bff87ad2
commit 0eb72d5e55
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Host/ReportView.aspx.cs
View File

@@ -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<int> feiertage = new List<int>();
if (Request.Params["ft"] != null)

7
Report/ReportObjects/RosterRO.cs
View File

@@ -15,7 +15,7 @@ namespace BeWo.Report.ReportObjects
public List<RosterReportRow> RosterReportRows { get; set; }
public int FirstWeekDay { get; set; }
public List<int> Feiertage { get; set; }
public EmployeeDC Creator { get; set; }
public RosterRO()
{
RosterReportRows = new List<RosterReportRow>();
@@ -84,7 +84,7 @@ namespace BeWo.Report.ReportObjects
return res;
}
public static RosterRO CreateNew(List<DienstEintragDC> dienstEintragDCs, List<DienstvertretungDC> dienstvertretungDCs, List<EmployeeDC> employee,
List<DienstInfoDC> dienstInfoDCs, BS.Shared.DataContracts.Compact.CompactWohnheimDC compactWohnheimDC, int year, int month, List<int> feiertage, int sortingIndex, bool aufsteigend)
List<DienstInfoDC> dienstInfoDCs, BS.Shared.DataContracts.Compact.CompactWohnheimDC compactWohnheimDC, int year, int month, List<int> 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