WT1.1.0+38 Design, time_picker

lib/bloc/exercise_new/exercise_new_bloc.dart

@@ -51,6 +51,7 @@ class ExerciseNewBloc extends Bloc<ExerciseNewEvent, ExerciseNewState> {
     exerciseRepository.setUnit(exerciseType.unit);
     exerciseRepository.setQuantity(quantity);
     exerciseRepository.setUnitQuantity(unitQuantity);
+    exerciseRepository.exercise.exercisePlanDetailId = 0;
     if (Cache().userLoggedIn != null) {
       customerRepository.customer = Cache().userLoggedIn;
       weight = customerRepository.customer.getProperty("Weight");

lib/bloc/menu/menu_bloc.dart

@@ -93,9 +93,9 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans {
         //await menuTreeRepository.createTree();
         setMenuInfo();
         exerciseDeviceRepository.setDevices(Cache().getDevices());
-        exerciseDeviceRepository.getGymDevices().forEach((element) {
+        /* exerciseDeviceRepository.getGymDevices().forEach((element) {
           listFilterDevice.add(element.exerciseDeviceId);
-        });
+        }); */
         yield MenuReady();
       } else if (event is MenuRecreateTree) {
         // ie. at language changes
@@ -140,11 +140,10 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans {
       } else if (event is MenuFilterExerciseType) {
         yield MenuLoading();
         final int deviceId = event.deviceId;
-        print("Defilter " + deviceId.toString());
         if (selectedDevice(deviceId)) {
-          listFilterDevice.remove(deviceId);
-        } else {
           listFilterDevice.add(deviceId);
+        } else {
+          listFilterDevice.remove(deviceId);
         }
         yield MenuReady();
       }
@@ -170,14 +169,14 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans {
   }
 
   bool selectedDevice(int deviceId) {
-    return listFilterDevice.contains(deviceId);
+    return !listFilterDevice.contains(deviceId);
   }
 
   LinkedHashMap<String, WorkoutMenuTree> getFilteredBranch(int parent) {
     if (parent == null) return LinkedHashMap();
 
     LinkedHashMap<String, WorkoutMenuTree> branch = menuTreeRepository.getBranch(parent);
-    if (!menuTreeRepository.isChild(parent) || ability.toString() == ExerciseAbility.none.toString()) {
+    if (!menuTreeRepository.isChild(parent) || ability.toString() == ExerciseAbility.none.toString() || listFilterDevice.isEmpty) {
       return branch;
     }
     LinkedHashMap<String, WorkoutMenuTree> filtered = LinkedHashMap();