Skip to content
Snippets Groups Projects
Commit eab12db5 authored by srosse's avatar srosse
Browse files

OPENOLAT-160: add the html code by rendering and not in the model

parent 885c226b
No related branches found
No related tags found
No related merge requests found
......@@ -57,7 +57,7 @@ public class DENEditTableDataModel extends DefaultTableDataModel<KalendarEvent>
KalendarEvent event = getObject(row);
switch (col) {
case 0: return denManager.format(event.getSubject());
case 0: return event.getSubject();
case 1:
//begin
return event.getBegin();
......@@ -70,7 +70,7 @@ public class DENEditTableDataModel extends DefaultTableDataModel<KalendarEvent>
return denManager.formatDuration(milliSeconds, translator);
case 3:
//location
return denManager.format(event.getLocation());
return event.getLocation();
case 4: return event.getComment();
case 5: return event.getNumParticipants();
default: return "error";
......
......@@ -59,7 +59,7 @@ public class DENListTableDataModel extends DefaultTableDataModel<KalendarEvent>
switch (col) {
case 0:
//subject
return denManager.format(event.getSubject());
return event.getSubject();
case 1:
//begin
return event.getBegin();
......@@ -72,7 +72,7 @@ public class DENListTableDataModel extends DefaultTableDataModel<KalendarEvent>
return denManager.formatDuration(milliSeconds, translator);
case 3:
//location
return denManager.format(event.getLocation());
return event.getLocation();
case 4:
//comment
return event.getComment();
......
......@@ -543,9 +543,9 @@ public class DENManager {
tableConfig.setResultsPerPage(15);
tableConfig.setShowAllLinkEnabled(true);
TableController tableCntrl = new TableController(tableConfig, ureq, wControl, trans);
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.date", 0, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new StrongColumnDescriptor("dates.table.date", 0, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.begin", 1, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.location", 3, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new StrongColumnDescriptor("dates.table.location", 3, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.duration", 2, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.comment", 4, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.participants.num", 5, null, ureq.getLocale()));
......@@ -572,9 +572,9 @@ public class DENManager {
tableConfig.setTableEmptyMessage(trans.translate("dates.table.empty"));
tableConfig.setColumnMovingOffered(true);
TableController tableCntrl = new TableController(tableConfig, ureq, wControl, trans);
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.date", 0, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new StrongColumnDescriptor("dates.table.date", 0, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.begin", 1, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.location", 3, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new StrongColumnDescriptor("dates.table.location", 3, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.duration", 2, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.comment", 4, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.reserved", 5, null, ureq.getLocale()));
......@@ -603,9 +603,9 @@ public class DENManager {
tableConfig.setTableEmptyMessage(trans.translate("dates.table.empty"));
tableConfig.setColumnMovingOffered(true);
TableController tableCntrl = new TableController(tableConfig, ureq, wControl, trans);
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.date", 0, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new StrongColumnDescriptor("dates.table.date", 0, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.begin", 1, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.location", 3, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new StrongColumnDescriptor("dates.table.location", 3, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.duration", 2, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.comment", 4, null, ureq.getLocale()));
tableCntrl.addColumnDescriptor(new DefaultColumnDescriptor("dates.table.participant.name", 5, null, ureq.getLocale()));
......@@ -866,10 +866,6 @@ public class DENManager {
kalendarEventLinks.add(link);
}
public String format(String unformattedText) {
return "<strong>"+unformattedText+"</strong>";
}
public String formatDuration(long ms, Translator translator) {
boolean setEntry = false;
int day = (int)(ms/1000/60/60/24);
......
......@@ -75,7 +75,7 @@ public class DENRunTableDataModel extends DefaultTableDataModel<KalendarEvent> {
switch (col) {
case 0:
//subject
return denManager.format(event.getSubject());
return event.getSubject();
case 1:
return event.getBegin();
case 2:
......@@ -86,17 +86,16 @@ public class DENRunTableDataModel extends DefaultTableDataModel<KalendarEvent> {
return denManager.formatDuration(milliSeconds, translator);
case 3:
//location
return denManager.format(event.getLocation());
return event.getLocation();
case 4:
//comment
return event.getComment();
case 5:
//enrolled & total
StringBuffer numStrBuf = new StringBuffer();
StringBuilder numStrBuf = new StringBuilder();
String[] participants = event.getParticipants();
numStrBuf.append(participants == null ? "0" : participants.length);
numStrBuf.append("/");
numStrBuf.append(event.getNumParticipants());
numStrBuf.append(participants == null ? "0" : participants.length)
.append("/").append(event.getNumParticipants());
return numStrBuf.toString();
case 6:
//status
......
/**
* <a href="http://www.openolat.org">
* OpenOLAT - Online Learning and Training</a><br>
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); <br>
* you may not use this file except in compliance with the License.<br>
* You may obtain a copy of the License at the
* <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
* <p>
* Unless required by applicable law or agreed to in writing,<br>
* software distributed under the License is distributed on an "AS IS" BASIS, <br>
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
* See the License for the specific language governing permissions and <br>
* limitations under the License.
* <p>
* Initial code contributed and copyrighted by<br>
* frentix GmbH, http://www.frentix.com
* <p>
*/
package de.bps.course.nodes.den;
import java.util.Locale;
import org.olat.core.gui.components.table.DefaultColumnDescriptor;
import org.olat.core.gui.render.Renderer;
import org.olat.core.gui.render.StringOutput;
/**
*
* Wrap a strong tag around the value
*
* Initial date: 02.09.2013<br>
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
public class StrongColumnDescriptor extends DefaultColumnDescriptor {
public StrongColumnDescriptor(final String headerKey, final int dataColumn, final String action, final Locale locale) {
super(headerKey, dataColumn, action, locale);
}
@Override
public void renderValue(StringOutput sb, int row, Renderer renderer) {
sb.append("<strong>");
super.renderValue(sb, row, renderer);
sb.append("</strong>");
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment