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

SEBSERV-176 fixed

Browse source
This commit is contained in:
anhefti 2021-03-11 13:05:24 +01:00
parent 736a686e2a
commit ed9ded57db
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientEvents.java
View file

@ -224,9 +224,14 @@ public class SEBClientEvents implements TemplateComposer {
.publishIf(() -> writeGrant, table.hasAnyContent()); .publishIf(() -> writeGrant, table.hasAnyContent());
} }
private PageAction getOpenDelete(final PageAction pageAction, final MultiValueMap<String, String> filterCriteria) { private PageAction getOpenDelete(
final PageAction pageAction,
final MultiValueMap<String, String> filterCriteria) {
try { try {
final List<String> ids = this.restService.getBuilder(GetClientEventNames.class)
final List<String> ids = this.restService
.getBuilder(GetClientEventNames.class)
.withQueryParams(filterCriteria) .withQueryParams(filterCriteria)
.call() .call()
.getOrThrow() .getOrThrow()
@ -234,9 +239,10 @@ public class SEBClientEvents implements TemplateComposer {
.map(EntityName::getModelId) .map(EntityName::getModelId)
.collect(Collectors.toList()); .collect(Collectors.toList());
final PageAction deleteAction = pageAction.withAttribute( final PageAction deleteAction = pageAction
PageContext.AttributeKeys.ENTITY_ID_LIST, .withAttribute(
StringUtils.join(ids, Constants.COMMA)) PageContext.AttributeKeys.ENTITY_ID_LIST,
StringUtils.join(ids, Constants.COMMA))
.withAttribute( .withAttribute(
PageContext.AttributeKeys.ENTITY_LIST_TYPE, PageContext.AttributeKeys.ENTITY_LIST_TYPE,
EntityType.CLIENT_EVENT.name()); EntityType.CLIENT_EVENT.name());

3
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientEventDAOImpl.java
View file

@ -92,6 +92,9 @@ public class ClientEventDAOImpl implements ClientEventDAO {
.and( .and(
ClientConnectionRecordDynamicSqlSupport.examId, ClientConnectionRecordDynamicSqlSupport.examId,
isEqualToWhenPresent(filterMap.getClientEventExamId())) isEqualToWhenPresent(filterMap.getClientEventExamId()))
.and(
ClientConnectionRecordDynamicSqlSupport.examUserSessionId,
SqlBuilder.isLikeWhenPresent(filterMap.getSQLWildcard(ClientConnection.FILTER_ATTR_SESSION_ID)))
.and( .and(
ClientEventRecordDynamicSqlSupport.clientConnectionId, ClientEventRecordDynamicSqlSupport.clientConnectionId,
isEqualToWhenPresent(filterMap.getClientEventConnectionId())) isEqualToWhenPresent(filterMap.getClientEventConnectionId()))