first commit

Base/Metrics/DashboardAdmin/get_total_bank.py

@@ -7,8 +7,9 @@ from Base.models import (
 from Movement.models import (
     Calendar,
     Product,
-    Expense,
-    Stock
+    ExpenseOrCredit,
+    Stock,
+    Transition
 )
 
 def metric():
@@ -36,31 +37,46 @@ def metric():
     # pegando total de Desspesas
     sum_expense = {}
     for bank in banks:
-        sum_bank = Expense.objects.filter(
+        sum_bank = ExpenseOrCredit.objects.filter(
             # active=True,
-            firm=True,
+            # firm=True,
+            debit=True,
+            credit=False,
             bank__name=bank.name,
         ).aggregate(Sum('gross_value'))['gross_value__sum'] or 0
         sum_expense[bank.name] = sum_bank
 
-    # pegando total de Desspesas Profissinal
-    sum_expense_prof = {}
+ # pegando total de Desspesas Profissinal
+    sum_expense_credit = {}
     for bank in banks:
-        sum_bank = Expense.objects.filter(
+        sum_bank = ExpenseOrCredit.objects.filter(
             # active=True,
-            firm=False,
+            # firm=True,
+            debit=False,
+            credit=True,
             bank__name=bank.name,
         ).aggregate(Sum('gross_value'))['gross_value__sum'] or 0
-        sum_expense_prof[bank.name] = sum_bank
+        sum_expense_credit[bank.name] = sum_bank
 
-    # Valores de entrada do estoque
-    sum_stock = {}
+    # Valores trans. de entrada
+    sum_transition_credit = {}
     for bank in banks:
-        sum_bank = Stock.objects.filter(
+        sum_bank = Transition.objects.filter(
             # active=True,
-            bank__name=bank.name,
+            bank_credit__name=bank.name,
         ).aggregate(Sum('gross_value'))['gross_value__sum'] or 0
-        sum_stock[bank.name] = sum_bank
+        sum_transition_credit[bank.name] = sum_bank
+
+
+    # Valores trans. de saida
+    sum_transition_debit = {}
+    for bank in banks:
+        sum_bank = Transition.objects.filter(
+            # active=True,
+            bank_debit__name=bank.name,
+        ).aggregate(Sum('gross_value'))['gross_value__sum'] or 0
+        sum_transition_debit[bank.name] = sum_bank
+
 
     # saldo total de tudo
     sum_total = {}
@@ -68,15 +84,23 @@ def metric():
         sum_mov_serv_get = sum_mov_serv.get(str(bank.name))
         sum_mov_prod_get = sum_mov_prod.get(str(bank.name))
         sum_expense_get = sum_expense.get(str(bank.name))
-        sum_expense_prof_get = sum_expense_prof.get(str(bank.name))
-        sum_sum_stock = sum_stock.get(str(bank.name))
+        sum_expense_credit_get = sum_expense_credit.get(str(bank.name))
+        sum_sum_transition_credit = sum_transition_credit.get(str(bank.name))
+        sum_sum_transition_debit = sum_transition_debit.get(str(bank.name))
 
         sum_total[bank.name] = (
                 sum_mov_serv_get +
-                sum_mov_prod_get -
-                sum_expense_get -
-                sum_expense_prof_get -
-                sum_sum_stock
+                sum_mov_prod_get +
+                sum_expense_credit_get +
+                sum_sum_transition_credit -
+                sum_sum_transition_debit -
+                sum_expense_get
+
         )
 
-    return sum_total
+    sum_all = sum(sum_total.values()) or 0
+
+    return {
+        'sum_total':sum_total,
+        'sum_all':sum_all,
+    }