home · contact · privacy
Improve accounting scripts.
[misc] / todo.py
diff --git a/todo.py b/todo.py
index 6cade91bf560fb45b42225631aa5cd9e5a089fee..6c84ee0dbe8e5d7b05fe00d625ef3342b972d97a 100644 (file)
--- a/todo.py
+++ b/todo.py
@@ -3,551 +3,823 @@ import json
 from uuid import uuid4
 from datetime import datetime, timedelta
 from urllib.parse import parse_qs
-from jinja2 import Template
+from jinja2 import Environment as JinjaEnv, FileSystemLoader as JinjaFSLoader 
 from urllib.parse import urlparse
+from os.path import split as path_split
 db_path = '/home/plom/org/todo_new.json'
-# db_path = '/home/plom/public_repos/misc/todo_new.json'
 server_port = 8082
 DATE_FORMAT = '%Y-%m-%d'
+j2env = JinjaEnv(loader=JinjaFSLoader('todo_templates'))
 
-html_head = """
-<style>
-body { font-family: monospace; }
-table.alternating tr:nth-child(even) {
-    background-color: #f2f2f2;
-}
-table.alternating tr:nth-child(odd) {
-    background-color: #ffffff;
-}
-th, td { text-align: left; vertical_align: top; border-bottom: 1px dotted black; }
-td details { display: inline }
-td.input { width: 100%; }
-td.number { text-align: right; }
-td.checkbox { width: 0.1em; height: 0.1em; padding: 0em; text-align: center; }
-tr.week_row td { height: 0.1em; border: 0px; background-color: black; }
-tr.day_row td { background-color: #f2f2f2 }
-input { font-family: monospace; padding: 0em; margin: 0em; }
-input[type="number"] { font-family: monospace; text-align: right; }
-input[type="text"] { width: 100%; box-sizing: border-box; }
-</style>
-<body>
-tasks: <a href="{{db.prefix}}/tasks">list</a> <a href="{{db.prefix}}/add_task">add</a> | day:
-<a href="{{db.prefix}}/day?hide_unchosen=0&hide_done=0">choose tasks</a>
-<a href="{{db.prefix}}/day?hide_unchosen=1&hide_done=1">do tasks</a>
-| <a href="{{db.prefix}}/calendar">calendar</a>
-| <a href="{{db.prefix}}/unset_cookie">unset cookie</a>
-<hr />
-"""
-form_footer = '\n</form>'
-form_header_tmpl = """
-<form action="{{action|e}}" method="POST">
-"""
-calendar_tmpl = """
-<p>
-from: <input name="start" {% if start_date %}value="{{ start_date }}"{% endif %} placeholder="{{ today }}" />
-to: <input name="end" {% if end_date %}value="{{ end_date }}"{% endif %} placeholder="2030-12-31" />
-<input type="submit" value="OK" />
-</p>
-<table>
-{% for date, day in days.items() | sort() %}
-{% if day.weekday == "Mo" %}<tr class="week_row"><td colspan=3></td></tr>{% endif %}
-<tr class="day_row"><td colspan=3><a href="{{db.prefix}}/day?selected_date={{date}}&hide_unchosen=1">{{ day.weekday }} {{ date }}</a> |{{ '%04.1f' % day.todos_sum|round(2) }}| {{ day.comment|e }}</td></tr>
-{% for task, todo in day.todos.items() | sort(attribute='1.title', reverse=True)  %}
-{% if todo.visible %}
-<tr><td class="checkbox">{% if todo.done %}✓{% else %}&nbsp;&nbsp;{% endif %}</td><td><a href="{{db.prefix}}/todo?task={{ todo.task.id_ }}&date={{ date }}">{%if "cancelled" in todo.tags%}<s>{% endif %}{% if "deadline" in todo.tags %}DEADLINE: {% endif %}{{ todo.title|e }}{%if "cancelled" in todo.tags%}</s>{% endif %}</a></td><td>{{ todo.comment|e }}</td></tr>
-{% endif %}
-{% endfor %}
-{% endfor %}
-</table>
-"""
-todo_tmpl = """
-<h3>todo</h3>
-<input type="hidden" name="task_uuid" value="{{ todo.task.id_ }}" />
-<input type="hidden" name="date" value="{{ todo.day.date }}" />
-<table>
-<tr><th>task</th><td><a href="{{db.prefix}}/task?id={{ todo.task.id_ }}">{{ todo.task.title|e }}</a></td></tr>
-<tr><th>default weight</th><td>{{ todo.default_weight }}</td></tr>
-<tr><th>day</th><td>{{ todo.day.date }}</td></tr>
-<tr><th>day weight</th><td class="input"><input type="number" name="day_weight" step=0.1 size=8 value="{{ todo.day_weight }}" /></td></tr>
-<tr><th>comment</th><td class="input"><input type="text" name="comment" value="{{todo.comment|e}}" /></td></tr>
-<tr><th>done</th><td class="input"><input type="checkbox" name="done" {% if todo.done %}checked{% endif %}/></td></tr>
-<tr><th>day tags</th>
-<td>
-{% for tag in db.t_tags | sort %}
-{% if tag in todo.task.tags %}&nbsp;✓{% else %}<input type="checkbox" name="day_tag_{{tag|e}}"{% if tag in todo.day_tags %} checked{% endif %}/>{% endif %} {{ tag }}<br />
-{% endfor %}
-add: <input name="day_tags_joined" type="text" value="" >
-</td>
-</tr>
-</table>
-<input type="submit" value="update" />
-"""
-task_tmpl = """
-<h3>task</h3>
-<input type="hidden" name="id" value="{{ task.id_ }}" />
-<table>
-<tr><th>title</th><td class="input"><input name="title" type="text" value="{{ task.title|e }}" /><details><summary>history</summary><ul>{% for k,v in task.title_history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details></td></tr>
-<tr><th>default weight</th><td class="input"><input type="number" name="default_weight" value="{{ task.default_weight }}" step=0.1 size=8 required /><details><summary>history</summary><ul>{% for k,v in task.default_weight_history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details></td></tr>
-<tr><th>tags</th>
-<td>
-{% for tag in db.t_tags | sort %}
-<input type="checkbox" name="tag_{{tag|e}}"{% if tag in task.tags %} checked{% endif %}/> {{ tag }}<br />
-{% endfor %}
-add: <input name="tags_joined" type="text" value="" ><br />
-<details><summary>history</summary><ul>{% for k,v in task.tags_history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details>
-</td></tr>
-</table>
-<input type="submit" value="update" />
-"""
-day_tmpl = """
-<p>
-<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 |
-<a href="{{db.prefix}}/day?selected_date={{prev_date}}">prev</a> <a href="{{db.prefix}}/day?selected_date={{next_date}}">next</a> |
-<input type="hidden" name="original_selected_date" value="{{ db.selected_date }}" />
-date: <input name="new_selected_date" value="{{ db.selected_date }}" size=10 /> |
-{{ db.selected_day.todos_sum|round(2) }} ({{ db.selected_day.todos_sum2|round(2)}}) |
-comment: <input name="day_comment" value="{{ db.selected_day.comment|e }}">
-</p>
-
-<table class="alternating">
-<tr><th>task</th><th class="checkbox">choose?</th><th class="checkbox">done?</th><th>weight</th><th>edit?</th><th>day tags</th><th>comment</th></tr>
-{% for uuid, t in db.tasks.items() | sort(attribute='1.title') %}
-{% if t.visible and (uuid not in db.selected_day.todos.keys() or db.selected_day.todos[uuid].visible) %}
-<tr>
-<input name="t_uuid" value="{{ uuid }}" type="hidden" >
-<td><details><summary>] <a href="{{db.prefix}}/task?id={{ uuid }}" />{{ t.current_title|e }}</a></summary>tags: {% for tag in t.tags | sort %}<a href="{{db.prefix}}/day?t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</details></td>
-{% if uuid in db.selected_day.todos.keys() %}
-<td class="checkbox"><input name="choose" type="checkbox" value="{{ uuid }}" checked></td>
-<td class="checkbox"><input name="done" type="checkbox" value="{{ uuid }}" {% if db.selected_day.todos[uuid].done %}checked{% endif %}></td>
-<td class="checkbox"><input name="day_weight" type="number" step=0.1 size=8 value="{% if db.selected_day.todos[uuid].day_weight is not none %}{{ db.selected_day.todos[uuid].day_weight }}{% endif %}" placeholder={{ t.current_default_weight }} ></td>
-<td><a href="{{db.prefix}}/todo?task={{uuid}}&date={{ db.selected_date }}">edit</a></td>
-<td>{% for tag in db.selected_day.todos[uuid].day_tags | sort %}<a href="{{db.prefix}}/tags?t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
-<td>{{ db.selected_day.todos[uuid].comment|e }}</td>
-{% else %}
-<td class="checkbox"><input name="choose" type="checkbox" value="{{ uuid }}"</td>
-<td class="checkbox"><input name="done" type="checkbox" value="{{ uuid }}"></td>
-<td class="checkbox"><input name="day_weight" type="number" step=0.1 size=8 placeholder={{ t.current_default_weight }} ></td>
-<td></td>
-<td></td>
-<td></td>
-{% endif %}
-</tr>
-{% endif %}
-{% endfor %}
-</table>
-<input type="submit" value="OK">
-"""
-tag_filters_tmpl = """
-<p style="float: left; margin-right: 1em;">
-<input type="submit" value="OK">
-</p>
-<p>
-mandatory tags:
-{% for and_filter in db.t_filter_and %}
-<select name="t_and">
-<option></option>
-{% for tag in db.t_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 db.t_tags | sort %}
-<option value="{{tag|e}}">{{tag|e}}</option>
-{% endfor %}
-</select>
-<br />
-forbidden tags:
-{% for not_filter in db.t_filter_not %}
-<select name="t_not">
-<option></option>
-{% for tag in db.t_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 db.t_tags | sort %}
-<option value="{{tag|e}}">{{tag|e}}</option>
-{% endfor %}
-</select>
-</p>
-"""
-tasks_tmpl = """
-<table class="alternating">
-<tr><th>default<br />weight</th><th>task</th><th>tags</th></tr>
-{% for uuid, t in db.tasks.items() | sort(attribute='1.title') %}
-{% if t.visible %}
-<tr>
-<td class="number">{{ t.default_weight }}</a></td>
-<td><a href="{{db.prefix}}/task?id={{ uuid }}" />{{ t.title|e }}</a></td>
-<td>{% for tag in t.tags | sort %}<a href="{{db.prefix}}/tags?t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
-{% endif %}
-{% endfor %}
-</table>
-"""
 
-class Task:
 
-    def __init__(self, db, title_history=None, tags_history=None, default_weight_history=None):
-        self.db = db
-        self.title_history = title_history if title_history else {}
-        self.tags_history = tags_history if tags_history else {}
-        self.default_weight_history = default_weight_history if default_weight_history else {}
-        self.visible = True
+def today_date(with_time=False):
+    length = 19 if with_time else 10
+    return str(datetime.now())[:length]
 
-    def _set_with_history(self, history, value):
-        keys = sorted(history.keys())
-        if len(history) == 0 or value != history[keys[-1]]:
-            history[str(datetime.now())[:19]] = value
 
-    def _last_of_history(self, history, default):
-        keys = sorted(history.keys())
-        return default if 0 == len(history) else history[keys[-1]]
 
-    @classmethod
-    def from_dict(cls, db, d):
-        return cls(
-                db,
-                d['title_history'],
-                {k: set(v) for k, v in d['tags_history'].items()},
-                d['default_weight_history'])
+class AttributeWithHistory:
 
-    @property
-    def default_weight(self):
-        return self._last_of_history(self.default_weight_history, 1)
+    def __init__(self, default_if_empty, history=None, then_date='2000-01-01', set_check=None, alt_get=None):
+        self.default = default_if_empty
+        self.then_date = then_date
+        self.history = history if history else {}
+        self.set_check = set_check
+        self.alt_get = alt_get 
 
-    @default_weight.setter
-    def default_weight(self, default_weight):
-        self._set_with_history(self.default_weight_history, default_weight)
+    def set(self, value):
+        if self.set_check:
+            self.set_check(value)
+        keys = sorted(self.history.keys())
+        if len(self.history) == 0 or value != self.history[keys[-1]]:
+            self.history[today_date(with_time=True)] = value
 
-    def default_weight_at(self, queried_date):
-        ret = self.default_weight_history[sorted(self.default_weight_history.keys())[0]]
-        for date_key, default_weight in self.default_weight_history.items():
+    def at(self, queried_date):
+        if self.alt_get:
+            ret = self.alt_get('at', queried_date)
+            if ret is not None:
+                return ret
+        if 0 == len(self.history):
+            return self.default
+        ret = self.history[sorted(self.history.keys())[0]]
+        for date_key, item in self.history.items():
             if date_key > f'{queried_date} 23:59:59':
                 break
-            ret = default_weight
+            ret = item
         return ret
 
     @property
-    def current_default_weight(self):
-        return self.default_weight_at(self.db.selected_date)
+    def now(self):
+        if self.alt_get:
+            ret = self.alt_get('now')
+            if ret is not None:
+                return ret
+        keys = sorted(self.history.keys())
+        return self.default if 0 == len(self.history) else self.history[keys[-1]]
 
     @property
-    def title(self):
-        return self._last_of_history(self.title_history, '')
+    def then(self):
+        if self.alt_get:
+            ret = self.alt_get('then')
+            if ret is not None:
+                return ret
+        return self.at(self.then_date)
 
-    @title.setter
-    def title(self, title):
-        self._set_with_history(self.title_history, title)
 
-    def title_at(self, queried_date):
-        ret = self.title_history[sorted(self.title_history.keys())[0]]
-        for date_key, title in self.title_history.items():
-            if date_key > f'{queried_date} 23:59:59':
-                break
-            ret = title
-        return ret
-
-    @property
-    def current_title(self):
-        return self.title_at(self.db.selected_date)
 
-    @property
-    def tags(self):
-        return self._last_of_history(self.tags_history, set())
+class Task:
 
-    @tags.setter
-    def tags(self, tags):
-        self._set_with_history(self.tags_history, set(tags))
+    def __init__(self,
+            db,
+            id_,
+            title_history=None,
+            tags_history=None,
+            default_effort_history=None,
+            subtask_ids_history=None,
+            comment=''):
+        self.db = db
+        self.id_ = id_
+        self.title = AttributeWithHistory('', title_history, self.db.selected_date)
+        self.tags = AttributeWithHistory(set(), tags_history, self.db.selected_date)
+        self.default_effort = AttributeWithHistory(0.0, default_effort_history, self.db.selected_date, alt_get=self.subtasks_sum_maker())
+        self.subtask_ids = AttributeWithHistory(set(), subtask_ids_history, self.db.selected_date, set_check=self.subtask_loop_checker())
+        self.comment = comment
 
-    # @property
-    # def tags_joined(self):
-    #     return ';'.join(sorted(list(self.tags)))
+        self.visible = True
+        self.dependers = [] 
 
-    # @tags_joined.setter
-    # def tags_joined(self, tags_string):
-    #     tags = set()
-    #     for tag in [tag.strip() for tag in tags_string.split(';') if tag.strip() != '']:
-    #         tags.add(tag)
-    #     self.tags = tags
+    @classmethod
+    def from_dict(cls, db, d, id_):
+        t = cls(
+               db,
+               id_,
+               d['title_history'],
+               {k: set(v) for k, v in d['tags_history'].items()},
+               d['default_effort_history'],
+               {k: set(v) for k, v in d['subtasks_history'].items()},
+               d['comment'])
+        return t
 
     def to_dict(self):
         return {
-            'title_history': self.title_history,
-            'tags_history': {k: list(v) for k,v in self.tags_history.items()},
-            'default_weight_history': self.default_weight_history}
+            'title_history': self.title.history,
+            'default_effort_history': self.default_effort.history,
+            'tags_history': {k: list(v) for k, v in self.tags.history.items()},
+            'subtasks_history': {k: list(v) for k, v in self.subtask_ids.history.items()},
+            'comment': self.comment,
+        }
+
+    @property
+    def subtasks(self):
+        subtasks = []
+        for id_ in self.subtask_ids.now:
+            if len(id_) == 0:
+                continue
+            subtasks += [self.db.tasks[id_]]
+        return subtasks
 
     @property
-    def id_(self):
-        for k, v in self.db.tasks.items():
-            if v == self:
-                return k
+    def subtask_depth(self):
+        def count_depth(task):
+            sub_count = 1
+            for subtask in task.subtasks:
+                sub_count += count_depth(subtask)
+            return sub_count
+        return count_depth(self) 
+
+    def subtask_loop_checker(self):
+        def f(subtask_ids_now):
+            loop_msg = "can't set subtask, would create loop"
+            for id_ in subtask_ids_now:
+                if id_ == self.id_:
+                    raise PlomException(loop_msg)
+                elif id_ in self.db.tasks.keys():
+                    subtask = self.db.tasks[id_]
+                    f(subtask.subtask_ids.now)
+        return f 
+
+    def subtasks_sum_maker(self):
+        def f(f_name, queried_date=None):
+            subtask_ids_to_check = getattr(self.subtask_ids, f_name)
+            if queried_date:
+                subtasks = [self.db.tasks[id_] for id_ in subtask_ids_to_check(queried_date)]
+            else:
+                subtasks = [self.db.tasks[id_] for id_ in subtask_ids_to_check]
+            if len(self.subtasks) > 0:
+                summe = 0
+                for subtask in self.subtasks:
+                    if queried_date:
+                        to_add = getattr(subtask.default_effort, f_name)
+                        summe += to_add(queried_date)
+                    else:
+                        summe += getattr(subtask.default_effort, f_name)
+                return summe
+            return None
+        return f
+
+    def matches(self, search):
+        if search is None:
+            return False
+        else:
+            return search in self.title.now or search in self.comment or search in '$'.join(self.tags.now)
 
 
 class Day:
 
-    def __init__(self, db, todos=None, comment=''):
+    def __init__(self, db, date, comment=''):
+        self.date = date 
         self.db = db
-        self.todos = todos if todos else {}
         self.comment = comment
-        self.archived = True
+        self.linked_todos_as_list = []
 
     @classmethod
-    def from_dict(cls, db, d):
-        todos = {}
+    def from_dict(cls, db, d, date=None):
         comment = d['comment'] if 'comment' in d.keys() else ''
-        day = cls(db, todos, comment)
-        for uuid, todo_dict in d['todos'].items():
-            day.add_todo(uuid, todo_dict)
+        day = cls(db, date, comment)
         return day
 
     def to_dict(self):
-        d = {'comment': self.comment, 'todos': {}}
-        for task_uuid, todo in self.todos.items():
-            d['todos'][task_uuid] = todo.to_dict()
+        d = {'comment': self.comment}
         return d
 
-    def add_todo(self, id_, dict_source=None):
-        self.todos[id_] = Todo.from_dict(self, dict_source) if dict_source else Todo(self)
-        return self.todos[id_]
+    @property
+    def linked_todos(self):
+        linked_todos = {}
+        for todo in self.linked_todos_as_list:
+            linked_todos[todo.id_] = todo
+        return linked_todos
 
     def _todos_sum(self, include_undone=False):
         s = 0
-        for todo in [todo for todo in self.todos.values() if todo.done]:
-            s += todo.weight
-        if include_undone:
-            for todo in [todo for todo in self.todos.values() if not todo.done]:
-                s += todo.day_weight if todo.day_weight else 0
+        for todo in [todo for todo in self.linked_todos.values()
+                     if self.date in todo.efforts.keys()]:
+                     # and not todo.children]:
+            day_effort = todo.efforts[self.date]
+            if todo.done:
+                s += day_effort if day_effort else todo.task.default_effort.at(self.date)
+            elif include_undone:
+                s += day_effort if day_effort else 0 
         return s
 
     @property
     def todos_sum(self):
         return self._todos_sum()
 
-    @property
-    def todos_sum2(self):
-        return self._todos_sum(True)
-
-    @property
-    def date(self):
-        for k, v in self.db.days.items():
-            if v == self:
-                return k
 
 class Todo:
 
-    def __init__(self, day, done=False, day_weight=None, comment='', day_tags=None):
-        self.day = day
-        self.done = done
-        self.day_weight = day_weight
+    def __init__(self,
+                 db,
+                 id_,
+                 task,
+                 done=False,
+                 comment='',
+                 day_tags=None,
+                 importance=1.0,
+                 efforts=None,
+                 dep_ids=None):
+        self.id_ = id_
+        self.db = db 
+        self.task = task 
+        self._done = done
+        self.efforts = efforts if efforts else {}
         self.comment = comment
         self.day_tags = day_tags if day_tags else set()
+        self.importance = importance
+        self.dep_ids = dep_ids if dep_ids else [] 
+
+        self.dependers = [] 
 
     @classmethod
-    def from_dict(cls, day, d):
-        return cls(day, d['done'], d['day_weight'], d['comment'], set(d['day_tags']))
+    def from_dict(cls, db, d, id_):
+        todo = cls(
+                db,
+                id_,
+                db.tasks[d['task']],
+                d['done'],
+                d['comment'],
+                set(d['day_tags']),
+                d['importance'],
+                d['efforts'],
+                d['deps'])
+        return todo
 
     def to_dict(self):
-        return {'done': self.done, 'day_weight': self.day_weight, 'comment': self.comment, 'day_tags': list(self.day_tags)}
+        return {
+                'task': self.task.id_,
+                'done': self.done,
+                'comment': self.comment,
+                'day_tags': list(self.day_tags),
+                'importance': self.importance,
+                'efforts': self.efforts,
+                'deps': self.dep_ids}
 
     @property
-    def default_weight(self):
-        return self.task.default_weight_at(self.day.date)
+    def title(self):
+        return self.task.title.at(self.earliest_date)
 
     @property
-    def weight(self):
-        if self.day_weight:
-            return self.day_weight
-        else:
-            return self.day_weight if self.day_weight else self.default_weight
+    def dated_title(self):
+        return f'{self.earliest_date}:{self.title}'
 
     @property
-    def task(self):
-        for k, v in self.day.todos.items():
-            if v == self:
-                return self.day.db.tasks[k]
+    def deps(self):
+        return [self.db.todos[id_] for id_ in self.dep_ids]
+
+    @deps.setter
+    def deps(self, deps):
+        self.dep_ids = [dep.id_ for dep in deps]
 
     @property
-    def title(self):
-        return self.task.title_at(self.day.date)
+    def default_effort(self):
+        return self.task.default_effort.at(self.earliest_date)
+
+    @property
+    def done(self):
+        return self.deps_done and self._done
+
+    @done.setter
+    def done(self, doneness):
+        self._done = doneness
+
+    @property
+    def deps_done(self):
+        if len(self.deps) > 0:
+            for dep in self.deps:
+                if not dep.done:
+                    return False
+        return True
 
-    # @property
-    # def day_tags_joined(self):
-    #     return ';'.join(sorted(list(self.day_tags)))
+    @property
+    def dep_efforts(self):
+        dep_efforts = 0
+        if self.deps:
+            for dep in self.deps: 
+                dep_efforts += dep.all_days_effort
+                dep_efforts += dep.dep_efforts
+        return dep_efforts
+
+    def depender_path(self, dep):
+        if self.dependers:
+            return f'Y{depender.depender_path()}:{self.title}Y'
+        else:
+            return f'X{self.title}X'
+
+    @property
+    def depender_paths(self):
+        paths = []
+        for depender in self.dependers:
+            if len(depender.depender_paths) == 0:
+                 paths += [[depender]]
+            else:
+                for path in depender.depender_paths:
+                    paths += [path + [depender]] 
+        return paths
+
+    @property
+    def all_days_effort(self):
+        total = 0
+        for effort in self.efforts.values():
+            total += effort if effort else 0
+        if self.done:
+            total = max(total, self.task.default_effort.at(self.latest_date))
+        return total
+
+    def matches(self, search):
+        if search is None:
+            return False
+        else:
+            return search in self.comment or search in '$'.join(self.tags) or search in self.title
 
-    # @day_tags_joined.setter
-    # def day_tags_joined(self, tags_string):
-    #     tags = set()
-    #     for tag in [tag.strip() for tag in tags_string.split(';') if tag.strip() != '']:
-    #         tags.add(tag)
-    #     self.day_tags = tags
+    def is_effort_removable(self, date):
+        if not date in self.efforts.keys():
+            return False
+        if self.efforts[date]:
+            return False
+        if self.done and date == self.latest_date:
+            return False
+        return True
 
     @property
     def tags(self):
-        return self.day_tags | self.task.tags
+        return self.day_tags | self.task.tags.now
+
+    @property
+    def day_effort(self):
+        return self.efforts[self.db.selected_date]
+
+    @property
+    def day(self):
+        return self.db.days[self.earliest_date]
+
+    @property
+    def sorted_effort_dates(self):
+        dates = list(self.efforts.keys())
+        dates.sort()
+        return dates
+
+    @property
+    def earliest_date(self):
+        return self.sorted_effort_dates[0]
+
+    @property
+    def latest_date(self):
+        return self.sorted_effort_dates[-1]
 
 
 class TodoDB(PlomDB):
 
-    def __init__(self, prefix, selected_date=None, t_filter_and = None, t_filter_not = None, hide_unchosen=False, hide_done=False):
-        self.prefix = prefix
-        self.selected_date = selected_date if selected_date else str(datetime.now())[:10]
-        self.t_filter_and = t_filter_and if t_filter_and else []
-        self.t_filter_not = t_filter_not if t_filter_not else []
+    def __init__(self,
+            selected_date=None,
+            tag_filter_and = None,
+            tag_filter_not = None,
+            hide_unchosen=False,
+            hide_done=False):
+        self.selected_date = selected_date if selected_date else today_date()
+        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
+
         self.days = {}
         self.tasks = {}
         self.t_tags = set()
+        self.todos = {}
         super().__init__(db_path)
 
+    # savefile I/O
+
     def read_db_file(self, f):
         d = json.load(f)
-        for date, day_dict in d['days'].items():
-            self.days[date] = self.add_day(dict_source=day_dict)
-        for day in self.days.values():
-            for todo in day.todos.values():
-                for tag in todo.day_tags:
-                    self.t_tags.add(tag)
-        for uuid, t_dict in d['tasks'].items():
-            t = self.add_task(id_=uuid, dict_source=t_dict)
-            for tag in t.tags:
+
+        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)
-        self.set_visibilities()
+        for task in self.tasks.values():
+            for dep in task.subtasks:
+                dep.dependers += [task]
 
-    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]) == 0\
-                    and len([tag for tag in self.t_filter_not if tag in t.tags]) == 0\
-                    and ((not self.hide_unchosen) or uuid in self.selected_day.todos.keys())
-        for day in self.days.values():
-            for todo in day.todos.values():
-                todo.visible = len([tag for tag in self.t_filter_and if not tag in todo.day_tags | todo.task.tags ]) == 0\
-                    and len([tag for tag in self.t_filter_not if tag in todo.day_tags | todo.task.tags ]) == 0\
-                    and ((not self.hide_done) or (not todo.done))
+        for id_, todo_dict in d['todos'].items():
+            todo = self.add_todo(todo_dict, id_, link_into_day=False)
+            for tag in todo.day_tags:
+                self.t_tags.add(tag)
+        for todo in self.todos.values():
+            for dep in todo.deps:
+                dep.dependers += [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)
+                self.days[date].linked_todos_as_list += [todo]
+
+        self.set_visibilities()
 
     def to_dict(self):
-        d = {
-                't_filter_and': self.t_filter_and,
-                't_filter_not': self.t_filter_not,
-                'tasks': {},
-                'days': {}
-        }
+        d = {'tasks': {}, 'days': {}, 'todos': {}}
         for uuid, t in self.tasks.items():
              d['tasks'][uuid] = t.to_dict()
         for date, day in self.days.items():
             d['days'][date] = day.to_dict()
+        for id_, todo in self.todos.items():
+            d['todos'][id_] = todo.to_dict()
         return d
 
-    @property
-    def selected_day(self):
-        if not self.selected_date in self.days.keys():
-            self.days[self.selected_date] = self.add_day()
-        return self.days[self.selected_date]
-
-    def change_selected_days_date(self, new_date):
-        if new_date in self.days.keys():
-            raise PlomException('cannot use same date twice')
-        else:
-            self.days[new_date] = self.selected_day
-            del self.days[self.selected_date]
-            self.selected_date = new_date
-
     def write(self):
         dates_to_purge = []
         for date, day in self.days.items():
-            if len(day.todos) == 0 and len(day.comment) == 0:
+            if len(day.linked_todos) == 0 and len(day.comment) == 0:
                 dates_to_purge += [date]
         for date in dates_to_purge:
             del self.days[date]
         self.write_text_to_db(json.dumps(self.to_dict()))
 
-    def add_task(self, id_=None, dict_source=None, return_id=False):
-        t = Task.from_dict(self, dict_source) if dict_source else Task(self)
+    # properties 
+
+    @property
+    def selected_day(self):
+        if not self.selected_date in self.days.keys():
+            self.days[self.selected_date] = self.add_day(date=self.selected_date)
+        return self.days[self.selected_date]
+
+    # table manipulations 
+
+    def add_day(self, date, dict_source=None):
+        day = Day.from_dict(self, dict_source, date) if dict_source else Day(self, date)
+        self.days[date] = day 
+        return day
+
+    def add_task(self, id_=None, dict_source=None):
         id_ = id_ if id_ else str(uuid4())
+        t = Task.from_dict(self, dict_source, id_) if dict_source else Task(self, id_)
         self.tasks[id_] = t
-        if return_id:
-            return id_, t
-        else:
-            return t
+        return t
 
-    def add_day(self, dict_source=None):
-        return Day.from_dict(self, dict_source) if dict_source else Day(self)
+    def update_task(self, id_, title, default_effort, tags, subtask_ids, comment):
+        task = self.tasks[id_] if id_ in self.tasks.keys() else self.add_task(id_)
+        task.title.set(title)
+        task.default_effort.set(default_effort)
+        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, link_into_day=True, adopt_if_possible=True):
+        id_ = id_ if id_ else str(uuid4())
+        if todo_dict:
+            todo = Todo.from_dict(self, todo_dict, id_)
+        elif task and efforts:
+            todo = Todo(self, id_, task, efforts=efforts)
+            deps = []
+            for dep_task in task.subtasks:
+                # if Todo expects dependencies, adopt any compatibles found in DB.selected_date
+                # before creating new depended Todos
+                dep_todo = None
+                if adopt_if_possible and list(efforts.keys())[0] == self.selected_date:
+                    adoptable_todos = [t for t in self.selected_day.linked_todos_as_list
+                                       if t.task.id_ == dep_task.id_]
+                    if len(adoptable_todos) > 0:
+                        dep_todo = adoptable_todos[0]
+                if not dep_todo:
+                    dep_todo = self.add_todo(task=dep_task, efforts=efforts,
+                                               link_into_day=link_into_day,
+                                               adopt_if_possible=adopt_if_possible)
+                deps += [dep_todo]
+            todo.dep_ids = [dep.id_ for dep in deps]
+        self.todos[id_] = todo 
+        if link_into_day:
+            self.selected_day.linked_todos_as_list += [todo] 
+        return todo
 
-    def show_day(self):
-        current_date = datetime.strptime(self.selected_date, DATE_FORMAT)
-        prev_date = current_date - timedelta(days=1)
-        prev_date_str = prev_date.strftime(DATE_FORMAT)
-        next_date = current_date + timedelta(days=1)
-        next_date_str = next_date.strftime(DATE_FORMAT)
-        return Template(form_header_tmpl + tag_filters_tmpl + day_tmpl + form_footer).render(db=self, action=self.prefix+'/day', prev_date=prev_date_str, next_date=next_date_str)
+    def _update_todo_shared(self, id_, done, comment, importance):
+        todo = self.todos[id_]
+        todo.done = done
+        todo.comment = comment 
+        todo.importance = importance 
+        return todo
+
+    def update_todo_for_day(self, id_, date, effort, done, comment, importance):
+        todo = self._update_todo_shared(id_, done, comment, importance)
+        todo.efforts[date] = effort 
+
+    def update_todo(self, id_, efforts, done, comment, tags, importance, deps):
+        todo = self._update_todo_shared(id_, done, comment, importance)
+        if len(efforts) == 0 and not todo.deps:
+            raise PlomException('todo must have at least one effort!')
+        todo.deps = deps 
+        todo.efforts = 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:
+                self.days[date].linked_todos_as_list += [todo]
+        todo.day_tags = tags
+
+    def delete_todo(self, id_):
+        todo = self.todos[id_]
+        dates_to_delete = []
+        for date in todo.efforts.keys():
+            dates_to_delete += [date]
+        for date in dates_to_delete:
+            self.delete_effort(todo, date, force=True)
+        for depender in todo.dependers:
+            depender.dep_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!')
+        self.days[date].linked_todos_as_list.remove(todo)
+        del todo.efforts[date]
+
+    # 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 = {}
-        todays_date = str(datetime.now())[:10]
-        target_start_str = start_date_str if start_date_str else sorted(self.days.keys())[0]
-        target_start = todays_date if target_start_str == 'today' else target_start_str
-        target_end_str = end_date_str if end_date_str else sorted(self.days.keys())[-1]
-        target_end = todays_date if target_end_str == 'today' else target_end_str
-        start_date = datetime.strptime(target_start, DATE_FORMAT)
-        end_date = datetime.strptime(target_end, DATE_FORMAT)
-        for n in range(int((end_date - start_date).days) + 1):
-            current_date_obj = start_date + timedelta(n)
-            current_date = current_date_obj.strftime(DATE_FORMAT)
-            if current_date not in self.days.keys():
-                days_to_show[current_date] = self.add_day()
+        for n in range(int((end_date_obj - start_date_obj).days) + 1):
+            date_obj = start_date_obj + timedelta(n)
+            date_str = date_obj.strftime(DATE_FORMAT)
+            if date_str not in self.days.keys():
+                days_to_show[date_str] = self.add_day(date_str)
             else:
-                days_to_show[current_date] = self.days[current_date]
-            days_to_show[current_date].weekday = datetime.strptime(current_date, DATE_FORMAT).strftime('%A')[:2]
-        return Template(form_header_tmpl + calendar_tmpl + form_footer).render(db=self, days=days_to_show, action=self.prefix+'/calendar', today=str(datetime.now())[:10], start_date=start_date_str, end_date=end_date_str)
-
-    def show_todo(self, task_uuid, selected_date):
-        todo = self.days[selected_date].todos[task_uuid]
-        return Template(form_header_tmpl + todo_tmpl + form_footer).render(db=self, todo=todo, action=self.prefix+'/todo')
-
-    def update_todo_mini(self, task_uuid, date, day_weight, done):
-        if task_uuid in self.days[date].todos.keys():
-            todo = self.days[date].todos[task_uuid]
-        else:
-            todo = self.days[date].add_todo(task_uuid)
-        todo.day_weight = float(day_weight) if len(day_weight) > 0 else None
-        todo.done = done
-        return todo
-
-    def update_todo(self, task_uuid, date, day_weight, done, comment, day_tags_joined, day_tags_checked):
-        todo = self.update_todo_mini(task_uuid, date, day_weight, done)
-        todo.comment = comment
-        day_tags = set()
-        for tag in [tag.strip() for tag in day_tags_joined.split(';') if tag.strip() != '']:
-            day_tags.add(tag)
-        for tag in day_tags_checked:
-            day_tags.add(tag)
-        todo.day_tags = day_tags
+                days_to_show[date_str] = self.days[date_str]
+            days_to_show[date_str].month_title = date_obj.strftime('%B') if date_obj.day == 1 else None 
+            days_to_show[date_str].weekday = datetime.strptime(date_str, DATE_FORMAT).strftime('%A')[:2]
+
+        return j2env.get_template('calendar.html').render(
+                selected_date=self.selected_date,
+                days=days_to_show,
+                start_date=start_date_str,
+                end_date=end_date_str)
+
+    def show_do_todos(self, sort_order=None):
+        prev_date_str, next_date_str = self.neighbor_dates()
+        adoptable_past_todos = []
+        for todo in self.todos.values():
+            if todo.done\
+                    or (not todo.visible)\
+                    or todo.earliest_date >= self.selected_date:
+                continue
+            adoptable_past_todos += [todo] 
+        todos = [t for t in self.selected_day.linked_todos_as_list
+                 if t.visible]
+                 # and not t.deps]
+        if sort_order == 'title':
+            todos.sort(key=lambda t: t.task.title.then)
+        elif sort_order == 'done':
+            todos.sort(key=lambda t: t.day_effort if t.day_effort else t.default_effort if t.done else 0, reverse=True)
+        elif sort_order == 'default_effort':
+            todos.sort(key=lambda t: t.default_effort, reverse=True)
+        elif sort_order == 'importance':
+            todos.sort(key=lambda t: t.importance, reverse=True)
+        return j2env.get_template('do_todos.html').render(
+                day=self.selected_day,
+                tags=self.t_tags,
+                filter_and=self.tag_filter_and,
+                filter_not=self.tag_filter_not,
+                prev_date=prev_date_str,
+                adoptable_past_todos=adoptable_past_todos,
+                next_date=next_date_str,
+                all_tasks=[t for t in self.tasks.values()],
+                todos=todos,
+                sort=sort_order,
+                hide_done=self.hide_done)
+
+    def show_todo(self, id_, 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)
+            end_date = end_day.strftime(DATE_FORMAT)
+        legal_dates = []
+        for n in range(int((end_day - start_day).days) + 1):
+            day = start_day + timedelta(n)
+            legal_dates += [day.strftime(DATE_FORMAT)]
+        date_filtered_todos = [] 
+        for date in legal_dates:
+            for filtered_todo in filtered_todos:
+                if filtered_todo in date_filtered_todos:
+                    continue
+                if date in filtered_todo.efforts.keys():
+                    date_filtered_todos += [filtered_todo]
+
+        return j2env.get_template('todo.html').render(
+                tags=self.t_tags,
+                todo=todo,
+                filtered_todos=date_filtered_todos,
+                filtered_tasks=filtered_tasks,
+                dep_todos=todo.deps,
+                start_date=start_date,
+                end_date=end_date)
 
     def show_task(self, id_):
         task = self.tasks[id_] if id_ else self.add_task()
-        return Template(form_header_tmpl + task_tmpl + form_footer).render(db=self, task=task, action=self.prefix+'/task')
+        if not id_:
+            task.default_effort.set(1.0)
+        filtered_tasks = [t for t in self.tasks.values()
+                          if t != task
+                          and (t not in task.subtasks)]
+        return j2env.get_template('task.html').render(
+                selected_date=self.selected_date,
+                tags=self.t_tags, 
+                filtered_tasks=filtered_tasks,
+                task=task)
+
+    def show_tasks(self, search, sort_order=None):
+        filtered_tasks = [] 
+        for task in [t for t in self.tasks.values() if (not search) or t.matches(search)]:
+            filtered_tasks += [task]
+        if sort_order == 'title':
+            filtered_tasks.sort(key=lambda t: t.title.now)
+        elif sort_order == 'default_effort':
+            filtered_tasks.sort(key=lambda t: t.default_effort.now, reverse=True)
+        elif sort_order == 'depth':
+            filtered_tasks.sort(key=lambda t: t.subtask_depth, reverse=True)
+        return j2env.get_template('tasks.html').render(
+                sort=sort_order,
+                tasks=filtered_tasks,
+                tags=self.t_tags,
+                filter_and=self.tag_filter_and,
+                filter_not=self.tag_filter_not,
+                search=search)
+
+    # def show_pick_tasks(self, search, hide_chosen_tasks, sort_order=None):
+    #     prev_date_str, next_date_str = self.neighbor_dates()
+
+    #     chosen_todos = self.selected_day.linked_todos_as_list
+
+    #     relevant_todos = []
+    #     for todo in self.todos.values():
+    #         if todo.done\
+    #                 or (not todo.visible)\
+    #                 or (not todo.matches(search))\
+    #                 or todo.earliest_date >= self.selected_date:
+    #             continue
+    #         relevant_todos += [todo] 
+
+    #     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
+    #         filtered_tasks += [task]
+
+    #     if sort_order == 'title':
+    #         chosen_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)
+    #         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.tag_filter_and,
+    #             filter_not=self.tag_filter_not,
+    #             day=self.selected_day,
+    #             prev_date=prev_date_str,
+    #             next_date=next_date_str,
+    #             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)
+
+    # helpers
 
-    def update_task(self, id_, title, default_weight, tags_joined, tags_checked):
-        task = self.tasks[id_] if id_ in self.tasks.keys() else self.add_task(id_)
-        task.title = title
-        task.default_weight = float(default_weight) if len(default_weight) > 0 else None
-        tags = set()
-        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)
-        task.tags = tags
+    def set_visibilities(self):
+        for uuid, t in self.tasks.items():
+            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.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):
+        todays_date_obj = datetime.strptime(today_date(), DATE_FORMAT) 
+        yesterdays_date_obj = todays_date_obj - timedelta(1)
+        def get_day_limit_obj(index, day_limit_string):
+            date_obj = datetime.strptime(sorted(self.days.keys())[index], DATE_FORMAT)
+            if day_limit_string and len(day_limit_string) > 0:
+                if day_limit_string in {'today', 'yesterday'}:
+                    date_obj = todays_date_obj if day_limit_string == 'today' else yesterdays_date_obj
+                else:
+                    date_obj = datetime.strptime(day_limit_string, DATE_FORMAT)
+            return date_obj
+        start_date_obj = get_day_limit_obj(0, start_date_str)
+        end_date_obj = get_day_limit_obj(-1, end_date_str)
+        return start_date_obj, end_date_obj
+
+    def neighbor_dates(self):
+        current_date = datetime.strptime(self.selected_date, DATE_FORMAT)
+        prev_date = current_date - timedelta(days=1)
+        prev_date_str = prev_date.strftime(DATE_FORMAT)
+        next_date = current_date + timedelta(days=1)
+        next_date_str = next_date.strftime(DATE_FORMAT)
+        return prev_date_str, next_date_str
+
+
+
+class ParamsParser:
+
+    def __init__(self, parsed_url_query, cookie_db):
+        self.params = parse_qs(parsed_url_query)
+        self.cookie_db = cookie_db
+
+    def get(self, key, default=None):
+        boolean = bool == type(default) 
+        param = self.params.get(key, [default])[0]
+        if boolean:
+            param = param != '0' 
+        return param 
+
+    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 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[cookie_key] = param
+        return param
+
+    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 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[cookie_key] = params
+        return params
+
+
+class PostvarsParser:
+
+    def __init__(self, postvars):
+        self.postvars = postvars
+
+    def has(self, key):
+        return key in self.postvars.keys()
+
+    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, float_if_possible=False):
+        if self.has(key) and len(self.postvars[key][i]) > 0:
+            val = self.postvars[key][i] 
+        else:
+            val = on_empty 
+        if float_if_possible and val is not None:
+            return float(val)
+        else:
+            return val 
 
-    def show_tasks(self):
-        return Template(form_header_tmpl + tag_filters_tmpl + tasks_tmpl + form_footer).render(db=self, action=self.prefix+'/tasks')
+    def get_all(self, key, on_empty=None):
+        if self.has(key) and len(self.postvars[key]) > 0:
+            return [v for v in self.postvars[key] if len(v) > 0]
+        return on_empty
 
+    def set(self, key, value):
+        self.postvars[key] = [value]
 
 
 class TodoHandler(PlomHandler):
@@ -555,7 +827,6 @@ class TodoHandler(PlomHandler):
     def config_init(self):
         return {
             'cookie_name': 'todo_cookie',
-            'prefix': '',
             'cookie_path': '/'
         }
 
@@ -563,184 +834,242 @@ class TodoHandler(PlomHandler):
         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.config_init)
         self.try_do(self.write_db)
 
     def write_db(self):
         from urllib.parse import urlencode
-        app_config = self.apps['todo'] if hasattr(self, 'apps') else self.config()
-        length = int(self.headers['content-length'])
-        postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1)
+        config = self.apps['todo'] if hasattr(self, 'apps') else self.config_init()
         parsed_url = urlparse(self.path)
-        db = TodoDB(prefix=app_config['prefix'])
-
-        if parsed_url.path == app_config['prefix'] + '/calendar':
-            start = postvars['start'][0] if len(postvars['start'][0]) > 0 else '-'
-            end = postvars['end'][0] if len(postvars['end'][0]) > 0 else '-'
-            homepage = f'{app_config["prefix"]}/calendar?start={start}&end={end}'
-
-        elif parsed_url.path == app_config['prefix'] + '/todo':
-            task_uuid = postvars['task_uuid'][0]
-            date = postvars['date'][0]
-            tags_checked = []
-            prefix = 'day_tag_'
-            for k in postvars.keys():
-                if k.startswith(prefix):
-                    tags_checked += [k[len(prefix):]]
-            db.update_todo(task_uuid, date, postvars['day_weight'][0], 'done' in postvars.keys(), postvars['comment'][0], postvars['day_tags_joined'][0], tags_checked)
-            homepage = f'{app_config["prefix"]}/todo?task={task_uuid}&date={date}'
-
-        elif parsed_url.path == app_config['prefix'] + '/task':
-            id_ = postvars['id'][0]
-            tags_checked = []
-            prefix = 'tag_'
-            for k in postvars.keys():
-                if k.startswith(prefix):
-                    tags_checked += [k[len(prefix):]]
-            db.update_task(id_, postvars['title'][0], postvars['default_weight'][0], postvars['tags_joined'][0], tags_checked)
-            homepage = f'{app_config["prefix"]}/task?id={id_}'
-
-        elif parsed_url.path in {app_config['prefix'] + '/tasks', app_config['prefix'] + '/day'}:
-            data = []
-            for target in postvars['t_and']:
-                if len(target) > 0 and not target in db.t_filter_and:
-                    db.t_filter_and += [target]
-            if len(db.t_filter_and) == 0:
-                data += [('t_and', '-')]
-            for target in postvars['t_not']:
-                if len(target) > 0 and not target in db.t_filter_not:
-                    db.t_filter_not += [target]
-            if len(db.t_filter_not) == 0:
-                data += [('t_not', '-')]
-            data += [('t_and', f) for f in db.t_filter_and] + [('t_not', f) for f in db.t_filter_not]
-            if parsed_url.path == app_config['prefix'] + '/tasks':
-                encoded_params = urlencode(data)
-                homepage = f'{app_config["prefix"]}/tasks?{encoded_params}'
-
-            elif parsed_url.path == app_config['prefix'] + '/day':
-                db.hide_unchosen = 'hide_unchosen' in postvars.keys()
-                db.hide_done = 'hide_done' in postvars.keys()
-                data += [('hide_unchosen', int(db.hide_unchosen))] + [('hide_done', int(db.hide_done))]
-
-                db.selected_date = postvars['original_selected_date'][0]
-                new_selected_date = postvars['new_selected_date'][0]
+        site = path_split(parsed_url.path)[1]
+        length = int(self.headers['content-length'])
+        postvars = PostvarsParser(parse_qs(self.rfile.read(length).decode(), keep_blank_values=1))
+
+        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 {('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 len(target) > 0 and not target in filter_db:
+                        filter_db += [target]
+                if len(filter_db) == 0:
+                    redir_params += [(param_name, '-')]
+            redir_params += [(param_name, f) for f in filter_db]
+        if site in {'calendar', 'todo'}:
+            redir_params += [('end', postvars.get('end', '-'))]
+            redir_params += [('start', postvars.get('start', '-'))]
+        # if site in {'tasks', 'pick_tasks'}:
+        #     redir_params += [('search', postvars.get('search', ''))]
+        if postvars.has('filter'): 
+            postvars.set('return_to', '')
+        
+        if 'tasks' == site:
+            redir_params += [('search', postvars.get('search', ''))]
+
+        elif 'todo' == site:
+            todo_id = postvars.get('todo_id')
+            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
                 try:
-                    datetime.strptime(new_selected_date, DATE_FORMAT)
+                    datetime.strptime(date, DATE_FORMAT)
                 except ValueError:
-                    raise PlomException(f'{app_config["prefix"]} bad date string: {new_selected_date}')
-                if new_selected_date != db.selected_date:
-                    db.change_selected_days_date(new_selected_date)
-                if 't_uuid' in postvars.keys():
-                    for i, uuid in enumerate(postvars['t_uuid']):
-                        t = db.tasks[uuid]
-                        if uuid in db.selected_day.todos.keys() and ((not 'choose' in postvars) or uuid not in postvars['choose']):
-                            del db.selected_day.todos[uuid]
-                    if 'choose' in postvars.keys():
-                        for i, uuid in enumerate(postvars['t_uuid']):
-                            if uuid in postvars['choose']:
-                                done = 'done' in postvars and uuid in postvars['done']
-                                db.update_todo_mini(uuid, db.selected_date, postvars['day_weight'][i], done)
-                if 'day_comment' in postvars.keys():
-                    db.selected_day.comment = postvars['day_comment'][0]
-                data += [('selected_date', db.selected_date)]
-                encoded_params = urlencode(data)
-                homepage = f'{app_config["prefix"]}/day?{encoded_params}'
-
+                    raise PlomException(f'bad date string')
+                latest_date = date
+                efforts[date] = None
+                if not (old_todo and old_todo.deps):
+                    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 postvars.get_all('tag', [])\
+                        or has_day_effort:
+                    raise PlomException('will not remove todo of preserve-worthy values')
+                db.delete_todo(todo_id) 
+                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]
+                deps = [db.todos[id_] for id_ in postvars.get_all('adopt_dep', [])
+                        if id_ in db.todos.keys()] 
+                for dep in deps:
+                    if not todo_id in [t.id_ for t in dep.dependers]:
+                        dep.dependers += [db.todos[todo_id]]
+                tasks_to_birth = [db.tasks[id_] for id_ in postvars.get_all('birth_dep', [])]
+                for task in tasks_to_birth:
+                    deps += [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_all('tag', []),
+                               importance=float(postvars.get('importance')),
+                               deps=deps)
+
+        elif 'task' == site:
+            task_id = postvars.get('task_id')
+            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('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:
+        #     redir_params += [('hide_chosen_tasks', int(postvars.has('hide_chosen_tasks')))]
+        #     if postvars.has('update'):
+        #         db.selected_date = postvars.get('date')
+        #         todos_to_shrink = []
+        #         todos_to_delete = []
+        #         for todo in db.selected_day.linked_todos_as_list:
+        #             if todo.visible and not todo.id_ in postvars.get_all('chosen_todo', []):
+        #                 if len(todo.comment) > 0\
+        #                         or len(todo.day_tags) > 0\
+        #                         or not todo.is_effort_removable(db.selected_date):
+        #                     raise PlomException('will not remove effort of preserve-worthy values')
+        #                 if len(todo.efforts) > 1:
+        #                     todos_to_shrink += [todo]
+        #                 else:
+        #                     todos_to_delete += [todo]
+        #         for todo in todos_to_shrink:
+        #             db.delete_effort(todo, db.selected_date)
+        #         for todo in todos_to_delete:
+        #             db.delete_todo(todo.id_)
+        #         for id_ in postvars.get_all('choose_task', []):
+        #             db.add_todo(task=db.tasks[id_], efforts={db.selected_date: None})
+        #         for id_ in postvars.get_all('choose_todo', []):
+        #             db.todos[id_].efforts[db.selected_date] = None
+
+        elif 'do_todos' == site:
+            redir_params += [('hide_done', int(postvars.has('hide_done')))]
+            if postvars.has('update'): 
+                db.selected_date = postvars.get('date') 
+                redir_params += [('date', db.selected_date)]
+                db.selected_day.comment = postvars.get('day_comment', '') 
+                task_id = postvars.get('choose_task', None)
+                if task_id:
+                    if task_id not in db.tasks.keys():
+                        raise PlomException('illegal task ID entered')
+                    db.add_todo(task=db.tasks[task_id], efforts={db.selected_date: None},
+                                adopt_if_possible=(not postvars.has('dont_adopt')))
+                for id_ in postvars.get_all('choose_todo', []):
+                    db.todos[id_].efforts[db.selected_date] = None
+                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\
+                            and old_todo.day_effort == day_effort\
+                            and comment == old_todo.comment\
+                            and old_todo.importance == importance:
+                        continue
+                    db.update_todo_for_day(
+                            todo_id,
+                            db.selected_date,
+                            day_effort,
+                            done,
+                            comment,
+                            importance)
+
+        homepage = postvars.get('return_to')
+        if not homepage:
+            encoded_params = urlencode(redir_params)
+            homepage = f'{site}?{encoded_params}'
         db.write()
         self.redirect(homepage)
 
     def do_GET(self):
-        self.try_do(self.config_init)
         self.try_do(self.show_db)
 
     def show_db(self):
-        app_config = self.apps['todo'] if hasattr(self, 'apps') else self.config()
-        cookie_db = self.get_cookie_db(app_config['cookie_name'])
+        config = self.apps['todo'] if hasattr(self, 'apps') else self.config_init()
         parsed_url = urlparse(self.path)
-        params = parse_qs(parsed_url.query)
-        selected_date = None
-        t_filter_and = None
-        t_filter_not = None
-        hide_unchosen = False
-        hide_done = False
-        if parsed_url.path in {app_config['prefix'] + '/day', app_config['prefix'] + '/tasks'}:
-            selected_date = params.get('selected_date', [None])[0]
-            if selected_date is None and 'selected_date' in cookie_db.keys():
-                selected_date = cookie_db['selected_date']
-            cookie_db['selected_date'] = selected_date
-            t_filter_and = params.get('t_and', None)
-            if t_filter_and is None and 't_and' in cookie_db.keys():
-                t_filter_and = cookie_db['t_and']
-            elif t_filter_and == ['-']:
-                t_filter_and = None
-            cookie_db['t_and'] = t_filter_and
-            t_filter_not = params.get('t_not', None)
-            if t_filter_not is None:
-                if 't_not' in cookie_db.keys():
-                    t_filter_not = cookie_db['t_not']
-                else:
-                    t_filter_not = ['deleted']
-            elif t_filter_not == ['-']:
-                t_filter_not = None
-            cookie_db['t_not'] = t_filter_not
-        if parsed_url.path == app_config['prefix'] + '/day':
-            hide_unchosen_params = params.get('hide_unchosen', [])
-            if 0 == len(hide_unchosen_params):
-                if 'hide_unchosen' in cookie_db.keys():
-                    hide_unchosen = cookie_db['hide_unchosen']
-            else:
-                hide_unchosen = hide_unchosen_params[0] != '0'
-            cookie_db['hide_unchosen'] = hide_unchosen
-            hide_done_params = params.get('hide_done', [])
-            if 0 == len(hide_done_params):
-                if 'hide_done' in cookie_db.keys():
-                    hide_done = cookie_db['hide_done']
-            else:
-                hide_done = hide_done_params[0] != '0'
-            cookie_db['hide_done'] = hide_done
-        db = TodoDB(app_config['prefix'], selected_date, t_filter_and, t_filter_not, hide_unchosen, hide_done)
-        if parsed_url.path == app_config['prefix'] + '/day':
-            page = db.show_day()
-        elif parsed_url.path == app_config['prefix'] + '/todo':
-            todo_date = params.get('date', [None])[0]
-            task_uuid = params.get('task', [None])[0]
-            page = db.show_todo(task_uuid, todo_date)
-        elif parsed_url.path == app_config['prefix'] + '/task':
-            id_ = params.get('id', [None])[0]
+        site = path_split(parsed_url.path)[1]
+        cookie_db = self.get_cookie_db(config['cookie_name'])
+        params = ParamsParser(parsed_url.query, cookie_db)
+
+        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', 'calendar', 'task'}:
+            selected_date = params.get_cookied('date')
+        if site in {'do_todos', '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(selected_date, tag_filter_and, tag_filter_not, hide_unchosen, hide_done)
+        if site in {'todo', 'task'}:
+            id_ = params.get('id')
+        if site in {'do_todos', 'tasks'}:
+            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_, start_date, end_date)
+        elif 'task' == site:
             page = db.show_task(id_)
-        elif parsed_url.path == app_config['prefix'] + '/tasks':
-            page = db.show_tasks()
-        elif parsed_url.path == app_config['prefix'] + '/add_task':
+        elif 'tasks' == site:
+            search = params.get('search', '')
+            page = db.show_tasks(search, sort_order)
+        elif 'add_task' == site:
             page = db.show_task(None)
-        elif parsed_url.path == app_config['prefix'] + '/unset_cookie':
-            page = 'no cookie to unset.'
-            if len(cookie_db) > 0:
-                self.unset_cookie(app_config['cookie_name'], app_config['cookie_path'])
-                page = 'cookie unset!'
-        else:
-            start_date = params.get('start', [None])[0]
-            if start_date is None:
-                if 'calendar_start' in cookie_db.keys():
-                    start_date = cookie_db['calendar_start']
-                else:
-                    start_date = 'today'
-            elif start_date == '-':
-                start_date = None
-            cookie_db['calendar_start'] = start_date
-            end_date = params.get('end', [None])[0]
-            if end_date is None and 'calendar_end' in cookie_db.keys():
-                end_date = cookie_db['calendar_end']
-            elif end_date == '-':
-                end_date = None
-            cookie_db['calendar_end'] = end_date
+        else:  # 'calendar' == site
             page = db.show_calendar(start_date, end_date)
-        header = Template(html_head).render(db=db, prefix=app_config['prefix'], date=selected_date)
-        if parsed_url.path != app_config['prefix'] + '/unset_cookie':
-            self.set_cookie(app_config['cookie_name'], app_config['cookie_path'], cookie_db)
-        self.send_HTML(header + page)
+
+        self.set_cookie(config['cookie_name'], config['cookie_path'], cookie_db)
+        self.send_HTML(page)
 
 
 if __name__ == "__main__":