Explorar o código

Dont know why these files changed

www-data %!s(int64=7) %!d(string=hai) anos
pai
achega
93979a27f8
Modificáronse 2 ficheiros con 45 adicións e 11 borrados
  1. 45 6
      webgui/stats/templates/stats/networks.html
  2. 0 5
      webgui/stats/views.py

+ 45 - 6
webgui/stats/templates/stats/networks.html

@@ -75,7 +75,7 @@
                 google.charts.setOnLoadCallback(drawChart0);
                 function drawChart0() {
                     var data = google.visualization.arrayToDataTable([
-                        ['Network', 'Users'],
+                        ['Network', 'Messages'],
                         {% for network in networklist.items %}
                             ['{{ network.0 }}',     {{ network.1.messages }}],
                         {% endfor %}
@@ -95,9 +95,11 @@
             <div class="ui card">
                 <div class="content">
                     <div class="header">
-                        <i class="ui sitemap icon"></i>
-                        /
-                        <i class="ui users icon"></i>
+                        <div>
+                            <i class="ui users icon"></i>
+                            /
+                            <i class="ui sitemap icon"></i>
+                        </div>
                     </div>
                 </div>
                 <div class="content">
@@ -128,15 +130,52 @@
             <div class="ui card">
                 <div class="content">
                     <div class="header">
-                        <i class="ui sitemap icon"></i>
-                        /
+                    <div>
                         <i class="ui users icon"></i>
+                        /
+                        <i class="ui sitemap icon"></i>
+                    </div>
                     </div>
                 </div>
                 <div class="content">
                     <div id="userschart"></div>
                 </div>
             </div>
+            <script type="text/javascript">
+                google.charts.load("current", {packages:["corechart"]});
+                google.charts.setOnLoadCallback(drawChart1);
+                function drawChart1() {
+                    var data = google.visualization.arrayToDataTable([
+                        ['Network', 'Channels'],
+                            {% for network in networklist.items %}
+                                ['{{ network.0 }}',     {{ network.1.channels }}],
+                            {% endfor %}
+                        ]);
+                    var options = {
+                        legend: 'none',
+                        pieSliceText: 'label',
+                        height: '275',
+                        pieHole: 0.1,
+                        'chartArea': {'width': '95%', 'height': '100%'},
+                    };
+                    var chart = new google.visualization.PieChart(document.getElementById('networkschart'));
+                    chart.draw(data, options);
+                }
+            </script>
+            <div class="ui card">
+                <div class="content">
+                    <div class="header">
+                    <div>
+                        <i class="ui hashtag icon"></i>
+                        /
+                        <i class="ui sitemap icon"></i>
+                    </div>
+                    </div>
+                </div>
+                <div class="content">
+                    <div id="networkschart"></div>
+                </div>
+            </div>
         </div>
     </section>
 {% endblock content %}

+ 0 - 5
webgui/stats/views.py

@@ -21,14 +21,9 @@ def networks(request):
     for channel in channels:
         networklist[channel.network.name]['channels'] += 1
     totalmessages = 0
-    print("messages " + str(messages))
-    
     for idx, record in enumerate(messages):
-        print("messages for " + str(record))
         totalmessages += record[1] + record[2] + record[3]
-        print("Saving messages to " + record[0])
         networklist[record[0]]['messages'] += record[1] + record[2] + record[3]
-        print("new networklist " + str(networklist))
     
     context = {
         'networks': networks,