From c2c4186965f7d1257d7fb1180c778b62a08fb743 Mon Sep 17 00:00:00 2001 From: Robin Dadswell Date: Wed, 6 Jan 2021 00:06:14 +0000 Subject: [PATCH] formatted date --- .../Movie/Index/Posters/MovieIndexPoster.js | 61 ++++++++++++++++--- .../Movie/Index/Posters/MovieIndexPosters.js | 11 +++- 2 files changed, 63 insertions(+), 9 deletions(-) diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPoster.js b/frontend/src/Movie/Index/Posters/MovieIndexPoster.js index 327cd8ed4..76c02c8af 100644 --- a/frontend/src/Movie/Index/Posters/MovieIndexPoster.js +++ b/frontend/src/Movie/Index/Posters/MovieIndexPoster.js @@ -134,13 +134,57 @@ class MovieIndexPoster extends Component { let releaseDate = ''; if (showReleaseDate) { if (physicalRelease && digitalRelease) { - releaseDate = ''; + if (physicalRelease < digitalRelease) { + releaseDate = getRelativeDate( + physicalRelease, + shortDateFormat, + showRelativeDates, + { + timeFormat, + timeForToday: false + } + ); + } else { + getRelativeDate( + digitalRelease, + shortDateFormat, + showRelativeDates, + { + timeFormat, + timeForToday: false + } + ); + } } else if (physicalRelease && !digitalRelease) { - releaseDate = physicalRelease; + releaseDate = getRelativeDate( + physicalRelease, + shortDateFormat, + showRelativeDates, + { + timeFormat, + timeForToday: false + } + ); } else if (digitalRelease && !physicalRelease) { - releaseDate = digitalRelease; + releaseDate = getRelativeDate( + digitalRelease, + shortDateFormat, + showRelativeDates, + { + timeFormat, + timeForToday: false + } + ); } else { - releaseDate = inCinemas; + releaseDate = getRelativeDate( + inCinemas, + shortDateFormat, + showRelativeDates, + { + timeFormat, + timeForToday: false + } + ); } } @@ -272,9 +316,12 @@ class MovieIndexPoster extends Component { { showReleaseDate && -
- {releaseDate} -
+ }