Revize a2e84e8c

re #7886 Creating + Editing assembly
Not working: Adding new role to access list, Loading values for parameter, Adding new values for parameter, disabling functions + operators if data type = enumeration, deleting role from Access list, Deleting parameter. Saving new assembly + checking all form elements.
Added new sql script file for creating test records.
re #7888 Added back button for Creating + Editing assembly page and page for Generating contingency table.

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

@@ -1 +1 @@
 package vldc.aswi.web.controller;
 
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -10 +11 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import vldc.aswi.domain.Assembly;
-import vldc.aswi.service.AssemblyManager;
-import vldc.aswi.service.SqlQueryManager;
+import vldc.aswi.domain.Role;
+import vldc.aswi.service.*;
+import vldc.aswi.service.parameter.ParameterTypeManager;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
 
 @Controller
 public class AssemblyController {
@@ -24 +28 @@
     @Autowired
     private AssemblyManager assemblyManager;
 
+    @Autowired
+    private RoleManager roleManager;
+
+    @Autowired
+    private ParameterTypeManager parameterTypeManager;
+
+    @Autowired
+    private OperatorManager operatorManager;
+
+    @Autowired
+    private FunctionManager functionManager;
+
+    @Autowired
+    private LocationManager locationManager;
+
     @GetMapping("/assembly")
     public ModelAndView assemblyIndex(@Valid @ModelAttribute("assemblyID") String id) {
         ModelAndView modelAndView = new ModelAndView("assembly");
@@ -46 +65 @@
         ModelMap modelMap = modelAndView.getModelMap();
 
         long assemblyID = assembly.getId();
-System.out.println(assemblyID);
-        Assembly assembly2 = assemblyManager.getAssemblyById(assemblyID);
 
+        Assembly assembly2 = assemblyManager.getAssemblyById(assemblyID);
 
         modelMap.addAttribute("assemblies", assemblyManager.getAssemblies());
         modelMap.addAttribute("assembly", assembly2);
@@ -59 +77 @@
 
     @GetMapping("/assembly_edit")
     public ModelAndView assemblyEditIndex(@Valid @ModelAttribute("assemblyID") String id) {
-        ModelAndView modelAndView = new ModelAndView("assembly_edit");
+        ModelAndView modelAndView = new ModelAndView("assembly_manage");
 
         ModelMap modelMap = modelAndView.getModelMap();
 
         Assembly assembly = assemblyManager.getAssemblyById(Long.parseLong(id));
 
-        modelMap.addAttribute("assemblies", assemblyManager.getAssemblies());
         modelMap.addAttribute("assembly", assembly);
+        modelMap.addAttribute("roles", roleManager.getRoles());
+        modelMap.addAttribute("rolesWithAccess", assembly.getRoles());
+        modelMap.addAttribute("parameters", assembly.getParameters());
+        modelMap.addAttribute("parameterTypes", parameterTypeManager.getParameterTypes());
+        modelMap.addAttribute("functions", functionManager.getFunctions());
+        modelMap.addAttribute("operators", operatorManager.getOperators());
+        modelMap.addAttribute("locations", locationManager.getLocations());
+
+        return modelAndView;
+    }
+
+    @GetMapping("/assembly_new")
+    public ModelAndView assemblyNewIndex() {
+        ModelAndView modelAndView = new ModelAndView("assembly_manage");
+
+        ModelMap modelMap = modelAndView.getModelMap();
+
+        modelMap.addAttribute("assembly", new Assembly());
+        modelMap.addAttribute("roles", roleManager.getRoles());
+
+        return modelAndView;
+    }
+
+    @PostMapping("/assembly_new")
+    public ModelAndView assemblyNewIndexPost() {
+        ModelAndView modelAndView = new ModelAndView("assembly_manage");
+
+        ModelMap modelMap = modelAndView.getModelMap();
+
+        modelMap.addAttribute("assembly", new Assembly());
+        modelMap.addAttribute("roles", roleManager.getRoles());
 
         return modelAndView;
     }