diff --git a/docs/images/lookup/details.png b/docs/images/lookup/details.png new file mode 100644 index 00000000..a9394784 Binary files /dev/null and b/docs/images/lookup/details.png differ diff --git a/docs/images/lookup/import_exam.png b/docs/images/lookup/import_exam.png new file mode 100644 index 00000000..b83ed215 Binary files /dev/null and b/docs/images/lookup/import_exam.png differ diff --git a/docs/images/lookup/list.png b/docs/images/lookup/list.png new file mode 100644 index 00000000..d43d44bb Binary files /dev/null and b/docs/images/lookup/list.png differ diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java index fa8a0739..8361ce45 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java @@ -117,9 +117,6 @@ public final class Exam implements GrantEntity { @JsonProperty(EXAM.ATTR_STATUS) public final ExamStatus status; -// @JsonProperty(EXAM.ATTR_LMS_SEB_RESTRICTION) -// public final Boolean lmsSebRestriction; - @JsonProperty(EXAM.ATTR_BROWSER_KEYS) public final String browserExamKeys; @@ -145,7 +142,6 @@ public final class Exam implements GrantEntity { @JsonProperty(EXAM.ATTR_OWNER) final String owner, @JsonProperty(EXAM.ATTR_SUPPORTER) final Collection supporter, @JsonProperty(EXAM.ATTR_STATUS) final ExamStatus status, -// @JsonProperty(EXAM.ATTR_LMS_SEB_RESTRICTION) final Boolean lmsSebRestriction, @JsonProperty(EXAM.ATTR_BROWSER_KEYS) final String browserExamKeys, @JsonProperty(EXAM.ATTR_ACTIVE) final Boolean active, @JsonProperty(EXAM.ATTR_LASTUPDATE) final String lastUpdate) { @@ -163,7 +159,6 @@ public final class Exam implements GrantEntity { this.quitPassword = quitPassword; this.owner = owner; this.status = (status != null) ? status : getStatusFromDate(startTime, endTime); -// this.lmsSebRestriction = (lmsSebRestriction != null) ? lmsSebRestriction : Boolean.FALSE; this.browserExamKeys = browserExamKeys; this.active = (active != null) ? active : Boolean.TRUE; this.lastUpdate = lastUpdate; @@ -216,7 +211,6 @@ public final class Exam implements GrantEntity { this.quitPassword = null; this.owner = null; this.status = (status != null) ? status : getStatusFromDate(this.startTime, this.endTime); -// this.lmsSebRestriction = null; this.browserExamKeys = null; this.active = null; this.supporter = null; @@ -314,10 +308,6 @@ public final class Exam implements GrantEntity { return this.status; } -// public Boolean getLmsSebRestriction() { -// return this.lmsSebRestriction; -// } - public String getBrowserExamKeys() { return this.browserExamKeys; } @@ -357,8 +347,6 @@ public final class Exam implements GrantEntity { builder.append(this.supporter); builder.append(", status="); builder.append(this.status); -// builder.append(", lmsSebRestriction="); -// builder.append(this.lmsSebRestriction); builder.append(", browserExamKeys="); builder.append(this.browserExamKeys); builder.append(", active="); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/CellFieldBuilderAdapter.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/CellFieldBuilderAdapter.java index 1d23c220..dba39ec5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/CellFieldBuilderAdapter.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/CellFieldBuilderAdapter.java @@ -10,6 +10,7 @@ package ch.ethz.seb.sebserver.gui.service.examconfig.impl; import java.util.Collection; +import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Group; @@ -83,6 +84,7 @@ interface CellFieldBuilderAdapter { builder.parent, new LocTextKey(ExamConfigurationService.ATTRIBUTE_LABEL_LOC_TEXT_PREFIX + attribute.name, attribute.name)); + label.setData(RWT.MARKUP_ENABLED, true); final GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); switch (orientation.title) { diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/LabelBuilder.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/LabelBuilder.java index b9d74f2f..71c8f62f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/LabelBuilder.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/LabelBuilder.java @@ -8,6 +8,7 @@ package ch.ethz.seb.sebserver.gui.service.examconfig.impl; +import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.springframework.context.annotation.Lazy; @@ -54,6 +55,7 @@ public class LabelBuilder implements InputFieldBuilder { final Label label = this.widgetFactory.labelLocalized( parent, ExamConfigurationService.attributeNameLocKey(attribute)); + label.setData(RWT.MARKUP_ENABLED, true); return new LabelField( attribute, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java index bf6984fa..cc515eed 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java @@ -114,9 +114,9 @@ public final class PolyglotPageServiceImpl implements PolyglotPageService { public void injectI18n(final Button button, final LocTextKey locTextKey, final LocTextKey locToolTipKey) { final Consumer