Add priority

gordon-cs · Jul 12, 2024 · 8dc596e · 8dc596e
1 parent df1a963
commit 8dc596e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/Gordon360/Models/ViewModels/PosterPatchViewModel.cs b/Gordon360/Models/ViewModels/PosterPatchViewModel.cs
@@ -11,5 +11,6 @@ public class PosterPatchViewModel
  public DateTime? VisibleDate { get; set; }
  public DateTime? ExpirationDate { get; set; }
  public string? Status { get; set; }
+ public int? Priority { get; set; }
 
 }
diff --git a/Gordon360/Models/ViewModels/PosterUploadViewModel.cs b/Gordon360/Models/ViewModels/PosterUploadViewModel.cs
@@ -14,6 +14,7 @@ public class PosterUploadViewModel
  public DateTime ExpirationDate { get; set; }
  public string UploaderADUsername { get; set; }
  public int StatusID { get; set; }
+ public int? Priority { get; set; }
 
  public Poster ToPoster()
  {
@@ -27,6 +28,7 @@ public Poster ToPoster()
  ExpirationDate = this.ExpirationDate,
  UploaderADUsername = this.UploaderADUsername,
  StatusID = 1, //default status
+ Priority = this.Priority ?? 0
  };
  }
 }
diff --git a/Gordon360/Models/ViewModels/PosterViewModel.cs b/Gordon360/Models/ViewModels/PosterViewModel.cs
@@ -13,6 +13,7 @@ public class PosterViewModel
  public DateTime VisibleDate { get; set; }
  public DateTime ExpirationDate { get; set; }
  public string Status { get; set; }
+ public int Priority { get; set; }
 
 
  public static implicit operator PosterViewModel(Poster p)
@@ -26,7 +27,8 @@ public static implicit operator PosterViewModel(Poster p)
  ImagePath = p.ImagePath,
  VisibleDate = p.VisibleDate,
  ExpirationDate = p.ExpirationDate,
- Status = p.Status.Status
+ Status = p.Status.Status,
+ Priority = p.Priority
  };
 
  return vm;

diff --git a/Gordon360/Services/PosterService.cs b/Gordon360/Services/PosterService.cs
@@ -39,7 +39,8 @@ public IEnumerable<PosterViewModel> GetCurrentPosters()
  {
  return GetPosters()
  .Where(p => p.ExpirationDate > DateTime.Now && p.Status == "Visible" && p.VisibleDate < DateTime.Now)
- .OrderBy(p => p.ExpirationDate);
+ .OrderByDescending(p => p.Priority)
+ .ThenBy(p => p.ExpirationDate);
  }
 
  //currently will only get posters if someone is signed up for a club, can be modified to include all posters but prioritize