diff --git a/src/main/java/de/bps/course/nodes/den/DENEditTableDataModel.java b/src/main/java/de/bps/course/nodes/den/DENEditTableDataModel.java
index 6d9c5ac5dc2a809b8c7db7bf5fe1d8be9e011d44..e7612b927d46d726b1ceb752de3a607c5d5fc8e6 100644
--- a/src/main/java/de/bps/course/nodes/den/DENEditTableDataModel.java
+++ b/src/main/java/de/bps/course/nodes/den/DENEditTableDataModel.java
@@ -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";
diff --git a/src/main/java/de/bps/course/nodes/den/DENListTableDataModel.java b/src/main/java/de/bps/course/nodes/den/DENListTableDataModel.java
index de29c0054738a57cf88ec3d562107a05329dc37f..f80de75eb156e435316faff32d34ede8df7ca166 100644
--- a/src/main/java/de/bps/course/nodes/den/DENListTableDataModel.java
+++ b/src/main/java/de/bps/course/nodes/den/DENListTableDataModel.java
@@ -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();
diff --git a/src/main/java/de/bps/course/nodes/den/DENManager.java b/src/main/java/de/bps/course/nodes/den/DENManager.java
index 14d610236da5600a0d942ff2a0c477ca8e1757de..2e2ed6fbf885daceab38916529521d81058e2a5c 100644
--- a/src/main/java/de/bps/course/nodes/den/DENManager.java
+++ b/src/main/java/de/bps/course/nodes/den/DENManager.java
@@ -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);
diff --git a/src/main/java/de/bps/course/nodes/den/DENRunTableDataModel.java b/src/main/java/de/bps/course/nodes/den/DENRunTableDataModel.java
index b10ff021770ccbd837d6881d9a0778c7dda9d392..91c5fe3e3f45b514078b5f62ffcfbee532b10ff7 100644
--- a/src/main/java/de/bps/course/nodes/den/DENRunTableDataModel.java
+++ b/src/main/java/de/bps/course/nodes/den/DENRunTableDataModel.java
@@ -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
diff --git a/src/main/java/de/bps/course/nodes/den/StrongColumnDescriptor.java b/src/main/java/de/bps/course/nodes/den/StrongColumnDescriptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..4f851d405ba2b3cc33a1f5bbb80c28f3b96c2dbe
--- /dev/null
+++ b/src/main/java/de/bps/course/nodes/den/StrongColumnDescriptor.java
@@ -0,0 +1,51 @@
+/**
+ * <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>");
+ }
+
+
+
+}