Add 'all challenges' option to badges report

Author: k7hpn

CHANGELOG.md

@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Validation of aria-describedby attributes when using data validation
 - JavaScript fix to support improved accessibility for TomSelect
 - Color contrast calculations to ensure accessibility compliance
+- Option to badge report to just run for all challenges
 
 ## Changed
 

src/GRA.Controllers/MissionControl/ReportingController.cs

@@ -383,11 +383,19 @@ public async Task<IActionResult> Run(ReportCriteriaViewModel viewModel)
 
             var siteId = GetCurrentSiteId();
 
+            var challenges = viewModel.ChallengeRequiredList;
+
+            if (viewModel.AllChallenges)
+            {
+                var challengeIds = await _challengeService.GetAllIdsAsync(siteId);
+                challenges = string.Join(',', challengeIds);
+            }
+
             var criterion = new ReportCriterion
             {
                 BadgeRequiredList = viewModel.BadgeRequiredList,
                 BranchId = viewModel.BranchId,
-                ChallengeRequiredList = viewModel.ChallengeRequiredList,
+                ChallengeRequiredList = challenges,
                 EndDate = viewModel.EndDate,
                 GroupInfoId = viewModel.GroupInfoId,
                 IncludeAchieverStatus = viewModel.IncludeAchieverStatus,

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

@@ -14,6 +14,7 @@ public class ReportCriteriaViewModel
         public int? BranchId { get; set; }
 
         public SelectList BranchList { get; set; }
+        public bool AllChallenges { get; set; }
         public string ChallengeRequiredList { get; set; }
 
         [DisplayName("End Date")]

src/GRA.Data/Repository/ChallengeRepository.cs

@@ -115,6 +115,15 @@ public async Task<Challenge> GetActiveByIdAsync(int id, int? userId = null)
             return challenge;
         }
 
+        public async Task<IEnumerable<int>> GetAllIdsAsync(int siteId)
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Where(_ => !_.IsDeleted && _.SiteId == siteId)
+                .Select(_ => _.Id)
+                .ToListAsync();
+        }
+
         public new async Task<Challenge> GetByIdAsync(int id)
         {
             var challenge = await DbSet

src/GRA.Domain.Repository/IChallengeRepository.cs

@@ -16,6 +16,8 @@ Task<List<Challenge>> GetByIdsAsync(int siteId, IEnumerable<int> ids,
 
         Task<int> GetChallengeCountAsync(ChallengeFilter filter);
 
+        Task<IEnumerable<int>> GetAllIdsAsync(int siteId);
+
         Task<IEnumerable<ChallengeTask>> GetChallengeTasksAsync(int challengeId, int? userId);
 
         Task<IEnumerable<string>> GetNamesAsync(IEnumerable<int> challengeIds);

src/GRA.Domain.Service/ChallengeService.cs

@@ -473,6 +473,11 @@ public async Task<ChallengeGroup> GetGroupByIdAsync(int id)
             return challengeGroup;
         }
 
+        public async Task<IEnumerable<int>> GetAllIdsAsync(int siteId)
+        {
+            return await _challengeRepository.GetAllIdsAsync(siteId);
+        }
+
         public async Task<ICollection<ChallengeGroup>> GetGroupListAsync()
         {
             VerifyPermission(Permission.ViewAllChallenges);

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

@@ -53,10 +53,10 @@
     <div class="row mt-4">
         <div class="col-12">
             <div class="card">
-                <div class="card-header bg-info-subtle">
+                <div class="card-header bg-info-subtle" id="badgeCardHeader">
                     <h3 class="card-title">Badges</h3>
                 </div>
-                <div class="card-body">
+                <div class="card-body" id="badgeCardBody">
                     <table class="table table-sm table-bordered table-striped">
                         <thead>
                             <tr>
@@ -118,6 +118,17 @@
         </div>
     </div>
 
+    <div class="row mt-4">
+        <div class="col-12 lead">
+            <input asp-for="AllChallenges"
+                   class="form-check-input me-1"
+                   type="checkbox">
+            <label class="form-check-label" for="AllChallenges">
+                Report on all Challenges only
+            </label>
+        </div>
+    </div>
+
     <div class="row mt-4">
         <div class="col-12">
             <button type="submit" class="btn btn-outline-primary">
@@ -208,6 +219,9 @@
 @section scripts
 {
     <script>
+        const allChallenges = document.getElementById("AllChallenges");
+        const badgeCardHeader = document.getElementById("badgeCardHeader");
+        const badgeCardBody = document.getElementById("badgeCardBody");
         const badgeIds = $("#BadgeRequiredList").val().split(',').filter(function (x) { return x }).map(Number);
         const challengeIds = $("#ChallengeRequiredList").val().split(',').filter(function (x) { return x }).map(Number);
         const endDatePicker = graInitalizePickerDatetime(document.getElementById("endDatePicker"));
@@ -343,8 +357,20 @@
         defaultDateTime.setDate(defaultDateTime.getDate() - 1);
         graPickerSetDate(startDatePicker, defaultDateTime);
 
+        allChallenges.addEventListener("input", (event) => {
+            if(event.target.checked === true) {
+                badgeCardHeader.classList.add("bg-secondary-subtle");
+                badgeCardHeader.classList.remove("bg-info-subtle");
+                badgeCardBody.classList.add("d-none");
+            } else {
+                badgeCardHeader.classList.add("bg-info-subtle");
+                badgeCardHeader.classList.remove("bg-secondary-subtle");
+                badgeCardBody.classList.remove("d-none");
+            }
+        });
+
         $("form").on("submit", function (e) {
-            if (badgeIds.length == 0 && challengeIds.length == 0) {
+            if (badgeIds.length == 0 && challengeIds.length == 0 && allChallenges.checked !== true) {
                 e.preventDefault();
                 alert("Please select which badges to report on.");
             }

src/GRA.Web/GRA.Web.csproj

@@ -8,7 +8,7 @@
     <Company>Maricopa County Library District</Company>
     <Copyright>Copyright 2017 Maricopa County Library District</Copyright>
     <Description>The Great Reading Adventure is an open-source tool for managing dynamic library reading programs.</Description>
-    <FileVersion>4.6.1.158</FileVersion>
+    <FileVersion>4.6.1.159</FileVersion>
     <OutputType>Exe</OutputType>
     <PackageId>GRA.Web</PackageId>
     <PackageLicenseUrl>https://github.com/mcld/greatreadingadventure/blob/master/LICENSE</PackageLicenseUrl>