jakobsn
6 年之前
共有 3 個檔案被更改，包括 39 行新增 和 16 行删除
分割檢視
Diff Options
-
+20 -0src/app/static/stylesheet.css
-
+16 -15src/app/templates/project.html
-
+3 -1src/app/views/project.py
+ 20
- 0
src/app/static/stylesheet.css
查看文件
| @@ -22,6 +22,7 @@ body { | |||
| .projects div { | |||
| border: 1px solid gray; | |||
| cursor: pointer; | |||
| } | |||
| .categories { | |||
| @@ -90,6 +91,25 @@ nav ul { | |||
| cursor: pointer; | |||
| margin: 2px; | |||
| } | |||
| .user_projects_category:hover { | |||
| background-color: lightskyblue; | |||
| } | |||
| #apply { | |||
| border: 1px solid gray; | |||
| padding: 5px; | |||
| background-color: lightslategray; | |||
| cursor: pointer; | |||
| margin: auto; | |||
| margin-top: 5px; | |||
| margin-bottom: 5px; | |||
| } | |||
| #apply:hover { | |||
| background-color: lightskyblue; | |||
| } | |||
| #project_meta { | |||
| margin: auto; | |||
| } | |||
+ 16
- 15
src/app/templates/project.html
查看文件
| @@ -1,4 +1,4 @@ | |||
| $def with (nav, project_form, project, tasks, permissions) | |||
| $def with (nav, project_form, project, tasks, permissions, categories) | |||
| <head> | |||
| <title>Beelance2</title> | |||
| @@ -11,25 +11,29 @@ $def with (nav, project_form, project, tasks, permissions) | |||
| <body> | |||
| $:nav | |||
| <h1>Project View</h1> | |||
| $if len(project): | |||
| <h2>Title: $project[3]</h2> | |||
| <p>Description: $project[4]</p> | |||
| <p>Status: $project[5]</p> | |||
| <h1>Project: $project[3]</h1> | |||
| $if project[5] == "open" and session.userid != project[2]: | |||
| <div id="apply" onclick="location.href='/apply?projectid=$project[0]'" name="Apply" description="apply">Apply for this project</div> | |||
| <div id="project_meta"> | |||
| <p>Status: $project[5]</p> | |||
| <p>Category: $categories[project[1]-1][1]</p> | |||
| <p>Description: $project[4]</p> | |||
| </div> | |||
| <ul> | |||
| $for task in tasks: | |||
| <li id="$task[0]">$task | |||
| <br> | |||
| $permissions | |||
| <br> | |||
| <li id="$task[0]"> | |||
| <h3>Task: $task[2]</h3> | |||
| <p>Description: $task[3]</p> | |||
| <p>Budget: $task[4]</p> | |||
| $if project[5] != "open": | |||
| $for filename in get_task_files(task[0]): | |||
| <a href="$filename[0]" download>$filename[0].split("/")[-1]</a> | |||
| <br> | |||
| <form method="POST" enctype="multipart/form-data" action=""> | |||
| $project_form.taskid.set_value(task[0]) | |||
| $:project_form.taskid.render() | |||
| @@ -44,8 +48,5 @@ $def with (nav, project_form, project, tasks, permissions) | |||
| </form> | |||
| </li> | |||
| </ul> | |||
| $if project[5] == "open" and session.userid != project[2]: | |||
| <div id="apply" onclick="location.href='/apply?projectid=$project[0]'" name="Apply" description="apply">Apply for this project</div> | |||
| </body> | |||
+ 3
- 1
src/app/views/project.py
查看文件
| @@ -26,6 +26,7 @@ class Project: | |||
| data = web.input(projectid=0) | |||
| permissions = models.project.get_user_permissions(str(session.userid), data.projectid) | |||
| categories = models.project.get_categories() | |||
| if data.projectid: | |||
| project = models.project.get_project_by_id(data.projectid) | |||
| @@ -34,7 +35,7 @@ class Project: | |||
| project = [[]] | |||
| tasks = [[]] | |||
| render = web.template.render('templates/', globals={'get_task_files':models.project.get_task_files, 'session':session}) | |||
| return render.project(nav, project_form, project, tasks,permissions) | |||
| return render.project(nav, project_form, project, tasks,permissions, categories) | |||
| def POST(self): | |||
| # Get session | |||
| @@ -43,6 +44,7 @@ class Project: | |||
| data = web.input(myfile={}, deliver=None, accepted=None, declined=None, projectid=0) | |||
| fileitem = data['myfile'] | |||
| permissions = models.project.get_user_permissions(str(session.userid), data.projectid) | |||
| categories = models.project.get_categories() | |||
| tasks = models.project.get_tasks_by_project_id(data.projectid) | |||
| # Determine status of the targeted task | |||