Merge branch 'dev_results_visualization_fork' into dev_results_visual…

…ization
hpi-studyu · Aug 26, 2024 · 4ad3905 · 4ad3905
2 parents c5acbc5 + 9d53cb3
commit 4ad3905
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 32 deletions.
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,6 +18,10 @@ class DescriptiveStatisticsWidget extends AverageSectionWidget {
   final String maxB;
   final String varianceA;
   final String varianceB;
+  int totalInterventionsA;
+  int totalInterventionsB;
+  int missingObservationsA;
+  int missingObservationsB;
 
   DescriptiveStatisticsWidget(
     List<num> valuesInterventionA,
@@ -52,7 +56,16 @@ class DescriptiveStatisticsWidget extends AverageSectionWidget {
             : "NONE",
         varianceB = valuesInterventionB.isNotEmpty
             ? pow(valuesInterventionB.standardDeviation, 2).toStringAsFixed(2)
-            : "NONE";
+            : "NONE",
+        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;
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -105,40 +118,26 @@ class DescriptiveStatisticsWidget extends AverageSectionWidget {
       child: Table(
         border: TableBorder.all(color: Colors.grey),
         columnWidths: const {
-          0: FixedColumnWidth(65),
-          1: FixedColumnWidth(65),
-          2: FixedColumnWidth(50),
-          3: FixedColumnWidth(50),
-          4: FixedColumnWidth(50),
-          5: FixedColumnWidth(65),
+          0: FixedColumnWidth(120), // Adjust column width if needed
+          1: FixedColumnWidth(80),
+          2: FixedColumnWidth(80),
         },
         children: [
-          _buildTableRow(
-            [
-              'Intervention',
-              'Observations',
-              'Average',
-              'Min',
-              'Max',
-              'Variance',
-            ],
-            isHeader: true,
-          ),
+          _buildTableRow(['Intervention', nameInterventionA, nameInterventionB],
+              isHeader: true),
           _buildTableRow([
-            nameInterventionA,
+            'Observations',
             observationsA.toString(),
-            averageA,
-            minA,
-            maxA,
-            varianceA
+            observationsB.toString(),
           ]),
+          _buildTableRow(['Average', averageA, averageB]),
+          _buildTableRow(['Min', minA, minB]),
+          _buildTableRow(['Max', maxA, maxB]),
+          _buildTableRow(['Variance', varianceA, varianceB]),
           _buildTableRow([
-            nameInterventionB,
-            observationsB.toString(),
-            averageB,
-            minB,
-            maxB,
-            varianceB
+            'Missing Observations',
+            missingObservationsA.toString(),
+            missingObservationsB.toString(),
           ]),
         ],
       ),
@@ -159,7 +158,7 @@ class DescriptiveStatisticsWidget extends AverageSectionWidget {
       child: Text(
         text,
         style: TextStyle(
-          fontSize: isHeader ? 8 : 8,
+          fontSize: isHeader ? 15 : 15, //Adjust font size if needed
           fontWeight: isHeader ? FontWeight.bold : FontWeight.normal,
           color: isHeader ? Colors.black : Colors.grey[800],
         ),

diff --git a/app/lib/screens/study/report/sections/results_textual_summary.dart b/app/lib/screens/study/report/sections/results_textual_summary.dart
@@ -127,8 +127,8 @@ class TextualSummaryWidget extends AverageSectionWidget {
       }
     } else {
       textualSummaryInterventionAB = [
-        "There was no significant difference in ${section.title} between interventions: $nameInterventionA and $nameInterventionB.",
-        "There was no significant difference in ${section.title} between interventions: $nameInterventionA and $nameInterventionB.",
+        "There was no evidence for a difference in ${section.title} between interventions: $nameInterventionA and $nameInterventionB.",
+        "There was no evidence for a difference in ${section.title} between interventions: $nameInterventionA and $nameInterventionB.",
       ];
     }
     return textualSummaryInterventionAB;