<a href="{{prefix}}/all">all</a> | edit day:
<a href="{{prefix}}/day">choose</a>
<a href="{{prefix}}/day?hide_unchosen=1">do</a>
+<a href="{{prefix}}/coming">coming</a>
<hr />
"""
-
form_footer = '\n</form>'
-old_days_tmpl = """
+form_header_tmpl = """
+<form action="{{action|e}}" method="POST">
+"""
+archived_days_tmpl = """
<table>
-{% for date, day in db.old_days.items() | sort(reverse=True) %}
-<tr><td>{{ date }} ({{ day.todos_sum |round(2) }}) {{ day.comment|e }} <input type="submit" name="edit_{{date}}" value="edit" /></td></tr>
+{% for date, day in days.items() | sort(reverse=True) %}
+{% if day.archived %}
+<tr><td>{{ date }} {{ day.weekday }} ({{ day.todos_sum|round(2) }}) {{ day.comment|e }} <input type="submit" name="edit_{{date}}" value="edit" /></td></tr>
{% for task, todo in day.todos.items() | sort(attribute='1.title', reverse=True) %}
<tr><td>{{ todo.title }}</td><td>{% if todo.done %}✓{% endif %}</td><td>{{ todo.weight }}</td></tr>
{% endfor %}
+{% endif %}
{% endfor %}
</table>
"""
-
selected_day_tmpl = """
-<form action="{{action|e}}" method="POST">
hiden unchosen: <input name="hide_unchosen" type="checkbox" {% if db.hide_unchosen %}checked{% endif %} /><br />
mandatory tags: {% for t_tag in db.t_tags | sort %}
<input name="t_filter_and" type="checkbox" value="{{ t_tag }}" {% if t_tag in db.t_filter_and %} checked {% endif %} >{{ t_tag }}
self.db = db
self.todos = todos
self.comment = comment
+ self.archived = True
@classmethod
def from_dict(cls, db, d):
self.t_filter_and = t_filter_and
self.t_filter_not = t_filter_not
self.hide_unchosen = hide_unchosen
- self.old_days = {}
+ self.days = {}
self.tasks = {}
- self.reset_day()
self.t_tags = set()
super().__init__(db_path)
+ if not hasattr(self, 'selected_day_date'):
+ self.switch_to_day()
def read_db_file(self, f):
d = json.load(f)
- self.selected_day = self.add_day(d['selected_day'])
self.selected_day_date = d['selected_day_date']
+ for date, day_dict in d['days'].items():
+ self.days[date] = self.add_day(dict_source=day_dict)
+ self.selected_day.archived = False
for uuid, t_dict in d['tasks'].items():
t = self.add_task(id_=uuid, dict_source=t_dict)
t.visible = len([tag for tag in self.t_filter_and if not tag in t.tags]) == 0\
and ((not self.hide_unchosen) or uuid in self.selected_day.todos)
for tag in t.tags:
self.t_tags.add(tag)
- for date, day_dict in d['old_days'].items():
- self.old_days[date] = self.add_day(dict_source=day_dict) # Day.from_dict(self, day_dict)
def to_dict(self):
d = {
- 'selected_day': self.selected_day.to_dict(),
'selected_day_date': self.selected_day_date,
't_filter_and': list(self.t_filter_and),
't_filter_not': list(self.t_filter_not),
'tasks': {},
- 'old_days': {}
+ 'days': {}
}
for uuid, t in self.tasks.items():
d['tasks'][uuid] = t.to_dict()
- for date, day in self.old_days.items():
- d['old_days'][date] = day.to_dict()
+ for date, day in self.days.items():
+ d['days'][date] = day.to_dict()
return d
+ @property
+ def selected_day(self):
+ return self.days[self.selected_day_date]
+
def write(self):
self.write_text_to_db(json.dumps(self.to_dict()))
- def save_selected_day(self):
- if self.selected_day_date in self.old_days.keys():
- raise PlomException('cannot use same date twice')
- self.old_days[self.selected_day_date] = self.selected_day
-
- def reset_day(self, date=None):
+ def switch_to_day(self, date=None):
+ if self.selected_day_date in self.days.keys():
+ self.selected_day.archived = True
if date:
self.selected_day_date = date
- self.selected_day = self.old_days[date]
- del self.old_days[date]
else:
self.selected_day_date = str(datetime.now())[:10]
- self.selected_day = self.add_day()
+ if not self.selected_day_date in self.days.keys():
+ self.days[self.selected_day_date] = self.add_day()
+ self.selected_day.archived = False
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)
def show_all(self):
for i in range(10):
self.add_task(id_=f'new{i}')
- for date, day in self.old_days.items():
+ for date, day in self.days.items():
for task_uuid, todo in day.todos.items():
todo.title = self.tasks[task_uuid].title_at(date)
- return Template(selected_day_tmpl + old_days_tmpl + form_footer).render(db=self, action=self.prefix+'/all')
+ return Template(form_header_tmpl + selected_day_tmpl + archived_days_tmpl + form_footer).render(db=self, action=self.prefix+'/all', days=self.days)
def show_selected_day(self):
- return Template(selected_day_tmpl + form_footer).render(db=self, action=self.prefix+'/day')
+ return Template(form_header_tmpl + selected_day_tmpl + form_footer).render(db=self, action=self.prefix+'/day')
+
+ def show_coming(self):
+ from datetime import timedelta
+ todays_date = str(datetime.now())[:10]
+ days_to_show = self.days.copy()
+ for day in days_to_show.values():
+ day.archived = False
+ last_date = sorted(days_to_show.keys())[-1]
+ start_date = datetime.strptime(todays_date, '%Y-%m-%d')
+ end_date = datetime.strptime(last_date, '%Y-%m-%d')
+ for n in range(int((end_date - start_date).days) + 1):
+ current_date_obj = start_date + timedelta(n)
+ current_date = current_date_obj.strftime('%Y-%m-%d')
+ if current_date not in days_to_show.keys():
+ days_to_show[current_date] = self.add_day()
+ days_to_show[current_date].archived = True
+ days_to_show[current_date].weekday = datetime.strptime(current_date, '%Y-%m-%d').strftime('%A')
+ for task_uuid, todo in days_to_show[current_date].todos.items():
+ todo.title = self.tasks[task_uuid].title_at(current_date)
+ return Template(form_header_tmpl + archived_days_tmpl + form_footer).render(db=self, action=self.prefix+'/day', days=days_to_show)
class TodoHandler(PlomHandler):
done = 'done' in postvars and uuid in postvars['done']
day_weight = float(postvars['day_weight'][i]) if postvars['day_weight'][i] else None
db.selected_day.add_todo(uuid, {'done': done, 'day_weight': day_weight})
- db.selected_day_date = postvars['selected_day_date'][0]
- db.selected_day.comment = postvars['comment'][0]
+
+ if 'comment' in postvars.keys():
+ db.selected_day.comment = postvars['comment'][0]
+ if 'selected_day_date' in postvars.keys():
+ new_selected_day_date = postvars['selected_day_date'][0]
+ try:
+ datetime.strptime(new_selected_day_date, '%Y-%m-%d')
+ except ValueError:
+ raise PlomException(f"{prefix} bad date string: {new_selected_day_date}")
+ if new_selected_day_date != db.selected_day_date:
+ if new_selected_day_date in db.days.keys():
+ raise PlomException('cannot use same date twice')
+ else:
+ db.days[new_selected_day_date] = db.selected_day
+ del db.days[db.selected_day_date]
+ db.selected_day_date = new_selected_day_date
+
switch_edited_day = None
- for date in db.old_days.keys():
- if f'edit_{date}' in postvars.keys():
- switch_edited_day = date
+ day_edit_prefix = 'edit_'
+ for k in postvars.keys():
+ if k.startswith(day_edit_prefix):
+ switch_edited_day = k[len(day_edit_prefix):]
break
if 'archive_day' in postvars.keys() or switch_edited_day:
- db.save_selected_day()
- if switch_edited_day:
- db.reset_day(date)
- else:
- db.reset_day()
+ db.switch_to_day(switch_edited_day)
db.write()
data = [('t_and', f) for f in db.t_filter_and] + [('t_not', f) for f in db.t_filter_not] + [('hide_unchosen', int(db.hide_unchosen))]
encoded_params = urlencode(data)
db = TodoDB(prefix, t_filter_and, t_filter_not, hide_unchosen)
if parsed_url.path == prefix + '/day':
page = db.show_selected_day()
+ elif parsed_url.path == prefix + '/coming':
+ page = db.show_coming()
else:
page = db.show_all()
header = Template(html_head).render(prefix=prefix)
projects / misc / blobdiff