Revize b66f682e

re #7881 loading of attributes of assembly on main page

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

@@ -10 +10 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import vldc.aswi.domain.Assembly;
+import vldc.aswi.domain.Configuration;
 import vldc.aswi.service.AssemblyManager;
+import vldc.aswi.service.ConfigurationManager;
 import vldc.aswi.service.SqlQueryManager;
 
 import javax.validation.Valid;
@@ -24 +26 @@
     @Autowired
     private AssemblyManager assemblyManager;
 
+    @Autowired
+    private ConfigurationManager configurationManager;
+
     @GetMapping("/assembly")
     public ModelAndView assemblyIndex(@Valid @ModelAttribute("assemblyID") String id) {
         ModelAndView modelAndView = new ModelAndView("assembly");
@@ -32 +37 @@
 
         Assembly assembly = assemblyManager.getAssemblyById(Long.parseLong(id));
 
-        modelMap.addAttribute("assemblies", assemblyManager.getAssemblies());
-        modelMap.addAttribute("assembly", assembly);
+        Configuration configuration = new Configuration();
+
+        configuration.setAssembly(assembly);
+
+        modelMap.addAttribute("configuration", configuration);
+        modelMap.addAttribute("assemblyID", id);
 
         return modelAndView;
     }
 
+    @GetMapping("/assembly")
+    public ModelAndView configurationIndex(@Valid @ModelAttribute("assemblyID") String id) {
+        ModelAndView modelAndView = new ModelAndView("assembly");
+
+        ModelMap modelMap = modelAndView.getModelMap();
+
+        Configuration configuration = configurationManager.getConfigurationById(Long.parseLong(id));
+
+        modelMap.addAttribute("configuration", configuration);
+        modelMap.addAttribute("assemblyID", configuration.getAssembly().getId());
+
+        return modelAndView;
+    }
 
     @PostMapping("/assembly")
     public ModelAndView indexPost(@Valid Assembly assembly, BindingResult bindingResult, RedirectAttributes atts) {