Merge pull request #18 from mario-bermonti:process-data

[improvement] Accept function that processes data
mario-bermonti · Sep 1, 2023 · d2a91bd · d2a91bd
2 parents b784d6c + e001037
commit d2a91bd
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 16 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -41,7 +41,11 @@ class _MyHomePageState extends State<MyHomePage> {
             ElevatedButton(
               onPressed: () {
                 List<String> stimList = ['012', '9876', '567890'];
-                Get.put(MDigits(stimList: stimList));
+                MDigits mDigits = Get.put(MDigits(
+                  stimList: stimList,
+                  participantID: '000',
+                  processData: print,
+                ));
               },
               child: Text(
                 'Comenzar mDigits',

diff --git a/lib/activity/trial_response/trial_response_controller.dart b/lib/activity/trial_response/trial_response_controller.dart
@@ -14,11 +14,9 @@ class TrialResponseController extends GetxController {
   }
 
   void submit() {
-    // spaces are meaningless as in paper and pencil measures
     String response = textController.text.trim();
-
+    _mDigits.addTrialData(resp: response);
     textController.clear();
-    // _mDigits.addTrialData(result: response);
   }
 
   void toNextScreen() {

diff --git a/lib/mdigits.dart b/lib/mdigits.dart
@@ -4,6 +4,7 @@ import 'package:mdigits/activity/trial_stim/stim_controller.dart';
 import 'package:mdigits/activity/trial_response/trial_response_view.dart';
 import 'package:mdigits/activity/trial_stim/trial_stim_view.dart';
 import 'package:mdigits/end/end_view.dart';
+import 'package:mdigits/models/trial_data.dart';
 import 'package:mdigits/rest/rest_view.dart';
 
 import 'activity/begin_view.dart';
@@ -14,6 +15,10 @@ class MDigits extends GetxController {
   /// Provides access and manages the stimuli
   late final StimController _stimuli;
 
+  /// Data for all trials
+  /// Used to provide data to app
+  final List<TrialData> data = <TrialData>[];
+
   /// Global task start time
   final DateTime _timeStart = DateTime.now();
 
@@ -26,29 +31,34 @@ class MDigits extends GetxController {
   Step _status = Step.stim;
 
   final List<String> stimList;
-
-  MDigits({required this.stimList});
-
+  final String participantID;
   @override
   onInit() async {
     await _setup();
     super.onInit();
   }
 
+  Function(List<TrialData> value)? processData;
+
+  MDigits({
+    required this.stimList,
+    required this.participantID,
+    this.processData,
+  });
+
   @override
   onReady() {
     Get.to(() => BeginView(beginFunction: run));
   }
 
-  /// Add trial data to the db
-  // void addTrialData({required String result}) {
-  //   _database.addTrialData(
-  //     participantId: _participantId,
-  //     stim: _stimuli.stim.currentStim,
-  //     resp: result,
-  //     sessionNumber: _sessionNumber,
-  //   );
-  // }
+  void addTrialData({required String resp}) {
+    TrialData trialData = TrialData(
+      participantID: participantID,
+      stim: _stimuli.stim.currentStim,
+      response: resp,
+    );
+    data.add(trialData);
+  }
 
   // TODO improve name of conditions checks?
   /// TODO can presenting stim next be improved? Current implementation seems
@@ -115,6 +125,10 @@ class MDigits extends GetxController {
       case Step.completed:
         // _saveData();
         Get.off(const EndView());
+        if (processData != null) {
+          processData!(data);
+        }
+        ;
         Get.back();
         return;
       default:

diff --git a/lib/models/trial_data.dart b/lib/models/trial_data.dart
@@ -0,0 +1,16 @@
+class TrialData {
+  final String participantID;
+  final String stim;
+  final String response;
+
+  TrialData({
+    required this.participantID,
+    required this.stim,
+    required this.response,
+  });
+
+  @override
+  String toString() {
+    return "Participant $participantID, stim: $stim, resp: $response";
+  }
+}