X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=ledger.py;h=5610293becb20bcdff004447b7ba18b5a91ff277;hb=2b686c3a54fdd117075df17d7c12fd6e776c35ce;hp=0dbc9fe4debe3c133a766d039394d1828a88a600;hpb=1b9c909cedf7e135f9b3ab977e9554a45d1f09d9;p=misc diff --git a/ledger.py b/ledger.py index 0dbc9fe..5610293 100755 --- a/ledger.py +++ b/ledger.py @@ -282,7 +282,10 @@ class MyServer(BaseHTTPRequestHandler): new_main = f'{account} {amount} {currency}' if '' == new_main.rstrip() == comment.rstrip(): # don't write empty lines continue - lines += [f'{new_main} ; {comment}'] + new_line = new_main + if comment.rstrip() != '': + new_line += f' ; {comment}' + lines += [new_line] elif '/add_free' == parsed_url.path: lines = postvars['booking'][0].splitlines() start = int(postvars['start'][0]) @@ -312,13 +315,17 @@ class MyServer(BaseHTTPRequestHandler): 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': page += self.add_free(db, start, end) elif parsed_url.path == '/add_structured': - bonus_lines = int(params.get('bonus_lines', ['0'])[0]) 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) else: page += self.ledger_as_html(db) page += self.footer @@ -391,7 +398,7 @@ class MyServer(BaseHTTPRequestHandler): lines = [] line_sep = '
' for comment in db.comments: - line = f'; {comment}' if comment != '' else '' + line = f' ; {comment}' if comment != '' else '' lines += [line + line_sep] for booking in db.bookings: i = booking.start_line @@ -408,24 +415,29 @@ class MyServer(BaseHTTPRequestHandler): edit: structured / free +| copy: +structured +/ free
""" return '\n'.join(lines) def header_add_form(self, action): return f"
\n" - def footer_add_form(self, start, end): + def footer_add_form(self, start, end, copy): + if copy: + start = end = 0 return f"""
""" - def add_free(self, db, start=0, end=0): + def add_free(self, db, start=0, end=0, copy=False): content = html.escape(''.join(db.get_lines(start, end))) - return f'{self.header_add_form("add_free")}{self.footer_add_form(start, end)}' + return f'{self.header_add_form("add_free")}{self.footer_add_form(start, end, copy)}' - def add_structured(self, db, start=0, end=0, bonus_lines=10): + def add_structured(self, db, start=0, end=0, bonus_lines=10, copy=False): import datetime lines = db.get_lines(start, end) bookings, comments = parse_lines(lines) @@ -433,28 +445,47 @@ edit: raise HandledException('can only edit single Booking') input_lines = '' last_line = 0 - def inpu(name, val=""): + def inpu(name, val="", datalist=""): + val = val if val is not None else "" safe_val = html.escape(str(val)) - return f'' + datalist_string = '' if datalist == '' else f'list="{datalist}"' + return f'' + today = str(datetime.datetime.now())[:10] if len(bookings) == 0: - today = str(datetime.datetime.now())[:10] - input_lines += f'{inpu("date", today)} {inpu("description")} ; {inpu("comment")}
' + input_lines += f'{inpu("date", today)} {inpu("description", "", "descriptions")} ; {inpu("line_0_comment")}
' last_line = 1 else: booking = bookings[0] last_line = len(comments) - input_lines += f'{inpu("date", booking.date_string)} {inpu("description", booking.description)} ; {inpu("comment", comments[0])}
' + date_string = today if copy else booking.date_string + input_lines += f'{inpu("date", date_string)} {inpu("description", booking.description, "descriptions")} ; {inpu("line_0_comment", comments[0])}
' 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("line_{i}_account", account)} {inpu("line_{i}_amount", amount)} {inpu("line_{i}_currency", currency)} ; {inpu("line_{i}_comment", comments[i])}
' + input_lines += f'{inpu(f"line_{i}_account", account, "accounts")} {inpu(f"line_{i}_amount", amount)} {inpu(f"line_{i}_currency", currency, "currencies")} ; {inpu(f"line_{i}_comment", comments[i])}
' for j in range(bonus_lines): i = j + last_line - input_lines += f'{inpu("line_{i}_account")} {inpu("line_{i}_amount")} {inpu("line_{i}_currency")} ; {inpu("line_{i}_comment")}
' - return f'{self.header_add_form("add_structured")}{input_lines}{self.footer_add_form(start, end)}' + input_lines += f'{inpu(f"line_{i}_account", "", "accounts")} {inpu(f"line_{i}_amount", "", "amounts")} {inpu(f"line_{i}_currency", "", "currencies")} ; {inpu(f"line_{i}_comment")}
' + 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)}' db = Database()