diff options
Diffstat (limited to 'todo/db/tasks.py')
| -rw-r--r-- | todo/db/tasks.py | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/todo/db/tasks.py b/todo/db/tasks.py index fc23bf0..1abbb51 100644 --- a/todo/db/tasks.py +++ b/todo/db/tasks.py @@ -1,10 +1,12 @@ from sqlite3 import Cursor import time from typing import List +from PyQt5 import QtCore +from datetime import date from todo.model.task import Task, ValidTaskForm from todo.model.status import Status -from todo.model import difficulty, priority, status +from todo.model import status def get(cursor: Cursor, s: Status) -> List[Task]: cursor.execute( @@ -13,9 +15,7 @@ def get(cursor: Cursor, s: Status) -> List[Task]: " created_at," " updated_at," " name," - " duration," - " difficulty," - " priority," + " due_date," " description" " FROM" " tasks" @@ -31,10 +31,8 @@ def get(cursor: Cursor, s: Status) -> List[Task]: created_at = task[1], updated_at = task[2], name = task[3], - duration = task[4], - difficulty = difficulty.parse(task[5]), - priority = priority.parse(task[6]), - description = task[7] + due_date = date.fromisoformat(task[4]) if task[4] else None, + description = task[5] )) return res @@ -46,22 +44,18 @@ def insert(cursor: Cursor, s: Status, form: ValidTaskForm): " created_at," " updated_at," " name," - " duration," - " difficulty," - " priority," + " due_date," " description," " status" - " ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", - (now, now, form.name, form.duration, difficulty.format(form.difficulty), priority.format(form.priority), form.description, status.format(s))) + " ) VALUES (?, ?, ?, ?, ?, ?)", + (now, now, form.name, form.due_date.isoformat() if form.due_date else "", form.description, status.format(s))) return Task( id = cursor.lastrowid, created_at = now, updated_at = now, name = form.name, - duration = form.duration, - difficulty = form.difficulty, - priority = form.priority, + due_date = form.due_date, description = form.description ) @@ -72,21 +66,17 @@ def update(cursor: Cursor, task: Task, form: ValidTaskForm): " UPDATE tasks SET" " updated_at = ?," " name = ?," - " duration = ?," - " difficulty = ?," - " priority = ?," + " due_date = ?," " description = ?" " WHERE id = ?", - (now, form.name, form.duration, difficulty.format(form.difficulty), priority.format(form.priority), form.description, task.id)) + (now, form.name, form.due_date.isoformat() if form.due_date else "", form.description, task.id)) return Task( id = task.id, created_at = task.created_at, updated_at = now, name = form.name, - duration = form.duration, - difficulty = form.difficulty, - priority = form.priority, + due_date = form.due_date, description = form.description ) |