Revize 2868bb9a

re #7871 Displaying list of assemblies + displaying result table of selected assembly.

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

@@ -4 +4 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.servlet.ModelAndView;
 import vldc.aswi.database.DatabaseInterface;
+import vldc.aswi.domain.Assembly;
 import vldc.aswi.model.table.TableColumn;
 import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
 import vldc.aswi.model.table.contingencyTable.ContingencyTableRowCell;
+import vldc.aswi.service.AssemblyManager;
 import vldc.aswi.service.SqlQueryManager;
 import vldc.aswi.utils.Converter;
 
 import javax.sql.DataSource;
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -23 +28 @@
 	@Autowired
 	private SqlQueryManager sqlQueryManager;
 
+	@Autowired
+	private AssemblyManager assemblyManager;
+
 	@GetMapping("/")
-	public ModelAndView index() throws Exception {
+	public ModelAndView index() {
 		ModelAndView modelAndView = new ModelAndView("index");
 
 		ModelMap modelMap = modelAndView.getModelMap();
 
-		String sqlQuery = "SELECT SP.fakulta_SP as fakulta_studia, " +
-				"SP.kodSP_i as program_studia, " +
-				"fn_meaning2(SP.typ,'TYP_OBORU') as typ_studia, " +
-				"fn_meaning2(SP.forma,'FORMA_OBORU_NEW') as forma_studia, " +
-				"decode(SP.vykazovan,'A',ST.vykazovan,'N') as vykazovan_na_SIMS, " +
-				"ST.os_cislo as studium, fn_meaning2(ST.stav,'STAV_STUDENTA') as stav_studia, " +
-				"OS.prijmeni || ' ' || OS.jmeno as osoba, " +
-				"trunc((sysdate - OS.datum_naroz) / 365) as vek, " +
-				"1 as pocet " +
-				"FROM studijni_programy SP, studenti ST, osoby OS " +
-				"WHERE SP.stpridno = ST.stpridno AND ST.osobidno = OS.osobidno AND ROWNUM <= 500";
-
-		modelMap.addAttribute("message", "Hello World!");
-		modelMap.addAttribute("contingencyTableRows", sqlQueryManager.getContingencyTableRow(sqlQuery));
+		modelMap.addAttribute("assemblies", assemblyManager.getAssemblies());
+
+		return modelAndView;
+	}
+
+	@PostMapping("/")
+	public ModelAndView indexPost(@Valid @ModelAttribute("assemblyID") String id) {
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("redirect:/assembly");
 
 		return modelAndView;
 	}