Merge branch 'master' of github.com:Alanaktion/phproject

app/view/backlog/index.html

@@ -107,6 +107,7 @@
 								<div class="panel-body {{ @key ? 'collapse' : 'in' }}" id="panel-{{ @sprint.id }}">
 									<div class="panel-head-points text-muted">
 										<span>{{ @dict.backlog_points }}:</span>
+										<span class="points-label-completed">0</span> /
 										<span class="points-label">0</span>
 									</div>
 									<ul class="list-group sortable" data-list-id="{{ @sprint.id }}">

app/view/backlog/item.html

@@ -1,4 +1,5 @@
 <li class="list-group-item {{ @project.status_closed ? 'completed' : '' }}" style="border-left: 4px solid #{{ @project.owner_task_color }};" data-id="{{ @project.id }}" data-type-id="{{ @project.type_id }}" data-user-id="{{ @project.owner_id }}"" data-points="{{ @project.size_estimate }}">
+	<span class="badge">{{ @project.priority_name }}</span>
 	<span class="title">
 		{{ @project.type_name }}
 		<a href="{{ @BASE }}/issues/{{ @project.id }}" target="_blank">#{{ @project.id }}</a>&ensp;
@@ -7,5 +8,4 @@
 		 - {{ @project.size_estimate }}
 		</check>
 	</span>
-	<span class="badge">{{ @project.priority_name }}</span>
 </li>

js/backlog.js

@@ -21,21 +21,40 @@ function getQueryVariable(variable) {
 
 function refreshPoints(){
 	$('.panel').each(function() {
+		// calculates total points in the backlog and sprints
 		var points = 0;
 		$('.list-group-item:not(.hidden-group):not(.hidden-type)', this).each(function() {
 			var val = parseInt($(this).attr('data-points'), 10);
 			if (val > 0) {
 				points += val;
 			}
 		});
+
+		// calculates completed points in sprints
+		var completedPoints = 0;
+		$('.list-group-item.completed:not(.hidden-group):not(.hidden-type)', this).each(function() {
+			var cval = parseInt($(this).attr('data-points'), 10);
+			if (cval > 0) {
+				completedPoints += cval;
+			}
+		});
+
+		// if no total points than hide points displayed
 		if (points) {
 			$('.panel-head-points', this).show();
 		} else {
 			$('.panel-head-points', this).hide();
 		}
+
+		// adds points to span
 		$(".points-label", this).text(points);
+
+		// adds completed points to span
+		$(".points-label-completed", this).text(completedPoints);
 	});
-}
+	$('.panel').each(function() {
+	});
+};
 
 var Backlog = {
 	init: function() {