jakobsn
6 years ago
4 changed files with 25 additions and 4 deletions
Unified View
Diff Options
-
+3 -2src/app/models/database.py
-
+14 -0src/app/models/project.py
-
+6 -1src/app/templates/project.html
-
+2 -1src/app/views/project.py
+ 3
- 2
src/app/models/database.py
View File
| @@ -3,7 +3,8 @@ import mysql.connector | |||||
| db = mysql.connector.connect( | db = mysql.connector.connect( | ||||
| user='root', | user='root', | ||||
| password='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' | database='db' | ||||
| ) | ) | ||||
+ 14
- 0
src/app/models/project.py
View File
| @@ -126,3 +126,17 @@ def set_task(projectid, task_title, task_description, budget): | |||||
| db.commit() | db.commit() | ||||
| cursor.close | 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 | |||||
+ 6
- 1
src/app/templates/project.html
View File
| @@ -1,4 +1,4 @@ | |||||
| $def with (nav, project) | |||||
| $def with (nav, project, tasks) | |||||
| <head> | <head> | ||||
| <title>Beelance2</title> | <title>Beelance2</title> | ||||
| @@ -18,4 +18,9 @@ $def with (nav, project) | |||||
| <p>Description: $project[4]</p> | <p>Description: $project[4]</p> | ||||
| <p>Status: $project[5]</p> | <p>Status: $project[5]</p> | ||||
| <ul> | |||||
| $for task in tasks: | |||||
| <li id="$task[0]">$task</li> | |||||
| </ul> | |||||
| </body> | </body> | ||||
+ 2
- 1
src/app/views/project.py
View File
| @@ -23,7 +23,8 @@ class Project: | |||||
| data = web.input(projectid=0) | data = web.input(projectid=0) | ||||
| if data.projectid: | if data.projectid: | ||||
| project = models.project.get_project_by_id(data.projectid) | project = models.project.get_project_by_id(data.projectid) | ||||
| tasks = models.project.get_tasks_by_project_id(data.projectid) | |||||
| else: | else: | ||||
| project = [[]] | project = [[]] | ||||
| return render.project(nav, project[0]) | |||||
| return render.project(nav, project[0], tasks) | |||||