jakobsn
6 jaren geleden
3 gewijzigde bestanden met toevoegingen van 22 en 17 verwijderingen
-
+8 -6src/app/templates/project.html
-
+3 -3src/app/views/forms.py
-
+11 -8src/app/views/project.py
+ 8
- 6
src/app/templates/project.html
Bestand weergeven
| @@ -1,4 +1,4 @@ | |||
| $def with (nav, project, tasks, permissions) | |||
| $def with (nav, project_form, project, tasks, permissions) | |||
| <head> | |||
| <title>Beelance2</title> | |||
| @@ -24,18 +24,20 @@ $def with (nav, project, tasks, permissions) | |||
| <br> | |||
| $permissions | |||
| <br> | |||
| $if project[5] != "open" or session.userid == project[2]: | |||
| $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=""> | |||
| <input type="file" name="myfile" /> | |||
| $:project_form.myfile.render() | |||
| <br/> | |||
| <input type="hidden" name="taskid" value="$task[0]"/> | |||
| $if task[6] == "waiting for delivery" or task[6] == "declined": | |||
| <input type="submit" name="submit"/> | |||
| $project_form.taskid.set_value(task[0]) | |||
| $:project_form.taskid.render() | |||
| $:project_form.submit.render() | |||
| $if permissions[2]: | |||
| <button type="submit" name="deliver" value="1">Deliver</button> | |||
| $if session.userid == project[2] and task[6] == "delivered": | |||
+ 3
- 3
src/app/views/forms.py
Bestand weergeven
| @@ -37,9 +37,9 @@ project_form = form.Form( | |||
| form.Input("myfile", type="file"), | |||
| form.Hidden("taskid"), | |||
| form.Button("submit", type="submit", html="Upload"), | |||
| form.Button("deliver", type="submit", value=True) | |||
| form.Button("accepted", type="submit", value=True) | |||
| form.Button("declined", type="submit", value=True) | |||
| form.Button("deliver", type="submit", value=True, html="Deliver"), | |||
| form.Button("accepted", type="submit", value=True, html="Accept Delivery"), | |||
| form.Button("declined", type="submit", value=True, html="Decline Delivery") | |||
| ) | |||
| def get_task_form_elements(identifier=0, task_title="", task_description="", budget=""): | |||
+ 11
- 8
src/app/views/project.py
Bestand weergeven
| @@ -1,10 +1,11 @@ | |||
| import web | |||
| import models.project | |||
| from views.utils import get_nav_bar | |||
| import cgi, os | |||
| import cgitb; cgitb.enable() | |||
| from views.forms import project_form | |||
| import os | |||
| from time import sleep | |||
| # Get html templates | |||
| render = web.template.render('templates/') | |||
| @@ -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, tasks,permissions) | |||
| return render.project(nav, project_form, project, tasks,permissions) | |||
| def POST(self): | |||
| print("HELLO") | |||
| @@ -58,12 +59,14 @@ class Project: | |||
| print("taskid", data.taskid, "equal", task[0]) | |||
| if task[0] == int(data.taskid): | |||
| print("ASDASADSSD", task[6]) | |||
| if(task[6] == "waiting for delivery" or task[6] == "declined"): | |||
| if(task[5] == "waiting for delivery" or task[5] == "declined"): | |||
| task_waiting = True | |||
| if(task[6] == 'accepted'): | |||
| if(task[5] == 'accepted'): | |||
| task_delivered = True | |||
| print(task_waiting, task_delivered) | |||
| print(permissions) | |||
| print(not permissions[1], not task_waiting) | |||
| # Test if the file was uploaded | |||
| if fileitem.filename: | |||
| if not permissions[1] or not task_waiting: | |||
| @@ -79,14 +82,14 @@ class Project: | |||
| if not os.path.isdir(path): | |||
| command = 'mkdir ' + path | |||
| os.popen(command) | |||
| sleep(0.5) | |||
| sleep(0.2) | |||
| path = path + '/task' + data.taskid | |||
| print(path) | |||
| if not os.path.isdir(path): | |||
| print(data.taskid) | |||
| command = 'mkdir ' + path | |||
| os.popen(command) | |||
| sleep(0.5) | |||
| sleep(0.2) | |||
| open(path + '/' + fn, 'wb').write(fileitem.file.read()) | |||
| message = 'The file "' + fn + '" was uploaded successfully' | |||
| models.project.set_task_file(data.taskid, (path + "/" + fn)) | |||
| @@ -103,7 +106,7 @@ class Project: | |||
| tasks = models.project.get_tasks_by_project_id(data.projectid) | |||
| for task in tasks: | |||
| print("task", task) | |||
| if task[6] != "accepted": | |||
| if task[5] != "accepted": | |||
| all_tasks_accepted = False | |||
| if all_tasks_accepted: | |||
| models.project.update_project_status(str(data.projectid), "finished") | |||