|
|
@@ -246,9 +246,14 @@ namespace GreenTree.Nachtragsmanagement.Web.Implementations
|
|
|
|
|
|
var currentCalendarWeek = GetCalendarWeek(DateTime.Now);
|
|
|
|
|
|
+ foreach (var appendix in appendices)
|
|
|
+ {
|
|
|
+ var h = (currentCalendarWeek - GetCalendarWeek(appendix.OfferingDate.Value)) % interval;
|
|
|
+ }
|
|
|
+
|
|
|
appendices = appendices
|
|
|
- .Where(a => (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) % interval == 0) ||
|
|
|
- (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) < 0))
|
|
|
+ .Where(a => ((currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value)) % interval == 0) ||
|
|
|
+ ((currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value)) < 0))
|
|
|
.OrderBy(a => a.Site == null
|
|
|
? null
|
|
|
: a.Site.CustomNumber.TryGetInt())
|
|
|
@@ -298,8 +303,8 @@ namespace GreenTree.Nachtragsmanagement.Web.Implementations
|
|
|
var currentCalendarWeek = GetCalendarWeek(DateTime.Now);
|
|
|
|
|
|
appendices = appendices
|
|
|
- .Where(a => (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) % interval == 0) ||
|
|
|
- (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) < 0))
|
|
|
+ .Where(a => ((currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value)) % interval == 0) ||
|
|
|
+ ((currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value)) < 0))
|
|
|
.OrderBy(a => a.Site == null
|
|
|
? null
|
|
|
: a.Site.CustomNumber.TryGetInt())
|
|
|
@@ -342,8 +347,8 @@ namespace GreenTree.Nachtragsmanagement.Web.Implementations
|
|
|
var currentCalendarWeek = GetCalendarWeek(DateTime.Now);
|
|
|
|
|
|
appendices = appendices
|
|
|
- .Where(a => (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) % interval == 0) ||
|
|
|
- (currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value) < 0))
|
|
|
+ .Where(a => ((currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value)) % interval == 0) ||
|
|
|
+ ((currentCalendarWeek - GetCalendarWeek(a.OfferingDate.Value)) < 0))
|
|
|
.OrderBy(a => a.Site == null
|
|
|
? null
|
|
|
: a.Site.CustomNumber.TryGetInt())
|