1
0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-26 22:46:53 -04:00

Fixed: Calendar Items Show on Correct Day

This commit is contained in:
Qstick
2019-07-27 00:56:07 -04:00
parent 582402d45e
commit 6288936fe2
10 changed files with 43 additions and 81 deletions
+15 -15
View File
@@ -10,24 +10,24 @@ import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
import createCommandsSelector from 'Store/Selectors/createCommandsSelector';
import CalendarPage from './CalendarPage';
function createMissingEpisodeIdsSelector() {
function createMissingMovieIdsSelector() {
return createSelector(
(state) => state.calendar.start,
(state) => state.calendar.end,
(state) => state.calendar.items,
(state) => state.queue.details.items,
(start, end, episodes, queueDetails) => {
return episodes.reduce((acc, episode) => {
const airDateUtc = episode.airDateUtc;
(start, end, movies, queueDetails) => {
return movies.reduce((acc, movie) => {
const inCinemas = movie.inCinemas;
if (
!episode.episodeFileId &&
moment(airDateUtc).isAfter(start) &&
moment(airDateUtc).isBefore(end) &&
isBefore(episode.airDateUtc) &&
!queueDetails.some((details) => !!details.episode && details.episode.id === episode.id)
!movie.movieFileId &&
moment(inCinemas).isAfter(start) &&
moment(inCinemas).isBefore(end) &&
isBefore(movie.inCinemas) &&
!queueDetails.some((details) => !!details.movie && details.movie.id === movie.id)
) {
acc.push(episode.id);
acc.push(movie.id);
}
return acc;
@@ -58,14 +58,14 @@ function createMapStateToProps() {
(state) => state.calendar.filters,
createMovieCountSelector(),
createUISettingsSelector(),
createMissingEpisodeIdsSelector(),
createMissingMovieIdsSelector(),
createIsSearchingSelector(),
(
selectedFilterKey,
filters,
movieCount,
uiSettings,
missingEpisodeIds,
missingMovieIds,
isSearchingForMissing
) => {
return {
@@ -73,7 +73,7 @@ function createMapStateToProps() {
filters,
colorImpairedMode: uiSettings.enableColorImpairedMode,
hasMovie: !!movieCount,
missingEpisodeIds,
missingMovieIds,
isSearchingForMissing
};
}
@@ -82,8 +82,8 @@ function createMapStateToProps() {
function createMapDispatchToProps(dispatch, props) {
return {
onSearchMissingPress(episodeIds) {
dispatch(searchMissing({ episodeIds }));
onSearchMissingPress(movieIds) {
dispatch(searchMissing({ movieIds }));
},
onDaysCountChange(dayCount) {