Index: lams_monitoring/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r64bfad846c475db43b1b303e0df03735f39d34ce -r3b2599b9a89d7b0a85bab91f15488aab826c1412 --- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 64bfad846c475db43b1b303e0df03735f39d34ce) +++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 3b2599b9a89d7b0a85bab91f15488aab826c1412) @@ -419,6 +419,7 @@ label.tra = tRAT label.ira.mark = iRAT mark label.ira.correct.count = iRAT correct answer count +label.average = Average label.tra.mark = tRAT mark label.tra.correct.count = tRAT correct answer count label.burning.questions = Burning Qs Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/TblGroupDTO.java =================================================================== diff -u -r64bfad846c475db43b1b303e0df03735f39d34ce -r3b2599b9a89d7b0a85bab91f15488aab826c1412 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/TblGroupDTO.java (.../TblGroupDTO.java) (revision 64bfad846c475db43b1b303e0df03735f39d34ce) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/TblGroupDTO.java (.../TblGroupDTO.java) (revision 3b2599b9a89d7b0a85bab91f15488aab826c1412) @@ -21,10 +21,7 @@ /** * Get the DTO for this group. Does not include the GroupBranchActivities as they will be in a separate array for * Flash. - * - * @param group */ - @SuppressWarnings("unchecked") public TblGroupDTO(Group group) { groupID = group.getGroupId(); groupName = group.getGroupName(); @@ -98,4 +95,14 @@ public void setTraCorrectAnswerCount(int traCorrectAnswerCount) { this.traCorrectAnswerCount = traCorrectAnswerCount; } + + public double getIraScoreAverage() { + return userList.stream().filter(u -> u.getIraScore() != null).mapToDouble(TblUserDTO::getIraScore).average() + .orElse(0); + } + + public double getIraCorrectAnswerCountAverage() { + return userList.stream().filter(u -> u.getIraScore() != null).mapToDouble(TblUserDTO::getIraCorrectAnswerCount) + .average().orElse(0); + } } \ No newline at end of file Index: lams_monitoring/web/tblmonitor/teams.jsp =================================================================== diff -u -r2244d9ee653046d2d5ab6eb76fa1a44729346fe6 -r3b2599b9a89d7b0a85bab91f15488aab826c1412 --- lams_monitoring/web/tblmonitor/teams.jsp (.../teams.jsp) (revision 2244d9ee653046d2d5ab6eb76fa1a44729346fe6) +++ lams_monitoring/web/tblmonitor/teams.jsp (.../teams.jsp) (revision 3b2599b9a89d7b0a85bab91f15488aab826c1412) @@ -291,6 +291,16 @@ + + + + + + + + + +