jakobsn
6 anni fa
5 ha cambiato i file con 26 aggiunte e 8 eliminazioni
-
+8 -0src/app/models/project.py
-
+2 -2src/app/templates/index.html
-
+1 -1src/app/templates/open_projects.html
-
+7 -1src/app/templates/project.html
-
+8 -4src/app/views/project.py
+ 8
- 0
src/app/models/project.py
Vedi File
| @@ -19,6 +19,14 @@ def set_project(categoryid, userid, title, project_description, project_status): | |||||
| categories = get_categories() | categories = get_categories() | ||||
| return 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): | def get_projects_by_status_and_category(categoryid, project_status): | ||||
| cursor = db.cursor() | cursor = db.cursor() | ||||
| query = ("SELECT * FROM projects WHERE project_status = \"" + | query = ("SELECT * FROM projects WHERE project_status = \"" + | ||||
+ 2
- 2
src/app/templates/index.html
Vedi File
| @@ -28,7 +28,7 @@ $def with (nav, project_bulk_one, project_bulk_two, projects) | |||||
| <div class="projects"> | <div class="projects"> | ||||
| $for project in project_bulk_one: | $for project in project_bulk_one: | ||||
| <div class="project"><h4>$project[3]</h4><p>$project[4]</p></div> | |||||
| <div class="project" onclick="location.href='/project?projectid=$project[0]'"><h4>$project[3]</h4><p>$project[4]</p></div> | |||||
| </div> | </div> | ||||
| $if projects == 'my': | $if projects == 'my': | ||||
| @@ -37,7 +37,7 @@ $def with (nav, project_bulk_one, project_bulk_two, projects) | |||||
| <div class="projects"> | <div class="projects"> | ||||
| $for project in project_bulk_two: | $for project in project_bulk_two: | ||||
| <div class="project"><h4>$project[3]</h4><p>$project[4]</p></div> | |||||
| <div class="project" onclick="location.href='/project?projectid=$project[0]'"><h4>$project[3]</h4><p>$project[4]</p></div> | |||||
| </div> | </div> | ||||
| </body> | </body> | ||||
+ 1
- 1
src/app/templates/open_projects.html
Vedi File
| @@ -15,7 +15,7 @@ $def with (nav, categories, open_projects) | |||||
| <div class="categories"> | <div class="categories"> | ||||
| $for category in categories: | $for category in categories: | ||||
| <div class="category" onclick="location.href='/my_projects?categoryid=$category[0]'">$category[1]</div> | |||||
| <div class="category" onclick="location.href='/open_projects?categoryid=$category[0]'">$category[1]</div> | |||||
| </div> | </div> | ||||
| <div class="projects"> | <div class="projects"> | ||||
+ 7
- 1
src/app/templates/project.html
Vedi File
| @@ -1,4 +1,4 @@ | |||||
| $def with (nav) | |||||
| $def with (nav, project) | |||||
| <head> | <head> | ||||
| <title>Beelance2</title> | <title>Beelance2</title> | ||||
| @@ -11,5 +11,11 @@ $def with (nav) | |||||
| <body> | <body> | ||||
| $:nav | $:nav | ||||
| <h1>Project View</h1> | |||||
| $if len(project): | |||||
| <h2>Title: $project[3]</h2> | |||||
| <p>Description: $project[4]</p> | |||||
| <p>Status: $project[5]</p> | |||||
| </body> | </body> | ||||
+ 8
- 4
src/app/views/project.py
Vedi File
| @@ -12,9 +12,13 @@ class Project: | |||||
| def GET(self): | def GET(self): | ||||
| # Get session | # Get session | ||||
| session = web.ctx.session | session = web.ctx.session | ||||
| # Get navbar | |||||
| # Get navbar | |||||
| nav = get_nav_bar(session) | 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]) | |||||