diff --git a/.gitignore b/.gitignore index d068335d1..43c12139e 100644 --- a/.gitignore +++ b/.gitignore @@ -399,3 +399,9 @@ /ReportImp/SehtMuenster/obj/Debug /ReportImp/SehtMuenster/obj/Release /ReportImp/SehtMuenster/bin/Release +/ReportImp/FabEv/bin/Debug +/ReportImp/FabEv/obj/Debug +/ReportImp/FabEv/obj/Release +/ReportImp/ProBalance/bin/Debug +/ReportImp/ProBalance/obj/Debug +/ReportImp/ProBalance/obj/Release diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 9adede087..86034ddcb 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -39,16 +39,16 @@ false true false - http://app.beyondsoft.de/dev/ + http://app.beyondsoft.de/sbdtest/ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.172 + 2.0.1.173 true publish.htm false true - 173 + 174 2.0.1.%2a false true @@ -2261,372 +2261,372 @@ False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index e8b054f48..f7752167d 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -2,7 +2,7 @@ D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\ - http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/|http://fortis-bewoplaner.fortis-ev.org.local/ + http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/|http://fortis-bewoplaner.fortis-ev.org.local/ diff --git a/Report/ReportObjects/ServicesOverviewRO.cs b/Report/ReportObjects/ServicesOverviewRO.cs index 3fdf31933..33023f90a 100644 --- a/Report/ReportObjects/ServicesOverviewRO.cs +++ b/Report/ReportObjects/ServicesOverviewRO.cs @@ -756,6 +756,11 @@ namespace BeWo.Report.ReportObjects { sd.IsGroup = true; groupBookingDict.Add(iSr.GroupOid.Value, iSr); + if ((!iSr.GroupEmployeeCount.HasValue || iSr.GroupEmployeeCount.Value < 2) && + (!iSr.GroupPersonCount.HasValue || iSr.GroupPersonCount.Value < 2)) + { + sd.IsGroup = false; + } } sd.MinutesDateTime = DateTime.Now.Date.AddMinutes(sd.Minutes); diff --git a/Service/ServiceImplementations/QueryServiceImp.cs b/Service/ServiceImplementations/QueryServiceImp.cs index fb2f9d468..b3dfdc648 100644 --- a/Service/ServiceImplementations/QueryServiceImp.cs +++ b/Service/ServiceImplementations/QueryServiceImp.cs @@ -150,6 +150,10 @@ namespace BeWo.Service.ServiceImplementations newsql = newsql.Replace(":" + GetParamterKeyName(item), String.Format("{0:yyyy-MM-dd}", dt)); } + else + { + newsql = newsql.Replace(":" + GetParamterKeyName(item), String.Format("{0:yyyy-MM-dd}", DateTime.MinValue)); + } break; case QueryParameterType.DateRange: if (item.Value is DateTimeSpan) diff --git a/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs b/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs index f8281d65a..45a44a8c0 100644 --- a/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs +++ b/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs @@ -398,9 +398,14 @@ namespace BS.Shared.DataContracts.Compact cbstr.Append(to.Value.ToShortDateString()); } - if (this.Customer.TerminationDate.HasValue && !String.IsNullOrEmpty(Customer.TerminationReason)) - { - cbstr.Append(" ("+Customer.TerminationReason+")"); + if (this.Customer.TerminationDate.HasValue) + { + String grund = ""; + if (!String.IsNullOrEmpty(Customer.TerminationReason)) + { + grund = ", Begründung: " + Customer.TerminationReason; + } + cbstr.Append(String.Format(" (Betreuung beendet am: {0:dd.MM.yyyy}{1})", Customer.TerminationDate, grund)); } if (cbstr.Length > 0)