X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=ledger.py;h=4a6a071833311493636a7f36b870e32d722dd45d;hb=5ca43356293c713a280d049578a987a2f46e5038;hp=2b2a80764104057ccf3e03ef62a29ecd291c15b1;hpb=fb98793f5731cb56c3122ce813ea85158040abed;p=misc diff --git a/ledger.py b/ledger.py index 2b2a807..4a6a071 100755 --- a/ledger.py +++ b/ledger.py @@ -67,7 +67,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 = [] @@ -295,12 +294,16 @@ class Database: i += 1 bak_as = f'{bak_prefix}{i}' - # collect what numbered .bak files to save + # collect what numbered .bak files to save: + # shrink datetime string right to left character by character, + # on each step add the oldest file whose mtime still fits the pattern + # (privilege older files to keep existing longer) 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))): + # assume backup_dates starts with oldest dates + for i, date in enumerate(backup_dates): if date[:datetime_len] == now: if i not in to_save: to_save += [i] @@ -310,7 +313,7 @@ class Database: # remove redundant backup files j = 0 - for i in reversed(to_save): + for i in to_save: if i != j: source = f'{bak_prefix}{i}' target = f'{bak_prefix}{j}' @@ -322,20 +325,54 @@ class Database: except FileNotFoundError: pass - # + # put second backup copy of current state at end of bak list 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:] + 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 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 +411,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,21 +463,33 @@ 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 @@ -470,6 +519,7 @@ input[type=number] { text-align: right; font-family: monospace; } / free | copy:structured / free +| move {% if move_up %}up{% else %}up{% endif %}/{% if move_down %}down{% else %}down{% endif %} | balance after ]