Merge pull request #85 from sagidayan/UI

- create class is working again #2
This commit is contained in:
Sagi Dayan 2015-06-29 13:07:03 +03:00
commit 3954855a65
3 changed files with 5 additions and 5 deletions

View file

@ -121,7 +121,7 @@ angular.module('SeHub')
var displayCourses = function() var displayCourses = function()
{ {
apiService.getCoursesByCampus(campusId).success(function(data) // Shows all classes from this campus apiService.getAllCoursesByCampus(token, campusId).success(function(data) // Shows all classes from this campus
{ {
$scope.courses = data; $scope.courses = data;
console.log("success " + $scope.courses); console.log("success " + $scope.courses);

View file

@ -43,8 +43,8 @@ service.factory('apiService', ['$http', function($http) {
}; };
return $http(req); return $http(req);
}, },
getCoursesByCampus: function(campusId){ getAllCoursesByCampus: function(token, campusId){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/getCoursesByCampus/" + campusId; var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/getAllCoursesByCampus/" + token + '/' + campusId;
req = { req = {
method : "GET", method : "GET",
url : url url : url

View file

@ -83,11 +83,11 @@
</div> </div>
</md-content> </md-content>
</div> </div>
<div layout-margin layout-padding ng-if="showMyClass"> <!-- <div layout-margin layout-padding ng-if="showMyClass">
<md-select placeholder="Choose Existing Course" ng-model="course" ng-click="chooseCourseClicked()" class="courseDropDown"> <md-select placeholder="Choose Existing Course" ng-model="course" ng-click="chooseCourseClicked()" class="courseDropDown">
<md-option ng-repeat="c in courses" value="{{c.course}}">{{c.course}}</md-option> <md-option ng-repeat="c in courses" value="{{c.course}}">{{c.course}}</md-option>
</md-select> </md-select>
</div> </div> -->
</div> </div>
<div ng-if="isStudent"> <!-- Student Mode --> <div ng-if="isStudent"> <!-- Student Mode -->