This repository has been archived by the owner on Oct 29, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 51
Small Group View, Small Group Attendance, Attendance Glitch Fix #242
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also added ability to get full user profiles with project information
…attendance (resubmission can cause verification!)
Conflicts: server/config/seed.js
…gned to small group
fixes #186 |
@@ -9,7 +9,7 @@ <h1 ng-hide="edittingName">{{project.name}}</h1> | |||
</p> | |||
<div class="btn-group description-buttons" ng-show="userOnProject"> | |||
<button type="button" class='btn btn-default btn-sm' ng-click='editName()'>Edit Project Name</button> | |||
<button type="button" class='btn btn-default btn-sm' ng-click='saveName()'>Save Project Name</button> | |||
<button type="button" class='btn btn-default btn-sm' ng-click='saveName()'>Save Project Name</button> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is that an extra whitespace line?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good catch zaran
When I am logged in as a non-mentor/non-admin, I can see the small group tab. Upon clicking it, I get a failed http call to GET /api/smallgroup/undefined/members |
}); | ||
}; | ||
$scope.addUser = function(user){ | ||
$http.get("/api/users/search", { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The search is currently case sensitive - this produces some unfriendly behavior.
Closed
kmcnellis
added a commit
that referenced
this pull request
Oct 27, 2015
Small Group View, Small Group Attendance, Attendance Glitch Fix
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows mentors to create small groups and add mentees to them. The mentees can then enter attendance codes they provide.
The frontend for mentors and students to view attendance of small groups and see their fellow mentees and projects has been added.
Currently, there isn't much administrative control over small groups- but this is the groundwork.
A bunch of utilities for accessing public user content, searching users, getting user roles was also added.
The seed was changed to remove Aaron and myself :)
The UI currently looks unremarkable, but fixing the UI shouldn't be too tricky :).
Fixes #184 and #186