Revize d12e5d6c

re #7885 changes in table generation and COUNT

src/main/java/vldc/aswi/utils/Converter.java

@@ -115 +115 @@
             if (i == 0) {
                 headerRows.get(i).addTableRowCell(new ContingencyTableRowCell("Celkový počet", 1));
             }
+            else {
+                headerRows.get(i).addTableRowCell(new ContingencyTableRowCell("", 1));
+            }
         }
 
         return headerRows;
@@ -159 +162 @@
             for (String s : list) {
                 StringBuilder levelString = new StringBuilder();
                 for (int i = 0; i < index; i++) {
-                    levelString.append("\t");
+                    levelString.append("----");
                 }
                 levelString.append(s);
                 ContingencyTableRow row = new ContingencyTableRow(false, index);
@@ -189 +192 @@
 
     private void fillRowWithCountData(ContingencyTableRow row, Map<String, TableColumn> tableColumns, Node node,
                                       List<NameUserName> rowNames, List<NameUserName> columnNames, List<ValueFunction> valueFunctions) {
+        int totalCount = 0;
         //sloupec v kont. tabulce
         for (Node columnNode : columnNodes) {
             int count = 0;
@@ -202 +206 @@
                         break;
                     }
                 }
+                int j;
                 // zvoleny sloupec ze sloupcu
-                for (int j = 0; j < columnNode.getValues().size(); j++) {
+                for (j = 0; j < columnNode.getValues().size(); j++) {
                     if (!tableColumns.get(columnNames.get(j).getName()).getValues().get(i).equals(columnNode.getValues().get(j))) {
                         isUsable = false;
                         break;
@@ -219 +224 @@
 
                 if (isUsable) {
                     count++;
+                    if (j - 1 == 0) {
+                        totalCount++;
+                    }
                 }
             }
 
             row.addTableRowCell(new ContingencyTableRowCell(Integer.toString(count), 0));
         }
+
+        row.addTableRowCell(new ContingencyTableRowCell(Integer.toString(totalCount), 0));
     }
 }