OO-2133 define assessment members, modify condition when to show, split position view

src/main/java/org/olat/course/assessment/AssessmentManager.java

@@ -206,8 +206,11 @@ public interface AssessmentManager {
 
 	public List<AssessmentEntry> getAssessmentEntries(CourseNode courseNode);
 	
+	public List<AssessmentEntry> getAssessmentEntriesWithStatus(CourseNode courseNode, String status);
+	
 	public List<AssessmentEntry> getAssessmentEntries(BusinessGroup group, CourseNode courseNode);
 	
 	public List<AssessmentEntry> getAssessmentEntries(Identity assessedIdentity);
+
 	
 }
\ No newline at end of file

src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java

@@ -93,6 +93,11 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
 	public List<AssessmentEntry> getAssessmentEntries(CourseNode courseNode) {
 		return assessmentService.loadAssessmentEntriesBySubIdent(cgm.getCourseEntry(), courseNode.getIdent());
 	}
+	
+	@Override
+	public List<AssessmentEntry> getAssessmentEntriesWithStatus(CourseNode courseNode, String status) {
+		return assessmentService.loadAssessmentEntriesBySubIdentWithStatus(cgm.getCourseEntry(), courseNode.getIdent(), status);
+	}
 
 	@Override
 	public AssessmentEntry getAssessmentEntry(CourseNode courseNode, Identity assessedIdentity) {

src/main/java/org/olat/course/highscore/ui/HighScoreRunController.java

@@ -66,6 +66,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class HighScoreRunController extends FormBasicController{
 	
 	private static final String GUIPREF_KEY_HIGHSCORE = "highscore";
+	private static final String STATUS_DONE = "done";
 	
 	private FlexiTableDataModel<HighScoreTableEntry> tableDataModel, tableDataModel2;
 	private List<HighScoreTableEntry> allMembers, ownIdMembers;
@@ -130,8 +131,14 @@ public class HighScoreRunController extends FormBasicController{
 			return;		
 		}	
 		
-		List<AssessmentEntry>  assessEntries = userCourseEnv.getCourseEnvironment()
-				.getAssessmentManager().getAssessmentEntries(courseNode);
+		List<AssessmentEntry>  assessEntries;
+		if ("iqtest".equals(courseNode.getType())) {
+			assessEntries =	userCourseEnv.getCourseEnvironment().getAssessmentManager()
+					.getAssessmentEntriesWithStatus(courseNode, STATUS_DONE);
+		} else {
+			assessEntries =	userCourseEnv.getCourseEnvironment().getAssessmentManager()
+					.getAssessmentEntries(courseNode);
+		}
 		// display only if has content
 		if (assessEntries.isEmpty()) {
 			viewHighscore = false;
@@ -327,9 +334,14 @@ public class HighScoreRunController extends FormBasicController{
 			}
 		}			
 		if (viewPosition && ownIdIndices.size() > 0) {
-			mainVC.contextPut("position", translate("highscore.position.info",
-					new String[] { String.valueOf(highscoreDataModel.getOwnTableEntry().getRank()),
-							String.valueOf(allScores.length - ownIdIndices.get(0) - 1)}));
+			int amountWorse = allScores.length - ownIdIndices.get(0) - 1;
+			if (amountWorse > 0) {
+				mainVC.contextPut("relposition", translate("highscore.position.second",
+						new String[] { String.valueOf(amountWorse)}));
+			}
+			int ownRank = highscoreDataModel.getOwnTableEntry().getRank();
+			mainVC.contextPut("position", translate("highscore.position.first",
+					new String[] { String.valueOf(ownRank) }));
 		}
 
 	}

src/main/java/org/olat/course/highscore/ui/_content/highscore.html

@@ -10,7 +10,11 @@
 			<div class="container-fluid o_highscore">
 			<div class="row clearfix">
 			#if ($position) 
-				<div class="o_position">$position</div>
+				<div class="o_position">$position
+				#if($relposition)
+					<div class="o_position_relative">$relposition</div>
+				#end
+				</div>
 			#end
 				#if ($first)
 				<div class="col-sm-6 o_podium">

src/main/java/org/olat/course/highscore/ui/_i18n/LocalStrings_de.properties

@@ -12,7 +12,8 @@ highscore.description=Erstellen Sie eine HighScore f\u00FCr diesen Kursbaustein.
 controller.title=Einstellungen der HighScore des Kursbausteins
 pane.tab.highscore=HighScore
 highscore.position=Positionsanzeige
-highscore.position.info=Herzlichen Gl\u00FCckwunsch, du bist {0}.! {1} sind schlechter als du!
+highscore.position.first=Herzlichen Gl\u00FCckwunsch, du bist {0}.!
+highscore.position.second= {0} sind schlechter als du!
 highscore.podium=Siegertreppchen
 highscore.histogram=Histogramm
 highscore.listing=Auflistung

src/main/java/org/olat/course/highscore/ui/_i18n/LocalStrings_en.properties

@@ -11,7 +11,8 @@ highscore.description=Create a HighScore for this Course Element. Define whether
 controller.title=HighScore Settings of your Course Element
 pane.tab.highscore=HighScore
 highscore.position=Display position
-highscore.position.info=Congratulations you are {0}.! {1} are worse than you! 
+highscore.position.first=Congratulations you are {0}.! 
+highscore.position.second={0} are worse than you! 
 highscore.podium=Podium
 highscore.histogram=Histogram
 highscore.listing=Listing

src/main/java/org/olat/course/nodes/basiclti/_content/overview.html

@@ -47,9 +47,9 @@
 		</div>
 	#end
 #end
-<div class="o_button_group">
-	$r.render("start")
-</div>
 #if ($r.available("highScore"))
 	$r.render("highScore")
-#end
+#end
\ No newline at end of file
+<div class="o_button_group">
+	$r.render("start")
+</div>
\ No newline at end of file

src/main/java/org/olat/course/nodes/iq/_content/assessment_run.html

@@ -71,9 +71,6 @@
 			/* ]]> */
 		</script>
 		#end
-		#if ($r.available("highScore"))
-			$r.render("highScore")
-		#end
 	#else
 		<div class="o_no_scoreinfo">
 			$r.translate("score.noscoreinfoyet")
@@ -89,6 +86,9 @@
 	#end
 #end
 
+#if ($r.available("highScore"))
+	$r.render("highScore")
+#end
 #if($showResultsOnHomePage && $attempts > 0)	
 	<div class="panel panel-default o_results">
 	  	<div class="panel-heading">

src/main/java/org/olat/course/nodes/iq/_content/testrun.html

@@ -65,9 +65,6 @@
 			/* ]]> */
 		</script>
 		#end
-		#if ($r.available("highScore"))
-			$r.render("highScore")
-		#end
 	#else
 		<div class="o_no_scoreinfo">
 			$r.translate("score.noscoreinfoyet")
@@ -82,6 +79,9 @@
 		</div>
 	#end
 #end
+#if ($r.available("highScore"))
+	$r.render("highScore")
+#end
 	
 #if($showResultsOnHomePage && $attempts >0)	
 	<div class="panel panel-default o_results">

src/main/java/org/olat/course/nodes/scorm/_content/run.html

@@ -55,15 +55,15 @@
 			/* ]]> */
 		</script>
 		#end
-		#if ($r.available("highScore"))
-			$r.render("highScore")
-		#end
 	#else
 		<div class="o_no_scoreinfo">
 			$r.translate("score.noscoreinfoyet")
 		</div>
 	#end
 #end
+#if ($r.available("highScore"))
+	$r.render("highScore")
+#end
 
 #if ($maxAttemptsReached)
 <div class="o_warning">

src/main/java/org/olat/course/run/preview/PreviewAssessmentManager.java

@@ -66,6 +66,11 @@ final class PreviewAssessmentManager extends BasicManager implements AssessmentM
 	public List<AssessmentEntry> getAssessmentEntries(CourseNode courseNode) {
 		return Collections.emptyList();
 	}
+	
+	@Override
+	public List<AssessmentEntry> getAssessmentEntriesWithStatus(CourseNode courseNode, String status) {
+		return Collections.emptyList();
+	}
 
 	@Override
 	public AssessmentEntry getAssessmentEntry(CourseNode courseNode, Identity assessedIdentity) {

src/main/java/org/olat/modules/assessment/AssessmentService.java

@@ -84,6 +84,8 @@ public interface AssessmentService {
 	
 	public List<AssessmentEntry> loadAssessmentEntriesBySubIdent(RepositoryEntry entry, String subIdent);
 	
+	public List<AssessmentEntry> loadAssessmentEntriesBySubIdentWithStatus(RepositoryEntry entry, String subIdent, String status);
+	
 	public List<AssessmentEntry> loadAssessmentEntriesByAssessedIdentity(Identity assessedIdentity, RepositoryEntry entry);
 	
 	public List<AssessmentEntry> loadAssessmentEntries(BusinessGroup assessedGroup, RepositoryEntry entry, String subIdent);

src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java

@@ -222,6 +222,39 @@ public class AssessmentEntryDAO {
 				.getResultList();
 	}
 	
+	/**
+	 * Load all assessment entries for the specific assessed repository entry with
+	 * the specific sub identifier (it is mandatory). The anonym users are excluded
+	 * by the query. The status of the assessment entry is optional 
+	 * 
+	 * @param entry The entry (mandatory)
+	 * @param subIdent The subIdent (mandatory)
+	 * @param status The status of the assessment entry (optional)
+	 * @return A list of assessment entries
+	 */
+	public List<AssessmentEntry> loadAssessmentEntryBySubIdentWithStatus(RepositoryEntryRef entry, String subIdent, String status) {
+		StringBuilder sb = new StringBuilder();
+		sb.append("select data from assessmententry data ")
+		   .append(" inner join fetch data.identity ident") 
+		   .append(" inner join fetch ident.user identuser")
+		   .append(" where data.repositoryEntry.key=:repositoryEntryKey and data.subIdent=:subIdent");
+		
+		if (status != null) {
+			sb.append(" and data.status=:status");
+		}
+		
+		TypedQuery<AssessmentEntry> typedQuery = dbInstance.getCurrentEntityManager()
+				.createQuery(sb.toString(), AssessmentEntry.class)
+				.setParameter("repositoryEntryKey", entry.getKey())
+				.setParameter("subIdent", subIdent);
+		
+		if (status != null) {
+			typedQuery.setParameter("status", status);	
+		}	
+		
+		return typedQuery.getResultList();
+	}
+	
 	public List<Identity> getAllIdentitiesWithAssessmentData(RepositoryEntryRef entry) {
 		StringBuilder sb = new StringBuilder();
 		sb.append("select distinct data.identity from assessmententry data where data.repositoryEntry.key=:repositoryEntryKey");

src/main/java/org/olat/modules/assessment/manager/AssessmentServiceImpl.java

@@ -88,6 +88,11 @@ public class AssessmentServiceImpl implements AssessmentService, UserDataDeletab
 	public List<AssessmentEntry> loadAssessmentEntriesBySubIdent(RepositoryEntry entry, String subIdent) {
 		return assessmentEntryDao.loadAssessmentEntryBySubIdent(entry, subIdent);
 	}
+	
+	@Override
+	public List<AssessmentEntry> loadAssessmentEntriesBySubIdentWithStatus(RepositoryEntry entry, String subIdent, String status) {
+		return assessmentEntryDao.loadAssessmentEntryBySubIdentWithStatus(entry, subIdent, status);
+	}
 
 	@Override
 	public List<AssessmentEntry> loadAssessmentEntriesByAssessedIdentity(Identity assessedIdentity, RepositoryEntry entry) {

src/main/webapp/static/themes/light/modules/_highscore.scss

@@ -15,6 +15,9 @@
 		border-style: ridge;
 		border-width: 3px;
 		border-color: $o-hs-podium-first-bg	;
+		.o_position_relative {
+
+		}
 	}
 
 	.o_podium {