Merge pull request sakaiproject#367 from jonespm/SAK-29128

SAK-29128 - Problem when removing students from a group who previously
bizzkriss · Apr 1, 2015 · c3530ce · c3530ce
2 parents 4f9b52a + f2c7bbb
commit c3530ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ice/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java b/...ice/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
@@ -1165,7 +1165,7 @@ private List getTotalPointsEarnedInternal(final String studentId, final Gradeboo
 	        if(gradeRec.getPointsEarned() != null && !gradeRec.getPointsEarned().equals("") && !gradeRec.getDroppedFromGrade())
 	        {
 	            Assignment go = gradeRec.getAssignment();
-	            if (go.isIncludedInCalculations())
+	            if (go.isIncludedInCalculations() && countedAssigns.contains(go))
 	            {
 	                Double pointsEarned = new Double(gradeRec.getPointsEarned());
 	                //if(gbGradeType == GradebookService.GRADE_TYPE_POINTS)

diff --git a/...ness/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java b/...ness/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java
@@ -226,7 +226,7 @@ List getTotalPointsEarnedInternal(final String studentId, final Gradebook gradeb
 			if(gradeRec.getPointsEarned() != null && !gradeRec.getPointsEarned().equals("") && !gradeRec.getDroppedFromGrade())
 			{
 				Assignment go = gradeRec.getAssignment();
-				if (go.isIncludedInCalculations())
+				if (go.isIncludedInCalculations() && countedAssigns.contains(go))
 				{
 					Double pointsEarned = new Double(gradeRec.getPointsEarned());
 					//if(gbGradeType == GradebookService.GRADE_TYPE_POINTS)