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

This commit is contained in:
Sagi Dayan 2015-08-02 13:44:20 +03:00
commit 3c19cbe613
4 changed files with 86 additions and 9 deletions

View file

@ -372,12 +372,22 @@ def deleteProject(token,projectId):
if p is None: if p is None:
return bad_request("no such Project") return bad_request("no such Project")
if p.master_id == user.key().id(): if p.master_id != user.key().id():
db.delete(p) return forbidden("user is not owner of Project")
db.save
return accepted("Project deleted") #remove all users related to project
for uId in p.membersId:
user = User.get_by_id(uId)
if user is None:
return bad_request("trying to remove a user from project failed")
user.projects_id_list.remove(p.key().id())
db.put(user)
db.delete(p)
db.save
return accepted("Project deleted")
return forbidden("user is not owner of Project")

View file

@ -218,9 +218,9 @@ def getAllTasksByCourse(token, courseId):
return no_content() return no_content()
@task_routes.route('/api/tasks/getAllFutureTasks/<string:token>/<string:courseId>', methods=["GET"]) @task_routes.route('/api/tasks/getAllFutureCampusTasks/<string:token>/<string:courseId>', methods=["GET"])
@auto.doc() @auto.doc()
def getAllFutureTasks(token, courseId): def getAllFutureCampusTasks(token, courseId):
""" """
<span class="card-title">>This Call will return an array of all Future Tasks in a course, ordered by date</span> <span class="card-title">>This Call will return an array of all Future Tasks in a course, ordered by date</span>
<br> <br>
@ -284,6 +284,73 @@ def getAllFutureTasks(token, courseId):
else: else:
return no_content() return no_content()
@task_routes.route('/api/tasks/getAllFutureTasks/<string:token>', methods=["GET"])
@auto.doc()
def getAllFutureTasks(token):
"""
<span class="card-title">>This Call will return an array of all Future Tasks ordered by date</span>
<br>
<b>Route Parameters</b><br>
- SeToken: token<br>
<br>
<br>
<b>Payload</b><br>
- NONE
<br>
<br>
<b>Response</b>
<br>
200 - JSON Example:<br>
<code>
{<br>
'title' : 'Task1',<br>
'courseName' : 'advance Math',<br>
'description' : 'prepare by sunday',<br>
'dueDate' : {
'year' : 2015,
'month' : 12,
'day' : 23
}<br>
'isPersonal' : true,<br>
'task_id' : 589689456894<br>
}<br>
</code>
<br>
"""
user = get_user_by_token
if user is None:
return bad_request("Bad User Token")
arr = []
for courseId in user.courses_id_list:
query = Task.all()
try:
query.filter("courseId = ", int(courseId))
except Exception as e:
return bad_request("Bad id format")
for t in query.run():
taskDic =dict(json.loads(t.to_JSON()))
#add a key 'forSortDate' for sorting dates
taskTime = datetime.datetime(taskDic['dueDate']['year'], taskDic['dueDate']['month'], taskDic['dueDate']['day'])
if taskTime >= datetime.date.today():
taskDic['forSortDate'] = taskTime
arr.append(taskDic)
#sort array by date, and remove added key
arr = sorted(arr, key=itemgetter('forSortDate'), reverse=False)
for i in arr:
del i['forSortDate']
if len(arr) != 0:
return Response(response=json.dumps(arr),
status=200,
mimetype="application/json")
else:
return no_content()
@task_routes.route('/api/tasks/getTaskComponents/<string:token>/<string:taskId>', methods=["GET"]) @task_routes.route('/api/tasks/getTaskComponents/<string:token>/<string:taskId>', methods=["GET"])

View file

@ -8,7 +8,7 @@ from models.Course import Course
class Message(db.Model): class Message(db.Model):
groupId = db.IntegerProperty(required=True) groupId = db.IntegerProperty(required=True)
message = db.StringProperty(required=True) message = db.StringProperty(required=True, multiline=True)
msgDate = db.DateTimeProperty(required=True) msgDate = db.DateTimeProperty(required=True)
master_id = db.IntegerProperty(required=True) master_id = db.IntegerProperty(required=True)
isProject = db.BooleanProperty(default=False) isProject = db.BooleanProperty(default=False)

View file

@ -15,7 +15,7 @@ class Task(db.Model):
data = {'title' : self.title, data = {'title' : self.title,
'courseId' : self.courseId, 'courseId' : self.courseId,
'description' : self.description, 'description' : self.description,
'dueDate' : { 'dueDate' : {
'year': self.dueDate.year, 'year': self.dueDate.year,
'month': self.dueDate.month, 'month': self.dueDate.month,
'day': self.dueDate.day 'day': self.dueDate.day