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

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
Christian
2024-12-19 17:13:08 +01:00
parent 69357d7380 e835f7fedf
commit 16ff50a3a4
136 changed files with 12286 additions and 25920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Host/Host.csproj.user
View File

@@ -31,8 +31,8 @@
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>False</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>

10
Host/ReportView.aspx.cs
View File

@@ -587,12 +587,18 @@ namespace Host
supportConcept = MapperFactory.SupportConceptDC_SupportConcept.MapToNewDC(DAOFactory.GenericDAO.GetByID<SupportConcept>(long.Parse(Request.Params["scOid"])));
if (Request.Params["start"] != null)
start = DateTime.Parse(Request.Params["start"]);
else
else if (supportConcept != null)
start = supportConcept.Ratings[0].StartDate;
else
start = null;
if (Request.Params["end"] != null)
end = DateTime.Parse(Request.Params["end"]);
else
else if (supportConcept != null)
end = supportConcept.Ratings[supportConcept.Ratings.Count - 1].StartDate;
else
end = null;
if (Request.Params["ze"] != null)
inclZeiterfassung = (Request.Params["ze"] == "1") ? true : false;
if (Request.Params["goals"] != null)