Revize 26c4caa0
Přidáno uživatelem Vojtěch Danišík před téměř 4 roky(ů)
src/main/java/vldc/aswi/web/controller/AssemblyController.java | ||
---|---|---|
15 | 15 |
import vldc.aswi.domain.*; |
16 | 16 |
import vldc.aswi.domain.parameter.Parameter; |
17 | 17 |
import vldc.aswi.domain.parameter.ParameterInConfiguration; |
18 |
import vldc.aswi.model.table.contingencyTable.ContingencyTableRow; |
|
18 | 19 |
import vldc.aswi.service.*; |
19 | 20 |
import vldc.aswi.service.parameter.ParameterManager; |
20 | 21 |
import vldc.aswi.service.parameter.ParameterTypeManager; |
... | ... | |
25 | 26 |
import javax.validation.Valid; |
26 | 27 |
import java.util.ArrayList; |
27 | 28 |
import java.util.Comparator; |
29 |
import java.util.List; |
|
28 | 30 |
import java.util.Set; |
29 | 31 |
import java.util.stream.Collectors; |
30 | 32 |
|
... | ... | |
186 | 188 |
|
187 | 189 |
System.out.println("Generuj tabulku"); |
188 | 190 |
prepareForTable(newConfiguration); |
191 |
|
|
192 |
List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration.getAssembly().getSQLQuery(), |
|
193 |
newConfiguration.getParametersInConfiguration()); |
|
194 |
|
|
189 | 195 |
System.out.println("Generuj tabulku"); |
190 | 196 |
ModelMap modelMap = modelAndView.getModelMap(); |
191 | 197 |
modelMap.addAttribute("configurationID", id); |
192 |
modelMap.addAttribute("contingencyTableRows", this.sqlQueryManager.getContingencyTableRow(newConfiguration));
|
|
198 |
modelMap.addAttribute("contingencyTableRows", rows);
|
|
193 | 199 |
Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder()); |
194 | 200 |
initializeFields(newConfiguration); |
195 | 201 |
|
Také k dispozici: Unified diff
re #8101 Bad saving changes for configuration.