CORD GUI -- User page has new layout, icons for bundle functions added, randomly generated session activity displayed.
Change-Id: I09fa44f2919df1c9b5e308efb2c0a9a47cbb626f
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/home/home.css b/apps/demo/cord-gui/src/main/webapp/app/view/home/home.css
index 1f44657..8f5002c 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/home/home.css
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/home/home.css
@@ -23,7 +23,7 @@
width: 42%;
}
#home div.move-down {
- margin-top: 19%;
+ margin-top: 10%;
}
#home div.image-holder {
@@ -60,12 +60,6 @@
#home table.users td {
font-size: 90%;
}
-#home table.users th {
- background-color: #7AB6EA;
- color: white;
- letter-spacing: 0.05em;
- font-weight: lighter;
-}
#home td, #home th {
text-align: left;
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/home/home.html b/apps/demo/cord-gui/src/main/webapp/app/view/home/home.html
index 2c634ee..a51ab18 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/home/home.html
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/home/home.html
@@ -37,7 +37,7 @@
<img ng-src="{{'/imgs/' + user.icon_id + '.png'}}">
</td>
<td>{{user.name}}</td>
- <td>Session Activity</td>
+ <td>{{shared.userActivity[user.id]}}</td>
</tr>
</tbody>
</table>
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/home/home.js b/apps/demo/cord-gui/src/main/webapp/app/view/home/home.js
index 4460f14..dc027e6 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/home/home.js
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/home/home.js
@@ -19,9 +19,13 @@
var urlSuffix = '/rs/dashboard';
+ function randomDate(start, end) {
+ return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));
+ }
+
angular.module('cordHome', [])
- .controller('CordHomeCtrl', ['$log', '$scope', '$resource',
- function ($log, $scope, $resource) {
+ .controller('CordHomeCtrl', ['$log', '$scope', '$resource', '$filter',
+ function ($log, $scope, $resource, $filter) {
var DashboardData, resource;
$scope.page.curr = 'dashboard';
@@ -31,6 +35,15 @@
function () {
$scope.bundle = resource.bundle;
$scope.users = resource.users;
+
+ if ($.isEmptyObject($scope.shared.userActivity)) {
+ $scope.users.forEach(function (user) {
+ var date = randomDate(new Date(2015, 0, 1), new Date());
+
+ $scope.shared.userActivity[user.id] = $filter('date')(date, 'mediumTime');
+ });
+ }
+
},
// error
function () {