Revize cc39413d

re #7885 added SUM and ability to work with multiple values and sorted parameters in configuration, optimization

src/main/webapp/WEB-INF/templates/assembly.html

@@ -177 +177 @@
                                                 th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].functions}"
                                                 multiple>
                                             <option th:each="function : ${parameterInConfiguration.parameter.functions}"
-                                                    th:text="${function.name}" th:value="${{function.id}}"></option>
+                                                    th:text="${function.name}" th:value="${function.id}"></option>
                                         </select>
                                     </td>
                                 </tr>
@@ -212 +212 @@
                 <table class="tg table">
                     <tr th:each="contingencyTableRow : ${contingencyTableRows}">
                         <div class="tg-align" th:if="${contingencyTableRow.isHeader()}">
-                            <th class="tg-align" th:each="contingencyTableRowCell : ${contingencyTableRow.getCells()}">
+                            <th class="tg-align" th:each="contingencyTableRowCell : ${contingencyTableRow.getCells()}" th:colspan="${contingencyTableRowCell.getColSpan()}">
                                 <span th:text="${contingencyTableRowCell.getValue()}"></span>
                             </th>
                         </div>