X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=ledger.py;h=6653af6e8e7f341cb80901f0aed83d9466c8c968;hb=71a0c94ce508dcd21165e06a955043d021efb89f;hp=ee6ed807ef72b4a9601acf32d25fad6ec1e0757a;hpb=ebc562af576469da5f0011e10f80c7b0490ed959;p=misc
diff --git a/ledger.py b/ledger.py
index ee6ed80..6653af6 100755
--- a/ledger.py
+++ b/ledger.py
@@ -1,21 +1,94 @@
-from http.server import BaseHTTPRequestHandler, HTTPServer
-import sys
import os
-import html
-import jinja2
+import jinja2
import decimal
+from datetime import datetime, timedelta
from urllib.parse import parse_qs, urlparse
-hostName = "localhost"
-serverPort = 8082
+from plomlib import PlomDB, PlomException, run_server, PlomHandler
+server_port = 8082
+db_path = '/home/plom/org/ledger2023.dat'
-class HandledException(Exception):
- pass
-
-
-def handled_error_exit(msg):
- print(f"ERROR: {msg}")
- sys.exit(1)
+html_head = """
+
+
+ledger
+balance
+add free
+add structured
+
+"""
+booking_html = """
+{{date}} {{desc}}
+[edit: structured
+/ free
+| copy:structured
+/ free
+| move {% if move_up %}up{% else %}up{% endif %}/{% if move_down %}down{% else %}down{% endif %}
+| balance after
+]
+
+{% for l in booking_lines %}
+{% if l.acc %}
+| {{l.acc|e}} | {{l.money|e}} |
+{% else %}
+ |
+{% endif %}
+{% endfor %}
+
+"""
+add_form_header = """
+"""
+add_free_html = """
+
+"""
+add_structured_html = """
+
+
+
+
+
+
+
+
+
+{% for line in booking_lines %}
+
+
+
+
+
+
+
+
+{% endfor %}
+{% for name, items in datalist_sets.items() %}
+
+{% endfor %}
+"""
def apply_booking_to_account_balances(account_sums, account, currency, amount):
@@ -27,61 +100,6 @@ def apply_booking_to_account_balances(account_sums, account, currency, amount):
account_sums[account][currency] += amount
-def add_taxes(lines):
- 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
- ESt_this_month = 0
- left_over = needed_income_before_krankenkasse - ESt_this_month
- too_low = 0
- too_high = 2 * needed_income_before_krankenkasse
- 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:
- ESt = decimal.Decimal(0)
- elif zvE < E1:
- y = (zvE - E0)/10000
- ESt = (decimal.Decimal(979.18) * y + 1400) * y
- elif zvE < E2:
- y = (zvE - E1)/10000
- 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)
- ESt_this_month = ESt / 12
- left_over = needed_income_before_krankenkasse - ESt_this_month
- 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
- 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).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)
- 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 -{ESt_this_month + kk_minimum_tax + kk_add} ⬠; -{final_minus}â¬'
- return [line_income_tax, line_kk_minimum, line_kk_add, line_finish]
-
-
def bookings_to_account_tree(bookings):
account_sums = {}
for booking in bookings:
@@ -126,8 +144,7 @@ def bookings_to_account_tree(bookings):
return account_tree, account_sums
-def parse_lines(lines):
- import datetime
+def parse_lines(lines, validate_bookings=True):
inside_booking = False
date_string, description = None, None
booking_lines = []
@@ -135,6 +152,7 @@ def parse_lines(lines):
bookings = []
comments = []
lines = lines.copy() + [''] # to ensure a booking-ending last line
+ last_date = ''
for i, line in enumerate(lines):
prefix = f"line {i}"
# we start with the case of an utterly empty line
@@ -144,8 +162,8 @@ def parse_lines(lines):
if inside_booking:
# assume we finished a booking, finalize, and commit to DB
if len(booking_lines) < 2:
- raise HandledException(f"{prefix} booking ends to early")
- booking = Booking(date_string, description, booking_lines, start_line)
+ raise PlomException(f"{prefix} booking ends to early")
+ booking = Booking(date_string, description, booking_lines, start_line, validate_bookings)
bookings += [booking]
# expect new booking to follow so re-zeroall booking data
inside_booking = False
@@ -168,20 +186,23 @@ def parse_lines(lines):
toks = non_comment.split(maxsplit=1)
date_string = toks[0]
try:
- datetime.datetime.strptime(date_string, '%Y-%m-%d')
+ datetime.strptime(date_string, '%Y-%m-%d')
except ValueError:
- raise HandledException(f"{prefix} bad date string: {date_string}")
+ raise PlomException(f"{prefix} bad date string: {date_string}")
+ if last_date > date_string:
+ raise PlomException(f"{prefix} out-of-order-date")
+ last_date = date_string
try:
description = toks[1]
except IndexError:
- raise HandledException(f"{prefix} bad description: {description}")
+ raise PlomException(f"{prefix} bad description: {description}")
inside_booking = True
booking_lines += [non_comment]
continue
# otherwise, read as transfer data
toks = non_comment.split() # ignore specification's allowance of single spaces in names
if len(toks) > 3:
- raise HandledException(f"{prefix} too many booking line tokens: {toks}")
+ raise PlomException(f"{prefix} too many booking line tokens: {toks}")
amount, currency = None, None
account_name = toks[0]
if account_name[0] == '[' and account_name[-1] == ']':
@@ -197,10 +218,10 @@ def parse_lines(lines):
try:
amount = decimal.Decimal(toks[2])
except decimal.InvalidOperation:
- raise HandledException(f"{prefix} no decimal number in: {toks[1:]}")
+ raise PlomException(f"{prefix} no decimal number in: {toks[1:]}")
currency = toks[i_currency]
if currency[0] in decimal_chars:
- raise HandledException(f"{prefix} currency starts with int, dot, or minus: {currency}")
+ raise PlomException(f"{prefix} currency starts with int, dot, or minus: {currency}")
elif len(toks) == 2:
value = toks[1]
inside_amount = False
@@ -224,39 +245,39 @@ def parse_lines(lines):
if inside_amount:
if c not in decimal_chars:
if len(currency) > 0:
- raise HandledException(f"{prefix} amount has non-decimal chars: {value}")
+ raise PlomException(f"{prefix} amount has non-decimal chars: {value}")
inside_currency = True
inside_amount = False
currency += c
continue
if c == '-' and len(amount_string) > 1:
- raise HandledException(f"{prefix} amount has non-start '-': {value}")
+ raise PlomException(f"{prefix} amount has non-start '-': {value}")
if c == '.':
if dots_counted > 1:
- raise HandledException(f"{prefix} amount has multiple dots: {value}")
+ raise PlomException(f"{prefix} amount has multiple dots: {value}")
dots_counted += 1
amount_string += c
- if len(amount_string) == 0:
- raise HandledException(f"{prefix} amount missing: {value}")
if len(currency) == 0:
- raise HandledException(f"{prefix} currency missing: {value}")
- amount = decimal.Decimal(amount_string)
+ raise PlomException(f"{prefix} currency missing: {value}")
+ if len(amount_string) > 0:
+ amount = decimal.Decimal(amount_string)
booking_lines += [(account_name, amount, currency)]
if inside_booking:
- raise HandledException(f"{prefix} last booking unfinished")
+ raise PlomException(f"{prefix} last booking unfinished")
return bookings, comments
class Booking:
- def __init__(self, date_string, description, booking_lines, start_line):
+ def __init__(self, date_string, description, booking_lines, start_line, process=True):
self.date_string = date_string
self.description = description
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()
+ if process:
+ self.validate_booking_lines()
+ self.sink = {}
+ self.account_changes = self.parse_booking_lines_to_account_changes()
def validate_booking_lines(self):
prefix = f"booking at line {self.start_line}"
@@ -268,7 +289,7 @@ class Booking:
_, amount, currency = line
if amount is None:
if empty_values > 0:
- raise HandledException(f"{prefix} relates more than one empty value of same currency {currency}")
+ raise PlomException(f"{prefix} relates more than one empty value of same currency {currency}")
empty_values += 1
continue
if currency not in sums:
@@ -277,14 +298,14 @@ class Booking:
if empty_values == 0:
for k, v in sums.items():
if v != 0:
- raise HandledException(f"{prefix} does not add up to zero")
+ raise PlomException(f"{prefix} does not add up to zero / {k} {v}")
else:
sinkable = False
for k, v in sums.items():
if v != 0:
sinkable = True
if not sinkable:
- raise HandledException(f"{prefix} has empty value that cannot be filled")
+ raise PlomException(f"{prefix} has empty value that cannot be filled")
def parse_booking_lines_to_account_changes(self):
account_changes = {}
@@ -310,168 +331,229 @@ class Booking:
-class Database:
+class LedgerDB(PlomDB):
- def __init__(self):
- db_name = "_ledger"
- self.db_file = db_name + ".json"
- self.lock_file = db_name+ ".lock"
+ def __init__(self, prefix):
+ self.prefix = prefix
self.bookings = []
self.comments = []
self.real_lines = []
- if os.path.exists(self.db_file):
- with open(self.db_file, "r") as f:
- self.real_lines += [l.rstrip() for l in f.readlines()]
+ super().__init__(db_path)
ret = parse_lines(self.real_lines)
self.bookings += ret[0]
self.comments += ret[1]
+ def read_db_file(self, f):
+ self.real_lines += [l.rstrip() for l in f.readlines()]
+
def get_lines(self, start, end):
return self.real_lines[start:end]
- def replace(self, start, end, lines):
- import shutil
- if os.path.exists(self.lock_file):
- raise HandledException('Sorry, lock file!')
- if os.path.exists(self.db_file):
- shutil.copy(self.db_file, self.db_file + ".bak")
- f = open(self.lock_file, 'w+')
- f.close()
- total_lines = self.real_lines[:start] + lines + self.real_lines[end:]
+ def write_db(self, text, mode='w'):
+ self.write_text_to_db(text)
+
+ def insert_at_date(self, lines, date):
+ start_at = len(self.real_lines)
+ for b in self.bookings:
+ if b.date_string >= date:
+ start_at = b.start_line
+ break
+ elif b.date_string > date:
+ break
+ if start_at == len(self.real_lines):
+ lines = [''] + lines
+ return self.write_lines_in_total_lines_at(self.real_lines, start_at, lines)
+
+ def update(self, start, end, lines, date):
+ total_lines = self.real_lines[:start] + self.real_lines[end:]
+ n_original_lines = end - start
+ start_at = len(total_lines)
+ for b in self.bookings:
+ if b.date_string == date:
+ if start_at == len(total_lines) or b.start_line == start:
+ start_at = b.start_line
+ if b.start_line > start:
+ start_at -= n_original_lines
+ elif b.date_string > date:
+ break
+ if start_at == len(total_lines):
+ lines = [''] + lines
+ return self.write_lines_in_total_lines_at(total_lines, start_at, lines)
+
+ def write_lines_in_total_lines_at(self, total_lines, start_at, lines):
+ total_lines = total_lines[:start_at] + lines + [''] + total_lines[start_at:]
+ _, _ = parse_lines(lines)
text = '\n'.join(total_lines)
- with open(self.db_file, 'w') as f:
- f.write(text);
- os.remove(self.lock_file)
-
- def append(self, lines):
- import shutil
- if os.path.exists(self.lock_file):
- raise HandledException('Sorry, lock file!')
- if os.path.exists(self.db_file):
- shutil.copy(self.db_file, self.db_file + ".bak")
- f = open(self.lock_file, 'w+')
- f.close()
- with open(self.db_file, 'a') as f:
- f.write('\n\n' + '\n'.join(lines) + '\n\n');
- os.remove(self.lock_file)
-
-
-class MyServer(BaseHTTPRequestHandler):
- header = """
-
-
-
-ledger
-balance
-add free
-add structured
-
-"""
- footer = "\n"
-
- def do_POST(self):
- db = Database()
- length = int(self.headers['content-length'])
- postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1)
- parsed_url = urlparse(self.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}']
- 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]
- comment = postvars[f'line_{i}_comment'][0]
- i += 1
- 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_taxes' in postvars.keys():
- lines += add_taxes(lines)
- elif '/add_free' == parsed_url.path:
- lines = postvars['booking'][0].splitlines()
- start = int(postvars['start'][0])
- end = int(postvars['end'][0])
- try:
- _, _ = parse_lines(lines)
- 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)
- self.send_header('Location', redir_url)
- self.end_headers()
+ self.write_db(text)
+ return start_at
+
+ def get_nth_for_booking_of_start_line(self, start_line):
+ nth = 0
+ for b in self.bookings:
+ if b.start_line >= start_line:
+ break
+ nth += 1
+ return nth
+
+ def add_taxes(self, lines, finish=False):
+ ret = []
+ bookings, _ = parse_lines(lines)
+ date = bookings[0].date_string
+ acc_kk_add = 'Reserves:KrankenkassenBeitragsWachstum'
+ acc_kk_minimum = 'Reserves:Month:KrankenkassenDefaultBeitrag'
+ acc_kk = 'Expenses:KrankenKasse'
+ acc_est = 'Reserves:Einkommenssteuer'
+ acc_assets = 'Assets'
+ acc_buffer = 'Reserves:NeuAnfangsPuffer:Ausgaben'
+ last_monthbreak_assets = 0
+ last_monthbreak_est = 0
+ last_monthbreak_kk_minimum = 0
+ last_monthbreak_kk_add = 0
+ buffer_expenses = 0
+ kk_expenses = 0
+ est_expenses = 0
+ months_passed = -int(finish)
+ for b in self.bookings:
+ if date == b.date_string:
+ break
+ acc_keys = b.account_changes.keys()
+ if acc_buffer in acc_keys:
+ buffer_expenses -= b.account_changes[acc_buffer]['â¬']
+ if acc_kk_add in acc_keys:
+ kk_expenses += b.account_changes[acc_kk_add]['â¬']
+ if acc_kk in acc_keys:
+ kk_expenses += b.account_changes[acc_kk]['â¬']
+ if acc_est in acc_keys:
+ est_expenses += b.account_changes[acc_est]['â¬']
+ if acc_kk_add in acc_keys and acc_kk_minimum in acc_keys:
+ months_passed += 1
+ if finish:
+ 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_before_anything = - 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_before_anything}â¬']
+ _, account_sums = bookings_to_account_tree(bookings)
+ expenses_so_far = -1 * account_sums[acc_assets]['â¬'] + old_needed_income_before_anything
+ 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
+ E0 = decimal.Decimal(10908)
+ E1 = decimal.Decimal(15999)
+ E2 = decimal.Decimal(62809)
+ E3 = decimal.Decimal(277825)
+ 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
+ if zvE < E0:
+ ESt = decimal.Decimal(0)
+ elif zvE < E1:
+ y = (zvE - E0)/10000
+ ESt = (decimal.Decimal(979.18) * y + 1400) * y
+ elif zvE < E2:
+ y = (zvE - E1)/10000
+ 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:
- 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"))
-
- def do_GET(self):
- self.send_response(200)
- self.send_header("Content-type", "text/html")
- self.end_headers()
- db = Database()
- parsed_url = urlparse(self.path)
- page = self.header + ''
- params = parse_qs(parsed_url.query)
- start = int(params.get('start', ['0'])[0])
- end = int(params.get('end', ['0'])[0])
- if parsed_url.path == '/balance':
- page += self.balance_as_html(db)
- elif parsed_url.path == '/add_free':
- page += self.add_free(db, start, end)
- elif parsed_url.path == '/add_structured':
- page += self.add_structured(db, start, end)
- elif parsed_url.path == '/copy_free':
- 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)
+ 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:
+ break
+ elif left_over < expenses_so_far:
+ too_low = needed_income_before_kk
+ elif left_over > expenses_so_far:
+ too_high = needed_income_before_kk
+ 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
+ if date < '2023-02-01':
+ 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_minimum_tax = decimal.Decimal(216.15).quantize(decimal.Decimal('0.00'))
+ else:
+ kk_factor = decimal.Decimal(0.197)
+ kk_minimum_tax = decimal.Decimal(222.94).quantize(decimal.Decimal('0.00'))
+ kk_add_so_far = account_sums[acc_kk_add]['â¬'] if acc_kk_add in account_sums.keys() else 0
+ kk_add = needed_income_before_kk / (1 - kk_factor) - needed_income_before_kk - kk_minimum_tax
+ hit_kk_minimum_income_limit = False
+ if kk_add_so_far + kk_add < 0:
+ hit_kk_minimum_income_limit = True
+ kk_add_uncorrect = kk_add
+ kk_add = -(kk_add + kk_add_so_far)
+ kk_add = decimal.Decimal(kk_add).quantize(decimal.Decimal('0.00'))
+ if finish:
+ ret += [f' {acc_kk_add} {-last_monthbreak_kk_add}⬠; for old assumption of needed income']
+ else:
+ ret += [f' {acc_kk_minimum} {kk_minimum_tax}⬠; assumed minimum income {kk_minimum_income:.2f}⬠* {kk_factor:.3f}']
+ if hit_kk_minimum_income_limit:
+ ret += [f' {acc_kk_add} {kk_add}⬠; {needed_income_before_kk:.2f}⬠/ (1 - {kk_factor:.3f}) - {needed_income_before_kk:.2f}⬠- {kk_minimum_tax}⬠= {kk_add_uncorrect:.2f}⬠would reduce current {acc_kk_dd} ({kk_add_so_far:.2f}â¬) below 0']
+ else:
+ ret += [f' {acc_kk_add} {kk_add}⬠; {needed_income_before_kk:.2f}⬠/ (1 - {kk_factor:.3f}) - {needed_income_before_kk:.2f}⬠- {kk_minimum_tax}â¬']
+ 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_before_anything + diff
+ ret += [f' {acc_assets} {-diff} â¬']
+ ret += [f' {acc_assets} {final_minus} â¬']
+ year_needed = buffer_expenses + final_minus + (12 - months_passed - 1) * final_minus
+ if finish:
+ ret += [f' {acc_buffer} {-final_minus} â¬']
else:
- page += self.ledger_as_html(db)
- page += self.footer
- self.wfile.write(bytes(page, "utf-8"))
+ ret += [f' {acc_buffer} {-final_minus} ⬠; assume as to earn in year: {acc_buffer} + {12 - months_passed - 1} * this = {year_needed}']
+ return ret
- def balance_as_html(self, db):
+ def ledger_as_html(self):
+ booking_tmpl = jinja2.Template(booking_html)
+ single_c_tmpl = jinja2.Template('
') ##
+ elements_to_write = []
+ last_i = i = 0 ##
+ for nth, booking in enumerate(self.bookings):
+ move_up = nth > 0 and self.bookings[nth - 1].date_string == booking.date_string
+ move_down = nth < len(self.bookings) - 1 and self.bookings[nth + 1].date_string == booking.date_string
+ booking_end = last_i = booking.start_line + len(booking.lines)
+ booking_lines = []
+ i = booking.start_line ##
+ elements_to_write += [single_c_tmpl.render(c=c) for c in self.comments[last_i:i] if c != ''] ##
+ for booking_line in booking.lines[1:]:
+ i += 1 ##
+ comment = self.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(
+ prefix=self.prefix,
+ nth=nth,
+ start=booking.start_line,
+ end=booking_end,
+ date=booking.date_string,
+ desc=booking.description,
+ head_comment=self.comments[booking.start_line],
+ move_up=move_up,
+ move_down=move_down,
+ booking_lines = booking_lines)]
+ elements_to_write += [single_c_tmpl.render(c=c) for c in self.comments[last_i:] if c != ''] #
+ return '\n'.join(elements_to_write)
+
+ def balance_as_html(self, until=None):
+ bookings = self.bookings[:until if until is None else int(until)]
lines = []
- account_tree, account_sums = bookings_to_account_tree(db.bookings)
+ account_tree, account_sums = bookings_to_account_tree(bookings)
def print_subtree(lines, indent, node, subtree, path):
line = f"{indent}{node}"
n_tabs = 5 - (len(line) // 8)
@@ -493,194 +575,41 @@ 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('
')
- booking_tmpl = jinja2.Template("""
-{{date}} {{desc}}
-[edit: structured
-/ free
-| copy:structured
-/ free]
-
-{% for l in booking_lines %}
-| {{l.acc|e}} | {{l.money|e}} | {{l.balance|e}} |
-{% endfor %}
-
-""")
- elements_to_write = []
- account_sums = {}
- for booking in db.bookings:
- i = booking.start_line
- 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 = []
- 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('
')
- booking_tmpl = jinja2.Template("""
-{{date}} {{desc}}
-[edit: structured
-/ free
-| copy:structured
-/ free]
-
-{% for l in booking_lines %}
-{% if l.acc %}
-| {{l.acc|e}} | {{l.money|e}} |
-{% else %}
- |
-{% endif %}
-{% endfor %}
-
-""")
- 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 == '':
- 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,
- 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)
+ def add_free(self, start=0, end=0, copy=False):
+ tmpl = jinja2.Template(add_form_header + add_free_html + add_form_footer)
+ lines = self.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=self.prefix + '/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("""
-
-""")
- import datetime
- lines = temp_lines if len(''.join(temp_lines)) > 0 else db.get_lines(start, end)
- bookings, comments = parse_lines(lines)
+ def add_structured(self, start=0, end=0, copy=False, temp_lines=[], add_empty_line=None):
+ tmpl = jinja2.Template(add_form_header + add_structured_html + add_form_footer)
+ lines = temp_lines if len(''.join(temp_lines)) > 0 else self.get_lines(start, end)
+ bookings, comments = parse_lines(lines, validate_bookings=False)
if len(bookings) > 1:
- raise HandledException('can only edit single Booking')
+ raise PlomException('can only structurally edit single Booking')
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:]
- action = 'add_structured'
+ booking.lines = booking.lines[:add_empty_line+1] + [''] + booking.lines[add_empty_line+1:]
+ action = self.prefix + '/add_structured'
datalist_sets = {'descriptions': set(), 'accounts': set(), 'currencies': set()}
- for b in db.bookings:
+ for b in self.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]
+ today = str(datetime.now())[:10]
booking_lines = []
if copy:
start = end = 0
desc = head_comment = ''
if len(bookings) == 0:
- for i in range(1, 3):
- booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': '', 'comment': ''}]
- date=today
+ for i in range(1, 8):
+ booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': 'â¬', 'comment': ''}]
+ date=today
else:
booking = bookings[0]
desc = booking.description
@@ -694,30 +623,196 @@ 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,
- 'curr': currency if currency else '',
+ '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
-
-
-if __name__ == "__main__":
- webServer = HTTPServer((hostName, serverPort), MyServer)
- print(f"Server started http://{hostName}:{serverPort}")
- try:
- webServer.serve_forever()
- except KeyboardInterrupt:
- pass
- webServer.server_close()
- print("Server stopped.")
+ end=end)
+ return content
+
+ def move_up(self, start, end):
+ prev_booking = None
+ for redir_nth, b in enumerate(self.bookings):
+ if b.start_line >= start:
+ break
+ prev_booking = b
+ start_at = prev_booking.start_line
+ self.make_move(start, end, start_at)
+ return redir_nth - 1
+
+ def move_down(self, start, end):
+ next_booking = None
+ for redir_nth, b in enumerate(self.bookings):
+ if b.start_line > start:
+ next_booking = b
+ break
+ start_at = next_booking.start_line + len(next_booking.lines) - (end - start) + 1
+ self.make_move(start, end, start_at)
+ return redir_nth
+
+ def make_move(self, start, end, start_at):
+ lines = self.get_lines(start, end)
+ total_lines = self.real_lines[:start] + self.real_lines[end:]
+ self.write_lines_in_total_lines_at(total_lines, start_at, lines)
+
+ def booking_lines_from_postvars(self, postvars):
+ add_empty_line = None
+ date = postvars['date'][0]
+ description = postvars['description'][0]
+ start_comment = postvars['line_0_comment'][0]
+ start_line = f'{date} {description}'
+ if start_comment.rstrip() != '':
+ start_line += f' ; {start_comment}'
+ lines = [start_line]
+ 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
+ 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]
+ currency = postvars[f'line_{i}_currency'][0]
+ comment = postvars[f'line_{i}_comment'][0]
+ i += 1
+ new_main = f' {account} {amount}'
+ if '' == new_main.rstrip() == comment.rstrip(): # don't write empty lines, ignore currency if nothing else set
+ continue
+ if len(amount.rstrip()) > 0:
+ new_main += f' {currency}'
+ j += 1
+ new_line = new_main
+ if comment.rstrip() != '':
+ new_line += f' ; {comment}'
+ lines += [new_line]
+ if 'add_sink' in postvars.keys():
+ temp_lines = lines.copy() + ['_']
+ try:
+ temp_bookings, _ = parse_lines(temp_lines)
+ for currency in temp_bookings[0].sink:
+ amount = temp_bookings[0].sink[currency]
+ lines += [f'Assets {amount:.2f} {currency}']
+ except PlomException:
+ pass
+ if 'add_taxes' in postvars.keys():
+ lines += self.add_taxes(lines, finish=False)
+ elif 'add_taxes2' in postvars.keys():
+ lines += self.add_taxes(lines, finish=True)
+ return lines, add_empty_line
+
+
+
+class LedgerHandler(PlomHandler):
+
+ def app_init(self, handler):
+ default_path = '/ledger'
+ handler.add_route('GET', default_path, self.forward_gets)
+ handler.add_route('POST', default_path, self.forward_posts)
+ return 'ledger', default_path
+
+ def do_POST(self):
+ self.try_do(self.forward_posts)
+
+ def forward_posts(self):
+ prefix = self.apps['ledger'] if hasattr(self, 'apps') else ''
+ parsed_url = urlparse(self.path)
+ length = int(self.headers['content-length'])
+ postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1)
+ print("DEBUG", postvars['start'], postvars['end'])
+ start = int(postvars['start'][0])
+ end = int(postvars['end'][0])
+ db = LedgerDB(prefix)
+ add_empty_line = None
+ lines = []
+ # get inputs
+ if prefix + '/add_structured' == parsed_url.path and not 'revert' in postvars.keys():
+ lines, add_empty_line = db.booking_lines_from_postvars(postvars)
+ elif prefix + '/add_free' == parsed_url.path and not 'revert' in postvars.keys():
+ lines = postvars['booking'][0].splitlines()
+ # validate where appropriate
+ if ('save' in postvars.keys()) or ('check' in postvars.keys()):
+ _, _ = parse_lines(lines)
+ # if saving, process where to and where to redirect after
+ if 'save' in postvars.keys():
+ last_date = str(datetime.now())[:10]
+ if len(db.bookings) > 0:
+ last_date = db.bookings[-1].date_string
+ target_date = last_date[:]
+ first_line_tokens = lines[0].split() if len(lines) > 0 else ''
+ first_token = first_line_tokens[0] if len(first_line_tokens) > 0 else ''
+ try:
+ datetime.strptime(first_token, '%Y-%m-%d')
+ target_date = first_token
+ except ValueError:
+ pass
+ if start == end == 0:
+ start = db.insert_at_date(lines, target_date)
+ nth = db.get_nth_for_booking_of_start_line(start)
+ else:
+ new_start = db.update(start, end, lines, target_date)
+ nth = db.get_nth_for_booking_of_start_line(new_start)
+ if new_start > start:
+ nth -= 1
+ self.redirect(prefix + f'/#{nth}')
+ # otherwise just re-build editing form
+ else:
+ if prefix + '/add_structured' == parsed_url.path:
+ edit_content = db.add_structured(start, end, temp_lines=lines, add_empty_line=add_empty_line)
+ else:
+ edit_content = db.add_free(start, end)
+ header = jinja2.Template(html_head).render(prefix=prefix)
+ self.send_HTML(header + edit_content)
+
+ def do_GET(self):
+ self.try_do(self.forward_gets)
+
+ def forward_gets(self):
+ prefix = self.apps['ledger'] if hasattr(self, 'apps') else ''
+ parsed_url = urlparse(self.path)
+ params = parse_qs(parsed_url.query)
+ start = int(params.get('start', ['0'])[0])
+ end = int(params.get('end', ['0'])[0])
+ db = LedgerDB(prefix=prefix)
+ if parsed_url.path == prefix + '/balance':
+ stop = params.get('stop', [None])[0]
+ page = db.balance_as_html(stop)
+ elif parsed_url.path == prefix + '/add_free':
+ page = db.add_free(start, end)
+ elif parsed_url.path == prefix + '/add_structured':
+ page = db.add_structured(start, end)
+ elif parsed_url.path == prefix + '/copy_free':
+ page = db.add_free(start, end, copy=True)
+ elif parsed_url.path == prefix + '/copy_structured':
+ page = db.add_structured(start, end, copy=True)
+ elif parsed_url.path == prefix + '/move_up':
+ nth = db.move_up(start, end)
+ self.redirect(prefix + f'/#{nth}')
+ return
+ elif parsed_url.path == prefix + '/move_down':
+ nth = db.move_down(start, end)
+ self.redirect(prefix + f'/#{nth}')
+ return
+ else:
+ page = db.ledger_as_html()
+ header = jinja2.Template(html_head).render(prefix=prefix)
+ self.send_HTML(header + page)
+
+
+
+if __name__ == "__main__":
+ run_server(server_port, LedgerHandler)