Fix for #110 - der skal kun være uddannelsesflyvninger (mindst 1 grad…

…ing) på listen
janhebnes · Apr 7, 2021 · c68e923 · c68e923
1 parent cfbd02c
commit c68e923
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/FlightJournal.Web/Controllers/TrainingLogHistoryController.cs b/FlightJournal.Web/Controllers/TrainingLogHistoryController.cs
@@ -154,12 +154,15 @@ public ActionResult ExportToJson(DateTime? fromDate, DateTime? toDate)
         private IEnumerable<Flight> SelectFlights(DateTime fromDate, DateTime toDate)
         {
             IEnumerable<Flight> flights;
-            var flightIds = db.AppliedExercises.Select(x => x.FlightId).Union(db.TrainingFlightAnnotations.Select(y => y.FlightId)).Distinct().ToList();
+            var trainingFlightIds = db.AppliedExercises
+                .Where(x=>x.Grading != null)
+                .Select(x => x.FlightId)
+                .Distinct().ToList();
 
             switch (UsersAccessScope())
             {
                 case AccessScope.AllFlights:
-                    flights = db.Flights.Where(x => x.Date >= fromDate && x.Date <= toDate && flightIds.Contains(x.FlightId));
+                    flights = db.Flights.Where(x => x.Date >= fromDate && x.Date <= toDate && trainingFlightIds.Contains(x.FlightId));
                     if (ClubController.CurrentClub.ShortName != null)
                     {
                         flights = flights.Where(f =>
@@ -172,7 +175,7 @@ private IEnumerable<Flight> SelectFlights(DateTime fromDate, DateTime toDate)
                     break;
                 case AccessScope.OwnFlights:
                     var pilotId = Request.Pilot().PilotId;
-                    flights = db.Flights.Where(x => x.Date >= fromDate && x.Date <= toDate && flightIds.Contains(x.FlightId) && (x.PilotId == pilotId || x.PilotBackseatId == pilotId));
+                    flights = db.Flights.Where(x => x.Date >= fromDate && x.Date <= toDate && trainingFlightIds.Contains(x.FlightId) && (x.PilotId == pilotId || x.PilotBackseatId == pilotId));
                     break;
                 default:
                     flights = Enumerable.Empty<Flight>();