sagi/se-hub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- project - Show graphs - Added !

Browse source
This commit is contained in:
Matan Bar Yosef 2015-06-29 22:31:32 +03:00
parent 7d6e78fa5a
commit e38cecb7e4
5 changed files with 152 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
templates/js/controllers/myProjectsController.js
View file

@ -1,7 +1,6 @@
angular.module('SeHub')
.controller('myProjectsController', ['$scope', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService ,$rootScope)
{
$scope.isEditPressed = false;
$scope.loadingData = true;
$scope.myProjectsEmpty = true;
$scope.user = $scope.$parent.user;
@ -52,18 +51,5 @@ angular.module('SeHub')
};
$scope.arrayHolder.push(tempArr);
}
$scope.editPressed = function()
{
$scope.isEditPressed = true;
console.log("EditPressed " + $scope.isEditPressed);
}
$scope.removeProject = function()
{
console.log("Project has been removed!");
}
$scope.displayMyProjects(); // Will display all my projects
}]);

40
templates/js/controllers/projectController.js
View file

@ -2,6 +2,46 @@ angular.module('SeHub')
.controller('projectController', ['$scope', '$routeParams', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope',
function ($scope, $routeParams, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService ,$rootScope)
{
var token = $cookies['com.sehub.www'];
var projectId = $routeParams.projectId;
$scope.isEditPressed = false;
$scope.user = $scope.$parent.user;
$scope.loadingData = true;
// $scope.thisProject = {};
// $scope.thisProject.courseName = $routeParams.className;
$scope.editProject = function()
{
$scope.isEditPressed = true;
console.log("EditPressed " + $scope.isEditPressed);
}
$scope.removeProject = function()
{
console.log("Project has been removed!");
}
$scope.getProjectInfo = function()
{
apiService.getProjectsById(token, projectId).success(function(data)
{
$scope.project = data;
console.log($scope.project);
$scope.init_line_lables();
$scope.loadingData = false;
console.log($scope.project);
}).error(function(err)
{
console.log("Error: " + err.message);
});
}
$scope.init_line_lables = function(){
$scope.project.weekly_labels = [];
for(var i = 0 ; i < $scope.project.info.stats.weekly_commits[0].length; i++)
$scope.project.weekly_labels.push('w '+i.toString());
}
$scope.getProjectInfo(); // Get all this project data
}]);

8
templates/js/services/apiService.js
View file

@ -125,6 +125,14 @@ service.factory('apiService', ['$http', function($http) {
};
return $http(req);
},
getProjectsById: function(token, projectId){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/projects/getProjectsById/" + token + "/" + projectId;
req = {
method : "GET",
url : url
};
return $http(req);
},
getProjectsByUser: function(token){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/projects/getProjectsByUser/" + token;
req = {

45
templates/views/project.html
View file

@ -1,13 +1,44 @@
<div class = "myClasses">
<div class = "project">
<md-content layout-padding layout-margin>
<h1 layout-margin style="margin-left:15px"><i class="fa fa-cube"></i> Project</h1>
Yipi Kayea Mother Fraker
<div>
<!-- Yipi Kayea Mother Fraker -->
<div flex = "99" layout = "row" layout-padding>
<div flex = "25">
Project Logo
<!-- <img ng-src="{{project.logo_url}} class = "md-avatar"> -->
</div>
<div flex = "20">
{{project.projectName}}
</div>
<div layout = "row" flex = "45">
<div flex>
<md-button ng-click="editProject()" style = "size:180%; width:50%;" ng class="md-raised md-primary">
<i class="fa fa-pencil-square-o"></i>
</md-button>
</div>
<div flex>
<md-button ng-click="removeProject()" style = "size:180%; width:40%;" ng class="md-raised md-primary">
<i class="fa fa-times"></i>
</md-button>
</div>
</div>
</div>
<div flex = "99" layout = "row">
<div flex = "45">
<!-- Graph -->
<div ng-if="loadingData" layout-paddig layout-margin class="loader">
<md-progress-circular md-mode="indeterminate"></md-progress-circular>
</div>
<md-card>
<canvas layout-padding layout-margin ng-if = "!loadingData" id="line" class="chart chart-line" data="project.info.stats.weekly_commits" labels="project.weekly_labels" legend="true" ></canvas>
</md-card>
</div>
<div flex = "45">
<md-card>
<canvas layout-padding layout-margin ng-if = "!loadingData" id="project.projectName" class="chart chart-bar" data="project.info.stats.micro.data" labels="project.info.stats.micro.labels" series="project.info.stats.micro.series"></canvas>
</md-card>
</div>
</div>