Skip to content

Commit

Permalink
Improved and fixed activity participants view
Browse files Browse the repository at this point in the history
  • Loading branch information
@gorco
gorco committed Mar 21, 2018
1 parent 533f052 commit 6119509
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 43 deletions.
4 changes: 2 additions & 2 deletions app/public/js/controllers/activity.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ angular.module('activityApp', ['myApp', 'ngStorage', 'services'])
}
if ($scope.unlockedGroups) {
$http.put(route, {groups: $scope.activity.groups}).success(function (data) {
$scope.class = data;
$scope.activity = data;
$scope.unlockedGroups = false;
}).error(function (data, status) {
console.error('Error on put' + route + ' ' +
Expand All @@ -315,7 +315,7 @@ angular.module('activityApp', ['myApp', 'ngStorage', 'services'])
}
if ($scope.unlockedGroupings) {
$scope.put(route, {groupings: $scope.activity.groupings}).success(function (data) {
$scope.class = data;
$scope.activity = data;
$scope.unlockedGroupings = false;
}).error(function (data, status) {
console.error('Error on put' + route + ' ' +
Expand Down
41 changes: 0 additions & 41 deletions app/views/view/data/participants.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,13 @@
thead
tr
th Teacher
th(ng-show='selectedGroup') Add or Remove
th(ng-show='selectedGroup') Remove
tbody
tr(ng-if='class.participants.teachers.length == 0')
td(colspan=6)
div.alert.alert-warning(style='margin-bottom: 0px') No students found
tr(ng-repeat='teacher in class.participants.teachers')
td(ng-class='getUserThClass(teacher, "teachers")')
label {{teacher}}
td(ng-show='selectedGroup && !isInSelectedGroup(teacher, "teachers")' ng-class='isInSelectedGroup(teacher, "teachers") ? "bg-success" : ""')
a(ng-click='modifyGroup(teacher, "teacher", true)')
span.glyphicon.glyphicon-plus
td(ng-show='isInSelectedGroup(teacher, "teachers")' ng-class='isInSelectedGroup(teacher, "teachers") ? "bg-success" : ""')
a(ng-click='modifyGroup(teacher, "teacher", false)')
span.glyphicon.glyphicon-minus
td(ng-show='!selectedGroup && !selectedGrouping' ng-class='isInSelectedGroup(teacher, "teachers") ? "bg-success" : ""')
a(ng-if='isRemovable(teacher)' ng-click='ejectUser(teacher, "teacher")')
span.glyphicon.glyphicon-remove-sign
.panel.panel-default
.panel-heading
h3
Expand All @@ -70,24 +59,13 @@
thead
tr
th Assistant
th(ng-show='selectedGroup') Add or Remove
th(ng-show='!selectedGroup') Remove
tbody
tr(ng-if='class.participants.assistants.length == 0')
td(colspan=6)
div.alert.alert-warning(style='margin-bottom: 0px') No assistants found
tr(ng-repeat='assistant in class.participants.assistants')
td(ng-class='getUserThClass(assistant, "assistants")')
label {{assistant}}
td(ng-show='!selectedGroup && !isInSelectedGroup(assistant, "assistants")' ng-class='isInSelectedGroup(assistant, "assistants") ? "bg-success" : ""')
a(ng-click='modifyGroup(assistant, "assistant", true)')
span.glyphicon.glyphicon-plus
td(ng-show='isInSelectedGroup(assistant, "assistants")' ng-class='isInSelectedGroup(assistant, "assistants") ? "bg-success" : ""')
a(ng-click='modifyGroup(assistant, "assistant", false)')
span.glyphicon.glyphicon-minus
td(ng-show='!selectedGroup && !selectedGrouping' ng-class='isInSelectedGroup(assistant, "assistants") ? "bg-success" : ""')
a(ng-click='ejectUser(assistant, "assistant")')
span.glyphicon.glyphicon-remove-sign
.panel.panel-default
.panel-heading
h3
Expand All @@ -97,24 +75,13 @@
thead
tr
th Student
th(ng-show='selectedGroup') Add or Remove
th(ng-show='!selectedGroup') Remove
tbody
tr(ng-if='class.participants.students.length == 0')
td(colspan=6)
div.alert.alert-warning(style='margin-bottom: 0px') No students found
tr(ng-repeat='student in class.participants.students')
td(ng-class='getUserThClass(student, "students")')
label {{student}}
td(ng-show='selectedGroup && !isInSelectedGroup(student, "students")' ng-class='isInSelectedGroup(student, "students") ? "bg-success" : ""')
a(ng-click='modifyGroup(student, "student", true)')
span.glyphicon.glyphicon-plus
td(ng-show='isInSelectedGroup(student, "students")' ng-class='isInSelectedGroup(student, "students") ? "bg-success" : ""')
a(ng-click='modifyGroup(student, "student", false)')
span.glyphicon.glyphicon-minus
td(ng-show='!selectedGroup && !selectedGrouping' ng-class='isInSelectedGroup(student, "students") ? "bg-success" : ""')
a(ng-click='ejectUser(student, "student")')
span.glyphicon.glyphicon-remove-sign
.col-md-6
.panel.panel-default
.panel-heading
Expand All @@ -131,7 +98,6 @@
tr
th Group
th(ng-if='unlockedGroups') Use this groups in the class
th Remove
tbody
tr(ng-if='classGroups.length == 0')
td(colspan=6)
Expand All @@ -148,9 +114,6 @@
td(ng-show='selectedGrouping && isInSelectedGrouping(group._id, "group")' ng-class='getGroupThClass(group)')
a.btn(ng-click='modifyGrouping(group, false)')
span.glyphicon.glyphicon-minus
td(ng-show='!selectedGrouping' ng-class='getGroupThClass(group)')
a.btn(ng-click='removeGroup(group)')
span.glyphicon.glyphicon-remove-sign
.panel.panel-default
.panel-heading
.row
Expand All @@ -166,7 +129,6 @@
tr
th Grouping
th(ng-if='unlockedGroupings') Use this groupings in the class
th Remove
tbody
tr(ng-if='classGroupings.length == 0')
td(colspan=6)
Expand All @@ -177,6 +139,3 @@
td(ng-if='unlockedGroupings')
a.btn(ng-click='checkGrouping(grouping)')
span.glyphicon(ng-class='activity.groupings.indexOf(grouping._id)===-1 ? "glyphicon-unchecked" : "glyphicon-saved"')
td
a(ng-click='removeGrouping(grouping)')
span.glyphicon.glyphicon-remove-sign

0 comments on commit 6119509

Please sign in to comment.