From 21a6b817233c8307ce809f08c27020821823811c Mon Sep 17 00:00:00 2001 From: basvtholt Date: Tue, 23 Jan 2018 14:55:56 +0100 Subject: [PATCH 1/5] Commit to merge develop --- src/main/resources/data.sql | 6 ++- .../app/components/dashboard.component.js | 29 +++++++++----- .../dashboardGroupOverview.component.html | 4 ++ .../app/components/empty.component.html | 3 ++ .../public/app/components/empty.component.js | 3 ++ src/main/resources/public/app/js/app.js | 3 ++ .../public/app/pages/dashboard-teacher.html | 39 ++++++++++++++++++- .../resources/public/app/pages/dashboard.html | 4 +- .../resources/public/app/styles/dashboard.css | 12 ++++++ src/main/resources/public/index.html | 2 +- 10 files changed, 90 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/public/app/components/dashboardGroupOverview.component.html create mode 100644 src/main/resources/public/app/components/empty.component.html create mode 100644 src/main/resources/public/app/components/empty.component.js diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 7ad942b..a8550ae 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1,7 +1,8 @@ INSERT INTO `user` (`id`, `email`, `name`, `password`, `verified`, `reference_id`) VALUES (1, "john.doe@student.stenden.com", "John Doe", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '123456'), (2, "jane.doe@stenden.com", "Jane Doe", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '654321'), - (3, "admin@stenden.com", "Administrator", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '987555'); + (3, "admin@stenden.com", "Administrator", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '987555'), + (4, "test.doe@student.stenden.com", "John Doe", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '123456'); INSERT INTO `role` (`id`, `code`, `label`) VALUES (1, "STUDENT_ROLE", "Student"), @@ -11,7 +12,8 @@ INSERT INTO `role` (`id`, `code`, `label`) VALUES INSERT INTO `user_roles` (`user_id`, `role_id`) VALUES (1, 1), (2, 2), - (3, 3); + (3, 3), + (4, 1); INSERT INTO `education` (`id`, `name`) VALUES (1, "INF"), diff --git a/src/main/resources/public/app/components/dashboard.component.js b/src/main/resources/public/app/components/dashboard.component.js index 7d5fec1..f82784f 100644 --- a/src/main/resources/public/app/components/dashboard.component.js +++ b/src/main/resources/public/app/components/dashboard.component.js @@ -1,5 +1,5 @@ -function DashboardCtrl($scope, StudentGroupsService, UserService){ - var ctrl = this; +function DashboardCtrl($scope, $state, StudentGroupsService, UserService, GroupService){ + let ctrl = this; $scope.init = function(){ ctrl.closed = 0; @@ -9,9 +9,13 @@ function DashboardCtrl($scope, StudentGroupsService, UserService){ UserService.getSelf().then(user => { ctrl.self = user; - StudentGroupsService.getStudentGroups(ctrl.self.data.id).then(function(response){ + GroupService.getGroupsByUserId(ctrl.self.data.id).then(function(response){ ctrl.groupsDetails = response.data; + if(ctrl.groupsDetails.length == 0){ + $state.transitionTo('app.empty'); + } + angular.forEach(ctrl.groupsDetails, function(value, key) { StudentGroupsService.getGradingStatus(value.id).then(function(response){ if(response.data.status == "CLOSED"){ @@ -19,7 +23,7 @@ function DashboardCtrl($scope, StudentGroupsService, UserService){ }else if(response.data.status == "OPEN"){ ctrl.open += 1; }else if(response.data.status == "PENDING"){ - $ctrl.pending += 1; + ctrl.pending += 1; } }) }); @@ -28,7 +32,11 @@ function DashboardCtrl($scope, StudentGroupsService, UserService){ } } -app.component('dashboardCourseOverview', { +app.component('dashboardProjectsOverview', { + templateUrl: '/app/components/dashboardProjectsOverview.component.html', + controller: DashboardCtrl +}) +.component('dashboardCourseOverview', { templateUrl: '/app/components/dashboardCourseOverview.component.html', controller: GroupCardCtrl, bindings: { @@ -36,10 +44,6 @@ app.component('dashboardCourseOverview', { group: '<', } }) -.component('dashboardProjectsOverview', { - templateUrl: '/app/components/dashboardProjectsOverview.component.html', - controller: DashboardCtrl -}) .component('dashboardGradeOverview', { templateUrl: '/app/components/dashboardGradeOverview.component.html', controller: GroupCardCtrl, @@ -47,4 +51,11 @@ app.component('dashboardCourseOverview', { user: '<', group: '<', } +}) +.component('dashboardGroupOverview', { + templateUrl: '/app/components/dashboardGroupOverview.component.html', + controller: DashboardCtrl, + bindings: { + group: '<' + } }); \ No newline at end of file diff --git a/src/main/resources/public/app/components/dashboardGroupOverview.component.html b/src/main/resources/public/app/components/dashboardGroupOverview.component.html new file mode 100644 index 0000000..ad25edf --- /dev/null +++ b/src/main/resources/public/app/components/dashboardGroupOverview.component.html @@ -0,0 +1,4 @@ +
+

Group

+ {{$ctrl.group}} +
diff --git a/src/main/resources/public/app/components/empty.component.html b/src/main/resources/public/app/components/empty.component.html new file mode 100644 index 0000000..4ef4de7 --- /dev/null +++ b/src/main/resources/public/app/components/empty.component.html @@ -0,0 +1,3 @@ +
+ Nothing to see here...yet +
\ No newline at end of file diff --git a/src/main/resources/public/app/components/empty.component.js b/src/main/resources/public/app/components/empty.component.js new file mode 100644 index 0000000..af36b67 --- /dev/null +++ b/src/main/resources/public/app/components/empty.component.js @@ -0,0 +1,3 @@ +app.component('empty', { + templateUrl: '/app/components/empty.component.html' +}) diff --git a/src/main/resources/public/app/js/app.js b/src/main/resources/public/app/js/app.js index 6a68f67..4e3268d 100644 --- a/src/main/resources/public/app/js/app.js +++ b/src/main/resources/public/app/js/app.js @@ -207,5 +207,8 @@ app.config(function ($stateProvider) { return AuthService.authenticate(); }, }, + }) + .state('app.empty', { + component: 'empty' }); }); \ No newline at end of file diff --git a/src/main/resources/public/app/pages/dashboard-teacher.html b/src/main/resources/public/app/pages/dashboard-teacher.html index 64834a2..24e58e5 100644 --- a/src/main/resources/public/app/pages/dashboard-teacher.html +++ b/src/main/resources/public/app/pages/dashboard-teacher.html @@ -1 +1,38 @@ -

Teacher Dashboard

\ No newline at end of file +
+
+
+ + + Projects Overview + + + +
+
+
+
+ + + Groups with finalized grade +
+ +
+ + +
+
+ + + Groups without grade + + +
+
+ + + Groups that are grading + + +
+
+
\ No newline at end of file diff --git a/src/main/resources/public/app/pages/dashboard.html b/src/main/resources/public/app/pages/dashboard.html index e5790f2..a4b4060 100644 --- a/src/main/resources/public/app/pages/dashboard.html +++ b/src/main/resources/public/app/pages/dashboard.html @@ -1,4 +1,4 @@ -
+
@@ -15,7 +15,7 @@ Projects Overview - +
diff --git a/src/main/resources/public/app/styles/dashboard.css b/src/main/resources/public/app/styles/dashboard.css index 6f1a9f7..8bc5ba9 100644 --- a/src/main/resources/public/app/styles/dashboard.css +++ b/src/main/resources/public/app/styles/dashboard.css @@ -34,4 +34,16 @@ md-grid-list md-card table button{ } .grade{ font-size: 26px; +} +.empty-page-wrap{ + display: table; + width: 100%; + height: 90%; + text-align: center; +} +.empty-page-txt{ + color: rgba(0, 0, 0, 0.3); + display: table-cell; + vertical-align: middle; + font-size: 2.5em; } \ No newline at end of file diff --git a/src/main/resources/public/index.html b/src/main/resources/public/index.html index dcd6484..7991608 100644 --- a/src/main/resources/public/index.html +++ b/src/main/resources/public/index.html @@ -58,7 +58,7 @@ - + From c4a5fa52bf5a507bf469d5624a7723c6f59625d2 Mon Sep 17 00:00:00 2001 From: basvtholt Date: Thu, 25 Jan 2018 12:58:18 +0100 Subject: [PATCH 2/5] added empty state + teacher dashboard --- .../app/components/dashboard.component.js | 22 +++--- .../dashboardCourseOverview.component.html | 33 ++++----- .../dashboardGradeOverview.component.html | 11 +-- .../dashboardGroupOverview.component.html | 30 +++++++- .../dashboardProjectsOverview.component.html | 2 +- .../app/components/groupCard.component.js | 3 + src/main/resources/public/app/js/groups.js | 23 ++++++- .../public/app/pages/dashboard-teacher.html | 68 ++++++++++++++++--- .../resources/public/app/pages/dashboard.html | 8 ++- .../resources/public/app/styles/dashboard.css | 13 ++++ 10 files changed, 164 insertions(+), 49 deletions(-) diff --git a/src/main/resources/public/app/components/dashboard.component.js b/src/main/resources/public/app/components/dashboard.component.js index f82784f..2a9e6bb 100644 --- a/src/main/resources/public/app/components/dashboard.component.js +++ b/src/main/resources/public/app/components/dashboard.component.js @@ -1,7 +1,7 @@ -function DashboardCtrl($scope, $state, StudentGroupsService, UserService, GroupService){ +function DashboardCtrl($scope, $state, StudentGroupsService, UserService, GroupService, CourseService){ let ctrl = this; - $scope.init = function(){ + ctrl.init = function(){ ctrl.closed = 0; ctrl.open = 0; ctrl.pending = 0; @@ -17,13 +17,17 @@ function DashboardCtrl($scope, $state, StudentGroupsService, UserService, GroupS } angular.forEach(ctrl.groupsDetails, function(value, key) { - StudentGroupsService.getGradingStatus(value.id).then(function(response){ - if(response.data.status == "CLOSED"){ - ctrl.closed += 1; - }else if(response.data.status == "OPEN"){ - ctrl.open += 1; - }else if(response.data.status == "PENDING"){ - ctrl.pending += 1; + GroupService.getGradingStatus(value.id).then(function(response){ + switch(response.data.status){ + case 'CLOSED': + ctrl.closed += 1; + break; + case 'OPEN': + ctrl.open += 1; + break; + case 'PENDING': + ctrl.pending += 1; + break; } }) }); diff --git a/src/main/resources/public/app/components/dashboardCourseOverview.component.html b/src/main/resources/public/app/components/dashboardCourseOverview.component.html index a6177a2..9edc9e5 100644 --- a/src/main/resources/public/app/components/dashboardCourseOverview.component.html +++ b/src/main/resources/public/app/components/dashboardCourseOverview.component.html @@ -1,31 +1,26 @@ -
+
- - - + + + - - + + - - -
{{$ctrl.name}}
StatusGroup gradeYour gradeStatusGroup gradeYour grade
{{$ctrl.groupStatus}}{{$ctrl.group.groupGrade.grade}}{{$ctrl.groupStatus}}{{$ctrl.groupGrade}} {{$ctrl.finalGrade}}
-
-
- {{member.name}},   -
-
- {{member.name}} -
-
-
-
+
+
+ {{member.name}},   +
+
+ {{member.name}} +
+
diff --git a/src/main/resources/public/app/components/dashboardGradeOverview.component.html b/src/main/resources/public/app/components/dashboardGradeOverview.component.html index daaba22..e3f4d48 100644 --- a/src/main/resources/public/app/components/dashboardGradeOverview.component.html +++ b/src/main/resources/public/app/components/dashboardGradeOverview.component.html @@ -1,7 +1,7 @@ -
+
- + @@ -9,10 +9,11 @@ - +
{{$ctrl.course.name}}{{$ctrl.group.course.name}}
Group gradeChange in grade
{{$ctrl.group.groupGrade.grade}} + {{$ctrl.groupGrade}} + {{$ctrl.finalGrade}} {{$ctrl.calculateGradeChange($ctrl.group.groupGrade.grade, $ctrl.finalGrade)}}
-
-
\ No newline at end of file +
diff --git a/src/main/resources/public/app/components/dashboardGroupOverview.component.html b/src/main/resources/public/app/components/dashboardGroupOverview.component.html index ad25edf..470701e 100644 --- a/src/main/resources/public/app/components/dashboardGroupOverview.component.html +++ b/src/main/resources/public/app/components/dashboardGroupOverview.component.html @@ -1,4 +1,28 @@ -
-

Group

- {{$ctrl.group}} +
+ + + + + + + + + + + + + + + + + +
Course{{$ctrl.group.course.name}}
Education{{$ctrl.group.course.education.name}}
Group name{{$ctrl.group.groupName}}
Group grade{{$ctrl.group.groupGrade.grade}}
+
+
+ {{member.name}},   +
+
+ {{member.name}} +
+
diff --git a/src/main/resources/public/app/components/dashboardProjectsOverview.component.html b/src/main/resources/public/app/components/dashboardProjectsOverview.component.html index c8c2def..a3a5a73 100644 --- a/src/main/resources/public/app/components/dashboardProjectsOverview.component.html +++ b/src/main/resources/public/app/components/dashboardProjectsOverview.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/main/resources/public/app/components/groupCard.component.js b/src/main/resources/public/app/components/groupCard.component.js index deefa4e..831b390 100644 --- a/src/main/resources/public/app/components/groupCard.component.js +++ b/src/main/resources/public/app/components/groupCard.component.js @@ -3,11 +3,14 @@ function GroupCardCtrl($state, StudentGroupsService, CourseService) { let ctrl = this; ctrl.groupMembers = []; + ctrl.groupGrade = ''; ctrl.$onInit = () => { ctrl.name = ctrl.group.groupName; + ctrl.groupGrade = (ctrl.group.groupGrade == null) ? 'TBD' : ctrl.group.groupGrade.grade; + StudentGroupsService.getFinalGroupGrade(ctrl.group.id, ctrl.user.id).then((response) => { if (response.data.grade) { ctrl.finalGrade = response.data.grade; diff --git a/src/main/resources/public/app/js/groups.js b/src/main/resources/public/app/js/groups.js index 853e9d3..09ef18b 100644 --- a/src/main/resources/public/app/js/groups.js +++ b/src/main/resources/public/app/js/groups.js @@ -13,7 +13,8 @@ app.controller('StudentGroupsCtrl', function ($scope, UserService, StudentGroups }); app.controller('TeacherGroupsCtrl', function ($scope, $mdDialog, UserService, GroupService) { - $scope.status = ' '; + $scope.limit = 10; + $scope.limitOptions = [5, 10, 15, 20, 50, 100]; $scope.teacherGroupList = []; $scope.onInit = () => { $scope.getGroups(); @@ -22,6 +23,26 @@ app.controller('TeacherGroupsCtrl', function ($scope, $mdDialog, UserService, Gr UserService.getSelf().then((response) => { return GroupService.getGroupsByUserId(response.data.id).then((response) => { $scope.teacherGroupList = response.data; + + $scope.closed = []; + $scope.pending = []; + $scope.open = []; + + angular.forEach($scope.teacherGroupList, function(value, key) { + GroupService.getGradingStatus(value.id).then(function(response){ + switch(response.data.status){ + case "CLOSED": + $scope.closed.push(value); + break; + case "PENDING": + $scope.pending.push(value); + break; + case "OPEN": + $scope.open.push(value); + break; + } + }) + }); }); }); diff --git a/src/main/resources/public/app/pages/dashboard-teacher.html b/src/main/resources/public/app/pages/dashboard-teacher.html index 24e58e5..e37c147 100644 --- a/src/main/resources/public/app/pages/dashboard-teacher.html +++ b/src/main/resources/public/app/pages/dashboard-teacher.html @@ -13,26 +13,78 @@
- Groups with finalized grade -
+ + + + {{option}} + + + + +
+
+
+
+ + + Recent closed + -
+ +
- + - Groups without grade + Recent open + + + +
- + - Groups that are grading + Recent pending + + + +
- \ No newline at end of file + + + + + \ No newline at end of file diff --git a/src/main/resources/public/app/pages/dashboard.html b/src/main/resources/public/app/pages/dashboard.html index a4b4060..a3264d0 100644 --- a/src/main/resources/public/app/pages/dashboard.html +++ b/src/main/resources/public/app/pages/dashboard.html @@ -1,15 +1,16 @@
-
-
+
+
+
-
+
@@ -25,6 +26,7 @@ Grade Overview
+
diff --git a/src/main/resources/public/app/styles/dashboard.css b/src/main/resources/public/app/styles/dashboard.css index 8bc5ba9..aca4882 100644 --- a/src/main/resources/public/app/styles/dashboard.css +++ b/src/main/resources/public/app/styles/dashboard.css @@ -46,4 +46,17 @@ md-grid-list md-card table button{ display: table-cell; vertical-align: middle; font-size: 2.5em; +} +.caption-compact{ + margin: 5px 0 !important; +} +.dashboard-select{ + max-width: 15%; +} +.teacher-dashboard-groups{ + max-height: 1000px; + overflow-x: auto; +} +.align-status{ + width: 33%; } \ No newline at end of file From fd585e2df16b36cebffa9fabec11e019f9ed136a Mon Sep 17 00:00:00 2001 From: basvtholt Date: Thu, 25 Jan 2018 13:20:16 +0100 Subject: [PATCH 3/5] resolved merge conflicts - data.sql --- src/main/resources/data.sql | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 1cc4cf3..2cd6e5c 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1,16 +1,9 @@ INSERT INTO `user` (`id`, `email`, `name`, `password`, `verified`, `reference_id`) VALUES -<<<<<<< HEAD - (1, "john.doe@student.stenden.com", "John Doe", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '123456'), - (2, "jane.doe@stenden.com", "Jane Doe", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '654321'), - (3, "admin@stenden.com", "Administrator", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '987555'), - (4, "test.doe@student.stenden.com", "John Doe", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '123456'); -======= (1, "pascal.drewes@student.stenden.com", "Pascal Drewes", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, "123456"), (2, "admin@stenden.com", "Administrator", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '987555'), (3, "cas.van.dinter@student.stenden.com", "Cas van Dinter", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, "123456"), (4, "danny.hooijer@student.stenden.com", "Danny Hooijer", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, "123456"), (5, "bas.van.t.holt@stenden.com", "Bas van't Holt", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, "123456"); ->>>>>>> 105352b401274b6ff2367ac5b4f1c8c52968ed58 INSERT INTO `role` (`id`, `code`, `label`) VALUES (1, "STUDENT_ROLE", "Student"), @@ -19,16 +12,10 @@ INSERT INTO `role` (`id`, `code`, `label`) VALUES INSERT INTO `user_roles` (`user_id`, `role_id`) VALUES (1, 1), -<<<<<<< HEAD - (2, 2), - (3, 3), - (4, 1); -======= (2, 3), (3, 1), (4, 1), (5, 2); ->>>>>>> 105352b401274b6ff2367ac5b4f1c8c52968ed58 INSERT INTO `education` (`id`, `name`) VALUES (1, "INF"), From 9c07bd01d0be97da125d8a46cf4cc08faba7ee38 Mon Sep 17 00:00:00 2001 From: basvtholt Date: Thu, 25 Jan 2018 13:21:26 +0100 Subject: [PATCH 4/5] Removed outcommented code --- .../public/app/pages/dashboard-teacher.html | 31 +------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/src/main/resources/public/app/pages/dashboard-teacher.html b/src/main/resources/public/app/pages/dashboard-teacher.html index e37c147..e71765b 100644 --- a/src/main/resources/public/app/pages/dashboard-teacher.html +++ b/src/main/resources/public/app/pages/dashboard-teacher.html @@ -58,33 +58,4 @@
-
- - - - \ No newline at end of file +
\ No newline at end of file From a342a61e9f9901daeab38eb837508ffeb4da213c Mon Sep 17 00:00:00 2001 From: basvtholt Date: Thu, 25 Jan 2018 13:28:45 +0100 Subject: [PATCH 5/5] Removed redundant init calls --- .../dashboardCourseOverview.component.html | 44 ++++++++-------- .../dashboardGradeOverview.component.html | 36 +++++++------ .../dashboardGroupOverview.component.html | 50 +++++++++---------- 3 files changed, 62 insertions(+), 68 deletions(-) diff --git a/src/main/resources/public/app/components/dashboardCourseOverview.component.html b/src/main/resources/public/app/components/dashboardCourseOverview.component.html index 9edc9e5..5320e44 100644 --- a/src/main/resources/public/app/components/dashboardCourseOverview.component.html +++ b/src/main/resources/public/app/components/dashboardCourseOverview.component.html @@ -1,26 +1,24 @@ -
-
Projects closed
- - - - - - - - - - - - - -
{{$ctrl.name}}
StatusGroup gradeYour grade
{{$ctrl.groupStatus}}{{$ctrl.groupGrade}}{{$ctrl.finalGrade}}
-
-
- {{member.name}},   -
-
- {{member.name}} -
+ + + + + + + + + + + + + + +
{{$ctrl.name}}
StatusGroup gradeYour grade
{{$ctrl.groupStatus}}{{$ctrl.groupGrade}}{{$ctrl.finalGrade}}
+
+
+ {{member.name}},  
+
+ {{member.name}} +
diff --git a/src/main/resources/public/app/components/dashboardGradeOverview.component.html b/src/main/resources/public/app/components/dashboardGradeOverview.component.html index e3f4d48..78c3241 100644 --- a/src/main/resources/public/app/components/dashboardGradeOverview.component.html +++ b/src/main/resources/public/app/components/dashboardGradeOverview.component.html @@ -1,19 +1,17 @@ -
- - - - - - - - - - - - - - -
{{$ctrl.group.course.name}}
Group gradeYour gradeChange in grade
- {{$ctrl.groupGrade}} - {{$ctrl.finalGrade}}{{$ctrl.calculateGradeChange($ctrl.group.groupGrade.grade, $ctrl.finalGrade)}}
-
+ + + + + + + + + + + + + + +
{{$ctrl.group.course.name}}
Group gradeYour gradeChange in grade
+ {{$ctrl.groupGrade}} + {{$ctrl.finalGrade}}{{$ctrl.calculateGradeChange($ctrl.group.groupGrade.grade, $ctrl.finalGrade)}}
diff --git a/src/main/resources/public/app/components/dashboardGroupOverview.component.html b/src/main/resources/public/app/components/dashboardGroupOverview.component.html index 470701e..ff02376 100644 --- a/src/main/resources/public/app/components/dashboardGroupOverview.component.html +++ b/src/main/resources/public/app/components/dashboardGroupOverview.component.html @@ -1,28 +1,26 @@ -
- - - - - - - - - - - - - - - - - -
Course{{$ctrl.group.course.name}}
Education{{$ctrl.group.course.education.name}}
Group name{{$ctrl.group.groupName}}
Group grade{{$ctrl.group.groupGrade.grade}}
-
-
- {{member.name}},   -
-
- {{member.name}} -
+ + + + + + + + + + + + + + + + + +
Course{{$ctrl.group.course.name}}
Education{{$ctrl.group.course.education.name}}
Group name{{$ctrl.group.groupName}}
Group grade{{$ctrl.group.groupGrade.grade}}
+
+
+ {{member.name}},  
+
+ {{member.name}} +