From f0a64f2f2ecd7c29c363d2ea4d506a22dc8cd913 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 15 Dec 2013 09:19:24 -0500 Subject: [PATCH] live tv + nuget updates --- dashboard-ui/livetvseriestimer.html | 54 +++++++++++---- .../scripts/advancedconfigurationpage.js | 2 +- dashboard-ui/scripts/livetvseriestimer.js | 69 +++++++++++++++++-- dashboard-ui/scripts/livetvseriestimers.js | 33 +++------ 4 files changed, 112 insertions(+), 46 deletions(-) diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html index f48ebd5723..85ae32d37a 100644 --- a/dashboard-ui/livetvseriestimer.html +++ b/dashboard-ui/livetvseriestimer.html @@ -14,31 +14,55 @@
-

+

-

-

- -

+

Cancel Series

-
+

+

+

+
  • - - + + + + +
    • +
  • diff --git a/dashboard-ui/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js index d10ce59457..7e25832337 100644 --- a/dashboard-ui/scripts/advancedconfigurationpage.js +++ b/dashboard-ui/scripts/advancedconfigurationpage.js @@ -75,7 +75,7 @@ header: "Select Server Cache Path", - instruction: "Browse or enter the path to use for Media Browser Server cache. The folder must be writeable." + instruction: "Browse or enter the path to use for Media Browser Server cache. The folder must be writeable. The location of this folder will directly impact server performance and should ideally be placed on a solid state drive." }); }); diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js index fce978d4c1..6462626ffc 100644 --- a/dashboard-ui/scripts/livetvseriestimer.js +++ b/dashboard-ui/scripts/livetvseriestimer.js @@ -26,20 +26,67 @@ currentItem = item; $('.itemName', page).html(item.Name); - $('.channel', page).html('' + item.ChannelName + '').trigger('create'); $('.overview', page).html(item.Overview || ''); $('#txtRequestedPrePaddingSeconds', page).val(item.RequestedPrePaddingSeconds); $('#txtRequestedPostPaddingSeconds', page).val(item.RequestedPostPaddingSeconds); $('#txtRequiredPrePaddingSeconds', page).val(item.RequiredPrePaddingSeconds); $('#txtRequiredPostPaddingSeconds', page).val(item.RequiredPostPaddingSeconds); - $('#selectPriority', page).val(item.Priority); - $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item)); + var channelHtml = ''; + + if (item.RecurrenceType == 'NewProgramEventsAllChannels' || item.RecurrenceType == 'AllProgramEventsAllChannels') { + channelHtml += 'All Channels'; + } + else if (item.ChannelId) { + channelHtml += '' + item.ChannelName + ''; + } + + $('.channel', page).html('Channel:   ' + channelHtml).trigger('create'); + + $('#selectSeriesType', page).val(item.RecurrenceType).selectmenu('refresh').trigger('change'); + + selectDays(page, item.Days); + + + $('.time', page).html('Time:   ' + LiveTvHelpers.getDisplayTime(item.StartDate)); Dashboard.hideLoadingMsg(); } + function selectDays(page, days) { + + var daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + + for (var i = 0, length = daysOfWeek.length; i < length; i++) { + + var day = daysOfWeek[i]; + + $('#chk' + day, page).checked(days.indexOf(day) != -1).checkboxradio('refresh'); + + } + + } + + function getDays(page) { + + var daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + + var days = []; + + for (var i = 0, length = daysOfWeek.length; i < length; i++) { + + var day = daysOfWeek[i]; + + if ($('#chk' + day, page).checked()) { + days.push(day); + } + + } + + return days; + } + function onSubmit() { Dashboard.showLoadingMsg(); @@ -52,7 +99,9 @@ item.RequestedPostPaddingSeconds = $('#txtRequestedPostPaddingSeconds', form).val(); item.RequiredPrePaddingSeconds = $('#txtRequiredPrePaddingSeconds', form).val(); item.RequiredPostPaddingSeconds = $('#txtRequiredPostPaddingSeconds', form).val(); - item.Priority = $('#selectPriority', form).val(); + item.RecurrenceType = $('#selectSeriesType', form).val(); + + item.Days = getDays(form); ApiClient.updateLiveTvSeriesTimer(item).done(function () { Dashboard.alert('Timer Saved'); @@ -70,7 +119,7 @@ var id = getParameterByName('id'); - apiClient.getLiveTvTimer(id).done(function (result) { + apiClient.getLiveTvSeriesTimer(id).done(function (result) { renderTimer(page, result); @@ -87,6 +136,16 @@ }); + $('#selectSeriesType', page).on('change', function () { + + if (this.value == 'Manual') { + $('#fldDays', page).show(); + } else { + $('#fldDays', page).hide(); + } + + }); + }).on('pagebeforeshow', "#liveTvSeriesTimerPage", function () { var page = this; diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js index 65dafd4e4f..03cb8e8242 100644 --- a/dashboard-ui/scripts/livetvseriestimers.js +++ b/dashboard-ui/scripts/livetvseriestimers.js @@ -32,9 +32,8 @@ html += ' '; html += 'Name'; html += 'Channel'; - html += 'Start'; - html += 'End'; html += 'Days'; + html += 'Time'; html += ''; @@ -53,33 +52,15 @@ html += ''; html += ''; - if (timer.ChannelId) { + + if (timer.RecurrenceType == 'NewProgramEventsAllChannels' || timer.RecurrenceType == 'AllProgramEventsAllChannels') { + html += 'All Channels'; + } + else if (timer.ChannelId) { html += '' + timer.ChannelName + ''; } html += ''; - var startDate = timer.StartDate; - var endDate = timer.StartDate; - - try { - - startDate = parseISO8601Date(startDate, { toLocal: true }); - - } catch (err) { - - } - - try { - - endDate = parseISO8601Date(endDate, { toLocal: true }); - - } catch (err) { - - } - - html += '' + startDate.toLocaleDateString() + ''; - html += '' + endDate.toLocaleDateString() + ''; - html += ''; if (timer.DayPattern) { @@ -93,6 +74,8 @@ html += ''; + html += '' + LiveTvHelpers.getDisplayTime(timer.StartDate) + ''; + html += ''; }