frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reports - final version (#418)

Browse Source 
* remove device config at log

* ...

* update ui
This commit is contained in:
brindosch
2017-03-18 00:05:04 +01:00
committed by redPanther
parent a20e073bbd
commit 9a0e1daf7b
22 changed files with 128 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
assets/webconfig/js/content_dashboard.js
View File

@@ -20,7 +20,7 @@ $(document).ready( function() {
title = d[i].title.rendered;
excerpt = d[i].excerpt.rendered;
link = d[i].link+'?pk_campaign=WebUI&pk_kwd=post_'+d[i].slug;
link = d[i].link+'?pk_campaign=WebUI&pk_kwd=news_'+d[i].slug;
newsCont(title,excerpt,link);
}
@@ -50,7 +50,7 @@ $(document).ready( function() {
function updateComponents()
{
var components = serverInfo.info.components;
var components = serverInfo.components;
components_html = "";
for ( idx=0; idx<components.length;idx++)
{
@@ -60,7 +60,7 @@ $(document).ready( function() {
}
// add more info
$('#dash_leddevice').html(serverInfo.info.ledDevices.active);
$('#dash_leddevice').html(serverInfo.ledDevices.active);
$('#dash_currv').html(currentVersion);
$('#dash_instance').html(serverConfig.general.name);
$('#dash_ports').html(jsonPort+' | '+serverConfig.protoServer.port);
@@ -80,7 +80,7 @@ $(document).ready( function() {
});
//determine platform
var grabbers = serverInfo.info.grabbers.available;
var grabbers = serverInfo.grabbers.available;
var html = "";
if(grabbers.indexOf('dispmanx') > -1)
@@ -105,4 +105,4 @@ $(document).ready( function() {
createHintH("intro", $.i18n('dashboard_label_intro'), "dash_intro");
removeOverlay();
});
});

2
assets/webconfig/js/content_effects.js
View File

@@ -123,7 +123,7 @@ $(document).ready( function() {
function updateEffectlist(){
if(editorReady)
{
var newEffects = serverInfo.info.effects;
var newEffects = serverInfo.effects;
if (newEffects.length != oldEffects.length)
{
$('#root_foregroundEffect_effect').html('');

2
assets/webconfig/js/content_effectsconfigurator.js
View File

@@ -10,7 +10,7 @@ $(document).ready( function() {
createHintH("intro", $.i18n('effectsconfigurator_label_intro'), "intro_effc");
function updateDelEffectlist(){
var newDelList = serverInfo.info.effects;
var newDelList = serverInfo.effects;
if(newDelList.length != oldDelList.length)
{
var EffectHtml = null;

2
assets/webconfig/js/content_grabber.js
View File

@@ -65,7 +65,7 @@ $(document).ready( function() {
//hide specific options
conf_editor_fg.on('ready',function() {
var grabbers = serverInfo.info.grabbers.available;
var grabbers = serverInfo.grabbers.available;
if(grabbers.indexOf('dispmanx') > -1)
hideEl(["device","verticalPixelDecimation","horizontalPixelDecimation","useXGetImage"]);

19
assets/webconfig/js/content_index.js
View File

@@ -6,14 +6,10 @@ $(document).ready( function() {
initWebSocket();
$(hyperion).on("cmd-serverinfo",function(event){
// get sysinfo only once
if ( typeof(sysInfo.info) == "undefined" )
requestSysInfo();
serverInfo = event.response;
serverInfo = event.response.info;
$(hyperion).trigger("ready");
if (serverInfo.info.hyperion.config_modified)
if (serverInfo.hyperion.config_modified)
$("#hyperion_reload_notify").fadeIn("fast");
else
$("#hyperion_reload_notify").fadeOut("fast");
@@ -25,7 +21,7 @@ $(document).ready( function() {
loggingStreamActive = false;
}
if (!serverInfo.info.hyperion.config_writeable)
if (!serverInfo.hyperion.config_writeable)
{
showInfoDialog('uilock',$.i18n('InfoDialog_nowrite_title'),$.i18n('InfoDialog_nowrite_text'));
$('#wrapper').toggle(false);
@@ -41,10 +37,11 @@ $(document).ready( function() {
}); // end cmd-serverinfo
$(hyperion).one("cmd-sysinfo", function(event) {
sysInfo = event.response;
currentVersion = sysInfo.info.hyperion.version;
requestServerInfo();
sysInfo = event.response.info;
currentVersion = sysInfo.hyperion.version;
});
$(hyperion).one("cmd-config-getschema", function(event) {
serverSchema = event.response.result;
requestServerConfig();
@@ -54,7 +51,7 @@ $(document).ready( function() {
$(hyperion).one("cmd-config-getconfig", function(event) {
serverConfig = event.response.result;
requestServerInfo();
requestSysInfo();
showOptHelp = serverConfig.general.showOptHelp;
});

6
assets/webconfig/js/content_leds.js
View File

@@ -432,7 +432,7 @@ $(document).ready(function() {
values_general = {};
values_specific = {};
isCurrentDevice = (serverInfo.info.ledDevices.active == $(this).val());
isCurrentDevice = (serverInfo.ledDevices.active == $(this).val());
for(var key in serverConfig.device){
if (key != "type" && key in generalOptions.properties)
@@ -455,7 +455,7 @@ $(document).ready(function() {
});
// create led device selection
ledDevices = serverInfo.info.ledDevices.available
ledDevices = serverInfo.ledDevices.available
devRPiSPI = ['apa102', 'ws2801', 'lpd6803', 'lpd8806', 'p9813', 'sk6812spi', 'sk6822spi', 'ws2812spi'];
devRPiPWM = ['ws281x'];
devRPiGPIO = ['piblaster'];
@@ -491,7 +491,7 @@ $(document).ready(function() {
$("#leddevices").append(createSel(optArr[3], $.i18n('conf_leds_optgroup_network')));
$("#leddevices").append(createSel(optArr[4], $.i18n('conf_leds_optgroup_usb')));
$("#leddevices").append(createSel(optArr[5], $.i18n('conf_leds_optgroup_debug')));
$("#leddevices").val(serverInfo.info.ledDevices.active);
$("#leddevices").val(serverInfo.ledDevices.active);
$("#leddevices").trigger("change");
// validate textfield and update preview

71
assets/webconfig/js/content_logging.js
View File

@@ -6,6 +6,7 @@
$(document).ready(function() {
var messages;
var reportUrl = 'https://report.hyperion-project.org/#';
$('#conf_cont').append(createOptPanel('fa-reorder', $.i18n("edt_conf_log_heading_title"), 'editor_container', 'btn_submit'));
if(showOptHelp)
@@ -26,13 +27,37 @@ $(document).ready(function() {
requestWriteConfig(conf_editor.getValue());
});
//show prev uploads
var ent;
if(getStorage("prev_reports"))
{
ent = JSON.parse(getStorage("prev_reports"));
$('#prev_reports').append('<hr><h4>'+$.i18n('conf_logging_lastreports')+'</h4>');
for(var i = 0; i<ent.length; i++)
{
$('#prev_reports').append('<p><a href="'+reportUrl+ent[i].id+'" target="_blank">'+ent[i].title+'('+ent[i].time+')</a></p>');
}
}
else
ent = [];
function updateLastReports(id,time,title)
{
if(ent.length > 4)
ent.pop();
ent.unshift({"id": id ,"time": time,"title": title})
setStorage("prev_reports",JSON.stringify(ent));
}
function uploadLog()
{
var reportUrl = 'https://glot.io/snippets/';
var log = "";
var config = JSON.stringify(serverConfig, null, "\t").replace(/"/g, '\\"');
var prios = serverInfo.info.priorities;
var comps = serverInfo.info.components;
var config = JSON.stringify(serverConfig, null).replace(/"/g, '\"');
var prios = serverInfo.priorities;
var comps = serverInfo.components;
var sys = sysInfo.system;
var shy = sysInfo.hyperion;
var info;
//create log
@@ -54,16 +79,21 @@ $(document).ready(function() {
log += "["+app_name+" "+logger_name+"] <"+level_string+"> "+debug+msg+"\n";
}
//create general info
info = "######## GENERAL ######## \n";
info += 'Build: '+serverInfo.info.hyperion[0].build+'\n';
info += 'Build time: '+serverInfo.info.hyperion[0].time+'\n';
info += 'Version: '+serverInfo.info.hyperion[0].version+'\n';
info += 'UI Lang: '+storedLang+'\n';
info += 'UI Access: '+storedAccess+'\n';
info += 'Avail Capt: '+serverInfo.info.grabbers.available+'\n\n';
info = "### GENERAL ### \n";
info += 'Build: '+shy.build+'\n';
info += 'Build time: '+shy.time+'\n';
info += 'Version: '+shy.version+'\n';
info += 'UI Lang: '+storedLang+' (BrowserL: '+navigator.language+')\n';
info += 'UI Access: '+storedAccess+'\n';
info += 'Log lvl: '+serverConfig.logger.level+'\n';
info += 'Avail Capt: '+serverInfo.grabbers.available+'\n\n';
info += 'Distribution:'+sys.prettyName+'\n';
info += 'Arch: '+sys.architecture+'\n';
info += 'Kernel: '+sys.kernelType+' ('+sys.kernelVersion+' (WS: '+sys.wordSize+'))\n';
info += 'Browser/OS: '+navigator.userAgent+'\n\n';
//create prios
info += "######## PRIORITIES ######## \n";
info += "### PRIORITIES ### \n";
for(var i = 0; i<prios.length; i++)
{
info += prios[i].priority;
@@ -73,23 +103,28 @@ $(document).ready(function() {
info += ' ';
info += ' ('+prios[i].component+') Owner: '+prios[i].owner+'\n';
}
info += '\npriorities_autoselect: '+serverInfo.info.priorities_autoselect+'\n\n';
info += '\npriorities_autoselect: '+serverInfo.priorities_autoselect+'\n\n';
//create comps
info += '######## COMPONENTS ######## \n'
info += '### COMPONENTS ### \n'
for(var i = 0; i<comps.length; i++)
{
info += comps[i].enabled+' - '+comps[i].name+'\n';
}
//escape data
info = JSON.stringify(info);
log = JSON.stringify(log);
config = JSON.stringify(config);
var title = 'Hyperion '+currentVersion+' Report ('+serverConfig.general.name+' ('+serverInfo.ledDevices.active+'))';
$.ajax({
url: 'https://snippets.glot.io/snippets',
// headers: { "Authorization": "Token 9ed92d37-36ca-4430-858f-47b6a3d4d535", "Access-Control-Allow-Origin": "*", "Access-Control-Allow-Methods": "GET,HEAD,OPTIONS,POST,PUT", "Access-Control-Allow-Headers": "Origin, X-Requested-With, Content-Type, Accept, Authorization" },
url: 'https://api.hyperion-project.org/report.php',
crossDomain: true,
contentType: 'application/json',
type: 'POST',
timeout: 7000,
data: '{"language":"plaintext","title":"Hyperion '+currentVersion+' Report ('+serverConfig.general.name+' ('+serverInfo.info.ledDevices.active+'))","public":false,"files":[{"name":"Info","content":"'+info+'"},{"name":"Hyperion Log","content":"'+log+'"},{"name":"Hyperion Config","content":"'+config+'"}]}'
data: '{"title":"'+title+'","info":'+info+',"log":'+log+',"config":'+config+'}'
})
.done( function( data, textStatus, jqXHR ) {
reportUrl += data.id;
@@ -97,6 +132,7 @@ $(document).ready(function() {
{
$('#upl_link').html($.i18n('conf_logging_yourlink')+': <a href="'+reportUrl+'" target="_blank">'+reportUrl+'</a>');
$("html, body").animate({ scrollTop: 9999 }, "fast");
updateLastReports(data.id,data.time,title);
}
else
{
@@ -105,6 +141,7 @@ $(document).ready(function() {
}
})
.fail( function( jqXHR, textStatus ) {
console.log(jqXHR,textStatus);
$('#btn_logupload').attr("disabled", false);
$('#upl_link').html('<span style="color:red">'+$.i18n('conf_logging_uplfailed')+'<span>');
});

16
assets/webconfig/js/content_remote.js
View File

@@ -24,7 +24,7 @@ $(document).ready(function() {
//color adjustment
var sColor = sortProperties(serverSchema.properties.color.properties.channelAdjustment.items.properties)
var values = serverInfo.info.adjustment[0]
var values = serverInfo.adjustment[0]
for(key in sColor)
{
@@ -86,7 +86,7 @@ $(document).ready(function() {
{
$('.sstbody').html("");
var data = "";
var prios = serverInfo.info.priorities
var prios = serverInfo.priorities
var i;
for(i = 0; i < prios.length; i++)
@@ -144,9 +144,9 @@ $(document).ready(function() {
if(btn_type != 'default')
$('.sstbody').append(createTableRow([origin, owner, priority, btn], false, true));
}
var btn_auto_color = (serverInfo.info.priorities_autoselect? "btn-success" : "btn-danger");
var btn_auto_state = (serverInfo.info.priorities_autoselect? "disabled" : "enabled");
var btn_auto_text = (serverInfo.info.priorities_autoselect? $.i18n('general_btn_on') : $.i18n('general_btn_off'));
var btn_auto_color = (serverInfo.priorities_autoselect? "btn-success" : "btn-danger");
var btn_auto_state = (serverInfo.priorities_autoselect? "disabled" : "enabled");
var btn_auto_text = (serverInfo.priorities_autoselect? $.i18n('general_btn_on') : $.i18n('general_btn_off'));
$('#auto_btn').html('<button id="srcBtn'+i+'" type="button" '+btn_auto_state+' class="btn '+btn_auto_color+'" style="margin:10px;display:inline-block;" onclick="requestSetSource(\'auto\');">'+$.i18n('remote_input_label_autoselect')+' ('+btn_auto_text+')</button>');
var max_width=100;
@@ -159,7 +159,7 @@ $(document).ready(function() {
function updateLedMapping()
{
mapping = serverInfo.info.ledMAppingType;
mapping = serverInfo.ledMAppingType;
$('#mappingsbutton').html("");
for(var ix = 0; ix < mappingList.length; ix++)
@@ -175,7 +175,7 @@ $(document).ready(function() {
function updateComponents()
{
components = serverInfo.info.components;
components = serverInfo.components;
// create buttons
$('#componentsbutton').html("");
for ( idx=0; idx<components.length;idx++)
@@ -204,7 +204,7 @@ $(document).ready(function() {
function updateEffectlist()
{
var newEffects = serverInfo.info.effects;
var newEffects = serverInfo.effects;
if (newEffects.length != oldEffects.length)
{
$('#effect_select').html('<option value="__none__"></option>');

5
assets/webconfig/js/hyperion.js
View File

@@ -3,14 +3,14 @@
var webPrio = 1;
var webOrigin = "Web Configuration";
var showOptHelp;
var currentVersion = "";
var currentVersion;
var latestVersion;
var serverInfo = {};
var parsedUpdateJSON = {};
var serverSchema = {};
var serverConfig = {};
var sysInfo = {};
var schema;
var sysInfo = {};
var jsonPort = 19444;
var websocket = null;
var hyperion = {};
@@ -77,6 +77,7 @@ function initWebSocket()
websocket.onopen = function (event) {
$(hyperion).trigger({type:"open"});
$(hyperion).on("cmd-serverinfo", function(event) {
watchdog = 0;
});

9
assets/webconfig/js/ui_utils.js
View File

@@ -235,9 +235,16 @@ function valValue(id,value,min,max)
if(typeof max === 'undefined' || max == "")
max = 999999;
if(value > max || value < min)
if(value > max)
{
$('#'+id).val(max);
showInfoDialog("warning","",$.i18n('edt_msg_error_maximum_incl',max));
return max;
}
else if(value < min)
{
$('#'+id).val(min);
showInfoDialog("warning","",$.i18n('edt_msg_error_minimum_incl',min));
return min;
}
return value;