From 09b48a53e843a7fad7ea15b40a7e9e886755cc2e Mon Sep 17 00:00:00 2001 From: Fedor Chukharev Date: Sat, 22 Jun 2019 19:33:03 +0300 Subject: [PATCH] Implement simple task list on index page --- ennead/templates/index.html | 1 + ennead/templates/task_list.html | 15 +++++++++++++++ ennead/views/tasks.py | 8 +++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 ennead/templates/task_list.html diff --git a/ennead/templates/index.html b/ennead/templates/index.html index 553c64f..d8d8f3d 100644 --- a/ennead/templates/index.html +++ b/ennead/templates/index.html @@ -6,4 +6,5 @@

Здесь будет град заложен.

+{% include 'task_list.html' %} {% endblock %} diff --git a/ennead/templates/task_list.html b/ennead/templates/task_list.html new file mode 100644 index 0000000..3e720d2 --- /dev/null +++ b/ennead/templates/task_list.html @@ -0,0 +1,15 @@ +
+
+ {% if tasks %} +
    + {% for task in tasks %} +
  • {{ task.name }}
  • + {% endfor %} +
+ {% else %} +

+ На сегодня задач нет! +

+ {% endif %} +
+
diff --git a/ennead/views/tasks.py b/ennead/views/tasks.py index 36400a2..a5833e5 100644 --- a/ennead/views/tasks.py +++ b/ennead/views/tasks.py @@ -1,7 +1,13 @@ """Views for task pages""" from flask import render_template from werkzeug.wrappers import Response +from ennead.models.task import TaskSet, Task def index() -> Response: - return render_template('index.html') + try: + active_set = TaskSet.get(TaskSet.active == 1) + except TaskSet.DoesNotExist: + return render_template('index.html', tasks=None) + tasks = Task.select().where(Task.task_set == active_set.active) + return render_template('index.html', tasks=tasks)