#99 remove obsolete income class

WiSchLabs · Dec 17, 2016 · 29655eb · 29655eb
1 parent 54f5034
commit 29655eb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 34 deletions.
diff --git a/core/models.py b/core/models.py
@@ -428,26 +428,26 @@ def __str__(self):
 
     def diff(self, ot_finance):
         f = Finance()
-        f.income_visitors_league = self.income_visitors_league - ot_finance.income_visitors_league
-        f.income_sponsoring = self.income_sponsoring - ot_finance.income_sponsoring
-        f.income_cup = self.income_cup - ot_finance.income_cup
-        f.income_interests = self.income_interests - ot_finance.income_interests
-        f.income_loan = self.income_loan - ot_finance.income_loan
-        f.income_transfer = self.income_transfer - ot_finance.income_transfer
-        f.income_visitors_friendlies = self.income_visitors_friendlies - ot_finance.income_visitors_friendlies
-        f.income_funcup = self.income_funcup - ot_finance.income_funcup
-        f.income_betting = self.income_betting - ot_finance.income_betting
-
-        f.expenses_player_salaries = self.expenses_player_salaries - ot_finance.expenses_player_salaries
-        f.expenses_stadium = self.expenses_stadium - ot_finance.expenses_stadium
-        f.expenses_youth = self.expenses_youth - ot_finance.expenses_youth
-        f.expenses_interests = self.expenses_interests - ot_finance.expenses_interests
-        f.expenses_trainings = self.expenses_trainings - ot_finance.expenses_trainings
-        f.expenses_transfer = self.expenses_transfer - ot_finance.expenses_transfer
-        f.expenses_compensation = self.expenses_compensation - ot_finance.expenses_compensation
-        f.expenses_friendlies = self.expenses_friendlies - ot_finance.expenses_friendlies
-        f.expenses_funcup = self.expenses_funcup - ot_finance.expenses_funcup
-        f.expenses_betting = self.expenses_betting - ot_finance.expenses_betting
+        f.income_visitors_league = abs(self.income_visitors_league - ot_finance.income_visitors_league)
+        f.income_sponsoring = abs(self.income_sponsoring - ot_finance.income_sponsoring)
+        f.income_cup = abs(self.income_cup - ot_finance.income_cup)
+        f.income_interests = abs(self.income_interests - ot_finance.income_interests)
+        f.income_loan = abs(self.income_loan - ot_finance.income_loan)
+        f.income_transfer = abs(self.income_transfer - ot_finance.income_transfer)
+        f.income_visitors_friendlies = abs(self.income_visitors_friendlies - ot_finance.income_visitors_friendlies)
+        f.income_funcup = abs(self.income_funcup - ot_finance.income_funcup)
+        f.income_betting = abs(self.income_betting - ot_finance.income_betting)
+
+        f.expenses_player_salaries = -abs(self.expenses_player_salaries - ot_finance.expenses_player_salaries)
+        f.expenses_stadium = -abs(self.expenses_stadium - ot_finance.expenses_stadium)
+        f.expenses_youth = -abs(self.expenses_youth - ot_finance.expenses_youth)
+        f.expenses_interests = -abs(self.expenses_interests - ot_finance.expenses_interests)
+        f.expenses_trainings = -abs(self.expenses_trainings - ot_finance.expenses_trainings)
+        f.expenses_transfer = -abs(self.expenses_transfer - ot_finance.expenses_transfer)
+        f.expenses_compensation = -abs(self.expenses_compensation - ot_finance.expenses_compensation)
+        f.expenses_friendlies = -abs(self.expenses_friendlies - ot_finance.expenses_friendlies)
+        f.expenses_funcup = -abs(self.expenses_funcup - ot_finance.expenses_funcup)
+        f.expenses_betting = -abs(self.expenses_betting - ot_finance.expenses_betting)
         return f
 
     def income(self):

diff --git a/core/views/ofm/finance_views.py b/core/views/ofm/finance_views.py
@@ -72,20 +72,6 @@ def _get_finances_diff_in_json(newer_finances, older_finances):
         return [finances_diff_dict]
 
 
-class Income(object):
-    def __init__(self):
-        self.visitors_league = 0
-        self.sponsoring = 0
-        self.cup = 0
-        self.interests = 0
-        self.loan = 0
-        self.transfer = 0
-        self.visitors_friendlies = 0
-        self.friendlies = 0
-        self.funcup = 0
-        self.betting = 0
-
-
 @method_decorator(login_required, name='dispatch')
 class FinanceBalanceChartView(CsrfExemptMixin, JsonRequestResponseMixin, View):
     def get(self, request, *args, **kwargs):