From a2a425018939ebb259d24d38633107805481c7ee Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Sun, 28 Feb 2021 06:45:02 -0600 Subject: [PATCH] fix playout display (time zone) --- ErsatzTV.Application/Playouts/Mapper.cs | 8 ++++++-- .../Data/Repositories/PlayoutRepository.cs | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ErsatzTV.Application/Playouts/Mapper.cs b/ErsatzTV.Application/Playouts/Mapper.cs index bba6cf488..4939e4856 100644 --- a/ErsatzTV.Application/Playouts/Mapper.cs +++ b/ErsatzTV.Application/Playouts/Mapper.cs @@ -1,4 +1,5 @@ -using ErsatzTV.Core.Domain; +using System; +using ErsatzTV.Core.Domain; namespace ErsatzTV.Application.Playouts { @@ -12,7 +13,10 @@ namespace ErsatzTV.Application.Playouts playout.ProgramSchedulePlayoutType); internal static PlayoutItemViewModel ProjectToViewModel(PlayoutItem playoutItem) => - new(GetDisplayTitle(playoutItem.MediaItem), playoutItem.Start, GetDisplayDuration(playoutItem.MediaItem)); + new( + GetDisplayTitle(playoutItem.MediaItem), + new DateTimeOffset(playoutItem.Start, TimeSpan.Zero).ToLocalTime(), + GetDisplayDuration(playoutItem.MediaItem)); private static PlayoutChannelViewModel Project(Channel channel) => new(channel.Id, channel.Number, channel.Name); diff --git a/ErsatzTV.Infrastructure/Data/Repositories/PlayoutRepository.cs b/ErsatzTV.Infrastructure/Data/Repositories/PlayoutRepository.cs index 2d0ecec38..60a682d86 100644 --- a/ErsatzTV.Infrastructure/Data/Repositories/PlayoutRepository.cs +++ b/ErsatzTV.Infrastructure/Data/Repositories/PlayoutRepository.cs @@ -67,9 +67,13 @@ namespace ErsatzTV.Infrastructure.Data.Repositories .ThenInclude(mi => (mi as Movie).MovieMetadata) .ThenInclude(mm => mm.Artwork) .Include(i => i.MediaItem) + .ThenInclude(mi => (mi as Movie).MediaVersions) + .Include(i => i.MediaItem) .ThenInclude(mi => (mi as Episode).EpisodeMetadata) .ThenInclude(em => em.Artwork) .Include(i => i.MediaItem) + .ThenInclude(mi => (mi as Episode).MediaVersions) + .Include(i => i.MediaItem) .ThenInclude(mi => (mi as Episode).Season) .ThenInclude(s => s.SeasonMetadata) .Filter(i => i.PlayoutId == playoutId)