|
@@ -360,7 +360,7 @@ def get_user_orders(user_id):
|
|
|
WHEN orders.stop_loss THEN 'Yes'
|
|
|
ELSE 'No'
|
|
|
END,
|
|
|
- datetime(orders.expiry_dt),
|
|
|
+ datetime(orders.expiry_dt, 'localtime'),
|
|
|
orders.rowid
|
|
|
FROM orders, ownables, ownership
|
|
|
WHERE ownership.user_id = ?
|
|
@@ -389,7 +389,7 @@ def get_ownable_orders(ownable_id):
|
|
|
WHEN orders.stop_loss THEN 'Yes'
|
|
|
ELSE 'No'
|
|
|
END,
|
|
|
- datetime(orders.expiry_dt),
|
|
|
+ datetime(orders.expiry_dt, 'localtime'),
|
|
|
orders.rowid
|
|
|
FROM orders, ownables, ownership
|
|
|
WHERE ownership.ownable_id = ?
|
|
@@ -459,7 +459,7 @@ def news():
|
|
|
FROM news
|
|
|
ORDER BY rowid DESC -- equivalent to order by dt
|
|
|
LIMIT 20) n
|
|
|
- ORDER BY dt ASC
|
|
|
+ ORDER BY rowid ASC -- equivalent to order by dt
|
|
|
''')
|
|
|
|
|
|
return cursor.fetchall()
|
|
@@ -686,7 +686,7 @@ def execute_orders(ownable_id):
|
|
|
|
|
|
buyer_money = user_money(buyer_id)
|
|
|
|
|
|
- def _my_division(x,y):
|
|
|
+ def _my_division(x, y):
|
|
|
try:
|
|
|
return floor(x/y)
|
|
|
except ZeroDivisionError:
|
|
@@ -694,7 +694,7 @@ def execute_orders(ownable_id):
|
|
|
|
|
|
amount = min(buy_order_amount - buy_executed_amount,
|
|
|
sell_order_amount - sell_executed_amount,
|
|
|
- _my_division(buyer_money,price))
|
|
|
+ _my_division(buyer_money, price))
|
|
|
|
|
|
if amount == 0: # probable because buyer has not enough money
|
|
|
delete_order(buy_order_id)
|
|
@@ -834,7 +834,7 @@ def transactions(ownable_id):
|
|
|
connect()
|
|
|
|
|
|
cursor.execute('''
|
|
|
- SELECT dt, amount, price
|
|
|
+ SELECT datetime(dt,'localtime'), amount, price
|
|
|
FROM transactions
|
|
|
WHERE ownable_id = ?
|
|
|
ORDER BY rowid DESC -- equivalent to order by dt
|
|
@@ -1050,4 +1050,4 @@ def new_news(message):
|
|
|
cursor.execute('''
|
|
|
INSERT INTO news(title)
|
|
|
VALUES (?)
|
|
|
- ''', (message,))
|
|
|
+ ''', (message,))
|