WT1.1.7+4 bugfix 1RM calculation for control

lib/bloc/exercise_control/exercise_control_bloc.dart

@@ -20,6 +20,8 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
   double unitQuantity;
   double quantity;
   double origQuantity;
+  double oneRepQuantity;
+  double oneRepUnitQuantity;
 
   double firstQuantity; // quantity of the first test
   double firstUnitQuantity; // unit quantity of the first test
@@ -29,6 +31,8 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
   @override
   ExerciseControlBloc({this.exerciseRepository, this.readonly, this.percentToCalculate, @required this.timerBloc})
       : super(ExerciseControlInitial()) {
+    oneRepQuantity = exerciseRepository.exercise.quantity;
+    oneRepUnitQuantity = exerciseRepository.exercise.unitQuantity;
     initialRM = this.calculate1RM(percent75: false);
     unitQuantity = this.calculate1RM(percent75: true).roundToDouble();
     quantity = percentToCalculate == 0.75 ? 12 : 30;
@@ -103,18 +107,25 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
 
     double rmWendler = weight * repeat * 0.0333 + weight;
     double rmOconner = weight * (1 + repeat / 40);
+    print("Weight: $weight repeat: $repeat,  $rmWendler, Oconner: $rmOconner");
     double average = (rmWendler + rmOconner) / 2;
 
     return percent75 ? average * this.percentToCalculate : average;
   }
 
   double calculateQuantityByUnitQuantity() {
-    final double rmWendler = initialRM;
-    final double rmOconner = initialRM;
-    final double weight = exerciseRepository.exercise.unitQuantity;
+    double weight = oneRepUnitQuantity;
+    double repeat = oneRepQuantity;
+    final double rmWendler = weight * repeat * 0.0333 + weight;
+    final double rmOconner = weight * (1 + repeat / 40);
+    print("Weight: $weight oneRepQuantity: $repeat,  $rmWendler, Oconner: $rmOconner");
+
+    weight = exerciseRepository.exercise.unitQuantity;
+    repeat = exerciseRepository.exercise.quantity;
+
     final double repeatWendler = (rmWendler - weight) / 0.0333 / weight;
     final double repeatOconner = (rmOconner / weight - 1) * 40;
-    print("Weight: $weight repeatWendler: $repeatWendler repeat Oconner: $repeatOconner");
-    return unitQuantity > 100 ? (repeatOconner + repeatWendler) / 2 : repeatWendler;
+    print("Initial 1RM: $initialRM Weight: $weight repeatWendler: $repeatWendler repeat Oconner: $repeatOconner");
+    return (repeatOconner + repeatWendler) / 2;
   }
 }

lib/bloc/login/login_bloc.dart

@@ -121,7 +121,6 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> with Trans {
         await userRepository.addUserApple();
         accountBloc.add(AccountLogInFinished(customer: Cache().userLoggedIn));
         await saveCustomer();
-        Track().track(TrackingEvent.registration);
         Track().track(TrackingEvent.registration, eventValue: "Apple");
 
         yield LoginSuccess();