X-Git-Url: https://plomlompom.com/repos/template?a=blobdiff_plain;f=ledger.py;h=ee6ed807ef72b4a9601acf32d25fad6ec1e0757a;hb=ebc562af576469da5f0011e10f80c7b0490ed959;hp=80ca0f63a422b2b907add4c3e1d00f0b5970d8f5;hpb=df13fc64930a7d05caf4ded471a27c4ab39faf32;p=misc diff --git a/ledger.py b/ledger.py index 80ca0f6..ee6ed80 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,7 +28,6 @@ def apply_booking_to_account_balances(account_sums, account, currency, amount): def add_taxes(lines): - import decimal bookings, _ = parse_lines(lines) _, account_sums = bookings_to_account_tree(bookings) expenses_so_far = -1 * account_sums['Assets']['€'] @@ -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,7 +128,6 @@ def bookings_to_account_tree(bookings): def parse_lines(lines): import datetime - import decimal inside_booking = False date_string, description = None, None booking_lines = [] @@ -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) @@ -409,7 +415,6 @@ input[type=number] { text-align: right; font-family: monospace; } lines += add_taxes(lines) elif '/add_free' == parsed_url.path: lines = postvars['booking'][0].splitlines() - lines += [''] # to ensure Booking-ending last line start = int(postvars['start'][0]) end = int(postvars['end'][0]) try: @@ -417,10 +422,11 @@ input[type=number] { text-align: right; font-family: monospace; } if 'save' in postvars.keys(): if start == end == 0: db.append(lines) + redir_url = f'/#last' else: db.replace(start, end, lines) + redir_url = f'/#{start}' self.send_response(301) - redir_url = '/' self.send_header('Location', redir_url) self.end_headers() else: @@ -446,7 +452,6 @@ input[type=number] { text-align: right; font-family: monospace; } 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': @@ -457,6 +462,8 @@ input[type=number] { text-align: right; font-family: monospace; } 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 @@ -486,58 +493,167 @@ input[type=number] { text-align: right; font-family: monospace; } content = "\n".join(lines) return f"
{content}
" - def ledger_as_html(self, db): - lines = [] - for comment in db.comments: - lines += [f'{comment}' if comment != '' else ''] + 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}}

+""") + elements_to_write = [] + account_sums = {} for booking in db.bookings: i = booking.start_line booking_end = booking.start_line + len(booking.lines) - lines[i] = f"""

{booking.date_string} {booking.description} {lines[i]} -[edit: structured -/ free -| copy:structured -/ free] -""" + 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 = [] + money = '' + if booking_line[1] is not None: + 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( + start=booking.start_line, + end=booking_end, + date=booking.date_string, + desc=booking.description, + head_comment=db.comments[booking.start_line], + booking_lines = booking_lines)] + return '\n'.join(elements_to_write) + + def ledger_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 + 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 != ''] + 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 == '': - lines[i] = f'
{lines[i]}
' + booking_lines += [{'acc': None, 'money': None, 'comment': comment}] continue - comment = f' {lines[i]}' if len(lines[i]) > 0 else '' + account = booking_line[0] money = '' - if booking_line[1]: + if booking_line[1] is not None: money = f'{booking_line[1]} {booking_line[2]}' - account = booking_line[0] - lines[i] = f'{booking_line[0]}{money}{comment}' - lines[i] = lines[i] + "\n" + '

' - return '\n'.join(lines) - - def header_add_form(self, action): - return f"
\n" - - def footer_add_form(self, start, end, copy): - if copy: - start = end = 0 - return f""" - - - -
""" - - def textarea(self, name, lines, min_rows=1, min_cols=20): - safe_content = html.escape(''.join(lines)) - n_rows = max(min_rows, len(lines)) - n_cols = min_cols - for line in lines: - n_cols = len(line) if len(line) > n_cols else n_cols - return f'' + booking_lines += [{'acc': booking_line[0], 'money':money, 'comment':comment}] + elements_to_write += [booking_tmpl.render( + last=booking.start_line == last_start, + start=booking.start_line, + end=booking_end, + date=booking.date_string, + desc=booking.description, + head_comment=db.comments[booking.start_line], + 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) def add_free(self, db, start=0, end=0, copy=False): + tmpl = jinja2.Template(""" +
+ + + + +
+""") lines = db.get_lines(start, end) - return f'{self.header_add_form("add_free")}{self.textarea("booking",lines,10,80)}{self.footer_add_form(start, end, copy)}' + if copy: + start = end = 0 + 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(""" +
+ + + +
+ + + + +
+{% for line in booking_lines %} + + + + + + +
+{% endfor %} +{% for name, items in datalist_sets.items() %} + +{% for item in items %} + +{% endfor %} + +{% endfor %} + + + +
+""") import datetime lines = temp_lines if len(''.join(temp_lines)) > 0 else db.get_lines(start, end) bookings, comments = parse_lines(lines) @@ -547,51 +663,53 @@ input[type=number] { text-align: right; font-family: monospace; } 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:] - def inpu(name, val="", datalist="", input_type='text', size=-1): - val = val if val is not None else "" - safe_val = html.escape(str(val)) - datalist_string = '' if datalist == '' else f'list="{datalist}"' - number_step = '' if input_type != 'number' else ' step=0.01' - size_string = '' if size < 0 else f' size={size}' - return f'' - input_lines = inpu('check', 'check', '', 'submit') +\ - inpu('revert', 'revert', '', 'submit') +\ - inpu('add_taxes', 'add taxes', '', 'submit') +\ - '
' + action = 'add_structured' + datalist_sets = {'descriptions': set(), 'accounts': set(), 'currencies': set()} + for b in db.bookings: + datalist_sets['descriptions'].add(b.description) + for account, moneys in b.account_changes.items(): + datalist_sets['accounts'].add(account) + for currency in moneys.keys(): + datalist_sets['currencies'].add(currency) + content = '' today = str(datetime.datetime.now())[:10] + booking_lines = [] + if copy: + start = end = 0 + desc = head_comment = '' if len(bookings) == 0: - input_lines += f'{inpu("date", today, size=9)} {inpu("description", "", "descriptions")} ; {inpu("line_0_comment")} {inpu(f"line_0_add", "[+]", "", "submit")}
' for i in range(1, 3): - input_lines += f'{inpu(f"line_{i}_account", "", "accounts", size=40)} {inpu(f"line_{i}_amount", "", "", "number", size=10)} {inpu(f"line_{i}_currency", "", "currencies", size=3)} ; {self.textarea(f"line_{i}_comment", "")} {inpu(f"line_{i}_delete", "[x]", "", "submit")} {inpu(f"line_{i}_add", "[+]", "", "submit")}
' + booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': '', 'comment': ''}] + date=today else: booking = bookings[0] + desc = booking.description + date = today if copy else booking.date_string + head_comment=comments[0] last_line = len(comments) - date_string = today if copy else booking.date_string - input_lines += f'{inpu("date", date_string, size=9)} {inpu("description", booking.description, "descriptions")} ; {self.textarea("line_0_comment", [comments[0]])} {inpu(f"line_0_add", "[+]", "", "submit")}
' for i in range(1, len(comments)): account = amount = currency = '' if i < len(booking.lines) and booking.lines[i] != '': account = booking.lines[i][0] amount = booking.lines[i][1] currency = booking.lines[i][2] - input_lines += f'{inpu(f"line_{i}_account", account, "accounts", size=40)} {inpu(f"line_{i}_amount", amount, "", "number", size=10)} {inpu(f"line_{i}_currency", currency, "currencies", size=3)} ; {self.textarea(f"line_{i}_comment", [comments[i]])} {inpu(f"line_{i}_delete", "[x]", "", "submit")} {inpu(f"line_{i}_add", "[+]", "", "submit")}
' - datalist_sets = {'descriptions': set(), 'accounts': set(), 'currencies': set()} - for b in db.bookings: - datalist_sets['descriptions'].add(b.description) - for account, moneys in b.account_changes.items(): - datalist_sets['accounts'].add(account) - for currency in moneys.keys(): - datalist_sets['currencies'].add(currency) - def build_datalist(name): - datalist = f'' + "\n" - for item in datalist_sets[name]: - safe_item = html.escape(item) - datalist += f'' + "\n" - return f"{datalist}\n" - datalists = build_datalist('descriptions') - datalists += build_datalist('accounts') - datalists += build_datalist('currencies') - return f'{self.header_add_form("add_structured")}{input_lines}{datalists}{self.footer_add_form(start, end, copy)}' + booking_lines += [{ + 'i': i, + 'acc': account, + 'amt': amount, + 'curr': currency if currency else '', + 'comment': comments[i], + 'comm_cols': len(comments[i])}] + content += tmpl.render( + action=action, + date=date, + desc=desc, + head_comment=head_comment, + booking_lines=booking_lines, + datalist_sets=datalist_sets, + start=start, + end=end) + return content if __name__ == "__main__":