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

Merge pull request #162 from sagidayan/UI

Browse source 
Ui
This commit is contained in:
Sagi Dayan 2015-08-03 02:55:50 +03:00
parent 245d1e332e 50085172a9
commit 09b6c37daf
5 changed files with 65 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
SE_API/TaskRoutes.py
View file

@ -703,9 +703,9 @@ def getAllUserTasks(token):
taskDic['forSortDate'] = taskTime
if t.isPersonal:
ownerId = user.key().id()
else:
ownerId = user.key().id()
if not t.isPersonal:
project = Project.all().filter("courseId = ", course.key().id())
for p in project.run():
if str(p.key().id()) in user.projects_id_list:
@ -1111,6 +1111,7 @@ def getAllUnsubmittedTasks(token):
taskDic['isPersonal'] = task.isPersonal
taskDic['usersToReview'] = []
taskDic['projectsToReview'] = []
taskDic['id'] = task.key().id()
tgs = TaskGrade.all().filter("taskId = ", task.key().id())
tcs = TaskComponent.all().filter("taskId = ", task.key().id()).filter("order = ", 0).filter("userId != ", -1)

51
templates/js/controllers/homeController.js
View file

@ -7,6 +7,7 @@ angular.module('SeHub')
$scope.oldText = "";
$scope.messages = [];
$scope.userMessages = [];
$scope.unSubmittedTasks = [];
$scope.userTasks = [];
$scope.messagesDisplay = [];
$scope.courses = [];
@ -66,26 +67,27 @@ angular.module('SeHub')
$scope.msg.msgToAdd = null;
}
$scope.reviewTask = function(task)
$scope.reviewTask = function(taskId, groupId)
{
//tasks/overview/:taskId/:submitterId/:gId', {
if(task.isPersonal) // As Lecturer
{
$location.path('/tasks/overview/' + task.id + '/' + $scope.user.id + '/' + $scope.user.id);
}
else // it's a project task
{
apiService.getProjectsByCourse(token, task.courseId).success(function(data)
{
for(var i = 0; i < $scope.user.projects_id_list.length; i++)
for(var j = 0; j < data.length; j++)
if($scope.user.projects_id_list[i] === data[j].id.toString())
$location.path('/tasks/overview/' + task.id + '/' + data[j].id + '/' + data[j].id);
}).error(function(err)
{
console.log(err.message);
});
}
// if(task.isPersonal) // As Lecturer
// {
$location.path('/tasks/overview/' + taskId + '/' + groupId + '/' + groupId);
// }
// else // it's a project task
// {
// apiService.getProjectsByCourse(token, task.courseId).success(function(data)
// {
// for(var i = 0; i < $scope.user.projects_id_list.length; i++)
// for(var j = 0; j < data.length; j++)
// if($scope.user.projects_id_list[i] === data[j].id.toString())
// $location.path('/tasks/overview/' + task.id + '/' + data[j].id + '/' + data[j].id);
// }).error(function(err)
// {
// console.log(err.message);
// });
// }
}
$scope.gotoTask = function(task)
@ -118,7 +120,6 @@ angular.module('SeHub')
apiService.getAllFutureTasks(token).success(function(data) // Get all Tasks // TODO change to closest TASK
{
$scope.userTasks = data;
console.log($scope.userTasks);
}).error(function(err)
{
console.log(err.message);
@ -193,6 +194,8 @@ angular.module('SeHub')
console.log($scope.courseObj);
}
$scope.chooseProjectClicked = function()
{
console.log("choose project Clicked!!");
@ -205,6 +208,16 @@ angular.module('SeHub')
{
$scope.displayMessages(); // // Display all messages in message feed and the latest one
}
apiService.getAllUnsubmittedTasks(token).success(function(data)
{
console.log(data);
$scope.unSubmittedTasks = data;
}).error(function(err)
{
console.log(err.message);
});
// $scope.displayMessages();
$scope.displayTasks(); // Display all tasks in task feed and the latest one
// $scope.getProjects(); // Get all projects info

3
templates/js/controllers/taskController.js
View file

@ -108,6 +108,9 @@ angular.module('SeHub')
$location.path('/tasks/overview/' + taskId + '/' + groupId + '/' + groupId);
});
}).error(function(err)
{
console.log(err.message);
})
} else {

8
templates/js/services/apiService.js
View file

@ -117,6 +117,14 @@ service.factory('apiService', ['$http', function($http) {
};
return $http(req);
},
getAllUnsubmittedTasks: function(token){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/tasks/getAllUnsubmittedTasks/" + token;
req = {
method : "GET",
url : url
};
return $http(req);
},
getAllFutureTasks: function(token, courseId){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/tasks/getAllFutureTasks/" + token + "/" + courseId;
req = {

28
templates/views/home.html
View file

@ -81,16 +81,24 @@
</md-tab>
<md-tab label="Tasks waiting for review">
<md-content class="md-padding">
<md-card ng-repeat = "task in userTasks" layout-padding>
<div>
Title:
<md-button ng-click="reviewTask(task)">
{{task.title}}
</md-button>
<br></br>
Description: {{task.description}}
</div>
</md-card>
<div ng-repeat = "course in unSubmittedTasks">
<md-card ng-repeat = "task in course.tasks" layout-padding>
<div ng-repeat = "uName in task.usersToReview">
Title: {{task.title}}
<br></br>
<md-button ng-click="reviewTask(task.id, uName.id)">
Name: {{uName.name}}
</md-button>
</div>
<div ng-repeat = "projName in task.projectsToReview">
Title: {{task.title}}
<br></br>
<md-button ng-click="reviewTask(task.id, projName.id)">
Name: {{projName.projectName}}
</md-button>
</div>
</md-card>
</div>
</md-content>
</md-tab>
</md-tabs>