From 1c67bec244ede59fc266bcac6a0c423bd3e25c93 Mon Sep 17 00:00:00 2001 From: jakobsn Date: Tue, 12 Nov 2019 13:26:40 +0100 Subject: [PATCH] show tasks --- src/app/models/database.py | 5 +++-- src/app/models/project.py | 14 ++++++++++++++ src/app/templates/project.html | 7 ++++++- src/app/views/project.py | 3 ++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/app/models/database.py b/src/app/models/database.py index 1cb2a97..771bf4d 100644 --- a/src/app/models/database.py +++ b/src/app/models/database.py @@ -3,7 +3,8 @@ import mysql.connector db = mysql.connector.connect( user='root', password='root', - host='10.5.0.5', # Docker address - #host='0.0.0.0', # Local address + #host='10.5.0.5', # Docker address + host='0.0.0.0', # Local address database='db' ) + \ No newline at end of file diff --git a/src/app/models/project.py b/src/app/models/project.py index 235a334..e7415a9 100644 --- a/src/app/models/project.py +++ b/src/app/models/project.py @@ -126,3 +126,17 @@ def set_task(projectid, task_title, task_description, budget): db.commit() cursor.close +def get_tasks_by_project_id(project_id): + """ + Get all tasks belonging to a project + + :param project_id: The id of the project holding the tasks + :type project_id: str + :return: List of tasks + """ + cursor = db.cursor() + query = ("SELECT * FROM tasks WHERE projectid = \"" + project_id + "\"") + cursor.execute(query) + tasks = cursor.fetchall() + cursor.close + return tasks diff --git a/src/app/templates/project.html b/src/app/templates/project.html index cb1b279..42500e4 100644 --- a/src/app/templates/project.html +++ b/src/app/templates/project.html @@ -1,4 +1,4 @@ -$def with (nav, project) +$def with (nav, project, tasks) Beelance2 @@ -18,4 +18,9 @@ $def with (nav, project)

Description: $project[4]

Status: $project[5]

+ + \ No newline at end of file diff --git a/src/app/views/project.py b/src/app/views/project.py index a3850ed..979c48e 100644 --- a/src/app/views/project.py +++ b/src/app/views/project.py @@ -23,7 +23,8 @@ class Project: data = web.input(projectid=0) if data.projectid: project = models.project.get_project_by_id(data.projectid) + tasks = models.project.get_tasks_by_project_id(data.projectid) else: project = [[]] - return render.project(nav, project[0]) + return render.project(nav, project[0], tasks)