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

Konflikte behoben

Browse Source
This commit is contained in:
Lyndon Jetten
2021-11-08 20:39:15 +01:00
parent 9783999104 a874692529
commit ca0e45e33d
235 changed files with 118819 additions and 3914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Host/ReportView.aspx.cs
View File

@@ -727,7 +727,9 @@ namespace Host
List<int> feiertage = new List<int>();
if (Request.Params["ft"] != null)
feiertage = Request.Params["ft"].Split(';').Select(int.Parse).ToList();
feiertage = Request.Params["ft"].Split(';').Select(int.Parse).ToList();
return reportCreator.CreateRosterReport(wOid, dt, feiertage);
}
private XtraReport CreateRosterReportIst()
@@ -742,7 +744,7 @@ namespace Host
private XtraReport CreateVorlagenReport()
{
long template = long.Parse(Request.Params["template"]);
long template = long.Parse(Request.Params["vorlage"]);
string objectOidString = Request.Params["obj"];
string[] oidArray = objectOidString.Split(',');