X-Git-Url: https://plomlompom.com/repos/processes?a=blobdiff_plain;ds=inline;f=ledger.py;h=0785b1a7559869c074080b0775d16f1a81c2cb3a;hb=3edadb6c0b977d0362ca8344303b3260184bebae;hp=a1b31eb9f9c4d56739340aa8658721b9eb61368d;hpb=3cc26ca62b237dd6f5ad480c0391431bdb5728fc;p=misc diff --git a/ledger.py b/ledger.py index a1b31eb..0785b1a 100755 --- a/ledger.py +++ b/ledger.py @@ -2,6 +2,8 @@ from http.server import BaseHTTPRequestHandler, HTTPServer import sys import os import html +import jinja2 +import decimal from urllib.parse import parse_qs, urlparse hostName = "localhost" serverPort = 8082 @@ -26,8 +28,7 @@ def apply_booking_to_account_balances(account_sums, account, currency, amount): def add_taxes(lines): - import decimal - bookings, _ = parse_lines(lines.copy()) + bookings, _ = parse_lines(lines) _, account_sums = bookings_to_account_tree(bookings) expenses_so_far = -1 * account_sums['Assets']['â¬'] needed_income_before_krankenkasse = expenses_so_far @@ -35,10 +36,10 @@ def add_taxes(lines): left_over = needed_income_before_krankenkasse - ESt_this_month too_low = 0 too_high = 2 * needed_income_before_krankenkasse - E0 = 10908 - E1 = 15999 - E2 = 62809 - E3 = 277825 + E0 = decimal.Decimal(10908) + E1 = decimal.Decimal(15999) + E2 = decimal.Decimal(62809) + E3 = decimal.Decimal(277825) while True: zvE = 12 * needed_income_before_krankenkasse if zvE < E0: @@ -55,27 +56,29 @@ def add_taxes(lines): ESt = decimal.Decimal(0.45) * (zvE - decimal.Decimal(277825)) + decimal.Decimal(106713.52) ESt_this_month = ESt / 12 left_over = needed_income_before_krankenkasse - ESt_this_month - if abs(left_over - expenses_so_far) < 0.1: + if abs(left_over - expenses_so_far) < 0.001: break elif left_over < expenses_so_far: too_low = needed_income_before_krankenkasse elif left_over > expenses_so_far: too_high = needed_income_before_krankenkasse needed_income_before_krankenkasse = too_low + (too_high - too_low)/2 - line_income_tax = f' Reserves:Einkommenssteuer {ESt_this_month:.2f}⬠; expenses so far: {expenses_so_far:.2f}â¬; zvE: {zvE:.2f}â¬; ESt total: {ESt:.2f}â¬; needed before Krankenkasse: {needed_income_before_krankenkasse:.2f}â¬' - kk_minimum_income = 1096.67 + ESt_this_month = ESt_this_month.quantize(decimal.Decimal('0.00')) + line_income_tax = f' Reserves:Einkommenssteuer {ESt_this_month}⬠; expenses so far: {expenses_so_far:.2f}â¬; zvE: {zvE:.2f}â¬; ESt total: {ESt:.2f}â¬; needed before Krankenkasse: {needed_income_before_krankenkasse:.2f}â¬' + kk_minimum_income = decimal.Decimal(1096.67) kk_factor = decimal.Decimal(0.189) - kk_minimum_tax = decimal.Decimal(207.27) + kk_minimum_tax = decimal.Decimal(207.27).quantize(decimal.Decimal('0.00')) # kk_minimum_income = 1131.67 # kk_factor = decimal.Decimal(0.191) # kk_minimum_tax = decimal.Decimal(216.15) # kk_factor = decimal.Decimal(0.197) # kk_minimum_tax = decimal.Decimal(222.94) kk_add = max(0, kk_factor * needed_income_before_krankenkasse - kk_minimum_tax) - line_kk_minimum = f' Reserves:Month:Krankenkassendefaultbeitrag {kk_minimum_tax:.2f}⬠; assed minimum income {kk_minimum_income:.2f}⬠* {kk_factor:.3f}' - line_kk_add = f' Reserves:Month:Krankenkassenbeitragswachstum {kk_add:.2f}⬠; max(0, {kk_factor:.3f} * {needed_income_before_krankenkasse:.2f}⬠- {kk_minimum_tax:.2f}â¬)' + kk_add = decimal.Decimal(kk_add).quantize(decimal.Decimal('0.00')) + line_kk_minimum = f' Reserves:Month:Krankenkassendefaultbeitrag {kk_minimum_tax}⬠; assumed minimum income {kk_minimum_income:.2f}⬠* {kk_factor:.3f}' + line_kk_add = f' Reserves:Month:Krankenkassenbeitragswachstum {kk_add}⬠; max(0, {kk_factor:.3f} * {needed_income_before_krankenkasse:.2f}⬠- {kk_minimum_tax}â¬)' final_minus = expenses_so_far + ESt_this_month + kk_minimum_tax + kk_add - line_finish = f' Assets -{final_minus:.2f}â¬' + line_finish = f' Assets -{ESt_this_month + kk_minimum_tax + kk_add} ⬠; -{final_minus}â¬' return [line_income_tax, line_kk_minimum, line_kk_add, line_finish] @@ -125,14 +128,13 @@ def bookings_to_account_tree(bookings): def parse_lines(lines): import datetime - import decimal inside_booking = False date_string, description = None, None booking_lines = [] start_line = 0 bookings = [] comments = [] - lines += [''] # to ensure a booking-ending last line + lines = lines.copy() + [''] # to ensure a booking-ending last line for i, line in enumerate(lines): prefix = f"line {i}" # we start with the case of an utterly empty line @@ -244,6 +246,7 @@ def parse_lines(lines): raise HandledException(f"{prefix} last booking unfinished") return bookings, comments + class Booking: def __init__(self, date_string, description, booking_lines, start_line): @@ -252,6 +255,7 @@ class Booking: self.lines = booking_lines self.start_line = start_line self.validate_booking_lines() + self.sink = {} self.account_changes = self.parse_booking_lines_to_account_changes() def validate_booking_lines(self): @@ -273,7 +277,7 @@ class Booking: if empty_values == 0: for k, v in sums.items(): if v != 0: - raise HandledException(f"{prefix} does not sum up to zero") + raise HandledException(f"{prefix} does not add up to zero") else: sinkable = False for k, v in sums.items(): @@ -301,6 +305,7 @@ class Booking: if sink_account: for currency, amount in debt.items(): apply_booking_to_account_balances(account_changes, sink_account, currency, -amount) + self.sink[currency] = -amount return account_changes @@ -316,7 +321,7 @@ class Database: self.real_lines = [] if os.path.exists(self.db_file): with open(self.db_file, "r") as f: - self.real_lines += f.readlines() + self.real_lines += [l.rstrip() for l in f.readlines()] ret = parse_lines(self.real_lines) self.bookings += ret[0] self.comments += ret[1] @@ -332,7 +337,8 @@ class Database: shutil.copy(self.db_file, self.db_file + ".bak") f = open(self.lock_file, 'w+') f.close() - text = ''.join(self.real_lines[:start]) + '\n'.join(lines) + ''.join(self.real_lines[end:]) + total_lines = self.real_lines[:start] + lines + self.real_lines[end:] + text = '\n'.join(total_lines) with open(self.db_file, 'w') as f: f.write(text); os.remove(self.lock_file) @@ -346,7 +352,7 @@ class Database: f = open(self.lock_file, 'w+') f.close() with open(self.db_file, 'a') as f: - f.write('\n' + '\n'.join(lines) + '\n'); + f.write('\n\n' + '\n'.join(lines) + '\n\n'); os.remove(self.lock_file) @@ -357,6 +363,7 @@ class MyServer(BaseHTTPRequestHandler): body { color: #000000; } table { margin-bottom: 2em; } 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; } .full_line_comment { display: block; white-space: nowrap; width: 0; } @@ -375,13 +382,22 @@ th, td { text-align: left } length = int(self.headers['content-length']) postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1) parsed_url = urlparse(self.path) - if '/add_structured' == parsed_url.path: + lines = [] + add_empty_line = None + if '/add_structured' == parsed_url.path and not 'revert' in postvars.keys(): date = postvars['date'][0] description = postvars['description'][0] start_comment = postvars['line_0_comment'][0] lines = [f'{date} {description} ; {start_comment}'] - i = 1 + if 'line_0_add' in postvars.keys(): + add_empty_line = 0 + i = j = 1 while f'line_{i}_comment' in postvars.keys(): + if f'line_{i}_delete' in postvars.keys(): + i += 1 + continue + if 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] currency = postvars[f'line_{i}_currency'][0] @@ -390,11 +406,12 @@ th, td { text-align: left } new_main = f'{account} {amount} {currency}' if '' == new_main.rstrip() == comment.rstrip(): # don't write empty lines continue + j += 1 new_line = new_main if comment.rstrip() != '': new_line += f' ; {comment}' lines += [new_line] - if 'add_income_tax' in postvars.keys(): + if 'add_taxes' in postvars.keys(): lines += add_taxes(lines) elif '/add_free' == parsed_url.path: lines = postvars['booking'][0].splitlines() @@ -402,18 +419,24 @@ th, td { text-align: left } end = int(postvars['end'][0]) try: _, _ = parse_lines(lines) - if start == end == 0: - db.append(lines) + if 'save' in postvars.keys(): + if start == end == 0: + db.append(lines) + else: + db.replace(start, end, lines) + self.send_response(301) + redir_url = '/' + self.send_header('Location', redir_url) + self.end_headers() else: - db.replace(start, end, lines) - self.send_response(301) - redir_url = '/' - if 'add_income_tax' in postvars.keys(): - redir_url = f'/add_structured?start={start}&end={start+len(lines)-1}' - self.send_header('Location', redir_url) - self.end_headers() + page = self.header + self.add_structured(db, start, end, temp_lines=lines, add_empty_line=add_empty_line) + self.footer + self.send_response(200) + self.send_header("Content-type", "text/html") + self.end_headers() + self.wfile.write(bytes(page, "utf-8")) except HandledException as e: self.send_response(400) + self.send_header("Content-type", "text/html") self.end_headers() page = f'{self.header}ERROR: {e}{self.footer}' self.wfile.write(bytes(page, "utf-8")) @@ -428,7 +451,6 @@ th, td { text-align: left } params = parse_qs(parsed_url.query) start = int(params.get('start', ['0'])[0]) end = int(params.get('end', ['0'])[0]) - bonus_lines = int(params.get('bonus_lines', ['0'])[0]) if parsed_url.path == '/balance': page += self.balance_as_html(db) elif parsed_url.path == '/add_free': @@ -439,6 +461,8 @@ th, td { text-align: left } page += self.add_free(db, start, end, copy=True) elif parsed_url.path == '/copy_structured': page += self.add_structured(db, start, end, copy=True) + elif parsed_url.path == '/ledger2': + page += self.ledger2_as_html(db) else: page += self.ledger_as_html(db) page += self.footer @@ -468,125 +492,221 @@ th, td { text-align: left } content = "\n".join(lines) return f"
{content}" - # def ledger_as_html(self, db): - # lines = [] - # line_sep = '
{booking.date_string} {booking.description}{suffix}' - # for booking_line in booking.lines[1:]: - # i += 1 - # if booking_line == '': - # continue - # suffix = f' {lines[i]}' if len(lines[i]) > 0 else '' - # value = f' {booking_line[1]} {booking_line[2]}' if booking_line[1] else '' - # lines[i] = f'{booking_line[0]}{value}{suffix}' - # lines[i] = lines[i][:-len(line_sep)] + f"""
-# edit : -# structured -# / free -# | co py: -# structured -# / free -#{{date}} {{desc}} {{head_comment|e}} +[edit: structured +/ free +| copy:structured +/ free] +
{{l.acc|e}} | {{l.money|e}} | {{l.balance|e}} |
{{date}} {{desc}} {{head_comment|e}} +[edit: structured +/ free +| copy:structured +/ free] +
{{l.acc|e}} | {{l.money|e}} | {{l.comment|e}} |
{{l.comment|e}} |
{lines[i]} | ||
{booking_line[0]} | {money} | {comment} |