OO-2803: separate the video from the table, remove the list in editor which...

OO-2803: separate the video from the table, remove the list in editor which duplicate the data model, rewrite the validation of chapter, drive the video per javascript command and not per reload of the video...

src/main/java/org/olat/modules/video/manager/VideoTranscodingDAO.java

@@ -26,7 +26,6 @@ import java.util.List;
 import javax.persistence.EntityNotFoundException;
 
 import org.olat.core.commons.persistence.DB;
-import org.olat.modules.video.VideoManager;
 import org.olat.modules.video.VideoTranscoding;
 import org.olat.modules.video.model.TranscodingCount;
 import org.olat.modules.video.model.VideoTranscodingImpl;
@@ -47,8 +46,6 @@ public class VideoTranscodingDAO {
 
 	@Autowired
 	private DB dbInstance;
-	@Autowired 
-	private VideoManager videoManager;
 
 	/**
 	 * Factory method to create and persist new video transcoding objects for a

src/main/java/org/olat/modules/video/ui/ChapterEditController.java

@@ -33,6 +33,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
+import org.olat.core.util.StringHelper;
 
 /**
  * The Class ChapterEditController.
@@ -44,6 +45,7 @@ public class ChapterEditController extends FormBasicController {
 
 	private String time;
 	private String chapter;
+	private long durationInSeconds;
 	private boolean chapterExists;
 	private VideoChapterTableRow videoChapterTableRow;
 	private SimpleDateFormat displayDateFormat = new SimpleDateFormat("HH:mm:ss");
@@ -52,10 +54,9 @@ public class ChapterEditController extends FormBasicController {
 	private TextElement beginEl;
 	
 	private List<VideoChapterTableRow> chapters;
-	private String duration;
 	
 	public ChapterEditController(UserRequest ureq, WindowControl wControl, VideoChapterTableRow videoChapterTableRow,
-			boolean chapterExists, List<VideoChapterTableRow> chapters, String duration) {
+			boolean chapterExists, List<VideoChapterTableRow> chapters, long durationInSeconds) {
 		super(ureq, wControl);
 		displayDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
 		try {
@@ -68,19 +69,22 @@ public class ChapterEditController extends FormBasicController {
 		}
 		this.videoChapterTableRow = videoChapterTableRow;
 		this.chapters = chapters;
-		this.duration = duration;
+		this.durationInSeconds = durationInSeconds;
 		this.chapter = videoChapterTableRow.getChapterName();
 		this.chapterExists = chapterExists;
 		
 		initForm(ureq);
 	}
 	
-	@Override
-	protected void doDispose() {
-		// only formInnerEvent()
+	/**
+	 * Gets the video chapter table row.
+	 *
+	 * @return the video chapter table row
+	 */
+	public VideoChapterTableRow getVideoChapterTableRow() {
+		return videoChapterTableRow;
 	}
 
-
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 
@@ -99,20 +103,80 @@ public class ChapterEditController extends FormBasicController {
 		uifactory.addFormCancelButton("cancel", buttonGroupLayout, ureq, getWindowControl());
 		uifactory.addFormSubmitButton("submit", "video.chapter." + (chapterExists ? "edit" : "add"), buttonGroupLayout);
 	}
+	
+	@Override
+	protected void doDispose() {
+		//
+	}
+	
+	@Override
+	protected void formOK(UserRequest ureq) {
+		try {
+			String chapterTitle = chapterTitleEl.getValue();
+			videoChapterTableRow.setChapterName(chapterTitle);
+			
+			// parse and format because the parse accept such input 00:07:56sfgg and return a correct date
+			String beginTime = beginEl.getValue();
+			videoChapterTableRow.setBegin(displayDateFormat.parse(beginTime));
+			String intervals = displayDateFormat.format(videoChapterTableRow.getBegin());
+			videoChapterTableRow.setIntervals(intervals);
+		} catch (ParseException e) {
+			logWarn("The content of the TextElement cannot be parsed as a Date", e);
+		}
+		
+		fireEvent(ureq, Event.DONE_EVENT);			
+	}
+
+	@Override
+	protected void formCancelled(UserRequest ureq) {
+		fireEvent(ureq, Event.CANCELLED_EVENT);
+	}
+	
+	@Override
+	protected boolean validateFormLogic(UserRequest ureq) {
+		boolean allOk = true;
+		
+		beginEl.clearError();
+		if(StringHelper.containsNonWhitespace(beginEl.getValue())) {
+			try {
+				Date date = displayDateFormat.parse(beginEl.getValue());
+				if (outOfRange(date)){
+					beginEl.setErrorKey("chapter.error.out.of.range", null);
+					allOk &= false;			
+				} else if (timeAlreadyExists(date)) {
+					beginEl.setErrorKey("chapter.error.already.exists", null);	
+					allOk &= false;		
+				}
+			} catch (ParseException e) {
+				beginEl.setErrorKey("chapter.error.format", null);
+				allOk &= false;
+			}
+		} else {
+			beginEl.setErrorKey("chapter.error.format", null);
+		}
 
+		chapterTitleEl.clearError();
+		if(!StringHelper.containsNonWhitespace(chapterTitleEl.getValue())) {
+			chapterTitleEl.setErrorKey("form.legende.mandatory", null);
+			allOk &= false;
+		} else if (chapterNameAlreadyExists(chapterTitleEl.getValue())){
+			chapterTitleEl.setErrorKey("chapter.error.name.already.exists", null);
+			allOk &= false;
+		}
+		
+		return allOk & super.validateFormLogic(ureq);
+	}
+	
 	/**
 	 * Checks if the modification of the video time is not greater than the length of the video.
 	 *
 	 * @return true, if successful
 	 */
-	private boolean outOfRange() {
-		if (duration != null) {
-			long durationLong = (long) Float.parseFloat(duration) * 1000;
-			Date durationDate = new Date(durationLong);			
-			return videoChapterTableRow.getBegin().after(durationDate);
-		} else {
-			return false;			
+	private boolean outOfRange(Date time) {
+		if (durationInSeconds > 0) {	
+			return time.getTime() > (durationInSeconds * 1000l);
 		}
+		return false;
 	}
 	
 	/**
@@ -120,9 +184,9 @@ public class ChapterEditController extends FormBasicController {
 	 *
 	 * @return true, if successful
 	 */
-	private boolean timeAlreadyExists() {
+	private boolean timeAlreadyExists(Date time) {
 		if (chapters.size() > 0 && videoChapterTableRow != null) {
-			String newTimeFormat = displayDateFormat.format(videoChapterTableRow.getBegin());
+			String newTimeFormat = displayDateFormat.format(time);
 			for (VideoChapterTableRow chapterRow : chapters) {
 				String beginFormat = displayDateFormat.format(chapterRow.getBegin());
 				if (beginFormat.equals(newTimeFormat) && !chapterRow.equals(videoChapterTableRow)) {
@@ -138,9 +202,9 @@ public class ChapterEditController extends FormBasicController {
 	 *
 	 * @return true, if successful
 	 */
-	private boolean chapterNameAlreadyExists(){
+	private boolean chapterNameAlreadyExists(String name) {
+		String currentTitle = name.trim().toLowerCase();
 		for (VideoChapterTableRow chapterRow : chapters) {
-			String currentTitle = chapterTitleEl.getValue().trim().toLowerCase();
 			if (currentTitle.equals(chapterRow.getChapterName().trim().toLowerCase())
 					&& !chapterRow.equals(videoChapterTableRow)) {
 				return true;
@@ -148,54 +212,4 @@ public class ChapterEditController extends FormBasicController {
 		}
 		return false;
 	}
-	
-	@Override
-	protected void formOK(UserRequest ureq) {
-		if (setTextElementValuesAndCheckFormat()) {
-			beginEl.setErrorKey("chapter.error.format", null);	
-		} else if (chapterNameAlreadyExists()){
-			chapterTitleEl.setErrorKey("chapter.error.name.already.exists", null);
-		} else if (outOfRange()){
-			beginEl.setErrorKey("chapter.error.out.of.range", null);			
-		} else if (timeAlreadyExists()) {
-			beginEl.setErrorKey("chapter.error.already.exists", null);			
-		} else {
-			fireEvent(ureq, Event.DONE_EVENT);			
-		}
-	}
-
-	@Override
-	protected void formCancelled(UserRequest ureq) {
-		fireEvent(ureq, Event.CANCELLED_EVENT);
-	}
-
-	/**
-	 * Gets the video chapter table row.
-	 *
-	 * @return the video chapter table row
-	 */
-	public VideoChapterTableRow getVideoChapterTableRow() {
-		setTextElementValuesAndCheckFormat();
-		return videoChapterTableRow;
-	}
-	
-	/**
-	 * Sets the text element values and check format.
-	 * only alter table if format is correct 
-	 * @return true, if successful
-	 */
-	private boolean setTextElementValuesAndCheckFormat (){
-		boolean incorrectTimeFormat = false;
-		String beginTime = beginEl.getValue();
-		String chapterTitle = chapterTitleEl.getValue();
-		try {
-			videoChapterTableRow.setBegin(displayDateFormat.parse(beginTime));
-			videoChapterTableRow.setChapterName(chapterTitle);		
-			videoChapterTableRow.setIntervals(beginTime);
-		} catch (ParseException e) {
-			logError("The content of the TextElement cannot be parsed as a Date", e);
-			incorrectTimeFormat = true;
-		}
-		return incorrectTimeFormat;
-	}
 }
\ No newline at end of file

src/main/java/org/olat/modules/video/ui/VideoChapterEditController.java

@@ -20,6 +20,7 @@
 package org.olat.modules.video.ui;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -27,6 +28,7 @@ import java.util.List;
 import java.util.TimeZone;
 
 import org.olat.core.gui.UserRequest;
+import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.form.flexible.FormItem;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.FlexiTableElement;
@@ -39,10 +41,14 @@ import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTable
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableDataModelFactory;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.SelectionEvent;
 import org.olat.core.gui.components.link.Link;
+import org.olat.core.gui.components.velocity.VelocityContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
+import org.olat.core.gui.control.controller.BasicController;
 import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
+import org.olat.core.gui.control.winmgr.JSCommand;
+import org.olat.core.util.StringHelper;
 import org.olat.modules.video.VideoManager;
 import org.olat.modules.video.ui.VideoChapterTableModel.ChapterTableCols;
 import org.olat.repository.RepositoryEntry;
@@ -55,200 +61,267 @@ import org.springframework.beans.factory.annotation.Autowired;
  * this class displays a VideoDisplayController and a table of chapters
  * chapters are saved in a textfile at the same location as the video resource
  */
-public class VideoChapterEditController extends FormBasicController {
-	
-	private RepositoryEntry entry;
-	private VideoChapterTableModel tableModel;
+public class VideoChapterEditController extends BasicController {
+
+	private CloseableModalController cmc;
+	private ChapterEditController chapterEditCtr;
+	private VideoChaptersController chaptersEditCtrl;
 	private VideoDisplayController videoDisplayCtr;
-	private FlexiTableElement chapterTable;
 	
-	private static final SimpleDateFormat displayDateFormat = new SimpleDateFormat("HH:mm:ss");
 
-	private final List<VideoChapterTableRow> chapters;
+	private long durationInSeconds;
+	private String currentTimeCode;
+	private RepositoryEntry entry;
+	private final String videoElementId;
+	private final SimpleDateFormat displayDateFormat;
 
 	@Autowired
 	private VideoManager videoManager;
 	
-	private CloseableModalController cmc;
-	private ChapterEditController chapterEditCtr;
-	
-	private String currentTimeCode;
-	private String duration;
-	private FormLink addChapterEl;
-	
 	public VideoChapterEditController(UserRequest ureq, WindowControl wControl, RepositoryEntry entry) {
-		super(ureq, wControl, "video_chapter");
-		displayDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+		super(ureq, wControl);
 		this.entry = entry;
-		chapters = videoManager.loadChapters(entry.getOlatResource());
-		initForm(ureq);
-		loadTableModel();
-	}
-
-	@Override
-	protected void doDispose() {
-		//
-	}
+		displayDateFormat = new SimpleDateFormat("HH:mm:ss");
+		displayDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
 
-	@Override
-	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		VelocityContainer mainVC = createVelocityContainer("video_chapter_editor");
+		
 		//video preview
 		videoDisplayCtr = new VideoDisplayController(ureq, getWindowControl(), entry, false, false, false, false, null, false, false, null, false);
 		listenTo(videoDisplayCtr);	
-		videoDisplayCtr.reloadVideo(ureq, null);
-		if(formLayout instanceof FormLayoutContainer) {
-			FormLayoutContainer layoutCont = (FormLayoutContainer)formLayout;
-			layoutCont.getFormItemComponent().put("video", videoDisplayCtr.getInitialComponent());
-		}
+		videoDisplayCtr.reloadVideo(ureq);
+		mainVC.put("video", videoDisplayCtr.getInitialComponent());
+		videoElementId = videoDisplayCtr.getVideoElementId();
 		
-		FlexiTableColumnModel chapterTableModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
-		chapterTableModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChapterTableCols.chapterName));
-		chapterTableModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChapterTableCols.intervals));
-		chapterTableModel.addFlexiColumnModel(new DefaultFlexiColumnModel("edit", translate("edit"), "edit"));
-		chapterTableModel.addFlexiColumnModel(new DefaultFlexiColumnModel("delete", translate("delete"), "delete"));
-		tableModel = new VideoChapterTableModel(chapterTableModel, getTranslator());
-
-		chapterTable = uifactory.addTableElement(getWindowControl(), "table", tableModel, getTranslator(), formLayout);
-		chapterTable.setCustomizeColumns(false);
-		chapterTable.setNumOfRowsEnabled(false);
-		
-		FormLayoutContainer buttonGroupLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
-		formLayout.add(buttonGroupLayout);
-		addChapterEl = uifactory.addFormLink("video.chapter.add", buttonGroupLayout, Link.BUTTON);
+		//chapters editor
+		chaptersEditCtrl = new VideoChaptersController(ureq, getWindowControl());
+		listenTo(chaptersEditCtrl);
+		mainVC.put("chapters", chaptersEditCtrl.getInitialComponent());
+				
+		putInitialPanel(mainVC);
 	}
 
-	private void loadTableModel() {	
-		if (chapters != null)tableModel.setObjects(chapters);
-		chapterTable.reset(true, true, true);		
-	}
-	
-	private void doDelete(UserRequest ureq, VideoChapterTableRow toRemove) {
-		if (chapters != null){
-			chapters.remove(toRemove);	
-			organizeChapters();
-			tableModel.setObjects(chapters);
-		}
-		chapterTable.reset(true, true, true);	
-		saveChapters(ureq, toRemove.getBegin());
-	}
-	
 	@Override
-	public void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
-		if(source == chapterTable) {
-			if(event instanceof SelectionEvent) {
-				SelectionEvent se = (SelectionEvent)event;
-				se.getIndex();
-				VideoChapterTableRow currentObject = tableModel.getObject(se.getIndex());
-				if ("delete".equals(se.getCommand())){
-					doDelete(ureq, currentObject);					
-				} else if ("edit".equals(se.getCommand())){
-					VideoChapterTableRow vctr = chapters.get(chapters.indexOf(currentObject));
-					doOpenCallout(ureq, vctr, true);
-				} 
-			}
-		} else if (addChapterEl == source) {
-			long currentLong = currentTimeCode != null ? (long) Float.parseFloat(currentTimeCode) * 1000 : 0;
-			Date currentDate = new Date(currentLong);
-			VideoChapterTableRow vctr = new VideoChapterTableRow(translate("video.chapter.new"), 
-					displayDateFormat.format(currentDate), currentDate, currentDate);
-			doOpenCallout(ureq, vctr, false);
-		}
+	protected void doDispose() {
+		//
 	}
 	
 	@Override
-	protected void propagateDirtinessToContainer(FormItem fiSrc, FormEvent event) {
-		//avoid reload of html template, to prevent videoreload
+	protected void event(UserRequest ureq, Component source, Event event) {
+		//
 	}
-
+	
 	@Override
-	public void event(UserRequest ureq, Controller source, Event event) {
+	protected void event(UserRequest ureq, Controller source, Event event) {
 		if (source == videoDisplayCtr) {
 			if (event instanceof VideoEvent) {
 				VideoEvent videoEvent = (VideoEvent) event;
-				String timeCode = videoEvent.getTimeCode();
-				currentTimeCode = timeCode;
-				duration = videoEvent.getDuration();
+				currentTimeCode = videoEvent.getTimeCode();
+				if(StringHelper.containsNonWhitespace(videoEvent.getDuration()) && !"NaN".equals(videoEvent.getDuration())) {
+					try {
+						durationInSeconds = Math.round(Double.parseDouble(videoEvent.getDuration()));
+					} catch (NumberFormatException e) {
+						//don't panic
+					}
+				}
 			}
-		} else if (source == chapterEditCtr){
-			if (event == Event.DONE_EVENT) {
-				doAddOrUpdateChapter(ureq, chapterEditCtr.getVideoChapterTableRow());
-			} 
-			cmc.deactivate();
-			cleanUp();
-		} else if (source == cmc) {
-			cleanUp();
-		} 
-		super.event(ureq, source, event);
+		}
 	}
+
+	private class VideoChaptersController extends FormBasicController {
+
+		private FormLink addChapterEl;
+		private FlexiTableElement chapterTable;
+		private VideoChapterTableModel tableModel;
+
+		public VideoChaptersController(UserRequest ureq, WindowControl wControl) {
+			super(ureq, wControl, "video_chapter");
+			initForm(ureq);
+			loadTableModel();
+		}
+
+		@Override
+		protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+			FlexiTableColumnModel chapterTableModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
+			chapterTableModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChapterTableCols.chapterName));
+			chapterTableModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChapterTableCols.intervals));
+			chapterTableModel.addFlexiColumnModel(new DefaultFlexiColumnModel("edit", translate("edit"), "edit"));
+			chapterTableModel.addFlexiColumnModel(new DefaultFlexiColumnModel("delete", translate("delete"), "delete"));
+			tableModel = new VideoChapterTableModel(chapterTableModel, getTranslator());
 	
-	private void cleanUp(){
-		removeAsListenerAndDispose(cmc);
-		removeAsListenerAndDispose(chapterEditCtr);
-		cmc = null;
-		chapterEditCtr = null;
-	}
+			chapterTable = uifactory.addTableElement(getWindowControl(), "table", tableModel, getTranslator(), formLayout);
+			chapterTable.setCustomizeColumns(false);
+			chapterTable.setNumOfRowsEnabled(false);
+			
+			FormLayoutContainer buttonGroupLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
+			formLayout.add(buttonGroupLayout);
+			addChapterEl = uifactory.addFormLink("video.chapter.add", buttonGroupLayout, Link.BUTTON);
+		}
+		
+		@Override
+		protected void doDispose() {
+			//
+		}
 	
-	@Override
-	protected void formOK(UserRequest ureq) {
-		// only formInnerEvent()
-	}
+		private void loadTableModel() {
+			List<VideoChapterTableRow> chapters = videoManager.loadChapters(entry.getOlatResource());
+			if(chapters == null) {
+				tableModel.setObjects(new ArrayList<>());
+			} else {
+				tableModel.setObjects(chapters);
+			}
+			chapterTable.reset(true, true, true);		
+		}
+
+		@Override
+		public void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
+			if(source == chapterTable) {
+				if(event instanceof SelectionEvent) {
+					SelectionEvent se = (SelectionEvent)event;
+					se.getIndex();
+					VideoChapterTableRow currentObject = tableModel.getObject(se.getIndex());
+					if ("delete".equals(se.getCommand())){
+						doDelete(currentObject);					
+					} else if ("edit".equals(se.getCommand())){
+						doEditChapter(ureq, currentObject, true);
+					} 
+				}
+			} else if (addChapterEl == source) {
+				long currentLong = currentTimeCode != null ? Math.round(Double.parseDouble(currentTimeCode)) * 1000l : 0l;
+				Date currentDate = new Date(currentLong);
+				VideoChapterTableRow vctr = new VideoChapterTableRow(translate("video.chapter.new"), 
+						displayDateFormat.format(currentDate), currentDate, currentDate);
+				doEditChapter(ureq, vctr, false);
+			}
+		}
+		
+		@Override
+		protected void propagateDirtinessToContainer(FormItem fiSrc, FormEvent event) {
+			//avoid reload of html template, to prevent videoreload
+		}
 	
-	private void saveChapters(UserRequest ureq, Date time) {
-		videoManager.saveChapters(chapters, entry.getOlatResource());
+		@Override
+		public void event(UserRequest ureq, Controller source, Event event) {
+			if (source == chapterEditCtr){
+				if (event == Event.DONE_EVENT) {
+					doAddOrUpdateChapter(ureq, chapterEditCtr.getVideoChapterTableRow());
+				} 
+				cmc.deactivate();
+				cleanUp();
+			} else if (source == cmc) {
+				cleanUp();
+			} 
+			super.event(ureq, source, event);
+		}
 		
-		long timeInSeconds = time.getTime() / 1000l;
-		videoDisplayCtr.reloadVideo(ureq, timeInSeconds);
-	}
-
-	private void doOpenCallout(UserRequest ureq, VideoChapterTableRow videoChapterTableRow, boolean chapterExists) {
-		if(chapterEditCtr != null) return;
+		private void cleanUp(){
+			removeAsListenerAndDispose(cmc);
+			removeAsListenerAndDispose(chapterEditCtr);
+			cmc = null;
+			chapterEditCtr = null;
+		}
+		
+		@Override
+		protected void formOK(UserRequest ureq) {
+			//
+		}
 		
-		chapterEditCtr = new ChapterEditController(ureq, getWindowControl(), videoChapterTableRow, 
-				chapterExists, chapters, duration); 
-		listenTo(chapterEditCtr);
+		private void doDelete(VideoChapterTableRow toRemove) {
+			List<VideoChapterTableRow> chapters = tableModel.getObjects();
+			chapters.remove(toRemove);	
+			organizeChapters(chapters);
+			tableModel.setObjects(chapters);
+			chapterTable.reset(true, true, true);	
+			saveChapters();
+		}
+		
+		private void saveChapters() {
+			List<VideoChapterTableRow> chapters = tableModel.getObjects();
+			videoManager.saveChapters(chapters, entry.getOlatResource());
+		}
+		
+		private void moveCurrentTime(Date time) {
+			long timeInSeconds = time.getTime() / 1000l;
 
-		cmc = new CloseableModalController(getWindowControl(), translate("close"), chapterEditCtr.getInitialComponent(), 
-				true, translate("video.chapter." + (chapterExists ? "edit" : "new")));
-		listenTo(cmc);
-		cmc.activate();
-	}
+			String elementId = "o_so_vid" + videoElementId;
+			StringBuilder sb = new StringBuilder();
+			sb.append("try {\n")
+			  .append(" var player = jQuery('#").append(elementId).append("').data('player');\n")
+			  .append(" var loaded = jQuery('#").append(elementId).append("').data('playerloaded');\n")
+			  .append(" if(loaded) {\n")
+			  .append("  player.pause();\n")
+			  .append("  player.setCurrentTime(").append(timeInSeconds).append(");\n")
+			  .append(" } else {")
+			  .append("  var metaListener = function(e) {\n")
+			  .append("   player.setCurrentTime(").append(timeInSeconds).append(");\n")
+			  .append("   player.pause();\n")
+			  .append("   player.media.removeEventListener(metaListener);\n")
+			  .append("  };\n")
+			  .append("  player.play();")
+			  .append("  player.media.addEventListener('loadedmetadata', metaListener);")
+			  .append(" }")
+			  .append("} catch(e) {\n")
+			  .append("  if(window.console) console.log(e);\n")
+			  .append("}");
+
+			getWindowControl().getWindowBackOffice().sendCommandTo(new JSCommand(sb.toString()));
+		}
 	
-	private void doAddOrUpdateChapter(UserRequest ureq, VideoChapterTableRow row){
-		//only add if object does not yet exist
-		if (!chapters.contains(row)){
-			chapters.add(row);
-		}
-		//sort chapters by begin time
-		Collections.sort(chapters, new Comparator<VideoChapterTableRow>(){
-			@Override
-			public int compare(VideoChapterTableRow o1, VideoChapterTableRow o2) {
-				return o1.getBegin().compareTo(o2.getBegin());
-			}			
-		});		
-		organizeChapters();
-		loadTableModel();
-		saveChapters(ureq, row.getBegin());
-		addToHistory(ureq, this);
-	}
+		private void doEditChapter(UserRequest ureq, VideoChapterTableRow videoChapterTableRow, boolean chapterExists) {
+			if(chapterEditCtr != null) return;
+			
+			chapterEditCtr = new ChapterEditController(ureq, getWindowControl(), videoChapterTableRow, 
+					chapterExists, tableModel.getObjects(), durationInSeconds); 
+			listenTo(chapterEditCtr);
 	
-	private void organizeChapters () {
-		//set end of previous chapter to beginning of the following				
-		for (int i = 1; i <= chapters.size(); i++) {
-			VideoChapterTableRow previousChapter = chapters.get(i-1);
-			if (i != chapters.size()) {
-				VideoChapterTableRow currentChapter = chapters.get(i);
-				previousChapter.setEnd(currentChapter.getBegin());				
-			} else {
-				long durationLong = duration != null ? (long) Float.parseFloat(duration) * 1000 : 0;
-				// duration may hold no value, backup ask videoManager
-				if (durationLong == 0){
-					Date endOfMovie = new Date(videoManager.getVideoDuration(entry.getOlatResource()));
-					previousChapter.setEnd(endOfMovie);
-				}else{
-					Date durationDate = new Date(durationLong);
-					previousChapter.setEnd(durationDate);					
+			cmc = new CloseableModalController(getWindowControl(), translate("close"), chapterEditCtr.getInitialComponent(), 
+					true, translate("video.chapter." + (chapterExists ? "edit" : "new")));
+			listenTo(cmc);
+			cmc.activate();
+		}
+		
+		private void doAddOrUpdateChapter(UserRequest ureq, VideoChapterTableRow row){
+			//only add if object does not yet exist
+			List<VideoChapterTableRow> chapters = new ArrayList<>(tableModel.getObjects());
+			if (!chapters.contains(row)){
+				chapters.add(row);
+			}
+			
+			//sort chapters by begin time
+			Collections.sort(chapters, new Comparator<VideoChapterTableRow>(){
+				@Override
+				public int compare(VideoChapterTableRow o1, VideoChapterTableRow o2) {
+					return o1.getBegin().compareTo(o2.getBegin());
+				}			
+			});		
+			organizeChapters(chapters);
+			tableModel.setObjects(chapters);
+			chapterTable.reset(true, true, true);
+			saveChapters();
+			moveCurrentTime(row.getBegin());
+			addToHistory(ureq, this);
+		}
+		
+		/**
+		 * Set end of previous chapter to beginning of the following.
+		 * 
+		 * @param chapters The list of chapters to reorganize
+		 */
+		private void organizeChapters(List<VideoChapterTableRow> chapters) {			
+			for (int i = 1; i <= chapters.size(); i++) {
+				VideoChapterTableRow previousChapter = chapters.get(i-1);
+				if (i != chapters.size()) {
+					VideoChapterTableRow currentChapter = chapters.get(i);
+					previousChapter.setEnd(currentChapter.getBegin());				
+				} else {
+					// duration may hold no value, backup ask videoManager
+					if (durationInSeconds <= 0) {
+						Date endOfMovie = new Date(videoManager.getVideoDuration(entry.getOlatResource()));
+						previousChapter.setEnd(endOfMovie);
+					} else {
+						previousChapter.setEnd(new Date(durationInSeconds * 1000l));					
+					}
 				}
-				
 			}
 		}
 	}

src/main/java/org/olat/modules/video/ui/VideoChapterTableRow.java

@@ -21,8 +21,6 @@ package org.olat.modules.video.ui;
 
 import java.util.Date;
 
-import org.olat.core.gui.components.form.flexible.FormUIFactory;
-
 /**
  * 
  * Initial date: 21.10.2016<br>
@@ -35,9 +33,6 @@ public class VideoChapterTableRow {
 	private String intervals;
 	private Date begin,end;
 
-	protected FormUIFactory uifactory = FormUIFactory.getInstance();
-
-
 	public VideoChapterTableRow(String chapterName, String intervals, Date begin, Date end) {
 		this.chapterName = chapterName;
 		this.intervals = intervals;
@@ -45,7 +40,6 @@ public class VideoChapterTableRow {
 		this.end = end;
 	}
 	
-
 	public String getChapterName() {
 		return chapterName;
 	}
@@ -77,13 +71,4 @@ public class VideoChapterTableRow {
 	public void setEnd(Date end) {
 		this.end = end;
 	}
-
-	public FormUIFactory getUifactory() {
-		return uifactory;
-	}
-
-	public void setUifactory(FormUIFactory uifactory) {
-		this.uifactory = uifactory;
-	}
-	
 }
\ No newline at end of file

src/main/java/org/olat/modules/video/ui/VideoDisplayController.java

@@ -176,22 +176,21 @@ public class VideoDisplayController extends BasicController {
 		JSAndCSSComponent mediaelementjs = new JSAndCSSComponent("mediaelementjs", jsCodePath ,cssPath);
 		mainVC.put("mediaelementjs", mediaelementjs);
 	}
-
+	
+	public String getVideoElementId() {
+		return mainVC.getDispatchID();
+	}
 
 	/**
 	 * Reload the video, e.g. when new captions or transcoded versions are available
 	 * @param ureq
 	 * @param currentTime The start time in seconds (optional)
 	 */
-	protected void reloadVideo(UserRequest ureq, Long currentTime) {
+	protected void reloadVideo(UserRequest ureq) {
 		//load video as VFSLeaf
 		VFSLeaf video = videoManager.getMasterVideoFile(entry.getOlatResource());
 		loadVideo(ureq, video);
 		mainVC.contextPut("addForceReload", "?t=" + CodeHelper.getRAMUniqueID());
-		if(currentTime != null) {
-			System.out.println("current");
-			mainVC.contextPut("currentTimeAt", currentTime.toString());
-		}
 	}
 	
 	/**
@@ -352,8 +351,6 @@ public class VideoDisplayController extends BasicController {
 					}
 				}
 			}
-			
 		}
 	}
-
 }

src/main/java/org/olat/modules/video/ui/VideoRuntimeController.java

@@ -100,7 +100,7 @@ public class VideoRuntimeController extends RepositoryEntryRuntimeController {
 			if (event instanceof RootEvent || event instanceof PopEvent) {
 				// reload the video, maybe some new transcoded files available
 				VideoDisplayController videoDisplayCtr = (VideoDisplayController)getRuntimeController();
-				videoDisplayCtr.reloadVideo(ureq, null);
+				videoDisplayCtr.reloadVideo(ureq);
 			}
 			// maybe something else needs to be done
 			super.event(ureq, source, event);

src/main/java/org/olat/modules/video/ui/_content/chapter_table.html

-<div>
-$r.render("table")
-</div>
\ No newline at end of file

src/main/java/org/olat/modules/video/ui/_content/video_chapter.html

-<fieldset>
-	<legend>
-		$r.contextHelpWithWrapper("Learning resource: Video#_video_resolution")
+$r.render("table")
+<div class="o_button_group">$r.render("buttons")</div>
\ No newline at end of file
-		$r.translate("video.chapter.title")
-	</legend>	
-	<div class="container-fluid">
-		<div class="row clearfix">
-			<div class="col-sm-6">
-				<div>$r.render("video")</div>
-			</div>
-			<div class="col-sm-6">
-				$r.render("table")
-				<div class="field">$r.render("buttons")</div>
-			</div>
-		</div>
-	</div>
-</fieldset>
\ No newline at end of file

src/main/java/org/olat/modules/video/ui/_content/video_chapter_editor.html

+<fieldset class="o_video_chapter_editor">
+	<legend>$r.contextHelpWithWrapper("Learning resource: Video#_video_resolution")
+		$r.translate("video.chapter.title")</legend>
+	<div class="row clearfix">
+		<div class="col-sm-6">$r.render("video")</div>
+		<div class="col-sm-6">$r.render("chapters")</div>
+	</div>
+</fieldset>
\ No newline at end of file

src/main/java/org/olat/modules/video/ui/_content/video_run.html

@@ -40,7 +40,9 @@
 			
 			## Callback to communicate with the server
 			success: function (mediaElement, domObject, player) {
-
+		        jQuery('#$r.getId("o_vid")').data('player', player);
+		        jQuery('#$r.getId("o_vid")').data('playerloaded', false);
+		        
 				## listen to play events, fired when movie is finished
 		        mediaElement.addEventListener('play', function(e) {
 		        	if (!o_info.linkbusy) {
@@ -71,14 +73,10 @@
 		        #if($useSourceChooser)
 		        jQuery(jQuery('.mejs__source-chooser-selector input')[$preferredResolution]).prop("checked", true).trigger("click");
 		        #end
-
-		        #if($r.isNotNull($currentTimeAt))
-			        player.play();
-		        	mediaElement.addEventListener('loadedmetadata', function(e) {
-			        	player.setCurrentTime(${currentTimeAt});
-						player.pause();
-			        }, false);
-		        #end
+		        
+		        mediaElement.addEventListener('loadedmetadata', function(e) {
+			        jQuery('#$r.getId("o_vid")').data('playerloaded', true);
+		        }, false);
 			}
 		});
 		// ]]>

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

@@ -116,6 +116,12 @@
 	}
 }
 
+.o_video_chapter_editor {
+	.o_table_wrapper.o_table_flexi .table {
+		margin-top: 0;
+	}
+}
+
 /* beautify source chooser plugin, remove radio button */
 .mejs__controls .mejs__sourcechooser-button > button {
     background: transparent;