diff --git a/SE_API/UserRoutes.py b/SE_API/UserRoutes.py index ce51a1b..0bc26d1 100644 --- a/SE_API/UserRoutes.py +++ b/SE_API/UserRoutes.py @@ -60,7 +60,7 @@ def getUserByToken(token): 403 - No User Found """ query = User.all() - query.filter("seToken = ", token) + query.filter("seToken =", token) for u in query.run(limit=5): return Response(response=u.to_JSON(), diff --git a/models/Task.py b/models/Task.py index 20119cc..659e8b7 100644 --- a/models/Task.py +++ b/models/Task.py @@ -5,15 +5,17 @@ from google.appengine.ext import db class Task(db.Model): title = db.StringProperty(required=True) - description = db.StringProperty(required=True) + courseName = db.StringProperty(required=True) + description = db.StringProperty(required=True,default=" ") dueDate = db.DateProperty(required=True) isProject = db.BooleanProperty(required=True) - isClose = db.BooleanProperty(required=True) - isDone = db.BooleanProperty(required=True) - taskGrade = db.IntegerProperty(required=True) + isClose = db.BooleanProperty(required=True, default=False) + isDone = db.BooleanProperty(required=True, default=False) + taskGrade = db.IntegerProperty(required=True, default=0) def to_JSON(self): data = {'title' : self.title, + 'courseName' : self.course, 'description' : self.description, 'dueDate' : self.dueDate, 'isProject' : self.isProject,