Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 9714fae3

Přidáno uživatelem Michal Linha před asi 4 roky(ů)

re #7981 parameter order in configuration implementation finished

Zobrazit rozdíly:

src/main/webapp/WEB-INF/templates/assembly.html
45 45
                    <input type="text" class="form-control name-input" th:field="*{tableName}"
46 46
                           th:value="${configuration?.tableName}">
47 47
                </div>
48

  
49 48
                <span>Parametry:</span>
50 49
                <div class="col-md-9">
51 50
                    <table class="table">
......
57 56
                        </tr>
58 57
                        </thead>
59 58
                        <tbody>
60
                        <tr th:each="parameterInConfiguration, itemStat : ${configuration.parametersInConfiguration}" class="parameter-row">
59
                        <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration, comparator)}" class="parameter-row">
61 60
                           <input type="hidden" class="parameterIndex" th:value="${itemStat.index}">
62 61
                            <td>
63 62
                                <span class="select-text-padding parameter-name"
......
123 122
                            </tr>
124 123
                            </thead>
125 124
                            <tbody id="row-wrapper" class="sortable">
126
                            <tr th:each="parameterInConfiguration, itemStat : ${configuration.parametersInConfiguration}" th:if="${parameterInConfiguration.location.name?.equals('Řádek')}" class="row-parameter parameter">
125
                            <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Řádek')}" class="row-parameter parameter">
127 126
                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="1">
128
                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].order}">
127
                                <input type="hidden" class="parametr-order" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}" th:value="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}">
129 128
                                <td>
130 129
                                    <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
131 130
                                </td>
......
155 154
                            </tr>
156 155
                            </thead>
157 156
                            <tbody id="column-wrapper" class="sortable">
158
                            <tr th:each="parameterInConfiguration, itemStat : ${configuration.parametersInConfiguration}" th:if="${parameterInConfiguration.location.name?.equals('Sloupec')}" class="column-parameter parameter">
157
                            <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Sloupec')}" class="column-parameter parameter">
159 158
                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="2">
160
                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].order}">
159
                                <input type="hidden" class="parametr-order" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}" th:value="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}">
161 160
                                <td>
162 161
                                    <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
163 162
                                </td>
......
186 185
                            </tr>
187 186
                            </thead>
188 187
                            <tbody id="value-wrapper">
189
                            <tr th:each="parameterInConfiguration, itemStat : ${configuration.parametersInConfiguration}" th:if="${parameterInConfiguration.location.name?.equals('Hodnota')}" class="value-parameter parameter">
188
                            <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Hodnota')}" class="value-parameter parameter">
190 189
                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="3">
191
                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].order}">
190
                                <input type="hidden" class="parametr-order" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}" th:value="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}">
192 191
                                <td>
193 192
                                    <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
194 193
                                </td>

Také k dispozici: Unified diff