From 01b6a76d305d298de2e0948ff27f230228366650 Mon Sep 17 00:00:00 2001
From: Matan Bar Yosef <baryosef.matan@gmail.com>
Date: Mon, 3 Aug 2015 23:51:52 +0300
Subject: [PATCH] - finish

---
 templates/js/controllers/homeController.js    | 3 +++
 templates/js/controllers/projectController.js | 4 ++++
 templates/views/home.html                     | 7 +++++--
 templates/views/project.html                  | 1 +
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/templates/js/controllers/homeController.js b/templates/js/controllers/homeController.js
index 032a7d1..a3eb34b 100644
--- a/templates/js/controllers/homeController.js
+++ b/templates/js/controllers/homeController.js
@@ -176,6 +176,9 @@ angular.module('SeHub')
     console.log($scope.courseObj);
   }
 
+  $scope.getDate = function(msg){
+    return msg.date.day.toString() + "-" + msg.date.month.toString() +"-"+ msg.date.year.toString() + "  " + msg.date.hour.toString() +":"+msg.date.minute.toString();
+  }
 
 
   $scope.chooseProjectClicked = function()
diff --git a/templates/js/controllers/projectController.js b/templates/js/controllers/projectController.js
index b1cf373..c108005 100644
--- a/templates/js/controllers/projectController.js
+++ b/templates/js/controllers/projectController.js
@@ -24,6 +24,10 @@ angular.module('SeHub')
 	console.log($scope.user.id)
 	// console.log($scope.projectid)
 
+	$scope.getDate = function(msg){
+    	return msg.date.day.toString() + "-" + msg.date.month.toString() +"-"+ msg.date.year.toString() + "  " + msg.date.hour.toString() +":"+msg.date.minute.toString();
+  	}
+
 	$scope.displayProjectMessages = function()
 	{
 		apiService.getAllUserMessages(token).success(function(data)
diff --git a/templates/views/home.html b/templates/views/home.html
index cbd2352..0751011 100644
--- a/templates/views/home.html
+++ b/templates/views/home.html
@@ -70,6 +70,7 @@
 											<div>
 												{{msg.group.courseName}}
 												{{msg.group.projectName}}
+												{{getDate(msg)}}
 											</div>
 										</div>
 										<div flex = "40">
@@ -83,8 +84,9 @@
 							<md-content class="md-padding">
 								<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}}
+										Title: {{task.title}}
+										<br/>{{(task.isPersonal) ? "A personal task": "A project task"}}
+										<div ng-repeat = "uName in task.usersToReview">	
 											<br></br>
 											<md-button ng-click="reviewTask(task.id, uName.id)">
 												Name: {{uName.name}}
@@ -167,6 +169,7 @@
 										<div>
 											{{msg.group.courseName}}
 											{{msg.group.projectName}}
+											{{getDate(msg)}}
 										</div>
 									</div>
 									<div flex = "40">
diff --git a/templates/views/project.html b/templates/views/project.html
index 1736c1c..87ec96b 100644
--- a/templates/views/project.html
+++ b/templates/views/project.html
@@ -119,6 +119,7 @@
 													<div>
 														{{msg.group.courseName}}
 														{{msg.group.projectName}}
+														{{getDate(msg)}}
 													</div>
 												</div>
 												<div flex = "40">