From e54eb2363c2080014d4a78a825dc2c079459e505 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Fri, 18 Oct 2019 13:04:39 +0200 Subject: seperate cars from users in summaries --- geldschieberbot.py | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/geldschieberbot.py b/geldschieberbot.py index a410442..d9da8ca 100644 --- a/geldschieberbot.py +++ b/geldschieberbot.py @@ -105,28 +105,47 @@ def send(msg): def create_summary(user): summary = "" + cars_summary = "" total = 0 + cars_total = 0 p_balances = balance[user] # failes if user is not in balance for person in p_balances: amount = p_balances[person] if amount == 0: continue - total -= amount - summary += "\t{} {} {}\n".format("<-" if amount < 0 else "->", person, to_euro(abs(amount))) - if summary == "": + if person in available_cars: + cars_total -= amount + cars_summary += f'\t{"<-" if amount < 0 else "->"} {person} {to_euro(abs(amount))}\n' + else: + total -= amount + summary += f'\t{"<-" if amount < 0 else "->"} {person} {to_euro(abs(amount))}\n' + + if not summary: summary = "\tAll fine :)" else: summary += f"\tBalance: {to_euro(total)}" - summary = user + ":\n" + summary - return summary + + ret_summary = f'{user}:\n{summary}' + + if cars_summary: + cars_summary += f'\tLiability: {to_euro(cars_total)}' + ret_summary += f'\n\tCars:\n{cars_summary}' + + return ret_summary def create_total_summary(): summary = "Summary:" + cars_summary = "" for person in balance: - summary += '\n' - summary += create_summary(person) + p_summary = create_summary(person) + if person in available_cars: + cars_summary += f'\n{p_summary}' + else: + summary += f'\n{p_summary}' + if cars_summary: + summary += f'\nCars:{cars_summary}' return summary def create_members(): -- cgit v1.2.3