Pārlūkot izejas kodu

Cannot deliver an accepted task

https
jakobsn pirms 6 gadiem
vecāks
revīzija
143ffcb42e
3 mainītis faili ar 23 papildinājumiem un 10 dzēšanām
  1. +2
    -2
      src/app/models/database.py
  2. +1
    -1
      src/app/templates/project.html
  3. +20
    -7
      src/app/views/project.py

+ 2
- 2
src/app/models/database.py Parādīt failu

@@ -3,8 +3,8 @@ import mysql.connector
db = mysql.connector.connect(
user='root',
password='root',
host='10.5.0.5', # Docker address
#host='0.0.0.0', # Local address
#host='10.5.0.5', # Docker address
host='0.0.0.0', # Local address
database='db'
)

+ 1
- 1
src/app/templates/project.html Parādīt failu

@@ -39,7 +39,7 @@ $def with (nav, project, tasks, permissions)
$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="accepted" value="1">Accept Delivery</button>
<button type="submit" name="declined" value="1">Decline Delivery</button>
</form>
</li>


+ 20
- 7
src/app/views/project.py Parādīt failu

@@ -44,18 +44,27 @@ class Project:
data = web.input(myfile={}, deliver=None, accepted=None, declined=None)

fileitem = data['myfile']

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

print(data)
task_waiting = False
task_delivered = False
for task in tasks:
print("TASK", task)
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"):
task_waiting = True
if(task[6] == 'accepted'):
task_delivered = True
print(task_waiting, task_delivered)
# Test if the file was uploaded
if fileitem.filename:
task_waiting = False
for task in tasks:
if task[0] == data.taskid and (task[6] == "waiting for delivery" or task[6] == "declined"):
task_waiting = True
if not permissions[1] and task_waiting:
if not permissions[1] or not task_waiting:
print("Permission denied")
raise web.seeother(('/project?projectid=' + data.projectid))

@@ -79,15 +88,19 @@ class Project:
open(path + '/' + fn, 'wb').write(fileitem.file.read())
message = 'The file "' + fn + '" was uploaded successfully'
models.project.set_task_file(data.taskid, (path + "/" + fn))
elif data.deliver:
elif data.deliver and not task_delivered:
models.project.update_task_status(data.taskid, "delivered")
print(data.taskid)
all_tasks_accepted = True
print("================================================")
print("================================================")

for task in tasks:
print("task", task)
if task[6] != "accepted":
all_tasks_accepted = False
if all_tasks_accepted:
models.project.update_project_status("finished")
models.project.update_project_status(str(data.projectid), "finished")
elif data.accepted:
print("accept")
models.project.update_task_status(data.taskid, "accepted")


Notiek ielāde…
Atcelt
Saglabāt