zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-163 fixes

Browse source
This commit is contained in:
anhefti 2022-09-14 09:59:08 +02:00
parent dbe50a69ff
commit 43d8129006
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ClientGroupData.java
View file

@ -10,23 +10,26 @@ package ch.ethz.seb.sebserver.gbl.model.exam;
import ch.ethz.seb.sebserver.gbl.model.Entity;
/** Overall interface for client group data used either for template or real client groups */
public interface ClientGroupData extends Entity {
public static final String ATTR_IP_RANGE_START = "ipRangeStart";
public static final String ATTR_IP_RANGE_END = "ipRangeEnd";
public static final String ATTR_CLIENT_OS = "clientOS";
/** All known and implemented client group types */
public enum ClientGroupType {
NONE,
IP_V4_RANGE,
CLIENT_OS
}
/** All known and implemented SEB OS types */
public enum ClientOS {
NONE(null),
WINDOWS("Windows"),
MAC_OS("TODO"),
I_OS("TODO");
MAC_OS("macOS"),
I_OS("iOS");
public final String queryString;

4
src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamClientGroupList.java
View file

@ -89,8 +89,8 @@ public class ExamClientGroupList implements TemplateComposer {
final EntityTable<ClientGroup> clientGroupTable =
this.pageService
.entityTableBuilder(this.restService.getRestCall(GetClientGroupPage.class))
.withRestCallAdapter(builder -> builder.withURIVariable(
API.PARAM_PARENT_MODEL_ID,
.withRestCallAdapter(builder -> builder.withQueryParam(
ClientGroup.FILTER_ATTR_EXAM_ID,
entityKey.modelId))
.withEmptyMessage(CLIENT_GROUP_EMPTY_LIST_MESSAGE)
.withMarkup()