From 7a0db61a0d9ba8e1359f5d14392bc90e6a0872e0 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 6 Jan 2013 23:57:14 +0100 Subject: o Creating a recent badges view. --- src/main/webapp/apps/app.js | 58 ++++++++++++++++++--- src/main/webapp/apps/frontPageApp/badgeList.html | 46 +++++++++++++++++ src/main/webapp/apps/frontPageApp/frontPageApp.js | 63 +++++++++++++++++------ src/main/webapp/apps/frontPageApp/personList.html | 2 +- 4 files changed, 144 insertions(+), 25 deletions(-) create mode 100755 src/main/webapp/apps/frontPageApp/badgeList.html (limited to 'src/main/webapp/apps') diff --git a/src/main/webapp/apps/app.js b/src/main/webapp/apps/app.js index 3d200ec..36736cd 100644 --- a/src/main/webapp/apps/app.js +++ b/src/main/webapp/apps/app.js @@ -4,26 +4,32 @@ directives.filter('countBadgeByLevel', function () { return function (badges) { // 5 levels var levels = [0, 0, 0, 0, 0]; - angular.forEach(badges, function(value, key){ + angular.forEach(badges, function (value, key) { levels[value.level - 1]++; }); return levels; } }); +directives.filter('isodate', function () { + return function (date) { + return date.toISOString(); + } +}); + directives.filter('gz', function () { return function (num) { - if(angular.isArray(num)) { + if (angular.isArray(num)) { var out = []; - angular.forEach(num, function(x){ - if(x > 0) { + angular.forEach(num, function (x) { + if (x > 0) { out.push(x); } }); return out; } - else if(angular.isNumber(num)) { + else if (angular.isNumber(num)) { return num > 0; } console.log("fail"); @@ -44,9 +50,47 @@ directives.directive('badge', function () { scope: { badgeDetail: '=badgeDetail' }, - template: '{{badgeDetail.badge.name}}' + - '' + + template: '' + + ' {{badgeDetail.badge.name}}' + + ' ' + + '' + ' awarded to ' + '{{badgeDetail.person.name}}' } }); + +directives.directive('badgeSpan', function () { + var template = + '' + + ' {{badge.name}}' + + ' ' + + ''; + + return { + restrict: 'E', + scope: { + badge: '=badge' + }, + template: template + } +}); + +directives.directive('personLink', function () { + return { + restrict: 'E', + scope: { + person: '=person' + }, + template: '{{person.name}}' + } +}); + +directives.directive('personAvatar', function () { + return { + restrict: 'E', + scope: { + person: '=person' + }, + template: '' + } +}); diff --git a/src/main/webapp/apps/frontPageApp/badgeList.html b/src/main/webapp/apps/frontPageApp/badgeList.html new file mode 100755 index 0000000..7671a55 --- /dev/null +++ b/src/main/webapp/apps/frontPageApp/badgeList.html @@ -0,0 +1,46 @@ +
+ + + +
+

Badges Awarded

+
+ + + +
+
+
+
+

{{date | date:'mediumDate'}}

+
+
+
+
+ +
+ +
+
+
+ +
+
+
diff --git a/src/main/webapp/apps/frontPageApp/frontPageApp.js b/src/main/webapp/apps/frontPageApp/frontPageApp.js index 39dbc9d..5f1cf2c 100755 --- a/src/main/webapp/apps/frontPageApp/frontPageApp.js +++ b/src/main/webapp/apps/frontPageApp/frontPageApp.js @@ -1,8 +1,9 @@ 'use strict'; -var frontPageApp = angular.module('frontPageApp', ['ngGrid', 'person', 'badge', 'build', 'pagingTableService', 'core.directives']).config(function ($routeProvider, $locationProvider) { +var frontPageApp = angular.module('frontPageApp', ['ngGrid', 'person', 'badge', 'build', 'pagingTableService', 'core.directives']).config(function ($routeProvider) { $routeProvider. when('/', {controller: FrontPageCtrl, templateUrl: '/apps/frontPageApp/frontPage.html?noCache=' + noCache}). + when('/badge/', {controller: BadgeListCtrl, templateUrl: '/apps/frontPageApp/badgeList.html?noCache=' + noCache}). when('/person/', {controller: PersonListCtrl, templateUrl: '/apps/frontPageApp/personList.html?noCache=' + noCache}). when('/person/:personUuid', {controller: PersonCtrl, templateUrl: '/apps/frontPageApp/person.html?noCache=' + noCache}); }); @@ -12,28 +13,56 @@ function FrontPageCtrl($scope, Person, Badge) { $scope.recentBadges = Badge.query(); } -function PersonListCtrl($scope, Person, PagingTableService) { +function groupBy(array, size) { + var group = []; + var groups = []; + angular.forEach(array, function (element) { + group.push(element); + if (group.length == size) { + groups.push(group); + group = []; + } + }); + + if (group.length != 0) { + groups.push(group); + } + return groups; +} + +function BadgeListCtrl($scope, Badge, PagingTableService) { + var groupSize = 6; + var personsWatcher = function () { - var array = $scope.persons.rows; - - var group = []; - var groups = []; - angular.forEach(array, function(element) { - group.push(element); - if(group.length == 4) { - groups.push(group); - group = []; - } + var withDay = _.map($scope.badges.rows, function(badge) { + badge.day = new Date(badge.badge.createdDate).clearTime().getTime(); +// badge.day.clearTime(); + return badge; }); - if(group.length != 0) { - groups.push(group); - } + var byDay = _.groupBy(withDay, 'day'); + console.log("byDay", byDay); +// var dateGroups = _.map(byDay, function(group, date) { +// return {date: groupBy(group, groupSize)} +// }); + + $scope.badgeGroups = byDay; + }; + + $scope.badges = PagingTableService.create($scope, PagingTableService.defaultCallback(Badge), + {count: groupSize * 6, watcher: personsWatcher}); - $scope.personGroups = groups; + $scope.badgeGroups = []; +} + +function PersonListCtrl($scope, Person, PagingTableService) { + var groupSize = 4; + var personsWatcher = function () { + $scope.personGroups = groupBy($scope.persons.rows, groupSize); }; - $scope.persons = PagingTableService.create($scope, PagingTableService.defaultCallback(Person, {orderBy: "name"}), {count: 4 * 6, watcher: personsWatcher}); + $scope.persons = PagingTableService.create($scope, PagingTableService.defaultCallback(Person, {orderBy: "name"}), + {count: groupSize * 6, watcher: personsWatcher}); $scope.personGroups = []; } diff --git a/src/main/webapp/apps/frontPageApp/personList.html b/src/main/webapp/apps/frontPageApp/personList.html index 5247f29..5d7d8c6 100755 --- a/src/main/webapp/apps/frontPageApp/personList.html +++ b/src/main/webapp/apps/frontPageApp/personList.html @@ -25,7 +25,7 @@
- + {{person.person.name}}
-- cgit v1.2.3