From: Christian Heller Date: Fri, 3 Nov 2023 23:58:33 +0000 (+0100) Subject: Improve ledger.py. X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/static/%7B%7Bdb.prefix%7D%7D/bar%20baz.html?a=commitdiff_plain;h=fc4f07e359dc5e3a7817c8d100a4142c1f1360c4;p=misc Improve ledger.py. --- diff --git a/ledger.py b/ledger.py index f7f722c..6e0a482 100755 --- a/ledger.py +++ b/ledger.py @@ -2,7 +2,7 @@ from http.server import BaseHTTPRequestHandler, HTTPServer import sys import os import html -import jinja2 +import jinja2 import decimal from urllib.parse import parse_qs, urlparse hostName = "localhost" @@ -319,7 +319,7 @@ class Database: kk_expenses = 0 est_expenses = 0 for b in self.bookings: - if date == b.date_string: + if date == b.date_string: break acc_keys = b.account_changes.keys() if acc_buffer in acc_keys: @@ -331,29 +331,29 @@ class Database: if acc_est in acc_keys: est_expenses += b.account_changes[acc_est]['€'] if finish and acc_kk_add in acc_keys and acc_kk_minimum in acc_keys: - last_monthbreak_kk_add = b.account_changes[acc_kk_add]['€'] - last_monthbreak_est = b.account_changes[acc_est]['€'] - last_monthbreak_kk_minimum = b.account_changes[acc_kk_minimum]['€'] - last_monthbreak_assets = b.account_changes[acc_buffer]['€'] - old_needed_income = last_monthbreak_assets + last_monthbreak_kk_add + last_monthbreak_kk_minimum + last_monthbreak_est + last_monthbreak_kk_add = b.account_changes[acc_kk_add]['€'] + last_monthbreak_est = b.account_changes[acc_est]['€'] + last_monthbreak_kk_minimum = b.account_changes[acc_kk_minimum]['€'] + last_monthbreak_assets = b.account_changes[acc_buffer]['€'] + old_needed_income = last_monthbreak_assets + last_monthbreak_kk_add + last_monthbreak_kk_minimum + last_monthbreak_est if finish: ret += [f' {acc_est} {-last_monthbreak_est}€ ; for old assumption of needed income: {old_needed_income}€'] _, account_sums = bookings_to_account_tree(bookings) - expenses_so_far = -1 * account_sums[acc_assets]['€'] - old_needed_income + expenses_so_far = -1 * account_sums[acc_assets]['€'] - old_needed_income needed_income_before_kk = expenses_so_far ESt_this_month = 0 left_over = needed_income_before_kk - ESt_this_month too_low = 0 - too_high = 2 * needed_income_before_kk + too_high = 2 * needed_income_before_kk E0 = decimal.Decimal(10908) E1 = decimal.Decimal(15999) - E2 = decimal.Decimal(62809) - E3 = decimal.Decimal(277825) + E2 = decimal.Decimal(62809) + E3 = decimal.Decimal(277825) months_passed = int(date[5:7]) - 1 while True: zvE = buffer_expenses - kk_expenses + (12 - months_passed) * needed_income_before_kk if finish: - zvE += last_monthbreak_assets + last_monthbreak_kk_add + last_monthbreak_kk_minimum + zvE += last_monthbreak_assets + last_monthbreak_kk_add + last_monthbreak_kk_minimum if zvE < E0: ESt = decimal.Decimal(0) elif zvE < E1: @@ -364,8 +364,8 @@ class Database: ESt = (decimal.Decimal(192.59) * y + 2397) * y + decimal.Decimal(966.53) elif zvE < E3: ESt = decimal.Decimal(0.42) * (zvE - decimal.Decimal(62809)) + decimal.Decimal(16405.54) - else: - ESt = decimal.Decimal(0.45) * (zvE - decimal.Decimal(277825)) + decimal.Decimal(106713.52) + else: + ESt = decimal.Decimal(0.45) * (zvE - decimal.Decimal(277825)) + decimal.Decimal(106713.52) ESt_this_month = (ESt + last_monthbreak_est - est_expenses) / (12 - months_passed) left_over = needed_income_before_kk - ESt_this_month if abs(left_over - expenses_so_far) < 0.001: @@ -377,16 +377,16 @@ class Database: needed_income_before_kk = too_low + (too_high - too_low)/2 ESt_this_month = ESt_this_month.quantize(decimal.Decimal('0.00')) ret += [f' {acc_est} {ESt_this_month}€ ; expenses so far: {expenses_so_far:.2f}€; zvE: {zvE:.2f}€; ESt total: {ESt:.2f}€; needed before Krankenkasse: {needed_income_before_kk:.2f}€'] - kk_minimum_income = 1131.67 + kk_minimum_income = 1131.67 if date < '2023-02-01': - kk_minimum_income = decimal.Decimal(1096.67) - kk_factor = decimal.Decimal(0.189) + kk_minimum_income = decimal.Decimal(1096.67) + kk_factor = decimal.Decimal(0.189) kk_minimum_tax = decimal.Decimal(207.27).quantize(decimal.Decimal('0.00')) elif date < '2023-08-01': - kk_factor = decimal.Decimal(0.191) + kk_factor = decimal.Decimal(0.191) kk_minimum_tax = decimal.Decimal(216.15).quantize(decimal.Decimal('0.00')) else: - kk_factor = decimal.Decimal(0.197) + kk_factor = decimal.Decimal(0.197) kk_minimum_tax = decimal.Decimal(222.94).quantize(decimal.Decimal('0.00')) kk_add = max(0, kk_factor * needed_income_before_kk - kk_minimum_tax) kk_add = decimal.Decimal(kk_add).quantize(decimal.Decimal('0.00')) @@ -395,7 +395,7 @@ class Database: else: ret += [f' {acc_kk_minimum} {kk_minimum_tax}€ ; assumed minimum income {kk_minimum_income:.2f}€ * {kk_factor:.3f}'] ret += [f' {acc_kk_add} {kk_add}€ ; max(0, {kk_factor:.3f} * {needed_income_before_kk:.2f}€ - {kk_minimum_tax}€)'] - diff = - last_monthbreak_est + ESt_this_month - last_monthbreak_kk_add + kk_add + diff = - last_monthbreak_est + ESt_this_month - last_monthbreak_kk_add + kk_add if not finish: diff += kk_minimum_tax final_minus = expenses_so_far + old_needed_income + diff @@ -415,15 +415,35 @@ th, td { text-align: left } input[type=number] { text-align: right; font-family: monospace; } .money { font-family: monospace; text-align: right; } .comment { font-style: italic; color: #777777; } +.meta { font-size: 0.75em; color: #777777; } .full_line_comment { display: block; white-space: nowrap; width: 0; } -ledger +ledger1 +ledger2 balance add free add structured
""" + booking_tmpl = jinja2.Template(""" +

{{date}} {{desc}} {{head_comment|e}}
+[edit: structured +/ free +| copy:structured +/ free +| balance before or after +] + +{% for l in booking_lines %} +{% if l.acc %} + +{% else %} + +{% endif %} +{% endfor %} +
{{l.acc|e}}{{l.money|e}}{{l.comment|e}}
{{l.comment|e}}

+""") footer = "\n" def do_POST(self): @@ -432,7 +452,7 @@ input[type=number] { text-align: right; font-family: monospace; } postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1) parsed_url = urlparse(self.path) lines = [] - add_empty_line = None + add_empty_line = None start = int(postvars['start'][0]) end = int(postvars['end'][0]) if '/add_structured' == parsed_url.path and not 'revert' in postvars.keys(): @@ -447,7 +467,9 @@ input[type=number] { text-align: right; font-family: monospace; } if f'line_{i}_delete' in postvars.keys(): i += 1 continue - if f'line_{i}_add' in postvars.keys(): + elif f'line_{i}_delete_after' in postvars.keys(): + break + elif f'line_{i}_add' in postvars.keys(): add_empty_line = j account = postvars[f'line_{i}_account'][0] amount = postvars[f'line_{i}_amount'][0] @@ -506,7 +528,8 @@ input[type=number] { text-align: right; font-family: monospace; } end = int(params.get('end', ['0'])[0]) if parsed_url.path == '/balance': stop_date = params.get('stop', [None])[0] - page += self.balance_as_html(db, stop_date) + plus = int(params.get('plus', [0])[0]) + page += self.balance_as_html(db, stop_date, plus) elif parsed_url.path == '/add_free': page += self.add_free(db, start, end) elif parsed_url.path == '/add_structured': @@ -522,14 +545,20 @@ input[type=number] { text-align: right; font-family: monospace; } page += self.footer self.wfile.write(bytes(page, "utf-8")) - def balance_as_html(self, db, stop_date=None): + def balance_as_html(self, db, stop_date=None, plus=0): lines = [] bookings = db.bookings if stop_date: - bookings = [] + bookings = [] + i = -1 for b in db.bookings: if b.date_string == stop_date: + if -1 == i: + i = 0 + if i >= plus: break + if i > -1: + i += 1 bookings += [b] account_tree, account_sums = bookings_to_account_tree(bookings) def print_subtree(lines, indent, node, subtree, path): @@ -553,116 +582,100 @@ input[type=number] { text-align: right; font-family: monospace; } content = "\n".join(lines) return f"
{content}
" - def ledger2_as_html(self, db): - single_c_tmpl = jinja2.Template('{{c|e}}
') - booking_tmpl = jinja2.Template(""" -

{{date}} {{desc}} {{head_comment|e}} -[edit: structured -/ free -| copy:structured -/ free] - -{% for l in booking_lines %} - -{% endfor %} -
{{l.acc|e}}{{l.money|e}}{{l.balance|e}}

-""") + def ledger_as_html(self, db): elements_to_write = [] - account_sums = {} + account_sums = {} ## + nth_of_same_date = 0 + same_date = '' for booking in db.bookings: - i = booking.start_line + if booking.date_string == same_date: + nth_of_same_date += 1 + else: + same_date = booking.date_string + nth_of_same_date = 0 booking_end = booking.start_line + len(booking.lines) booking_lines = [] for booking_line in booking.lines[1:]: if booking_line == '': continue - account = booking_line[0] - account_toks = account.split(':') - path = '' - for tok in account_toks: - path += tok - if not path in account_sums.keys(): - account_sums[path] = {} - path += ':' - moneys = [] + account = booking_line[0] ## + account_toks = account.split(':') ## + path = '' ## + for tok in account_toks: ## + path += tok ## + if not path in account_sums.keys(): ## + account_sums[path] = {} ## + path += ':' ## + moneys = [] ## money = '' if booking_line[1] is not None: - moneys += [(booking_line[1], booking_line[2])] + moneys += [(booking_line[1], booking_line[2])] ## money = f'{moneys[0][0]} {moneys[0][1]}' - else: - for currency, amount in booking.sink.items(): - moneys += {(amount, currency)} - money = '[' - for m in moneys: - money += f'{m[0]} {m[1]} ' - money += ']' - balance = '' - for amount, currency in moneys: - path = '' - for tok in account_toks: - path += tok - if not currency in account_sums[path].keys(): - account_sums[path][currency] = 0 - account_sums[path][currency] += amount - path += ':' - balance += f'{account_sums[account][currency]} {currency}' - booking_lines += [{'acc': booking_line[0], 'money':money, 'balance':balance}] - elements_to_write += [booking_tmpl.render( + else: ## + for currency, amount in booking.sink.items(): ## + moneys += {(amount, currency)} ## + money = '[' ## + for m in moneys: ## + money += f'{m[0]} {m[1]} ' ## + money += ']' ## + balance = '' ## + for amount, currency in moneys: ## + path = '' ## + for tok in account_toks: ## + path += tok ## + if not currency in account_sums[path].keys(): ## + account_sums[path][currency] = 0 ## + account_sums[path][currency] += amount ## + path += ':' ## + balance += f'{account_sums[account][currency]} {currency}' ## + booking_lines += [{'acc': booking_line[0], 'money':money, 'comment':balance}] ## + elements_to_write += [self.booking_tmpl.render( start=booking.start_line, end=booking_end, date=booking.date_string, desc=booking.description, head_comment=db.comments[booking.start_line], + steps_after_date=nth_of_same_date, booking_lines = booking_lines)] - return '\n'.join(elements_to_write) + return '\n'.join(elements_to_write) - def ledger_as_html(self, db): + def ledger2_as_html(self, db): single_c_tmpl = jinja2.Template('{{c|e}}
') - booking_tmpl = jinja2.Template(""" -

{{date}} {{desc}} {{head_comment|e}} -[edit: structured -/ free -| copy:structured -/ free] - -{% for l in booking_lines %} -{% if l.acc %} - -{% else %} - -{% endif %} -{% endfor %} -
{{l.acc|e}}{{l.money|e}}{{l.comment|e}}
{{l.comment|e}}

-""") elements_to_write = [] - last_i = i = 0 - last_start = db.bookings[-1].start_line + last_i = i = 0 ## + nth_of_same_date = 0 + same_date = '' for booking in db.bookings: - i = booking.start_line - elements_to_write += [single_c_tmpl.render(c=c) for c in db.comments[last_i:i] if c != ''] + if booking.date_string == same_date: + nth_of_same_date += 1 + else: + same_date = booking.date_string + nth_of_same_date = 0 + i = booking.start_line ## + elements_to_write += [single_c_tmpl.render(c=c) for c in db.comments[last_i:i] if c != ''] ## booking_end = last_i = booking.start_line + len(booking.lines) booking_lines = [] for booking_line in booking.lines[1:]: - i += 1 - comment = db.comments[i] - if booking_line == '': - booking_lines += [{'acc': None, 'money': None, 'comment': comment}] - continue - account = booking_line[0] - money = '' - if booking_line[1] is not None: - money = f'{booking_line[1]} {booking_line[2]}' - booking_lines += [{'acc': booking_line[0], 'money':money, 'comment':comment}] - elements_to_write += [booking_tmpl.render( - last=booking.start_line == last_start, + i += 1 + comment = db.comments[i] + if booking_line == '': + booking_lines += [{'acc': None, 'money': None, 'comment': comment}] + continue + account = booking_line[0] + money = '' + if booking_line[1] is not None: + money = f'{booking_line[1]} {booking_line[2]}' + booking_lines += [{'acc': booking_line[0], 'money':money, 'comment':comment}] ## + elements_to_write += [self.booking_tmpl.render( start=booking.start_line, end=booking_end, date=booking.date_string, desc=booking.description, head_comment=db.comments[booking.start_line], + steps_after_date=nth_of_same_date, booking_lines = booking_lines)] elements_to_write += [single_c_tmpl.render(c=c) for c in db.comments[last_i:] if c != ''] - return '\n'.join(elements_to_write) + return '\n'.join(elements_to_write) def add_free(self, db, start=0, end=0, copy=False): tmpl = jinja2.Template(""" @@ -679,7 +692,7 @@ input[type=number] { text-align: right; font-family: monospace; } lines = db.get_lines(start, end) if copy: start = end = 0 - return tmpl.render(action='add_free', start=start, end=end, lines=lines) + return tmpl.render(action='add_free', start=start, end=end, lines=lines) def add_structured(self, db, start=0, end=0, copy=False, temp_lines=[], add_empty_line=None): tmpl = jinja2.Template(""" @@ -699,6 +712,7 @@ input[type=number] { text-align: right; font-family: monospace; } +
@@ -723,7 +737,7 @@ input[type=number] { text-align: right; font-family: monospace; } if add_empty_line is not None: comments = comments[:add_empty_line+1] + [''] + comments[add_empty_line+1:] booking = bookings[0] - booking.lines = booking.lines[:add_empty_line+1] + [''] + booking.lines[add_empty_line+1:] + booking.lines = booking.lines[:add_empty_line+1] + [''] + booking.lines[add_empty_line+1:] action = 'add_structured' datalist_sets = {'descriptions': set(), 'accounts': set(), 'currencies': set()} for b in db.bookings: @@ -741,7 +755,7 @@ input[type=number] { text-align: right; font-family: monospace; } if len(bookings) == 0: for i in range(1, 3): booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': '', 'comment': ''}] - date=today + date=today else: booking = bookings[0] desc = booking.description @@ -755,25 +769,25 @@ input[type=number] { text-align: right; font-family: monospace; } amount = booking.lines[i][1] currency = booking.lines[i][2] booking_lines += [{ - 'i': i, + 'i': i, 'acc': account, - 'amt': amount, + 'amt': amount, 'curr': currency if currency else '', 'comment': comments[i], 'comm_cols': len(comments[i])}] content += tmpl.render( - action=action, + action=action, date=date, desc=desc, - head_comment=head_comment, + head_comment=head_comment, booking_lines=booking_lines, datalist_sets=datalist_sets, start=start, - end=end) - return content + end=end) + return content -if __name__ == "__main__": +if __name__ == "__main__": webServer = HTTPServer((hostName, serverPort), MyServer) print(f"Server started http://{hostName}:{serverPort}") try: