Merge branch 'dev_results_visualization_fork' into dev_results_visual…

…ization
hpi-studyu · Aug 26, 2024 · b04c3a1 · b04c3a1
2 parents 4ad3905 + d51b728
commit b04c3a1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/app/lib/screens/study/report/sections/average_section_widget.dart b/app/lib/screens/study/report/sections/average_section_widget.dart
@@ -166,7 +166,17 @@ class AverageSectionWidget extends ReportSectionWidget {
       gridData: getGridData(barGroups),
       alignment: BarChartAlignment.spaceAround,
       barGroups: barGroups,
-      barTouchData: BarTouchData(enabled: true),
+      barTouchData: BarTouchData(
+        enabled: true,
+        touchTooltipData: BarTouchTooltipData(
+          getTooltipItem: (group, groupIndex, rod, rodIndex) {
+            return BarTooltipItem(
+              rod.toY.toString(),
+              const TextStyle(color: Colors.white),
+            );
+          },
+        ),
+      ),
       maxY: maxY,
     );
   }

diff --git a/app/lib/screens/study/report/sections/results_descriptive_statistics.dart b/app/lib/screens/study/report/sections/results_descriptive_statistics.dart
@@ -18,10 +18,8 @@ class DescriptiveStatisticsWidget extends AverageSectionWidget {
   final String maxB;
   final String varianceA;
   final String varianceB;
-  int totalInterventionsA;
-  int totalInterventionsB;
-  int missingObservationsA;
-  int missingObservationsB;
+  final int totalInterventionsA;
+  final int totalInterventionsB;
 
   DescriptiveStatisticsWidget(
     List<num> valuesInterventionA,
@@ -60,12 +58,7 @@ class DescriptiveStatisticsWidget extends AverageSectionWidget {
         totalInterventionsA = subject.study.schedule.phaseDuration *
             subject.study.schedule.numberOfCycles,
         totalInterventionsB = subject.study.schedule.phaseDuration *
-            subject.study.schedule.numberOfCycles,
-        missingObservationsA = 0,
-        missingObservationsB = 0 {
-    missingObservationsA = totalInterventionsA - observationsA;
-    missingObservationsB = totalInterventionsB - observationsB;
-  }
+            subject.study.schedule.numberOfCycles;
 
   @override
   Widget build(BuildContext context) {
@@ -102,6 +95,8 @@ class DescriptiveStatisticsWidget extends AverageSectionWidget {
   }
 
   Widget _buildStatisticsTable() {
+    final int missingObservationsA = totalInterventionsA - observationsA;
+    final int missingObservationsB = totalInterventionsB - observationsB;
     return Container(
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(8.0),
@@ -123,8 +118,10 @@ class DescriptiveStatisticsWidget extends AverageSectionWidget {
           2: FixedColumnWidth(80),
         },
         children: [
-          _buildTableRow(['Intervention', nameInterventionA, nameInterventionB],
-              isHeader: true),
+          _buildTableRow(
+            ['Intervention', nameInterventionA, nameInterventionB],
+            isHeader: true,
+          ),
           _buildTableRow([
             'Observations',
             observationsA.toString(),