Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Run EMA tasks in EMA screen #27

Merged
merged 4 commits into from
Apr 26, 2024
Merged

Run EMA tasks in EMA screen #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af87434
feat: Run EMA tasks in EMA screen
mario-bermonti Apr 25, 2024
fd13aaa
feat: Run EMA tasks when EMA button pressed
mario-bermonti Apr 25, 2024
ae3513c
improve: Make runSession async
mario-bermonti Apr 25, 2024
518cf23
feature: Randomize EMA task order
mario-bermonti Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/src/ema/ema_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:mdigit_span_tasks_ema/src/ema/run_ema_tasks.dart';

class EMAButton extends StatelessWidget {
const EMAButton({
Expand All @@ -8,7 +9,9 @@ class EMAButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ElevatedButton(
onPressed: () {},
onPressed: () {
runEMATasks();
},
child: Text(
'EMA screen',
style: Theme.of(context).textTheme.titleLarge,
Expand Down
23 changes: 23 additions & 0 deletions lib/src/ema/run_ema_tasks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import 'package:get/get.dart';
import 'package:mdigit_span_tasks_ema/src/digit_span_tasks/task_runners/run_dsb.dart';

import '../digit_span_tasks/task_runners/run_dsf.dart';
import '../services/run_session.dart';

void runEMAdsf() async {
await runSession(taskRunner: runDigitSpanForward, taskName: 'ds_forward');
}

void runEMAdsb() async {
await runSession(taskRunner: runDigitSpanBackwards, taskName: 'ds_backwards');
}

final List<Function> emaTasks = <Function>[runEMAdsf, runEMAdsb];

Future<void> runEMATasks() async {
emaTasks.shuffle();
for (Function emaTask in emaTasks) {
await emaTask();
}
Get.back();
}
2 changes: 1 addition & 1 deletion lib/src/services/run_session.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:mdigit_span_tasks_ema/src/services/data_processor.dart';
/// Run a data collection session
/// Running a session includes configuring everything needed and running a
/// cognitive task specified with [taskRunner].
void runSession(
Future<void> runSession(
{required Function({
required String participantID,
required String sessionID,
Expand Down
12 changes: 8 additions & 4 deletions lib/src/task_list/view/task_buttons.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ class DSBButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ElevatedButton(
onPressed: () => runSession(
taskRunner: runDigitSpanBackwards, taskName: 'ds_backwards'),
onPressed: () async {
await runSession(
taskRunner: runDigitSpanBackwards, taskName: 'ds_backwards');
},
child: Text(
'Digit Span Backwards',
style: Theme.of(context).textTheme.titleLarge,
Expand All @@ -29,8 +31,10 @@ class DSFButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ElevatedButton(
onPressed: () =>
runSession(taskRunner: runDigitSpanForward, taskName: 'ds_forward'),
onPressed: () async {
await runSession(
taskRunner: runDigitSpanForward, taskName: 'ds_forward');
},
child: Text(
'Digit Span Forward',
style: Theme.of(context).textTheme.titleLarge,
Expand Down
Loading