X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7B%20card_id%20%7D%7D/delete?a=blobdiff_plain;f=ledger.py;h=b93b202e462cb47566bbc1fcf2aee598eec72775;hb=169d6b20b9f3d63508180971426db3bc195a3581;hp=f7f722c56cfb930d91f33183dffac2dde1868068;hpb=140e8f039bef05db2511f54f8fa923fb3a4a066a;p=misc
diff --git a/ledger.py b/ledger.py
index f7f722c..b93b202 100755
--- a/ledger.py
+++ b/ledger.py
@@ -2,8 +2,9 @@ from http.server import BaseHTTPRequestHandler, HTTPServer
import sys
import os
import html
-import jinja2
+import jinja2
import decimal
+import datetime
from urllib.parse import parse_qs, urlparse
hostName = "localhost"
serverPort = 8082
@@ -80,6 +81,7 @@ def parse_lines(lines, validate_bookings=True):
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
@@ -116,6 +118,9 @@ def parse_lines(lines, validate_bookings=True):
datetime.datetime.strptime(date_string, '%Y-%m-%d')
except ValueError:
raise HandledException(f"{prefix} bad date string: {date_string}")
+ if last_date > date_string:
+ raise HandledException(f"{prefix} out-of-order-date")
+ last_date = date_string
try:
description = toks[1]
except IndexError:
@@ -181,11 +186,10 @@ def parse_lines(lines, validate_bookings=True):
raise HandledException(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)
+ 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")
@@ -275,31 +279,72 @@ class Database:
def get_lines(self, start, end):
return self.real_lines[start:end]
- def replace(self, start, end, lines):
+ def write_db(self, text, mode='w'):
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:]
- text = '\n'.join(total_lines)
- with open(self.db_file, 'w') as f:
+
+ # always back up most recent to .bak
+ bakpath = f'{self.db_file}.bak'
+ shutil.copy(self.db_file, bakpath)
+
+ # collect modification times of numbered .bak files
+ bak_prefix = f'{bakpath}.'
+ backup_dates = []
+ i = 0
+ bak_as = f'{bak_prefix}{i}'
+ while os.path.exists(bak_as):
+ mod_time = os.path.getmtime(bak_as)
+ backup_dates += [str(datetime.datetime.fromtimestamp(mod_time))]
+ i += 1
+ bak_as = f'{bak_prefix}{i}'
+
+ # collect what numbered .bak files to save
+ to_save = []
+ datetime_len = 19
+ now = str(datetime.datetime.now())[:datetime_len]
+ while datetime_len > 2:
+ for i, date in reversed(list(enumerate(backup_dates))):
+ if date[:datetime_len] == now:
+ if i not in to_save:
+ to_save += [i]
+ break
+ datetime_len -= 1
+ now = now[:datetime_len]
+
+ # remove redundant backup files
+ j = 0
+ for i in reversed(to_save):
+ if i != j:
+ source = f'{bak_prefix}{i}'
+ target = f'{bak_prefix}{j}'
+ shutil.move(source, target)
+ else:
+ print("keeping", i)
+ j += 1
+ for i in range(j, len(backup_dates)):
+ print("removing", i)
+ try:
+ os.remove(f'{bak_prefix}{i}')
+ except FileNotFoundError:
+ pass
+
+ #
+ shutil.copy(self.db_file, f'{bak_prefix}{j}')
+ with open(self.db_file, mode) as f:
f.write(text);
os.remove(self.lock_file)
+ def replace(self, start, end, lines):
+ total_lines = self.real_lines[:start] + lines + self.real_lines[end:]
+ text = '\n'.join(total_lines)
+ self.write_db(text)
+
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)
+ text = '\n\n' + '\n'.join(lines) + '\n\n'
+ self.write_db(text, 'a')
def add_taxes(self, lines, finish=False):
ret = []
@@ -318,8 +363,9 @@ class Database:
buffer_expenses = 0
kk_expenses = 0
est_expenses = 0
+ months_passed = -int(finish)
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:
@@ -330,30 +376,31 @@ class Database:
kk_expenses += b.account_changes[acc_kk]['â¬']
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
+ 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 = 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)
- months_passed = int(date[5:7]) - 1
+ 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
+ zvE += last_monthbreak_assets + last_monthbreak_kk_add + last_monthbreak_kk_minimum
if zvE < E0:
ESt = decimal.Decimal(0)
elif zvE < E1:
@@ -364,8 +411,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 +424,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,13 +442,14 @@ 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
ret += [f' {acc_assets} {-diff} â¬']
ret += [f' {acc_assets} {final_minus} â¬']
- ret += [f' {acc_buffer} {-final_minus} â¬']
+ year_needed = buffer_expenses + final_minus + (12 - months_passed - 1) * final_minus
+ ret += [f' {acc_buffer} {-final_minus} ⬠; assume as to earn in year: {acc_buffer} + {12 - months_passed - 1} * this = {-year_needed}']
return ret
@@ -415,60 +463,93 @@ 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}}
+[edit: structured
+/ free
+| copy:structured
+/ free
+| balance before or after
+]
+
+{% for l in booking_lines %}
+{% if l.acc %}
+| {{l.acc|e}} | {{l.money|e}} |
+{% else %}
+ |
+{% endif %}
+{% endfor %}
+
+""")
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
- start = int(postvars['start'][0])
- end = int(postvars['end'][0])
- 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 += db.add_taxes(lines, finish=False)
- elif 'add_taxes2' in postvars.keys():
- lines += db.add_taxes(lines, finish=True)
- elif '/add_free' == parsed_url.path:
- lines = postvars['booking'][0].splitlines()
try:
+ 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
+ start = int(postvars['start'][0])
+ end = int(postvars['end'][0])
+ 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
+ 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 HandledException:
+ pass
+ if 'add_taxes' in postvars.keys():
+ lines += db.add_taxes(lines, finish=False)
+ elif 'add_taxes2' in postvars.keys():
+ lines += db.add_taxes(lines, finish=True)
+ elif '/add_free' == parsed_url.path:
+ lines = postvars['booking'][0].splitlines()
if ('save' in postvars.keys()) or ('check' in postvars.keys()):
_, _ = parse_lines(lines)
if 'save' in postvars.keys():
@@ -506,7 +587,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 +604,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):
@@ -554,115 +642,99 @@ input[type=number] { text-align: right; font-family: monospace; }
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 = {}
+ 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):
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
+ 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 +751,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("""
@@ -688,6 +760,7 @@ input[type=number] { text-align: right; font-family: monospace; }
+
@@ -699,6 +772,7 @@ input[type=number] { text-align: right; font-family: monospace; }
+
@@ -715,7 +789,6 @@ input[type=number] { text-align: right; font-family: monospace; }
""")
- import datetime
lines = temp_lines if len(''.join(temp_lines)) > 0 else db.get_lines(start, end)
bookings, comments = parse_lines(lines, validate_bookings=False)
if len(bookings) > 1:
@@ -723,7 +796,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:
@@ -740,8 +813,8 @@ input[type=number] { text-align: right; font-family: monospace; }
desc = head_comment = ''
if len(bookings) == 0:
for i in range(1, 3):
- booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': '', 'comment': ''}]
- date=today
+ booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': 'â¬', 'comment': ''}]
+ date=today
else:
booking = bookings[0]
desc = booking.description
@@ -755,25 +828,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,
- '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
+ end=end)
+ return content
-if __name__ == "__main__":
+if __name__ == "__main__":
webServer = HTTPServer((hostName, serverPort), MyServer)
print(f"Server started http://{hostName}:{serverPort}")
try: