From 646287d1e3278af74dd76fdca4dc056c1410c10b Mon Sep 17 00:00:00 2001
From: Tobi <t.rechel@gmx.de>
Date: Mon, 10 Nov 2014 03:09:45 +0100
Subject: [PATCH] stat remake

---
 mojotrollz/api/database/player_races.php      | 65 +++++++++++++++++
 mojotrollz/dbd/qq/CHAR_STATS.php              |  2 +-
 mojotrollz/dbd/qq/CLASS_STATS.php             |  2 +-
 mojotrollz/dbd/qq/FACTION_BALANCE.php         | 14 ++++
 .../page/user_default/css/user_default.css    | 12 +++-
 mojotrollz/page/user_default/user_default.tpl |  9 +--
 .../user_start/{ => tpl}/char_stats_realm.tpl |  0
 .../{ => tpl}/class_stats_realm.tpl           |  0
 .../page/user_start/tpl/faction_balance.tpl   |  1 +
 .../page/user_start/{ => tpl}/user_start.tpl  | 13 ++--
 mojotrollz/page/user_start/user_start.php     | 70 ++++---------------
 11 files changed, 120 insertions(+), 68 deletions(-)
 create mode 100644 mojotrollz/api/database/player_races.php
 create mode 100644 mojotrollz/dbd/qq/FACTION_BALANCE.php
 rename mojotrollz/page/user_start/{ => tpl}/char_stats_realm.tpl (100%)
 rename mojotrollz/page/user_start/{ => tpl}/class_stats_realm.tpl (100%)
 create mode 100644 mojotrollz/page/user_start/tpl/faction_balance.tpl
 rename mojotrollz/page/user_start/{ => tpl}/user_start.tpl (83%)

diff --git a/mojotrollz/api/database/player_races.php b/mojotrollz/api/database/player_races.php
new file mode 100644
index 0000000..ca07688
--- /dev/null
+++ b/mojotrollz/api/database/player_races.php
@@ -0,0 +1,65 @@
+<?php
+class player_races {
+    const HUMAN = 1;
+    const HUMAN_NAME = 'human';
+    
+    const ORK = 2;
+    const ORK_NAME = 'ork';
+    
+    const DWARF = 3;
+    const DWARF_NAME = 'dwarf';
+    
+    const NIGHTELF = 4;
+    const NIGHTELF_NAME = 'nightelf';
+    
+    const SCOURGE = 5;
+    const SCOURGE_NAME = 'scourge';
+    
+    const TAUREN = 6;
+    const TAUREN_NAME = 'tauren';
+    
+    const GNOME = 7;
+    const GNOME_NAME = 'gnome';
+    
+    const TROLL = 8;
+    const TROLL_NAME = 'troll';
+    
+    public static function name($race){
+        switch($race){
+            case self::HUMAN:
+                return self::HUMAN_NAME;
+            case self::ORK:
+                return self::ORK_NAME;
+            case self::DWARF:
+                return self::DWARF_NAME;
+            case self::NIGHTELF:
+                return self::NIGHTELF_NAME;
+            case self::SCOURGE:
+                return self::SCOURGE_NAME;
+            case self::TAUREN:
+                return self::TAUREN_NAME;
+            case self::GNOME:
+                return self::GNOME_NAME;
+            case self::TROLL:
+                return self::TROLL_NAME;
+            default:
+                return 'race not valid';
+        }
+    }
+    
+    public static function is($class){
+        switch($class){
+            case self::HUMAN:
+            case self::ORK:
+            case self::DWARF:
+            case self::NIGHTELF:
+            case self::SCOURGE:
+            case self::TAUREN:
+            case self::GNOME:
+            case self::TROLL:
+                return true;
+            default:
+                return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/dbd/qq/CHAR_STATS.php b/mojotrollz/dbd/qq/CHAR_STATS.php
index 8373957..d060e8f 100644
--- a/mojotrollz/dbd/qq/CHAR_STATS.php
+++ b/mojotrollz/dbd/qq/CHAR_STATS.php
@@ -7,7 +7,7 @@ class CHAR_STATS extends \SYSTEM\DB\QQ {
 //pg            
 '',
 //mys
-'SELECT race,COUNT(*) as count FROM characters group by race;',
+'SELECT race,COUNT(*) as count FROM characters group by race ORDER BY count DESC;',
 new \DBD\mangos_chars()
 );}}
 
diff --git a/mojotrollz/dbd/qq/CLASS_STATS.php b/mojotrollz/dbd/qq/CLASS_STATS.php
index 32421f5..0ce9638 100644
--- a/mojotrollz/dbd/qq/CLASS_STATS.php
+++ b/mojotrollz/dbd/qq/CLASS_STATS.php
@@ -7,7 +7,7 @@ class CLASS_STATS extends \SYSTEM\DB\QQ {
 //pg            
 '',
 //mys
-'SELECT class,COUNT(*) as count FROM characters group by class;',
+'SELECT class,COUNT(*) as count FROM characters group by class ORDER BY count DESC;',
 new \DBD\mangos_chars()
 );}}
 
diff --git a/mojotrollz/dbd/qq/FACTION_BALANCE.php b/mojotrollz/dbd/qq/FACTION_BALANCE.php
new file mode 100644
index 0000000..59f9bbe
--- /dev/null
+++ b/mojotrollz/dbd/qq/FACTION_BALANCE.php
@@ -0,0 +1,14 @@
+<?php
+namespace DBD;
+
+class FACTION_BALANCE extends \SYSTEM\DB\QQ {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT sum(case when race = 1 or race = 3 or race = 4 or race = 7 then 1 else 0 end) class_alliance,
+        sum(case when race = 2 or race = 5 or race = 6 or race = 8 then 1 else 0 end) class_horde FROM characters;',
+new \DBD\mangos_chars()
+);}}
+
diff --git a/mojotrollz/page/user_default/css/user_default.css b/mojotrollz/page/user_default/css/user_default.css
index e518077..97e7ccc 100644
--- a/mojotrollz/page/user_default/css/user_default.css
+++ b/mojotrollz/page/user_default/css/user_default.css
@@ -70,6 +70,7 @@ html, body {
 }
 
 #frame_content {
+    width: 100%;
     margin-left: 10px;
     margin-right: 10px;
     margin-bottom: 10px;
@@ -81,14 +82,19 @@ html, body {
     height: 26px;
 }
 
-#frame_character{
-    width: 100%;
+#char_container{
     height: 250px;
     position: absolute;
     bottom: 0;
 }
 
+#frame_character{
+    float: left;
+    width: 70%;
+    
+}
+
 #frame_menu{
     float: left;
-    width: 200px;
+    width: 30%;
 }
\ No newline at end of file
diff --git a/mojotrollz/page/user_default/user_default.tpl b/mojotrollz/page/user_default/user_default.tpl
index 8fa37fd..38b30a0 100644
--- a/mojotrollz/page/user_default/user_default.tpl
+++ b/mojotrollz/page/user_default/user_default.tpl
@@ -16,11 +16,12 @@
                 </div>
                 <div class="threecol_row" style="">
                     <div id="frame_left_border" class="threecol_col" style="background: url(${PICPATH}border_left.png) repeat-y;"></div>
-                    <div id="frame_content_user">
-                        <div id="frame_menu" style="">
-                        </div>
+                    <div id="frame_content_user">                   
                         <div id="frame_content" style="background: url(${PICPATH}background.png)no repeat;"></div>
-                        <div id="frame_character"></div>
+                        <div id="char_container">
+                            <div id="frame_character"></div>
+                            <div id="frame_menu" style=""></div>
+                        </div>
                     </div>
                     <div id="frame_right_border" class="threecol_col" style="background: url(${PICPATH}border_right.png) repeat-y;"></div>
                 </div>
diff --git a/mojotrollz/page/user_start/char_stats_realm.tpl b/mojotrollz/page/user_start/tpl/char_stats_realm.tpl
similarity index 100%
rename from mojotrollz/page/user_start/char_stats_realm.tpl
rename to mojotrollz/page/user_start/tpl/char_stats_realm.tpl
diff --git a/mojotrollz/page/user_start/class_stats_realm.tpl b/mojotrollz/page/user_start/tpl/class_stats_realm.tpl
similarity index 100%
rename from mojotrollz/page/user_start/class_stats_realm.tpl
rename to mojotrollz/page/user_start/tpl/class_stats_realm.tpl
diff --git a/mojotrollz/page/user_start/tpl/faction_balance.tpl b/mojotrollz/page/user_start/tpl/faction_balance.tpl
new file mode 100644
index 0000000..915b744
--- /dev/null
+++ b/mojotrollz/page/user_start/tpl/faction_balance.tpl
@@ -0,0 +1 @@
+Alliance: ${class_alliance} Horde: ${class_horde}
\ No newline at end of file
diff --git a/mojotrollz/page/user_start/user_start.tpl b/mojotrollz/page/user_start/tpl/user_start.tpl
similarity index 83%
rename from mojotrollz/page/user_start/user_start.tpl
rename to mojotrollz/page/user_start/tpl/user_start.tpl
index c3b282e..258aa93 100644
--- a/mojotrollz/page/user_start/user_start.tpl
+++ b/mojotrollz/page/user_start/tpl/user_start.tpl
@@ -15,17 +15,22 @@
 <p><a href="${url_realmlistwtf}" target="_blank">Download realmlist.wtf</a></p>
 <p><a href="${url_wowclient}" target="_blank">Download WoW 1.12</a></p>
 </div>
-<div style="float: left; margin-left: 20px;">
-    <p>Guilds: ${guildcount}</p>
-</div>
 <div style="float: left;">
     <H3>Racial Pluralism</H3>
-    <table>${char_stats}</table>   
+    
+    <table>${char_stats}</table>
+    <br>
+    <p><font style="font-size: 10pt;"> ${factionbalance}</font></p>
 </div>
 <div style="float: left; margin-left: 20px;">
     <H3>Class Diffusion</H3>
     <table>${class_stats}</table>   
 </div>
+<div style="float: left; margin-left: 20px;">
+    
+    <H3>Guilds <font style="font-size: 10pt;"> overallcount:${guildcount}</font></H3>
+    
+</div>
 <div style="float: left; margin-left: 20px;">
     <!--<H4>Richest Player: ${richest}</H4>
     <H4>Most Votes: ${mostvotes}</H4>
diff --git a/mojotrollz/page/user_start/user_start.php b/mojotrollz/page/user_start/user_start.php
index af5464d..b66595e 100644
--- a/mojotrollz/page/user_start/user_start.php
+++ b/mojotrollz/page/user_start/user_start.php
@@ -6,28 +6,7 @@ class user_start extends SYSTEM\PAGE\Page {
     public static function css (){
        return array();}
        
-    private function switch_race($race){
-        switch($race){
-            case 1:
-                return 'human';
-            case 2:
-                return 'ork';
-            case 3:
-                return 'dwarf';
-            case 4:
-                return 'nightelf';
-            case 5:
-                return 'undead';
-            case 6:
-                return 'tauren';
-            case 7:
-                return 'gnome';
-            case 8:
-                return 'troll';
-            default:
-                return '';
-        }
-    }
+    
     
      private function switch_order($race){
         switch($race){
@@ -52,39 +31,16 @@ class user_start extends SYSTEM\PAGE\Page {
         }
     }
     
-    private function switch_class($class){
-        switch($class){
-            case 1:
-                return 'Warrior';
-            case 2:
-                return 'Paladin';
-            case 3:
-                return 'Hunter';
-            case 4:
-                return 'Rogue';
-            case 5:
-                return 'Priest';
-            case 6:
-                return 'Shaman';
-            case 7:
-                return 'Mage';
-            case 8:
-                return 'Warlock';
-            case 9:
-                return 'Druid';
-            default:
-                return 'class not valid';
-        }
-    }
+    
     
     public function get_char_statistics(){
+        $result = '';
         $chars = \DBD\CHAR_STATS::QA();
         foreach ($chars as $race){
             $vars = array();
-            $order = $this->switch_order($race['race']);
-            $vars['race'] = $this->switch_race($order);
+            $vars['race'] = player_races::name($race['race']);
             $vars['count'] = $race['count'];
-            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/char_stats_realm.tpl'), $vars);
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/tpl/char_stats_realm.tpl'), $vars);
         }
         
         return $result;
@@ -95,9 +51,9 @@ class user_start extends SYSTEM\PAGE\Page {
         $chars = \DBD\CLASS_STATS::QA();
         foreach ($chars as $class){
             $vars = array();
-            $vars['class'] = $this->switch_class($class['class']);
+            $vars['class'] = player_classes::name($class['class']);
             $vars['count'] = $class['count'];
-            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/class_stats_realm.tpl'), $vars);
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/tpl/class_stats_realm.tpl'), $vars);
         }
         
 
@@ -105,23 +61,27 @@ class user_start extends SYSTEM\PAGE\Page {
     }
     
     public function get_faction_balance(){
-        
+        $balance = \DBD\FACTION_BALANCE::Q1();
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/tpl/faction_balance.tpl'), $balance);
     }
+
     
+
     public function html(){
         $vars = array();
         $vars['char_stats'] = $this->get_char_statistics();
         $vars['class_stats'] = $this->get_class_statistics();
-        $vars['guildcount'] = \DBD\COUNT_GUILDS::Q1();
+        $vars['guildcount'] = \DBD\COUNT_GUILDS::Q1()['count'];
         $vars['realm_status'] = realm::status();
         $vars['world_status'] = world::status();
         $vars['player_online'] = database::player_online();
+        $vars['factionbalance'] = $this->get_faction_balance();
         $vars['PICPATH'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=default_page&id=';
-        $vars['PIC'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id=';
+        $vars['PIC'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=race&id=';
         $vars['PI'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id=';
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE),
                                     \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_SERVERINFO),
                                     \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_BASIC));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/user_start.tpl'), $vars);
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/tpl/user_start.tpl'), $vars);
     }
 }
\ No newline at end of file