self.comment = split_by_comment[1].lstrip()
-
-# html_head = """
-# <style>
-# body { color: #000000; }
-# table { margin-bottom: 2em; }
-# th, td { text-align: left }
-# input[type=number] { text-align: right; font-family: monospace; }
-# .money { font-family: monospace; text-align: right; }
-# .comment { font-style: italic; color: #777777; }
-# .meta { font-size: 0.75em; color: #777777; }
-# .full_line_comment { display: block; white-space: nowrap; width: 0; }
-# </style>
-# <body>
-# <a href="{{prefix}}/ledger">ledger</a>
-# <a href="{{prefix}}/ledger2">ledger2</a>
-# <a href="{{prefix}}/balance">balance</a>
-# <a href="{{prefix}}/balance2">balance2</a>
-# <a href="{{prefix}}/add_free">add free</a>
-# <a href="{{prefix}}/add_structured">add structured</a>
-# <a href="{{prefix}}/edit">add</a>
-# <hr />
-# """
-# booking_html = """
-# <p id="{{nth}}"><a href="{{prefix}}#{{nth}}">{{date}}</a> {{desc}} <span class="comment">{{head_comment|e}}</span><br />
-# <span class="meta">[edit: <a href="{{prefix}}/add_structured?start={{start}}&end={{end}}">structured</a>
-# / <a href="{{prefix}}/add_free?start={{start}}&end={{end}}">free</a>
-# | copy:<a href="{{prefix}}/copy_structured?start={{start}}&end={{end}}">structured</a>
-# / <a href="{{prefix}}/copy_free?start={{start}}&end={{end}}">free</a>
-# | move {% if move_up %}<a href="{{prefix}}/move_up?start={{start}}&end={{end}}">up</a>{% else %}up{% endif %}/{% if move_down %}<a href="{{prefix}}/move_down?start={{start}}&end={{end}}">down</a>{% else %}down{% endif %}
-# | <a href="{{prefix}}/balance?stop={{nth+1}}">balance after</a>
-# ]</span>
-# <table>
-# {% for l in booking_lines %}
-# {% if l.acc %}
-# <tr><td>{{l.acc|e}}</td><td class="money">{{l.money|e}}</td><td class="comment">{{l.comment|e}}</td></tr>
-# {% else %}
-# <tr><td><div class="comment full_line_comment">{{l.comment|e}}</div></td></tr>
-# {% endif %}
-# {% endfor %}
-# </table></p>
-# """
-# add_form_header = """<form method="POST" action="{{action|e}}">
-# <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!" tabindex="5" >
-# </form>
-# """
-# add_free_html = """<br />
-# <textarea name="booking" rows=10 cols=80>{% for line in lines %}{{ line }}{% if not loop.last %}
-# {% endif %}{% endfor %}</textarea>
-# """
-# add_structured_html = """
-# <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 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" 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() %}
-# <datalist id="{{name}}">
-# {% for item in items %}
-# <option value="{{item|e}}">{{item|e}}</option>
-# {% endfor %}
-# </datalist>
-# {% endfor %}
-# """
-
-
class Wealth:
def __init__(self):
return full_moneys
-# def apply_booking_to_account_balances(account_sums, account, currency, amount):
-# if not account in account_sums:
-# account_sums[account] = {currency: amount}
-# elif not currency in account_sums[account].keys():
-# account_sums[account][currency] = amount
-# else:
-# account_sums[account][currency] += amount
-#
-#
-# def bookings_to_account_tree(bookings):
-# account_sums = {}
-# for booking in bookings:
-# for account, changes in booking.account_changes.items():
-# for currency, amount in changes.items():
-# apply_booking_to_account_balances(account_sums, account, currency, amount)
-# account_tree = {}
-# def collect_branches(account_name, path):
-# node = account_tree
-# path_copy = path[:]
-# while len(path_copy) > 0:
-# step = path_copy.pop(0)
-# node = node[step]
-# toks = account_name.split(":", maxsplit=1)
-# parent = toks[0]
-# if parent in node.keys():
-# child = node[parent]
-# else:
-# child = {}
-# node[parent] = child
-# if len(toks) == 2:
-# k, v = collect_branches(toks[1], path + [parent])
-# if k not in child.keys():
-# child[k] = v
-# else:
-# child[k].update(v)
-# return parent, child
-# for account_name in sorted(account_sums.keys()):
-# k, v = collect_branches(account_name, [])
-# if k not in account_tree.keys():
-# account_tree[k] = v
-# else:
-# account_tree[k].update(v)
-# def collect_totals(parent_path, tree_node):
-# for k, v in tree_node.items():
-# child_path = parent_path + ":" + k
-# for currency, amount in collect_totals(child_path, v).items():
-# apply_booking_to_account_balances(account_sums, parent_path, currency, amount)
-# return account_sums[parent_path]
-# for account_name in account_tree.keys():
-# account_sums[account_name] = collect_totals(account_name, account_tree[account_name])
-# return account_tree, account_sums
-
-
def parse_lines_to_bookings(lines, ignore_editable_exceptions=False):
lines = [LedgerTextLine(line) for line in lines]
lines += [LedgerTextLine('')] # to simulate ending of last booking
return bookings
-# def parse_lines(lines, validate_bookings=True):
-# inside_booking = False
-# date_string, description = None, None
-# booking_lines = []
-# start_line = 0
-# bookings = []
-# comments = []
-# lines = lines.copy() + [''] # to ensure a booking-ending last line
-# last_date = ''
-# for i, line in enumerate(lines):
-# prefix = f"line {i}"
-# # we start with the case of an utterly empty line
-# comments += [""]
-# stripped_line = line.rstrip()
-# if stripped_line == '':
-# if inside_booking:
-# # assume we finished a booking, finalize, and commit to DB
-# if len(booking_lines) < 2:
-# 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
-# inside_booking = False
-# date_string, description = None, None
-# booking_lines = []
-# continue
-# # if non-empty line, first get comment if any, and commit to DB
-# split_by_comment = stripped_line.split(sep=";", maxsplit=1)
-# if len(split_by_comment) == 2:
-# comments[i] = split_by_comment[1].lstrip()
-# # if pre-comment empty: if inside_booking, this must be a comment-only line so we keep it for later ledger-output to capture those comments; otherwise, no more to process for this line
-# non_comment = split_by_comment[0].rstrip()
-# if non_comment.rstrip() == '':
-# if inside_booking:
-# booking_lines += ['']
-# continue
-# # if we're starting a booking, parse by first-line pattern
-# if not inside_booking:
-# start_line = i
-# toks = non_comment.split(maxsplit=1)
-# date_string = toks[0]
-# try:
-# datetime.strptime(date_string, '%Y-%m-%d')
-# except ValueError:
-# raise PlomException(f"{prefix} bad date string: {date_string}")
-# # if last_date > date_string:
-# # raise PlomException(f"{prefix} out-of-order-date")
-# last_date = date_string
-# try:
-# description = toks[1]
-# except IndexError:
-# 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 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] == ']':
-# # ignore specification's differentiation of "virtual" accounts
-# account_name = account_name[1:-1]
-# decimal_chars = ".-0123456789"
-# if len(toks) == 3:
-# i_currency = 1
-# try:
-# amount = decimal.Decimal(toks[1])
-# i_currency = 2
-# except decimal.InvalidOperation:
-# try:
-# amount = decimal.Decimal(toks[2])
-# except decimal.InvalidOperation:
-# raise PlomException(f"{prefix} no decimal number in: {toks[1:]}")
-# currency = toks[i_currency]
-# if currency[0] in decimal_chars:
-# raise PlomException(f"{prefix} currency starts with int, dot, or minus: {currency}")
-# elif len(toks) == 2:
-# value = toks[1]
-# inside_amount = False
-# inside_currency = False
-# amount_string = ""
-# currency = ""
-# dots_counted = 0
-# for i, c in enumerate(value):
-# if i == 0:
-# if c in decimal_chars:
-# inside_amount = True
-# else:
-# inside_currency = True
-# if inside_currency:
-# if c in decimal_chars and len(amount_string) == 0:
-# inside_currency = False
-# inside_amount = True
-# else:
-# currency += c
-# continue
-# if inside_amount:
-# if c not in decimal_chars:
-# if len(currency) > 0:
-# 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 PlomException(f"{prefix} amount has non-start '-': {value}")
-# if c == '.':
-# if dots_counted > 1:
-# raise PlomException(f"{prefix} amount has multiple dots: {value}")
-# dots_counted += 1
-# amount_string += c
-# if len(currency) == 0:
-# 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 PlomException(f"{prefix} last booking unfinished")
-# return bookings, comments
-
-
class TransferLine:
def __init__(self, line=None, account='', amount=None, currency='', comment='', validate=True):
self.clean()
self.parse_lines()
- def add_taxes(self):
+ def add_taxes(self, db):
acc_kk_add = 'Reserves:KrankenkassenBeitragsWachstum'
- acc_kk_minimum = 'Reserves:Month:KrankenkassenDefaultBeitrag'
+ acc_kk_minimum = 'Reserves:Monthly:KrankenkassenDefaultBeitrag'
acc_kk = 'Expenses:KrankenKasse'
- acc_est = 'Reserves:EinkommensSteuer'
+ acc_ESt = 'Reserves:EinkommensSteuer'
acc_assets = 'Assets'
- acc_buffer = 'Reserves:NeuAnfangsPuffer:Ausgaben'
- buffer_expenses = 0 # FIXME: hardcoded for now
- kk_expenses = 0 # FIXME: hardcoded for now
- est_expenses = 0 # FIXME: hardcoded for now
- months_passed = 0 # FIXME: hardcoded for now
- last_monthbreak_assets = 0 # FIXME: hardcoded for now
- last_monthbreak_est = 0 # FIXME: hardcoded for now
- last_monthbreak_kk_minimum = 0 # FIXME: hardcoded for now
- last_monthbreak_kk_add = 0 # FIXME: hardcoded for now
- expenses_so_far = 0 # FIXME: hardcoded for now
- needed_netto = self.account_changes['Assets'].money_dict['€']
+ acc_neuanfangspuffer_expenses = 'Reserves:NeuAnfangsPuffer:Ausgaben'
+ months_passed = datetime.strptime(self.date, '%Y-%m-%d').month - 1
+ past_kk_expenses = 0
+ past_kk_add = 0
+ past_neuanfangspuffer_expenses = 0
+ for b in db.bookings:
+ if b.date == self.date:
+ break
+ if acc_neuanfangspuffer_expenses in b.account_changes.keys():
+ past_neuanfangspuffer_expenses -= b.account_changes[acc_neuanfangspuffer_expenses].money_dict['€']
+ if acc_kk_add in b.account_changes.keys():
+ past_kk_add += b.account_changes[acc_kk_add].money_dict['€']
+ if acc_kk_minimum in b.account_changes.keys():
+ past_kk_expenses += b.account_changes[acc_kk_minimum].money_dict['€']
+
+ needed_netto = -self.account_changes['Assets'].money_dict['€']
+ past_taxed_needs_before_kk = past_neuanfangspuffer_expenses - past_kk_expenses
ESt_this_month = 0
- left_over = needed_netto - ESt_this_month
+ E0 = decimal.Decimal(11604)
+ E1 = decimal.Decimal(17006)
+ E2 = decimal.Decimal(66761)
+ E3 = decimal.Decimal(277826)
+ taxed_income_before_kk = needed_netto
too_low = 0
too_high = 2 * needed_netto
- E0 = decimal.Decimal(10908)
- E1 = decimal.Decimal(15999)
- E2 = decimal.Decimal(62809)
- E3 = decimal.Decimal(277825)
while True:
- zvE = buffer_expenses - kk_expenses + (12 - months_passed) * needed_netto
- # if finish:
- # zvE += last_monthbreak_assets + last_monthbreak_kk_add + last_monthbreak_kk_minimum
+ estimate_for_remaining_year = (12 - months_passed) * taxed_income_before_kk
+ zvE = past_taxed_needs_before_kk + estimate_for_remaining_year
if zvE < E0:
- ESt = decimal.Decimal(0)
+ ESt_year = decimal.Decimal(0)
elif zvE < E1:
y = (zvE - E0)/10000
- ESt = (decimal.Decimal(979.18) * y + 1400) * y
+ ESt_year = (decimal.Decimal(922.98) * y + 1400) * y
elif zvE < E2:
y = (zvE - E1)/10000
- ESt = (decimal.Decimal(192.59) * y + 2397) * y + decimal.Decimal(966.53)
+ ESt_year = (decimal.Decimal(181.19) * y + 2397) * y + decimal.Decimal(1025.38)
elif zvE < E3:
- ESt = decimal.Decimal(0.42) * (zvE - decimal.Decimal(62809)) + decimal.Decimal(16405.54)
+ ESt_year = decimal.Decimal(0.42) * zvE - 10602.13
else:
- ESt = decimal.Decimal(0.45) * (zvE - decimal.Decimal(277825)) + decimal.Decimal(106713.52)
- ESt_this_month = (ESt + last_monthbreak_est - est_expenses) / (12 - months_passed)
- left_over = needed_netto - ESt_this_month
- if abs(left_over - expenses_so_far) < 0.001:
+ ESt_year = decimal.Decimal(0.45) * zvE - 18936.88
+ ESt_this_month = ESt_year / 12
+ taxed_income_minus_ESt = taxed_income_before_kk - ESt_this_month
+ if abs(taxed_income_minus_ESt - needed_netto) < 0.001:
break
- elif left_over < expenses_so_far:
- too_low = needed_netto
- elif left_over > expenses_so_far:
- too_high = needed_netto
- needed_netto = too_low + (too_high - too_low)/2
+ elif taxed_income_minus_ESt < needed_netto:
+ too_low = taxed_income_before_kk
+ elif taxed_income_minus_ESt > needed_netto:
+ too_high = taxed_income_before_kk
+ taxed_income_before_kk = too_low + (too_high - too_low)/2
ESt_this_month = ESt_this_month.quantize(decimal.Decimal('0.00'))
- self.transfer_lines += [TransferLine(None, acc_est, ESt_this_month, '€')]
- kk_minimum_income = 1131.67
- kk_factor = decimal.Decimal(0.197)
- kk_minimum_tax = decimal.Decimal(222.94).quantize(decimal.Decimal('0.00'))
- kk_add_so_far = account_sums[acc_kk_add]['€'] if acc_kk_add in account_sums.keys() else 0
- kk_add = needed_netto / (1 - kk_factor) - needed_netto - 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)
+ comment = f'estimated zvE: {past_taxed_needs_before_kk}€ + {estimate_for_remaining_year:.2f}€ = {zvE:.2f}€ → year ESt: {ESt_year:.2f} → needed taxed income before Krankenkasse: {taxed_income_before_kk:.2f}€'
+ self.transfer_lines += [TransferLine(None, acc_ESt, ESt_this_month, '€', comment)]
+
+ kk_factor = decimal.Decimal(1.197)
+ kk_minimum_income = 1178.33
+ kk_minimum_tax = decimal.Decimal(232.13).quantize(decimal.Decimal('0.00'))
+ if self.date < '2024-02-01':
+ kk_minimum_income = 1131.67
+ kk_minimum_tax = decimal.Decimal(222.94).quantize(decimal.Decimal('0.00'))
+ comment = f'assumed minimum income of {kk_minimum_income:.2f}€ * {kk_factor:.3f}'
+ self.transfer_lines += [TransferLine(None, acc_kk_minimum, kk_minimum_tax, '€', comment)]
+ kk_add = taxed_income_before_kk * kk_factor - taxed_income_before_kk - kk_minimum_tax
kk_add = decimal.Decimal(kk_add).quantize(decimal.Decimal('0.00'))
- self.transfer_lines += [TransferLine(None, acc_kk_minimum, kk_minimum_tx, '€')]
- self.transfer_lines += [TransferLine(None, acc_kk_add, kk_add, '€')]
- 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_before_anything + diff
- diff += kk_minimum_tax
- final_minus = expenses_so_far - old_needed_income_before_anything + diff
- self.transfer_lines += [TransferLine(None, acc_assets, -diff, '€')]
- self.transfer_lines += [TransferLine(None, acc_assets, final_minus, '€')]
- self.transfer_lines += [TransferLine(None, acc_buffer, -final_minus, '€')]
-
-
-# class Booking:
-#
-# def __init__(self, date_string, description, booking_lines, start_line, process=True):
-# self.date_string = date_string
-# self.description = description
-# self.lines = booking_lines
-# self.start_line = start_line
-# if process:
-# self.validate_booking_lines()
-# self.sink = {}
-# self.account_changes = self.parse_booking_lines_to_account_changes()
-#
-# def validate_booking_lines(self):
-# prefix = f"booking at line {self.start_line}"
-# sums = {}
-# empty_values = 0
-# for line in self.lines[1:]:
-# if line == '':
-# continue
-# _, amount, currency = line
-# if amount is None:
-# if empty_values > 0:
-# raise PlomException(f"{prefix} relates more than one empty value of same currency {currency}")
-# empty_values += 1
-# continue
-# if currency not in sums:
-# sums[currency] = 0
-# sums[currency] += amount
-# if empty_values == 0:
-# for k, v in sums.items():
-# if v != 0:
-# 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 PlomException(f"{prefix} has empty value that cannot be filled")
-#
-# def parse_booking_lines_to_account_changes(self):
-# account_changes = {}
-# debt = {}
-# sink_account = None
-# for line in self.lines[1:]:
-# if line == '':
-# continue
-# account, amount, currency = line
-# if amount is None:
-# sink_account = account
-# continue
-# apply_booking_to_account_balances(account_changes, account, currency, amount)
-# if currency not in debt:
-# debt[currency] = amount
-# else:
-# debt[currency] += amount
-# if sink_account:
-# for currency, amount in debt.items():
-# apply_booking_to_account_balances(account_changes, sink_account, currency, -amount)
-# self.sink[currency] = -amount
-# return account_changes
+ if past_kk_add + kk_add < 0: # *if* kk_add would actually kill all earlier kk_add …
+ kk_add = - past_kk_add # … shrink it so it won't push the kk_add total below 0
+ comment = f'local negative as large as possible without moving {acc_kk_add} below zero'
+ else:
+ comment = f'({taxed_income_before_kk:.2f}€ * {kk_factor:.3f}) - {taxed_income_before_kk:.2f} - {kk_minimum_tax}'
+ self.transfer_lines += [TransferLine(None, acc_kk_add, kk_add, '€', comment)]
+ diff_through_taxes_and_kk = ESt_this_month + kk_minimum_tax + kk_add
+ comment = f'{ESt_this_month} + {kk_minimum_tax} + {kk_add}'
+ self.transfer_lines += [TransferLine(None, acc_assets, -diff_through_taxes_and_kk, '€', comment)]
+ final_loss = diff_through_taxes_and_kk + needed_netto
+ comment = f'{needed_netto} + {diff_through_taxes_and_kk}'
+ self.transfer_lines += [TransferLine(None, acc_assets, final_loss, '€', comment)]
+ self.transfer_lines += [TransferLine(None, acc_neuanfangspuffer_expenses, -final_loss, '€')]
class LedgerDB(PlomDB):
def read_db_file(self, f):
self.text_lines += f.readlines()
- # self.text_lines += [l.rstrip() for l in f.readlines()] # TODO is this necessary? (parser already removes lines?)
-
- # def get_lines(self, start, end):
- # return self.text_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 = 0
- # if len(self.bookings) > 0:
- # if date >= self.bookings[-1].date_string:
- # start_at = len(self.text_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
- # lines += [''] # DEBUG is new
- # return self.write_lines_in_total_lines_at(self.text_lines, start_at, lines)
-
- # def update(self, start, end, lines, date):
- # remaining_lines = self.text_lines[:start] + self.text_lines[end:]
- # n_original_lines = end - start
- # start_at = len(remaining_lines)
- # for b in self.bookings:
- # if b.date_string == date:
- # if start_at == len(remaining_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
- # # print("DEBUG update start_at", start_at, "len(remaining_lines)", len(remaining_lines), "len(self.text_lines)", len(self.text_lines), "end", end)
- # if start_at != 0 and end != len(self.text_lines) and start_at == len(remaining_lines):
- # # Add empty predecessor line if appending.
- # lines = [''] + lines
- # return self.write_lines_in_total_lines_at(remaining_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:]
- # 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 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 insert_booking_at_date(self, booking):
place_at = 0
place_at = i + 1
self.bookings.insert(place_at, booking)
- def add_taxes(self, lines, finish=False):
- ret = []
- bookings, _ = parse_lines(lines)
- date = bookings[0].date_string
- acc_kk_add = 'Reserves:KrankenkassenBeitragsWachstum'
- acc_kk_minimum = 'Reserves:Month:KrankenkassenDefaultBeitrag'
- acc_kk = 'Expenses:KrankenKasse'
- acc_est = 'Reserves:Einkommenssteuer'
- acc_assets = 'Assets'
- acc_buffer = 'Reserves:NeuAnfangsPuffer:Ausgaben'
- last_monthbreak_assets = 0
- last_monthbreak_est = 0
- last_monthbreak_kk_minimum = 0
- last_monthbreak_kk_add = 0
- buffer_expenses = 0
- kk_expenses = 0
- est_expenses = 0
- months_passed = -int(finish)
- for b in self.bookings:
- if date == b.date_string:
- break
- acc_keys = b.account_changes.keys()
- if acc_buffer in acc_keys:
- buffer_expenses -= b.account_changes[acc_buffer]['€']
- if acc_kk_add in acc_keys:
- kk_expenses += b.account_changes[acc_kk_add]['€']
- if acc_kk in acc_keys:
- kk_expenses += b.account_changes[acc_kk]['€']
- if acc_est in acc_keys:
- est_expenses += b.account_changes[acc_est]['€']
- if acc_kk_add in acc_keys and acc_kk_minimum in acc_keys:
- months_passed += 1
- if finish:
- last_monthbreak_kk_add = b.account_changes[acc_kk_add]['€']
- 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_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_before_anything}€']
- _, account_sums = bookings_to_account_tree(bookings)
- 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
- too_low = 0
- too_high = 2 * needed_income_before_kk
- E0 = decimal.Decimal(10908)
- E1 = decimal.Decimal(15999)
- E2 = decimal.Decimal(62809)
- E3 = decimal.Decimal(277825)
- while True:
- zvE = buffer_expenses - kk_expenses + (12 - months_passed) * needed_income_before_kk
- if finish:
- zvE += last_monthbreak_assets + last_monthbreak_kk_add + last_monthbreak_kk_minimum
- if zvE < E0:
- ESt = decimal.Decimal(0)
- elif zvE < E1:
- y = (zvE - E0)/10000
- ESt = (decimal.Decimal(979.18) * y + 1400) * y
- elif zvE < E2:
- y = (zvE - E1)/10000
- ESt = (decimal.Decimal(192.59) * y + 2397) * y + decimal.Decimal(966.53)
- elif zvE < E3:
- ESt = decimal.Decimal(0.42) * (zvE - decimal.Decimal(62809)) + decimal.Decimal(16405.54)
- else:
- ESt = decimal.Decimal(0.45) * (zvE - decimal.Decimal(277825)) + decimal.Decimal(106713.52)
- ESt_this_month = (ESt + last_monthbreak_est - est_expenses) / (12 - months_passed)
- left_over = needed_income_before_kk - ESt_this_month
- if abs(left_over - expenses_so_far) < 0.001:
- break
- elif left_over < expenses_so_far:
- too_low = needed_income_before_kk
- elif left_over > expenses_so_far:
- too_high = needed_income_before_kk
- needed_income_before_kk = too_low + (too_high - too_low)/2
- ESt_this_month = ESt_this_month.quantize(decimal.Decimal('0.00'))
- ret += [f' {acc_est} {ESt_this_month}€ ; expenses so far: {expenses_so_far:.2f}€; zvE: {zvE:.2f}€; ESt total: {ESt:.2f}€; needed before Krankenkasse: {needed_income_before_kk:.2f}€']
- kk_minimum_income = 1131.67
- if date < '2023-02-01':
- kk_minimum_income = decimal.Decimal(1096.67)
- kk_factor = decimal.Decimal(0.189)
- kk_minimum_tax = decimal.Decimal(207.27).quantize(decimal.Decimal('0.00'))
- elif date < '2023-08-01':
- kk_factor = decimal.Decimal(0.191)
- kk_minimum_tax = decimal.Decimal(216.15).quantize(decimal.Decimal('0.00'))
- else:
- kk_factor = decimal.Decimal(0.197)
- kk_minimum_tax = decimal.Decimal(222.94).quantize(decimal.Decimal('0.00'))
- 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}€ ; 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}']
- 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_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
- 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
-
- # 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):
for index, booking in enumerate(self.bookings):
booking.can_up = index > 0 and self.bookings[index - 1].date == booking.date
booking.can_down = index < len(self.bookings) - 1 and self.bookings[index + 1].date == booking.date
return j2env.get_template('ledger.html').render(bookings=self.bookings)
- # def ledger_as_html(self):
- # booking_tmpl = jinja2.Template(booking_html)
- # single_c_tmpl = jinja2.Template('<span class="comment">{{c|e}}</span><br />') ##
- # elements_to_write = []
- # last_i = i = 0 ##
- # for nth, booking in enumerate(self.bookings):
- # move_up = nth > 0 and self.bookings[nth - 1].date_string == booking.date_string
- # move_down = nth < len(self.bookings) - 1 and self.bookings[nth + 1].date_string == booking.date_string
- # booking_end = last_i = booking.start_line + len(booking.lines)
- # booking_lines = []
- # i = booking.start_line ##
- # elements_to_write += [single_c_tmpl.render(c=c) for c in self.comments[last_i:i] if c != ''] ##
- # for booking_line in booking.lines[1:]:
- # i += 1 ##
- # comment = self.comments[i] ##
- # if booking_line == '':
- # booking_lines += [{'acc': None, 'money': None, 'comment': comment}] ##
- # continue
- # account = booking_line[0]
- # money = ''
- # if booking_line[1] is not None:
- # money = f'{booking_line[1]} {booking_line[2]}'
- # booking_lines += [{'acc': booking_line[0], 'money':money, 'comment':comment}] ##
- # elements_to_write += [booking_tmpl.render(
- # prefix=self.prefix,
- # nth=nth,
- # start=booking.start_line,
- # end=booking_end,
- # date=booking.date_string,
- # desc=booking.description,
- # head_comment=self.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 self.comments[last_i:] if c != ''] #
- # return '\n'.join(elements_to_write)
-
def balance_as_html(self, until_after=None):
bookings = self.bookings[:(until_after if until_after is None else int(until_after)+1)]
account_trunk = Account('', None)
walk_tree(nodes, 0, acc)
return j2env.get_template('balance.html').render(nodes=nodes)
- # def balance_as_html(self, until=None):
- # bookings = self.bookings[:until if until is None else int(until)]
- # lines = []
- # account_tree, account_sums = bookings_to_account_tree(bookings)
- # def print_subtree(lines, indent, node, subtree, path):
- # line = f"{indent}{node}"
- # n_tabs = 5 - (len(line) // 8)
- # line += n_tabs * "\t"
- # if "€" in account_sums[path + node].keys():
- # amount = account_sums[path + node]["€"]
- # line += f"{amount:9.2f} €\t"
- # else:
- # line += f"\t\t"
- # for currency, amount in account_sums[path + node].items():
- # if currency != '€' and amount != 0:
- # line += f"{amount:5.2f} {currency}\t"
- # lines += [line]
- # indent += " "
- # for k, v in sorted(subtree.items()):
- # print_subtree(lines, indent, k, v, path + node + ":")
- # for k, v in sorted(account_tree.items()):
- # print_subtree(lines, "", k, v, "")
- # content = "\n".join(lines)
- # return f"<pre>{content}</pre>"
-
def edit(self, index, sent=None, error_msg=None, edit_mode='table', copy=False):
accounts = set()
if sent or -1 == index:
accounts.add(transfer_line.account)
return j2env.get_template('edit.html').render(content=content, index=index, error_msg=error_msg, edit_mode=edit_mode, accounts=accounts, adding=(copy or -1 == index))
- # def add_free(self, start=0, end=0, copy=False):
- # tmpl = jinja2.Template(add_form_header + add_free_html + add_form_footer)
- # lines = self.get_lines(start, end)
- # if copy:
- # start = end = 0
- # return tmpl.render(action=self.prefix + '/add_free', start=start, end=end, lines=lines)
-
- # def add_structured(self, start=0, end=0, copy=False, temp_lines=[], add_empty_line=None):
- # tmpl = jinja2.Template(add_form_header + add_structured_html + add_form_footer)
- # lines = temp_lines if len(''.join(temp_lines)) > 0 else self.get_lines(start, end)
- # bookings, comments = parse_lines(lines, validate_bookings=False)
- # if len(bookings) > 1:
- # 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]
- # booking.lines = booking.lines[:add_empty_line+1] + [''] + booking.lines[add_empty_line+1:]
- # action = self.prefix + '/add_structured'
- # datalist_sets = {'descriptions': set(), 'accounts': set(), 'currencies': set()}
- # for b in self.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)
- # content = ''
- # today = str(datetime.now())[:10]
- # booking_lines = []
- # if copy:
- # start = end = 0
- # desc = head_comment = ''
- # if len(bookings) == 0:
- # date=today
- # else:
- # booking = bookings[0]
- # desc = booking.description
- # date = today if copy else booking.date_string
- # head_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]
- # booking_lines += [{
- # 'i': i,
- # 'acc': account,
- # 'amt': amount,
- # '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,
- # desc=desc,
- # head_comment=head_comment,
- # booking_lines=booking_lines,
- # datalist_sets=datalist_sets,
- # start=start,
- # end=end)
- # return content
-
def move_up(self, index):
return self.move(index, -1)
lines += booking.for_writing
self.write_text_to_db('\n'.join(lines) + '\n')
- # def move_up(self, start, end):
- # prev_booking = None
- # for redir_nth, b in enumerate(self.bookings):
- # if b.start_line >= start:
- # break
- # prev_booking = b
- # start_at = prev_booking.start_line
- # self.make_move(start, end, start_at)
- # return redir_nth - 1
-
- # def move_down(self, start, end):
- # next_booking = None
- # for redir_nth, b in enumerate(self.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(start, end, start_at-1)
- # start_at = next_booking.start_line + len(next_booking.lines) - (end - start)
- # self.make_move(start, end, start_at)
- # return redir_nth
-
- # def make_move(self, start, end, start_at):
- # # FIXME currently broken due to changed self.write_lines_in_total_lines_at, easy fix would be lines += [""] maybe?
- # lines = self.get_lines(start, end)
- # if start == 0:
- # total_lines = self.text_lines[end+1:]
- # lines = [''] + lines
- # start_at += 1
- # else:
- # total_lines = self.text_lines[:start-1] + self.text_lines[end:] # -1 because we reduce the original position's two empty limit lines to one in-between line
- # lines += ['']
- # self.write_lines_in_total_lines_at(total_lines, start_at, lines)
-
- # def booking_lines_from_postvars(self, postvars):
- # 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}']
- # lines += [f'Assets {amount} {currency}']
- # except PlomException:
- # pass
- # 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
-
-
class LedgerHandler(PlomHandler):
if 'check' == submit_button:
error_msg = 'All looks fine!'
elif submit_button in {'mirror', 'fill_sink', 'add_taxes'}:
- getattr(booking, submit_button)()
+ if 'add_taxes' == submit_button:
+ booking.add_taxes(db)
+ else:
+ getattr(booking, submit_button)()
elif 'replace' == submit_button:
booking.replace(postvars['replace_from'][0], postvars['replace_to'][0])
elif submit_button in {'textarea', 'table'}:
index = index if index >= 0 else len(db.bookings) - 1
self.redirect(prefix + f'/ledger#{index}')
- # def forward_posts(self):
- # 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])
- # print("DEBUG start, end", start, end)
- # 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)
- # print("DEBUG save", new_start, start, end, lines)
- # 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.try_do(self.forward_gets)
html_foot = '</body>\n</html>'
def fail_400(self, e):
- self.send_HTML(f'ERROR: {e}', 400)
+ self.send_HTML(f'ERROR BAR: {e}', 400)
def send_HTML(self, html, code=200):
self.send_code_and_headers(code, [('Content-type', 'text/html')])
self.comment = comment
self.visible = True
+ self.parents = []
@classmethod
def from_dict(cls, db, d, id_):
def subtasks(self):
subtasks = []
for id_ in self.subtask_ids.now:
+ if len(id_) == 0:
+ continue
subtasks += [self.db.tasks[id_]]
return subtasks
self.date = date
self.db = db
self.comment = comment
- self.archived = True
self.linked_todos_as_list = []
- self.todos = {}
@classmethod
def from_dict(cls, db, d, date=None):
comment = d['comment'] if 'comment' in d.keys() else ''
day = cls(db, date, comment)
- for id_ in d['linked_todos']:
- day.linked_todos_as_list += [db.todos[id_]]
return day
def to_dict(self):
- d = {'comment': self.comment, 'linked_todos': []}
- for todo_id in self.linked_todos.keys():
- d['linked_todos'] += [todo_id]
+ d = {'comment': self.comment}
return d
@property
def title(self):
return self.task.title.at(self.earliest_date)
+ @property
+ def dated_title(self):
+ return f'{self.earliest_date}:{self.title}'
+
@property
def children(self):
return [self.db.todos[id_] for id_ in self.child_ids]
if not date in efforts.keys():
efforts[date] = None
if effort is not None:
- to_add = effort
+ to_add = effort / len(child.parents)
elif child.done:
- to_add = child.task.default_effort.at(date)
+ to_add = child.task.default_effort.at(date) / len(child.parents)
if to_add is not None:
if efforts[date] is not None:
efforts[date] += to_add
return False
return True
- @property
- def path(self):
- path = ''
- if self.parent:
- path = f'{self.parent.path}{self.parent.title}:'
- return path
-
@property
def tags(self):
return self.day_tags | self.task.tags.now
class TodoDB(PlomDB):
def __init__(self,
- prefix,
selected_date=None,
- t_filter_and = None,
- t_filter_not = None,
+ tag_filter_and = None,
+ tag_filter_not = None,
hide_unchosen=False,
hide_done=False):
- self.prefix = prefix
self.selected_date = selected_date if selected_date else today_date()
- self.t_filter_and = t_filter_and if t_filter_and else []
- self.t_filter_not = t_filter_not if t_filter_not else []
+ self.tag_filter_and = tag_filter_and if tag_filter_and else []
+ self.tag_filter_not = tag_filter_not if tag_filter_not else []
self.hide_unchosen = hide_unchosen
self.hide_done = hide_done
def read_db_file(self, f):
d = json.load(f)
+
for id_, t_dict in d['tasks'].items():
t = self.add_task(id_=id_, dict_source=t_dict)
for tag in t.tags.now:
self.t_tags.add(tag)
+ for task in self.tasks.values():
+ for child in task.subtasks:
+ child.parents += [task]
+
for id_, todo_dict in d['todos'].items():
- todo = self.add_todo(todo_dict, id_)
- self.todos[id_] = todo
+ todo = self.add_todo(todo_dict, id_, link_into_day=False)
for tag in todo.day_tags:
self.t_tags.add(tag)
- for date, day_dict in d['days'].items():
- self.add_day(dict_source=day_dict, date=date)
for todo in self.todos.values():
for child in todo.children:
child.parents += [todo]
+
+ for date, day_dict in d['days'].items():
+ self.add_day(dict_source=day_dict, date=date)
+ for todo in self.todos.values():
for date in todo.efforts.keys():
if not date in self.days.keys():
self.add_day(date)
- if not todo in self.days[date].linked_todos_as_list:
- self.days[date].linked_todos_as_list += [todo]
+ # if not todo in self.days[date].linked_todos_as_list:
+ # self.days[date].linked_todos_as_list += [todo]
+ self.days[date].linked_todos_as_list += [todo]
+
self.set_visibilities()
def to_dict(self):
d['tasks'][uuid] = t.to_dict()
for date, day in self.days.items():
d['days'][date] = day.to_dict()
- for todo in day.todos.values():
- d['todos'][todo.id_] = todo.to_dict()
for id_, todo in self.todos.items():
d['todos'][id_] = todo.to_dict()
return d
task.tags.set(tags)
task.subtask_ids.set(subtask_ids)
task.comment = comment
+ return task
- def add_todo(self, todo_dict=None, id_=None, task=None, efforts=None):
+ def add_todo(self, todo_dict=None, id_=None, task=None, efforts=None, link_into_day=True):
id_ = id_ if id_ else str(uuid4())
if todo_dict:
todo = Todo.from_dict(self, todo_dict, id_)
todo = Todo(self, id_, task, efforts=efforts)
children = []
for child_task in task.subtasks:
- children += [self.add_todo(task=child_task, efforts=efforts)]
+ # if Todo expects chuldren, adopt any compatibles found in DB.selected_date
+ # before creating new child Todos
+ child_todo = None
+ if list(efforts.keys())[0] == self.selected_date:
+ adoptable_todos = [t for t in self.selected_day.linked_todos_as_list
+ if t.task.id_ == child_task.id_]
+ if len(adoptable_todos) > 0:
+ child_todo = adoptable_todos[0]
+ if not child_todo:
+ child_todo = self.add_todo(task=child_task,
+ efforts=efforts, link_into_day=link_into_day)
+ children += [child_todo]
todo.child_ids = [child.id_ for child in children]
self.todos[id_] = todo
+ if link_into_day:
+ self.selected_day.linked_todos_as_list += [todo]
return todo
def _update_todo_shared(self, id_, done, comment, importance):
raise PlomException('todo must have at least one effort!')
todo.children = children
todo.efforts = efforts
- for date in todo.efforts:
+ for date in todo.efforts.keys():
if not date in self.days.keys():
self.add_day(date=date)
if not self in self.days[date].linked_todos_as_list:
parent.child_ids.remove(todo.id_)
del self.todos[id_]
+ def delete_task(self, id_):
+ del self.tasks[id_]
+
def delete_effort(self, todo, date, force=False):
if (not force) and len(todo.efforts) == 1:
raise PlomException('todo must retain at least one effort!')
# views
+ def show_message(self, message):
+ return j2env.get_template('message.html').render(message=message)
+
def show_calendar(self, start_date_str, end_date_str):
- self.t_filter_and = ['calendar']
- self.t_filter_not = ['deleted']
+ self.tag_filter_and = ['calendar']
+ self.tag_filter_not = ['deleted']
self.set_visibilities()
start_date_obj, end_date_obj = self.get_limit_days_from_date_strings(start_date_str, end_date_str)
days_to_show = {}
return j2env.get_template('do_todos.html').render(
day=self.selected_day,
tags=self.t_tags,
- filter_and=self.t_filter_and,
- filter_not=self.t_filter_not,
+ filter_and=self.tag_filter_and,
+ filter_not=self.tag_filter_not,
prev_date=prev_date_str,
next_date=next_date_str,
todos=todos,
sort=sort_order,
hide_done=self.hide_done)
- def show_todo(self, id_, return_to, search, start_date, end_date):
+ def show_todo(self, id_, search, start_date, end_date):
todo = self.todos[id_]
+ filtered_tasks = [t for t in self.tasks.values()
+ if t != todo.task]
+ filtered_todos = [t for t in self.todos.values()
+ if t != todo]
+
+ # if going into the past, only allow 3-day ranges
start_day, end_day = self.get_limit_days_from_date_strings(start_date, end_date)
if start_day < datetime.now() - timedelta(days=2):
end_day = start_day + timedelta(days=3)
for n in range(int((end_day - start_day).days) + 1):
day = start_day + timedelta(n)
legal_dates += [day.strftime(DATE_FORMAT)]
- filtered_todos = [t for t in self.todos.values()
- if t.visible
- and t != todo
- and (len(search) == 0 or t.matches(search))]
date_filtered_todos = []
for date in legal_dates:
for filtered_todo in filtered_todos:
continue
if date in filtered_todo.efforts.keys():
date_filtered_todos += [filtered_todo]
+
return j2env.get_template('todo.html').render(
- filter_and=self.t_filter_and,
- filter_not=self.t_filter_not,
tags=self.t_tags,
todo=todo,
filtered_todos=date_filtered_todos,
+ filtered_tasks=filtered_tasks,
child_todos=todo.children,
- return_to=return_to,
start_date=start_date,
end_date=end_date)
- def show_task(self, id_, return_to='', search=''):
+ def show_task(self, id_):
task = self.tasks[id_] if id_ else self.add_task()
- selected = task.id_ in self.selected_day.todos.keys()
+ if not id_:
+ task.default_effort.set(1.0)
filtered_tasks = [t for t in self.tasks.values()
- if t.visible
- and t != task
- and (t not in task.subtasks)
- and (len(search) == 0 or t.matches(search))]
+ if t != task
+ and (t not in task.subtasks)]
return j2env.get_template('task.html').render(
- search=search,
+ selected_date=self.selected_date,
tags=self.t_tags,
- filter_and=self.t_filter_and,
- filter_not=self.t_filter_not,
filtered_tasks=filtered_tasks,
- task=task,
- return_to=return_to)
+ task=task)
def show_tasks(self, expand_uuid):
expanded_tasks = {}
expanded_tasks[uuid] = self.tasks[uuid]
return j2env.get_template('tasks.html').render(
db=self,
- filter_and=self.t_filter_and,
- filter_not=self.t_filter_not,
+ filter_and=self.tag_filter_and,
+ filter_not=self.tag_filter_not,
expand_uuid=expand_uuid,
expanded_tasks=expanded_tasks)
continue
relevant_todos += [todo]
- tasks = []
+ filtered_tasks = []
chosen_tasks = [todo.task for todo in self.selected_day.linked_todos_as_list]
for uuid, task in self.tasks.items():
if (not task.visible)\
or (not task.matches(search))\
or (hide_chosen_tasks and task in chosen_tasks):
continue
- tasks += [task]
+ filtered_tasks += [task]
if sort_order == 'title':
chosen_todos.sort(key=lambda t: t.title)
- relevant_todos.sort(key=lambda t: t.title)
+ relevant_todos.sort(key=lambda t: t.dated_title)
tasks.sort(key=lambda t: t.title.then)
elif sort_order == 'effort':
chosen_todos.sort(key=lambda t:
t.day_effort if t.day_effort else (t.default_effort if t.done else 0),
reverse=True)
relevant_todos.sort(key=lambda t: t.all_days_effort, reverse=True)
- tasks.sort(key=lambda t: t.default_effort.then, reverse=True)
+ filtered_tasks.sort(key=lambda t: t.default_effort.then, reverse=True)
return j2env.get_template('pick_tasks.html').render(
sort=sort_order,
tags=self.t_tags,
chosen_todos=chosen_todos,
- filter_and=self.t_filter_and,
- filter_not=self.t_filter_not,
+ filter_and=self.tag_filter_and,
+ filter_not=self.tag_filter_not,
day=self.selected_day,
prev_date=prev_date_str,
next_date=next_date_str,
- tasks=tasks,
+ all_tasks=[t for t in self.tasks.values()],
+ filtered_tasks=filtered_tasks,
hide_chosen_tasks=hide_chosen_tasks,
relevant_todos=relevant_todos,
search=search)
def set_visibilities(self):
for uuid, t in self.tasks.items():
- t.visible = len([tag for tag in self.t_filter_and if not tag in t.tags.now]) == 0\
- and len([tag for tag in self.t_filter_not if tag in t.tags.now]) == 0\
+ t.visible = len([tag for tag in self.tag_filter_and if not tag in t.tags.now]) == 0\
+ and len([tag for tag in self.tag_filter_not if tag in t.tags.now]) == 0\
and ((not self.hide_unchosen) or uuid in self.selected_day.todos.keys())
for todo in self.todos.values():
- todo.visible = len([tag for tag in self.t_filter_and if not tag in todo.day_tags | todo.task.tags.now ]) == 0\
- and len([tag for tag in self.t_filter_not if tag in todo.day_tags | todo.task.tags.now ]) == 0\
+ todo.visible = len([tag for tag in self.tag_filter_and if not tag in todo.day_tags | todo.task.tags.now ]) == 0\
+ and len([tag for tag in self.tag_filter_not if tag in todo.day_tags | todo.task.tags.now ]) == 0\
and ((not self.hide_done) or (not todo.done))
def get_limit_days_from_date_strings(self, start_date_str, end_date_str):
param = param != '0'
return param
- def get_cookied(self, key, default=None):
+ def cookie_key_from_params_key(self, prefix, key):
+ return f'{prefix}:{key}' if prefix else key
+
+ def get_cookied(self, key, default=None, prefix=None):
+ cookie_key = self.cookie_key_from_params_key(prefix, key)
param = self.get(key, default)
if param == '-':
param = None
- if key in self.cookie_db.keys():
- del self.cookie_db[key]
- if param is None and key in self.cookie_db.keys():
- param = self.cookie_db[key]
+ if cookie_key in self.cookie_db.keys():
+ del self.cookie_db[cookie_key]
+ if param is None and cookie_key in self.cookie_db.keys():
+ param = self.cookie_db[cookie_key]
if param is not None:
- self.cookie_db[key] = param
+ self.cookie_db[cookie_key] = param
return param
- def get_cookied_chain(self, key, default=None):
+ def get_cookied_chain(self, key, default=None, prefix=None):
+ cookie_key = self.cookie_key_from_params_key(prefix, key)
params = self.params.get(key, default)
if params == ['-']:
params = None
- if key in self.cookie_db.keys():
- del self.cookie_db[key]
- if params is None and key in self.cookie_db.keys():
- params = self.cookie_db[key]
+ if cookie_key in self.cookie_db.keys():
+ del self.cookie_db[cookie_key]
+ if params is None and cookie_key in self.cookie_db.keys():
+ params = self.cookie_db[cookie_key]
if params is not None:
- self.cookie_db[key] = params
+ self.cookie_db[cookie_key] = params
return params
def has(self, key):
return key in self.postvars.keys()
- def get(self, key, on_empty=None):
- return self.get_at_index(key, 0, on_empty)
+ def get(self, key, on_empty=None, float_if_possible=False):
+ return self.get_at_index(key, 0, on_empty, float_if_possible)
- def get_at_index(self, key, i, on_empty=None):
+ def get_at_index(self, key, i, on_empty=None, float_if_possible=False):
if self.has(key) and len(self.postvars[key][i]) > 0:
- return self.postvars[key][i]
- return on_empty
-
- def get_float_if_possible(self, key):
- s = self.get(key)
- if s is not None:
- return float(s)
+ val = self.postvars[key][i]
else:
- return None
+ val = on_empty
+ if float_if_possible and val is not None:
+ return float(val)
+ else:
+ return val
def get_all(self, key, on_empty=None):
if self.has(key) and len(self.postvars[key]) > 0:
- return self.postvars[key]
+ return [v for v in self.postvars[key] if len(v) > 0]
return on_empty
- def get_defined_tags(self, joined_key, key_prefix):
- tags = set()
- tags_checked = []
- for k in self.postvars.keys():
- if k.startswith(key_prefix):
- tags_checked += [k[len(key_prefix):]]
- tags_joined = self.get(joined_key, '')
- for tag in [tag.strip() for tag in tags_joined.split(';') if tag.strip() != '']:
- tags.add(tag)
- for tag in tags_checked:
- tags.add(tag)
- return tags
-
def set(self, key, value):
self.postvars[key] = [value]
def config_init(self):
return {
'cookie_name': 'todo_cookie',
- 'prefix': '',
'cookie_path': '/'
}
default_path = '/todo'
handler.add_route('GET', default_path, self.show_db)
handler.add_route('POST', default_path, self.write_db)
- return 'todo', {'cookie_name': 'todo_cookie', 'prefix': default_path, 'cookie_path': default_path}
+ return 'todo', {'cookie_name': 'todo_cookie', 'cookie_path': default_path}
def do_POST(self):
self.try_do(self.write_db)
length = int(self.headers['content-length'])
postvars = PostvarsParser(parse_qs(self.rfile.read(length).decode(), keep_blank_values=1))
- db = TodoDB(prefix=config['prefix'])
+ db = TodoDB()
redir_params = []
# if we do encounter a filter post, we repost it (and if empty, the emptying command '-')
- for param_name, filter_db_name in {('t_and', 't_filter_and'), ('t_not', 't_filter_not')}:
+ for param_name, filter_db_name in {('and_tag', 'tag_filter_and'), ('not_tag', 'tag_filter_not')}:
filter_db = getattr(db, filter_db_name)
if postvars.has(param_name):
for target in postvars.get_all(param_name, []):
if site in {'calendar', 'todo'}:
redir_params += [('end', postvars.get('end', '-'))]
redir_params += [('start', postvars.get('start', '-'))]
- if site in {'todo', 'task', 'pick_tasks'}:
+ if site in {'todo', 'pick_tasks'}:
redir_params += [('search', postvars.get('search', ''))]
redir_params += [('search', postvars.get('search', ''))]
redir_params += [('search', postvars.get('search', ''))]
redir_params += [('id', todo_id)]
old_todo = db.todos[todo_id] if todo_id in db.todos.keys() else None
efforts = {}
+ latest_date = db.selected_date
for i, date in enumerate(postvars.get_all('effort_date', [])):
if '' == date:
continue
datetime.strptime(date, DATE_FORMAT)
except ValueError:
raise PlomException(f'bad date string')
+ latest_date = date
efforts[date] = None
if not (old_todo and old_todo.children):
- efforts[date] = postvars.get_at_index('effort', i, None)
+ efforts[date] = postvars.get_at_index('effort', i, on_empty=None,
+ float_if_possible=True)
if postvars.has('delete'):
has_day_effort = len([e for e in efforts.values() if e is not None]) > 0
if postvars.has('done')\
or postvars.get('comment')\
- or len(postvars.get_defined_tags('joined_day_tags', 'day_tag_')) > 0\
+ or postvars.get_all('tag', [])\
or has_day_effort:
raise PlomException('will not remove todo of preserve-worthy values')
db.delete_todo(todo_id)
- if not postvars.get('return_to'):
- postvars.set('return_to', 'calendar')
+ postvars.set('return_to', 'calendar')
elif postvars.has('update'):
if postvars.has('delete_effort'):
for date in postvars.get_all('delete_effort'):
db.delete_effort(old_todo, date)
del efforts[date]
- children = [db.todos[id_] for id_ in postvars.get_all('adopt_child', [])]
+ children = [db.todos[id_] for id_ in postvars.get_all('adopt_child', [])
+ if id_ in db.todos.keys()]
+ for child in children:
+ if not todo_id in [t.id_ for t in child.parents]:
+ child.parents += [db.todos[todo_id]]
+ tasks_to_birth = [db.tasks[id_] for id_ in postvars.get_all('birth_child', [])]
+ for task in tasks_to_birth:
+ children += [db.add_todo(task=task, efforts={latest_date: None})]
db.update_todo(id_=todo_id,
efforts=efforts,
done=postvars.has('done'),
comment=postvars.get('comment', ''),
- tags=postvars.get_defined_tags('joined_day_tags', 'day_tag_'),
+ tags=postvars.get_all('tag', []),
importance=float(postvars.get('importance')),
children=children)
elif 'task' == site:
task_id = postvars.get('task_id')
- if postvars.has('update'):
- db.update_task(
+ if postvars.has('delete') and task_id in db.tasks.keys():
+ if [t for t in db.todos.values() if task_id == t.task.id_]:
+ raise PlomException('will not remove Task describing existing Todos')
+ if postvars.get('title', '')\
+ or postvars.get_all('tag', [])\
+ or postvars.get_all('subtask', [])\
+ or postvars.get('comment', ''):
+ raise PlomException('will not remove Task of preserve-worthy values')
+ db.delete_task(task_id)
+ elif postvars.has('update'):
+ task = db.update_task(
id_=task_id,
title=postvars.get('title', ''),
- default_effort=postvars.get_float_if_possible('default_effort'),
- tags=postvars.get_defined_tags('joined_tags', 'tag_'),
+ default_effort=postvars.get('default_effort', float_if_possible=True),
+ tags=postvars.get_all('tag', []),
subtask_ids=postvars.get_all('subtask', []),
comment=postvars.get('comment', ''))
+ if postvars.has('add_as_todo'):
+ db.add_todo(task=task, efforts={postvars.get('selected_date'): None})
redir_params += [('id', task_id)]
elif 'pick_tasks' == site:
db.selected_date = postvars.get('date')
redir_params += [('date', db.selected_date)]
db.selected_day.comment = postvars.get('day_comment', '')
- for i, todo_id in enumerate(postvars.get_all('todo_id')):
- old_todo = None if not todo_id in db.todos.keys() else db.todos[todo_id]
+ for i, todo_id in enumerate(postvars.get_all('todo_id', [])):
+ old_todo = db.todos[todo_id]
done = todo_id in postvars.get_all('done', [])
day_effort_input = postvars.get_at_index('effort', i, '')
day_effort = float(day_effort_input) if len(day_effort_input) > 0 else None
comment = postvars.get_at_index('effort_comment', i, '')
+ if (day_effort is not None) and (not done) and day_effort < 0 and 0 == len(comment):
+ if len(old_todo.efforts) > 1:
+ db.delete_effort(old_todo, db.selected_date)
+ else:
+ db.delete_todo(todo_id)
+ continue
importance = float(postvars.get_at_index('importance', i))
if old_todo\
and old_todo.done == done\
cookie_db = self.get_cookie_db(config['cookie_name'])
params = ParamsParser(parsed_url.query, cookie_db)
- selected_date = t_filter_and = t_filter_not = None
+ selected_date = tag_filter_and = tag_filter_not = None
hide_unchosen = hide_done = False
return_to = params.get('return_to', '')
- if site in {'do_todos', 'pick_tasks', 'calendar'}:
+ if site in {'do_todos', 'pick_tasks', 'calendar', 'task'}:
selected_date = params.get_cookied('date')
- if site in {'do_todos', 'pick_tasks', 'task', 'todo'}:
- t_filter_and = params.get_cookied_chain('t_and')
- t_filter_not = params.get_cookied_chain('t_not')
+ if site in {'do_todos', 'pick_tasks'}:
+ tag_filter_and = params.get_cookied_chain('and_tag', prefix=site)
+ tag_filter_not = params.get_cookied_chain('not_tag', prefix=site)
if 'do_todos' == site:
hide_done = params.get('hide_done', False)
- db = TodoDB(config['prefix'], selected_date, t_filter_and, t_filter_not, hide_unchosen, hide_done)
+ db = TodoDB(selected_date, tag_filter_and, tag_filter_not, hide_unchosen, hide_done)
if site in {'todo', 'task'}:
id_ = params.get('id')
- if site in {'todo', 'task', 'pick_tasks'}:
+ if site in {'todo', 'pick_tasks'}:
search = params.get('search', '')
if site in {'do_todos', 'pick_tasks'}:
- sort_order = params.get_cookied('sort')
- if site in {'calendar', 'todo'}:
- start_date = params.get_cookied('start')
- end_date = params.get_cookied('end')
- if 'do_todos' == site:
+ sort_order = params.get_cookied('sort', prefix=site)
+ if site in {'', 'calendar', 'todo'}:
+ start_date = params.get_cookied('start', prefix=site)
+ end_date = params.get_cookied('end', prefix=site)
+ if 'reset_cookie' == site:
+ cookie_db = { # sensible defaults
+ params.cookie_key_from_params_key('pick_tasks', 'and_tag'): ['default'],
+ params.cookie_key_from_params_key('pick_tasks', 'not_tag'): ['ignore'],
+ params.cookie_key_from_params_key('todo', 'and_tag'): ['default'],
+ params.cookie_key_from_params_key('todo', 'not_tag'): ['ignore'],
+ params.cookie_key_from_params_key('todo', 'start'): 'yesterday',
+ params.cookie_key_from_params_key('todo', 'end'): 'today'}
+ page = db.show_message('cookie unset!')
+ elif 'do_todos' == site:
page = db.show_do_todos(sort_order)
elif 'pick_tasks' == site:
hide_chosen_tasks = params.get('hide_chosen_tasks', False)
page = db.show_pick_tasks(search, hide_chosen_tasks, sort_order)
elif site == 'todo':
- page = db.show_todo(id_, return_to, search, start_date, end_date)
+ page = db.show_todo(id_, search, start_date, end_date)
elif 'task' == site:
- page = db.show_task(id_, return_to, search)
+ page = db.show_task(id_)
elif 'tasks' == site:
expand_uuid = params.get('expand_uuid')
page = db.show_tasks(expand_uuid)
elif 'add_task' == site:
page = db.show_task(None)
- elif 'unset_cookie' == site:
- page = 'no cookie to unset.'
- if len(cookie_db) > 0:
- self.unset_cookie(config['cookie_name'], config['cookie_path'])
- page = 'cookie unset!'
- else:
+ else: # 'calendar' == site
page = db.show_calendar(start_date, end_date)
- if 'unset_cookie' != site:
- self.set_cookie(config['cookie_name'], config['cookie_path'], cookie_db)
+ self.set_cookie(config['cookie_name'], config['cookie_path'], cookie_db)
self.send_HTML(page)
+{% import 'macros.html' as macros %}
<style>
body { font-family: monospace; background: white; color: black; }
input { font-family: monospace; padding: 0em; margin: 0em; }
input[type="submit"] { background-color: #cccccc; }
button { background-color: #cccccc; }
input[type="submit"].update { background-color: #aaffaa; }
+input[type="submit"].delete { background-color: #ff7777; }
+div.delete { float: right; }
{% block css %}
{% endblock %}
</style>
<a href="pick_tasks">pick tasks</a>
<a href="do_todos">do todos</a>
| <a href="calendar">calendar</a>
-| <a href="unset_cookie">unset cookie</a>
+| <a href="reset_cookie">reset cookie</a>
<hr />
{% block content %}
{% endblock %}
+++ /dev/null
-{% extends 'base.html' %}
-{% block css %}
-table.alternating tr:nth-child(even) {
- background-color: #cccccc;
-}
-table.alternating tr:nth-child(odd) {
- background-color: #ffffff;
-}
-th.desc { background: linear-gradient(to bottom, white, grey); }
-td.checkbox, td.number { height: 0.1em; padding: 0em; text-align: center; }
-td.checkbox { width: 0.1em }
-td button { height: 1.5em; padding: 0em; margin: 0em }
-td details { display: inline }
-input[type="number"] { text-align: right; }
-{% endblock %}
-{% block content %}
-<form action="{{action|e}}" method="POST">
-{% include 'tagfilters.html' %}
-<p>
-<input name="expect_unchosen_done" type="hidden" value="1"/>
-<input name="hide_unchosen" type="checkbox" {% if db.hide_unchosen %}checked{% endif %} /> hide unchosen <input name="hide_done" type="checkbox" {% if db.hide_done %}checked{% endif %} /> hide done
-</p>
-</form>
-
-<h3>edit day</h3>
-<form id="form_to_watch" action="{{action|e}}" method="POST">
-<p>
-| <a href="{{db.prefix}}/day?selected_date={{prev_date}}">prev</a> | {{db.selected_date}} | <a href="{{db.prefix}}/day?selected_date={{next_date}}">next</a> |
-comment: <input name="day_comment" value="{{ db.selected_day.comment|e }}">
-<input type="submit" value="update">
-<input type="hidden" name="selected_date" value="{{ db.selected_date }}" />
-</p>
-<details>
-<summary>done: {{ db.selected_day.todos_sum|round(2) }} ({{ db.selected_day.todos_sum2|round(2)}})</summary>
-<table class="alternating">
-{% for todo in done_tasks %}
-<tr>
-<td>{{todo.task.current_title|e}}</td>
-<td>{{todo.effort}}</td>
-<td>{{todo.comment}}</td>
-</tr>
-{% endfor %}
-</table>
-</details>
-<table class="alternating">
-<tr>
-<th {% if sort=='title' %}class="desc"{% endif %}><a href="?sort=title">task</a></th>
-<th {% if sort=='chosen' %}class="desc"{% endif %}><a href="?sort=chosen">todo</a></th>
-<th {% if sort=='done' %}class="desc"{% endif %}><a href="?sort=done">done</a></th>
-<th {% if sort=='default_effort' %}class="desc"{% endif %}><a href="?sort=default_effort">effort</a></th>
-<th {% if sort=='importance' %}class="desc"{% endif %}><a href="?sort=importance">importance</a></th>
-<th>edit?</th><th>day tags</th>
-<th {% if sort=='comment' %}class="desc"{% endif %}><a href="?sort=comment">comment</a></th></tr>
-{% for row in task_rows %}
-<tr>
-<input name="t_uuid" value="{{ row.uuid }}" type="hidden" >
-<td><details><summary>] <a href="{{db.prefix}}/task?id={{ row.uuid }}&referer=day" />{{ row.task.current_title|e }}</a></summary>tags: {% for tag in row.task.tags | sort %}<a href="{{db.prefix}}/day?t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</details></td>
-{% if row.todo %}
-<td class="checkbox"><input name="choose" type="checkbox" value="{{ row.uuid }}" checked></td>
-<td class="checkbox"><input name="done" type="checkbox" value="{{ row.uuid }}" {% if row.todo.done %}checked{% endif %}></td>
-<td class="number"><input class="day_effort_input" name="day_effort" type="number" step=0.1 size=8 value="{% if row.todo.day_effort is not none %}{{ row.todo.day_effort }}{% endif %}" placeholder={{ row.task.current_default_effort }} ></td>
-<td class="number"><input name="importance" type="number" step=0.1 size=8 value="{{row.todo.importance}}" ></td>
-<td><a href="{{db.prefix}}/todo?task={{row.uuid}}&date={{db.selected_date}}&referer=day">edit</a></td>
-<td>{% for tag in row.todo.day_tags | sort %}<a href="{{db.prefix}}/tags?t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
-<td>{{ row.todo.comment|e }}</td>
-{% else %}
-<td class="checkbox"><input name="choose" type="checkbox" value="{{ row.uuid }}"</td>
-<td class="checkbox"><input name="done" type="checkbox" value="{{ row.uuid }}"></td>
-<td class="number"><input class="day_effort_input" name="day_effort" type="number" step=0.1 size=8 placeholder={{ row.task.current_default_effort }} ></td>
-<td class="number"><input name="importance" type="number" step=0.1 size=8 value="1.0" ></td>
-<td><a href="{{db.prefix}}/todo?task={{row.uuid}}&date={{db.selected_date}}&referer=day">edit</a></td>
-<td></td>
-<td></td>
-<td></td>
-{% endif %}
-</tr>
-{% endfor %}
-</table>
-<input type="submit" value="update">
-</form>
-{% include 'watch_form.html' %}
-<script>
-var day_effort_inputs = document.getElementsByClassName("day_effort_input");
-for (let i = 0; i < day_effort_inputs.length; i++) {
- let input = day_effort_inputs[i];
- let button = document.createElement('button');
- button.innerHTML = '+' + input.placeholder;
- button.onclick = function(event) {
- event.preventDefault();
- if (input.value) {
- input.value = parseFloat(input.value) + parseFloat(input.placeholder);
- } else {
- input.value = parseFloat(input.placeholder);
- }
- input.value = parseFloat(input.value).toFixed(1);
- formHasChanged = true;
- };
- input.insertAdjacentElement('afterend', button);
-}
-</script>
-{% endblock %}
{% include 'tagfilters.html' %}
<br />
<input name="hide_done" type="checkbox" {% if hide_done %}checked{% endif %} /> hide done
-<input type="submit" name="filter" value="filter" />
+<input id="filter_button" type="submit" name="filter" value="filter" />
<p>
| <a href="do_todos?date={{prev_date}}">prev</a> | {{day.date}} | <a href="do_todos?date={{next_date}}">next</a> |
comment: <input name="day_comment" value="{{day.comment|e}}">
<input name="importance" type="number" step=0.1 size=7 value={{todo.importance}} } >
</td>
<td>
-<a href="todo?id={{todo.id_}}&return_to=do_todos">{{todo.path}}{{todo.title}}</a>
+<a href="todo?id={{todo.id_}}&return_to=do_todos">{% if todo.parents|length > 0 %}…:{% endif %}{{todo.title}}</a>
</td>
<td>
<input name="effort_comment" type="text" size=100 value="{{todo.comment|e}}" />
{% endfor %}
</table>
-<input class="update" type="submit" name="update" value="update">
+<input id="update_button" class="update" type="submit" name="update" value="update">
</form>
{% include 'watch_form.html' %}
<h3>pick todos for day</h3>
<form id="form_to_watch" action="pick_tasks" method="POST">
-{% include 'tagfilters.html' %}
-<br />
-<input name="hide_chosen_tasks" type="checkbox" {% if hide_chosen_tasks %}checked{% endif %} /> hide chosen tasks<br />
-search: <input name="search" value="{{search|e}}" />
-<input type="submit" name="filter" value="filter" />
<p>
<a href="pick_tasks?date={{prev_date}}">prev</a> | {{day.date}} | <a href="pick_tasks?date={{next_date}}">next</a> | {{day.comment}}
<input type="hidden" name="date" value="{{day.date}}" />
<input class="update" id="pick_upper" name="update" type="submit" value="pick" />
<input type="hidden" name="search" value="{{search|e}}" />
-<table class="alternating">
+<table>
+
+<tr>
+<th colspan=5>task quick-add: <input name="choose_task" size=50 list="tasks"></th>
+</tr>
+<datalist id="tasks">
+{% for task in all_tasks %}
+<option value="{{task.id_}}">{{task.title.now}}</option>
+{% endfor %}
+</datalist>
+
<tr>
<th>do</th>
<th {% if sort=='effort' %}class="desc"{% endif %}>
{{todo.all_days_effort}}/{{todo.default_effort}}
</td>
<td>
-<a href="todo?id={{todo.id_}}">{{todo.day.date}} {{todo.task.title.then|e}}</a>
+<a href="todo?id={{todo.id_}}">{{todo.dated_title|e}}</a>
</td>
<td>
{{todo.comment|e}}
<th colspan=4>tasks</th>
</tr>
-{% for task in tasks %}
+{% for task in filtered_tasks %}
<tr>
<td class="checkbox">
<input name="choose_task" type="checkbox" value="{{task.id_}}">
{% endfor %}
</table>
-<input class="update" id="pick_lower" name="update" type="submit" value="pick" />
+<input id="update_button" class="update" id="pick_lower" name="update" type="submit" value="pick" />
+<br />
+{% include 'tagfilters.html' %}
+<br />
+<input name="hide_chosen_tasks" type="checkbox" {% if hide_chosen_tasks %}checked{% endif %} /> hide chosen tasks<br />
+search: <input name="search" value="{{search|e}}" />
+<input id="filter_button" type="submit" name="filter" value="filter" />
</form>
{% include 'watch_form.html' %}
-need:
-{% for and_filter in filter_and %}
-<select name="t_and">
-<option></option>
-{% for tag in tags | sort %}
-<option value="{{tag|e}}" {% if and_filter == tag %}selected{% endif %}>{{tag|e}}</option>
-{% endfor %}
-</select>
-{% endfor %}
-<select name="t_and">
-<option></option>
-{% for tag in tags | sort %}
-<option value="{{tag|e}}">{{tag|e}}</option>
-{% endfor %}
-</select>
+need tags:
+{{ macros.tagselection(submit_name='and_tag', selected_tags=filter_and, all_tags=tags) }}
<br />
-hide:
-{% for not_filter in filter_not %}
-<select name="t_not">
-<option></option>
-{% for tag in tags | sort %}
-<option value="{{tag|e}}" {% if not_filter == tag %}selected{% endif %}>{{tag|e}}</option>
-{% endfor %}
-</select>
-{% endfor %}
-<select name="t_not">
-<option></option>
-{% for tag in tags | sort %}
-<option value="{{tag|e}}">{{tag|e}}</option>
-{% endfor %}
-</select>
+hide tags:
+{{ macros.tagselection(submit_name='not_tag', selected_tags=filter_not, all_tags=tags) }}
{% extends 'base.html' %}
{% block css %}
-th { padding-right: 1em; }
+tr.toplevel th { padding-right: 1em; }
+tr.toplevel td, tr.toplevel th { padding-top: 1em; }
+tr.lowlevel td, tr.lowlevel th { padding-top: 0em; }
{% endblock %}
{% block content %}
<h3>edit task</h3>
-<form id="form_to_watch" action="task" method="POST">
+<form action="task" method="POST">
<input type="hidden" name="task_id" value="{{ task.id_ }}" />
-<input type="hidden" name="return_to" value="{{ return_to }}" />
<table>
-<tr>
+<tr class="toplevel">
+<th>add as todo</th>
+<td><input name="add_as_todo" type="checkbox" /> to {{ selected_date }}</td>
+<input name="selected_date" type="hidden" value="{{ selected_date }}" />
+</tr>
+
+<tr class="toplevel">
<th>title</th>
<td class="input">
<input name="title" type="text" value="{{ task.title.now|e }}" size=100 />
</td>
</tr>
-<tr>
+<tr class="toplevel">
<th>comment</th>
<td class="input">
-<textarea name="comment" cols=100>{{task.comment|e}}</textarea>
+<textarea name="comment" cols=100 rows=5>{{task.comment|e}}</textarea>
</td>
</tr>
-<tr>
+<tr class="toplevel">
<th>default effort</th>
<td class="input">
{% if task.subtasks %}
</td>
</tr>
-<tr>
+<tr class="toplevel">
<th>tags</th>
<td>
-{% for tag in tags | sort %}
-<input type="checkbox" name="tag_{{tag|e}}"{% if tag in task.tags.now %} checked{% endif %}/> {{ tag }}
-<br />
-{% endfor %}
-add: <input name="joined_tags" type="text" value="" size=100>
-<br />
+ <!--
+add: <input name="tag" value="" size=15 >
+ -->
+add: {{ macros.tagselection(submit_name='tag', selected_tags=task.tags.now, all_tags=tags) }}
<details>
<summary>history</summary>
<ul>
</td>
</tr>
-<tr>
+{% if task.parents %}
+<tr class="toplevel">
+<th>parents</th>
+<td>
+<ul>
+{% for parent in task.parents %}
+<li><a href="task?id={{parent.id_}}">{{parent.title.now}}</a>
+{% endfor %}
+</ul>
+</td>
+</tr>
+{% endif %}
+
+<tr class="toplevel">
<th>children</th>
<td>
+{% if task.subtasks %}
<table>
-
{% for subtask in task.subtasks %}
-<tr>
+<tr class="lowlevel">
<td>
<input name="subtask" type="checkbox" value="{{subtask.id_}}" checked/>
</td>
</td>
</tr>
{% endfor %}
-
-<tr>
-<th colspan=2>---</th>
-</tr>
-
-{% for subtask in filtered_tasks %}
-<tr>
-<td>
-<input name="subtask" type="checkbox" value="{{subtask.id_}}"/>
-</td>
-<td>
-<a href="task?id={{subtask.id_}}">{{subtask.title.now}}</a>
-</td>
-</tr>
-{% endfor %}
-
</table>
+{% endif %}
+<br />
+add: <input name="subtask" list="tasks" />
</td>
</tr>
+<datalist id="tasks">
+{% for subtask in filtered_tasks %}
+<option value="{{subtask.id_}}">{{subtask.title.now}}</option>
+{% endfor %}
+</datalist>
</table>
-<input class="update" type="submit" name="update" value="update" />
-<hr />
-{% include 'tagfilters.html' %}
-<br />
-search: <input name="search" value="{{search|e}}" />
-<input type="submit" name="filter" value="filter" />
+<input id="update_button" class="update" type="submit" name="update" value="update" />
+<div class="delete">
+<input class="delete" type="submit" name="delete" value="delete" />
+</div>
</form>
-
-{% include 'watch_form.html' %}
-<script>
-mere_filter_inputs = mere_filter_inputs.concat(['search']);
-</script>
{% endblock %}
<td class="number">{{ t.default_effort.now }}</a></td>
<td>
{% if uuid == expand_uuid %}
-<a href="{{db.prefix}}/tasks">[-]</a>
+<a href="tasks">[-]</a>
{% elif t.subtasks|count > 0 %}
-<a href="{{db.prefix}}/tasks?expand_uuid={{uuid}}">[+]</a>
+<a href="tasks?expand_uuid={{uuid}}">[+]</a>
{% endif %}
-<a href="{{db.prefix}}/task?id={{ uuid }}" />{{ t.title.now|e }}</a></td>
-<td>{% for tag in t.tags.now | sort %}<a href="{{db.prefix}}/tasks?t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
+<a href="task?id={{ uuid }}" />{{ t.title.now|e }}</a></td>
+<td>{% for tag in t.tags.now | sort %}<a href="tasks?and_tag={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
</tr>
{% if uuid == expand_uuid %}
{% for uuid, t in expanded_tasks.items() %}
<tr class="expanded">
<td class="number">{{ t.default_effort }}</a></td>
-<td> [+] <a href="{{db.prefix}}/task?id={{ uuid }}" />{{ t.title.now|e }}</a></td>
-<td>{% for tag in t.tags.now | sort %}<a href="{{db.prefix}}/tasks?t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
+<td> [+] <a href="task?id={{ uuid }}" />{{ t.title.now|e }}</a></td>
+<td>{% for tag in t.tags.now | sort %}<a href="tasks?and_tag={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
</tr>
{% endfor %}
{% endif %}
{% extends 'base.html' %}
{% block css %}
-th.toplevel { padding-right: 1em; }
-input[type="submit"].delete { background-color: #ff7777; }
-div.delete { float: right; }
+tr.toplevel th { padding-right: 1em; }
td.center { text-align: center; }
+tr.toplevel td, tr.toplevel th { padding-top: 1em; }
+tr.lowlevel td, tr.lowlevel th { padding-top: 0em; }
{% endblock %}
{% block content %}
<h3>edit todo</h3>
-<form id="form_to_watch" action="todo" method="POST">
+<form action="todo" method="POST">
<input type="hidden" name="todo_id" value="{{todo.id_}}" />
-<input type="hidden" name="return_to" value="{{return_to}}" />
+<input type="hidden" name="importance" step=0.1 size=8 value="{{ todo.importance }}" />
<table>
-<tr>
-<th class="toplevel">task</th>
-<td><a href="task?id={{ todo.task.id_ }}">{{ todo.task.title.then|e }}</a></td>
-</tr>
-
-<tr>
-<th class="toplevel">default effort</th>
-<td>{{ todo.default_effort }}</td>
+<tr class="toplevel">
+<th>task</th>
+<td colspan=2>
+<a href="task?id={{ todo.task.id_ }}">{{ todo.task.title.then|e }}</a>
+{% if todo.task.comment %}
+<pre>{{ todo.task.comment|e }}</pre>
+{% else %}
+<br />
+{% endif %}
+</td>
</tr>
-<tr>
-<th class="toplevel">efforts</th>
+<tr class="toplevel">
+<th>work</th>
+<td>
+{% if todo.children %}
+[{% if todo.done %}✓{% else %} {% endif %}]
+{% else %}
+<input type="checkbox" name="done" {% if todo.done %}checked{% endif %}/>
+{% endif %}
+done<br />
+(sum: {{todo.all_days_effort}})
+</td>
<td>
<table>
-<tr><th>date</th><th>effort</th><th>delete</th></tr>
+<tr class="lowlevel">
+<th>date</th>
+<th>effort</th>
+<th>delete</th>
+</tr>
{% for date, effort in todo.efforts.items() %}
-<tr>
+<tr class="lowlevel">
<td>
-<input name="effort_date" size=10 value="{{date}}" {% if todo.children and effort %}disabled{% endif %}>
+<input name="effort_date" type="hidden" value="{{date}}">{{date}}
</td>
<td>
<input type="number" name="effort" step=0.1 size=8 value="{{effort}}" placeholder="{{todo.default_effort}}" {% if todo.children and effort %}disabled{% endif %} />
</td>
</tr>
{% endfor %}
-<tr>
+<tr class="lowlevel">
<td>
<input name="effort_date" size=10 value="">
</td>
</td>
</tr>
-<tr>
-<th class="toplevel">total effort</th>
-<td>{{todo.all_days_effort}}</td>
-</tr>
-
-<tr>
-<th class="toplevel">importance</th>
-<td class="input">
-<input type="number" name="importance" step=0.1 size=8 value="{{ todo.importance }}" />
-</td>
-</tr>
-
-<tr>
-<th class="toplevel">comment</th>
-<td class="input">
-<textarea name="comment" rows=3 cols=100>{{todo.comment|e}}</textarea>
+<tr class="toplevel">
+<th>comment</th>
+<td class="input" colspan=2>
+<input name="comment" size=100 value="{{todo.comment|e}}" />
</td>
</tr>
-<tr>
-<th>done</th>
-<td class="input">
-{% if todo.children %}✓{% else %}<input type="checkbox" name="done" {% if todo.done %}checked{% endif %}/>{% endif %}
-</td>
-</tr>
-
-<tr>
-<th class="toplevel">day tags</th>
-<td>
-{% for tag in tags | sort %}
-{% if tag in todo.task.tags.now %}
- ✓
-{% else %}
-<input type="checkbox" name="day_tag_{{tag|e}}"{% if tag in todo.day_tags %} checked{% endif %}/>
-{% endif %} {{ tag }}
+<tr class="toplevel">
+<th>tags</th>
+<td colspan=2>
+new: <input name="tag" value="" size=15 >
+{% for tag in todo.task.tags.now | sort %}<select disabled><option>{{ tag }}</option></select>{% endfor %}
+{{ macros.tagselection(submit_name='tag', selected_tags=todo.day_tags, all_tags=tags) }}
<br />
-{% endfor %}
-add: <input name="joined_day_tags" value="" size=100 >
</td>
</tr>
-<tr>
-<th class="toplevel">parents</th>
-<td>
+{% if todo.parents %}
+<tr class="toplevel">
+<th>parents</th>
+<td colspan=2>
<ul>
{% for parent in todo.parents %}
<li><a href="todo?id={{parent.id_}}">{{parent.title}}</a>
</ul>
</td>
</tr>
+{% endif %}
-<tr>
-<th class="toplevel">children</th>
-<td>
-<table class="alternating">
-<tr>
-<th>adopt</th><th>effort</th><th>title</th><th>comments</th>
+<tr class="toplevel">
+<th>children</th>
+<td colspan=2>
+{% if todo.children %}
+<table>
+<tr class="lowlevel">
+<th>adopted</th><th>effort</th><th>title</th><th>comments</th>
</tr>
{% for todo in child_todos %}
-<tr>
+<tr class="lowlevel">
<td class="center"><input name="adopt_child" type="checkbox" value="{{todo.id_}}" checked/></td>
<td class="number">{{ '{:2.1f}'.format(todo.all_days_effort) }} {% if todo.done %}✓{% else %} {% endif %}</td>
<td><a href="todo?id={{todo.id_}}">{{todo.day.date}} {{todo.title}}</a></td>
-</tr>
-{% endfor %}
-<tr>
-<th colspan=4>--------</th>
-</tr>
-{% for todo in filtered_todos %}
-<tr>
-<td class="center"><input name="adopt_child" type="checkbox" value="{{todo.id_}}" /></td>
-<td class="number">{{ '{:2.1f}'.format(todo.all_days_effort) }} {% if todo.done %}✓{% else %} {% endif %}</td>
-<td><a href="todo?id={{todo.id_}}">{{todo.day.date}} {{todo.title}}</a></td>
+<td>{{todo.comment}}</td>
</tr>
{% endfor %}
</table>
+{% endif %}
+<br />
+make from task:<br />
+<input name="birth_child" list="tasks" size=100><br />
+adopt (from <input name="start" {% if start_date %}value="{{ start_date }}"{% endif %} placeholder="yesterday" /> to <input name="end" {% if end_date %}value="{{ end_date }}"{% endif %} placeholder="2030-12-31" />):<br />
+<input name="adopt_child" list="todos" size=100>
+<datalist id="todos">
+{% for todo in filtered_todos %}<option value="{{todo.id_}}">{{ '{:2.1f}'.format(todo.all_days_effort) }} {% if todo.done %}✓{% else %} {% endif %} {{todo.day.date}} {{todo.title}}</option>
+{% endfor %}
+</datalist>
+<datalist id="tasks">
+{% for task in filtered_tasks %}<option value="{{task.id_}}">{{task.title.now}}</option>
+{% endfor %}
+</datalist>
</td>
</tr>
</table>
-<input class="update" name="update" type="submit" value="update" />
+<input id="update_button" class="update" name="update" type="submit" value="update" />
<div class="delete">
<input class="delete" type="submit" name="delete" value="delete" />
</div>
-
-<hr />
-{% include 'tagfilters.html' %}
-<br />
-from: <input name="start" {% if start_date %}value="{{ start_date }}"{% endif %} placeholder="yesterday" />
-to: <input name="end" {% if end_date %}value="{{ end_date }}"{% endif %} placeholder="2030-12-31" />
-search: <input name="search" value="{{search|e}}" />
-<input type="submit" name="filter" value="filter" />
-
</form>
-{% include 'watch_form.html' %}
-<script>
-mere_filter_inputs = mere_filter_inputs.concat(['search', 'start', 'end']);
-</script>
{% endblock %}
<script>
-var mere_filter_inputs = ['t_and', 't_not', 'filter'];
+var mere_filter_inputs = ['and_tag', 'not_tag', 'filter'];
+var update_button_names = ['update'];
var sending_commits = false;
var changes_to_commit = false;
var form_to_watch = document.getElementById('form_to_watch');
});
};
};
+form_to_watch.addEventListener('keydown', function(event) {
+ let el = document.activeElement;
+ if ('Enter' === event.key
+ && ['INPUT', 'SELECT'].includes(el.tagName)
+ && (el.tagName !== 'INPUT' || el.type !== 'submit')) {
+ event.preventDefault();
+ if (mere_filter_inputs.includes(el.name)) {
+ document.getElementById('filter_button').click();
+ } else {
+ document.getElementById('update_button').click();
+ };
+ };
+});
form_to_watch.addEventListener('submit', function(event) {
- if ('update' == event.submitter.name) {
+ if (update_button_names.includes(event.submitter.name)) {
sending_commits = true;
};
});
projects / misc / commitdiff