tBKwtWS 7 yıl önce
ebeveyn
işleme
d7a432a857

+ 1 - 1
webgui/stats/templates/stats/network.html

@@ -106,7 +106,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="item">
+                <div class="ui item">
                     <div class="ui basic segment">
                         <div class="ui two small statistics">
                             <a class="statistic" href="/">

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

@@ -241,9 +241,9 @@
                     google.charts.setOnLoadCallback(drawChart3);
                     function drawChart3() {
                         var data = google.visualization.arrayToDataTable([
-                            ['Coin spent', 'Coin given'],
+                            ['network', 'Coin given / coin spent'],
                             {% for network in networkslist.items %}
-                                ['{{ network.0|escapejs }}',     {{ network.1.coingivencount }}],
+                                ['{{ network.0|escapejs }}',     {{ network.1.coingivencount }} / {{ network.1.coinspentcount }}],
                             {% endfor %}
                         ]);
                         var options = {
@@ -263,14 +263,16 @@
                         <div class="header">
                             <div>
                                 <i class="icons">
-                                    <i class="ui cart icon"></i>
-                                    <i class="top right corner money icon"></i>
+                                    <i class="ui send icon"></i>
+                                    <i class="left top corner money icon"></i>
                                 </i>
                                 /
                                 <i class="icons">
-                                    <i class="ui send icon"></i>
-                                    <i class="left top corner money icon"></i>
+                                    <i class="ui cart icon"></i>
+                                    <i class="top right corner money icon"></i>
                                 </i>
+                                /
+                                <i class="sitemap icon"></i>
                             </div>
                         </div>
                     </div>

+ 1 - 3
webgui/stats/views.py

@@ -17,8 +17,6 @@ def networks(request):
     for network in networks:
         networkslist[network.name] = {'channelcount': 0, 'usercount': 0, 'messagecount': 0, 'xpspentcount': 0, 'coinspentcount': 0, 'coingivencount': 0}
         networkslist[network.name]['host'] = network.host
-        print(networkslist[network.name]['host'])
-        print(network.host)
         networkslist[network.name]['port'] = network.port
         networkslist[network.name]['usessl'] = network.use_ssl
         if network.password:
@@ -34,6 +32,7 @@ def networks(request):
         networkslist[user.network.name]['xpspentcount'] += user.xp_spent
         networkslist[user.network.name]['coinspentcount'] += user.coin_spent
         networkslist[user.network.name]['coingivencount'] += user.coin_given
+        #networkslist[user.network.name]['coingivenperspentcount'] += user.coin_given / (user.coin_spent + 1)
     for channel in channels:
         networkslist[channel.network.name]['channelcount'] += 1
     totalmessages = 0
@@ -42,7 +41,6 @@ def networks(request):
         networkslist[record[0]]['messagecount'] += record[1] + record[2] + record[3]
     totalmessages = convert_units.shorten_number(totalmessages)
     
-    print(networkslist)
     context = {
         'networks': networks,
         'channels': channels,