X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=ledger.py;h=36cca98c1c0d5e28fefb986c8d07907da7cfb553;hb=53b84307929582af2aaeac2247cc57db4a7bedf4;hp=3071df69d7f0b0f0595fc1c1db61f85234a188f4;hpb=7c77bd5fe82ff15e0e9c6a808ff7eb5a6d859301;p=misc

diff --git a/ledger.py b/ledger.py
index 3071df6..36cca98 100755
--- a/ledger.py
+++ b/ledger.py
@@ -46,13 +46,13 @@ booking_html = """
 </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" />
+<input type="submit" name="check" value="check" tabindex="5"  />
+<input type="submit" name="revert" value="revert" tabindex="5"  />
 """
 add_form_footer = """
 <input type="hidden" name="start" value={{start}} />
 <input type="hidden" name="end" value={{end}} />
-<input type="submit" name="save" value="save!">
+<input type="submit" name="save" value="save!" tabindex="5" >
 </form>
 """
 add_free_html = """<br />
@@ -62,23 +62,27 @@ add_free_html = """<br />
 </textarea>
 """
 add_structured_html = """
-<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" />
+<input type="submit" name="add_taxes" value="add taxes" tabindex="5" />
+<input type="submit" name="add_taxes2" value="add taxes2" tabindex="5"  />
+<input type="submit" name="add_sink" value="add sink" tabindex="5"  />
+<input name="replace_from" tabindex="5"  />
+<input type="submit" name="replace" value="-> replace ->" tabindex="5"  />
+<input name="replace_to" tabindex="5"  />
+<input type="submit" name="add_mirror" value="add mirror" tabindex="5"  />
 <br />
-<input name="date" value="{{date|e}}" size=9 />
-<input name="description" value="{{desc|e}}" list="descriptions" />
-<textarea name="line_0_comment" rows=1 cols=20>{{head_comment|e}}</textarea>
-<input type="submit" name="line_0_add" value="[+]" />
+<input name="date" value="{{date|e}}" size=9 tabindex="3"  />
+<input name="description" value="{{desc|e}}" list="descriptions" tabindex="3"  />
+<textarea name="line_0_comment" rows=1 cols=20 tabindex="3" >{{head_comment|e}}</textarea>
+<input type="submit" name="line_0_add" value="[+]" tabindex="5"  />
 <br />
 {% for line in booking_lines %}
-<input name="line_{{line.i}}_account" value="{{line.acc|e}}" size=40 list="accounts" />
-<input type="number" name="line_{{line.i}}_amount" step=0.01 value="{{line.amt}}" size=10 />
-<input name="line_{{line.i}}_currency" value="{{line.curr|e}}" size=3 list="currencies" />
-<input type="submit" name="line_{{line.i}}_delete" value="[x]" />
-<input type="submit" name="line_{{line.i}}_delete_after" value="[XX]" />
-<input type="submit" name="line_{{line.i}}_add" value="[+]" />
-<textarea name="line_{{line.i}}_comment" rows=1 cols={% if line.comm_cols %}{{line.comm_cols}}{% else %}20{% endif %}>{{line.comment|e}}</textarea>
+<input name="line_{{line.i}}_account" value="{{line.acc|e}}" size=40 list="accounts" tabindex="3" />
+<input type="number" name="line_{{line.i}}_amount" step=0.01 value="{{line.amt}}" size=10 tabindex="3" />
+<input name="line_{{line.i}}_currency" value="{{line.curr|e}}" size=3 list="currencies" tabindex="5" />
+<input type="submit" name="line_{{line.i}}_delete" value="[x]" tabindex="5" />
+<input type="submit" name="line_{{line.i}}_delete_after" value="[XX]" tabindex="5" />
+<input type="submit" name="line_{{line.i}}_add" value="[+]" tabindex="5" />
+<textarea name="line_{{line.i}}_comment" rows=1 cols={% if line.comm_cols %}{{line.comm_cols}}{% else %}20{% endif %} tabindex="3">{{line.comment|e}}</textarea>
 <br />
 {% endfor %}
 {% for name, items in datalist_sets.items() %}
@@ -350,22 +354,26 @@ class LedgerDB(PlomDB):
         return self.real_lines[start:end]
 
     def write_db(self, text, mode='w'):
+        if text[-1] != '\n':
+            text += '\n'
         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
+        start_at = 0 
+        if len(self.bookings) > 0:
+            if date >= self.bookings[-1].date_string:
+                start_at = len(self.real_lines)
+                lines = [''] + lines
+            else:
+                for b in self.bookings:
+                    if b.date_string == date:
+                        start_at = b.start_line 
+                    elif b.date_string > date:
+                        start_at = b.start_line 
+                        break
         return self.write_lines_in_total_lines_at(self.real_lines, start_at, lines)
 
     def update(self, start, end, lines, date):
-        print("DEBUG update", date)
         total_lines = self.real_lines[:start] + self.real_lines[end:]
         n_original_lines = end - start
         start_at = len(total_lines)
@@ -514,6 +522,14 @@ class LedgerDB(PlomDB):
             ret += [f'  {acc_buffer}  {-final_minus} € ; assume as to earn in year: {acc_buffer} + {12 - months_passed - 1} * this = {year_needed}']
         return ret
 
+    def add_mirror(self, lines):
+        ret = []
+        bookings, _ = parse_lines(lines)
+        booking = bookings[0]
+        for line in booking.lines[1:]:
+            ret += [f'?  {-line[1]} {line[2]}']
+        return ret
+
     def ledger_as_html(self):
         booking_tmpl = jinja2.Template(booking_html)
         single_c_tmpl = jinja2.Template('<span class="comment">{{c|e}}</span><br />')  ##
@@ -608,15 +624,12 @@ class LedgerDB(PlomDB):
             start = end = 0
         desc = head_comment = ''
         if len(bookings) == 0:
-            for i in range(1, 8):
-                booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': '€', 'comment': ''}]
             date=today
         else:
             booking = bookings[0]
             desc = booking.description
             date = today if copy else booking.date_string
             head_comment=comments[0]
-            last_line = len(comments)
             for i in range(1, len(comments)):
                 account = amount = currency = ''
                 if i < len(booking.lines) and booking.lines[i] != '':
@@ -630,6 +643,8 @@ class LedgerDB(PlomDB):
                         'curr': currency if currency else '€',
                         'comment': comments[i],
                         'comm_cols': len(comments[i])}]
+        for i in range(len(comments), len(comments) + 8):
+            booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': '€', 'comment': ''}]
         content += tmpl.render(
                 action=action,
                 date=date,
@@ -658,12 +673,12 @@ class LedgerDB(PlomDB):
                 next_booking = b
                 break
         start_at = next_booking.start_line + len(next_booking.lines) - (end - start) + 1 
-        self.make_move(start, end, start_at)
+        self.make_move(start, end, start_at-1)
         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:]
+        total_lines = self.real_lines[:start-1] + self.real_lines[end:]  # +1 because we reduce the original position's two empty border lines to in-between line
         self.write_lines_in_total_lines_at(total_lines, start_at, lines)
 
     def booking_lines_from_postvars(self, postvars):
@@ -710,10 +725,15 @@ class LedgerDB(PlomDB):
                     lines += [f'Assets  {amount:.2f} {currency}']
             except PlomException:
                 pass
-        if 'add_taxes' in postvars.keys():
+        elif '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)
+        elif 'replace' in postvars.keys():
+            for i, line in enumerate(lines):
+                lines[i] = line.replace(postvars['replace_from'][0], postvars['replace_to'][0])
+        elif 'add_mirror' in postvars.keys():
+            lines += self.add_mirror(lines)
         return lines, add_empty_line
 
 
@@ -727,97 +747,90 @@ class LedgerHandler(PlomHandler):
         return 'ledger', default_path 
 
     def do_POST(self):
-        self.forward_posts()
+        self.try_do(self.forward_posts)
 
     def forward_posts(self):
-        try:
-            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
+        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)
+        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:
-                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)
-        except PlomException as e:
-            self.fail_400(e)
+                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.forward_gets()
+        self.try_do(self.forward_gets)
 
     def forward_gets(self):
-        try:
-            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)
-        except PlomException as e:
-            self.fail_400(e)
+        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)