aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fl.fischer@fau.de>2019-10-18 13:04:39 +0200
committerFlorian Fischer <florian.fl.fischer@fau.de>2019-10-18 13:04:39 +0200
commite54eb2363c2080014d4a78a825dc2c079459e505 (patch)
tree475050b6536233448322b1f6662fef61cd205cab
parent2bab8d1ab3dd31c6e316cb0b3d9474e0655c5350 (diff)
downloadgeldschieberbot-e54eb2363c2080014d4a78a825dc2c079459e505.tar.gz
geldschieberbot-e54eb2363c2080014d4a78a825dc2c079459e505.zip
seperate cars from users in summaries
-rw-r--r--geldschieberbot.py33
1 files 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():