Merge branch...

Merge branch '116-average-number-of-submissions-before-passing-per-assignment-whole-course' into 'development'

Resolve "Average number of submissions before passing per assignment (whole course)"

Closes #116

See merge request !211

CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Ability to add file(s) for an assignment (@dsavvidi)
 - Add "Enrol in a new edition" button in "Your courses" page (@dsavvidi)
 - Module level grade export features (@dsavvidi)
+- New statistic: Average number of submissions before passing per assignment (@dsavvidi)
+
 ### Changed
 - Group joining is now restricted to groups with no submissions (@dsavvidi)
 - Reduced number of buttons needed to access script feedback (@dsavvidi)

src/main/java/nl/tudelft/submit/dto/view/statistics/AssignmentStatisticsDTO.java

@@ -43,6 +43,8 @@ public class AssignmentStatisticsDTO {
 
 	private Double medianScore;
 
+	private Double avgSubmissionsToPass;
+
 	private Integer[] scoreDistribution;
 
 	private Integer[] passFailDistribution;

src/main/java/nl/tudelft/submit/service/StatisticsService.java

@@ -360,12 +360,25 @@ public class StatisticsService {
 				.totalGroups(groups.size())
 				.totalStudents(totalStudents)
 				.totalSubmissions(totalSubmissions)
+				.avgSubmissionsToPass(calculateAvgSubmissionsToPass(submissions, grades, gradeType,
+						assignment.getModule().getEdition().getId()))
 				.scoreDistribution(getScoreDistribution(grades, gradeType))
 				.passFailDistribution(getPassFailDistribution(grades, gradeType,
 						assignment.getModule().getEdition().getId(), totalStudents))
 				.build();
 	}
 
+	private Double calculateAvgSubmissionsToPass(
+			Map<StudentGroupSummaryDTO, List<SubmissionDetailsDTO>> groupSubmissions,
+			Map<StudentGroupSummaryDTO, GradeSummaryDTO> grades, GradeScheme gradeType, Long editionId) {
+		int passingScore = getPassingScore(gradeType, editionId);
+		return groupSubmissions.keySet().stream()
+				.filter(group -> grades.get(group).getScore() >= passingScore)
+				.mapToLong(group -> groupSubmissions.get(group).size())
+				.average()
+				.orElse(0.0);
+	}
+
 	private SortedMap<Long, SubmitSubmissionViewDTO> getAssignmentSubmissionsForModule(
 			ModuleDetailsDTO module,
 			Map<StudentGroupSummaryDTO, List<SubmissionDetailsDTO>> submissions,
@@ -435,9 +448,7 @@ public class StatisticsService {
 
 	private Integer[] getPassFailDistribution(List<? extends CalculatedScore> grades,
 			GradeScheme gradeType, Long editionId, int totalStudents) {
-		int passingScore = gradeType == GradeScheme.PASS_FAIL ? 1
-				: editionService.getSubmitEdition(editionId).map(SubmitEdition::getPassingScore).orElse(0.0)
-						.intValue();
+		int passingScore = getPassingScore(gradeType, editionId);
 		Integer[] distribution = { 0, 0, 0 };
 		grades.forEach(score -> {
 			if (score.getScore() >= passingScore) {
@@ -452,9 +463,7 @@ public class StatisticsService {
 
 	private Integer[] getPassFailDistribution(Map<StudentGroupSummaryDTO, GradeSummaryDTO> grades,
 			GradeScheme gradeType, Long editionId, int totalStudents) {
-		int passingScore = gradeType == GradeScheme.PASS_FAIL ? 1
-				: editionService.getSubmitEdition(editionId).map(SubmitEdition::getPassingScore).orElse(0.0)
-						.intValue();
+		int passingScore = getPassingScore(gradeType, editionId);
 		Integer[] distribution = { 0, 0, 0, 0, 0 };
 		grades.forEach((group, score) -> {
 			int index = score.getScore() >= passingScore ? 0 : 2;
@@ -555,4 +564,12 @@ public class StatisticsService {
 		}));
 	}
 
+	private int getPassingScore(GradeScheme gradeType, Long editionId) {
+		return gradeType == GradeScheme.PASS_FAIL ? 1
+				: editionService.getSubmitEdition(editionId)
+						.map(SubmitEdition::getPassingScore)
+						.orElse(0.0)
+						.intValue();
+	}
+
 }

src/main/resources/messages.properties

@@ -296,6 +296,7 @@ grading.type.unlimited = Unbounded score
 statistics.total_students = Total students
 statistics.total_groups = Total groups
 statistics.total_submissions = Total submissions
+statistics.avgSubmissionsToPass = Average submissions to pass (per group)
 statistics.average_score = Average score
 statistics.median_score = Median score
 statistics.pass_fail = Pass/Fail

src/main/resources/templates/assignment/statistics.html

@@ -47,6 +47,10 @@
                         <span th:text="#{statistics.total_submissions}"></span>
                         <span th:text="${statistics.totalSubmissions}"></span>
                     </div>
+                    <div class="flex space-between underlined pil-3">
+                        <span th:text="#{statistics.avgSubmissionsToPass}"></span>
+                        <span th:text="${statistics.avgSubmissionsToPass}"></span>
+                    </div>
                 </div>
                 <th:block
                     th:if="${statistics.averageScore != null or statistics.medianScore != null}">

src/test/java/nl/tudelft/submit/service/StatisticsServiceTest.java

@@ -410,6 +410,7 @@ class StatisticsServiceTest {
 						.totalSubmissions(2)
 						.averageScore(1.0)
 						.medianScore(1.0)
+						.avgSubmissionsToPass(2.0)
 						.scoreDistribution(new Integer[] { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 })
 						.passFailDistribution(new Integer[] { 1, 0, 0, 0, 1 })
 						.build());