Revize efcabc4d

re #7885 basic contingency table generation (not completely finished)

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

@@ -4 +4 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import vldc.aswi.database.DatabaseInterface;
+import vldc.aswi.model.table.NameUserName;
 import vldc.aswi.model.table.TableColumn;
+import vldc.aswi.model.table.ValueFunction;
 import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
 import vldc.aswi.utils.Converter;
 
 import javax.sql.DataSource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -31 +34 @@
     @Override
     public List<ContingencyTableRow> getContingencyTableRow(String sqlQuery) {
         Map<String, TableColumn> tableColumns = this.databaseInterface.executeQueryAndReturnTableColumns(sqlQuery);
-        return Converter.convertTableColumnsToContingencyTableRows(tableColumns);
+        List<NameUserName> rowNames = new ArrayList<>();
+        rowNames.add(new NameUserName("PROGRAM_STUDIA", "d"));
+        rowNames.add(new NameUserName("TYP_STUDIA", "d"));
+
+        List<NameUserName> columnNames = new ArrayList<>();
+        columnNames.add(new NameUserName("FAKULTA_STUDIA", "d"));
+        columnNames.add(new NameUserName("FORMA_STUDIA", "d"));
+
+        List<ValueFunction> valueFunctions = new ArrayList<>();
+        valueFunctions.add(new ValueFunction("VEK", "d"));
+        Converter c = new Converter();
+        return c.convertTableColumnsToContingencyTableRows(tableColumns, rowNames, columnNames, valueFunctions);
     }
 
     /**