home · contact · privacy
Improve/refactor income and ledger scripts with plomlib.
[misc] / ledger.py
index 2b2a80764104057ccf3e03ef62a29ecd291c15b1..b4d9fd99191af8cdf3a45d2686654b4b371eb3fe 100755 (executable)
--- a/ledger.py
+++ b/ledger.py
@@ -3,14 +3,11 @@ import os
 import html
 import jinja2
 import decimal
-import datetime
+from datetime import datetime, timedelta
 from urllib.parse import parse_qs, urlparse
-hostName = "localhost"
-serverPort = 8082
+from plomlib import PlomDB, PlomException, run_server, run_server, PlomServer
 
-
-class HandledException(Exception):
-    pass
+server_port = 8082
 
 
 def apply_booking_to_account_balances(account_sums, account, currency, amount):
@@ -67,7 +64,6 @@ def bookings_to_account_tree(bookings):
 
 
 def parse_lines(lines, validate_bookings=True):
-    import datetime
     inside_booking = False
     date_string, description = None, None
     booking_lines = []
@@ -85,7 +81,7 @@ def parse_lines(lines, validate_bookings=True):
             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")
+                    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
@@ -109,23 +105,23 @@ def parse_lines(lines, validate_bookings=True):
             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 HandledException(f"{prefix} out-of-order-date")
+                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] == ']':
@@ -141,10 +137,10 @@ def parse_lines(lines, validate_bookings=True):
                 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
@@ -168,25 +164,25 @@ def parse_lines(lines, validate_bookings=True):
                 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(currency) == 0:
-                raise HandledException(f"{prefix} currency missing: {value}")
+                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
 
 
@@ -212,7 +208,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:
@@ -221,14 +217,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 / {k} {v}")
+                    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 = {}
@@ -254,88 +250,68 @@ 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"
         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__('_ledger')
         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 write_db(self, text, mode='w'):
-        import shutil
-        if os.path.exists(self.lock_file):
-            raise HandledException('Sorry, lock file!')
-        f = open(self.lock_file, 'w+')
-        f.close()
-
-        # 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)
-            j += 1
-        for i in range(j, len(backup_dates)):
-            try:
-                os.remove(f'{bak_prefix}{i}')
-            except FileNotFoundError:
-                pass
+        self.write_text_to_db(text)
 
-        # 
-        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 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 replace(self, start, end, lines):
-        total_lines = self.real_lines[:start] + lines + self.real_lines[end:]
+    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)
         self.write_db(text)
+        return start_at
 
-    def append(self, lines):
-        text = '\n\n' + '\n'.join(lines) + '\n\n'
-        self.write_db(text, 'a')
+    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 = []
@@ -374,11 +350,11 @@ class Database:
                     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
+        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}€']
+            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
+        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
@@ -426,25 +402,37 @@ class Database:
         else:
             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_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}€  ; max(0, {kk_factor:.3f} * {-(old_needed_income - last_monthbreak_est):.2f}€ - {kk_minimum_tax}€)']
+            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}']
-        ret += [f'  {acc_kk_add}  {kk_add}€  ; max(0, {kk_factor:.3f} * {needed_income_before_kk:.2f}€ - {kk_minimum_tax}€)']
+        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 + diff
+        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 
-        ret += [f'  {acc_buffer}  {-final_minus} € ; assume as to earn in year: {acc_buffer} + {12 - months_passed - 1} * this = {-year_needed}']
+        if finish:
+            ret += [f'  {acc_buffer}  {-final_minus} €']
+        else:
+            ret += [f'  {acc_buffer}  {-final_minus} € ; assume as to earn in year: {acc_buffer} + {12 - months_passed - 1} * this = {year_needed}']
         return ret
 
 
-class MyServer(BaseHTTPRequestHandler):
+class LedgerServer(PlomServer):
     header = """<html>
 <meta charset="UTF-8">
 <style>
@@ -470,6 +458,7 @@ input[type=number] { text-align: right; font-family: monospace; }
 / <a href="/add_free?start={{start}}&end={{end}}">free</a>
 | copy:<a href="/copy_structured?start={{start}}&end={{end}}">structured</a>
 / <a href="/copy_free?start={{start}}&end={{end}}">free</a>
+| move {% if move_up %}<a href="/move_up?start={{start}}&end={{end}}">up</a>{% else %}up{% endif %}/{% if move_down %}<a href="/move_down?start={{start}}&end={{end}}">down</a>{% else %}down{% endif %}
 | <a href="/balance?stop={{nth+1}}">balance after</a>
 ]</span>
 <table>
@@ -482,6 +471,10 @@ input[type=number] { text-align: right; font-family: monospace; }
 {% endfor %}
 </table></p>
 """)
+    add_form_header = """<form method="POST" action="{{action|e}}">
+<input type="submit" name="check" value="check" />
+<input type="submit" name="revert" value="revert" />
+"""
     add_form_footer = """
 <input type="hidden" name="start" value={{start}} />
 <input type="hidden" name="end" value={{end}} />
@@ -497,77 +490,48 @@ input[type=number] { text-align: right; font-family: monospace; }
             postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1)
             start = int(postvars['start'][0])
             end = int(postvars['end'][0])
-
-            db = Database()
+            db = LedgerDB()
             add_empty_line = None
             lines = []
+            # get inputs
             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, add_empty_line = self.booking_lines_from_postvars(postvars, db) 
+            elif '/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:
-                    db.append(lines)
-                    redir_url = f'/#last'
+                    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 
+                redir_url = f'/#{nth}'
+                self.send_code_and_headers(302, [('Location', redir_url)])
+            # otherwise just re-build editing form
+            else:
+                if '/add_structured' == parsed_url.path: 
+                    edit_content = self.add_structured(db, start, end, temp_lines=lines, add_empty_line=add_empty_line)
                 else:
-                    db.replace(start, end, lines)
-                    nth = 0
-                    for i, b in enumerate(db.bookings):
-                        if b.start_line == start:
-                            nth = i
-                            break
-                    redir_url = f'/#{nth}'
-                self.send_code_and_headers(301, [('Location', redir_url)])
-            else:  # implicit assumption: this only happens on /add_structured flows
-                page = self.header + self.add_structured(db, start, end, temp_lines=lines, add_empty_line=add_empty_line) + self.footer
-                self.send_HTML(page)
-        except HandledException as e:
+                    edit_content = self.add_free(db, start, end)
+                self.send_HTML(self.header + edit_content + self.footer)
+        except PlomException as e:
             self.fail_400(e)
 
     def do_GET(self):
@@ -576,7 +540,7 @@ 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])
-            db = Database()
+            db = LedgerDB()
             page = self.header
             if parsed_url.path == '/balance':
                 stop = params.get('stop', [None])[0]
@@ -589,26 +553,70 @@ 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 == '/move_up':
+                nth = self.move_up(db, start, end)
+                self.send_code_and_headers(302, [('Location', f'/#{nth}')])
+                return
+            elif parsed_url.path == '/move_down':
+                nth = self.move_down(db, start, end)
+                self.send_code_and_headers(302, [('Location', f'/#{nth}')])
+                return
             else:
                 page += self.ledger_as_html(db)
             page += self.footer
             self.send_HTML(page)
-        except HandledException as e:
+        except PlomException as e:
             self.fail_400(e)
 
-    def fail_400(self, e):
-        page = f'{self.header}ERROR: {e}{self.footer}'
-        self.send_HTML(page, 400)
-
-    def send_HTML(self, html, code=200):
-        self.send_code_and_headers(code, [('Content-type', 'text/html')])
-        self.wfile.write(bytes(html, "utf-8"))
-
-    def send_code_and_headers(self, code, headers=[]):
-        self.send_response(code)
-        for fieldname, content in headers:
-            self.send_header(fieldname, content)
-        self.end_headers()
+    def booking_lines_from_postvars(self, postvars, db):
+        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 += db.add_taxes(lines, finish=False)
+        elif 'add_taxes2' in postvars.keys():
+            lines += db.add_taxes(lines, finish=True)
+        return lines, add_empty_line
 
     def balance_as_html(self, db, until=None):
         bookings = db.bookings[:until if until is None else int(until)]
@@ -640,6 +648,8 @@ input[type=number] { text-align: right; font-family: monospace; }
         elements_to_write = []
         last_i = i = 0  ##
         for nth, booking in enumerate(db.bookings):
+            move_up = nth > 0 and db.bookings[nth - 1].date_string == booking.date_string
+            move_down = nth < len(db.bookings) - 1 and db.bookings[nth + 1].date_string == booking.date_string
             booking_end = last_i = booking.start_line + len(booking.lines)
             booking_lines = []
             i = booking.start_line  ##
@@ -662,13 +672,14 @@ input[type=number] { text-align: right; font-family: monospace; }
                 date=booking.date_string,
                 desc=booking.description,
                 head_comment=db.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 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("""
-<form method="POST" action="{{action|e}}">
+        tmpl = jinja2.Template(self.add_form_header + """<br />
 <textarea name="booking" rows=10 cols=80>
 {% for line in lines %}{{ line }}
 {% endfor %}
@@ -680,10 +691,7 @@ input[type=number] { text-align: right; font-family: monospace; }
         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("""
-<form method="POST" action="{{action|e}}">
-<input type="submit" name="check" value="check" />
-<input type="submit" name="revert" value="revert" />
+        tmpl = jinja2.Template(self.add_form_header + """
 <input type="submit" name="add_taxes" value="add taxes" />
 <input type="submit" name="add_taxes2" value="add taxes2" />
 <input type="submit" name="add_sink" value="add sink" />
@@ -714,7 +722,7 @@ input[type=number] { text-align: right; font-family: monospace; }
         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:
-            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]
@@ -728,7 +736,7 @@ input[type=number] { text-align: right; font-family: monospace; }
                 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
@@ -767,13 +775,31 @@ input[type=number] { text-align: right; font-family: monospace; }
                 end=end)
         return content
 
+    def move_up(self, db, start, end):
+        prev_booking = None
+        for redir_nth, b in enumerate(db.bookings):
+            if b.start_line >= start:
+                break
+            prev_booking = b
+        start_at = prev_booking.start_line 
+        self.make_move(db, start, end, start_at)
+        return redir_nth - 1
+
+    def move_down(self, db, start, end):
+        next_booking = None
+        for redir_nth, b in enumerate(db.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(db, start, end, start_at)
+        return redir_nth
+
+    def make_move(self, db, start, end, start_at):
+        lines = db.get_lines(start, end)
+        total_lines = db.real_lines[:start] + db.real_lines[end:]
+        db.write_lines_in_total_lines_at(total_lines, start_at, lines)
+
 
 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.")
+    run_server(server_port, LedgerServer)