OPENOLAT-44: fix sort by date in the "Assignment by date" course building block

src/main/java/de/bps/course/nodes/den/DENEditTableDataModel.java

@@ -28,9 +28,8 @@ import java.util.List;
 import org.olat.commons.calendar.model.KalendarEvent;
 import org.olat.core.gui.components.table.DefaultTableDataModel;
 import org.olat.core.gui.translator.Translator;
-import org.olat.core.util.Formatter;
 
-public class DENEditTableDataModel extends DefaultTableDataModel {
+public class DENEditTableDataModel extends DefaultTableDataModel<KalendarEvent> {
 	
 	public static final String CHANGE_ACTION = "denDateChange";
 	public static final String DELETE_ACTION = "denDateDelete";
@@ -41,7 +40,7 @@ public class DENEditTableDataModel extends DefaultTableDataModel {
 	private Translator translator;
 	private DENManager denManager;
 	
-	public DENEditTableDataModel(List objects, Translator translator) {
+	public DENEditTableDataModel(List<KalendarEvent> objects, Translator translator) {
 		super(objects);
 		
 		this.translator = translator;
@@ -55,15 +54,13 @@ public class DENEditTableDataModel extends DefaultTableDataModel {
 
 	@Override
 	public Object getValueAt(int row, int col) {
-		KalendarEvent event = (KalendarEvent)objects.get(row);
+		KalendarEvent event = getObject(row);
 		
 		switch (col) {
 			case 0: return denManager.format(event.getSubject());
 			case 1:
 				//begin
-				Formatter formatter = Formatter.getInstance(translator.getLocale());
-				String formattedDate = formatter.formatDateAndTime(event.getBegin());
-				return denManager.format(formattedDate);
+				return event.getBegin();
 			case 2:
 				//duration
 				Date begin = event.getBegin();
@@ -79,19 +76,6 @@ public class DENEditTableDataModel extends DefaultTableDataModel {
 		default:	return "error";
 		}
 	}
-
-	public KalendarEvent getDENEventObject(int row) {
-		return (KalendarEvent)objects.get(row);
-	}
-	
-	public void setEntry(int row, KalendarEvent event) {
-		objects.remove(row);
-		objects.add(row, event);
-	}
-	
-	public KalendarEvent getEntryAt(int row) {
-		return (KalendarEvent)objects.get(row);
-	}
 	
 	public void removeEntries(BitSet choosenEntries) {
 		Collection<Object> delList = new ArrayList<Object>();

src/main/java/de/bps/course/nodes/den/DENListTableDataModel.java

@@ -29,9 +29,8 @@ import org.olat.core.gui.translator.Translator;
 import org.olat.core.id.Identity;
 import org.olat.core.id.User;
 import org.olat.core.id.UserConstants;
-import org.olat.core.util.Formatter;
 
-public class DENListTableDataModel extends DefaultTableDataModel {
+public class DENListTableDataModel extends DefaultTableDataModel<KalendarEvent> {
 	
 	public static final String CHANGE_ACTION = "denPartsChange";
 	public static final String MAIL_ACTION = "denSendMail";
@@ -42,7 +41,7 @@ public class DENListTableDataModel extends DefaultTableDataModel {
 	private DENManager denManager;
 	private Translator translator;
 
-	public DENListTableDataModel(List objects, Translator translator) {
+	public DENListTableDataModel(List<KalendarEvent> objects, Translator translator) {
 		super(objects);
 		denManager = DENManager.getInstance();
 		this.translator = translator;
@@ -55,7 +54,7 @@ public class DENListTableDataModel extends DefaultTableDataModel {
 
 	@Override
 	public Object getValueAt(int row, int col) {
-		KalendarEvent event = (KalendarEvent)objects.get(row);
+		KalendarEvent event = getObject(row);
 		
 		switch (col) {
 		case 0:
@@ -63,9 +62,7 @@ public class DENListTableDataModel extends DefaultTableDataModel {
 			return denManager.format(event.getSubject());
 		case 1:
 			//begin
-			Formatter formatter = Formatter.getInstance(translator.getLocale());
-			String formattedDate = formatter.formatDateAndTime(event.getBegin());
-			return denManager.format(formattedDate);
+			return event.getBegin();
 		case 2:
 			//duration
 			Date begin = event.getBegin();

src/main/java/de/bps/course/nodes/den/DENRunTableDataModel.java

@@ -27,7 +27,6 @@ import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.table.DefaultTableDataModel;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.id.Identity;
-import org.olat.core.util.Formatter;
 
 import de.bps.course.nodes.DENCourseNode;
 
@@ -35,7 +34,7 @@ import de.bps.course.nodes.DENCourseNode;
  * TableDataModel for run view of date enrollment
  * @author skoeber
  */
-public class DENRunTableDataModel extends DefaultTableDataModel {
+public class DENRunTableDataModel extends DefaultTableDataModel<KalendarEvent> {
 	
 	public static final String CMD_ENROLL_IN_DATE = "cmd.enroll.in.date";
 	public static final String CMD_ENROLLED_CANCEL = "cmd.enrolled.cancel";
@@ -55,7 +54,7 @@ public class DENRunTableDataModel extends DefaultTableDataModel {
 	 * @param ureq
 	 * @param DENCourseNode courseNode
 	 */
-	public DENRunTableDataModel(List objects, UserRequest ureq, DENCourseNode courseNode, Boolean cancelEnrollEnabled, Translator translator) {
+	public DENRunTableDataModel(List<KalendarEvent> objects, UserRequest ureq, DENCourseNode courseNode, Boolean cancelEnrollEnabled, Translator translator) {
 		super(objects);
 		denManager = DENManager.getInstance();
 		identity = ureq.getIdentity();
@@ -71,16 +70,14 @@ public class DENRunTableDataModel extends DefaultTableDataModel {
 
 	@Override
 	public Object getValueAt(int row, int col) {
-		KalendarEvent event = (KalendarEvent)objects.get(row);
+		KalendarEvent event = getObject(row);
 		
 		switch (col) {
 		case 0:
 			//subject
 			return denManager.format(event.getSubject());
 		case 1:
-			Formatter formatter = Formatter.getInstance(translator.getLocale());
-			String formattedDate = formatter.formatDateAndTime(event.getBegin());
-			return denManager.format(formattedDate);
+			return event.getBegin();
 		case 2:
 			Date begin = event.getBegin();
 			Date end = event.getEnd();
@@ -128,12 +125,4 @@ public class DENRunTableDataModel extends DefaultTableDataModel {
 		default: return "error";
 		}
 	}
-	
-	public KalendarEvent getEntryAt(int row) {
-		return (KalendarEvent)objects.get(row);
-	}
-
-	public void setEntries(List newEntries) {
-		this.objects = newEntries;
-	}
 }