- Workout list/details updated in real time while working out also on watchOS

- Fixed update on iOS when viewing inside choices

Author: piscoTech

Gym Tracker Core/ExecuteWorkoutController.swift

@@ -645,11 +645,11 @@ public class ExecuteWorkoutController: NSObject {
 	}
 
 	public func isManaging(_ p: GTPart) -> Bool {
-		return p.parentHierarchy.contains { ($0 as? GTWorkout) == workout }
+		return workoutIterator.isManaging(p)
 	}
 
 	public func isManaging(_ s: GTSet) -> Bool {
-		return isManaging(s.exercize)
+		return workoutIterator.isManaging(s.exercize)
 	}
 
 	public func secondaryInfoChange(for s: GTSet, forProposingChange: Bool = false) -> Double {

Gym Tracker Core/WorkoutIterator.swift

@@ -323,6 +323,10 @@ public class WorkoutIterator: IteratorProtocol {
 
 	// MARK: - Manage cache of secondary info changes
 
+	public func isManaging(_ p: GTPart) -> Bool {
+		return exercizes.contains { $0.contains(p) }
+	}
+	
 	/// Fetch the secondary info change for the given exercize.
 	/// - returns: The secondary info change for the given exercize ignoring the workout progress.
 	func secondaryInfoChange(for e: GTSimpleSetsExercize) -> Double {

Gym Tracker watchOS Extension/ExecuteWorkoutIC.swift

@@ -223,7 +223,7 @@ class ExecuteWorkoutInterfaceController: WKInterfaceController, ExecuteWorkoutCo
 	}
 
 	func globallyUpdateSecondaryInfoChange() {
-		#warning("Implement me")
+		appDelegate.executeWorkoutDetail?.reloadDetails(from: workoutController)
 	}
 
 }

Gym Tracker watchOS Extension/WorkoutDetailIC.swift

@@ -26,6 +26,8 @@ class WorkoutDetailInterfaceController: WKInterfaceController {
 
 	private var workout: GTWorkout!
 	private var delegate: WorkoutListInterfaceController?
+	
+	private var choices: [GTChoice: Int32]?
 
     override func awake(withContext context: Any?) {
         super.awake(withContext: context)
@@ -48,7 +50,7 @@ class WorkoutDetailInterfaceController: WKInterfaceController {
 		updateButton()
 	}
 
-	func reloadData(checkExistence: Bool = true, choices: [GTChoice: Int32]? = nil) {
+	func reloadData(checkExistence: Bool = true, choices: [GTChoice: Int32]? = nil, withController ctrl: ExecuteWorkoutController? = nil) {
 		if checkExistence {
 			guard workout.stillExists(inDataManager: appDelegate.dataManager), !workout.archived else {
 				if delegate != nil {
@@ -60,6 +62,7 @@ class WorkoutDetailInterfaceController: WKInterfaceController {
 			}
 		}
 
+		self.choices = choices
 		workoutName.setText(workout.name)
 		let exercizes = workout.exercizeList
 		let exCell = "exercize"
@@ -90,7 +93,11 @@ class WorkoutDetailInterfaceController: WKInterfaceController {
 				row.setRest(r.rest)
 			} else if let se = p as? GTSetsExercize {
 				let row = table.rowController(at: i) as! ExercizeCell
-				row.detailLabel.setText(se.summary)
+				if let curWrkt = ctrl {
+					row.detailLabel.setAttributedText(se.summaryWithSecondaryInfoChange(from: curWrkt))
+				} else {
+					row.detailLabel.setText(se.summary)
+				}
 				row.accessoryWidth = 21
 				row.showAccessory(false)
 
@@ -110,6 +117,10 @@ class WorkoutDetailInterfaceController: WKInterfaceController {
 			}
 		}
     }
+	
+	func reloadDetails(from ctrl: ExecuteWorkoutController) {
+		reloadData(checkExistence: false, choices: self.choices, withController: ctrl)
+	}
 
     override func willActivate() {
         // This method is called when watch view controller is about to be visible to user