瀏覽代碼

Can accept or decline task

https
jakobsn 6 年之前
父節點
當前提交
62ee4206b7
共有 2 個檔案被更改,包括 18 行新增9 行删除
  1. +8
    -5
      src/app/templates/project.html
  2. +10
    -4
      src/app/views/project.py

+ 8
- 5
src/app/templates/project.html 查看文件

@@ -32,11 +32,14 @@ $def with (nav, project, tasks, permissions)
<input type="file" name="myfile" /> <input type="file" name="myfile" />
<br/> <br/>
<input type="hidden" name="taskid" value="$task[0]"/> <input type="hidden" name="taskid" value="$task[0]"/>
$if task[6] == "waiting for delivery":
<input type="submit" name="submit"/>

$if permissions[2]:
<button type="submit" name="deliver" value="1">Deliver</button>
$if session.userid != project[2]:
$if task[6] == "waiting for delivery" or task[6] == "declined":
<input type="submit" name="submit"/>
$if permissions[2]:
<button type="submit" name="deliver" value="1">Deliver</button>
$if session.userid == project[2] and task[6] == "delivered":
<button type="submit" name="acceped" value="1">Accept Delivery</button>
<button type="submit" name="declined" value="1">Decline Delivery</button>
</form> </form>
</li> </li>
</ul> </ul>


+ 10
- 4
src/app/views/project.py 查看文件

@@ -37,19 +37,20 @@ class Project:
return render.project(nav, project, tasks,permissions) return render.project(nav, project, tasks,permissions)


def POST(self): def POST(self):
print("HELLO")
# Get session # Get session
session = web.ctx.session session = web.ctx.session


data = web.input(myfile={}, deliver=None)
data = web.input(myfile={}, deliver=None, accepted=None, declined=None)


fileitem = data['myfile'] fileitem = data['myfile']


permissions = models.project.get_user_permissions(str(session.userid), data.projectid) permissions = models.project.get_user_permissions(str(session.userid), data.projectid)
tasks = models.project.get_tasks_by_project_id(data.projectid) tasks = models.project.get_tasks_by_project_id(data.projectid)


print(data.deliver)
print(data)
# Test if the file was uploaded # Test if the file was uploaded
if fileitem.filename and tasks[int(data.taskid) == "waiting for delivery"]:
if fileitem.filename and tasks[int(data.taskid) == "waiting for delivery" or tasks[int(data.taskid) == "declined"]:
if not permissions[1]: if not permissions[1]:
print("Permission denied") print("Permission denied")
raise web.seeother(('/project?projectid=' + data.projectid)) raise web.seeother(('/project?projectid=' + data.projectid))
@@ -57,7 +58,7 @@ class Project:
data = web.input(projectid=0) data = web.input(projectid=0)


fn = fileitem.filename fn = fileitem.filename
print(data)
print("DATA", data)
# Create the project directory if it doesnt exist # Create the project directory if it doesnt exist
path = 'static/project' + data.projectid path = 'static/project' + data.projectid
if not os.path.isdir(path): if not os.path.isdir(path):
@@ -77,6 +78,11 @@ class Project:
elif data.deliver: elif data.deliver:
models.project.update_task_status(data.taskid, "delivered") models.project.update_task_status(data.taskid, "delivered")
print(data.taskid) print(data.taskid)
elif data.accepted:
print("accept")
models.project.update_task_status(data.taskid, "accepted")
elif data.declined:
models.project.update_task_status(data.taskid, "declined")
else: else:
message = 'No file was uploaded' message = 'No file was uploaded'


Loading…
取消
儲存