fix: disable reactive for schedule intervention screen

hpi-studyu · Jun 25, 2024 · e6f7fc4 · e6f7fc4
1 parent ecc4b6e
commit e6f7fc4
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 21 deletions.
diff --git a/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart b/designer_v2/lib/features/design/interventions/study_schedule_form_view.dart
@@ -5,7 +5,6 @@ import 'package:studyu_designer_v2/common_views/form_consumer_widget.dart';
 import 'package:studyu_designer_v2/common_views/form_control_label.dart';
 import 'package:studyu_designer_v2/common_views/form_table_layout.dart';
 import 'package:studyu_designer_v2/features/design/interventions/study_schedule_form_controller_mixin.dart';
-import 'package:studyu_designer_v2/features/forms/form_validation.dart';
 import 'package:studyu_designer_v2/localization/app_translation.dart';
 import 'package:studyu_designer_v2/utils/input_formatter.dart';
 
@@ -22,16 +21,24 @@ class StudyScheduleFormView extends FormConsumerWidget {
         control: formViewModel.sequenceTypeCustomControl,
         label: tr.phase_sequence_custom_label,
         labelHelpText: tr.phase_sequence_custom_label_help,
-        input: ReactiveTextField(
-          formControl: formViewModel.sequenceTypeCustomControl,
+        input: TextField(
+          onChanged: (value) =>
+              formViewModel.sequenceTypeCustomControl.value = value,
+          controller: TextEditingController()
+            ..value = TextEditingValue(
+              text: formViewModel.sequenceTypeCustomControl.value!,
+              selection: TextSelection.collapsed(
+                offset: formViewModel.sequenceTypeCustomControl.value!.length,
+              ),
+            ),
+          //formControl: formViewModel.sequenceTypeCustomControl,
           keyboardType: TextInputType.text,
           inputFormatters: <TextInputFormatter>[
             FilteringTextInputFormatter.singleLineFormatter,
             LengthLimitingTextInputFormatter(10),
             StudySequenceFormatter(),
           ],
-          validationMessages:
-              formViewModel.sequenceTypeCustomControl.validationMessages,
+          //validationMessages: formViewModel.sequenceTypeCustomControl.validationMessages,
         ),
       );
     }
@@ -48,8 +55,11 @@ class StudyScheduleFormView extends FormConsumerWidget {
               control: formViewModel.sequenceTypeControl,
               label: tr.form_field_crossover_schedule_sequence,
               labelHelpText: tr.form_field_crossover_schedule_sequence_tooltip,
-              input: ReactiveDropdownField(
-                formControl: formViewModel.sequenceTypeControl,
+              input: DropdownButtonFormField(
+                //formControl: formViewModel.sequenceTypeControl,
+                onChanged: (value) =>
+                    formViewModel.sequenceTypeControl.value = value,
+                value: formViewModel.sequenceTypeControl.value,
                 decoration: InputDecoration(
                   helperText:
                       tr.form_field_crossover_schedule_sequence_description,
@@ -63,8 +73,7 @@ class StudyScheduleFormView extends FormConsumerWidget {
                       ),
                     )
                     .toList(),
-                validationMessages:
-                    formViewModel.sequenceTypeControl.validationMessages,
+                //validationMessages: formViewModel.sequenceTypeControl.validationMessages,
               ),
             ),
             _renderCustomSequence(),
@@ -77,8 +86,20 @@ class StudyScheduleFormView extends FormConsumerWidget {
                 children: [
                   Container(
                     constraints: const BoxConstraints(maxWidth: 70),
-                    child: ReactiveTextField(
-                      formControl: formViewModel.phaseDurationControl,
+                    child: TextField(
+                      controller: TextEditingController()
+                        ..value = TextEditingValue(
+                          text: formViewModel.phaseDurationControl.value
+                              .toString(),
+                          selection: TextSelection.collapsed(
+                            offset: formViewModel.phaseDurationControl.value
+                                .toString()
+                                .length,
+                          ),
+                        ),
+                      //formControl: formViewModel.phaseDurationControl,
+                      onChanged: (value) => formViewModel
+                          .phaseDurationControl.value = int.parse(value),
                       keyboardType: TextInputType.number,
                       inputFormatters: <TextInputFormatter>[
                         FilteringTextInputFormatter.digitsOnly,
@@ -88,8 +109,7 @@ class StudyScheduleFormView extends FormConsumerWidget {
                           max: StudyScheduleControls.kPhaseDurationMax,
                         ),
                       ],
-                      validationMessages:
-                          formViewModel.phaseDurationControl.validationMessages,
+                      //validationMessages: formViewModel.phaseDurationControl.validationMessages,
                     ),
                   ),
                   const SizedBox(width: 8.0),
@@ -109,8 +129,19 @@ class StudyScheduleFormView extends FormConsumerWidget {
                 children: [
                   Container(
                     constraints: const BoxConstraints(maxWidth: 70),
-                    child: ReactiveTextField(
-                      formControl: formViewModel.numCyclesControl,
+                    child: TextField(
+                      //formControl: formViewModel.numCyclesControl,
+                      onChanged: (value) => formViewModel
+                          .numCyclesControl.value = int.parse(value),
+                      controller: TextEditingController()
+                        ..value = TextEditingValue(
+                          text: formViewModel.numCyclesControl.value.toString(),
+                          selection: TextSelection.collapsed(
+                            offset: formViewModel.numCyclesControl.value
+                                .toString()
+                                .length,
+                          ),
+                        ),
                       keyboardType: TextInputType.number,
                       inputFormatters: <TextInputFormatter>[
                         FilteringTextInputFormatter.digitsOnly,
@@ -120,8 +151,7 @@ class StudyScheduleFormView extends FormConsumerWidget {
                           max: StudyScheduleControls.kNumCyclesMax,
                         ),
                       ],
-                      validationMessages:
-                          formViewModel.numCyclesControl.validationMessages,
+                      //validationMessages: formViewModel.numCyclesControl.validationMessages,
                     ),
                   ),
                   const SizedBox(width: 8.0),
@@ -141,8 +171,11 @@ class StudyScheduleFormView extends FormConsumerWidget {
                 children: [
                   Container(
                     constraints: const BoxConstraints(maxWidth: 70),
-                    child: ReactiveCheckbox(
-                      formControl: formViewModel.includeBaselineControl,
+                    child: Checkbox(
+                      value: formViewModel.includeBaselineControl.value,
+                      onChanged: (value) =>
+                          formViewModel.includeBaselineControl.value = value,
+                      //formControl: formViewModel.includeBaselineControl,
                     ),
                   ),
                   const SizedBox(width: 8.0),

diff --git a/designer_v2/lib/services/notification_service.dart b/designer_v2/lib/services/notification_service.dart
@@ -61,7 +61,7 @@ class NotificationService implements INotificationService {
 
 @Riverpod(keepAlive: true)
 NotificationService notificationService(NotificationServiceRef ref) {
-  ref.onDispose((() => print('NotificationService disposed')));
+  ref.onDispose(() => print('NotificationService disposed'));
 
   return NotificationService();
 }
diff --git a/designer_v2/lib/services/notification_service.g.dart b/designer_v2/lib/services/notification_service.g.dart