X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=todo.py;h=94f3882f3c683bee5aa3b80a2922be660f70575c;hb=ecee822bebf62049803b90fc8d8a0b484915a0fc;hp=11b0149028966effd5f551d1fbc0f36819838faf;hpb=38b9ce0ba2b5af072554999bc5836ffe455f06db;p=misc
diff --git a/todo.py b/todo.py
index 11b0149..94f3882 100644
--- a/todo.py
+++ b/todo.py
@@ -21,12 +21,13 @@ def today_date(with_time=False):
class AttributeWithHistory:
- def __init__(self, default_if_empty, history=None, then_date='2000-01-01', set_check=None, alt_get=None):
+ def __init__(self, parent, name, default_if_empty, history=None, then_date='2000-01-01', set_check=None):
+ self.parent = parent
+ self.name = name
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
def set(self, value):
if self.set_check:
@@ -36,39 +37,71 @@ class AttributeWithHistory:
self.history[today_date(with_time=True)] = value
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):
+ end_of_queried_day = f'{queried_date} 23:59:59'
+ sorted_dates = sorted(self.history.keys())
+ if self.parent.forked_task and (0 == len(sorted_dates) or sorted_dates[0] > end_of_queried_day):
+ return getattr(self.parent.forked_task, self.name).at(queried_date)
+ elif 0 == len(sorted_dates):
return self.default
- ret = self.history[sorted(self.history.keys())[0]]
+ ret = self.history[sorted_dates[0]]
for date_key, item in self.history.items():
- if date_key > f'{queried_date} 23:59:59':
+ if date_key > end_of_queried_day:
break
ret = item
return ret
@property
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]]
+ if 0 == len(self.history):
+ if self.parent.forked_task:
+ return getattr(self.parent.forked_task, self.name).now
+ return self.default
+ return self.history[keys[-1]]
@property
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)
-class Task:
+class TaskLike:
+
+ def __init__(self, db, id_, comment):
+ self.db = db
+ self.id_ = id_
+ self.comment = comment
+ self.dependers = []
+
+ @property
+ def visible(self):
+ visible_by_and = 0 == len([tag for tag in self.db.tag_filter_and
+ if not tag in self.tags])
+ visible_by_not = 0 == len([tag for tag in self.db.tag_filter_not
+ if tag in self.tags])
+ return visible_by_and and visible_by_not
+
+ @property
+ def deps_depth(self):
+ if len(self.deps) == 0:
+ return 0
+ return 1 + max([d.deps_depth for d in self.deps])
+
+ @property
+ def deps_chain(self):
+ all_deps = set()
+ def add_deps(todo, all_deps):
+ for dep in todo.deps:
+ all_deps.add(dep)
+ add_deps(dep, all_deps)
+ add_deps(self, all_deps)
+ chain = list(all_deps)
+ chain.sort(key=lambda t: t.deps_depth)
+ return chain
+
+
+
+class Task(TaskLike):
def __init__(self,
db,
@@ -76,18 +109,15 @@ class Task:
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
-
- self.visible = True
- self.parents = []
+ dep_ids_history=None,
+ comment='',
+ forks_id=None):
+ super().__init__(db, id_, comment)
+ self.forks_id = forks_id
+ self.title = AttributeWithHistory(self, 'title', '', title_history, self.db.selected_date)
+ self.tags = AttributeWithHistory(self, 'tags', set(), tags_history, self.db.selected_date)
+ self.default_effort = AttributeWithHistory(self, 'default_effort', 0.0, default_effort_history, self.db.selected_date)
+ self.dep_ids = AttributeWithHistory(self, 'dep_ids', set(), dep_ids_history, self.db.selected_date, set_check=self.dep_loop_checker())
@classmethod
def from_dict(cls, db, d, id_):
@@ -97,8 +127,9 @@ class Task:
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'])
+ {k: set(v) for k, v in d['deps_history'].items()},
+ d['comment'],
+ d['forks'])
return t
def to_dict(self):
@@ -106,55 +137,73 @@ class Task:
'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()},
+ 'deps_history': {k: list(v) for k, v in self.dep_ids.history.items()},
'comment': self.comment,
+ 'forks': self.forks_id,
}
+ # def fork(self):
+ # now = today_date(with_time=True)
+ # dict_source = {
+ # 'title_history': {now: self},
+ # 'default_effort_history': {now: self},
+ # 'tags_history': {now: self},
+ # 'deps_history': {now: self},
+ # 'comment': self.comment,
+ # 'forks': self.id_}
+ # return self.db.add_task(dict_source=dict_source)
+
+ @property
+ def forked_task(self):
+ return self.db.tasks[self.forks_id] if self.forks_id else None
+
@property
- def subtasks(self):
- subtasks = []
- for id_ in self.subtask_ids.now:
+ def deps(self):
+ deps = []
+ for id_ in self.dep_ids.now:
if len(id_) == 0:
continue
- subtasks += [self.db.tasks[id_]]
- return subtasks
+ elif id_ not in self.db.tasks.keys():
+ raise PlomException(f'dep referenced on Task {self.id_} not found: {id_}')
+ deps += [self.db.tasks[id_]]
+ return deps
- 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:
+ @property
+ def deps_weight(self):
+ def count_weight(task):
+ sub_count = 1
+ for dep in task.deps:
+ sub_count += count_weight(dep)
+ return sub_count
+ return count_weight(self)
+
+ def dep_loop_checker(self):
+ def f(dep_ids_now):
+ loop_msg = "can't set dep, would create loop"
+ for id_ in dep_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)
+ dep = self.db.tasks[id_]
+ f(dep.dep_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)
+ @property
+ def latest_effort_date(self):
+ todos = [t for t in self.db.todos.values() if t.task.id_ == self.id_]
+ todos.sort(key=lambda t: t.latest_date)
+ if len(todos) > 0:
+ return todos[-1].latest_date
+ else:
+ return ''
+
+
class Day:
@@ -196,8 +245,38 @@ class Day:
def todos_sum(self):
return self._todos_sum()
+ def sorted_todos(self, done, is_tree_shaped, sort_order, legal_keys):
+ todos = [t for t in self.linked_todos_as_list if t.visible and t.done == done]
+ reverse = False
+ sort_column = sort_order[:]
+ if sort_order and '-' == sort_order[0]:
+ reverse = True
+ sort_column = sort_order[1:]
+ if sort_column in legal_keys:
+ todos.sort(key=lambda t: getattr(t, sort_column))
+ if reverse:
+ todos.reverse()
+ if is_tree_shaped:
+ def walk_tree(todo, sorted_todos):
+ todo.deps = [t for t in sorted_todos if t in todo.deps]
+ for dep in [t for t in sorted_todos if t in todo.deps]:
+ walk_tree(dep, sorted_todos)
+ if done:
+ trunk = [t for t in todos if len([td for td in t.dependers if td.done]) == 0]
+ else:
+ trunk = [t for t in todos if len(t.dependers) == 0]
+ for node in trunk:
+ walk_tree(node, todos)
+ todos = trunk
+ return todos
+
+ @property
+ def visible_in_export(self):
+ return len(self.comment) + len([t for t in self.linked_todos_as_list if t.visible]) > 0
+
+
-class Todo:
+class Todo(TaskLike):
def __init__(self,
db,
@@ -208,18 +287,21 @@ class Todo:
day_tags=None,
importance=1.0,
efforts=None,
- child_ids=None):
- self.id_ = id_
- self.db = db
+ dep_ids=None):
+ super().__init__(db, id_, comment)
self.task = task
self._done = done
- self._efforts = efforts if efforts else {}
- self.comment = comment
+ for k in efforts.keys():
+ try:
+ datetime.strptime(k, DATE_FORMAT)
+ except ValueError:
+ raise PlomException(f'Todo creation: bad date string: {k}')
+ self.efforts = efforts if efforts else {}
self.day_tags = day_tags if day_tags else set()
self.importance = importance
- self.child_ids = child_ids if child_ids else []
-
- self.parents = []
+ self._dep_ids = dep_ids if dep_ids else []
+ self.already_listed = False
+ self.been_observed = False
@classmethod
def from_dict(cls, db, d, id_):
@@ -232,7 +314,7 @@ class Todo:
set(d['day_tags']),
d['importance'],
d['efforts'],
- d['children'])
+ d['deps'])
return todo
def to_dict(self):
@@ -243,27 +325,31 @@ class Todo:
'day_tags': list(self.day_tags),
'importance': self.importance,
'efforts': self.efforts,
- 'children': self.child_ids}
-
- @property
- def parent(self):
- return self.parents[0] if len(self.parents) > 0 else None
+ 'deps': self._dep_ids}
@property
def title(self):
- return self.task.title.at(self.earliest_date)
+ return self.task.title.at(self.db.selected_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]
-
- @children.setter
- def children(self, children):
- self.child_ids = [child.id_ for child in children]
+ 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]
+ def f(deps):
+ loop_msg = "can't set dep, would create loop"
+ for dep in deps:
+ if dep == self:
+ raise PlomException(loop_msg)
+ else:
+ f(dep.deps)
+ f(self.deps)
@property
def default_effort(self):
@@ -271,45 +357,59 @@ class Todo:
@property
def done(self):
- if len(self.children) > 0:
- for child in self.children:
- if not child.done:
- return False
- return True
- else:
- return self._done
+ return self.deps_done and self._done
@done.setter
def done(self, doneness):
self._done = doneness
@property
- def efforts(self):
- if self.children:
- efforts = {}
- for date in self._efforts.keys():
- efforts[date] = None
- for child in self.children:
- to_add = None
- for date, effort in child.efforts.items():
- if not date in efforts.keys():
- efforts[date] = None
- if effort is not None:
- to_add = effort / len(child.parents)
- elif child.done:
- 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
- else:
- efforts[date] = to_add
- return efforts
+ def deps_done(self):
+ if len(self.deps) > 0:
+ for dep in self.deps:
+ if not dep.done:
+ return False
+ return True
+
+ @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 self._efforts
+ return f'X{self.title}X'
- @efforts.setter
- def efforts(self, efforts_dict):
- self._efforts = efforts_dict
+ @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 shortened_depender_paths(self):
+ new_paths = []
+ for path in self.depender_paths:
+ new_path = []
+ for i, step in enumerate(path):
+ next_step = None if len(path) <= i+1 else path[i+1]
+ for distinct_path in new_paths:
+ if len(distinct_path) >= i+2 and distinct_path[i+1] == next_step:
+ step = None
+ new_path += [step]
+ new_paths += [new_path]
+ return new_paths
@property
def all_days_effort(self):
@@ -343,6 +443,13 @@ class Todo:
def day_effort(self):
return self.efforts[self.db.selected_date]
+ @property
+ def effort_at_selected_date(self):
+ if self.db.selected_date in self.efforts.keys() and self.day_effort is not None:
+ return self.day_effort
+ else:
+ return self.task.default_effort.then
+
@property
def day(self):
return self.db.days[self.earliest_date]
@@ -361,20 +468,37 @@ class Todo:
def latest_date(self):
return self.sorted_effort_dates[-1]
+ @property
+ def has_dependers(self):
+ return len(self.dependers) > 0
+
+ @property
+ def has_deps(self):
+ return len(self.deps) > 0
+
+ @property
+ def sort_done(self):
+ return self.day_effort if self.day_effort else 0
+
+ @property
+ def family_effort(self):
+ return self.effort_at_selected_date + self.dep_efforts
+
+ def observe(self):
+ self.been_observed = True
+ return ''
+
+
class TodoDB(PlomDB):
def __init__(self,
selected_date=None,
tag_filter_and = None,
- tag_filter_not = None,
- hide_unchosen=False,
- hide_done=False):
+ tag_filter_not = None):
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 = {}
@@ -392,16 +516,16 @@ class TodoDB(PlomDB):
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 dep in task.deps:
+ dep.dependers += [task]
for id_, todo_dict in d['todos'].items():
- todo = self.add_todo(todo_dict, id_, link_into_day=False)
+ todo = self.add_todo(todo_dict, id_)
for tag in todo.day_tags:
self.t_tags.add(tag)
for todo in self.todos.values():
- for child in todo.children:
- child.parents += [todo]
+ 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)
@@ -409,11 +533,9 @@ class TodoDB(PlomDB):
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]
self.days[date].linked_todos_as_list += [todo]
- self.set_visibilities()
+ # self.set_visibilities()
def to_dict(self):
d = {'tasks': {}, 'days': {}, 'todos': {}}
@@ -455,39 +577,60 @@ class TodoDB(PlomDB):
self.tasks[id_] = t
return t
- def update_task(self, id_, title, default_effort, tags, subtask_ids, comment):
+ def fork_task(self, id_):
+ origin = self.tasks[id_]
+ now = today_date(with_time=True)
+ fork_id = str(uuid4())
+ fork = Task(self, fork_id, {}, {}, {}, {}, origin.comment, id_)
+ self.tasks[fork_id] = fork
+ return fork
+
+ def update_task(self, id_, title, default_effort, tags, comment, dep_ids, depender_ids):
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.dep_ids.set(dep_ids)
task.comment = comment
+ for depender in task.dependers:
+ if not depender.id_ in depender_ids:
+ depender_dep_ids = depender.dep_ids.now
+ depender_dep_ids.remove(task.id_)
+ depender.dep_ids.set(depender_dep_ids)
+ for depender_id in depender_ids:
+ depender= self.tasks[depender_id]
+ depender_dep_ids = depender.dep_ids.now
+ depender_dep_ids.add(task.id_)
+ depender.dep_ids.set(depender_dep_ids)
return task
- def add_todo(self, todo_dict=None, id_=None, task=None, efforts=None, link_into_day=True):
+ def add_todo(self, todo_dict=None, id_=None, task=None, efforts=None, parenthood=''):
+ make_children = parenthood != 'childless'
+ adopt_if_possible = parenthood == 'adoption'
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)
- children = []
- for child_task in task.subtasks:
- # 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]
+ deps = []
+ if make_children and todo.latest_date in self.days.keys():
+ for dep_task in task.deps:
+ # if Todo expects dependencies, adopt any compatibles found in DB.selected_date
+ # before creating new depended Todos
+ dep_todo = None
+ if adopt_if_possible:
+ adoptable_todos = [t for t in self.days[todo.latest_date].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, parenthood=parenthood)
+ deps += [dep_todo]
+ todo.deps = deps
self.todos[id_] = todo
- if link_into_day:
- self.selected_day.linked_todos_as_list += [todo]
+ for date in todo.efforts.keys():
+ if date in self.days.keys(): # possibly not all Days have been initialized yet
+ self.days[date].linked_todos_as_list += [todo]
return todo
def _update_todo_shared(self, id_, done, comment, importance):
@@ -501,11 +644,11 @@ class TodoDB(PlomDB):
todo = self._update_todo_shared(id_, done, comment, importance)
todo.efforts[date] = effort
- def update_todo(self, id_, efforts, done, comment, tags, importance, children):
+ 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.children:
+ if len(efforts) == 0 and not todo.deps:
raise PlomException('todo must have at least one effort!')
- todo.children = children
+ todo.deps = deps
todo.efforts = efforts
for date in todo.efforts.keys():
if not date in self.days.keys():
@@ -521,8 +664,8 @@ class TodoDB(PlomDB):
dates_to_delete += [date]
for date in dates_to_delete:
self.delete_effort(todo, date, force=True)
- for parent in todo.parents:
- parent.child_ids.remove(todo.id_)
+ for depender in todo.dependers:
+ depender._dep_ids.remove(todo.id_)
del self.todos[id_]
def delete_task(self, id_):
@@ -539,68 +682,91 @@ class TodoDB(PlomDB):
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.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 = {}
- 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[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]
+ def show_calendar_export(self, start_date_str, end_date_str):
+ days_to_show = self.init_calendar_items(start_date_str, end_date_str)
+ return j2env.get_template('calendar_export.html').render(days=days_to_show)
+ def show_calendar(self, start_date_str, end_date_str):
+ # self.tag_filter_and = ['calendar']
+ # self.tag_filter_not = ['deleted']
+
+ # 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)
+
+ # days_to_show = {}
+ # 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[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]
+
+ days_to_show = self.init_calendar_items(start_date_str, end_date_str)
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()
- todos = [t for t in self.selected_day.linked_todos_as_list
- if t.visible
- and not t.children]
- 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(
+ def show_day_todos(self, undone_sort_order=None, done_sort_order=None, is_tree_shaped=False, todo_parenthood=None):
+ legal_undone_sort_keys = {'title', 'sort_done', 'default_effort', 'importance'}
+ legal_done_sort_keys = {'title', 'effort_at_selected_date', 'family_effort'}
+
+ 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)
+
+ adoptable_past_todos = []
+ for todo in [t for t in self.todos.values()
+ if t.visible
+ and (not t.done)
+ and t.earliest_date < self.selected_date]:
+ adoptable_past_todos += [todo]
+ undone_todos = self.selected_day.sorted_todos(False, is_tree_shaped, undone_sort_order,
+ legal_undone_sort_keys)
+ done_todos = self.selected_day.sorted_todos(True, is_tree_shaped, done_sort_order,
+ legal_done_sort_keys)
+
+ return j2env.get_template('day_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,
- todos=todos,
- sort=sort_order,
- hide_done=self.hide_done)
-
- def show_todo(self, id_, search, start_date, end_date):
+ all_tasks=[t for t in self.tasks.values()],
+ undone_todos=undone_todos,
+ done_todos=done_todos,
+ is_tree_shaped=is_tree_shaped,
+ undone_sort=undone_sort_order,
+ done_sort=done_sort_order,
+ parenthood=todo_parenthood)
+
+ def show_todo(self, id_, parenthood):
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)]
+ if t != todo
+ and t not in todo.deps]
+
+ legal_dates = list(todo.efforts.keys())
date_filtered_todos = []
for date in legal_dates:
for filtered_todo in filtered_todos:
@@ -609,102 +775,79 @@ class TodoDB(PlomDB):
if date in filtered_todo.efforts.keys():
date_filtered_todos += [filtered_todo]
+ dep_slots = []
+ for dep in todo.task.deps:
+ dep_slots += [{'task': dep,
+ 'todos': [t for t in todo.deps if t.task == dep]}]
+
+ suggested_todos = {}
+ for dep in todo.task.deps:
+ suggested_todos[dep.id_] = [t for t in date_filtered_todos if t.task.id_ == dep.id_]
+ additional_deps = [t for t in todo.deps if not t.task in todo.task.deps]
+
return j2env.get_template('todo.html').render(
tags=self.t_tags,
todo=todo,
filtered_todos=date_filtered_todos,
filtered_tasks=filtered_tasks,
- child_todos=todo.children,
- start_date=start_date,
- end_date=end_date)
+ dep_slots=dep_slots,
+ suggested_todos=suggested_todos,
+ additional_deps=additional_deps,
+ parentood=parenthood,
+ dep_todos=todo.deps)
def show_task(self, id_):
- task = self.tasks[id_] if id_ else self.add_task()
+ if id_:
+ if not id_ in self.tasks.keys():
+ raise PlomException('no Task for ID')
+ task = self.tasks[id_]
+ else:
+ task = self.add_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)]
+ and (t not in task.deps)]
+
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, expand_uuid):
- expanded_tasks = {}
- if expand_uuid:
- for uuid in self.tasks[expand_uuid].subtask_ids.now:
- expanded_tasks[uuid] = self.tasks[uuid]
- return j2env.get_template('tasks.html').render(
- db=self,
- filter_and=self.tag_filter_and,
- filter_not=self.tag_filter_not,
- expand_uuid=expand_uuid,
- expanded_tasks=expanded_tasks)
-
- 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
+ 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':
- 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(
+ reverse = False
+ sort_column = sort_order
+ if sort_order and '-' == sort_order[0]:
+ reverse = True
+ sort_column = sort_order[1:]
+ if sort_column == 'title':
+ filtered_tasks.sort(key=lambda t: t.title.now)
+ elif sort_column == 'default_effort':
+ filtered_tasks.sort(key=lambda t: t.default_effort.now)
+ elif sort_column == 'weight':
+ filtered_tasks.sort(key=lambda t: t.deps_weight)
+ elif sort_column == 'latest_effort_date':
+ filtered_tasks.sort(key=lambda t: t.latest_effort_date)
+ if reverse:
+ filtered_tasks.reverse()
+ return j2env.get_template('tasks.html').render(
sort=sort_order,
+ tasks=filtered_tasks,
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 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 init_calendar_items(self, start_date_str, end_date_str):
+ self.tag_filter_and = ['calendar']
+ self.tag_filter_not = ['deleted']
- 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):
@@ -717,15 +860,18 @@ class TodoDB(PlomDB):
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
+ days_to_show = {}
+ 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[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 days_to_show
@@ -735,19 +881,22 @@ class ParamsParser:
self.params = parse_qs(parsed_url_query)
self.cookie_db = cookie_db
- def get(self, key, default=None):
- boolean = bool == type(default)
+ def get(self, key, default=None, as_bool=False):
+ # boolean = bool == type(default)
param = self.params.get(key, [default])[0]
- if boolean:
- param = param != '0'
+ if as_bool:
+ if param == '0':
+ param = False
+ elif param is not None:
+ param = True
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):
+ def get_cookied(self, key, default=None, prefix=None, as_bool=False):
cookie_key = self.cookie_key_from_params_key(prefix, key)
- param = self.get(key, default)
+ param = self.get(key, default, as_bool)
if param == '-':
param = None
if cookie_key in self.cookie_db.keys():
@@ -772,6 +921,7 @@ class ParamsParser:
return params
+
class PostvarsParser:
def __init__(self, postvars):
@@ -842,14 +992,16 @@ class TodoHandler(PlomHandler):
if site in {'calendar', 'todo'}:
redir_params += [('end', postvars.get('end', '-'))]
redir_params += [('start', postvars.get('start', '-'))]
- if site in {'todo', 'pick_tasks'}:
- redir_params += [('search', postvars.get('search', ''))]
- redir_params += [('search', postvars.get('search', ''))]
- redir_params += [('search', postvars.get('search', ''))]
+ if site in {'day_todos', 'todo'}:
+ todo_parenthood = postvars.get('parenthood')
+ redir_params += [('parenthood', todo_parenthood)]
if postvars.has('filter'):
postvars.set('return_to', '')
- if 'todo' == site:
+ 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
@@ -858,13 +1010,9 @@ class TodoHandler(PlomHandler):
for i, date in enumerate(postvars.get_all('effort_date', [])):
if '' == date:
continue
- try:
- 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):
+ 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'):
@@ -881,76 +1029,92 @@ class TodoHandler(PlomHandler):
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', [])
- 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', [])]
+ 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]]
+ birth_dep_ids = postvars.get_all('birth_dep', [])
+ for id_ in [id_ for id_ in birth_dep_ids if not id_ in db.tasks.keys()]:
+ raise PlomException('submitted illegal dep ID')
+ tasks_to_birth = [db.tasks[id_] for id_ in birth_dep_ids]
for task in tasks_to_birth:
- children += [db.add_todo(task=task, efforts={latest_date: None})]
+ deps += [db.add_todo(task=task, efforts={latest_date: None}, parenthood=todo_parenthood)]
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')),
- children=children)
+ deps=deps)
elif 'task' == site:
task_id = postvars.get('task_id')
- if postvars.has('delete') and task_id in db.tasks.keys():
+ if (postvars.has('delete') or postvars.has('fork')) and (not task_id in db.tasks.keys()):
+ if not task_id in db.tasks.keys():
+ raise PlomException('can only do this on Task that already exists')
+ if postvars.has('delete'):
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_all('dep', [])\
or postvars.get('comment', ''):
raise PlomException('will not remove Task of preserve-worthy values')
db.delete_task(task_id)
elif postvars.has('update'):
+ dep_ids = postvars.get_all('dep', [])
+ for id_ in [id_ for id_ in dep_ids if not id_ in db.tasks.keys()]:
+ raise PlomException('submitted illegal dep ID')
+ depender_ids = postvars.get_all('depender', [])
+ for id_ in [id_ for id_ in depender_ids if not id_ in db.tasks.keys()]:
+ raise PlomException('submitted illegal dep ID')
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', ''))
+ comment=postvars.get('comment', ''),
+ dep_ids=dep_ids,
+ depender_ids=depender_ids)
if postvars.has('add_as_todo'):
- db.add_todo(task=task, efforts={postvars.get('selected_date'): None})
- redir_params += [('id', task_id)]
+ db.add_todo(task=task, efforts={postvars.get('new_todo_date'): None})
+ elif postvars.has('fork'):
+ t = db.fork_task(task_id)
+ task_id = t.id_
+
+ # dep_ids = postvars.get_all('dep', [])
+ # for id_ in [id_ for id_ in dep_ids if not id_ in db.tasks.keys()]:
+ # raise PlomException('submitted illegal dep ID')
+ # depender_ids = postvars.get_all('depender', [])
+ # for id_ in [id_ for id_ in depender_ids if not id_ in db.tasks.keys()]:
+ # raise PlomException('submitted illegal dep ID')
+ # 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', []),
+ # comment=postvars.get('comment', ''),
+ # dep_ids=dep_ids,
+ # depender_ids=depender_ids)
+ # if postvars.has('add_as_todo'):
+ # db.add_todo(task=task, efforts={postvars.get('new_todo_date'): None})
- 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
+ redir_params += [('id', task_id)]
- elif 'do_todos' == site:
- redir_params += [('hide_done', int(postvars.has('hide_done')))]
+ elif 'day_todos' == site:
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},
+ parenthood=todo_parenthood)
+ 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', [])
@@ -996,48 +1160,44 @@ class TodoHandler(PlomHandler):
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', 'pick_tasks', 'calendar', 'task'}:
+ if site in {'day_todos', 'calendar', 'task'}:
selected_date = params.get_cookied('date')
- if site in {'do_todos', 'pick_tasks'}:
+ if site in {'day_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 {'todo', 'pick_tasks'}:
- search = params.get('search', '')
- if site in {'do_todos', 'pick_tasks'}:
- sort_order = params.get_cookied('sort', prefix=site)
- if site in {'', 'calendar', 'todo'}:
+ if site in {'day_todos', 'todo'}:
+ todo_parenthood = params.get_cookied('parenthood', prefix=site)
+ if site in {'calendar', 'calendar_export', ''}:
start_date = params.get_cookied('start', prefix=site)
end_date = params.get_cookied('end', prefix=site)
+ db = TodoDB(selected_date, tag_filter_and, tag_filter_not)
+ if site in {'todo', 'task'}:
+ id_ = params.get('id')
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('day_todos', 'tree'): True,
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 'day_todos' == site:
+ is_tree_shaped = params.get_cookied('tree', prefix=site, as_bool=True)
+ undone_sort_order = params.get_cookied('undone_sort', prefix=site)
+ done_sort_order = params.get_cookied('done_sort', prefix=site)
+ page = db.show_day_todos(undone_sort_order, done_sort_order, is_tree_shaped, todo_parenthood)
elif site == 'todo':
- page = db.show_todo(id_, search, start_date, end_date)
+ page = db.show_todo(id_, parenthood=todo_parenthood)
elif 'task' == site:
page = db.show_task(id_)
elif 'tasks' == site:
- expand_uuid = params.get('expand_uuid')
- page = db.show_tasks(expand_uuid)
+ sort_order = params.get_cookied('sort', prefix=site)
+ search = params.get('search', '')
+ page = db.show_tasks(search, sort_order)
elif 'add_task' == site:
page = db.show_task(None)
+ elif 'calendar_export' == site:
+ page = db.show_calendar_export(start_date, end_date)
else: # 'calendar' == site
page = db.show_calendar(start_date, end_date)