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

SEBSERV-72 front- and back-end implementation of template attributes

Browse source
This commit is contained in:
anhefti 2019-10-16 12:53:28 +02:00
parent b71968628c
commit c96901472b
22 changed files with 688 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java
View file

@ -129,8 +129,6 @@ public final class API {
public static final String TEMPLATE_ATTRIBUTE_ENDPOINT = "/template-attribute";
public static final String CONFIGURATION_TEMPLATE_ENDPOINT = "/exam-config-template";
public static final String ORIENTATION_ENDPOINT = "/orientation";
public static final String VIEW_ENDPOINT = ORIENTATION_ENDPOINT + "/view";

4
src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/TemplateAttribute.java
View file

@ -58,8 +58,8 @@ public final class TemplateAttribute implements Entity {
@Override
public String getModelId() {
return this.institutionId != null
? String.valueOf(this.institutionId)
return this.configAttribute != null
? String.valueOf(this.configAttribute.id)
: null;
}

145
src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateAttributeForm.java
View file

@ -8,42 +8,183 @@
package ch.ethz.seb.sebserver.gui.content;
import java.util.Arrays;
import org.eclipse.swt.widgets.Composite;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.api.API;
import ch.ethz.seb.sebserver.gbl.model.Domain;
import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.TemplateAttribute;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.View;
import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition;
import ch.ethz.seb.sebserver.gui.form.FormBuilder;
import ch.ethz.seb.sebserver.gui.form.FormHandle;
import ch.ethz.seb.sebserver.gui.service.ResourceService;
import ch.ethz.seb.sebserver.gui.service.examconfig.ExamConfigurationService;
import ch.ethz.seb.sebserver.gui.service.examconfig.InputField;
import ch.ethz.seb.sebserver.gui.service.examconfig.InputFieldBuilder;
import ch.ethz.seb.sebserver.gui.service.examconfig.impl.AttributeMapping;
import ch.ethz.seb.sebserver.gui.service.examconfig.impl.ViewContext;
import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey;
import ch.ethz.seb.sebserver.gui.service.page.PageContext;
import ch.ethz.seb.sebserver.gui.service.page.PageService;
import ch.ethz.seb.sebserver.gui.service.page.PageService.PageActionBuilder;
import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.examconfig.GetConfigurations;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.examconfig.GetTemplateAttribute;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser;
import ch.ethz.seb.sebserver.gui.widget.WidgetFactory;
@Lazy
@Component
@GuiProfile
public class ConfigTemplateAttributeForm implements TemplateComposer {
private static final LocTextKey FORM_TITLE =
new LocTextKey("sebserver.configtemplate.attr.form.title");
private static final LocTextKey FORM_NAME_TEXT_KEY =
new LocTextKey("sebserver.configtemplate.attr.form.name");
private static final LocTextKey FORM_TYPE_TEXT_KEY =
new LocTextKey("sebserver.configtemplate.attr.form.type");
private static final LocTextKey FORM_VIEW_TEXT_KEY =
new LocTextKey("sebserver.configtemplate.attr.form.view");
private static final LocTextKey FORM_GROUP_TEXT_KEY =
new LocTextKey("sebserver.configtemplate.attr.form.group");
private static final LocTextKey FORM_VALUE_TEXT_KEY =
new LocTextKey("sebserver.configtemplate.attr.form.value");
private final PageService pageService;
private final RestService restService;
private final CurrentUser currentUser;
private final ResourceService resourceService;
private final ExamConfigurationService examConfigurationService;
protected ConfigTemplateAttributeForm(
final PageService pageService,
final RestService restService,
final CurrentUser currentUser) {
final CurrentUser currentUser,
final ExamConfigurationService examConfigurationService) {
this.pageService = pageService;
this.restService = restService;
this.currentUser = currentUser;
this.resourceService = pageService.getResourceService();
this.examConfigurationService = examConfigurationService;
}
@Override
public void compose(final PageContext pageContext) {
// TODO Auto-generated method stub
final WidgetFactory widgetFactory = this.pageService.getWidgetFactory();
final UserInfo user = this.currentUser.get();
final EntityKey attributeKey = pageContext.getEntityKey();
final EntityKey templateKey = pageContext.getParentEntityKey();
final Long templateId = Long.valueOf(templateKey.modelId);
// the attribute
final TemplateAttribute attribute = this.restService.getBuilder(GetTemplateAttribute.class)
.withURIVariable(API.PARAM_PARENT_MODEL_ID, templateKey.modelId)
.withURIVariable(API.PARAM_MODEL_ID, attributeKey.modelId)
.call()
.getOrThrow();
// the follow-up configuration
final Configuration configuration = this.restService.getBuilder(GetConfigurations.class)
.withQueryParam(Configuration.FILTER_ATTR_CONFIGURATION_NODE_ID, templateKey.getModelId())
.withQueryParam(Configuration.FILTER_ATTR_FOLLOWUP, Constants.TRUE_STRING)
.call()
.map(Utils::toSingleton)
.onError(pageContext::notifyError)
.getOrThrow();
// the default page layout with title
final Composite content = widgetFactory.defaultPageLayout(
pageContext.getParent(),
FORM_TITLE);
final PageContext formContext = pageContext.copyOf(content);
final boolean hasView = attribute.getOrientation() != null;
final FormHandle<TemplateAttribute> formHandle = this.pageService.formBuilder(
formContext, 4)
.readonly(true) // TODO change this for next version
.addField(FormBuilder.text(
Domain.CONFIGURATION_ATTRIBUTE.ATTR_NAME,
FORM_NAME_TEXT_KEY,
attribute::getName))
.addField(FormBuilder.text(
Domain.CONFIGURATION_ATTRIBUTE.ATTR_TYPE,
FORM_TYPE_TEXT_KEY,
() -> attribute.getConfigAttribute().getType().name()))
.addFieldIf(
() -> hasView,
() -> FormBuilder.singleSelection(
Domain.ORIENTATION.ATTR_VIEW_ID,
FORM_VIEW_TEXT_KEY,
attribute.getViewModelId(),
() -> this.resourceService.getViewResources(templateKey.modelId)))
.addFieldIf(
() -> hasView,
() -> FormBuilder.text(
Domain.ORIENTATION.ATTR_GROUP_ID,
FORM_GROUP_TEXT_KEY,
attribute.getGroupId()))
.build();
widgetFactory.labelLocalizedTitle(
content,
FORM_VALUE_TEXT_KEY);
final InputFieldBuilder inputFieldBuilder = this.examConfigurationService.getInputFieldBuilder(
attribute.getConfigAttribute(),
attribute.getOrientation());
final AttributeMapping attributeMapping = this.examConfigurationService
.getAttributes(templateId)
.getOrThrow();
final ViewContext viewContext = this.examConfigurationService.createViewContext(
formContext,
configuration,
new View(-1L, "template", 10, 0, templateId),
attributeMapping,
1);
final InputField createInputField = inputFieldBuilder.createInputField(
content,
attribute.getConfigAttribute(),
viewContext);
viewContext.registerInputField(createInputField);
this.examConfigurationService.initInputFieldValues(
configuration.id,
Arrays.asList(viewContext));
final PageActionBuilder pageActionBuilder = this.pageService
.pageActionBuilder(formContext.clearEntityKeys());
pageActionBuilder
.newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_ATTR_FORM_SET_DEFAULT)
.withEntityKey(attributeKey)
.withParentEntityKey(templateKey)
.withExec(this.examConfigurationService::resetToDefaults)
.ignoreMoveAwayFromEdit()
.publish()
.newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_ATTR_FORM_EDIT_TEMPLATE)
.withEntityKey(templateKey)
.publish();
}

82
src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateForm.java
View file

@ -8,10 +8,6 @@
package ch.ethz.seb.sebserver.gui.content;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.eclipse.swt.widgets.Composite;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -31,10 +27,13 @@ import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition;
import ch.ethz.seb.sebserver.gui.form.FormBuilder;
import ch.ethz.seb.sebserver.gui.form.FormHandle;
import ch.ethz.seb.sebserver.gui.service.ResourceService;
import ch.ethz.seb.sebserver.gui.service.examconfig.ExamConfigurationService;
import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey;
import ch.ethz.seb.sebserver.gui.service.page.PageContext;
import ch.ethz.seb.sebserver.gui.service.page.PageService;
import ch.ethz.seb.sebserver.gui.service.page.PageService.PageActionBuilder;
import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer;
import ch.ethz.seb.sebserver.gui.service.page.impl.PageAction;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.examconfig.GetExamConfigNode;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.examconfig.GetTemplateAttributePage;
@ -71,11 +70,14 @@ public class ConfigTemplateForm implements TemplateComposer {
new LocTextKey("sebserver.configtemplate.attrs.list.view");
private static final LocTextKey ATTRIBUTES_LIST_GROUP_TEXT_KEY =
new LocTextKey("sebserver.configtemplate.attrs.list.group");
private static final LocTextKey EMPTY_ATTRIBUTE_SELECTION_TEXT_KEY =
new LocTextKey("sebserver.configtemplate.attr.info.pleaseSelect");
private final PageService pageService;
private final RestService restService;
private final CurrentUser currentUser;
private final ResourceService resourceService;
private final ExamConfigurationService examConfigurationService;
private final TableFilterAttribute nameFilter =
new TableFilterAttribute(CriteriaType.TEXT, TemplateAttribute.FILTER_ATTR_NAME);
@ -85,12 +87,14 @@ public class ConfigTemplateForm implements TemplateComposer {
protected ConfigTemplateForm(
final PageService pageService,
final RestService restService,
final CurrentUser currentUser) {
final CurrentUser currentUser,
final ExamConfigurationService examConfigurationService) {
this.pageService = pageService;
this.restService = restService;
this.currentUser = currentUser;
this.resourceService = pageService.getResourceService();
this.examConfigurationService = examConfigurationService;
}
@ -166,6 +170,9 @@ public class ConfigTemplateForm implements TemplateComposer {
? this.restService.getRestCall(NewExamConfig.class)
: this.restService.getRestCall(SaveExamConfig.class));
final PageActionBuilder pageActionBuilder = this.pageService
.pageActionBuilder(formContext.clearEntityKeys());
if (isReadonly) {
widgetFactory.label(content, "");
@ -181,7 +188,7 @@ public class ConfigTemplateForm implements TemplateComposer {
final EntityTable<TemplateAttribute> attrTable =
this.pageService.entityTableBuilder(this.restService.getRestCall(GetTemplateAttributePage.class))
.withRestCallAdapter(restCall -> restCall.withURIVariable(
API.PARAM_MODEL_ID,
API.PARAM_PARENT_MODEL_ID,
entityKey.modelId))
.withPaging(15)
.withColumn(new ColumnDefinition<>(
@ -193,7 +200,7 @@ public class ConfigTemplateForm implements TemplateComposer {
.withColumn(new ColumnDefinition<>(
Domain.ORIENTATION.ATTR_VIEW_ID,
ATTRIBUTES_LIST_VIEW_TEXT_KEY,
getViewNameFunction(entityKey))
resourceService.getViewNameFunction(entityKey.modelId))
.withFilter(viewFilter)
.sortable())
.withColumn(new ColumnDefinition<>(
@ -202,15 +209,44 @@ public class ConfigTemplateForm implements TemplateComposer {
TemplateAttribute::getGroupId)
.withFilter(this.groupFilter)
.sortable())
// .withDefaultAction(pageActionBuilder
// .newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_VIEW_FROM_LIST)
// .create())
.withDefaultAction(pageActionBuilder
.newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_ATTR_EDIT)
.withParentEntityKey(entityKey)
.create())
.compose(pageContext.copyOf(content));
// TODO list of all attributes with filter
pageActionBuilder
.newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_ATTR_EDIT)
.withParentEntityKey(entityKey)
.withSelect(
attrTable::getSelection,
PageAction::applySingleSelection,
EMPTY_ATTRIBUTE_SELECTION_TEXT_KEY)
.publishIf(() -> attrTable.hasAnyContent())
.newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_ATTR_SET_DEFAULT)
.withParentEntityKey(entityKey)
.withSelect(
attrTable::getSelection,
action -> this.resetToDefaults(action, attrTable),
EMPTY_ATTRIBUTE_SELECTION_TEXT_KEY)
.noEventPropagation()
.publishIf(() -> attrTable.hasAnyContent())
.newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_ATTR_REMOVE_VIEW)
.withParentEntityKey(entityKey)
.withSelect(
attrTable::getSelection,
action -> this.removeFormView(action, attrTable),
EMPTY_ATTRIBUTE_SELECTION_TEXT_KEY)
.noEventPropagation()
.publishIf(() -> attrTable.hasAnyContent())
;
}
this.pageService.pageActionBuilder(formContext.clearEntityKeys())
pageActionBuilder
.newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_NEW)
.publishIf(() -> writeGrant && isReadonly)
@ -232,12 +268,24 @@ public class ConfigTemplateForm implements TemplateComposer {
}
private final Function<TemplateAttribute, String> getViewNameFunction(final EntityKey templateId) {
final Map<String, String> mapping = this.resourceService.getViewResources(templateId.modelId)
.stream()
.collect(Collectors.toMap(tuple -> tuple._1, tuple -> tuple._2));
private final PageAction resetToDefaults(
final PageAction action,
final EntityTable<TemplateAttribute> attrTable) {
return attr -> mapping.get(attr.getViewModelId());
final PageAction resetToDefaults = this.examConfigurationService.resetToDefaults(action);
// reload the list
attrTable.applyFilter();
return resetToDefaults;
}
private final PageAction removeFormView(
final PageAction action,
final EntityTable<TemplateAttribute> attrTable) {
final PageAction removeFormView = this.examConfigurationService.removeFormView(action);
// reload the list
attrTable.applyFilter();
return removeFormView;
}
}

17
src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java
View file

@ -454,17 +454,28 @@ public enum ActionDefinition {
SEB_EXAM_CONFIG_TEMPLATE_ATTR_EDIT(
new LocTextKey("sebserver.configtemplate.attr.list.actions.modify"),
ImageIcon.EDIT,
PageStateDefinitionImpl.SEB_EXAM_CONFIG_TEMPLATE_ATTRIBUTE_VIEW,
PageStateDefinitionImpl.SEB_EXAM_CONFIG_TEMPLATE_ATTRIBUTE_EDIT,
ActionCategory.SEB_CONFIG_TEMPLATE_ATTRIBUTE_LIST),
SEB_EXAM_CONFIG_TEMPLATE_ATTR_SET_DEFAULT(
new LocTextKey("sebserver.configtemplate.attr.list.actions.setdefault"),
ImageIcon.SAVE,
PageStateDefinitionImpl.SEB_EXAM_CONFIG_TEMPLATE_ATTRIBUTE_VIEW,
PageStateDefinitionImpl.SEB_EXAM_CONFIG_TEMPLATE_VIEW,
ActionCategory.SEB_CONFIG_TEMPLATE_ATTRIBUTE_LIST),
SEB_EXAM_CONFIG_TEMPLATE_ATTR_REMOVE_VIEW(
new LocTextKey("sebserver.configtemplate.attr.list.actions.removeview"),
ImageIcon.DELETE,
PageStateDefinitionImpl.SEB_EXAM_CONFIG_TEMPLATE_ATTRIBUTE_VIEW,
PageStateDefinitionImpl.SEB_EXAM_CONFIG_TEMPLATE_VIEW,
ActionCategory.SEB_CONFIG_TEMPLATE_ATTRIBUTE_LIST),
SEB_EXAM_CONFIG_TEMPLATE_ATTR_FORM_SET_DEFAULT(
new LocTextKey("sebserver.configtemplate.attr.action.setdefault"),
ImageIcon.UNDO,
PageStateDefinitionImpl.SEB_EXAM_CONFIG_TEMPLATE_ATTRIBUTE_EDIT,
ActionCategory.SEB_CONFIG_TEMPLATE_ATTRIBUTE_LIST),
SEB_EXAM_CONFIG_TEMPLATE_ATTR_FORM_EDIT_TEMPLATE(
new LocTextKey("sebserver.configtemplate.attr.action.template"),
ImageIcon.SHOW,
PageStateDefinitionImpl.SEB_EXAM_CONFIG_TEMPLATE_VIEW,
ActionCategory.SEB_CONFIG_TEMPLATE_ATTRIBUTE_LIST),
RUNNING_EXAM_VIEW_LIST(

4
src/main/java/ch/ethz/seb/sebserver/gui/content/activity/PageStateDefinitionImpl.java
View file

@ -72,10 +72,6 @@ public enum PageStateDefinitionImpl implements PageStateDefinition {
SEB_EXAM_CONFIG_TEMPLATE_VIEW(Type.FORM_VIEW, ConfigTemplateForm.class, ActivityDefinition.SEB_EXAM_CONFIG),
SEB_EXAM_CONFIG_TEMPLATE_EDIT(Type.FORM_EDIT, ConfigTemplateForm.class, ActivityDefinition.SEB_EXAM_CONFIG),
SEB_EXAM_CONFIG_TEMPLATE_ATTRIBUTE_VIEW(
Type.FORM_VIEW,
ConfigTemplateAttributeForm.class,
ActivityDefinition.SEB_EXAM_CONFIG),
SEB_EXAM_CONFIG_TEMPLATE_ATTRIBUTE_EDIT(
Type.FORM_EDIT,
ConfigTemplateAttributeForm.class,

9
src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java
View file

@ -41,6 +41,7 @@ import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationStatus;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationType;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.TemplateAttribute;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.View;
import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus;
import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent;
@ -485,6 +486,14 @@ public class ResourceService {
.collect(Collectors.toList());
}
public final Function<TemplateAttribute, String> getViewNameFunction(final String templateId) {
final Map<String, String> mapping = this.getViewResources(templateId)
.stream()
.collect(Collectors.toMap(tuple -> tuple._1, tuple -> tuple._2));
return attr -> mapping.get(attr.getViewModelId());
}
public Map<Long, String> getExamNameMapping() {
final UserInfo userInfo = this.currentUser.get();
return this.restService.getBuilder(GetExamNames.class)

5
src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/ExamConfigurationService.java
View file

@ -24,6 +24,7 @@ import ch.ethz.seb.sebserver.gui.service.examconfig.impl.ViewContext;
import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport;
import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey;
import ch.ethz.seb.sebserver.gui.service.page.PageContext;
import ch.ethz.seb.sebserver.gui.service.page.impl.PageAction;
import ch.ethz.seb.sebserver.gui.widget.WidgetFactory;
public interface ExamConfigurationService {
@ -58,6 +59,10 @@ public interface ExamConfigurationService {
Long configurationId,
Collection<ViewContext> viewContexts);
PageAction resetToDefaults(PageAction action);
PageAction removeFormView(PageAction action);
static String attributeNameKey(final ConfigurationAttribute attribute) {
if (attribute == null) {
return null;

19
src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/ExamConfigurationServiceImpl.java
View file

@ -28,6 +28,7 @@ import ch.ethz.seb.sebserver.gbl.api.API;
import ch.ethz.seb.sebserver.gbl.api.APIMessage;
import ch.ethz.seb.sebserver.gbl.api.APIMessage.ErrorMessage;
import ch.ethz.seb.sebserver.gbl.api.JSONMapper;
import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationAttribute;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationTableValues;
@ -44,6 +45,7 @@ import ch.ethz.seb.sebserver.gui.service.examconfig.ValueChangeRule;
import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey;
import ch.ethz.seb.sebserver.gui.service.page.FieldValidationError;
import ch.ethz.seb.sebserver.gui.service.page.PageContext;
import ch.ethz.seb.sebserver.gui.service.page.impl.PageAction;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCallError;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.examconfig.GetConfigAttributes;
@ -209,6 +211,23 @@ public class ExamConfigurationServiceImpl implements ExamConfigurationService {
.forEach(vc -> vc.setValuesToInputFields(attributeValues));
}
@Override
public final PageAction resetToDefaults(final PageAction action) {
final EntityKey singleSelection = action.getSingleSelection();
// TODO
return action;
}
@Override
public final PageAction removeFormView(final PageAction action) {
final EntityKey singleSelection = action.getSingleSelection();
// TODO
return action;
}
private static final class ValueChangeListenerImpl implements ValueChangeListener {
public static final String VALIDATION_ERROR_KEY_PREFIX = "sebserver.examconfig.props.validation.";

2
src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/ViewContext.java
View file

@ -214,7 +214,7 @@ public final class ViewContext {
inputField.clearError();
}
void registerInputField(final InputField inputField) {
public void registerInputField(final InputField inputField) {
this.inputFieldMapping.put(
inputField.getAttribute().id,
inputField);

43
src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/seb/examconfig/GetTemplateAttribute.java Normal file
View file

@ -0,0 +1,43 @@
/*
* Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.examconfig;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.core.type.TypeReference;
import ch.ethz.seb.sebserver.gbl.api.API;
import ch.ethz.seb.sebserver.gbl.api.EntityType;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.TemplateAttribute;
import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall;
@Lazy
@Component
@GuiProfile
public class GetTemplateAttribute extends RestCall<TemplateAttribute> {
public GetTemplateAttribute() {
super(new TypeKey<>(
CallType.GET_SINGLE,
EntityType.CONFIGURATION_NODE,
new TypeReference<TemplateAttribute>() {
}),
HttpMethod.GET,
MediaType.APPLICATION_FORM_URLENCODED,
API.CONFIGURATION_NODE_ENDPOINT
+ API.PARENT_MODEL_ID_VAR_PATH_SEGMENT
+ API.TEMPLATE_ATTRIBUTE_ENDPOINT
+ API.MODEL_ID_VAR_PATH_SEGMENT);
}
}

2
src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/seb/examconfig/GetTemplateAttributePage.java
View file

@ -36,7 +36,7 @@ public class GetTemplateAttributePage extends RestCall<Page<TemplateAttribute>>
HttpMethod.GET,
MediaType.APPLICATION_FORM_URLENCODED,
API.CONFIGURATION_NODE_ENDPOINT
+ API.MODEL_ID_VAR_PATH_SEGMENT
+ API.PARENT_MODEL_ID_VAR_PATH_SEGMENT
+ API.TEMPLATE_ATTRIBUTE_ENDPOINT);
}

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ConfigurationAttributeDAO.java
View file

@ -21,4 +21,6 @@ public interface ConfigurationAttributeDAO extends EntityDAO<ConfigurationAttrib
* @return Collection of all ConfigurationAttribute that are root attributes */
Result<Collection<ConfigurationAttribute>> getAllRootAttributes();
Result<Collection<ConfigurationAttribute>> allChildAttributes(final Long parentId);
}

5
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ConfigurationValueDAO.java
View file

@ -68,4 +68,9 @@ public interface ConfigurationValueDAO extends EntityDAO<ConfigurationValue, Con
* @return the saved table values of the attribute and configuration */
Result<ConfigurationTableValues> saveTableValues(ConfigurationTableValues value);
Result<Set<EntityKey>> setDefaultValues(
Long institutionId,
Long configurationId,
Long attributeId);
}

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/OrientationDAO.java
View file

@ -30,4 +30,6 @@ public interface OrientationDAO extends EntityDAO<Orientation, Orientation> {
Result<Collection<Orientation>> getAllOfTemplate(Long templateId);
Result<Orientation> getAttributeOfTemplate(Long templateId, Long attributeId);
}

16
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationAttributeDAOImpl.java
View file

@ -110,6 +110,22 @@ public class ConfigurationAttributeDAOImpl implements ConfigurationAttributeDAO
.collect(Collectors.toList()));
}
@Override
@Transactional(readOnly = true)
public Result<Collection<ConfigurationAttribute>> allChildAttributes(final Long parentId) {
return Result.tryCatch(() -> this.configurationAttributeRecordMapper
.selectByExample()
.where(
ConfigurationAttributeRecordDynamicSqlSupport.parentId,
SqlBuilder.isEqualTo(parentId))
.build()
.execute()
.stream()
.map(ConfigurationAttributeDAOImpl::toDomainModel)
.flatMap(DAOLoggingSupport::logAndSkipOnError)
.collect(Collectors.toList()));
}
@Override
@Transactional(readOnly = true)
public Result<Collection<ConfigurationAttribute>> getAllRootAttributes() {

90
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationValueDAOImpl.java
View file

@ -14,6 +14,7 @@ import static org.mybatis.dynamic.sql.SqlBuilder.isIn;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@ -31,6 +32,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import ch.ethz.seb.sebserver.gbl.api.EntityType;
import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationTableValues;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationTableValues.TableValue;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationValue;
@ -334,6 +336,86 @@ public class ConfigurationValueDAOImpl implements ConfigurationValueDAO {
});
}
@Override
@Transactional
public Result<ConfigurationTableValues> saveTableValues(final ConfigurationTableValues value) {
return this.configurationDAOBatchService
.saveNewTableValues(value)
.onError(TransactionHandler::rollback);
}
@Override
@Transactional
public Result<Set<EntityKey>> setDefaultValues(
final Long institutionId,
final Long configurationId,
final Long attributeId) {
return attributeRecordById(attributeId)
.flatMap(this::getAttributeMapping)
.map(attributeMapping -> {
final Set<EntityKey> tableValues = this.configurationValueRecordMapper.selectByExample()
.where(
ConfigurationValueRecordDynamicSqlSupport.institutionId,
isEqualTo(institutionId))
.and(
ConfigurationValueRecordDynamicSqlSupport.configurationId,
isEqualTo(configurationId))
.and(
ConfigurationValueRecordDynamicSqlSupport.configurationAttributeId,
SqlBuilder.isIn(new ArrayList<>(attributeMapping.keySet())))
.build()
.execute()
.stream()
.map(r -> new EntityKey(r.getId(), EntityType.CONFIGURATION_VALUE))
.collect(Collectors.toSet());
// if there are table values, delete them first
if (tableValues != null && !tableValues.isEmpty()) {
this.delete(tableValues)
.getOrThrow();
}
// get the attribute value reset to defaultValue and save
final List<ConfigurationValueRecord> values = this.configurationValueRecordMapper.selectByExample()
.where(
ConfigurationValueRecordDynamicSqlSupport.institutionId,
isEqualTo(institutionId))
.and(
ConfigurationValueRecordDynamicSqlSupport.configurationId,
isEqualTo(configurationId))
.and(
ConfigurationValueRecordDynamicSqlSupport.configurationAttributeId,
SqlBuilder.isEqualTo(attributeId))
.build()
.execute();
if (values.isEmpty()) {
return tableValues;
} else {
if (values.size() > 1) {
throw new IllegalStateException("Expacted one but get: " + values.size());
}
final ConfigurationAttributeRecord attribute = this.configurationAttributeRecordMapper
.selectByPrimaryKey(attributeId);
final String defaultValue = attribute.getDefaultValue();
final ConfigurationValueRecord oldRec = values.get(0);
final ConfigurationValueRecord newRec = new ConfigurationValueRecord(
oldRec.getId(), null, null, null, null, defaultValue);
this.configurationValueRecordMapper.updateByPrimaryKeySelective(newRec);
final HashSet<EntityKey> result = new HashSet<>();
result.add(new EntityKey(newRec.getId(), EntityType.CONFIGURATION_VALUE));
result.addAll(tableValues);
return result;
}
});
}
// get all attributes of the table (columns) mapped to attribute id
private Result<Map<Long, ConfigurationAttributeRecord>> getAttributeMapping(
final ConfigurationAttributeRecord attributeRecord) {
@ -353,14 +435,6 @@ public class ConfigurationValueDAOImpl implements ConfigurationValueDAO {
});
}
@Override
@Transactional
public Result<ConfigurationTableValues> saveTableValues(final ConfigurationTableValues value) {
return this.configurationDAOBatchService
.saveNewTableValues(value)
.onError(TransactionHandler::rollback);
}
private Result<ConfigurationAttributeRecord> attributeRecord(final ConfigurationValue value) {
return attributeRecordById(value.attributeId);
}

22
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/OrientationDAOImpl.java
View file

@ -31,6 +31,7 @@ import ch.ethz.seb.sebserver.gbl.model.sebconfig.Orientation;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.TitleOrientation;
import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.OrientationRecordDynamicSqlSupport;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.OrientationRecordMapper;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.OrientationRecord;
@ -193,7 +194,7 @@ public class OrientationDAOImpl implements OrientationDAO {
.selectByExample()
.where(
OrientationRecordDynamicSqlSupport.templateId,
SqlBuilder.isEqualToWhenPresent(templateId))
SqlBuilder.isEqualTo(templateId))
.build()
.execute()
.stream()
@ -202,6 +203,24 @@ public class OrientationDAOImpl implements OrientationDAO {
.collect(Collectors.toList()));
}
@Override
public Result<Orientation> getAttributeOfTemplate(final Long templateId, final Long attributeId) {
return Result.tryCatch(() -> this.orientationRecordMapper
.selectByExample()
.where(
OrientationRecordDynamicSqlSupport.templateId,
SqlBuilder.isEqualTo(templateId))
.and(
OrientationRecordDynamicSqlSupport.configAttributeId,
SqlBuilder.isEqualTo(attributeId))
.build()
.execute()
.stream()
.map(OrientationDAOImpl::toDomainModel)
.flatMap(DAOLoggingSupport::logAndSkipOnError)
.collect(Utils.toSingleton()));
}
@Override
@Transactional
public Result<Collection<EntityKey>> delete(final Set<EntityKey> all) {
@ -266,4 +285,5 @@ public class OrientationDAOImpl implements OrientationDAO {
record.getHeight(),
TitleOrientation.valueOf(record.getTitle())));
}
}

37
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/SebExamConfigTemplateService.java Normal file
View file

@ -0,0 +1,37 @@
/*
* Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig;
import java.util.List;
import java.util.Set;
import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.TemplateAttribute;
import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap;
public interface SebExamConfigTemplateService {
Result<List<TemplateAttribute>> getTemplateAttributes(
final Long institutionId,
final Long templateId,
final String sort,
final FilterMap filterMap);
Result<TemplateAttribute> getAttribute(
final Long institutionId,
final Long templateId,
final Long attributeId);
Result<Set<EntityKey>> setDefaultValues(
final Long institutionId,
final Long templateId,
final Long attributeId);
}

143
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/SebExamConfigTemplateServiceImpl.java Normal file
View file

@ -0,0 +1,143 @@
/*
* Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig.impl;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import ch.ethz.seb.sebserver.gbl.model.Domain;
import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.PageSortOrder;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationAttribute;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.Orientation;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.TemplateAttribute;
import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationAttributeDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationNodeDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationValueDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.OrientationDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ViewDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig.SebExamConfigService;
import ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig.SebExamConfigTemplateService;
@Lazy
@Service
@WebServiceProfile
public class SebExamConfigTemplateServiceImpl implements SebExamConfigTemplateService {
private final ConfigurationNodeDAO ConfigurationNodeDAO;
private final ConfigurationDAO configurationDAO;
private final ViewDAO viewDAO;
private final OrientationDAO orientationDAO;
private final ConfigurationAttributeDAO configurationAttributeDAO;
private final ConfigurationValueDAO configurationValueDAO;
private final SebExamConfigService sebExamConfigService;
protected SebExamConfigTemplateServiceImpl(
final ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationNodeDAO configurationNodeDAO,
final ConfigurationDAO configurationDAO, final ViewDAO viewDAO, final OrientationDAO orientationDAO,
final ConfigurationAttributeDAO configurationAttributeDAO,
final ConfigurationValueDAO configurationValueDAO,
final SebExamConfigService sebExamConfigService) {
super();
this.ConfigurationNodeDAO = configurationNodeDAO;
this.configurationDAO = configurationDAO;
this.viewDAO = viewDAO;
this.orientationDAO = orientationDAO;
this.configurationAttributeDAO = configurationAttributeDAO;
this.configurationValueDAO = configurationValueDAO;
this.sebExamConfigService = sebExamConfigService;
}
@Override
public Result<List<TemplateAttribute>> getTemplateAttributes(
final Long institutionId,
final Long templateId,
final String sort,
final FilterMap filterMap) {
return Result.tryCatch(() -> {
final Map<Long, Orientation> orentiations = this.orientationDAO
.getAllOfTemplate(templateId)
.getOrThrow()
.stream()
.collect(Collectors.toMap(
o -> o.attributeId,
Function.identity()));
final List<TemplateAttribute> attrs = this.configurationAttributeDAO
.getAllRootAttributes()
.getOrThrow()
.stream()
.map(attr -> new TemplateAttribute(institutionId, templateId, attr, orentiations.get(attr.id)))
.filter(attr -> attr.isNameLike(filterMap.getString(TemplateAttribute.FILTER_ATTR_NAME))
&& attr.isGroupLike(filterMap.getString(TemplateAttribute.FILTER_ATTR_GROUP))
&& attr.isInView(filterMap.getLong(TemplateAttribute.FILTER_ATTR_VIEW)))
.collect(Collectors.toList());
if (!StringUtils.isBlank(sort)) {
final String sortBy = PageSortOrder.decode(sort);
final PageSortOrder sortOrder = PageSortOrder.getSortOrder(sort);
if (sortBy.equals(Domain.CONFIGURATION_NODE.ATTR_NAME)) {
Collections.sort(attrs, TemplateAttribute.nameComparator(sortOrder == PageSortOrder.DESCENDING));
}
}
return attrs;
});
}
@Override
public Result<TemplateAttribute> getAttribute(
final Long institutionId,
final Long templateId,
final Long attributeId) {
return Result.tryCatch(() -> {
final ConfigurationAttribute attribute = this.configurationAttributeDAO
.byPK(attributeId)
.getOrThrow();
final Orientation orientation = this.orientationDAO
.getAttributeOfTemplate(templateId, attributeId)
.getOr(null);
return new TemplateAttribute(
institutionId,
templateId,
attribute,
orientation);
});
}
@Override
public Result<Set<EntityKey>> setDefaultValues(
final Long institutionId,
final Long templateId,
final Long attributeId) {
return this.configurationDAO.getFollowupConfiguration(templateId)
.flatMap(config -> this.configurationValueDAO
.setDefaultValues(
institutionId,
config.id,
attributeId));
}
}

105
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ConfigurationNodeController.java
View file

@ -12,18 +12,14 @@ import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.Set;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.mybatis.dynamic.sql.SqlTable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -42,15 +38,13 @@ import ch.ethz.seb.sebserver.gbl.api.API;
import ch.ethz.seb.sebserver.gbl.api.APIMessage;
import ch.ethz.seb.sebserver.gbl.api.POSTMapper;
import ch.ethz.seb.sebserver.gbl.api.authorization.PrivilegeType;
import ch.ethz.seb.sebserver.gbl.model.Domain;
import ch.ethz.seb.sebserver.gbl.model.Domain.EXAM;
import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.Page;
import ch.ethz.seb.sebserver.gbl.model.PageSortOrder;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigKey;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationType;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.Orientation;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.TemplateAttribute;
import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
import ch.ethz.seb.sebserver.gbl.util.Result;
@ -61,7 +55,6 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.Authorization
import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.UserService;
import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.impl.SEBServerUser;
import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionService;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationAttributeDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationNodeDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap;
@ -69,6 +62,7 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.dao.OrientationDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ViewDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig.SebExamConfigService;
import ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig.SebExamConfigTemplateService;
import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationService;
@WebServiceProfile
@ -81,9 +75,10 @@ public class ConfigurationNodeController extends EntityController<ConfigurationN
private final ConfigurationDAO configurationDAO;
private final ViewDAO viewDAO;
private final OrientationDAO orientationDAO;
private final ConfigurationAttributeDAO configurationAttributeDAO;
private final SebExamConfigService sebExamConfigService;
private final SebExamConfigTemplateService sebExamConfigTemplateService;
protected ConfigurationNodeController(
final AuthorizationService authorization,
final BulkActionService bulkActionService,
@ -94,8 +89,8 @@ public class ConfigurationNodeController extends EntityController<ConfigurationN
final ConfigurationDAO configurationDAO,
final ViewDAO viewDAO,
final OrientationDAO orientationDAO,
final ConfigurationAttributeDAO configurationAttributeDAO,
final SebExamConfigService sebExamConfigService) {
final SebExamConfigService sebExamConfigService,
final SebExamConfigTemplateService sebExamConfigTemplateService) {
super(authorization,
bulkActionService,
@ -107,8 +102,8 @@ public class ConfigurationNodeController extends EntityController<ConfigurationN
this.configurationDAO = configurationDAO;
this.viewDAO = viewDAO;
this.orientationDAO = orientationDAO;
this.configurationAttributeDAO = configurationAttributeDAO;
this.sebExamConfigService = sebExamConfigService;
this.sebExamConfigTemplateService = sebExamConfigTemplateService;
}
@Override
@ -235,12 +230,12 @@ public class ConfigurationNodeController extends EntityController<ConfigurationN
}
@RequestMapping(
path = API.MODEL_ID_VAR_PATH_SEGMENT + API.TEMPLATE_ATTRIBUTE_ENDPOINT,
path = API.PARENT_MODEL_ID_VAR_PATH_SEGMENT + API.TEMPLATE_ATTRIBUTE_ENDPOINT,
method = RequestMethod.GET,
consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Page<TemplateAttribute> getTemplateAttributePage(
@PathVariable final Long modelId,
@PathVariable(name = API.PARAM_PARENT_MODEL_ID, required = true) final Long parentModelId,
@RequestParam(
name = API.PARAM_INSTITUTION_ID,
required = true,
@ -261,30 +256,13 @@ public class ConfigurationNodeController extends EntityController<ConfigurationN
filterMap.putIfAbsent(API.PARAM_INSTITUTION_ID, String.valueOf(institutionId));
}
final Map<Long, Orientation> orentiations = this.orientationDAO.getAllOfTemplate(modelId)
.getOrThrow()
.stream()
.collect(Collectors.toMap(
o -> o.attributeId,
Function.identity()));
final List<TemplateAttribute> attrs = this.configurationAttributeDAO
.getAllRootAttributes()
.getOrThrow()
.stream()
.map(attr -> new TemplateAttribute(institutionId, modelId, attr, orentiations.get(attr.id)))
.filter(attr -> attr.isNameLike(filterMap.getString(TemplateAttribute.FILTER_ATTR_NAME))
&& attr.isGroupLike(filterMap.getString(TemplateAttribute.FILTER_ATTR_GROUP))
&& attr.isInView(filterMap.getLong(TemplateAttribute.FILTER_ATTR_VIEW)))
.collect(Collectors.toList());
if (!StringUtils.isBlank(sort)) {
final String sortBy = PageSortOrder.decode(sort);
final PageSortOrder sortOrder = PageSortOrder.getSortOrder(sort);
if (sortBy.equals(Domain.CONFIGURATION_NODE.ATTR_NAME)) {
Collections.sort(attrs, TemplateAttribute.nameComparator(sortOrder == PageSortOrder.DESCENDING));
}
}
final List<TemplateAttribute> attrs = this.sebExamConfigTemplateService
.getTemplateAttributes(
institutionId,
parentModelId,
sort,
filterMap)
.getOrThrow();
final int start = (pageNumber - 1) * pageSize;
int end = start + pageSize;
@ -299,6 +277,55 @@ public class ConfigurationNodeController extends EntityController<ConfigurationN
attrs.subList(start, end));
}
@RequestMapping(
path = API.PARENT_MODEL_ID_VAR_PATH_SEGMENT
+ API.TEMPLATE_ATTRIBUTE_ENDPOINT
+ API.MODEL_ID_VAR_PATH_SEGMENT,
method = RequestMethod.GET,
consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public TemplateAttribute getTemplateAttribute(
@PathVariable(name = API.PARAM_PARENT_MODEL_ID, required = true) final Long parentModelId,
@PathVariable(name = API.PARAM_MODEL_ID, required = true) final Long modelId,
@RequestParam(
name = API.PARAM_INSTITUTION_ID,
required = true,
defaultValue = UserService.USERS_INSTITUTION_AS_DEFAULT) final Long institutionId) {
// at least current user must have read access for specified entity type within its own institution
checkReadPrivilege(institutionId);
return this.sebExamConfigTemplateService
.getAttribute(
institutionId,
parentModelId,
modelId)
.getOrThrow();
}
@RequestMapping(
path = API.PARENT_MODEL_ID_VAR_PATH_SEGMENT
+ API.TEMPLATE_ATTRIBUTE_ENDPOINT
+ API.MODEL_ID_VAR_PATH_SEGMENT,
method = RequestMethod.POST,
consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Set<EntityKey> resetTemplateAttribute(
@PathVariable(name = API.PARAM_PARENT_MODEL_ID, required = true) final Long parentModelId,
@PathVariable(name = API.PARAM_MODEL_ID, required = true) final Long modelId,
@RequestParam(
name = API.PARAM_INSTITUTION_ID,
required = true,
defaultValue = UserService.USERS_INSTITUTION_AS_DEFAULT) final Long institutionId) {
checkModifyPrivilege(institutionId);
return this.sebExamConfigTemplateService
.setDefaultValues(
institutionId,
parentModelId,
modelId)
.getOrThrow();
}
@Override
protected Result<ConfigurationNode> validForSave(final ConfigurationNode entity) {
return super.validForSave(entity)

13
src/main/resources/messages.properties
View file

@ -955,7 +955,18 @@ sebserver.configtemplate.attrs.list.group=Group
sebserver.configtemplate.attr.list.actions=Selected Attribute
sebserver.configtemplate.attr.list.actions.modify=Edit Attribute
sebserver.configtemplate.attr.list.actions.setdefault=Set Default Values
sebserver.configtemplate.attr.list.actions.removeview=Remove View
sebserver.configtemplate.attr.list.actions.removeview=Remove From View
sebserver.configtemplate.attr.info.pleaseSelect=Please select an attribute first
sebserver.configtemplate.attr.form.title=Template Attribute
sebserver.configtemplate.attr.form.name=Name
sebserver.configtemplate.attr.form.type=Type
sebserver.configtemplate.attr.form.view=View
sebserver.configtemplate.attr.form.group=Group
sebserver.configtemplate.attr.form.value=Template Attribute Value
sebserver.configtemplate.attr.action.setdefault=Set Default Values
sebserver.configtemplate.attr.action.template=View Template
################################