Fix challenges on report to exclude selections

Author: k7hpn

src/GRA.Controllers/MissionControl/ReportingController.cs

@@ -337,19 +337,16 @@ await _userService
                 }
             }
 
-            if (viewModel.PastMaxPage)
-            {
-                return RedirectToAction(nameof(History), new
+            return viewModel.PastMaxPage
+                ? RedirectToAction(nameof(History), new
                 {
                     endDate,
                     page = viewModel.LastPage ?? 1,
                     reportId,
                     requestedBy,
                     startDate
-                });
-            }
-
-            return View(viewModel);
+                })
+                : View(viewModel);
         }
 
         [HttpGet]
@@ -383,19 +380,21 @@ public async Task<IActionResult> Run(ReportCriteriaViewModel viewModel)
 
             var siteId = GetCurrentSiteId();
 
-            var challenges = viewModel.ChallengeRequiredList;
+            var badgeReportList = viewModel.BadgeRequiredList;
+            var challengeReportList = viewModel.ChallengeRequiredList;
 
-            if (viewModel.AllChallenges)
+            if (viewModel.AllChallengesOnly)
             {
                 var challengeIds = await _challengeService.GetAllIdsAsync(siteId);
-                challenges = string.Join(',', challengeIds);
+                challengeReportList = string.Join(',', challengeIds);
+                badgeReportList = string.Empty;
             }
 
             var criterion = new ReportCriterion
             {
-                BadgeRequiredList = viewModel.BadgeRequiredList,
+                BadgeRequiredList = badgeReportList,
                 BranchId = viewModel.BranchId,
-                ChallengeRequiredList = challenges,
+                ChallengeRequiredList = challengeReportList,
                 EndDate = viewModel.EndDate,
                 GroupInfoId = viewModel.GroupInfoId,
                 IncludeAchieverStatus = viewModel.IncludeAchieverStatus,

src/GRA.Controllers/ViewModel/MissionControl/Reporting/ReportCriteriaViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using GRA.Domain.Model;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
@@ -14,7 +15,9 @@ public class ReportCriteriaViewModel
         public int? BranchId { get; set; }
 
         public SelectList BranchList { get; set; }
-        public bool AllChallenges { get; set; }
+
+        [Display(Name = "Report on all Challenges only")]
+        public bool AllChallengesOnly { get; set; }
         public string ChallengeRequiredList { get; set; }
 
         [DisplayName("End Date")]

src/GRA.Web/Areas/MissionControl/Views/Reporting/BadgeCriteria.cshtml

@@ -120,12 +120,10 @@
 
     <div class="row mt-4">
         <div class="col-12 lead">
-            <input asp-for="AllChallenges"
+            <input asp-for="AllChallengesOnly"
                    class="form-check-input me-1"
                    type="checkbox">
-            <label class="form-check-label" for="AllChallenges">
-                Report on all Challenges only
-            </label>
+            <label class="form-check-label" asp-for="AllChallengesOnly"></label>
         </div>
     </div>