+
diff --git a/dashboard-ui/scripts/livetvchannel.js b/dashboard-ui/scripts/livetvchannel.js
index 944c167bc8..17048d86de 100644
--- a/dashboard-ui/scripts/livetvchannel.js
+++ b/dashboard-ui/scripts/livetvchannel.js
@@ -62,7 +62,7 @@
html += '
LIVE ';
}
else if (program.IsPremiere) {
- html += '
PREMIERE ';
+ html += '
PREMIERE ';
}
else if (program.IsSeries && !program.IsRepeat) {
html += '
NEW ';
diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js
index 696a2b9706..ca0da5d109 100644
--- a/dashboard-ui/scripts/livetvguide.js
+++ b/dashboard-ui/scripts/livetvguide.js
@@ -1,5 +1,8 @@
(function ($, document, apiClient) {
+ // 30 mins
+ var cellDurationMs = 30 * 60 * 1000;
+
function formatDigit(i) {
return i < 10 ? "0" + i : i;
}
@@ -29,6 +32,8 @@
date.setTime(date.getTime() - (date.getSeconds() * 1000));
+ date.setHours(date.getHours(), date.getMinutes(), 0, 0);
+
return date;
}
@@ -46,14 +51,14 @@
var date = currentDate;
var nextDay = new Date(date.getTime());
- nextDay.setDate(nextDay.getDate() + 1);
+ nextDay.setDate(nextDay.getDate() + 2);
nextDay.setHours(1, 0, 0, 0);
var promise1 = channelsPromise;
var promise2 = apiClient.getLiveTvPrograms({
UserId: Dashboard.getCurrentUserId(),
- MaxEndDate: getDateFormat(nextDay)
+ MaxStartDate: getDateFormat(nextDay)
});
@@ -66,69 +71,216 @@
});
}
- function renderDate(page, date) {
-
- $('.guideDate', page).html(LibraryBrowser.getFutureDateText(date));
-
- $('.timeslotHeaders', page).html(getTimeslotHeadersHtml(date));
- }
-
function getTimeslotHeadersHtml(date) {
var html = '';
- html += '';
-
date = new Date(date.getTime());
var dateNumber = date.getDate();
while (date.getDate() == dateNumber) {
html += '';
// Add 30 mins
- date.setTime(date.getTime() + (30 * 60 * 1000));
+ date.setTime(date.getTime() + cellDurationMs);
}
return html;
}
- function getChannelHtml(page, date, channel, programs) {
+ function findProgramStartingInCell(programs, startIndex, cellStart, cellEnd, cellIndex) {
+
+ for (var i = startIndex, length = programs.length; i < length; i++) {
+
+ var program = programs[i];
+
+ if (!program.StartDateLocal) {
+ try {
+
+ program.StartDateLocal = parseISO8601Date(program.StartDate, { toLocal: true });
+
+ } catch (err) {
+
+ }
+
+ }
+
+ if (!program.EndDateLocal) {
+ try {
+
+ program.EndDateLocal = parseISO8601Date(program.EndDate, { toLocal: true });
+
+ } catch (err) {
+
+ }
+
+ }
+
+ var localTime = program.StartDateLocal.getTime();
+ if ((localTime >= cellStart || cellIndex == 0) && localTime < cellEnd && program.EndDateLocal > cellStart) {
+
+ return {
+
+ index: i,
+ program: program
+ };
+
+ }
+ }
+
+ return null;
+ }
+
+ function getChannelProgramsHtml(page, date, channel, programs) {
var html = '';
- html += '
';
+ var dateNumber = date.getDate();
- html += '
';
- html += channel.Name + '
' + channel.Number;
- html += '
';
+ programs = programs.filter(function (curr) {
+ return curr.ChannelId == channel.Id;
+ });
+ html += '
';
+
+ var programIndex = 0;
+ var cellIndex = 0;
+
+ while (date.getDate() == dateNumber) {
+
+ // Add 30 mins
+ var cellEndDate = new Date(date.getTime() + cellDurationMs);
+
+ var program = findProgramStartingInCell(programs, programIndex, date, cellEndDate, cellIndex);
+
+ if (program) {
+ programIndex = program.index + 1;
+ program = program.program;
+ }
+
+ html += '
';
+
+ var cssClass = "timeslotCellInner";
+
+ if (program) {
+ if (program.IsKids) {
+ cssClass += " childProgramInfo";
+ }
+ else if (program.IsSports) {
+ cssClass += " sportsProgramInfo";
+ }
+ else if (program.IsNews) {
+ cssClass += " newsProgramInfo";
+ }
+ else if (program.IsMovie) {
+ cssClass += " movieProgramInfo";
+ }
+ }
+
+ html += '
';
+
+ if (program) {
+
+ html += '
';
+ html += program.Name;
+ html += '
';
+
+ html += '
';
+
+ if (program.IsLive) {
+ html += 'LIVE ';
+ }
+ else if (program.IsPremiere) {
+ html += 'PREMIERE ';
+ }
+ else if (program.IsSeries && !program.IsRepeat) {
+ html += 'NEW ';
+ }
+
+ html += LiveTvHelpers.getDisplayTime(program.StartDateLocal);
+ html += ' - ';
+ html += LiveTvHelpers.getDisplayTime(program.EndDateLocal);
+
+ html += '
';
+
+ } else {
+ html += ' ';
+ }
+
+ html += '
';
+ html += '
';
+
+ date = cellEndDate;
+ cellIndex++;
+ }
html += '
';
return html;
}
- function renderChannels(page, date, channels, programs) {
+ function renderPrograms(page, date, channels, programs) {
var html = [];
for (var i = 0, length = channels.length; i < length; i++) {
- html.push(getChannelHtml(page, date, channels[i], programs));
+ html.push(getChannelProgramsHtml(page, date, channels[i], programs));
}
- $('#guide', page).html(html.join(''));
+ $('.programGrid', page).html(html.join(''));
+ }
+
+ function renderChannelHeaders(page, channels) {
+
+ var html = '';
+
+ for (var i = 0, length = channels.length; i < length; i++) {
+
+ var channel = channels[i];
+
+ html += '';
+ }
+
+ $('.channelList', page).html(html);
}
function renderGuide(page, date, channels, programs) {
- renderDate(page, date);
- renderChannels(page, date, channels, programs);
+ renderChannelHeaders(page, channels);
+ $('.timeslotHeaders', page).html(getTimeslotHeadersHtml(date));
+ renderPrograms(page, date, channels, programs);
}
- $(document).on('pagebeforeshow', "#liveTvGuidePage", function () {
+ function onProgramGridScroll(page, elem) {
+
+ var grid = $(elem);
+
+ grid.prev().scrollTop(grid.scrollTop());
+ $('.timeslotHeaders', page).scrollLeft(grid.scrollLeft());
+ }
+
+ $(document).on('pageinit', "#liveTvGuidePage", function () {
+
+ var page = this;
+
+ $('.programGrid', page).on('scroll', function () {
+
+ onProgramGridScroll(page, this);
+ });
+
+ }).on('pagebeforeshow', "#liveTvGuidePage", function () {
var page = this;