* Update web view with shared accounts
* Update TODO
This commit is contained in:
@@ -30,7 +30,7 @@ class User
|
||||
foreach($this->categories as $i => $category)
|
||||
if ($category["id"] == "$id") return $category;
|
||||
|
||||
return "";
|
||||
return LoadCategory($this, $id);
|
||||
}
|
||||
|
||||
function GetAccountName($id)
|
||||
|
@@ -92,6 +92,12 @@ function LoadUser($name)
|
||||
|
||||
$user->accounts = array();
|
||||
|
||||
while ($row = $result->fetchArray())
|
||||
array_push($user->accounts, $row);
|
||||
|
||||
// Shared accounts
|
||||
$result = $db->query("SELECT * FROM account WHERE id IN (SELECT account FROM shared_account WHERE user='$user->id') ORDER BY name ASC");
|
||||
|
||||
while ($row = $result->fetchArray())
|
||||
array_push($user->accounts, $row);
|
||||
|
||||
@@ -117,6 +123,21 @@ function LoadUser($name)
|
||||
return $user;
|
||||
}
|
||||
|
||||
function LoadCategory(&$user, $id)
|
||||
{
|
||||
$result = $db->query("SELECT * FROM category WHERE id='$id'");
|
||||
|
||||
if ($row = $result->fetchArray())
|
||||
{
|
||||
ExtractStyle($row);
|
||||
array_push($user->categories, $row);
|
||||
|
||||
return $row;
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
function GetAccountAmount($id, $month, $year)
|
||||
{
|
||||
global $db;
|
||||
@@ -150,7 +171,6 @@ function LoadMonth($user, $month, $year)
|
||||
$req .= $user->preferences["operation_order"];
|
||||
|
||||
return $db->query($req);
|
||||
|
||||
}
|
||||
|
||||
function GetAllOperations($user, &$last_year, &$last_month)
|
||||
|
Reference in New Issue
Block a user