diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js index f36967c7c..fbff4a934 100644 --- a/PlexRequests.UI/Content/requests.js +++ b/PlexRequests.UI/Content/requests.js @@ -540,6 +540,7 @@ function buildRequestContext(result, type) { requestedUsers: result.requestedUsers ? result.requestedUsers.join(', ') : '', requestedDate: Humanize(result.requestedDate), requestedDateTicks: result.requestedDateTicks, + released: result.released, available: result.available, admin: result.admin, issues: result.issues, diff --git a/PlexRequests.UI/Models/RequestViewModel.cs b/PlexRequests.UI/Models/RequestViewModel.cs index e5dc09746..b7508d36d 100644 --- a/PlexRequests.UI/Models/RequestViewModel.cs +++ b/PlexRequests.UI/Models/RequestViewModel.cs @@ -39,6 +39,7 @@ namespace PlexRequests.UI.Models public string PosterPath { get; set; } public DateTime ReleaseDate { get; set; } public long ReleaseDateTicks { get; set; } + public bool Released { get; set; } public RequestType Type { get; set; } public string Status { get; set; } public bool Approved { get; set; } diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs index afb98b454..4e7a9b7ce 100644 --- a/PlexRequests.UI/Modules/RequestsModule.cs +++ b/PlexRequests.UI/Modules/RequestsModule.cs @@ -152,8 +152,10 @@ namespace PlexRequests.UI.Modules var viewModel = dbMovies.Select(movie => { + return new RequestViewModel { + ProviderId = movie.ProviderId, Type = movie.Type, Status = movie.Status, @@ -163,6 +165,7 @@ namespace PlexRequests.UI.Modules ReleaseDate = movie.ReleaseDate, ReleaseDateTicks = movie.ReleaseDate.Ticks, RequestedDate = movie.RequestedDate, + Released = DateTime.Now > movie.ReleaseDate, RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(movie.RequestedDate, DateTimeOffset).Ticks, Approved = movie.Available || movie.Approved, Title = movie.Title, @@ -246,7 +249,8 @@ namespace PlexRequests.UI.Modules ReleaseDateTicks = tv.ReleaseDate.Ticks, RequestedDate = tv.RequestedDate, RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(tv.RequestedDate, DateTimeOffset).Ticks, - Approved = tv.Available || tv.Approved, + Released = DateTime.Now > tv.ReleaseDate, + Approved = tv.Available || tv.Approved, Title = tv.Title, Overview = tv.Overview, RequestedUsers = isAdmin ? tv.AllUsers.ToArray() : new string[] { }, @@ -288,6 +292,7 @@ namespace PlexRequests.UI.Modules ReleaseDateTicks = album.ReleaseDate.Ticks, RequestedDate = album.RequestedDate, RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(album.RequestedDate, DateTimeOffset).Ticks, + Released = DateTime.Now > album.ReleaseDate, Approved = album.Available || album.Approved, Title = album.Title, Overview = album.Overview, @@ -411,4 +416,4 @@ namespace PlexRequests.UI.Modules : new JsonResponseModel { Result = false, Message = "Could not update the notes, please try again or check the logs" }); } } -} \ No newline at end of file +} diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml index b6fe26214..fe556f45d 100644 --- a/PlexRequests.UI/Views/Requests/Index.cshtml +++ b/PlexRequests.UI/Views/Requests/Index.cshtml @@ -63,6 +63,8 @@