OO-4828: always show the progression for participants, and the roles

src/main/java/org/olat/modules/curriculum/ui/member/CurriculumMemberListController.java

@@ -68,7 +68,6 @@ import org.olat.core.util.mail.MailPackage;
 import org.olat.core.util.mail.MailTemplate;
 import org.olat.core.util.resource.OresHelper;
 import org.olat.course.member.MemberListController;
-import org.olat.group.ui.main.CourseMembership;
 import org.olat.group.ui.main.EditMembershipController;
 import org.olat.group.ui.main.EditSingleMembershipController;
 import org.olat.group.ui.main.MemberLeaveConfirmationController;
@@ -235,9 +234,8 @@ public class CurriculumMemberListController extends FormBasicController implemen
 		
 		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(MemberCols.progression, new LearningProgressCompletionCellRenderer()));
 		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(MemberCols.firstTime));
-		if(restrictToRoles == null || restrictToRoles.size() != 1) {
-			columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(MemberCols.role, new CurriculumMembershipCellRenderer(getTranslator())));
-		}
+		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(MemberCols.role, new CurriculumMembershipCellRenderer(getTranslator())));
+		
 		DefaultFlexiColumnModel toolsCol = new DefaultFlexiColumnModel(MemberCols.tools);
 		toolsCol.setSortable(false);
 		toolsCol.setExportable(false);
@@ -275,8 +273,7 @@ public class CurriculumMemberListController extends FormBasicController implemen
 	}
 	
 	private CurriculumMemberRow forgeRow(CurriculumMemberStats member) {
-		CourseMembership membership = new CourseMembership();
-		CurriculumMemberRow row = new CurriculumMemberRow(member.getIdentity(), membership,
+		CurriculumMemberRow row = new CurriculumMemberRow(member.getIdentity(), member.getMembership(),
 				member.getFirstTime(), member.getAverageCompletion());
 		
 		FormLink toolsLink = uifactory.addFormLink("tools_" + (++counter), "tools", "", null, null, Link.NONTRANSLATED);

src/main/java/org/olat/modules/curriculum/ui/member/CurriculumMemberListTableModel.java

@@ -39,6 +39,7 @@ import org.olat.user.propertyhandlers.UserPropertyHandler;
 public class CurriculumMemberListTableModel extends DefaultFlexiTableDataModel<CurriculumMemberRow> implements SortableFlexiTableDataModel<CurriculumMemberRow> {
 	
 	private static final MemberCols[] COLS = MemberCols.values();
+	private static final Double ZERO = Double.valueOf(0.0d);
 	
 	private final Locale locale;
 	private final List<UserPropertyHandler> userPropertyHandlers;
@@ -80,6 +81,16 @@ public class CurriculumMemberListTableModel extends DefaultFlexiTableDataModel<C
 		return userPropertyHandlers.get(propPos).getUserProperty(row.getIdentity().getUser(), locale);
 	}
 	
+	public Double getAvergaeCompletion(CurriculumMemberRow row) {
+		if(!row.getMembership().isParticipant()) return null;
+		
+		Double completion = row.getAverageCompletion();
+		if(completion == null) {
+			completion = ZERO;
+		}
+		return completion;
+	}
+	
 	public int indexOf(Long identityKey) {
 		List<CurriculumMemberRow> rows = getObjects();
 		for(int i=rows.size(); i-->0; ) {