Fixed otherFeild lambda func not being used
This commit is contained in:
parent
9284a55825
commit
6280533b39
@ -127,7 +127,7 @@ def calculateStats(transactions, yearRangeVal=None, monthRangeVal=None, otherFel
|
|||||||
if isinstance(monthRangeVal, list) or isinstance(monthRangeVal, tuple): monthRange = lambda x: x[1].month in monthRangeVal
|
if isinstance(monthRangeVal, list) or isinstance(monthRangeVal, tuple): monthRange = lambda x: x[1].month in monthRangeVal
|
||||||
if isinstance(monthRangeVal, int) or isinstance(monthRangeVal, float): monthRange = lambda x: x[1].month == int(monthRangeVal)
|
if isinstance(monthRangeVal, int) or isinstance(monthRangeVal, float): monthRange = lambda x: x[1].month == int(monthRangeVal)
|
||||||
|
|
||||||
if not isinstance(yearRangeVal, type(monthRange)): otherFelid = lambda x: True
|
if not isinstance(otherFelid, type(monthRange)): otherFelid = lambda x: True
|
||||||
|
|
||||||
periodTransactions = [x for x in transactions if yearRange(x) and monthRange(x) and otherFelid(x)]
|
periodTransactions = [x for x in transactions if yearRange(x) and monthRange(x) and otherFelid(x)]
|
||||||
periodTransactions = sorted(periodTransactions, reverse = True, key = lambda x: x[1])
|
periodTransactions = sorted(periodTransactions, reverse = True, key = lambda x: x[1])
|
||||||
@ -163,7 +163,8 @@ import pprint
|
|||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
trans = loadTransactionData()
|
trans = loadTransactionData()
|
||||||
stats = calculateStats(trans, 2020, 1)
|
y = lambda x: x[-2] == TRANSACTION_TYPES[1]
|
||||||
|
stats = calculateStats(trans, 2020, 1, y)
|
||||||
pprint.pprint(stats, indent=4)
|
pprint.pprint(stats, indent=4)
|
||||||
|
|
||||||
#calculateStats(trans)
|
#calculateStats(trans)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user