Merge pull request #162 from sagidayan/UI

Ui

SE_API/TaskRoutes.py

@@ -703,9 +703,9 @@ def getAllUserTasks(token):
             taskDic['forSortDate'] = taskTime
 
 
-            if t.isPersonal:
+
             ownerId = user.key().id()
-            else:
+            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)

templates/js/controllers/homeController.js

@@ -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
+
-    {
+    // if(task.isPersonal) // As Lecturer
-      $location.path('/tasks/overview/' + task.id + '/' + $scope.user.id + '/' + $scope.user.id);
+    // {
-    }
+      $location.path('/tasks/overview/' + taskId + '/' + groupId + '/' + groupId);
-    else // it's a project task
+    // }
-    { 
+    // else // it's a project task
-      apiService.getProjectsByCourse(token, task.courseId).success(function(data)
+    // { 
-      {
+    //   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++)
+    //     for(var i = 0; i < $scope.user.projects_id_list.length; i++)
-            if($scope.user.projects_id_list[i] === data[j].id.toString())
+    //       for(var j = 0; j < data.length; j++)
-              $location.path('/tasks/overview/' + task.id + '/' + data[j].id + '/' + data[j].id);
+    //         if($scope.user.projects_id_list[i] === data[j].id.toString())
-      }).error(function(err)
+    //           $location.path('/tasks/overview/' + task.id + '/' + data[j].id + '/' + data[j].id);
-      {
+    //   }).error(function(err)
-        console.log(err.message);
+    //   {
-      });
+    //     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

templates/js/controllers/taskController.js

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

templates/js/services/apiService.js

@@ -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 = {

templates/views/home.html

@@ -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 ng-repeat = "course in unSubmittedTasks">
-									<div>
+									<md-card ng-repeat = "task in course.tasks" layout-padding>
-										Title: 
+										<div ng-repeat = "uName in task.usersToReview">
-										<md-button ng-click="reviewTask(task)">
+											Title: {{task.title}}
-											{{task.title}}
-										</md-button>
 											<br></br>
-										Description: {{task.description}}
+											<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>