From 6b9fa0a37e4a4af96535fa19aaf261d6afebc3a6 Mon Sep 17 00:00:00 2001 From: jakobsn Date: Fri, 8 Nov 2019 19:12:32 +0100 Subject: [PATCH] Project view --- src/app/models/project.py | 8 ++++++++ src/app/templates/index.html | 4 ++-- src/app/templates/open_projects.html | 2 +- src/app/templates/project.html | 8 +++++++- src/app/views/project.py | 12 ++++++++---- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/app/models/project.py b/src/app/models/project.py index 6271200..845f403 100644 --- a/src/app/models/project.py +++ b/src/app/models/project.py @@ -19,6 +19,14 @@ def set_project(categoryid, userid, title, project_description, project_status): categories = get_categories() return categories +def get_project_by_id(projectid): + cursor = db.cursor() + query = ("SELECT * FROM projects WHERE projectid = \"" + + projectid + "\"") + cursor.execute(query) + project = cursor.fetchall() + return project + def get_projects_by_status_and_category(categoryid, project_status): cursor = db.cursor() query = ("SELECT * FROM projects WHERE project_status = \"" + diff --git a/src/app/templates/index.html b/src/app/templates/index.html index a3e8195..9d576fd 100644 --- a/src/app/templates/index.html +++ b/src/app/templates/index.html @@ -28,7 +28,7 @@ $def with (nav, project_bulk_one, project_bulk_two, projects)
$for project in project_bulk_one: -

$project[3]

$project[4]

+

$project[3]

$project[4]

$if projects == 'my': @@ -37,7 +37,7 @@ $def with (nav, project_bulk_one, project_bulk_two, projects)
$for project in project_bulk_two: -

$project[3]

$project[4]

+

$project[3]

$project[4]

\ No newline at end of file diff --git a/src/app/templates/open_projects.html b/src/app/templates/open_projects.html index 199df28..792908e 100644 --- a/src/app/templates/open_projects.html +++ b/src/app/templates/open_projects.html @@ -15,7 +15,7 @@ $def with (nav, categories, open_projects)
$for category in categories: -
$category[1]
+
$category[1]
diff --git a/src/app/templates/project.html b/src/app/templates/project.html index e966c18..cb1b279 100644 --- a/src/app/templates/project.html +++ b/src/app/templates/project.html @@ -1,4 +1,4 @@ -$def with (nav) +$def with (nav, project) Beelance2 @@ -11,5 +11,11 @@ $def with (nav) $:nav +

Project View

+ + $if len(project): +

Title: $project[3]

+

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 4b1704f..98270bf 100644 --- a/src/app/views/project.py +++ b/src/app/views/project.py @@ -12,9 +12,13 @@ class Project: def GET(self): # Get session session = web.ctx.session - - # Get navbar + # Get navbar nav = get_nav_bar(session) - data = web.input() + + data = web.input(projectid=0) + if data.projectid: + project = models.project.get_project_by_id(data.projectid) + else: + project = [[]] - return render.project(nav) + return render.project(nav, project[0])