mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Calendar will now only show monitored episodes

This commit is contained in:
Mark McDowall 2013-07-15 15:52:00 -07:00
parent f4a3394745
commit 440a128f28
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesBetweenDatesFixture.cs
View File

@ -16,6 +16,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests
var series = Builder<Series>.CreateNew() var series = Builder<Series>.CreateNew()
.With(s => s.Id = 0) .With(s => s.Id = 0)
.With(s => s.Runtime = 30) .With(s => s.Runtime = 30)
.With(s => s.Monitored = true)
.Build(); .Build();
series.Id = Db.Insert(series).Id; series.Id = Db.Insert(series).Id;
@ -23,6 +24,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests
var episode = Builder<Episode>.CreateNew() var episode = Builder<Episode>.CreateNew()
.With(e => e.Id = 0) .With(e => e.Id = 0)
.With(e => e.SeriesId = series.Id) .With(e => e.SeriesId = series.Id)
.With(e => e.Monitored = true)
.Build(); .Build();
Db.Insert(episode); Db.Insert(episode);

8
NzbDrone.Core/Tv/EpisodeRepository.cs
View File

@ -119,8 +119,12 @@ namespace NzbDrone.Core.Tv
public List<Episode> EpisodesBetweenDates(DateTime startDate, DateTime endDate) public List<Episode> EpisodesBetweenDates(DateTime startDate, DateTime endDate)
{ {
return Query.Where<Episode>(e => e.AirDate >= startDate) return Query.Join<Episode, Series>(JoinType.Inner, e => e.Series, (e, s) => e.SeriesId == s.Id)
.AndWhere(e => e.AirDate <= endDate).ToList(); .Where<Episode>(e => e.AirDate >= startDate)
.AndWhere(e => e.AirDate <= endDate)
.AndWhere(e => e.Monitored)
.AndWhere(e => e.Series.Monitored)
.ToList();
} }
public void SetMonitoredFlat(Episode episode, bool monitored) public void SetMonitoredFlat(Episode episode, bool monitored)