solve release merge conflicts

This commit is contained in:
CaCO3
2022-11-25 16:36:34 +01:00
committed by GitHub
parent ec326d9a11
commit d4f02f971f

View File

@@ -1,29 +1,53 @@
<html> <html>
<head> <head>
<script src='https://cdn.plot.ly/plotly-2.14.0.min.js'></script> <script src='https://cdn.plot.ly/plotly-2.14.0.min.js'></script>
<style>
<script type="text/javascript" src="./gethost.js"></script>
<script type="text/javascript" src="./readconfigcommon.js"></script>
<script type="text/javascript" src="./readconfigparam.js"></script>
<style>
textarea { textarea {
width: 600px; width: 600px;
height: 300px; height: 300px;
} }
</style> </style>
<script> <script>
function run() { function run() {
var el = document.getElementById('cnsl'); var el = document.getElementById('cnsl');
el && eval(el.value); el && eval(el.value);
} }
</script> </script>
</head>
<body> </head>
<div id='chart'></div> <body>
<button onclick="document.getElementById('editor').hidden = false; this.hidden = true;" >Editor</button> <div id='chart'></div>
<div id='editor' hidden='true'> <select id="datafiles" onchange="run();"></select>
<textarea id="cnsl"> <select id="numbers" onchange="run();"></select>
const d = new Date(); <select id="datatype" onchange="run();">
var date = d.getFullYear() + "-" + (d.getMonth()+1) + "-" + d.getDate(); <option value="3">Value</option>
fetch('/fileserver/log/message/log_'+date+'.txt') <option value="4">PreValue</option>
<option value="5">Change-Rate</option>
<option value="6">Change-Absolut</option>
</select>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=fileserver/log/data/>Download</a>
<!-- <button onclick="document.getElementById('editor').hidden = false; this.hidden = true;" >Editor</button> -->
<div id='editor' hidden='true'>
<textarea id="cnsl">
datefile = document.getElementById("datafiles").value;
numbername = document.getElementById("numbers").value;
datatype = document.getElementById("datatype").value;
//alert("Auslesen: " + datefile + " " + numbername);
_basepath = getbasepath();
fetch(_basepath + '/fileserver/log/data/' + datefile)
.then(response => { .then(response => {
// handle the response // handle the response
if (response.status == 404) {
alert("no log data available for "+dateString);
}
response.text() response.text()
.then( result => { .then( result => {
var lines = result.split("\n"); var lines = result.split("\n");
@@ -35,28 +59,75 @@ fetch('/fileserver/log/message/log_'+date+'.txt')
var timex = 1; var timex = 1;
for (let line of lines) { for (let line of lines) {
if (line.includes("PostProcessing - Raw")) { {
console.log(line); console.log(line);
var value = line.split(" ")[6]; if (line.split(",")[1] == numbername)
var time = line.split(" ")[0]; {
var value = line.split(",")[datatype];
var time = line.split(",")[0];
console.log("> "+time+" "+value+"\n"); console.log("> "+time+" "+value+"\n");
trace.x.push(timex); trace.x.push(time);
timex += 1; // timex += 1;
trace.y.push(value); trace.y.push(value);
} }
} }
}
console.log(trace); console.log(trace);
var data = [trace]; var data = [trace];
Plotly.newPlot('chart', data); Plotly.newPlot('chart', data);
}); });
}) }).catch((error) => {
.catch(error => {
// handle the error // handle the error
out.value = "error"; console.log(error);
alert("test");
}); });
</textarea><br /> </textarea><br />
<button onclick="run();">run</button> <button onclick="run();">run</button>
</div> </div>
<script>run();</script>
<script>
function WriteModelFiles()
{
list_data = getDATAList();
var _indexDig = document.getElementById("datafiles");
while (_indexDig.length)
_indexDig.remove(0);
for (var i = list_data.length - 1; i >= 0; --i)
{
var optionDig = document.createElement("option");
var text = list_data[i];
optionDig.text = text;
optionDig.value = list_data[i];
_indexDig.add(optionDig);
}
}
function WriteNumbers()
{
list_data = getNUMBERSList();
var _indexDig = document.getElementById("numbers");
while (_indexDig.length)
_indexDig.remove(0);
for (var i = 0; i < list_data.length; ++i)
{
var optionDig = document.createElement("option");
var text = list_data[i];
optionDig.text = text;
optionDig.value = list_data[i];
_indexDig.add(optionDig);
}
}
WriteModelFiles();
WriteNumbers();
run();
</script>
</body> </body>
</html> </html>