diff --git a/backend/src/main/java/AppConfig.java b/backend/src/main/java/AppConfig.java index ffff9d6f..bf138034 100644 --- a/backend/src/main/java/AppConfig.java +++ b/backend/src/main/java/AppConfig.java @@ -60,7 +60,8 @@ import ru.micord.ervu.account_applications.model.ReferenceEntity; "component.addresses", "gen", "ru.cg", - "ru.micord" + "ru.micord", + "error_handler" }, excludeFilters = { @ComponentScan.Filter(type = FilterType.REGEX, pattern = "ru.cg.webbpm.modules.database.impl.DatabaseConfiguration"), @ComponentScan.Filter(type = FilterType.REGEX, pattern = "security.WebSecurityConfig"), diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/component/model/RequiredField.java b/backend/src/main/java/ru/micord/ervu/account_applications/component/model/RequiredField.java new file mode 100644 index 00000000..4b03298d --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/model/RequiredField.java @@ -0,0 +1,7 @@ +package ru.micord.ervu.account_applications.component.model; + + +public class RequiredField { + public String name; + public String displayName; +} diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/component/validator/RequiredFieldValidator.java b/backend/src/main/java/ru/micord/ervu/account_applications/component/validator/RequiredFieldValidator.java index 7ed5d01f..eaa84fa9 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/component/validator/RequiredFieldValidator.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/validator/RequiredFieldValidator.java @@ -7,7 +7,10 @@ import java.util.Map; import model.FieldData; import model.FormValidationResult; import model.SimpleFormValidationResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.support.MessageSourceAccessor; +import ru.micord.ervu.account_applications.component.model.RequiredField; import service.FormValidatorWithCode; import ru.cg.webbpm.modules.core.runtime.api.MessageBundleUtils; @@ -16,16 +19,17 @@ import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn; public class RequiredFieldValidator extends FormValidatorWithCode { private static final MessageSourceAccessor MESSAGE_SOURCE = MessageBundleUtils.createAccessor( "messages/common_errors_messages"); - public String[] requiredFields; + private static final Logger LOGGER = LoggerFactory.getLogger(RequiredFieldValidator.class); + public RequiredField[] requiredFields; @Override public FormValidationResult validate(Map values, List fieldData) { List missingFields = new ArrayList<>(); - for (String fieldName : requiredFields) { - if (isFieldNull(fieldName, values, fieldData)) { - missingFields.add(fieldName); + for (RequiredField requiredField : requiredFields) { + if (isFieldNull(requiredField.name, values, fieldData)) { + missingFields.add(requiredField.displayName); } } diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page index 2fee2e04..e80122bb 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page @@ -4291,7 +4291,7 @@ showServerValidationErrors -null +true @@ -4330,33 +4330,97 @@ - "application_kind" + + + displayName + + "Вид заявки" + + + + name + + "application_kind" + + + - "user_login" + + + displayName + + "Логин" + + + + name + + "user_login" + + + - "secondname" + + + displayName + + "Фамилия" + + + + name + + "secondname" + + + - "firstname" + + + displayName + + "Имя" + + + + name + + "firstname" + + + - "application_status" + + + displayName + + "Статус заявки" + + + + name + + "application_status" + + + - false RequiredFieldValidator ru.micord.ervu.account_applications.component.validator @@ -9338,7 +9402,16 @@ Form2 true false - + + + + showServerValidationErrors + +true + + + + @@ -9373,27 +9446,92 @@ - "application_kind" + + + displayName + + "Вид заявки" + + + + name + + "application_kind" + + + - "user_login" + + + displayName + + "Логин" + + + + name + + "user_login" + + + - "secondname" + + + displayName + + "Фамилия" + + + + name + + "secondname" + + + - "firstname" + + + displayName + + "Имя" + + + + name + + "firstname" + + + - "application_status" + + + displayName + + "Статус заявки" + + + + name + + "application_status" + + + @@ -12540,6 +12678,12 @@ "btn-main" + + + +disabled + + true @@ -13772,7 +13916,16 @@ Form3 true false - + + + + showServerValidationErrors + +true + + + + @@ -13807,27 +13960,92 @@ - "application_kind" + + + displayName + + "Вид заявки" + + + + name + + "application_kind" + + + - "user_login" + + + displayName + + "Логин" + + + + name + + "user_login" + + + - "secondname" + + + displayName + + "Фамилия" + + + + name + + "secondname" + + + - "firstname" + + + displayName + + "Имя" + + + + name + + "firstname" + + + - "application_status" + + + displayName + + "Статус заявки" + + + + name + + "application_status" + + + @@ -17029,6 +17247,12 @@ "btn-main" + + + +disabled + + true