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

Merge branch 'master' of github.com:sagidayan/SE-Hub

Browse source
This commit is contained in:
Sagi Dayan 2015-08-02 16:34:04 +03:00
commit 2b558e83d6
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
SE_API/TaskRoutes.py
View file

@ -20,6 +20,7 @@ from models.Task import Task
from models.Course import Course
from models.TaskComponent import TaskComponent
from models.TaskGrade import TaskGrade
from models.Project import Project
#Validation Utils Libs
from SE_API.Validation_Utils import *
@ -200,13 +201,25 @@ def submitTask(token, taskId, ownerId):
payload = json.loads(request.data)
user = get_user_by_token(token)
if user is None:
bad_request("bad user Token")
task = Task.get_by_id(int(taskId))
if task is None:
bad_request("bad Task id")
if task.isPersonal:
if User.get_by_id(ownerId) is None:
return bad_request("no such user")
else:
if Project.get_by_id(ownerId) is None:
return bad_request("no such project")
#create components
for c in payload['components']:
for c in payload:
try:
component = TaskComponent(taskId=task.key().id(), userId=(int(ownerId)), type=c['type'], label=c['label'], isMandatory=c['isMandatory'], order=c['order'])
component = TaskComponent(taskId=task.key().id(), userId=(int(ownerId)), type=c['type'], label=c['label'], value=c['value'], isMandatory=c['isMandatory'], order=c['order'])
except Exception as e:
print e
return bad_request("Bad component")
@ -678,6 +691,12 @@ def getTaskById(token, taskId, ownerId):
task = Task.get_by_id(int(taskId))
if task is None:
return bad_request("Bad Task id")
if task.isPersonal:
if User.get_by_id(ownerId) is None:
return bad_request("no such user")
else:
if Project.get_by_id(ownerId) is None:
return bad_request("no such project")
task = json.loads(task.to_JSON())
task['components'] = []

2
models/TaskComponent.py
View file

@ -10,6 +10,7 @@ class TaskComponent(db.Model):
userId = db.IntegerProperty(required=True, default = -1)
type = db.StringProperty(required=True,default=" ")
label = db.StringProperty(required=True,default=" ")
value = db.StringProperty(required=True, default=" ")
isMandatory = db.BooleanProperty(required=True, default=True)
order = db.IntegerProperty(required=True)
@ -18,6 +19,7 @@ class TaskComponent(db.Model):
'userId' : self.userId,
'type' : self.type,
'label' : self.label,
'value' : self.value,
'isMandatory' : self.isMandatory,
'order' : self.order,
'id' : self.key().id()