diff --git a/transportmanager/client/pages/dashboard_page.py b/transportmanager/client/pages/dashboard_page.py index 1eca617..6494d1b 100644 --- a/transportmanager/client/pages/dashboard_page.py +++ b/transportmanager/client/pages/dashboard_page.py @@ -112,6 +112,8 @@ class DashboardPage: #print(month_first_day) if len(self.all_orders)>0: for order in self.all_orders: + if order.get('status') != 'active': + continue dt = self._parse_dt(order.get('created_at')) if dt and dt.date() >= month_first_day.date(): self.orders.append(order) diff --git a/transportmanager/client/pages/report_page.py b/transportmanager/client/pages/report_page.py index 79658ea..6b71065 100644 --- a/transportmanager/client/pages/report_page.py +++ b/transportmanager/client/pages/report_page.py @@ -141,8 +141,8 @@ class ReportPage: ft.DataCell(ft.Text(client_name)), ft.DataCell(ft.Text(transporter_name)), ft.DataCell(ft.Text(order_date)), - ft.DataCell(ft.Text(received)), ft.DataCell(ft.Text(paid)), + ft.DataCell(ft.Text(received)), ft.DataCell(ft.Text(profit)), ], )