diff --git a/src/main/java/org/olat/modules/lecture/ui/component/LectureBlockStatusCellRenderer.java b/src/main/java/org/olat/modules/lecture/ui/component/LectureBlockStatusCellRenderer.java index ec8c01b1d020bff8fabbbb3a9363f21bacee44ea..0d1b0092713e43b75bcdf1e93343e2accb069773 100644 --- a/src/main/java/org/olat/modules/lecture/ui/component/LectureBlockStatusCellRenderer.java +++ b/src/main/java/org/olat/modules/lecture/ui/component/LectureBlockStatusCellRenderer.java @@ -25,6 +25,7 @@ import org.olat.core.gui.render.Renderer; import org.olat.core.gui.render.StringOutput; import org.olat.core.gui.render.URLBuilder; import org.olat.core.gui.translator.Translator; +import org.olat.core.util.StringHelper; import org.olat.modules.lecture.LectureBlock; import org.olat.modules.lecture.LectureBlockStatus; import org.olat.modules.lecture.LectureRollCallStatus; @@ -50,13 +51,22 @@ public class LectureBlockStatusCellRenderer implements FlexiCellRenderer { target.append(translator.translate(status.name())); } else if(cellValue instanceof LectureBlock) { LectureBlock block = (LectureBlock)cellValue; - LectureBlockStatus status = block.getStatus(); - if(LectureBlockStatus.done.equals(status)) { - LectureRollCallStatus rollCallStatus = block.getRollCallStatus(); - target.append(translator.translate(rollCallStatus.name())); - } else { - target.append(translator.translate(status.name())); + String status = getStatus(block, translator); + if(StringHelper.containsNonWhitespace(status)) { + target.append(status); } } } + + public static final String getStatus(LectureBlock block, Translator trans) { + LectureBlockStatus status = block.getStatus(); + if(LectureBlockStatus.done.equals(status)) { + LectureRollCallStatus rollCallStatus = block.getRollCallStatus(); + return trans.translate(rollCallStatus.name()); + } + if(status != null) { + return trans.translate(status.name()); + } + return null; + } } diff --git a/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlocksEntryExport.java b/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlocksEntryExport.java index 32de1a83f9ed3f1354da45f0e7f9dd13b2399447..6376f113e2f31bd5fc9e8c021e75f2258c9d261f 100644 --- a/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlocksEntryExport.java +++ b/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlocksEntryExport.java @@ -41,6 +41,7 @@ import org.olat.modules.lecture.LectureBlock; import org.olat.modules.lecture.LectureService; import org.olat.modules.lecture.Reason; import org.olat.modules.lecture.model.LectureBlockWithTeachers; +import org.olat.modules.lecture.ui.component.LectureBlockStatusCellRenderer; import org.olat.repository.RepositoryEntry; import org.olat.user.UserManager; @@ -139,7 +140,12 @@ public class LecturesBlocksEntryExport extends OpenXMLWorkbookResource { if(lectureBlock.getRollCallStatus() == null) { pos++; } else { - row.addCell(pos++, translator.translate(lectureBlock.getRollCallStatus().name())); + String status = LectureBlockStatusCellRenderer.getStatus(lectureBlock, translator); + if(status != null) { + row.addCell(pos++, status); + } else { + pos++; + } } row.addCell(pos++, formatter.formatDate(lectureBlock.getAutoClosedDate()));