Merge pull request #1248 from gordon-cs/s25-show-current-or-next

s25 show only finalized schedule

Author: jsenning

Gordon360/Controllers/ScheduleController.cs

@@ -1,4 +1,4 @@
-using Gordon360.Authorization;
+using Gordon360.Authorization;
 using Gordon360.Enums;
 using Gordon360.Extensions.System;
 using Gordon360.Models.ViewModels;
@@ -35,13 +35,14 @@ public async Task<ActionResult<CoursesBySessionViewModel>> GetAllCourses(string
         {
             result = await scheduleService.GetAllInstructorCoursesAsync(username);
         }
+
         return Ok(result);
     }
 
     /// <summary>
-    ///  Gets all term objects for a user
+    /// Gets all term-based course schedules for a user, filtered to only include officially published terms.
     /// </summary>
-    /// <returns>A IEnumerable of term objects as well as the schedules</returns>
+    /// <returns>A list of published term schedule objects</returns>
     [HttpGet]
     [Route("{username}/allcourses-by-term")]
     public async Task<ActionResult<IEnumerable<CoursesByTermViewModel>>> GetAllCoursesByTerm(string username)
@@ -59,7 +60,10 @@ public async Task<ActionResult<IEnumerable<CoursesByTermViewModel>>> GetAllCours
             result = await scheduleService.GetAllInstructorCoursesByTermAsync(username);
         }
 
-        return Ok(result);
+        var publishedResult = result
+            .Where(r => string.Equals(r.ShowOnWeb, "B", StringComparison.OrdinalIgnoreCase))
+            .ToList();
+        return Ok(publishedResult);
     }
 
     /// <summary>
@@ -73,4 +77,4 @@ public async Task<ActionResult<bool>> GetCanReadStudentSchedules()
         var groups = AuthUtils.GetGroups(User);
         return groups.Contains(AuthGroup.Advisors);
     }
-}
+}

Gordon360/Models/ViewModels/CoursesByTermViewModel.cs

@@ -9,6 +9,7 @@ public record CoursesByTermViewModel(
     string TermDescription,
     DateTime? TermBeginDate,
     DateTime? TermEndDate,
+    string ShowOnWeb,
     IEnumerable<UserCoursesViewModel> AllCourses)
 {
     public CoursesByTermViewModel(YearTermTableViewModel term, IEnumerable<UserCoursesViewModel> courses) : this(
@@ -17,6 +18,7 @@ public CoursesByTermViewModel(YearTermTableViewModel term, IEnumerable<UserCours
         TermDescription: term.Description,
         TermBeginDate: term.BeginDate,
         TermEndDate: term.EndDate,
+        ShowOnWeb: term.ShowOnWeb,
         AllCourses: courses)
     { }
 }

Gordon360/Models/ViewModels/YearTermTableViewModel.cs

@@ -10,6 +10,7 @@ public class YearTermTableViewModel
         public DateTime? BeginDate { get; set; }
         public DateTime? EndDate { get; set; }
         public string Description { get; set; }
+        public string ShowOnWeb { get; set; }
 
         public YearTermTableViewModel(YearTermTable entity)
         {
@@ -18,7 +19,7 @@ public YearTermTableViewModel(YearTermTable entity)
             BeginDate = entity.TRM_BEGIN_DTE;
             EndDate = entity.TRM_END_DTE;
             Description = entity.YR_TRM_DESC;
+            ShowOnWeb = entity.SHOW_ON_WEB;
         }
     }
 }
-