X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=store.py;h=d25dd35d1b06efe8f73b812c90cb1d51a66448cc;hb=3faa0d739e599daafacf948534d2e66292387d02;hp=43fee03deecf6f9e6ddd52df39af1e3f64ed62a3;hpb=7bd830a83b662874c145ea9548edfde79eadc68f;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

diff --git a/store.py b/store.py
index 43fee03..d25dd35 100644
--- a/store.py
+++ b/store.py
@@ -27,7 +27,7 @@ class ReportStore:
             if isinstance(obj, (datetime, date)):
                 return obj.isoformat()
             return str(obj)
-        return json.dumps(self.logs, default=default_json_serial)
+        return json.dumps(self.logs, default=default_json_serial, indent="  ")
 
     def set_verbose(self, verbose_print):
         self.verbose_print = verbose_print
@@ -234,7 +234,7 @@ class TradeStore:
 
     @property
     def pending(self):
-        return list(filter(lambda t: not t.is_fullfiled, self.all))
+        return list(filter(lambda t: t.pending, self.all))
 
     def compute_trades(self, values_in_base, new_repartition, only=None):
         computed_trades = []
@@ -275,6 +275,10 @@ class TradeStore:
                 orders.append(trade.prepare_order(compute_value=compute_value))
         self.market.report.log_orders(orders, only, compute_value)
 
+    def close_trades(self):
+        for trade in self.all:
+            trade.close()
+
     def print_all_with_order(self, ind=""):
         for trade in self.all:
             trade.print_with_order(ind=ind)