Projekt

Obecné

Profil

« Předchozí | Další » 

Revize b439853d

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

re #7881 ability to create or edit a user configuration and set or edit its basic attributes, operator value and configuration name are validated, if operator value is wrong user is redirected to main page, auto increment functionality changed to IDENTITY

Zobrazit rozdíly:

src/main/webapp/WEB-INF/templates/assembly.html
29 29
        </h1>
30 30
    </div>
31 31

  
32
    <form th:object="${configuration}" method="post" th:action="@{/assembly(assemblyID=${assemblyID})}">
33
        <input type="hidden" th:field="*{id}" th:value="${assembly?.getId()}" />
32
    <form th:object="${configuration}" method="post" th:action="@{/configuration(configurationID=${configuration.id})}">
33
        <input type="hidden" th:field="*{assembly.id}" th:value="${configuration.assembly?.getId()}" />
34 34
        <div class="container box">
35 35
            <div class="col-md-12">
36 36
                <div class="col-md-12 form-group row">
37 37
                    <label for="exampleFormControlSelect1" class="name-input-label">Titulek tabulky:</label>
38
                    <input type="text" class="form-control name-input" th:field="*{name}" th:value="${assembly?.name}">
38
                    <input type="text" class="form-control name-input" th:field="*{tableName}" th:value="${configuration?.tableName}">
39 39
                </div>
40 40

  
41 41
                <span>Parametry:</span>
......
49 49
                        </tr>
50 50
                        </thead>
51 51
                        <tbody>
52
                        <tr th:each="parameter, itemStat : ${configuration.parametersInConfiguration}">
53

  
54
                        </tr>
55
                        <tr>
56
                            <td><span class="select-text-padding">Akademický rok</span></td>
52
                        <tr th:each="parameterInConfiguration, itemStat : ${configuration.parametersInConfiguration}">
57 53
                            <td>
58
                                <span class="select-action-padding select-action-button select-input-action-margin-collapse">
54
                                <span class="select-text-padding" th:text="${parameterInConfiguration.parameter.name}"></span>
55
                            </td>
56
                            <td>
57
                                <optional th:each="location : ${parameterInConfiguration.parameter.locations}">
58
                                <span th:if="${location.name.equals('Sloupec')}" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.name}" class="select-action-padding select-action-button select-input-action-margin-collapse">
59 59
                                  <i class="fas fa-align-justify"></i>
60 60
                                </span>
61
                                                <span class="select-action-padding select-action-button select-input-action-margin-collapse">
61
                                <span th:if="${location.name.equals('Řádek')}" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.name}" class="select-action-padding select-action-button select-input-action-margin-collapse">
62 62
                                  <i class="fas fa-align-justify transform"></i>
63 63
                                </span>
64
                                <span th:if="${location.name.equals('Hodnota')}" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.name}" class="select-action-padding select-action-button select-input-action-margin-collapse">
65
                                    <i class="fas fa-heading"></i>
66
                                </span>
67
                                </optional>
64 68
                            </td>
65 69
                            <td class="s">
66 70
                                <div class="col select-filter">
67
                                    <select class="form-control" style="{width:60px;}" id="exampleFormControlSelect1">
68
                                        <option>IN</option>
69
                                        <option>GREATER</option>
70
                                        <option>LESS</option>
71
                                        <option>EQUAL</option>
72
                                    </select>
73
                                    <input type="text" class="form-control select-filter-input" id="name">
74
                                </div>
75
                            </td>
76
                        </tr>
77
                        <tr>
78
                            <td><span class="select-text-padding">Fakulta</span></td>
79
                            <td>
80
                <span class="select-action-padding select-action-button select-input-action-margin-collapse select-action-headlight">
81
                  <i class="fas fa-align-justify"></i>
82
                </span>
83
                                <span class="select-action-padding select-action-button select-input-action-margin-collapse ">
84
                  <i class="fas fa-align-justify transform"></i>
85
                </span>
86
                            </td>
87
                            <td class="s">
88
                                <div class="col select-filter">
89
                                    <select class="form-control" style="{width:60px;}" id="exampleFormControlSelect1">
90
                                        <option>IN</option>
91
                                        <option>GREATER</option>
92
                                        <option>LESS</option>
93
                                        <option>EQUAL</option>
94
                                    </select>
95
                                    <input type="text" class="form-control select-filter-input" id="name">
96
                                </div>
97
                            </td>
98
                        </tr>
99
                        <tr>
100
                            <td><span class="select-text-padding">Ročník</span></td>
101
                            <td>
102
                <span class="select-action-padding select-action-button select-input-action-margin-collapse">
103
                  <i class="fas fa-align-justify"></i>
104
                </span>
105
                                <span class="select-action-padding select-action-button select-input-action-margin-collapse select-action-headlight">
106
                  <i class="fas fa-align-justify transform"></i>
107
                </span>
108
                            </td>
109
                            <td class="s">
110
                                <div class="col select-filter">
111
                                    <select class="form-control" style="{width:60px;}" id="exampleFormControlSelect1">
112
                                        <option>IN</option>
113
                                        <option>GREATER</option>
114
                                        <option>LESS</option>
115
                                        <option>EQUAL</option>
116
                                    </select>
117
                                    <input type="text" class="form-control select-filter-input" id="name">
118
                                </div>
119
                            </td>
120
                        </tr>
121
                        <tr>
122
                            <td><span class="select-text-padding">Typ strudia</span></td>
123
                            <td>
124
                <span class="select-action-padding select-action-button select-input-action-margin-collapse select-action-headlight">
125
                  <i class="fas fa-align-justify"></i>
126
                </span>
127
                                <span class="select-action-padding select-action-button select-input-action-margin-collapse">
128
                  <i class="fas fa-align-justify transform"></i>
129
                </span>
130
                                <span class="select-action-padding select-action-button select-input-action-margin-collapse">
131
                  <i class="fas fa-heading"></i>
132
                </span>
133
                            </td>
134
                            <td class="s">
135
                                <div class="col select-filter">
136
                                    <select class="form-control" style="{width:60px;}" id="exampleFormControlSelect1">
137
                                        <option>IN</option>
138
                                        <option>GREATER</option>
139
                                        <option>LESS</option>
140
                                        <option>EQUAL</option>
141
                                    </select>
142
                                    <input type="text" class="form-control select-filter-input" id="name">
143
                                </div>
144
                            </td>
145
                        </tr>
146
                        <tr>
147
                            <td><span class="select-text-padding">Počet</span></td>
148
                            <td>
149
                <span class="select-action-padding select-action-button select-input-action-margin-collapse select-action-headlight">
150
                  <i class="fas fa-heading"></i>
151
                </span>
152
                            </td>
153
                            <td class="s">
154
                                <div class="col select-filter">
155
                                    <select class="form-control" style="{width:60px;}" id="exampleFormControlSelect1">
156
                                        <option>IN</option>
157
                                        <option>GREATER</option>
158
                                        <option>LESS</option>
159
                                        <option>EQUAL</option>
71
                                    <select class="form-control" style="{width:60px;}" id="exampleFormControlSelect1" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].operator.name}">
72
                                        <option th:value="zadny" selected value> -- Zvolte operátor -- </option>
73
                                        <option th:each="operator : ${parameterInConfiguration.parameter.operators}" th:text="${operator.name}" th:value="${operator.name}"></option>
160 74
                                    </select>
161
                                    <input type="text" class="form-control select-filter-input" id="name">
75
                                    <input type="text" class="form-control select-filter-input" id="name" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].operatorValue}">
162 76
                                </div>
163 77
                            </td>
164 78
                        </tr>
......
271 185
                <div class="col-md-12 form-group row template-input">
272 186
                    <label for="exampleFormControlSelect1" class="template-input-label">Vlastní název šablony:</label>
273 187
                    <div class="">
274
                        <input type="text" class="form-control select-filter-input" id="name">
188
                        <input type="text" required="required" class="form-control select-filter-input" id="name" th:field="${configuration.name}">
275 189
                    </div>
276 190

  
277 191
                    <button type="submit" class="btn btn-success mb-2 template-input-submit">Uložit šablonu</button>

Také k dispozici: Unified diff