Browse Source

fixed graph data order

subDesTagesMitExtraKaese 3 years ago
parent
commit
843511faf3
2 changed files with 2 additions and 5 deletions
  1. 1 1
      ts3-viewer/ajax.php
  2. 1 4
      ts3-viewer/index.php

+ 1 - 1
ts3-viewer/ajax.php

@@ -9,7 +9,7 @@
     LEFT JOIN channel on channel.id = channelEvent.channelId 
     LEFT JOIN server ON server.id = channel.serverId 
     WHERE server.uid = ? 
-    ORDER BY date DESC LIMIT 10000");
+    ORDER BY date ASC LIMIT 10000");
   $stmtEvents->execute(Array($serverUid));
   $stmtChannel = $pdo->prepare("SELECT channel.id, channel.name, channel.channelId, channel.parentId, channel.position, channel.description, server.name as serverName, server.id as serverId FROM channel 
     LEFT JOIN server ON server.id = channel.serverId

+ 1 - 4
ts3-viewer/index.php

@@ -79,7 +79,7 @@
     function makeTree(tree, channels, events) {
       tree.events = events.filter(e => e[0] == tree.id);
       if(tree.events.length > 0) {
-        tree.events.splice(0,0,[tree.events[0][0], (new Date()).getTime()/1000, tree.events[0][2]]);
+        tree.events.push([tree.events[tree.events.length-1][0], (new Date()).getTime()/1000, tree.events[tree.events.length-1][2]]);
       }
       tree.children = channels.filter((ch) => ch.parentId == tree.channelId).sort((a, b) => a.position - b.position);
       tree.clientCount = tree.events.reduce((sum, e) => sum+e[2], 0) / (tree.events.length > 0 ? tree.events.length : 1);
@@ -196,9 +196,6 @@
       let series = [];
       function iterChilds(tree, prefix="") {
         const data = tree.events.map(e => [e[1]*1000, e[2]]);
-        for(let i=0; i<data.length-2; i++) {
-          data[i][1] = data[i+1][1];
-        }
         const name = prefix + formatHeadings(tree.name, false);
         const maxClients = data.reduce((acc, val) => val[1] > acc ? val[1] : acc, 0);
         if(data.length > 0 && maxClients > 0) {