Added category, added pie chart on categories, removed buggy ba-resize plugin.

This commit is contained in:
Alexis Lahouze
2013-01-12 22:11:48 +01:00
parent 6f36d7970f
commit 868cf3138a
5 changed files with 155 additions and 77 deletions

View File

@ -17,7 +17,7 @@ class EntryAPI extends RestAPI {
$account=$this->_request['account'];
$statement=$connection->prepare("select id, value_date, operation_date, label, value, account_id, sold, pointedSold from (select *, sum(value) over(order by value_date, operation_date, label desc, value desc) as sold, sum(value) over(partition by operation_date is not null order by value_date, operation_date, label desc, value desc) as pointedSold from entry where account_id=:account order by value_date desc, operation_date desc, label, value) as e where date_trunc('month', e.value_date) = :day ");
$statement=$connection->prepare("select id, value_date, operation_date, label, value, account_id, sold, pointedsold, category from (select *, sum(value) over(order by value_date, operation_date, label desc, value desc) as sold, sum(value) over(partition by operation_date is not null order by value_date, operation_date, label desc, value desc) as pointedSold from entry where account_id=:account order by value_date desc, operation_date desc, label, value) as e where date_trunc('month', e.value_date) = :day ");
$statement->bindParam("day", $day);
$statement->bindParam("account", $account);
@ -36,9 +36,9 @@ class EntryAPI extends RestAPI {
$connection=$this->get_db_connection();
if($entry['id'] != null) {
$statement=$connection->prepare("update entry set value_date=:value_date, operation_date=:operation_date, label=:label, value=:value, account_id=:account where id=:id");
$statement=$connection->prepare("update entry set value_date=:value_date, operation_date=:operation_date, label=:label, value=:value, account_id=:account, category=:category where id=:id");
} else {
$statement=$connection->prepare("insert into entry (value_date, operation_date, label, value, account_id) values (:value_date, :operation_date, :label, :value, :account)");
$statement=$connection->prepare("insert into entry (value_date, operation_date, label, value, account_id) values (:value_date, :operation_date, :label, :value, :account, :category)");
}
$statement->bindParam("value_date", $entry['value_date']);
@ -47,6 +47,7 @@ class EntryAPI extends RestAPI {
$statement->bindParam("value", $entry['value']);
$statement->bindParam("account", $entry['account']);
$statement->bindParam("id", $entry['id']);
$statement->bindParam("category", $entry['category']);
$return=$statement->execute();