added sort by calculated release date

pull/5848/head
Robin Dadswell 4 years ago committed by Qstick
parent 600c7e3391
commit c28b62da2a

@ -74,6 +74,15 @@ function MovieIndexSortMenu(props) {
{translate('Year')}
</SortMenuItem>
<SortMenuItem
name="releaseDate"
sortKey={sortKey}
sortDirection={sortDirection}
onPress={onSortSelect}
>
{translate('ReleaseDate')}
</SortMenuItem>
<SortMenuItem
name="inCinemas"
sortKey={sortKey}

@ -288,12 +288,14 @@ class MovieIndexPoster extends Component {
<MovieIndexPosterInfo
qualityProfile={qualityProfile}
showQualityProfile={showQualityProfile}
showReleaseDate={showReleaseDate}
showRelativeDates={showRelativeDates}
shortDateFormat={shortDateFormat}
timeFormat={timeFormat}
inCinemas={inCinemas}
physicalRelease={physicalRelease}
digitalRelease={digitalRelease}
releaseDate={releaseDate}
{...otherProps}
/>

@ -10,10 +10,12 @@ function MovieIndexPosterInfo(props) {
studio,
qualityProfile,
showQualityProfile,
showReleaseDate,
added,
inCinemas,
digitalRelease,
physicalRelease,
releaseDate,
certification,
path,
sizeOnDisk,
@ -57,7 +59,25 @@ function MovieIndexPosterInfo(props) {
);
}
if (sortKey === 'inCinemas' && inCinemas) {
if (sortKey === 'releaseDate' && !showReleaseDate) {
const relativeReleaseDate = getRelativeDate(
releaseDate,
shortDateFormat,
showRelativeDates,
{
timeFormat,
timeForToday: false
}
);
return (
<div className={styles.info}>
{translate('releaseDate')}: {relativeReleaseDate}
</div>
);
}
if (sortKey === 'inCinemas' && inCinemas && !showReleaseDate) {
const inCinemasDate = getRelativeDate(
inCinemas,
shortDateFormat,
@ -75,7 +95,7 @@ function MovieIndexPosterInfo(props) {
);
}
if (sortKey === 'digitalRelease' && digitalRelease) {
if (sortKey === 'digitalRelease' && digitalRelease && !showReleaseDate) {
const digitalReleaseDate = getRelativeDate(
digitalRelease,
shortDateFormat,
@ -93,7 +113,7 @@ function MovieIndexPosterInfo(props) {
);
}
if (sortKey === 'physicalRelease' && physicalRelease) {
if (sortKey === 'physicalRelease' && physicalRelease && !showReleaseDate) {
const physicalReleaseDate = getRelativeDate(
physicalRelease,
shortDateFormat,
@ -147,9 +167,11 @@ MovieIndexPosterInfo.propTypes = {
certification: PropTypes.string,
digitalRelease: PropTypes.string,
physicalRelease: PropTypes.string,
releaseDate: PropTypes.string.isRequired,
path: PropTypes.string.isRequired,
sizeOnDisk: PropTypes.number,
sortKey: PropTypes.string.isRequired,
showReleaseDate: PropTypes.bool.isRequired,
showRelativeDates: PropTypes.bool.isRequired,
shortDateFormat: PropTypes.string.isRequired,
timeFormat: PropTypes.string.isRequired

Loading…
Cancel
Save