Revize 45073efd

re #7990 Added parameter ordering by parameterOrder.

src/main/java/vldc/aswi/domain/Assembly.java

@@ -6 +6 @@
 import vldc.aswi.domain.parameter.Parameter;
 
 import javax.persistence.*;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -92 +94 @@
         roles.remove(role);
         role.getAssemblies().remove(this);
     }
+
+    /**
+     * Sort parameter list by parameterOrder.
+     */
+    public void sortParameterList() {
+        Collections.sort(parameters);
+    }
 }

src/main/java/vldc/aswi/domain/parameter/Parameter.java

@@ -14 +14 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
-public class Parameter extends EntityParent {
+public class Parameter extends EntityParent implements Comparable<Parameter> {
 
     /** Name of parameter in SQL query. */
     @Column(name = "nazev")
@@ -143 +143 @@
         locations.remove(location);
         location.getParameters().remove(this);
     }
+
+    /**
+     * Compare two parameters by parameterOrder from 0 to X.
+     * @param parameter - Compared parameter.
+     * @return 1 if current parameter is higher, -1 if lower.
+     */
+    @Override
+    public int compareTo(Parameter parameter) {
+        if (this.getParameterOrder() > parameter.getParameterOrder()) {
+            return 1;
+        }
+        else {
+            return -1;
+        }
+    }
 }

src/main/java/vldc/aswi/service/AssemblyManagerImpl.java

@@ -10 +10 @@
 import vldc.aswi.dao.RoleRepository;
 import vldc.aswi.domain.Assembly;
 import vldc.aswi.domain.Role;
+import vldc.aswi.domain.parameter.Parameter;
 import vldc.aswi.service.parameter.ParameterManager;
 
 import javax.transaction.Transactional;
@@ -74 +75 @@
      */
     @Override
     public Assembly getAssemblyById(Long id) {
-        return assemblyRepository.getById(id);
+        Assembly assembly = this.assemblyRepository.getById(id);
+        assembly.sortParameterList();
+        return assembly;
     }
 
     /**