WT1.1.18+2 Training Plan days, skip

lib/widgets/exercise_save.dart

@@ -24,21 +24,24 @@ class ExerciseSave extends StatefulWidget {
   final int exerciseTypeId;
   final double? weight;
   final int? repeats;
+  final int? set;
+  final int? exerciseNr;
 
-  ExerciseSave({
-    required this.onQuantityChanged,
-    this.onUnitQuantityChanged,
-    this.onSubmit,
-    required this.hasUnitQuantity,
-    this.unitQuantityUnit,
-    required this.unit,
-    required this.exerciseName,
-    required this.exerciseDescription,
-    required this.exerciseTask,
-    required this.exerciseTypeId,
-    this.weight,
-    this.repeats,
-  });
+  ExerciseSave(
+      {required this.onQuantityChanged,
+      this.onUnitQuantityChanged,
+      this.onSubmit,
+      required this.hasUnitQuantity,
+      this.unitQuantityUnit,
+      required this.unit,
+      required this.exerciseName,
+      required this.exerciseDescription,
+      required this.exerciseTask,
+      required this.exerciseTypeId,
+      this.weight,
+      this.repeats,
+      this.set,
+      this.exerciseNr});
   @override
   _ExerciseSaveState createState() => _ExerciseSaveState();
 }
@@ -230,7 +233,9 @@ class _ExerciseSaveState extends State<ExerciseSave> with Trans {
             ),
             widget.hasUnitQuantity
                 ? Text(
-                    t("Step") + ": " + "1/4",
+                    widget.set == null || widget.exerciseNr == null
+                        ? t("Step") + ": " + "1/4"
+                        : t("Step") + ": " + "${widget.exerciseNr}/${widget.set}",
                     style: GoogleFonts.inter(
                       fontSize: 22,
                       color: Colors.white,

lib/widgets/menu_page_widget.dart

@@ -79,7 +79,6 @@ class _MenuPageWidgetState extends State<MenuPageWidget> with Trans, Logging {
       }
       if (!tutorialBloc.isTutorialDone()) {
         if (tutorialBloc.isActive == false && tutorialBloc.canActivate) {
-          print("Activate tutorial");
           tutorialBloc.canActivate = true;
           tutorialBloc.isActive = true;
           tutorialBloc.menuBloc = menuBloc;
@@ -328,7 +327,7 @@ class _MenuPageWidgetState extends State<MenuPageWidget> with Trans, Logging {
                             Navigator.of(context).pop();
                             if (Cache().myTrainingPlan != null) {
                               final TrainingPlanBloc bloc = BlocProvider.of<TrainingPlanBloc>(context);
-                              bloc.myPlan = Cache().myTrainingPlan;
+                              bloc.setMyPlan(Cache().myTrainingPlan);
                               Navigator.of(context).pushNamed("myTrainingPlanExecute");
                             }
                           },
@@ -411,6 +410,11 @@ class _MenuPageWidgetState extends State<MenuPageWidget> with Trans, Logging {
         args['templateName'] = workoutTree.nameEnglish;
         args['templateNameTranslation'] = workoutTree.name;
         Navigator.of(context).pushNamed('testSetEdit', arguments: args);
+      } else if (menuBloc.ability != null && ExerciseAbility.training.equalsTo(menuBloc.ability!) && workoutTree.parent != 0) {
+        HashMap<String, dynamic> args = HashMap();
+        print("menu ${workoutTree.internalName}");
+        args['parentName'] = workoutTree.internalName;
+        Navigator.of(context).pushNamed("myTrainingPlanActivate", arguments: args);
       }
       menuBloc.add(MenuTreeDown(item: workoutTree, parent: workoutTree.id));
     } else {