change in get user task by id
This commit is contained in:
parent
44f0d1705a
commit
8e47d2ff0a
1 changed files with 76 additions and 65 deletions
|
@ -353,7 +353,7 @@ def getTaskComponents(token, taskId):
|
||||||
|
|
||||||
@task_routes.route('/api/tasks/getAllUserTasks/<string:token>', methods=["GET"])
|
@task_routes.route('/api/tasks/getAllUserTasks/<string:token>', methods=["GET"])
|
||||||
@auto.doc()
|
@auto.doc()
|
||||||
def getAllTasksByUser(token):
|
def getAllUserTasks(token):
|
||||||
"""
|
"""
|
||||||
<span class="card-title">>This Call will return an array of all of the User's Tasks</span>
|
<span class="card-title">>This Call will return an array of all of the User's Tasks</span>
|
||||||
<br>
|
<br>
|
||||||
|
@ -491,70 +491,81 @@ def getAllTasksByUser(token):
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# @task_routes.route('/api/tasks/getUserFullTasksById/<string:token>/<string:taskId>', methods=["GET"])
|
@task_routes.route('/api/tasks/getUserTaskById/<string:token>/<string:taskId>', methods=["GET"])
|
||||||
# @auto.doc()
|
@auto.doc()
|
||||||
# def getFullTasksById(token, taskId):
|
def getUserTaskById(token, taskId):
|
||||||
# """
|
"""
|
||||||
# <span class="card-title">>This Call will return an array of all components for a given task</span>
|
<span class="card-title">>This Call will return an array of all components for a given task</span>
|
||||||
# <br>
|
<br>
|
||||||
# <b>Route Parameters</b><br>
|
<b>Route Parameters</b><br>
|
||||||
# - SeToken: token<br>
|
- SeToken: token<br>
|
||||||
# - taskId: 1234567890
|
- taskId: 1234567890
|
||||||
# <br>
|
<br>
|
||||||
# <br>
|
<br>
|
||||||
# <b>Payload</b><br>
|
<b>Payload</b><br>
|
||||||
# - NONE
|
- NONE
|
||||||
# <br>
|
<br>
|
||||||
# <br>
|
<br>
|
||||||
# <b>Response</b>
|
<b>Response</b>
|
||||||
# <br>
|
<br>
|
||||||
# 200 - JSON Example:<br>
|
200 - JSON Example:<br>
|
||||||
# <code>
|
<code>
|
||||||
# [
|
[
|
||||||
# {<br>
|
{<br>
|
||||||
# 'taskId' : 7589454894,
|
'taskId' : 7589454894,
|
||||||
# 'userId' : -1,
|
'userId' : -1,
|
||||||
# 'type' : 'kindOfType',
|
'type' : 'kindOfType',
|
||||||
# 'label' : 'kindOfLabel',
|
'label' : 'kindOfLabel',
|
||||||
# 'isMandatory' : true,
|
'isMandatory' : true,
|
||||||
# 'order' : 2
|
'order' : 2
|
||||||
# }<br>
|
}<br>
|
||||||
# {<br>
|
{<br>
|
||||||
# 'taskId' : 7589454894,
|
'taskId' : 7589454894,
|
||||||
# 'userId' : yossi,
|
'userId' : yossi,
|
||||||
# 'type' : 'otherKindOfType',
|
'type' : 'otherKindOfType',
|
||||||
# 'label' : 'otherKindOfLabel',
|
'label' : 'otherKindOfLabel',
|
||||||
# 'isMandatory' : false,
|
'isMandatory' : false,
|
||||||
# 'order' : 4
|
'order' : 4
|
||||||
# }<br>
|
}<br>
|
||||||
# ]
|
]
|
||||||
# </code>
|
</code>
|
||||||
# <br>
|
<br>
|
||||||
# """
|
"""
|
||||||
# user = get_user_by_token(token)
|
user = get_user_by_token(token)
|
||||||
# if user is None:
|
if user is None:
|
||||||
# return bad_request("Bad User Token")
|
return bad_request("Bad User Token")
|
||||||
#
|
|
||||||
# task = Task.get_by_id(int(taskId))
|
task = Task.get_by_id(int(taskId))
|
||||||
# if task is None:
|
if task is None:
|
||||||
# return bad_request("Bad Task id")
|
return bad_request("Bad Task id")
|
||||||
#
|
|
||||||
# taskCompQuery = TaskComponent.all()
|
|
||||||
# taskCompQuery.filter("taskId = ", task.key().id())
|
taskCompQuery = TaskComponent.all()
|
||||||
#
|
taskCompQuery.filter("taskId = ", task.key().id())
|
||||||
# if task.isPersonal:
|
|
||||||
# taskCompQuery.filter("userId = ", user.key().id())
|
if task.isPersonal:
|
||||||
# else:
|
taskCompQuery.filter("userId = ", user.key().id())
|
||||||
# taskCompQuery.filter("userId = ", user.key().id())
|
else:
|
||||||
#
|
taskCompQuery.filter("userId = ", user.key().id())#TODO: fix to project
|
||||||
# if taskCompQuery.count() == 0:
|
|
||||||
# #create componenets and Score for user
|
#check if never created a personalized task and if so, create it
|
||||||
#
|
if taskCompQuery.count() == 0:
|
||||||
#
|
taskCompQuery = TaskComponent.all().filter("taskId = ", task.key().id()).filter("userId = ", -1)
|
||||||
# for i in taskCompQuery.run():
|
for tc in taskCompQuery.run():
|
||||||
# print i.to_JSON()
|
tcNew = TaskComponent(taskId=tc.taskId, userId=user.key().id(), type=tc.type, label=tc.label, isMandatory=tc.isMandatory, order=tc.order)
|
||||||
#
|
db.put(tcNew)
|
||||||
# return no_content()
|
|
||||||
|
grade = TaskGrade(grade=0, taskId=task.key().id(), userId=user.key().id())
|
||||||
|
db.put(grade)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
db.save
|
||||||
|
return no_content()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue