Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2

src/de/tudarmstadt/informatik/hostage/logging/UglyDbHelper.java

@@ -174,12 +174,17 @@ public class UglyDbHelper extends SQLiteOpenHelper {
 			selectQuery = selectQuery + filter.getProtocolsQueryStatement(TABLE_ATTACK_INFO, KEY_PROTOCOL);
 		}
 
+        selectQuery = selectQuery + " GROUP BY " + TABLE_RECORDS+"."+KEY_ATTACK_ID;
+
         if (filter.getSorttype() == LogFilter.SortType.timestamp){
             //DESC
             selectQuery = selectQuery + " ORDER BY " + filter.getSorttype() + " DESC";
         } else {
             selectQuery = selectQuery + " ORDER BY " + filter.getSorttype();
         }
+
+
+
 		System.out.println(selectQuery);
 		SQLiteDatabase db = this.getReadableDatabase();
 		Cursor cursor = db.rawQuery(selectQuery, null);

src/de/tudarmstadt/informatik/hostage/ui2/adapter/StatisticListAdapter.java

@@ -24,7 +24,7 @@ public class StatisticListAdapter extends ArrayAdapter<PlotComparisonItem> {
     }
 
     public interface ValueFormatter {
-        public String convertValueToString(double value);
+        public String convertValueForItemToString(PlotComparisonItem item);
     }
 
     private ValueFormatter formatter;
@@ -84,7 +84,7 @@ public class StatisticListAdapter extends ArrayAdapter<PlotComparisonItem> {
         if (this.formatter == null){
             holder.valueView.setText("" + item.getValue2());
         } else {
-            holder.valueView.setText(this.formatter.convertValueToString(item.getValue2()));
+            holder.valueView.setText(this.formatter.convertValueForItemToString(item));
         }
     }
 }

src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordOverviewFragment.java

@@ -3,7 +3,6 @@ package de.tudarmstadt.informatik.hostage.ui2.fragment;
 import android.annotation.SuppressLint;
 import android.app.Fragment;
 import android.app.FragmentManager;
-import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -274,7 +273,7 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 
             item.setId_Mapping(mapping);
 
-            item.setTag(val.getId());
+            item.setTag(val.getAttack_id());
 
             String groupID = this.getGroupValue(val);
 
@@ -327,7 +326,7 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
                 ExpandableListItem item = (ExpandableListItem)adapter.getChild(i,i2);
 
                 UglyDbHelper dbh = new UglyDbHelper(getBaseContext());
-                Record rec = dbh.getRecord((int) item.getTag());
+                Record rec = dbh.getRecordOfAttackId((int) item.getTag());
                 RecordOverviewFragment.this.pushRecordDetailViewForRecord(rec);
                 return true;
             }

src/de/tudarmstadt/informatik/hostage/ui2/fragment/StatisticsFragment.java

@@ -336,16 +336,16 @@ public class StatisticsFragment extends Fragment implements ChecklistDialog.Chec
         if (this.currentPlotView instanceof LineGraph){
             adapter.setValueFormatter(new StatisticListAdapter.ValueFormatter() {
                 @Override
-                public String convertValueToString(double value) {
-                    return String.format("%.02f", value) + " %";
+                public String convertValueForItemToString(PlotComparisonItem item) {
+                    return String.format("%.02f", item.getValue2()) + " %" + " " + "("+ (item.getValue1().intValue())  +")";
                 }
             });
         } else {
 
             adapter.setValueFormatter(new StatisticListAdapter.ValueFormatter() {
                 @Override
-                public String convertValueToString(double value) {
-                    int v = (int) value;
+                public String convertValueForItemToString(PlotComparisonItem item)  {
+                    int v = (int) item.getValue2().intValue();
                     return "" + v;
                 }
             });
@@ -1108,7 +1108,7 @@ public class StatisticsFragment extends Fragment implements ChecklistDialog.Chec
             });
 
             double itemValue = (((double)numbOfAttacks / (double)records.size())*100.);
-            PlotComparisonItem item = new PlotComparisonItem(groupKey, this.getColor(index), 0., itemValue);
+            PlotComparisonItem item = new PlotComparisonItem(groupKey, this.getColor(index), (double) numbOfAttacks, itemValue);
             item.setOtherData(singleLineItems);
             plotItems.add(item);
             index++;