Calendar will now only show monitored episodes

NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesBetweenDatesFixture.cs

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

NzbDrone.Core/Tv/EpisodeRepository.cs

@@ -119,8 +119,12 @@ namespace NzbDrone.Core.Tv
 
         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)