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

- graphs in project - updated over period of time

Browse source 
(graphs are big again)
This commit is contained in:
Matan Bar Yosef 2015-06-30 19:47:22 +03:00
parent bddee44648
commit bb3f56bb44
2 changed files with 45 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,12 +15,10 @@ angular.module('SeHub')
$scope.editProject = function(ev)
{
$scope.isEditPressed = true;
console.log("EditPressed " + $scope.isEditPressed);
}
$scope.removeProject = function(ev)
{
console.log("Project has been removed!");
$mdDialog.show($mdDialog.alert().title('Remove Project').content('Are you sure you want to remove the project ?')
.ariaLabel('Removing project alert dialog').ok('Yes').targetEvent(ev));
// .then(function() {
@ -28,15 +26,27 @@ angular.module('SeHub')
// }); // Pop-up alert
};
$scope.getProfileRoute = function(assigneeName)
{
for(var i = 0; i < $scope.project.members.length; i++)
{
if(assigneeName === $scope.project.members[i].name)
{
console.log(assigneeName);
console.log($scope.project.members[i].name);
return '#/profile/' + $scope.project.members[i].id;
}
else
return '#';
}
}
$scope.getProjectInfo = function()
{
apiService.getProjectsById(token, projectId).success(function(data)
{
$scope.project = data;
console.log($scope.project);
$scope.init_line_lables();
// if($scope.user === $scope.project.info.master_id)
// {
// $scope.isMasterOrLecturer = true;
@ -45,20 +55,11 @@ angular.module('SeHub')
// {
$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
}]);

73
templates/views/project.html
View file

@ -1,45 +1,35 @@
<div class = "project">
<md-content layout-padding layout-margin>
<div layout = "row">
<div layout = "column">
<div>
<h1 layout-margin style="margin-left:15px"><i class="fa fa-cube"></i> Project '{{project.projectName}}'</h1>
</div>
<div> <!-- ng-if = "{{project.logo_url}}"> -->
<div flex = "25">
<div flex = "10">
<img ng-src="{{project.logo_url}}" class = "md-avatar">
</div>
</div>
</div>
<div>
<div layout = "row" flex = "45">
<!-- <div ng-if = "isMasterOrLecturer"> -->
<md-card layout = "row">
<div layout-padding>
<md-button ng-click="editProject($event)" ng class="md-raised md-primary">
<i class="fa fa-pencil-square-o"></i>
</md-button>
</div>
<div layout-padding>
<md-button ng-click="removeProject($event)" ng class="md-raised md-primary">
<i class="fa fa-times"></i>
</md-button>
</div>
</md-card>
<!-- </div> -->
<div>
<div layout = "row" flex = "45">
<!-- <div ng-if = "isMasterOrLecturer"> -->
<md-card layout = "row">
<div layout-padding>
<md-button ng-click="editProject($event)" ng class="md-raised md-primary">
<i class="fa fa-pencil-square-o"></i>
</md-button>
</div>
<div layout-padding>
<md-button ng-click="removeProject($event)" ng class="md-raised md-primary">
<i class="fa fa-times"></i>
</md-button>
</div>
</md-card>
<!-- </div> -->
</div>
</div>
</div>
</div>
<!-- <div flex = "99" layout = "row" layout-padding>
<div flex = "20">
Project Name: {{project.projectName}}
</div>
</div> -->
<md-card>
<div flex = "99" layout = "row">
<div flex = "80" layout = "row" style="height:40%;" layout-margin>
<div flex = "10" layout-padding layout-margin border = "1">
Team Members:
<ul layout-padding>
@ -48,16 +38,16 @@
</li>
</ul>
</div>
<div flex = "45">
<div flex = "40">
<!-- 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>
<canvas layout-padding layout-margin ng-if = "!loadingData" id="line" class="chart chart-line" data="project.info.stats.weekly_commits.data" labels="project.info.stats.weekly_commits.labels" legend="true" ></canvas>
</md-card>
</div>
<div flex = "40">
<div flex = "35">
<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>
@ -82,8 +72,8 @@
<table style="width:100%;" border = "1">
<tr>
<th>Name</th>
<th>Number</th>
<th>url</th>
<th>Title</th>
<th>Url</th>
</tr>
<tr ng-repeat = "member in project.members">
<td>
@ -128,21 +118,18 @@
{{issue.milestone.title}}
</td>
<td>
<a ng-href="#/profile/{{issue.user.id}}" style="text-decoration:none; color:black;">
{{issue.user.login}}
</a>
<span ng-repeat = "member in project.members">
<a ng-href = "{{getProfileRoute(issue.assignee.login)}}" style="text-decoration:none; color:black;">
{{issue.assignee.login}}
</a>
</span>
</td>
</tr>
</table>
</md-content>
</md-tab>
<md-tab label="Bugs">
<md-content class="md-padding">
<h1 class="md-display-2">Bugs</h1>
<p> Bugs ..</p>
</md-content>
</md-tab>
<md-tab label="tasks">
<md-content class="md-padding">
<h1 class="md-display-2">tasks</h1>