OO-2636: more icons for the lecture status for participants, wording...

src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java

@@ -186,7 +186,9 @@ public abstract class AbstractTeacherOverviewController extends BasicController
 				startWizardButton.setUserObject(block);
 				
 				currentBlocks.add(row);
-			} else if(block.getRollCallStatus() == LectureRollCallStatus.closed || block.getRollCallStatus() == LectureRollCallStatus.autoclosed) {
+			} else if(block.getStatus() == LectureBlockStatus.cancelled
+					|| block.getRollCallStatus() == LectureRollCallStatus.closed
+					|| block.getRollCallStatus() == LectureRollCallStatus.autoclosed) {
 				closedBlocks.add(row);
 			} else if(block.getStartDate() != null && block.getStartDate().after(now)) {
 				nextBlocks.add(row);

src/main/java/org/olat/modules/lecture/ui/CloseRollCallConfirmationController.java

@@ -102,7 +102,7 @@ public class CloseRollCallConfirmationController extends FormBasicController {
 			}
 		}
 		
-		String datePage = velocity_root + "/date_start_end.html";
+		String datePage = velocity_root + "/date_end.html";
 		FormLayoutContainer dateCont = FormLayoutContainer.createCustomFormLayout("start_end", getTranslator(), datePage);
 		dateCont.setLabel("lecture.block.effective.end", null);
 		formLayout.add(dateCont);

src/main/java/org/olat/modules/lecture/ui/_content/date_end.html

+<div class="o_date_ms form-inline">$r.render("lecture.end.hour"):$r.render("lecture.end.minute")</div>
+#if($f.hasError("lecture.end.hour"))
+	<div>$r.render("lecture.end.hour_ERROR")</div>
+#end
+#if($f.hasError("lecture.end.minute"))
+	<div>$r.render("lecture.end.minute_ERROR")</div>
+#end
\ No newline at end of file

src/main/java/org/olat/modules/lecture/ui/_content/date_start_end.html

 <div class="o_date_ms form-inline">
-	$r.translate("lecture.time.from") $r.render("lecture.start.hour"):$r.render("lecture.start.minute")
-	$r.translate("lecture.time.until") $r.render("lecture.end.hour"):$r.render("lecture.end.minute")</div>
+	$r.translate("lecture.time.from") $r.render("lecture.start.hour"):$r.render("lecture.start.minute")	
+$r.translate("lecture.time.until") $r.render("lecture.end.hour"):$r.render("lecture.end.minute")</div>
 #if($f.hasError("lecture.start.hour"))
 	<div>$r.render("lecture.start.hour_ERROR")</div>
 #end

src/main/java/org/olat/modules/lecture/ui/_content/participant_blocks.html

@@ -24,6 +24,8 @@ $r.render("table")
 	<li><i class="o_icon o_lectures_rollcall_ok"> </i> $r.translate("table.legend.attended")</li>
 	<li><i class="o_icon o_lectures_rollcall_warning"> </i> $r.translate("table.legend.authorized")</li>
 	<li><i class="o_icon o_lectures_rollcall_danger"> </i> $r.translate("table.legend.absent")</li>
+	<li><i class="o_icon o_icon_cancelled"> </i> $r.translate("cancelled")</li>
+	<li><i class="o_icon o_icon_status_in_review"> </i> $r.translate("in.progress")</li>
 	<li><i class="o_icon o_lectures_rollcall_free"> </i> $r.translate("table.legend.free")</li>
 	<li>(*) $r.translate("table.legend.free")</li>
 </ul>
\ No newline at end of file

src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties

@@ -258,7 +258,7 @@ table.header.tools=<i class\='o_icon o_icon_actions o_icon-lg'> </i>
 table.header.username=Benutzername
 table.legend.absent=Abwesend
 table.legend.attended=Anwesend
-table.legend.authorized=Entschuldigt Abwesenheit
+table.legend.authorized=Entschuldigte Abwesenheit
 table.legend.free=Freiwillige Veranstalltung
 tool.participant=Als Teilnehmer
 tool.teacher=Als Dozent

src/main/java/org/olat/modules/lecture/ui/component/LectureBlockRollCallStatusCellRenderer.java

@@ -65,13 +65,18 @@ public class LectureBlockRollCallStatusCellRenderer implements FlexiCellRenderer
 			LectureBlockStatus status = rollCall.getStatus();
 			LectureRollCallStatus rollCallStatus = rollCall.getRollCallStatus();
 			if(status == LectureBlockStatus.cancelled) {
-				target.append(translator.translate("cancelled"));
+				String title = translator.translate("cancelled");
+				target.append("<span title='").append(title).append("'><i class='o_icon o_icon-lg o_icon_cancelled'> </i></span>");
 			} else if(status == LectureBlockStatus.done
 					&& (rollCallStatus == LectureRollCallStatus.closed || rollCallStatus == LectureRollCallStatus.autoclosed)) {
 				renderClosed(target, rollCall);	
 			} else {
-				target.append(translator.translate("in.progress"));
+				String title = translator.translate("in.progress");
+				target.append("<span title='").append(title).append("'><i class='o_icon o_icon-lg o_icon_status_in_review'> </i></span>");
 			}
+		} else if(!rollCall.isCompulsory()) {
+			String title = translator.translate("rollcall.tooltip.free");
+			target.append("<span title='").append(title).append("'><i class='o_icon o_icon-lg o_lectures_rollcall_free'> </i></span>");
 		}
 	}