sagi/se-hub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #151 from sagidayan/API_Dev

Browse source 
Api dev
This commit is contained in:
Sagi Dayan 2015-08-02 21:56:57 +03:00
commit 54360f3782
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SE_API/TaskRoutes.py
View file

@ -712,7 +712,7 @@ def getAllUserTasks(token):
grade = TaskGrade.all().filter("taskId = ", t.key().id()).filter("userId = ", ownerId) grade = TaskGrade.all().filter("taskId = ", t.key().id()).filter("userId = ", ownerId)
for g in grade.run(): for g in grade.run():
taskDic['grade'] = g.grade taskDic['grade'] = json.loads(g.to_JSON())
if grade.count() == 0: if grade.count() == 0:
taskDic['grade'] = {'taskId': t.key().id(), 'userId': ownerId, 'grade': None} taskDic['grade'] = {'taskId': t.key().id(), 'userId': ownerId, 'grade': None}
@ -725,7 +725,7 @@ def getAllUserTasks(token):
basicTC = TaskComponent.all().filter("taskId = ", t.key().id()).filter("userId = ", -1).count() basicTC = TaskComponent.all().filter("taskId = ", t.key().id()).filter("userId = ", -1).count()
allTC = TaskComponent.all().filter("taskId = ", t.key().id()).count() allTC = TaskComponent.all().filter("taskId = ", t.key().id()).count()
done = (basicTC/allTC) - 1 done = (allTC/basicTC) - 1
taskDic['submitted']['done'] = done taskDic['submitted']['done'] = done
taskArr.append(taskDic) taskArr.append(taskDic)