Revize 10920ea3

re #8130 #8135 #8142

pom.xml

@@ -13 +13 @@
 	<artifactId>aswi</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>war</packaging>
-	<name>pia</name>
+	<name>aswi</name>
 	<description>Simulation of contignent table - web app</description>
 
-	<properties>
-		<java.version>8</java.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -82 +78 @@
 			<artifactId>lombok</artifactId>
 		</dependency>
 		
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

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

@@ -11 +11 @@
 import java.util.List;
 
 /**
- * Validator for assembly.
+ * Validator for assembly (creating / updating).
  */
 @Component
 public class AssemblyValidator implements Validator {

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

@@ -373 +373 @@
             modelAndView.setViewName("redirect:/assembly_edit?assemblyID=" + assemblyId);
         }
 
+        modelMap.addAttribute("allRoles", this.roleManager.getRoles());
+        modelMap.addAttribute("allParameterTypes", this.parameterTypeManager.getParameterTypes());
+        modelMap.addAttribute("allFunctions", this.functionManager.getFunctions());
+        modelMap.addAttribute("allOperators", this.operatorManager.getOperators());
+        modelMap.addAttribute("allLocations", this.locationManager.getLocations());
+
         return modelAndView;
     }
 

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

@@ -92 +92 @@
                     <div class="selected-input-container">
                         <div class="selected-input-box">
                             <div class="selected-input-box-icon">
-                                <i class="fas fa-align-justify"></i>
+                                <i class="fas fa-align-justify transform"></i>
                             </div>
                             <table class="table table-parameter">
                                 <thead>
@@ -102 +102 @@
                                     <th class="col-3-p"></th>
                                 </tr>
                                 </thead>
-                                <tbody id="row-wrapper" class="sortable">
-                                <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Řádek')}" class="row-parameter parameter">
-                                    <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="1">
+                                <tbody id="column-wrapper" class="sortable">
+                                <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Sloupec')}" class="column-parameter parameter">
+                                    <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="2">
                                     <input type="hidden" class="parametr-order" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}" th:value="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}">
                                     <td>
                                         <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
@@ -121 +121 @@
                             </table>
                         </div>
 
-
                         <div class="selected-input-box">
                             <div class="selected-input-box-icon">
-                                <i class="fas fa-align-justify transform"></i>
+                                <i class="fas fa-align-justify"></i>
                             </div>
                             <table class="table table-parameter">
                                 <thead>
@@ -134 +133 @@
                                     <th class="col-3-p"></th>
                                 </tr>
                                 </thead>
-                                <tbody id="column-wrapper" class="sortable">
-                                <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Sloupec')}" class="column-parameter parameter">
-                                    <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="2">
+                                <tbody id="row-wrapper" class="sortable">
+                                <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Řádek')}" class="row-parameter parameter">
+                                    <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="1">
                                     <input type="hidden" class="parametr-order" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}" th:value="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}">
                                     <td>
                                         <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
@@ -153 +152 @@
                             </table>
                         </div>
 
-
                         <div class="selected-input-box">
                             <div class="selected-input-box-icon">
                                 <i class="fas fa-heading"></i>
@@ -190 +188 @@
                     <div class="col-md-12 form-group row template-input">
                         <label th:for="${configuration.name}" class="template-input-label">Vlastní název šablony:</label>
                         <div class="">
-                            <input type="text" required="required" class="form-control select-filter-input" th:field="${configuration.name}">
+                            <input type="text" class="form-control select-filter-input" id="configurationName" th:field="${configuration.name}">
                         </div>
 
-                        <button type="submit" class="btn btn-success mb-2 template-input-submit" name="saveConfiguration">Uložit šablonu</button>
+                        <button type="submit" class="btn btn-success mb-2 template-input-submit" name="saveConfiguration" onclick="checkIfConfigurationNameIsNull()">Uložit šablonu</button>
                     </div>
 
 

src/main/webapp/js/assemblyScripts.js

@@ -242 +242 @@
         $(this).find('.parametr-order').attr('value', index);
         index++;
     });
+}
 
+function checkIfConfigurationNameIsNull() {
+    var configurationName = document.getElementById('configurationName');
 
+    if (configurationName.value == null || configurationName.value == "") {
+        alert("Není vyplněn název šablony !");
+    }
 }