From 54945703b6d55e92e7c76144b9e23c96d57e5dac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Thu, 27 Nov 2014 18:27:31 +0100
Subject: [PATCH] Update web view

---
 www/User.php     | 17 +++++++++++++++++
 www/database.php | 16 ++++++++++++++++
 www/index.php    |  6 ++++--
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/www/User.php b/www/User.php
index 32c8c63..00b46b0 100755
--- a/www/User.php
+++ b/www/User.php
@@ -23,6 +23,7 @@ class User
     public $id;
     public $accounts;
     public $categories;
+    public $tags;
     public $preferences;
 
     function GetCategory($id)
@@ -44,6 +45,22 @@ class User
         return LoadCategory($this, $id);
     }
 
+    function GetTag($id)
+    {
+        if ($id == "" || $id == "0")
+        {
+            $tag["id"] = 0;
+            $tag["name"] = "";
+
+            return $tag;
+        }
+
+        foreach($this->tags as $i => $tag)
+            if ($tag["id"] == "$id") return $tag;
+
+        return LoadTag($this, $id);
+    }
+
     function IsAccountBlocked($id)
     {
         foreach($this->accounts as $i => $account) 
diff --git a/www/database.php b/www/database.php
index 8ab6e65..10abff2 100755
--- a/www/database.php
+++ b/www/database.php
@@ -140,6 +140,22 @@ function LoadCategory(&$user, $id)
     return "";
 }
 
+function LoadTag(&$user, $id)
+{
+    global $db;
+
+    $result = $db->query("SELECT * FROM tag WHERE id='$id'");
+
+    if ($row = $result->fetchArray())
+    {
+        array_push($user->tags, $row);
+
+        return $row;
+    }
+
+    return "";
+}
+
 function GetAccountAmount($id, $month, $year)
 {
     global $db;
diff --git a/www/index.php b/www/index.php
index cd7e7b6..54a77ca 100755
--- a/www/index.php
+++ b/www/index.php
@@ -245,7 +245,7 @@ function toggleOperations(parent, operations)
 <br /><br />
 <div id="operations">
     <table>
-    <tr class="header" bgcolor="#99CCFF"><td/><td>Description</td><td>Date</td><td>Debit</td><td>Credit</td><td>Category</td><td>Account</td></tr>
+    <tr class="header" bgcolor="#99CCFF"><td/><td>Description</td><td>Date</td><td>Debit</td><td>Credit</td><td>Category</td><td>Account</td><td>Tag</td></tr>
     <?php
     $prev_week=-1;
 $operations = LoadMonth($_SESSION["user"], $_SESSION["cur_month"], $_SESSION["cur_year"]);
@@ -253,6 +253,7 @@ $operations = LoadMonth($_SESSION["user"], $_SESSION["cur_month"], $_SESSION["cu
 foreach($operations as $i => $operation)
 {
     $category = $_SESSION["user"]->GetCategory($operation["category"]);
+    $tag = $_SESSION["user"]->GetTag($operation["tag"]);
     if ($operation["fix_cost"] == "0")
     {
 	$cur_week = date("W", mktime(0, 0, 0, $operation["month"]+1, $operation["day"]+1, $operation["year"]));
@@ -294,6 +295,7 @@ foreach($operations as $i => $operation)
     else
         echo "<td />";
     echo "<td>" . $_SESSION["user"]->GetAccountName($operation["account"]) . "</td>";
+    echo "<td>" . $tag["name"] . "</td>";
     echo "</tr>\n";
 }
 ?>
@@ -351,6 +353,6 @@ foreach($operations as $i => $operation)
 </div>
 </div>
 <br /><br />
-<center><a href="http://indefero.soutade.fr/p/kisscount">KissCount</a> &copy; 2010-2012 Grégory Soutadé</center>
+<center><a href="http://indefero.soutade.fr/p/kisscount">KissCount</a> &copy; 2010-2014 Grégory Soutadé</center>
 </body>
 </html>
\ No newline at end of file