github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-08 06:00:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup graphs PRs

Browse source
This commit is contained in:
JonnyWong16 2017-03-04 15:33:45 -08:00
parent a3014638c8
commit c6ad09fe8f
5 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

38
data/interfaces/default/graphs.html
View file

@ -322,11 +322,11 @@
// Initial values for graph from config // Initial values for graph from config
var yaxis = "${config['graph_type']}"; var yaxis = "${config['graph_type']}";
var current_range = ${config['graph_days']}; var current_day_range = ${config['graph_days']};
var current_month_range = ${config['graph_months']}; var current_month_range = ${config['graph_months']};
var current_tab = "${'#' + config['graph_tab']}"; var current_tab = "${'#' + config['graph_tab']}";
$('.days').html(current_range); $('.days').html(current_day_range);
$('.months').html(current_month_range); $('.months').html(current_month_range);
// Load user ids and names (for the selector) // Load user ids and names (for the selector)
@ -557,15 +557,15 @@
} }
// Set initial state // Set initial state
if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); } if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); } if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); } if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
// Tab1 opened // Tab1 opened
$('#graph-tabs a[href="#tabs-1"]').on('shown.bs.tab', function (e) { $('#graph-tabs a[href="#tabs-1"]').on('shown.bs.tab', function (e) {
e.preventDefault(); e.preventDefault();
current_tab = $(this).attr('href'); current_tab = $(this).attr('href');
loadGraphsTab1(current_range, yaxis); loadGraphsTab1(current_day_range, yaxis);
$.ajax({ $.ajax({
url: 'set_graph_config', url: 'set_graph_config',
data: { graph_tab: current_tab.replace('#','') }, data: { graph_tab: current_tab.replace('#','') },
@ -577,7 +577,7 @@
$('#graph-tabs a[href="#tabs-2"]').on('shown.bs.tab', function (e) { $('#graph-tabs a[href="#tabs-2"]').on('shown.bs.tab', function (e) {
e.preventDefault(); e.preventDefault();
current_tab = $(this).attr('href'); current_tab = $(this).attr('href');
loadGraphsTab2(current_range, yaxis); loadGraphsTab2(current_day_range, yaxis);
$.ajax({ $.ajax({
url: 'set_graph_config', url: 'set_graph_config',
data: { graph_tab: current_tab.replace('#','') }, data: { graph_tab: current_tab.replace('#','') },
@ -599,24 +599,26 @@
// Date range changed // Date range changed
$('#graph-days').on('change', function() { $('#graph-days').on('change', function() {
current_range = $(this).val(); current_day_range = Math.round($(this).val());
if (current_range < 1) { $(this).val(current_day_range);
if (current_day_range < 1) {
$(this).val(7); $(this).val(7);
current_range = 7; current_day_range = 7;
} }
if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); } if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); } if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
$('.days').html(current_range); $('.days').html(current_day_range);
$.ajax({ $.ajax({
url: 'set_graph_config', url: 'set_graph_config',
data: { graph_days: current_range}, data: { graph_days: current_day_range},
async: true async: true
}); });
}); });
// Month range changed // Month range changed
$('#graph-months').on('change', function() { $('#graph-months').on('change', function() {
current_month_range = $(this).val(); current_month_range = Math.round($(this).val());
$(this).val(current_month_range);
if (current_month_range < 1) { if (current_month_range < 1) {
$(this).val(12); $(this).val(12);
current_month_range = 12; current_month_range = 12;
@ -633,16 +635,16 @@
// User changed // User changed
$('#graph-user').on('change', function() { $('#graph-user').on('change', function() {
selected_user_id = $(this).val() || null; selected_user_id = $(this).val() || null;
if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); } if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); } if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); } if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
}); });
// Y-axis changed // Y-axis changed
$('#yaxis-selection').on('change', function() { $('#yaxis-selection').on('change', function() {
yaxis = $('input[name=yaxis-options]:checked', '#yaxis-selection').val(); yaxis = $('input[name=yaxis-options]:checked', '#yaxis-selection').val();
if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); } if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); } if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); } if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
$.ajax({ $.ajax({
url: 'set_graph_config', url: 'set_graph_config',

4
data/interfaces/default/settings.html
View file

@ -119,9 +119,9 @@
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" id="week_start" name="week_start" value="1" ${config['week_start']}> Week starting on Monday <input type="checkbox" id="week_start_monday" name="week_start_monday" value="1" ${config['week_start_monday']}> Week Starting on Monday
</label> </label>
<p class="help-block">Default is Sunday. This is only relevant for the Play by day of week graph.</p> <p class="help-block">Change the "<em>Play by day of week</em>" graph to start on Monday. Default is start on Sunday.</p>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>

2
plexpy/config.py
View file

@ -566,7 +566,7 @@ _CONFIG_DEFINITIONS = {
'UPDATE_LABELS': (int, 'General', 1), 'UPDATE_LABELS': (int, 'General', 1),
'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1), 'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1),
'VIDEO_LOGGING_ENABLE': (int, 'Monitoring', 1), 'VIDEO_LOGGING_ENABLE': (int, 'Monitoring', 1),
'WEEK_START': (int, 'General', 0), 'WEEK_START_MONDAY': (int, 'General', 0),
'XBMC_ENABLED': (int, 'XBMC', 0), 'XBMC_ENABLED': (int, 'XBMC', 0),
'XBMC_HOST': (str, 'XBMC', ''), 'XBMC_HOST': (str, 'XBMC', ''),
'XBMC_PASSWORD': (str, 'XBMC', ''), 'XBMC_PASSWORD': (str, 'XBMC', ''),

8
plexpy/graphs.py
View file

@ -169,8 +169,7 @@ class Graphs(object):
logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_per_dayofweek: %s." % e) logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_per_dayofweek: %s." % e)
return None return None
week_start = plexpy.CONFIG.WEEK_START if plexpy.CONFIG.WEEK_START_MONDAY:
if (week_start == 1):
days_list = ['Monday', 'Tuesday', 'Wednesday', days_list = ['Monday', 'Tuesday', 'Wednesday',
'Thursday', 'Friday', 'Saturday', 'Sunday'] 'Thursday', 'Friday', 'Saturday', 'Sunday']
else: else:
@ -342,12 +341,9 @@ class Graphs(object):
# create our date range as some months may not have any data # create our date range as some months may not have any data
# but we still want to display them # but we still want to display them
time_range = int(time_range)
x = time_range
base = time.localtime() base = time.localtime()
month_range = [time.localtime( month_range = [time.localtime(
time.mktime((base.tm_year, base.tm_mon - n, 1, 0, 0, 0, 0, 0, 0))) for n in range(x)] time.mktime((base.tm_year, base.tm_mon - n, 1, 0, 0, 0, 0, 0, 0))) for n in range(int(time_range))]
categories = [] categories = []
series_1 = [] series_1 = []

4
plexpy/webserve.py
View file

@ -2623,7 +2623,7 @@ class WebInterface(object):
"imgur_client_id": plexpy.CONFIG.IMGUR_CLIENT_ID, "imgur_client_id": plexpy.CONFIG.IMGUR_CLIENT_ID,
"cache_images": checked(plexpy.CONFIG.CACHE_IMAGES), "cache_images": checked(plexpy.CONFIG.CACHE_IMAGES),
"pms_version": plexpy.CONFIG.PMS_VERSION, "pms_version": plexpy.CONFIG.PMS_VERSION,
"week_start": checked(plexpy.CONFIG.WEEK_START) "week_start_monday": checked(plexpy.CONFIG.WEEK_START_MONDAY)
} }
return serve_template(templatename="settings.html", title="Settings", config=config, kwargs=kwargs) return serve_template(templatename="settings.html", title="Settings", config=config, kwargs=kwargs)
@ -2637,7 +2637,7 @@ class WebInterface(object):
checked_configs = [ checked_configs = [
"launch_browser", "enable_https", "https_create_cert", "api_enabled", "freeze_db", "check_github", "launch_browser", "enable_https", "https_create_cert", "api_enabled", "freeze_db", "check_github",
"grouping_global_history", "grouping_user_history", "grouping_charts", "group_history_tables", "grouping_global_history", "grouping_user_history", "grouping_charts", "group_history_tables",
"pms_use_bif", "pms_ssl", "pms_is_remote", "home_stats_type", "week_start", "pms_use_bif", "pms_ssl", "pms_is_remote", "home_stats_type", "week_start_monday",
"movie_notify_enable", "tv_notify_enable", "music_notify_enable", "monitoring_use_websocket", "movie_notify_enable", "tv_notify_enable", "music_notify_enable", "monitoring_use_websocket",
"refresh_libraries_on_startup", "refresh_users_on_startup", "refresh_libraries_on_startup", "refresh_users_on_startup",
"ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable", "ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable",