Changeset 634 for trunk/pages

Timestamp:

Sep 14, 2009, 7:53:21 AM (15 years ago)

Author:

george

Message:

• Upraveno: Stránka s výpisem dotací osamostatněna a doplněna o stránkování.
• Přidáno: Zobrazení ročních příjmů a nákladů na stránce financí.

Location:

trunk/pages

Files:

• dotation.php (modified) (1 diff)
• dotation_dump.php (added)
• guilda.php (modified) (1 diff)
• guildy.php (modified) (1 diff)

trunk/pages/dotation.php

@@ -23 +23 @@
 </p>';
 
-$operace = array(
-  'buy' => 'Nákup',
-  'sell' => 'Prodej',
-  'consumption' => 'Spotřeba',
-  'internet' => 'Internet',
-  'contribution' => 'Příspěvek od',
-);
-
 $load_money = $db->query('SELECT SUM(`Money`) FROM `Finance`;')->fetch_row();
 
 $Output .= '<p><strong>Aktuální stav financí: '.$load_money[0].' Kč</strong></p>';
+
+$Output .= '<h4 class="Center">Roční přehledy financování</h4>';
 $Output .= '<table class="BaseTable">'.
-  '<tr>'.
-  '<th>Datum</th>'.
-  '<th>Suma</th>'.
-  '<th>Popis</th>'.
-  '<th>Odměna</th>'.
-  '</tr>'; 
+  '<tr><th>Rok</th><th>Příjmy</th><th>Výdaje</th><th>Rozdíl</th></tr>';
+$DbResult = $db->query('SELECT MAX(Time), MIN(Time) FROM Finance');
+$TimeRange = $DbResult->fetch_array();
 
-$load_dotation = $db->query('SELECT * FROM `Finance` ORDER BY `Id` DESC');
-while($row = $load_dotation->fetch_assoc())
+$StartDateTimeParts = explode(' ',$TimeRange['MIN(Time)']);
+$StartDateParts = explode('-',$StartDateTimeParts[0]);
+$EndDateTimeParts = explode(' ',$TimeRange['MAX(Time)']);
+$EndDateParts = explode('-',$EndDateTimeParts[0]);
+
+$TotalIncome = 0;
+$TotalExpense = 0;
+for($Year = $EndDateParts[0]; $Year >= $StartDateParts[0]; $Year--)
 {
-  $odmena = $row['Reward'];
-  
-  if($row['Time'] != '')
-  {
-    $date = $server->HumanDate($row['Time'], 0);
-    //$date = $row['time'];
-  } else $date = '';
-  if($row['Money'] > 0) $plus = '+';
-    else $plus = '';
-  $Output .= '<tr>'.
-    '<td>'.$date.'</td>'.
-    '<td>'.$plus.$row['Money'].'</td>'.
-    '<td>'.$operace[$row['Operation']].' '.$row['Description'].'</td>'.
-    '<td>'.$odmena.'</td>'.
-    '</tr>';
+  $DbResult = $db->query('SELECT SUM(Money) AS Income FROM Finance WHERE (Money > 0) AND (Time >= "'.$Year.'-01-01") AND (Time < DATE_ADD("'.$Year.'-01-01", INTERVAL 1 YEAR))');
+  $Income = $DbResult->fetch_assoc();
+  $Income = $Income['Income'];
+  $TotalIncome += $Income;
+  $DbResult = $db->query('SELECT -SUM(Money) AS Expense FROM Finance WHERE (Money < 0) AND (Time >= "'.$Year.'-01-01") AND (Time < DATE_ADD("'.$Year.'-01-01", INTERVAL 1 YEAR))');
+  $Expense = $DbResult->fetch_assoc();
+  $Expense = $Expense['Expense'];
+  $TotalExpense += $Expense;
+  $Output .= '<tr><td>'.$Year.'</td><td>'.$Income.'</td><td>'.$Expense.'</td><td>'.($Income - $Expense).'</td></tr>';
 }
+$Output .= '<tr><th>Celkem</th><th>'.$TotalIncome.'</th><th>'.$TotalExpense.'</th><th>'.($TotalIncome - $TotalExpense).'</th></tr>';
 $Output .= '</table>';
+
+$Output .= '<br/><div class="Center"><a href="?page=dotation_dump">Výpis jednotlivých příspěvků</a></div>';
 
 echo($Output); 

trunk/pages/guilda.php

@@ -43 +43 @@
       <td>'.$total_members.' (Online : '.$online_mem['online_mem'].')</td>
     </tr>');
-  $DbResult = $db->query('SELECT Homepage FROM GuildInfo WHERE Guild='.$guild_id);
+  $DbResult = $db->query('SELECT Homepage FROM GuildInfo WHERE Guild='.$guild_id.' AND Realm='.$Realm->Id);
   $DbRow = $DbResult->fetch_assoc();
   $Homepage = $DbRow['Homepage'];

trunk/pages/guildy.php

@@ -52 +52 @@
   $DbResult = $db2->query('SELECT COUNT(*) AS online_mem  FROM `guild_member`, `characters`, `guild` WHERE guild.guildid = '.$row['guildid'].' AND guild_member.guildid = guild.guildid AND guild_member.guid = characters.guid AND characters.online = 1');
   $online_mem = $DbResult->fetch_assoc();
-  $DbResult = $db->query('SELECT Homepage FROM GuildInfo WHERE Guild='.$row['guildid']);
+  $DbResult = $db->query('SELECT Homepage FROM GuildInfo WHERE Guild='.$row['guildid'].' AND Realm='.$Realm->Id);
   $DbRow = $DbResult->fetch_assoc();
   $Homepage = $DbRow['Homepage'];