From d4f02f971f61cd72fbc771695e82e996f1ab967e Mon Sep 17 00:00:00 2001
From: CaCO3 <caco3@ruinelli.ch>
Date: Fri, 25 Nov 2022 16:36:34 +0100
Subject: [PATCH] solve release merge conflicts

---
 sd-card/html/graph.html | 139 ++++++++++++++++++++++++++++++----------
 1 file changed, 105 insertions(+), 34 deletions(-)
diff --git a/sd-card/html/graph.html b/sd-card/html/graph.html
index 75e4c75c..1c3dcd69 100644
--- a/sd-card/html/graph.html
+++ b/sd-card/html/graph.html
@@ -1,29 +1,53 @@
 <html>
-<head>
-<script src='https://cdn.plot.ly/plotly-2.14.0.min.js'></script>
-<style>
-    textarea {
-        width: 600px;
-        height: 300px;
+    <head>
+    <script src='https://cdn.plot.ly/plotly-2.14.0.min.js'></script>
+
+    <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 {
+            width: 600px;
+            height: 300px;
+        }
+    </style>
+    <script>
+    function run() {
+      var el = document.getElementById('cnsl');
+      el && eval(el.value);
     }
-</style>
-<script>
-function run() {
-  var el = document.getElementById('cnsl');
-  el && eval(el.value);
-}
-</script>
-</head>
-<body>
-<div id='chart'></div>
-<button onclick="document.getElementById('editor').hidden = false; this.hidden = true;" >Editor</button>
-<div id='editor' hidden='true'>
-<textarea id="cnsl">
-const d = new Date();
-var date = d.getFullYear() + "-" + (d.getMonth()+1) + "-" + d.getDate();    
-fetch('/fileserver/log/message/log_'+date+'.txt')
+    </script>
+
+    </head>
+    <body>
+    <div id='chart'></div>
+        <select id="datafiles" onchange="run();"></select>
+        <select id="numbers" onchange="run();"></select>
+        <select id="datatype" onchange="run();">
+            <option value="3">Value</option>
+            <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 => {
     // handle the response
+    if (response.status == 404) {
+        alert("no log data available for "+dateString);
+    }
     response.text()
     .then( result => {
         var lines = result.split("\n");
@@ -35,28 +59,75 @@ fetch('/fileserver/log/message/log_'+date+'.txt')
 
         var timex = 1;
         for (let line of lines) {
-            if (line.includes("PostProcessing - Raw")) {
+            {
                 console.log(line);
-                var value = line.split(" ")[6];
-                var time  = line.split(" ")[0];
-                console.log("> "+time+" "+value+"\n");
-                trace.x.push(timex);
-                timex += 1;
-                trace.y.push(value);
+                if (line.split(",")[1] == numbername)
+                {
+                    var value = line.split(",")[datatype];
+                    var time  = line.split(",")[0];
+                    console.log("> "+time+" "+value+"\n");
+                    trace.x.push(time);
+//                    timex += 1;
+                    trace.y.push(value);
+                }
             }
         }
         console.log(trace);
         var data = [trace];
         Plotly.newPlot('chart', data);
     });
-})
-.catch(error => {
+}).catch((error) => {
     // handle the error
-out.value = "error";
+    console.log(error);
+alert("test");
 });        
 </textarea><br />
 <button onclick="run();">run</button>
 </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>
-</html>
\ No newline at end of file
+</html>
