X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=ledger.py;h=7771f7f7e458ec4848cf0c19535034c18cda7556;hb=88432b5868d90a30de13a6745f68817d54d40092;hp=640c63afca0a601488ca55fce96a311cec60aa89;hpb=ed21ddf65324afb6cdce3aec0b97449e6c5c2829;p=misc

diff --git a/ledger.py b/ledger.py
index 640c63a..7771f7f 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])
@@ -391,7 +394,7 @@ class MyServer(BaseHTTPRequestHandler):
         lines = []
         line_sep = '<br />'
         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
@@ -426,33 +429,53 @@ edit:
         return f'{self.header_add_form("add_free")}<textarea name="booking" rows="8" cols="80">{content}</textarea>{self.footer_add_form(start, end)}'
 
     def add_structured(self, db, start=0, end=0, bonus_lines=10):
+        import datetime
         lines = db.get_lines(start, end) 
         bookings, comments = parse_lines(lines) 
         if len(bookings) > 1:
             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'<input name="{name}" value="{safe_val}" />'
+            datalist_string = '' if datalist == '' else f'list="{datalist}"'
+            return f'<input name="{name}" value="{safe_val}" {datalist_string}/>'
         if len(bookings) == 0:
-            input_lines += f'{inpu("date")} {inpu("description")} ; {inpu("comment")}<br />' 
+            today = str(datetime.datetime.now())[:10]
+            input_lines += f'{inpu("date", today)} {inpu("description", "", "descriptions")} ; {inpu("line_0_comment")}<br />' 
             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])}<br />' 
+            input_lines += f'{inpu("date", booking.date_string)} {inpu("description", booking.description, "descriptions")} ; {inpu("line_0_comment", comments[0])}<br />' 
             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])}<br />' 
+                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])}<br />' 
         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")}<br />'
-        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")}<br />'
+        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'<datalist id="{name}">' + "\n" 
+            for item in datalist_sets[name]:
+                safe_item = html.escape(item) 
+                datalist += f'<option value="{safe_item}">{safe_item}</option>' + "\n"
+            return f"{datalist}</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)}'
 
 
 db = Database()