diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js
index 5d0edde4e3..f0f54accbc 100644
--- a/dashboard-ui/scripts/livetvitems.js
+++ b/dashboard-ui/scripts/livetvitems.js
@@ -108,19 +108,19 @@
if (params.IsMovie == 'true') {
query.IsMovie = true;
}
- else if (params.IsMovie == 'true') {
+ else if (params.IsMovie == 'false') {
query.IsMovie = false;
}
if (params.IsSports == 'true') {
query.IsSports = true;
}
- else if (params.IsSports == 'true') {
+ else if (params.IsSports == 'false') {
query.IsSports = false;
}
if (params.IsKids == 'true') {
query.IsKids = true;
}
- else if (params.IsKids == 'true') {
+ else if (params.IsKids == 'false') {
query.IsKids = false;
}
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 729e80f688..595d5de4d9 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -53,18 +53,6 @@
indexByDate: false
});
});
-
- //ApiClient.getLiveTvRecordings({
-
- // userId: Dashboard.getCurrentUserId(),
- // IsInProgress: true,
- // Fields: 'CanDelete'
-
- //}).then(function (result) {
-
- // renderRecordings(context.querySelector('#activeRecordings'), result.Items);
-
- //});
}
function renderLatestRecordings(context) {
@@ -107,7 +95,7 @@
function renderEpisodeRecordings(context) {
- ApiClient.getLiveTvRecordings({
+ ApiClient.getLiveTvRecordingSeries({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
@@ -118,11 +106,14 @@
}).then(function (result) {
- renderRecordings(context.querySelector('#episodeRecordings'), result.Items);
+ renderRecordings(context.querySelector('#episodeRecordings'), result.Items, {
+ showItemCounts: true,
+ showParentTitle: false
+ });
});
}
- function renderProgramRecordings(context) {
+ function renderSportsRecordings(context) {
ApiClient.getLiveTvRecordings({
@@ -131,12 +122,31 @@
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
- IsMovie: false,
- IsSeries: false
+ IsSports: true
}).then(function (result) {
- renderRecordings(context.querySelector('#programRecordings'), result.Items, {
+ renderRecordings(context.querySelector('#sportsRecordings'), result.Items, {
+ showYear: true,
+ showParentTitle: false
+ });
+ });
+ }
+
+ function renderKidsRecordings(context) {
+
+ ApiClient.getLiveTvRecordings({
+
+ UserId: Dashboard.getCurrentUserId(),
+ Limit: enableScrollX() ? 12 : 8,
+ IsInProgress: false,
+ Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
+ EnableTotalRecordCount: false,
+ IsKids: true
+
+ }).then(function (result) {
+
+ renderRecordings(context.querySelector('#kidsRecordings'), result.Items, {
showYear: true,
showParentTitle: false
});
@@ -169,7 +179,8 @@
renderLatestRecordings(context);
renderMovieRecordings(context);
renderEpisodeRecordings(context);
- renderProgramRecordings(context);
+ renderSportsRecordings(context);
+ renderKidsRecordings(context);
}
function onMoreClick(e) {
@@ -189,6 +200,12 @@
case 'programs':
Dashboard.navigate('livetvitems.html?type=Recordings&IsSeries=false&IsMovie=false');
break;
+ case 'kids':
+ Dashboard.navigate('livetvitems.html?type=Recordings&IsKids=true');
+ break;
+ case 'sports':
+ Dashboard.navigate('livetvitems.html?type=Recordings&IsSports=true');
+ break;
default:
break;
}
diff --git a/dashboard-ui/scripts/livetvschedule.js b/dashboard-ui/scripts/livetvschedule.js
index b5992d3587..87b4148421 100644
--- a/dashboard-ui/scripts/livetvschedule.js
+++ b/dashboard-ui/scripts/livetvschedule.js
@@ -1,5 +1,24 @@
define(['scripts/livetvcomponents', 'emby-button', 'emby-itemscontainer'], function () {
+ function renderActiveRecordings(context) {
+
+ ApiClient.getLiveTvTimers({
+
+ IsActive: true
+
+ }).then(function (result) {
+
+ // The IsActive param is new, so handle older servers that don't support it
+ if (result.Items.length && result.Items[0].Status != 'InProgress') {
+ result.Items = [];
+ }
+
+ renderTimers(context.querySelector('#activeRecordings'), result.Items, {
+ indexByDate: false
+ });
+ });
+ }
+
function renderTimers(context, timers, options) {
LiveTvHelpers.getTimersHtml(timers, options).then(function (html) {
@@ -33,6 +52,7 @@
Dashboard.showLoadingMsg();
+ renderActiveRecordings(context);
renderUpcomingRecordings(context);
}
diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json
index c9395ba0e0..9cbc5b23ef 100644
--- a/dashboard-ui/strings/en-US.json
+++ b/dashboard-ui/strings/en-US.json
@@ -2133,6 +2133,6 @@
"H264EncodingPresetHelp": "Choose a faster value to improve performance, or a slower value to improve quality.",
"LabelH264Crf": "H264 encoding CRF:",
"H264CrfHelp": "The Constant Rate Factor (CRF) is the default quality setting for the x264 encoder. You can set the values between 0 and 51, where lower values would result in better quality (at the expense of higher file sizes). Sane values are between 18 and 28. The default for x264 is 23, so you can use this as a starting point.",
- "HeaderRecordedMovies": "Recorded Movies",
- "HeaderRecordedEpisodes": "Recorded Episodes"
+ "Sports": "Sports",
+ "HeaderForKids": "For Kids"
}