OO-3898: show num. of collected documents too

src/main/java/org/olat/course/nodes/gta/ui/CoachParticipantsTableModel.java

@@ -85,6 +85,9 @@ public class CoachParticipantsTableModel extends DefaultFlexiTableDataModel<Coac
 		} else if(col == CGCols.passed.ordinal()) {
 			return row.getPassed();
 		} else if(col == CGCols.numOfSubmissionDocs.ordinal()) {
+			if(row.getCollectionDate() != null) {
+				return row.getNumOfCollectedDocs();
+			}
 			return row.getNumOfSubmissionDocs();
 		} else if(col >= GTACoachedGroupGradingController.USER_PROPS_OFFSET) {
 			int propIndex = col - GTACoachedGroupGradingController.USER_PROPS_OFFSET;

src/main/java/org/olat/course/nodes/gta/ui/CoachedIdentityRow.java

@@ -45,10 +45,11 @@ public class CoachedIdentityRow implements CoachedElementRow {
 	private final BigDecimal score;
 	private final Boolean passed;
 	private final int numOfSubmissionDocs;
+	private final int numOfCollectedDocs;
 	
 	public CoachedIdentityRow(UserPropertiesRow identity, TaskLight task, Date submissionDueDate,
 			Date syntheticSubmissionDate, boolean hasSubmittedDocuments, FormLink markLink, Boolean userVisibility,
-			BigDecimal score, Boolean passed, int numOfSubmissionDocs) {
+			BigDecimal score, Boolean passed, int numOfSubmissionDocs, int numOfCollectedDocs) {
 		this.identity = identity;
 		this.task = task;
 		this.submissionDueDate = submissionDueDate;
@@ -59,6 +60,7 @@ public class CoachedIdentityRow implements CoachedElementRow {
 		this.score = score;
 		this.passed = passed;
 		this.numOfSubmissionDocs = numOfSubmissionDocs;
+		this.numOfCollectedDocs = numOfCollectedDocs;
 	}
 
 	@Override
@@ -130,4 +132,8 @@ public class CoachedIdentityRow implements CoachedElementRow {
 		return numOfSubmissionDocs;
 	}
 	
+	public int getNumOfCollectedDocs() {
+		return numOfCollectedDocs;
+	}
+	
 }

src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantListController.java

@@ -311,7 +311,8 @@ public class GTACoachedParticipantListController extends GTACoachedListControlle
 				}
 			}
 			
-			int numSubmittedDocs = task != null && task.getSubmissionNumOfDocs() != null? task.getSubmissionNumOfDocs(): 0;
+			int numSubmittedDocs = task != null && task.getSubmissionNumOfDocs() != null ? task.getSubmissionNumOfDocs().intValue() : 0;
+			int numOfCollectedDocs = task != null && task.getCollectionNumOfDocs() != null ? task.getCollectionNumOfDocs().intValue() : 0;
 
 			AssessmentEntry assessment = identityToAssessments.get(assessableIdentity.getIdentityKey());
 			Boolean userVisibility = assessment!=null? assessment.getUserVisibility(): null;
@@ -319,7 +320,8 @@ public class GTACoachedParticipantListController extends GTACoachedListControlle
 			Boolean passed = assessment!=null? assessment.getPassed(): null;
 			
 			rows.add(new CoachedIdentityRow(assessableIdentity, task, submissionDueDate, syntheticSubmissionDate,
-					hasSubmittedDocument, markLink, userVisibility, score, passed, numSubmittedDocs));
+					hasSubmittedDocument, markLink, userVisibility, score, passed,
+					numSubmittedDocs, numOfCollectedDocs));
 		}
 		
 		tableModel.setObjects(rows);