WT1.1.10 compact test, paralell test

lib/bloc/exercise_control/exercise_control_bloc.dart

@@ -13,7 +13,6 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
   final TimerBloc timerBloc;
   final ExerciseRepository exerciseRepository;
   final bool readonly;
-  final double percentToCalculate;
   int step = 1;
 
   double initialRM;
@@ -29,18 +28,18 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
   double scrollOffset = 0;
 
   @override
-  ExerciseControlBloc({this.exerciseRepository, this.readonly, this.percentToCalculate, @required this.timerBloc})
-      : super(ExerciseControlInitial()) {
+  ExerciseControlBloc({this.exerciseRepository, this.readonly, @required this.timerBloc}) : super(ExerciseControlInitial()) {
+    print("Exercise ${exerciseRepository.exercise.toJson()}");
     oneRepQuantity = exerciseRepository.exercise.quantity;
     oneRepUnitQuantity = exerciseRepository.exercise.unitQuantity;
     initialRM = this.calculate1RM(percent75: false);
     unitQuantity = this.calculate1RM(percent75: true).roundToDouble();
-    quantity = percentToCalculate == 0.75 ? 12 : 35;
+    quantity = 12;
     origQuantity = quantity;
 
     exerciseRepository.setUnitQuantity(unitQuantity);
     exerciseRepository.setQuantity(quantity);
-    print("init quantity: " + quantity.toString());
+
     timerBloc.add(TimerStart(duration: 300));
   }
 
@@ -49,7 +48,6 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
     try {
       if (event is ExerciseControlLoad) {
         yield ExerciseControlLoading();
-        print("init quantity: " + quantity.toString());
         step = 1;
         yield ExerciseControlReady();
       } else if (event is ExerciseControlQuantityChange) {
@@ -83,9 +81,8 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
           }
           exerciseRepository.end = DateTime.now();
           await exerciseRepository.addExercise();
+          exerciseRepository.initExercise();
 
-          exerciseRepository.setQuantity(quantity);
-          exerciseRepository.exercise.exerciseId = null;
           step <= 3 ? timerBloc.add(TimerStart(duration: 300)) : timerBloc.add(TimerEnd());
         }
         yield ExerciseControlReady();
@@ -110,7 +107,7 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
     print("Weight: $weight repeat: $repeat,  $rmWendler, Oconner: $rmOconner");
     double average = (rmWendler + rmOconner) / 2;
 
-    return percent75 ? average * this.percentToCalculate : average;
+    return percent75 ? average * 0.75 : average;
   }
 
   int calculateQuantityByUnitQuantity() {