diff --git a/dashboard-ui/advancedmetadata.html b/dashboard-ui/advancedmetadata.html index 59bec15c36..252df7de7f 100644 --- a/dashboard-ui/advancedmetadata.html +++ b/dashboard-ui/advancedmetadata.html @@ -11,7 +11,6 @@
Basics - TV Settings Images Advanced
diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html index 47a8d7602d..dd9699facd 100644 --- a/dashboard-ui/episodes.html +++ b/dashboard-ui/episodes.html @@ -9,6 +9,7 @@
Suggested Next up + Upcoming Shows Episodes Genres diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html index 7f16d558b1..bf74a28dc4 100644 --- a/dashboard-ui/metadata.html +++ b/dashboard-ui/metadata.html @@ -11,7 +11,6 @@
Basics - TV Settings Images Advanced
@@ -39,6 +38,11 @@
If enabled, movies and people will be updated automatically as they are updated on the themoviedb.org.
+
  • + + +
    If enabled, tv series and episodes will be updated automatically as they are updated on the tvdb.com.
    +
  • - -
    • - - -
    - -
    - - -
    - - diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index 3cb4a605a9..ead573bd24 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -36,7 +36,7 @@ if (item.LocationType == "Virtual" && item.Type == "Episode") { try { - if (item.PremiereDate && (new Date().getTime() >= parseISO8601Date(item.PremiereDate).getTime())) { + if (item.PremiereDate && (new Date().getTime() >= parseISO8601Date(item.PremiereDate, { toLocal: true }).getTime())) { isMissingEpisode = true; } } catch (err) { @@ -610,7 +610,7 @@ try { - var date = parseISO8601Date(review.Date, true).toLocaleDateString(); + var date = parseISO8601Date(review.Date, { toLocal: true }).toLocaleDateString(); html += '' + date + ''; } diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 6a792f393e..0e2ed096df 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -47,7 +47,7 @@ if (item.Type == "Episode" && item.LocationType == "Virtual") { try { - if (item.PremiereDate && (new Date().getTime() >= parseISO8601Date(item.PremiereDate).getTime())) { + if (item.PremiereDate && (new Date().getTime() >= parseISO8601Date(item.PremiereDate, { toLocal: true }).getTime())) { htmlName += ''; } } catch (err) { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 1d2dff4c5f..a2e712e616 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -671,7 +671,7 @@ if (item.PremiereDate) { try { - futureDateText = LibraryBrowser.getFutureDateText(parseISO8601Date(item.PremiereDate), true); + futureDateText = LibraryBrowser.getFutureDateText(parseISO8601Date(item.PremiereDate, { toLocal: true }), true); } catch (err) { @@ -884,7 +884,7 @@ try { - var date = parseISO8601Date(item.PremiereDate); + var date = parseISO8601Date(item.PremiereDate, { toLocal: true }); html += "
    "; html += LibraryBrowser.getPremiereDateText(item, date); @@ -1020,7 +1020,10 @@ } try { - if (item.PremiereDate && (new Date().getTime() < parseISO8601Date(item.PremiereDate).getTime())) { + + var date = parseISO8601Date(item.PremiereDate, { toLocal: true }); + + if (item.PremiereDate && (new Date().getTime() < date.getTime())) { return '
    Unaired
    '; } } catch (err) { @@ -1051,7 +1054,10 @@ if (!isPlayed) { try { - if (date && (new Date().getTime() - parseISO8601Date(date).getTime()) < 604800000) { + + var parsedDate = parseISO8601Date(item.PremiereDate, { toLocal: true }); + + if (date && (new Date().getTime() - parsedDate.getTime()) < 604800000) { return "
    New
    "; } } catch (err) { diff --git a/dashboard-ui/scripts/metadataconfigurationpage.js b/dashboard-ui/scripts/metadataconfigurationpage.js index f0ba6093d4..463b23588a 100644 --- a/dashboard-ui/scripts/metadataconfigurationpage.js +++ b/dashboard-ui/scripts/metadataconfigurationpage.js @@ -43,6 +43,7 @@ $('#selectCountry', page).val(config.MetadataCountryCode).selectmenu("refresh"); $('#chkEnableInternetProviders', page).checked(config.EnableInternetProviders).checkboxradio("refresh"); $('#chkEnableTmdbPersonUpdates', page).checked(config.EnableTmdbUpdates).checkboxradio("refresh"); + $('#chkEnableTvdbUpdates', page).checked(config.EnableTvDbUpdates).checkboxradio("refresh"); Dashboard.hideLoadingMsg(); }, @@ -91,6 +92,7 @@ config.SaveLocalMeta = $('#chkSaveLocal', form).checked(); config.PreferredMetadataLanguage = $('#selectLanguage', form).val(); config.MetadataCountryCode = $('#selectCountry', form).val(); + config.EnableTvDbUpdates = $('#chkEnableTvdbUpdates', form).checked(); ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); }); diff --git a/dashboard-ui/scripts/metadatatv.js b/dashboard-ui/scripts/metadatatv.js deleted file mode 100644 index a56e962c9c..0000000000 --- a/dashboard-ui/scripts/metadatatv.js +++ /dev/null @@ -1,52 +0,0 @@ -var MetadataTVPage = { - - onPageShow: function () { - Dashboard.showLoadingMsg(); - - var page = this; - - ApiClient.getServerConfiguration().done(function (result) { - - MetadataTVPage.load(page, result); - }); - }, - - load: function (page, config) { - - var chkEnableTvdbUpdates = $('#chkEnableTvdbUpdates', page).checked(config.EnableTvDbUpdates).checkboxradio("refresh"); - var chkCreateMissingEpisodes = $('#chkCreateMissingEpisodes', page).checked(config.CreateVirtualMissingEpisodes).checkboxradio("refresh"); - var chkCreateFutureEpisodes = $('#chkCreateFutureEpisodes', page).checked(config.CreateVirtualFutureEpisodes).checkboxradio("refresh"); - - if (config.EnableInternetProviders) { - chkEnableTvdbUpdates.checkboxradio("enable"); - chkCreateMissingEpisodes.checkboxradio("enable"); - chkCreateFutureEpisodes.checkboxradio("enable"); - } else { - chkEnableTvdbUpdates.checkboxradio("disable"); - chkCreateMissingEpisodes.checkboxradio("disable"); - chkCreateFutureEpisodes.checkboxradio("disable"); - } - - Dashboard.hideLoadingMsg(); - }, - - onSubmit: function () { - var form = this; - - Dashboard.showLoadingMsg(); - - ApiClient.getServerConfiguration().done(function (config) { - - config.EnableTvDbUpdates = $('#chkEnableTvdbUpdates', form).checked(); - config.CreateVirtualMissingEpisodes = $('#chkCreateMissingEpisodes', form).checked(); - config.CreateVirtualFutureEpisodes = $('#chkCreateFutureEpisodes', form).checked(); - - ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); - }); - - // Disable default form submission - return false; - } -}; - -$(document).on('pageshow', "#metadataTvPage", MetadataTVPage.onPageShow); \ No newline at end of file diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js index b5c67fa998..3f91dfda04 100644 --- a/dashboard-ui/scripts/tvupcoming.js +++ b/dashboard-ui/scripts/tvupcoming.js @@ -11,7 +11,7 @@ SortBy: "PremiereDate,AirTime", SortOrder: "Ascending", IncludeItemTypes: "Episode", - Limit: 40, + Limit: 30, Recursive: true, Fields: "PrimaryImageAspectRatio,SeriesInfo,UserData", HasPremiereDate: true, @@ -21,7 +21,7 @@ ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { if (!result.Items.length) { - $('#upcomingItems', page).html("Nothing here. To utilize this feature, please enable future episodes in the dashboard metadata configuration."); + $('#upcomingItems', page).html("

    Nothing here. Please ensure downloading of internet metadata is enabled.

    ").trigger('create'); return; } $('#upcomingItems', page).html(LibraryBrowser.getPosterViewHtml({