Revize c08ea26b

re #7885 added option to show empty rows and columns, bug fixes re #8134 nothing; re #8154 added validator; re #8136 added column names no comments

src/main/java/vldc/aswi/domain/parameter/ParameterInConfiguration.java

@@ -16 +16 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
-@OperatorValueConstraint
 public class ParameterInConfiguration extends EntityParent implements Comparable<ParameterInConfiguration> {
 
     /** Specific configuration in which is this parameterConfiguration presented. */

src/main/java/vldc/aswi/model/table/Node.java

@@ -26 +26 @@
 
     private boolean isUsable;
 
+    private boolean isFilledTotalValue = false;
+
     /**
      * Values of the nodes on a path the the node.
      */
@@ -139 +141 @@
     public void setUsable(boolean usable) {
         isUsable = usable;
     }
+
+    public boolean isFilledTotalValue() {
+        return isFilledTotalValue;
+    }
+
+    public void setFilledTotalValue(boolean filledTotalValue) {
+        isFilledTotalValue = filledTotalValue;
+    }
 }

src/main/java/vldc/aswi/model/table/ValueFunction.java

@@ -22 +22 @@
 
     private boolean isFirstMax = true;
 
+    private boolean isFilledTotalValue = false;
+
     /**
      * Value
      */
@@ -159 +161 @@
     public void setFirstMax(boolean firstMax) {
         isFirstMax = firstMax;
     }
+
+    public boolean isFilledTotalValue() {
+        return isFilledTotalValue;
+    }
+
+    public void setFilledTotalValue(boolean filledTotalValue) {
+        isFilledTotalValue = filledTotalValue;
+    }
 }

src/main/java/vldc/aswi/service/SqlQueryManagerImpl.java

@@ -116 +116 @@
         boolean isWhereDefined = false;
 
         for (ParameterInConfiguration parameterInConfiguration : parametersInConfiguration) {
-            if (parameterInConfiguration.getOperator() != null && !parameterInConfiguration.getOperator().getName().equals("zadny") &&
+            if (parameterInConfiguration.getParameter().getParameterType().getName().equals("Výčet") && false) {
+                isWhereDefined = processListing(parameterInConfiguration, finalSQLQuery, isWhereDefined);
+            }
+            else if (parameterInConfiguration.getOperator() != null && !parameterInConfiguration.getOperator().getName().equals("zadny") &&
                     parameterInConfiguration.getOperatorValue() != null && !parameterInConfiguration.getOperatorValue().equals("")) {
-                String[] values = parameterInConfiguration.getOperatorValue().split(";");
-                if (!isWhereDefined) {
-                    finalSQLQuery.append(" WHERE ");
-                    isWhereDefined = true;
-                } else {
-                    finalSQLQuery.append(" AND ");
-                }
-
-                finalSQLQuery.append(parameterInConfiguration.getParameter().getNameOfSelect());
-                finalSQLQuery.append(" ");
-                finalSQLQuery.append(parameterInConfiguration.getOperator().getName());
-                finalSQLQuery.append(" ");
-                switch (parameterInConfiguration.getOperator().getName()) {
-                    case "BETWEEN":
-                    case "NOT BETWEEN":
-                        finalSQLQuery.append(betweenNotBetween(values, parameterInConfiguration.getParameter().getParameterType().getName()));
-                        break;
-                    case "IN":
-                    case "NOT IN":
-                        finalSQLQuery.append(inNotIn(values, parameterInConfiguration.getParameter().getParameterType().getName()));
-                        break;
-                    case "LIKE":
-                    case "NOT LIKE":
-                        finalSQLQuery.append(likeNotLike(values, parameterInConfiguration.getParameter().getParameterType().getName()));
-                        break;
-                    default:
-                        finalSQLQuery.append(otherOperators(values, parameterInConfiguration.getParameter().getParameterType().getName()));
-                        break;
-                }
+                isWhereDefined = processFilter(parameterInConfiguration, finalSQLQuery, isWhereDefined);
             }
         }
 
         return finalSQLQuery.toString();
     }
 
+    private boolean processListing(ParameterInConfiguration parameterInConfiguration, StringBuilder finalSQLQuery, boolean isWhereDefined) {
+        if (!isWhereDefined) {
+            finalSQLQuery.append(" WHERE ");
+        } else {
+            finalSQLQuery.append(" AND ");
+        }
+
+        finalSQLQuery.append(parameterInConfiguration.getParameter().getNameOfSelect());
+        finalSQLQuery.append(" IN ");
+        inNotIn(null, "Text");
+
+        return true;
+    }
+
+    private boolean processFilter(ParameterInConfiguration parameterInConfiguration, StringBuilder finalSQLQuery, boolean isWhereDefined) {
+        String[] values = parameterInConfiguration.getOperatorValue().split(";");
+        if (!isWhereDefined) {
+            finalSQLQuery.append(" WHERE ");
+        } else {
+            finalSQLQuery.append(" AND ");
+        }
+
+        finalSQLQuery.append(parameterInConfiguration.getParameter().getNameOfSelect());
+        finalSQLQuery.append(" ");
+        finalSQLQuery.append(parameterInConfiguration.getOperator().getName());
+        if (parameterInConfiguration.getOperator().getName().equals("IS NULL") ||
+                parameterInConfiguration.getOperator().getName().equals("IS NOT NULL")) {
+            return true;
+        }
+        finalSQLQuery.append(" ");
+        switch (parameterInConfiguration.getOperator().getName()) {
+            case "BETWEEN":
+            case "NOT BETWEEN":
+                finalSQLQuery.append(betweenNotBetween(values, parameterInConfiguration.getParameter().getParameterType().getName()));
+                break;
+            case "IN":
+            case "NOT IN":
+                finalSQLQuery.append(inNotIn(values, parameterInConfiguration.getParameter().getParameterType().getName()));
+                break;
+            case "LIKE":
+            case "NOT LIKE":
+                finalSQLQuery.append(likeNotLike(values, parameterInConfiguration.getParameter().getParameterType().getName()));
+                break;
+            default:
+                finalSQLQuery.append(otherOperators(values, parameterInConfiguration.getParameter().getParameterType().getName()));
+                break;
+        }
+
+        return true;
+    }
+
     private String likeNotLike(String[] values, String type) {
         StringBuilder SQLQueryPart = new StringBuilder();
         addQuotes(type, SQLQueryPart);

src/main/java/vldc/aswi/utils/Converter.java

@@ -15 +15 @@
  */
 public class Converter {
 
+    private final boolean isNotRemoveEmpty;
+
     private final Map<String, TableColumn> tableColumns;
     private final List<NameUserName> rowNames;
     private final List<NameUserName> columnNames;
@@ -24 +26 @@
     private final DecimalFormat decimalFormat = new DecimalFormat("0.###");
 
     public Converter(Map<String, TableColumn> tableColumns, List<NameUserName> rowNames, List<NameUserName> columnNames,
-                     List<ValueFunction> valueFunctions) {
+                     List<ValueFunction> valueFunctions, boolean isNotRemoveEmpty) {
         this.tableColumns = tableColumns;
         this.rowNames = rowNames;
         this.columnNames = columnNames;
         this.valueFunctions = valueFunctions;
+        this.isNotRemoveEmpty = isNotRemoveEmpty;
     }
 
     /**
@@ -59 +62 @@
         long stopTime2 = System.nanoTime();
         System.out.println("Rows:" + TimeUnit.MILLISECONDS.convert((stopTime2 - startTime2), TimeUnit.NANOSECONDS));
 
-        long startTime3 = System.nanoTime();
-        for (ContingencyTableRow dataRow : dataRows) {
-            for (int i = 0; i < columnNodes.size(); i++) {
-                if (!columnNodes.get(i).isUsable()) {
-                    dataRow.getCells().remove(i + 1);
+        if (isNotRemoveEmpty) {
+            long startTime3 = System.nanoTime();
+            for (ContingencyTableRow dataRow : dataRows) {
+                for (int i = 0; i < columnNodes.size(); i++) {
+                    if (!columnNodes.get(i).isUsable()) {
+                        dataRow.getCells().remove(i + 1);
+                    }
                 }
             }
-        }
 
-        columnNodes.removeIf(node -> !node.isUsable());
-        long stopTime3 = System.nanoTime();
-        System.out.println("Columns remove:" + TimeUnit.MILLISECONDS.convert((stopTime3 - startTime3), TimeUnit.NANOSECONDS));
+            columnNodes.removeIf(node -> !node.isUsable());
+            long stopTime3 = System.nanoTime();
+            System.out.println("Columns remove:" + TimeUnit.MILLISECONDS.convert((stopTime3 - startTime3), TimeUnit.NANOSECONDS));
+        }
 
         long startTime4 = System.nanoTime();
         List<ContingencyTableRow> headerRows = createHeaderOnlyRows();
@@ -127 +132 @@
                     String value = columnNode.getValues().get(i);
                     if (!prevValues.contains(value)) {
                         prevValues.add(value);
-                        headerRows.get(i + 1).addTableRowCell(new ContingencyTableRowCell(value, 1));
+                        headerRows.get(i + 1).addTableRowCell(new ContingencyTableRowCell(columnNames.get(i).getUserName() + " - " + value, 1));
                         headerRows.get(0).getCells().get(headerRows.get(0).getCells().size() - 1).setColSpan(headerRows.get(0).getCells().get(headerRows.get(0).getCells().size() - 1).getColSpan() + 1);
                     } else if (columnNode.getValues().size() >= prevSize) {
                         headerRows.get(i + 1).getCells().get(headerRows.get(i + 1).getCells().size() - 1).setColSpan(headerRows.get(i + 1).getCells().get(headerRows.get(i + 1).getCells().size() - 1).getColSpan() + 1);
@@ -233 +238 @@
                 for (int i = 0; i < index; i++) {
                     levelString.append("      ");
                 }
-                levelString.append(s);
+                levelString.append(rowNames.get(index).getUserName()).append(" - ").append(s);
                 ContingencyTableRow row = new ContingencyTableRow(false, index);
                 row.addTableRowCell(new ContingencyTableRowCell(levelString.toString(), 1));
                 rows.add(row);
@@ -259 +264 @@
             for (String s : list) {
                 Node node = new Node(prevNode);
                 node.getValues().add(s);
-                if (checkIfColumnIsUsable(node.getValues())) {
+                if (isNotRemoveEmpty) {
+                    int newIndex = index + 1;
+                    generateColumns(newIndex, values, columnNodes, node);
+                    columnNodes.add(node);
+                }
+                else if (checkIfColumnIsUsable(node.getValues())) {
                     int newIndex = index + 1;
                     generateColumns(newIndex, values, columnNodes, node);
                     columnNodes.add(node);
@@ -285 +295 @@
         }
 
         boolean isRowUsable = false;
+        if (isNotRemoveEmpty) {
+            isRowUsable = true;
+        }
+
         if (columnNodes.size() == 0) {
             columnNodes.add(new Node());
         }
@@ -295 +309 @@
                 !usableIDs.isEmpty()) {
             return true;
         }
+        else if (valueFunctions.get(0).getFunction() != null && valueFunctions.get(0).getFunction().equals("NIC") &&
+                usableIDs.isEmpty()) {
+            return isRowUsable;
+        }
 
         DoubleWrapper[] totals = new DoubleWrapper[valueFunctions.size()];
         initializeWrapperField(totals);
@@ -354 +372 @@
                     row.addTableRowCell(new ContingencyTableRowCell("", 0));
                 }
                 else {
+                    columnNode.setFilledTotalValue(true);
                     row.addTableRowCell(generateFilledCell(valueFunction.getFunction(), result.getValue(), result.getValue(), result.getValue(),
                             result.getValue(), resultAvgSum.getValue(), result.getValue()));
                 }
@@ -367 +386 @@
                 row.addTableRowCell(new ContingencyTableRowCell("", 0));
             }
             else {
+                valueFunctions.get(i).setFilledTotalValue(true);
                 row.addTableRowCell(generateFilledCell(valueFunctions.get(i).getFunction(), totals[i].getValue(), totals[i].getValue(),
                         totals[i].getValue(), totals[i].getValue(), totalsAvgSum[i].getValue(), totals[i].getValue()));
             }
@@ -582 +602 @@
         List<ContingencyTableRowCell> valueCells = new ArrayList<>();
         for (ValueFunction valueFunction : valueFunctions) {
             for (Node columnNode : columnNodes) {
+                if (columnNode.isFilledTotalValue()) {
                     finalRow.addTableRowCell(generateFilledCell(valueFunction.getFunction(), columnNode.getTotalResult(), columnNode.getTotalResultSum(),
                             columnNode.getTotalMin(), columnNode.getTotalMax(), columnNode.getTotalResultAvgSum(),
                             columnNode.getTotalResultAvg()));
+                }
+                else {
+                    finalRow.addTableRowCell(new ContingencyTableRowCell("", 0));
+                }
+            }
+            if (valueFunction.isFilledTotalValue()) {
+                valueCells.add(generateFilledCell(valueFunction.getFunction(), valueFunction.getTotalResult(), valueFunction.getTotalResultSum(),
+                        valueFunction.getTotalMin(), valueFunction.getTotalMax(), valueFunction.getTotalResultAvgSum(),
+                        valueFunction.getTotalResultAvg()));
+            }
+            else {
+                valueCells.add(new ContingencyTableRowCell("", 0));
             }
-            valueCells.add(generateFilledCell(valueFunction.getFunction(), valueFunction.getTotalResult(), valueFunction.getTotalResultSum(),
-                    valueFunction.getTotalMin(), valueFunction.getTotalMax(), valueFunction.getTotalResultAvgSum(),
-                    valueFunction.getTotalResultAvg()));
         }
 
         finalRow.addTableRowCells(valueCells);

src/main/java/vldc/aswi/validators/ConfigurationValidator.java

@@ +1 @@
+package vldc.aswi.validators;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.NumberUtils;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+import vldc.aswi.domain.Assembly;
+import vldc.aswi.domain.Configuration;
+import vldc.aswi.domain.parameter.Parameter;
+import vldc.aswi.domain.parameter.ParameterInConfiguration;
+import vldc.aswi.service.SqlQueryManager;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class ConfigurationValidator implements Validator {
+
+    /**
+     * Validator for supporting this class.
+     * @param aClass - Class.
+     * @return true if sent class match Configuration class.
+     */
+    @Override
+    public boolean supports(Class<?> aClass) {
+        return Configuration.class.isAssignableFrom(aClass);
+    }
+
+    @Override
+    public void validate(Object obj, Errors errors) {
+        Configuration configuration = (Configuration) obj;
+
+        List<ParameterInConfiguration> parametersInConfiguration = configuration.getParametersInConfiguration();
+        for (int i = 0; i < parametersInConfiguration.size(); i++) {
+            ParameterInConfiguration parameterInConfiguration = parametersInConfiguration.get(i);
+            if (parameterInConfiguration.getOperator() == null || parameterInConfiguration.getOperatorValue() == null ||
+                    parameterInConfiguration.getOperatorValue().equals("")) {
+                continue;
+            }
+            if (parameterInConfiguration.getOperator().getName().equals("BETWEEN") ||
+                    parameterInConfiguration.getOperator().getName().equals("NOT BETWEEN")) {
+                validateBETWEEN(parameterInConfiguration, errors, i, parameterInConfiguration.getOperator().getName());
+            }
+            else if (parameterInConfiguration.getOperator().getName().equals("IN") ||
+                    parameterInConfiguration.getOperator().getName().equals("NOT IN")) {
+                validateIN(parameterInConfiguration, errors, i, parameterInConfiguration.getOperator().getName());
+            }
+            else if (!parameterInConfiguration.getOperator().getName().equals("LIKE") ||
+                    parameterInConfiguration.getOperator().getName().equals("NOT LIKE")) {
+                validateOthersExceptLIKE(parameterInConfiguration, errors, i, parameterInConfiguration.getOperator().getName());
+            }
+        }
+
+    }
+
+    private void validateBETWEEN(ParameterInConfiguration parameterInConfiguration, Errors errors, int i, String operator) {
+        if (!parameterInConfiguration.getOperatorValue().matches("\\w+;\\w+")) {
+            errors.rejectValue("parametersInConfiguration[" + i + "].operatorValue", "Nesprávně oddělené hodnoty" +
+                    " filtru " + operator +"! Použijte ';' pro oddělení hodnot!");
+        }
+        else {
+            validateValuesInList(parameterInConfiguration, errors, i, operator);
+        }
+    }
+
+    private void validateValuesInList(ParameterInConfiguration parameterInConfiguration, Errors errors, int i, String operator) {
+        String[] values = parameterInConfiguration.getOperatorValue().split(";");
+        for (String value : values) {
+            if (parameterInConfiguration.getParameter().getParameterType().getName().equals("Datum")) {
+                validateDate(value, errors, i, operator);
+            }
+            if (parameterInConfiguration.getParameter().getParameterType().getName().equals("Číslo")) {
+                validateNumber(value, errors, i, operator);
+            }
+        }
+    }
+
+    private void validateIN(ParameterInConfiguration parameterInConfiguration, Errors errors, int i, String operator) {
+        if (!parameterInConfiguration.getOperatorValue().matches("\\w+(;\\w+)*$")) {
+            errors.rejectValue("parametersInConfiguration[" + i + "].operatorValue", "Špatně zadaná hodnota" +
+                    " filtru " + operator + "!  Použijte ';' pro oddělení hodnot!");
+        }
+        else {
+            validateValuesInList(parameterInConfiguration, errors, i, operator);
+        }
+    }
+
+    private void validateOthersExceptLIKE(ParameterInConfiguration parameterInConfiguration, Errors errors, int i, String operator) {
+        if (parameterInConfiguration.getParameter().getParameterType().getName().equals("Datum")) {
+            validateDate(parameterInConfiguration.getOperatorValue(), errors, i, operator);
+        }
+        if (parameterInConfiguration.getParameter().getParameterType().getName().equals("Číslo")) {
+            validateNumber(parameterInConfiguration.getOperatorValue(), errors, i, operator);
+        }
+    }
+
+    private void validateNumber(String value, Errors errors, int i, String operator) {
+        if (!value.matches("-?\\d+(\\.\\d+)?")) {
+            errors.rejectValue("parametersInConfiguration[" + i + "].operatorValue", "Špatně zadaná hodnota" +
+                    " filtru " + operator + "! Očekává se číslo!");
+        }
+    }
+
+    private void validateDate(String value, Errors errors, int i, String operator) {
+        try {
+            new SimpleDateFormat("yyyy-MM-dd").parse(value);
+        } catch (ParseException nfe) {
+            errors.rejectValue("parametersInConfiguration[" + i + "].operatorValue", "Špatně zadaná hodnota" +
+                    " filtru " + operator + "! Očekává se datum!");
+        }
+    }
+}

src/main/java/vldc/aswi/web/controller/AssemblyController.java

@@ -3 +3 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22 +23 @@
 import vldc.aswi.utils.AuthControl;
 import vldc.aswi.validators.AssemblyValidator;
 import vldc.aswi.utils.Utils;
+import vldc.aswi.validators.ConfigurationValidator;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
@@ -76 +78 @@
     @Autowired
     private AssemblyValidator assemblyValidator;
 
+    /** Autowired configuration validator */
+    @Autowired
+    private ConfigurationValidator configurationValidator;
+
     /** Name of thymeleaf parameter, which will contain text in assembly form. */
     private String assemblyTitleName = "title";
 
@@ -85 +91 @@
     /** Title text for new assembly form. */
     private String assemblyNewTitleText = "Vytvoření nové sestavy";
 
+    /** Title text for table generation form.  */
+    private String generateTableTitleText = "Generování tabulky - ";
+
     /**
      * Bind assembly validator.
      * @param binder Binder.
@@ -167 +176 @@
     {
 
         ModelAndView modelAndView = new ModelAndView();
+        ModelMap modelMap = modelAndView.getModelMap();
 
         if (bindingResult.hasErrors()) {
             // TODO: 04.05.2020 Error message
@@ -188 +198 @@
 
             System.out.println("Generuj tabulku");
             prepareForTable(newConfiguration);
+            BindingResult errors = new BeanPropertyBindingResult(newConfiguration, newConfiguration.getClass().getName());
+            configurationValidator.validate(newConfiguration, errors);
+            if (errors.hasErrors()) {
+                addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
 
-            List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration.getAssembly().getSQLQuery(),
-                    newConfiguration.getParametersInConfiguration());
+                modelMap.addAttribute(assemblyErrorName, getFullErrorMessage(errors));
+                modelMap.addAttribute(assemblyTitleName, generateTableTitleText + " " + newConfiguration.getName());
+            }
+            else {
+                List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration);
 
-            System.out.println("Generuj tabulku");
-            ModelMap modelMap = modelAndView.getModelMap();
-            modelMap.addAttribute("configurationID", id);
-            modelMap.addAttribute("contingencyTableRows", rows);
-            Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
-            initializeFields(newConfiguration);
-
-            modelMap.addAttribute("configuration", newConfiguration);
-            modelMap.addAttribute("comparator", comparator);
-            modelMap.addAttribute("formAction", "/assembly?assemblyID=" + newConfiguration.getAssembly().getId());
-            modelAndView.setViewName("assembly");
+                System.out.println("Generuj tabulku");
+                modelMap.addAttribute("configurationID", id);
+                modelMap.addAttribute("contingencyTableRows", rows);
+                addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
+            }
         }
         else if (exportXls != null)
         {
@@ -243 +254 @@
  */
     }
 
+    private void addConfigurationDataIntoModelAndView(Configuration newConfiguration, ModelAndView modelAndView, ModelMap modelMap) {
+        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
+        initializeFields(newConfiguration);
+        modelMap.addAttribute("configuration", newConfiguration);
+        modelMap.addAttribute("comparator", comparator);
+        modelMap.addAttribute("formAction", "/assembly?assemblyID=" + newConfiguration.getAssembly().getId());
+        modelAndView.setViewName("assembly");
+    }
+
     /**
      * Get method for assembly delete.
      * @param id - ID of assembly.

src/main/java/vldc/aswi/web/controller/ConfigurationController.java

@@ -3 +3 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@@ -19 +21 @@
 import vldc.aswi.service.SqlQueryManager;
 import vldc.aswi.utils.AuthControl;
 import vldc.aswi.utils.Utils;
+import vldc.aswi.validators.AssemblyValidator;
+import vldc.aswi.validators.ConfigurationValidator;
+
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -45 +51 @@
     @Autowired
     private ConfigurationManager configurationManager;
 
+    /** Autowired configuration validator */
+    @Autowired
+    private ConfigurationValidator configurationValidator;
+
+    /** Name of thymeleaf parameter, which will contain text in assembly form. */
+    private String assemblyTitleName = "title";
+
+    /** Title text for table generation form.  */
+    private String generateTableTitleText = "Generování tabulky - ";
+
     /**
      * Opens an configuration page after configuration name was clicked
      * @param id ID of configuration
@@ -96 +112 @@
      * @return modelAndView with redirection
      */
     @PostMapping("/configuration")
-    public ModelAndView configurationPost(Configuration newConfiguration,
+    public ModelAndView configurationPost(@Valid Configuration newConfiguration,
                                            BindingResult bindingResult,
                                            @RequestParam("configurationID") String id,
                                            @RequestParam(required=false, value="generateTable") String generateTable,
@@ -119 +135 @@
         if (generateTable != null)
         {
             prepareForTable(newConfiguration);
-            System.out.println("Generuj tabulku");
-
-            List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration.getAssembly().getSQLQuery(),
-                    newConfiguration.getParametersInConfiguration());
-
-            modelMap.addAttribute("configurationID", id);
-            modelMap.addAttribute("contingencyTableRows", rows);
-            Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
-            initializeFields(newConfiguration);
-            modelMap.addAttribute("configuration", newConfiguration);
-            modelMap.addAttribute("comparator", comparator);
-            modelMap.addAttribute("formAction", "/configuration?configurationID=" + id);
-            modelAndView.setViewName("assembly");
+            BindingResult errors = new BeanPropertyBindingResult(newConfiguration, newConfiguration.getClass().getName());
+            configurationValidator.validate(newConfiguration, errors);
+            if (errors.hasErrors()) {
+                addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
+
+                modelMap.addAttribute(assemblyErrorName, getFullErrorMessage(errors));
+                modelMap.addAttribute(assemblyTitleName, generateTableTitleText + " " + newConfiguration.getName());
+            }
+            else {
+                List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration);
+                System.out.println("Generuj tabulku");
+                modelMap.addAttribute("configurationID", id);
+                modelMap.addAttribute("contingencyTableRows", rows);
+                addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
+            }
         }
         else if (exportXls != null)
         {
@@ -220 +238 @@
             }
         }
     }
+
+    private void addConfigurationDataIntoModelAndView(Configuration newConfiguration, ModelAndView modelAndView, ModelMap modelMap) {
+        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
+        initializeFields(newConfiguration);
+        modelMap.addAttribute("configuration", newConfiguration);
+        modelMap.addAttribute("comparator", comparator);
+        modelMap.addAttribute("formAction", "/assembly?assemblyID=" + newConfiguration.getAssembly().getId());
+        modelAndView.setViewName("assembly");
+    }
 }